Merge pull request #4040

b801ef5 Use different colors for different subaccounts (rating89us)
monero-project · Sep 28, 2022 · 4b8e0f3 · 4b8e0f3
2 parents c247b96 + b801ef5
commit 4b8e0f3
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 6 deletions.
diff --git a/LeftPanel.qml b/LeftPanel.qml
@@ -120,7 +120,7 @@ Rectangle {
                     width: 260
                     height: 135
                     fillMode: Image.PreserveAspectFit
-                    source: MoneroComponents.Style.blackTheme ? "qrc:///images/card-background-black.png" : "qrc:///images/card-background-white.png"
+                    source: MoneroComponents.Style.blackTheme ? "qrc:///images/card-background-black" + (currentAccountIndex % MoneroComponents.Style.accountColors.length) + ".png" : "qrc:///images/card-background-white.png"
                 }
 
                 DropShadow {

diff --git a/components/MenuButton.qml b/components/MenuButton.qml
@@ -92,7 +92,7 @@ Rectangle {
         anchors.leftMargin: 20
         height: parent.height
         width: 2
-        color: button.checked ? MoneroComponents.Style.buttonBackgroundColor : "transparent"
+        color: button.checked ? MoneroComponents.Style.accountColors[currentAccountIndex % MoneroComponents.Style.accountColors.length] : "transparent"
 
         // button text
         MoneroComponents.TextPlain {

diff --git a/components/Style.qml b/components/Style.qml
@@ -81,6 +81,7 @@ QtObject {
     property string leftPanelBackgroundGradientStart: blackTheme ? _b_leftPanelBackgroundGradientStart : _w_leftPanelBackgroundGradientStart
     property string leftPanelBackgroundGradientStop: blackTheme ? _b_leftPanelBackgroundGradientStop : _w_leftPanelBackgroundGradientStop
     property string historyHeaderTextColor: blackTheme ? _b_historyHeaderTextColor : _w_historyHeaderTextColor
+    property var accountColors: blackTheme ? _b_accountColors : _w_accountColors
 
     property string _b_defaultFontColor: "white"
     property string _b_dimmedFontColor: "#BBBBBB"
@@ -142,6 +143,7 @@ QtObject {
     property string _b_leftPanelBackgroundGradientStart: "#222222"
     property string _b_leftPanelBackgroundGradientStop: "#1a1a1a"
     property string _b_historyHeaderTextColor: "#C0C0C0"
+    property var _b_accountColors: ["#6E513C", "#842129", "#458421", "#742184", "#291DBE", "#846F21", "#217F84", "#696969"]
 
     property string _w_defaultFontColor: "black"
     property string _w_dimmedFontColor: "#3f3f3f"
@@ -203,4 +205,5 @@ QtObject {
     property string _w_leftPanelBackgroundGradientStart: "white"
     property string _w_leftPanelBackgroundGradientStop: "#f5f5f5"
     property string _w_historyHeaderTextColor: "#515151"
+    property var _w_accountColors: ["#6E513C", "#6E513C", "#842129", "#458421", "#742184", "#291DBE", "#846F21", "#217F84", "#696969"]
 }
diff --git a/images/card-background-black.png → images/card-background-black0.png b/images/card-background-black.png → images/card-background-black0.png
diff --git a/images/[email protected] → images/[email protected] b/images/[email protected] → images/[email protected]
diff --git a/images/card-background-black1.png b/images/card-background-black1.png
diff --git a/images/[email protected] b/images/[email protected]
diff --git a/images/card-background-black2.png b/images/card-background-black2.png
diff --git a/images/[email protected] b/images/[email protected]
diff --git a/images/card-background-black3.png b/images/card-background-black3.png
diff --git a/images/[email protected] b/images/[email protected]
diff --git a/images/card-background-black4.png b/images/card-background-black4.png
diff --git a/images/[email protected] b/images/[email protected]
diff --git a/images/card-background-black5.png b/images/card-background-black5.png
diff --git a/images/[email protected] b/images/[email protected]
diff --git a/images/card-background-black6.png b/images/card-background-black6.png
diff --git a/images/[email protected] b/images/[email protected]
diff --git a/images/card-background-black7.png b/images/card-background-black7.png
diff --git a/images/[email protected] b/images/[email protected]
diff --git a/pages/Account.qml b/pages/Account.qml
@@ -238,7 +238,7 @@ Rectangle {
                             Layout.fillHeight: true
                             anchors.top: parent.top
                             anchors.bottom: parent.bottom
-                            color: "darkgrey"
+                            color: MoneroComponents.Style.accountColors[currentAccountIndex % MoneroComponents.Style.accountColors.length]
                             width: 2
                         }
 

diff --git a/pages/Receive.qml b/pages/Receive.qml
@@ -580,7 +580,8 @@ Rectangle {
                             Layout.fillHeight: true
                             anchors.top: parent.top
                             anchors.bottom: parent.bottom
-                            color: "darkgrey"
+                            property int currentAccountIndex: currentWallet ? currentWallet.currentSubaddressAccount : 0
+                            color: MoneroComponents.Style.accountColors[currentAccountIndex % MoneroComponents.Style.accountColors.length]
                             width: 2
                         }
 

diff --git a/qml.qrc b/qml.qrc
@@ -119,8 +119,22 @@
         <file>components/RemoteNodeEdit.qml</file>
         <file>pages/Keys.qml</file>
         <file>images/appicon.ico</file>
-        <file>images/card-background-black.png</file>
-        <file>images/[email protected]</file>
+        <file>images/card-background-black0.png</file>
+        <file>images/card-background-black1.png</file>
+        <file>images/card-background-black2.png</file>
+        <file>images/card-background-black3.png</file>
+        <file>images/card-background-black4.png</file>
+        <file>images/card-background-black5.png</file>
+        <file>images/card-background-black6.png</file>
+        <file>images/card-background-black7.png</file>
+        <file>images/[email protected]</file>
+        <file>images/[email protected]</file>
+        <file>images/[email protected]</file>
+        <file>images/[email protected]</file>
+        <file>images/[email protected]</file>
+        <file>images/[email protected]</file>
+        <file>images/[email protected]</file>
+        <file>images/[email protected]</file>
         <file>images/card-background-white.png</file>
         <file>images/[email protected]</file>
         <file>images/moneroLogo_white.png</file>