Skip to content

Commit

Permalink
settings-wallet: use StandardButton instead of custom buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiphon
xiphon committed Dec 13, 2018
1 parent 59fc48b commit 9c09294
Showing 1 changed file with 36 additions and 139 deletions.
175 changes: 36 additions & 139 deletions pages/settings/SettingsWallet.qml
View file
Expand Up @@ -104,39 +104,13 @@ Rectangle {
}
}

Rectangle {
Layout.minimumWidth: 120 * scaleRatio
Layout.preferredWidth: closeWalletText.width + (20 * scaleRatio)
Layout.preferredHeight: parent.height
color: "transparent"

Rectangle{
width: parent.width
height: 24 * scaleRatio
radius: 2 * scaleRatio
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
color: MoneroComponents.Style.buttonBackgroundColorDisabled

Text {
id: closeWalletText
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
color: MoneroComponents.Style.defaultFontColor
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
font.bold: true
text: qsTr("Close wallet") + translationManager.emptyString
}

MouseArea {
cursorShape: Qt.PointingHandCursor
anchors.fill: parent
onClicked: {
appWindow.showWizard();
}
}
MoneroComponents.StandardButton {
small: true
text: qsTr("Close wallet") + translationManager.emptyString
onClicked: {
appWindow.showWizard();
}
width: 135 * scaleRatio
}
}

Expand Down Expand Up @@ -195,39 +169,13 @@ Rectangle {
}
}

Rectangle {
Layout.minimumWidth: 120 * scaleRatio
Layout.preferredWidth: createViewOnlyText.width + (20 * scaleRatio)
Layout.preferredHeight: parent.height
color: "transparent"

Rectangle{
width: parent.width
height: 24 * scaleRatio
radius: 2 * scaleRatio
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
color: MoneroComponents.Style.buttonBackgroundColorDisabled

Text {
id: createViewOnlyText
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
color: MoneroComponents.Style.defaultFontColor
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
font.bold: true
text: qsTr("Create wallet") + translationManager.emptyString
}

MouseArea {
cursorShape: Qt.PointingHandCursor
anchors.fill: parent
onClicked: {
wizard.openCreateViewOnlyWalletPage();
}
}
MoneroComponents.StandardButton {
small: true
text: qsTr("Create wallet") + translationManager.emptyString
onClicked: {
wizard.openCreateViewOnlyWalletPage();
}
width: 135 * scaleRatio
}
}

Expand Down Expand Up @@ -286,37 +234,13 @@ Rectangle {
}
}

Rectangle {
Layout.minimumWidth: 120 * scaleRatio
Layout.preferredWidth: showSeedText.width + (20 * scaleRatio)
Layout.preferredHeight: parent.height
color: "transparent"

Rectangle{
width: parent.width
height: 24 * scaleRatio
radius: 2 * scaleRatio
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
color: MoneroComponents.Style.buttonBackgroundColorDisabled

Text {
id: showSeedText
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
color: MoneroComponents.Style.defaultFontColor
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
font.bold: true
text: qsTr("Show seed") + translationManager.emptyString
}

MouseArea {
cursorShape: Qt.PointingHandCursor
anchors.fill: parent
onClicked: Utils.showSeedPage();
}
MoneroComponents.StandardButton {
small: true
text: qsTr("Show seed") + translationManager.emptyString
onClicked: {
Utils.showSeedPage();
}
width: 135 * scaleRatio
}
}

Expand Down Expand Up @@ -375,53 +299,26 @@ Rectangle {
}
}

Rectangle {
Layout.minimumWidth: 120 * scaleRatio
Layout.preferredWidth: rescanButtonText.width + (20 * scaleRatio)
Layout.preferredHeight: parent.height
color: "transparent"

Rectangle{
width: parent.width

height: 24 * scaleRatio
radius: 2 * scaleRatio
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
color: MoneroComponents.Style.buttonBackgroundColorDisabled

Text {
id: rescanButtonText
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
color: MoneroComponents.Style.defaultFontColor
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
font.bold: true
text: qsTr("Rescan") + translationManager.emptyString
}

MouseArea {
cursorShape: Qt.PointingHandCursor
anchors.fill: parent
onClicked: {
if (!currentWallet.rescanSpent()) {
console.error("Error: ", currentWallet.errorString);
informationPopup.title = qsTr("Error") + translationManager.emptyString;
informationPopup.text = qsTr("Error: ") + currentWallet.errorString
informationPopup.icon = StandardIcon.Critical
informationPopup.onCloseCallback = null
informationPopup.open();
} else {
informationPopup.title = qsTr("Information") + translationManager.emptyString
informationPopup.text = qsTr("Successfully rescanned spent outputs.") + translationManager.emptyString
informationPopup.icon = StandardIcon.Information
informationPopup.onCloseCallback = null
informationPopup.open();
}
}
MoneroComponents.StandardButton {
small: true
text: qsTr("Rescan") + translationManager.emptyString
onClicked: {
if (!currentWallet.rescanSpent()) {
console.error("Error: ", currentWallet.errorString);
informationPopup.title = qsTr("Error") + translationManager.emptyString;
informationPopup.text = qsTr("Error: ") + currentWallet.errorString
informationPopup.icon = StandardIcon.Critical
informationPopup.onCloseCallback = null
informationPopup.open();
} else {
informationPopup.title = qsTr("Information") + translationManager.emptyString
informationPopup.text = qsTr("Successfully rescanned spent outputs.") + translationManager.emptyString
informationPopup.icon = StandardIcon.Information
informationPopup.onCloseCallback = null
informationPopup.open();
}
}
width: 135 * scaleRatio
}
}
}
Expand Down

0 comments on commit 9c09294

Please sign in to comment.