monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 00:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move default divider/button colors to Style.qml

Browse source
This commit is contained in:
Sander Ferdinand 2017-12-07 17:34:12 +01:00 committed by moneromooo-monero
parent 868fbe2f2d
commit 948669edbc
1 changed files with 11 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
pages/Settings.qml
View file

@ -41,7 +41,7 @@ Rectangle {
property bool viewOnly: false property bool viewOnly: false
id: page id: page
color: "#F0EEEE" color: "transparent"
Clipboard { id: clipboard } Clipboard { id: clipboard }
@ -62,7 +62,6 @@ Rectangle {
Label { Label {
id: manageWalletLabel id: manageWalletLabel
Layout.fillWidth: true Layout.fillWidth: true
color: "#4A4949"
text: qsTr("Manage wallet") + translationManager.emptyString text: qsTr("Manage wallet") + translationManager.emptyString
Layout.topMargin: 10 * scaleRatio Layout.topMargin: 10 * scaleRatio
} }
@ -71,7 +70,8 @@ Rectangle {
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
height: 1 height: 1
color: "#DEDEDE" color: Style.dividerColor
opacity: Style.dividerOpacity
} }
GridLayout { GridLayout {
@ -79,10 +79,6 @@ Rectangle {
StandardButton { StandardButton {
id: closeWalletButton id: closeWalletButton
text: qsTr("Close wallet") + translationManager.emptyString text: qsTr("Close wallet") + translationManager.emptyString
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
visible: true visible: true
onClicked: { onClicked: {
console.log("closing wallet button clicked") console.log("closing wallet button clicked")
@ -94,10 +90,6 @@ Rectangle {
enabled: !viewOnly enabled: !viewOnly
id: createViewOnlyWalletButton id: createViewOnlyWalletButton
text: qsTr("Create view only wallet") + translationManager.emptyString text: qsTr("Create view only wallet") + translationManager.emptyString
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
visible: true visible: true
onClicked: { onClicked: {
wizard.openCreateViewOnlyWalletPage(); wizard.openCreateViewOnlyWalletPage();
@ -143,10 +135,6 @@ Rectangle {
id: rescanSpentButton id: rescanSpentButton
enabled: !persistentSettings.useRemoteNode enabled: !persistentSettings.useRemoteNode
text: qsTr("Rescan wallet balance") + translationManager.emptyString text: qsTr("Rescan wallet balance") + translationManager.emptyString
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
onClicked: { onClicked: {
if (!currentWallet.rescanSpent()) { if (!currentWallet.rescanSpent()) {
console.error("Error: ", currentWallet.errorString); console.error("Error: ", currentWallet.errorString);
@ -199,10 +187,6 @@ Rectangle {
enabled: persistentSettings.useRemoteNode enabled: persistentSettings.useRemoteNode
Layout.fillWidth: false Layout.fillWidth: false
text: qsTr("Local Node") + translationManager.emptyString text: qsTr("Local Node") + translationManager.emptyString
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
onClicked: { onClicked: {
appWindow.disconnectRemoteNode(); appWindow.disconnectRemoteNode();
} }
@ -213,10 +197,6 @@ Rectangle {
enabled: !persistentSettings.useRemoteNode enabled: !persistentSettings.useRemoteNode
Layout.fillWidth: false Layout.fillWidth: false
text: qsTr("Remote Node") + translationManager.emptyString text: qsTr("Remote Node") + translationManager.emptyString
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
onClicked: { onClicked: {
appWindow.connectRemoteNode(); appWindow.connectRemoteNode();
} }
@ -229,7 +209,6 @@ Rectangle {
Layout.topMargin: 20 Layout.topMargin: 20
Label { Label {
id: manageDaemonLabel id: manageDaemonLabel
color: "#4A4949"
text: qsTr("Manage Daemon") + translationManager.emptyString text: qsTr("Manage Daemon") + translationManager.emptyString
} }
@ -237,14 +216,13 @@ Rectangle {
id: daemonAdvanced id: daemonAdvanced
Layout.leftMargin: 15 Layout.leftMargin: 15
text: qsTr("Show advanced") + translationManager.emptyString text: qsTr("Show advanced") + translationManager.emptyString
checkedIcon: "../images/checkedVioletIcon.png"
uncheckedIcon: "../images/uncheckedIcon.png"
} }
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
height: 1 height: 1
color: "#DEDEDE" color: Style.dividerColor
opacity: Style.dividerOpacity
} }
GridLayout { GridLayout {
@ -255,10 +233,6 @@ Rectangle {
visible: !appWindow.daemonRunning visible: !appWindow.daemonRunning
id: startDaemonButton id: startDaemonButton
text: qsTr("Start Local Node") + translationManager.emptyString text: qsTr("Start Local Node") + translationManager.emptyString
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
onClicked: { onClicked: {
// Update bootstrap daemon address // Update bootstrap daemon address
persistentSettings.bootstrapNodeAddress = bootstrapNodeEdit.daemonAddrText ? bootstrapNodeEdit.getAddress() : ""; persistentSettings.bootstrapNodeAddress = bootstrapNodeEdit.daemonAddrText ? bootstrapNodeEdit.getAddress() : "";
@ -273,10 +247,6 @@ Rectangle {
visible: appWindow.daemonRunning visible: appWindow.daemonRunning
id: stopDaemonButton id: stopDaemonButton
text: qsTr("Stop Local Node") + translationManager.emptyString text: qsTr("Stop Local Node") + translationManager.emptyString
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
onClicked: { onClicked: {
appWindow.stopDaemon() appWindow.stopDaemon()
} }
@ -286,10 +256,6 @@ Rectangle {
visible: true visible: true
id: daemonStatusButton id: daemonStatusButton
text: qsTr("Show status") + translationManager.emptyString text: qsTr("Show status") + translationManager.emptyString
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
onClicked: { onClicked: {
daemonManager.sendCommand("status",currentWallet.nettype); daemonManager.sendCommand("status",currentWallet.nettype);
daemonConsolePopup.open(); daemonConsolePopup.open();
@ -302,7 +268,6 @@ Rectangle {
visible: !isMobile && !persistentSettings.useRemoteNode visible: !isMobile && !persistentSettings.useRemoteNode
Label { Label {
id: blockchainFolderLabel id: blockchainFolderLabel
color: "#4A4949"
text: qsTr("Blockchain location") + translationManager.emptyString text: qsTr("Blockchain location") + translationManager.emptyString
} }
LineEdit { LineEdit {
@ -332,7 +297,6 @@ Rectangle {
id: daemonFlagsRow id: daemonFlagsRow
Label { Label {
id: daemonFlagsLabel id: daemonFlagsLabel
color: "#4A4949"
text: qsTr("Local daemon startup flags") + translationManager.emptyString text: qsTr("Local daemon startup flags") + translationManager.emptyString
} }
LineEdit { LineEdit {
@ -350,7 +314,6 @@ Rectangle {
Label { Label {
id: daemonLoginLabel id: daemonLoginLabel
Layout.fillWidth: true Layout.fillWidth: true
color: "#4A4949"
text: qsTr("Node login (optional)") + translationManager.emptyString text: qsTr("Node login (optional)") + translationManager.emptyString
} }
@ -401,7 +364,6 @@ Rectangle {
visible: persistentSettings.useRemoteNode visible: persistentSettings.useRemoteNode
ColumnLayout { ColumnLayout {
Label { Label {
color: "#4A4949"
text: qsTr("Remote node") + translationManager.emptyString text: qsTr("Remote node") + translationManager.emptyString
} }
RemoteNodeEdit { RemoteNodeEdit {
@ -419,10 +381,6 @@ Rectangle {
StandardButton { StandardButton {
id: remoteNodeSave id: remoteNodeSave
text: qsTr("Connect") + translationManager.emptyString text: qsTr("Connect") + translationManager.emptyString
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
onClicked: { onClicked: {
// Update daemon login // Update daemon login
persistentSettings.remoteNodeAddress = remoteNodeEdit.getAddress(); persistentSettings.remoteNodeAddress = remoteNodeEdit.getAddress();
@ -441,7 +399,6 @@ Rectangle {
RowLayout { RowLayout {
visible: !isMobile visible: !isMobile
Label { Label {
color: "#4A4949"
text: qsTr("Layout settings") + translationManager.emptyString text: qsTr("Layout settings") + translationManager.emptyString
anchors.topMargin: 30 * scaleRatio anchors.topMargin: 30 * scaleRatio
Layout.topMargin: 30 * scaleRatio Layout.topMargin: 30 * scaleRatio
@ -451,7 +408,8 @@ Rectangle {
visible: !isMobile visible: !isMobile
Layout.fillWidth: true Layout.fillWidth: true
height: 1 height: 1
color: "#DEDEDE" color: Style.dividerColor
opacity: Style.dividerOpacity
} }
RowLayout { RowLayout {
@ -461,8 +419,6 @@ Rectangle {
checked: persistentSettings.customDecorations checked: persistentSettings.customDecorations
onClicked: appWindow.setCustomWindowDecorations(checked) onClicked: appWindow.setCustomWindowDecorations(checked)
text: qsTr("Custom decorations") + translationManager.emptyString text: qsTr("Custom decorations") + translationManager.emptyString
checkedIcon: "../images/checkedVioletIcon.png"
uncheckedIcon: "../images/uncheckedIcon.png"
} }
} }
@ -470,7 +426,6 @@ Rectangle {
RowLayout { RowLayout {
Label { Label {
color: "#4A4949"
text: qsTr("Log level") + translationManager.emptyString text: qsTr("Log level") + translationManager.emptyString
anchors.topMargin: 30 * scaleRatio anchors.topMargin: 30 * scaleRatio
Layout.topMargin: 30 * scaleRatio Layout.topMargin: 30 * scaleRatio
@ -479,7 +434,8 @@ Rectangle {
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
height: 1 height: 1
color: "#DEDEDE" color: Style.dividerColor
opacity: Style.dividerOpacity
} }
ColumnLayout { ColumnLayout {
ComboBox { ComboBox {
@ -518,7 +474,6 @@ Rectangle {
// Version // Version
RowLayout { RowLayout {
Label { Label {
color: "#4A4949"
text: qsTr("Debug info") + translationManager.emptyString text: qsTr("Debug info") + translationManager.emptyString
fontSize: 16 fontSize: 16
anchors.topMargin: 30 * scaleRatio anchors.topMargin: 30 * scaleRatio
@ -528,7 +483,8 @@ Rectangle {
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
height: 1 height: 1
color: "#DEDEDE" color: Style.dividerColor
opacity: Style.dividerOpacity
} }
TextBlock { TextBlock {
Layout.topMargin: 8 Layout.topMargin: 8
@ -572,10 +528,6 @@ Rectangle {
Layout.fillWidth: false Layout.fillWidth: false
Layout.leftMargin: 30 Layout.leftMargin: 30
text: qsTr("Save") + translationManager.emptyString text: qsTr("Save") + translationManager.emptyString
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
onClicked: { onClicked: {
currentWallet.walletCreationHeight = restoreHeight.text currentWallet.walletCreationHeight = restoreHeight.text