From b801ef594b65053c473ba778552c2db4d020dd82 Mon Sep 17 00:00:00 2001
From: rating89us <45968869+rating89us@users.noreply.github.com>
Date: Sun, 25 Sep 2022 11:12:38 +0200
Subject: Use different colors for different subaccounts
---
LeftPanel.qml | 2 +-
components/MenuButton.qml | 2 +-
components/Style.qml | 3 +++
images/card-background-black.png | Bin 24232 -> 0 bytes
images/card-background-black0.png | Bin 0 -> 24232 bytes
images/card-background-black0@2x.png | Bin 0 -> 70165 bytes
images/card-background-black1.png | Bin 0 -> 19445 bytes
images/card-background-black1@2x.png | Bin 0 -> 53747 bytes
images/card-background-black2.png | Bin 0 -> 19317 bytes
images/card-background-black2@2x.png | Bin 0 -> 53662 bytes
images/card-background-black3.png | Bin 0 -> 19611 bytes
images/card-background-black3@2x.png | Bin 0 -> 54040 bytes
images/card-background-black4.png | Bin 0 -> 19292 bytes
images/card-background-black4@2x.png | Bin 0 -> 53125 bytes
images/card-background-black5.png | Bin 0 -> 19446 bytes
images/card-background-black5@2x.png | Bin 0 -> 53691 bytes
images/card-background-black6.png | Bin 0 -> 19587 bytes
images/card-background-black6@2x.png | Bin 0 -> 54142 bytes
images/card-background-black7.png | Bin 0 -> 7133 bytes
images/card-background-black7@2x.png | Bin 0 -> 17787 bytes
images/card-background-black@2x.png | Bin 70165 -> 0 bytes
pages/Account.qml | 2 +-
pages/Receive.qml | 3 ++-
qml.qrc | 18 ++++++++++++++++--
24 files changed, 24 insertions(+), 6 deletions(-)
delete mode 100755 images/card-background-black.png
create mode 100644 images/card-background-black0.png
create mode 100644 images/card-background-black0@2x.png
create mode 100644 images/card-background-black1.png
create mode 100644 images/card-background-black1@2x.png
create mode 100644 images/card-background-black2.png
create mode 100644 images/card-background-black2@2x.png
create mode 100644 images/card-background-black3.png
create mode 100644 images/card-background-black3@2x.png
create mode 100644 images/card-background-black4.png
create mode 100644 images/card-background-black4@2x.png
create mode 100644 images/card-background-black5.png
create mode 100644 images/card-background-black5@2x.png
create mode 100644 images/card-background-black6.png
create mode 100644 images/card-background-black6@2x.png
create mode 100644 images/card-background-black7.png
create mode 100644 images/card-background-black7@2x.png
delete mode 100755 images/card-background-black@2x.png
diff --git a/LeftPanel.qml b/LeftPanel.qml
index cf56c56b..5fc3c2e7 100644
--- 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
index cd57ea9e..b9916f66 100644
--- 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
index da739477..5a833f84 100644
--- 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 b/images/card-background-black.png
deleted file mode 100755
index 2aa5c46d..00000000
Binary files a/images/card-background-black.png and /dev/null differ
diff --git a/images/card-background-black0.png b/images/card-background-black0.png
new file mode 100644
index 00000000..2aa5c46d
Binary files /dev/null and b/images/card-background-black0.png differ
diff --git a/images/card-background-black0@2x.png b/images/card-background-black0@2x.png
new file mode 100644
index 00000000..9e68d910
Binary files /dev/null and b/images/card-background-black0@2x.png differ
diff --git a/images/card-background-black1.png b/images/card-background-black1.png
new file mode 100644
index 00000000..4c26a225
Binary files /dev/null and b/images/card-background-black1.png differ
diff --git a/images/card-background-black1@2x.png b/images/card-background-black1@2x.png
new file mode 100644
index 00000000..4289d331
Binary files /dev/null and b/images/card-background-black1@2x.png differ
diff --git a/images/card-background-black2.png b/images/card-background-black2.png
new file mode 100644
index 00000000..1e9a3d74
Binary files /dev/null and b/images/card-background-black2.png differ
diff --git a/images/card-background-black2@2x.png b/images/card-background-black2@2x.png
new file mode 100644
index 00000000..54224feb
Binary files /dev/null and b/images/card-background-black2@2x.png differ
diff --git a/images/card-background-black3.png b/images/card-background-black3.png
new file mode 100644
index 00000000..d580b8d1
Binary files /dev/null and b/images/card-background-black3.png differ
diff --git a/images/card-background-black3@2x.png b/images/card-background-black3@2x.png
new file mode 100644
index 00000000..b87bdeea
Binary files /dev/null and b/images/card-background-black3@2x.png differ
diff --git a/images/card-background-black4.png b/images/card-background-black4.png
new file mode 100644
index 00000000..0979de87
Binary files /dev/null and b/images/card-background-black4.png differ
diff --git a/images/card-background-black4@2x.png b/images/card-background-black4@2x.png
new file mode 100644
index 00000000..9f3ea05d
Binary files /dev/null and b/images/card-background-black4@2x.png differ
diff --git a/images/card-background-black5.png b/images/card-background-black5.png
new file mode 100644
index 00000000..d6206f23
Binary files /dev/null and b/images/card-background-black5.png differ
diff --git a/images/card-background-black5@2x.png b/images/card-background-black5@2x.png
new file mode 100644
index 00000000..d70b0f01
Binary files /dev/null and b/images/card-background-black5@2x.png differ
diff --git a/images/card-background-black6.png b/images/card-background-black6.png
new file mode 100644
index 00000000..e6739abc
Binary files /dev/null and b/images/card-background-black6.png differ
diff --git a/images/card-background-black6@2x.png b/images/card-background-black6@2x.png
new file mode 100644
index 00000000..1760fa8e
Binary files /dev/null and b/images/card-background-black6@2x.png differ
diff --git a/images/card-background-black7.png b/images/card-background-black7.png
new file mode 100644
index 00000000..ab11744e
Binary files /dev/null and b/images/card-background-black7.png differ
diff --git a/images/card-background-black7@2x.png b/images/card-background-black7@2x.png
new file mode 100644
index 00000000..cb700997
Binary files /dev/null and b/images/card-background-black7@2x.png differ
diff --git a/images/card-background-black@2x.png b/images/card-background-black@2x.png
deleted file mode 100755
index 9e68d910..00000000
Binary files a/images/card-background-black@2x.png and /dev/null differ
diff --git a/pages/Account.qml b/pages/Account.qml
index b1410570..70c10c88 100644
--- 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
index 8c3df3bf..fe655419 100644
--- 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
index ea698a4e..56341eaa 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -119,8 +119,22 @@
components/RemoteNodeEdit.qml
pages/Keys.qml
images/appicon.ico
- images/card-background-black.png
- images/card-background-black@2x.png
+ images/card-background-black0.png
+ images/card-background-black1.png
+ images/card-background-black2.png
+ images/card-background-black3.png
+ images/card-background-black4.png
+ images/card-background-black5.png
+ images/card-background-black6.png
+ images/card-background-black7.png
+ images/card-background-black0@2x.png
+ images/card-background-black1@2x.png
+ images/card-background-black2@2x.png
+ images/card-background-black3@2x.png
+ images/card-background-black4@2x.png
+ images/card-background-black5@2x.png
+ images/card-background-black6@2x.png
+ images/card-background-black7@2x.png
images/card-background-white.png
images/card-background-white@2x.png
images/moneroLogo_white.png
--
cgit v1.2.3