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-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2601

Browse source 
4a86a1c remove colored dots (tobtoht)
This commit is contained in:
luigi1111 2019-12-21 18:43:06 -05:00
commit 1c97e9796d
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 19 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
LeftPanel.qml
View file

@ -365,7 +365,7 @@ Rectangle {
MoneroComponents.MenuButtonDivider { MoneroComponents.MenuButtonDivider {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- Account tab --------------- // ------------- Account tab ---------------
@ -375,7 +375,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Account") + translationManager.emptyString text: qsTr("Account") + translationManager.emptyString
symbol: qsTr("T") + translationManager.emptyString symbol: qsTr("T") + translationManager.emptyString
dotColor: "#44AAFF"
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
parent.previousButton = accountButton parent.previousButton = accountButton
@ -387,7 +386,7 @@ Rectangle {
visible: accountButton.present visible: accountButton.present
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- Transfer tab --------------- // ------------- Transfer tab ---------------
@ -397,7 +396,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Send") + translationManager.emptyString text: qsTr("Send") + translationManager.emptyString
symbol: qsTr("S") + translationManager.emptyString symbol: qsTr("S") + translationManager.emptyString
dotColor: "#FF6C3C"
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
parent.previousButton = transferButton parent.previousButton = transferButton
@ -409,7 +407,7 @@ Rectangle {
visible: transferButton.present visible: transferButton.present
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- AddressBook tab --------------- // ------------- AddressBook tab ---------------
@ -420,7 +418,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Address book") + translationManager.emptyString text: qsTr("Address book") + translationManager.emptyString
symbol: qsTr("B") + translationManager.emptyString symbol: qsTr("B") + translationManager.emptyString
dotColor: "#FF4F41"
under: transferButton under: transferButton
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
@ -433,7 +430,7 @@ Rectangle {
visible: addressBookButton.present visible: addressBookButton.present
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- Receive tab --------------- // ------------- Receive tab ---------------
@ -443,7 +440,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Receive") + translationManager.emptyString text: qsTr("Receive") + translationManager.emptyString
symbol: qsTr("R") + translationManager.emptyString symbol: qsTr("R") + translationManager.emptyString
dotColor: "#AAFFBB"
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
parent.previousButton = receiveButton parent.previousButton = receiveButton
@ -455,7 +451,7 @@ Rectangle {
visible: receiveButton.present visible: receiveButton.present
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- Merchant tab --------------- // ------------- Merchant tab ---------------
@ -467,7 +463,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Merchant") + translationManager.emptyString text: qsTr("Merchant") + translationManager.emptyString
symbol: qsTr("U") + translationManager.emptyString symbol: qsTr("U") + translationManager.emptyString
dotColor: "#FF4F41"
under: receiveButton under: receiveButton
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
@ -480,7 +475,7 @@ Rectangle {
visible: merchantButton.present && appWindow.walletMode >= 2 visible: merchantButton.present && appWindow.walletMode >= 2
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- History tab --------------- // ------------- History tab ---------------
@ -491,7 +486,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Transactions") + translationManager.emptyString text: qsTr("Transactions") + translationManager.emptyString
symbol: qsTr("H") + translationManager.emptyString symbol: qsTr("H") + translationManager.emptyString
dotColor: "#6B0072"
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
parent.previousButton = historyButton parent.previousButton = historyButton
@ -503,7 +497,7 @@ Rectangle {
visible: historyButton.present visible: historyButton.present
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- Advanced tab --------------- // ------------- Advanced tab ---------------
@ -514,7 +508,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Advanced") + translationManager.emptyString text: qsTr("Advanced") + translationManager.emptyString
symbol: qsTr("D") + translationManager.emptyString symbol: qsTr("D") + translationManager.emptyString
dotColor: "#FFD781"
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
parent.previousButton = advancedButton parent.previousButton = advancedButton
@ -525,7 +518,7 @@ Rectangle {
visible: advancedButton.present && appWindow.walletMode >= 2 visible: advancedButton.present && appWindow.walletMode >= 2
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- Mining tab --------------- // ------------- Mining tab ---------------
@ -536,7 +529,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Mining") + translationManager.emptyString text: qsTr("Mining") + translationManager.emptyString
symbol: qsTr("M") + translationManager.emptyString symbol: qsTr("M") + translationManager.emptyString
dotColor: "#FFD781"
under: advancedButton under: advancedButton
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
@ -549,7 +541,7 @@ Rectangle {
visible: miningButton.present && appWindow.walletMode >= 2 visible: miningButton.present && appWindow.walletMode >= 2
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- TxKey tab --------------- // ------------- TxKey tab ---------------
@ -560,7 +552,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Prove/check") + translationManager.emptyString text: qsTr("Prove/check") + translationManager.emptyString
symbol: qsTr("K") + translationManager.emptyString symbol: qsTr("K") + translationManager.emptyString
dotColor: "#FFD781"
under: advancedButton under: advancedButton
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
@ -573,7 +564,7 @@ Rectangle {
visible: txkeyButton.present && appWindow.walletMode >= 2 visible: txkeyButton.present && appWindow.walletMode >= 2
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- Shared RingDB tab --------------- // ------------- Shared RingDB tab ---------------
@ -584,7 +575,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Shared RingDB") + translationManager.emptyString text: qsTr("Shared RingDB") + translationManager.emptyString
symbol: qsTr("G") + translationManager.emptyString symbol: qsTr("G") + translationManager.emptyString
dotColor: "#FFD781"
under: advancedButton under: advancedButton
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
@ -597,7 +587,7 @@ Rectangle {
visible: sharedringdbButton.present && appWindow.walletMode >= 2 visible: sharedringdbButton.present && appWindow.walletMode >= 2
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- Sign/verify tab --------------- // ------------- Sign/verify tab ---------------
@ -608,7 +598,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Sign/verify") + translationManager.emptyString text: qsTr("Sign/verify") + translationManager.emptyString
symbol: qsTr("I") + translationManager.emptyString symbol: qsTr("I") + translationManager.emptyString
dotColor: "#FFD781"
under: advancedButton under: advancedButton
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
@ -621,7 +610,7 @@ Rectangle {
visible: signButton.present && appWindow.walletMode >= 2 visible: signButton.present && appWindow.walletMode >= 2
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
// ------------- Settings tab --------------- // ------------- Settings tab ---------------
@ -631,7 +620,6 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
text: qsTr("Settings") + translationManager.emptyString text: qsTr("Settings") + translationManager.emptyString
symbol: qsTr("E") + translationManager.emptyString symbol: qsTr("E") + translationManager.emptyString
dotColor: "#36B25C"
onClicked: { onClicked: {
parent.previousButton.checked = false parent.previousButton.checked = false
parent.previousButton = settingsButton parent.previousButton = settingsButton
@ -643,7 +631,7 @@ Rectangle {
visible: settingsButton.present visible: settingsButton.present
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.leftMargin: 16 anchors.leftMargin: 20
} }
} // Column } // Column

30
components/MenuButton.qml
View file

@ -36,7 +36,6 @@ Rectangle {
id: button id: button
property alias text: label.text property alias text: label.text
property bool checked: false property bool checked: false
property alias dotColor: dot.color
property alias symbol: symbolText.text property alias symbol: symbolText.text
property int numSelectedChildren: 0 property int numSelectedChildren: 0
property var under: null property var under: null
@ -63,7 +62,7 @@ Rectangle {
height: present ? ((appWindow.height >= 800) ? 44 : 38 ) : 0 height: present ? ((appWindow.height >= 800) ? 44 : 38 ) : 0
LinearGradient { LinearGradient {
visible: isOpenGL && button.checked visible: isOpenGL && button.checked || numSelectedChildren > 0
height: parent.height height: parent.height
width: 260 width: 260
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -88,27 +87,10 @@ Rectangle {
// button decorations that are subject to leftMargin offsets // button decorations that are subject to leftMargin offsets
Rectangle { Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: parent.getOffset() + 20 anchors.leftMargin: 20
height: parent.height height: parent.height
width: button.checked ? 20: 10 width: 2
color: "transparent" color: button.checked ? MoneroComponents.Style.buttonBackgroundColor : "transparent"
// dot if unchecked
Rectangle {
id: dot
anchors.centerIn: parent
width: button.checked ? 20 : 8
height: button.checked ? 20 : 8
radius: button.checked ? 20 : 4
color: button.dotColor
// arrow if checked
Image {
anchors.centerIn: parent
anchors.left: parent.left
source: MoneroComponents.Style.menuButtonImageDotArrowSource
visible: button.checked
}
}
// button text // button text
MoneroComponents.TextPlain { MoneroComponents.TextPlain {
@ -118,7 +100,7 @@ Rectangle {
themeTransitionWhiteColor: MoneroComponents.Style._w_menuButtonTextColor themeTransitionWhiteColor: MoneroComponents.Style._w_menuButtonTextColor
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.right anchors.left: parent.right
anchors.leftMargin: 8 anchors.leftMargin: button.getOffset() + 8
font.bold: true font.bold: true
font.pixelSize: 14 font.pixelSize: 14
} }
@ -144,7 +126,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font.pixelSize: 12 font.pixelSize: 12
font.bold: true font.bold: true
color: button.checked || buttonArea.containsMouse ? MoneroComponents.Style.menuButtonTextColor : dot.color color: MoneroComponents.Style.menuButtonTextColor
visible: appWindow.ctrlPressed visible: appWindow.ctrlPressed
themeTransition: false themeTransition: false
} }