From 4a86a1cf762a316e81343ab0db9d955c90977446 Mon Sep 17 00:00:00 2001 From: thotbot Date: Sun, 15 Dec 2019 21:38:19 +0000 Subject: [PATCH] remove colored dots --- LeftPanel.qml | 38 +++++++++++++------------------------- components/MenuButton.qml | 30 ++++++------------------------ 2 files changed, 19 insertions(+), 49 deletions(-) diff --git a/LeftPanel.qml b/LeftPanel.qml index 959f5189..31f22ddf 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -364,7 +364,7 @@ Rectangle { MoneroComponents.MenuButtonDivider { anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- Account tab --------------- @@ -374,7 +374,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Account") + translationManager.emptyString symbol: qsTr("T") + translationManager.emptyString - dotColor: "#44AAFF" onClicked: { parent.previousButton.checked = false parent.previousButton = accountButton @@ -386,7 +385,7 @@ Rectangle { visible: accountButton.present anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- Transfer tab --------------- @@ -396,7 +395,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Send") + translationManager.emptyString symbol: qsTr("S") + translationManager.emptyString - dotColor: "#FF6C3C" onClicked: { parent.previousButton.checked = false parent.previousButton = transferButton @@ -408,7 +406,7 @@ Rectangle { visible: transferButton.present anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- AddressBook tab --------------- @@ -419,7 +417,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Address book") + translationManager.emptyString symbol: qsTr("B") + translationManager.emptyString - dotColor: "#FF4F41" under: transferButton onClicked: { parent.previousButton.checked = false @@ -432,7 +429,7 @@ Rectangle { visible: addressBookButton.present anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- Receive tab --------------- @@ -442,7 +439,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Receive") + translationManager.emptyString symbol: qsTr("R") + translationManager.emptyString - dotColor: "#AAFFBB" onClicked: { parent.previousButton.checked = false parent.previousButton = receiveButton @@ -454,7 +450,7 @@ Rectangle { visible: receiveButton.present anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- Merchant tab --------------- @@ -466,7 +462,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Merchant") + translationManager.emptyString symbol: qsTr("U") + translationManager.emptyString - dotColor: "#FF4F41" under: receiveButton onClicked: { parent.previousButton.checked = false @@ -479,7 +474,7 @@ Rectangle { visible: merchantButton.present && appWindow.walletMode >= 2 anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- History tab --------------- @@ -490,7 +485,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Transactions") + translationManager.emptyString symbol: qsTr("H") + translationManager.emptyString - dotColor: "#6B0072" onClicked: { parent.previousButton.checked = false parent.previousButton = historyButton @@ -502,7 +496,7 @@ Rectangle { visible: historyButton.present anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- Advanced tab --------------- @@ -513,7 +507,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Advanced") + translationManager.emptyString symbol: qsTr("D") + translationManager.emptyString - dotColor: "#FFD781" onClicked: { parent.previousButton.checked = false parent.previousButton = advancedButton @@ -524,7 +517,7 @@ Rectangle { visible: advancedButton.present && appWindow.walletMode >= 2 anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- Mining tab --------------- @@ -535,7 +528,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Mining") + translationManager.emptyString symbol: qsTr("M") + translationManager.emptyString - dotColor: "#FFD781" under: advancedButton onClicked: { parent.previousButton.checked = false @@ -548,7 +540,7 @@ Rectangle { visible: miningButton.present && appWindow.walletMode >= 2 anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- TxKey tab --------------- @@ -559,7 +551,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Prove/check") + translationManager.emptyString symbol: qsTr("K") + translationManager.emptyString - dotColor: "#FFD781" under: advancedButton onClicked: { parent.previousButton.checked = false @@ -572,7 +563,7 @@ Rectangle { visible: txkeyButton.present && appWindow.walletMode >= 2 anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- Shared RingDB tab --------------- @@ -583,7 +574,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Shared RingDB") + translationManager.emptyString symbol: qsTr("G") + translationManager.emptyString - dotColor: "#FFD781" under: advancedButton onClicked: { parent.previousButton.checked = false @@ -596,7 +586,7 @@ Rectangle { visible: sharedringdbButton.present && appWindow.walletMode >= 2 anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- Sign/verify tab --------------- @@ -607,7 +597,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Sign/verify") + translationManager.emptyString symbol: qsTr("I") + translationManager.emptyString - dotColor: "#FFD781" under: advancedButton onClicked: { parent.previousButton.checked = false @@ -620,7 +609,7 @@ Rectangle { visible: signButton.present && appWindow.walletMode >= 2 anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } // ------------- Settings tab --------------- @@ -630,7 +619,6 @@ Rectangle { anchors.right: parent.right text: qsTr("Settings") + translationManager.emptyString symbol: qsTr("E") + translationManager.emptyString - dotColor: "#36B25C" onClicked: { parent.previousButton.checked = false parent.previousButton = settingsButton @@ -642,7 +630,7 @@ Rectangle { visible: settingsButton.present anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 16 + anchors.leftMargin: 20 } } // Column diff --git a/components/MenuButton.qml b/components/MenuButton.qml index 93fc3b9f..a7edfff4 100644 --- a/components/MenuButton.qml +++ b/components/MenuButton.qml @@ -36,7 +36,6 @@ Rectangle { id: button property alias text: label.text property bool checked: false - property alias dotColor: dot.color property alias symbol: symbolText.text property int numSelectedChildren: 0 property var under: null @@ -63,7 +62,7 @@ Rectangle { height: present ? ((appWindow.height >= 800) ? 44 : 38 ) : 0 LinearGradient { - visible: isOpenGL && button.checked + visible: isOpenGL && button.checked || numSelectedChildren > 0 height: parent.height width: 260 anchors.verticalCenter: parent.verticalCenter @@ -88,27 +87,10 @@ Rectangle { // button decorations that are subject to leftMargin offsets Rectangle { anchors.left: parent.left - anchors.leftMargin: parent.getOffset() + 20 + anchors.leftMargin: 20 height: parent.height - width: button.checked ? 20: 10 - color: "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 - } - } + width: 2 + color: button.checked ? MoneroComponents.Style.buttonBackgroundColor : "transparent" // button text MoneroComponents.TextPlain { @@ -118,7 +100,7 @@ Rectangle { themeTransitionWhiteColor: MoneroComponents.Style._w_menuButtonTextColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.right - anchors.leftMargin: 8 + anchors.leftMargin: button.getOffset() + 8 font.bold: true font.pixelSize: 14 } @@ -144,7 +126,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter font.pixelSize: 12 font.bold: true - color: button.checked || buttonArea.containsMouse ? MoneroComponents.Style.menuButtonTextColor : dot.color + color: MoneroComponents.Style.menuButtonTextColor visible: appWindow.ctrlPressed themeTransition: false }