diff options
| -rw-r--r-- | LeftPanel.qml | 2 | ||||
| -rw-r--r-- | components/MenuButton.qml | 2 | ||||
| -rw-r--r-- | components/Style.qml | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | images/card-background-black0.png (renamed from images/card-background-black.png) | bin | 24232 -> 24232 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | images/card-background-black0@2x.png (renamed from images/card-background-black@2x.png) | bin | 70165 -> 70165 bytes | |||
| -rw-r--r-- | images/card-background-black1.png | bin | 0 -> 19445 bytes | |||
| -rw-r--r-- | images/card-background-black1@2x.png | bin | 0 -> 53747 bytes | |||
| -rw-r--r-- | images/card-background-black2.png | bin | 0 -> 19317 bytes | |||
| -rw-r--r-- | images/card-background-black2@2x.png | bin | 0 -> 53662 bytes | |||
| -rw-r--r-- | images/card-background-black3.png | bin | 0 -> 19611 bytes | |||
| -rw-r--r-- | images/card-background-black3@2x.png | bin | 0 -> 54040 bytes | |||
| -rw-r--r-- | images/card-background-black4.png | bin | 0 -> 19292 bytes | |||
| -rw-r--r-- | images/card-background-black4@2x.png | bin | 0 -> 53125 bytes | |||
| -rw-r--r-- | images/card-background-black5.png | bin | 0 -> 19446 bytes | |||
| -rw-r--r-- | images/card-background-black5@2x.png | bin | 0 -> 53691 bytes | |||
| -rw-r--r-- | images/card-background-black6.png | bin | 0 -> 19587 bytes | |||
| -rw-r--r-- | images/card-background-black6@2x.png | bin | 0 -> 54142 bytes | |||
| -rw-r--r-- | images/card-background-black7.png | bin | 0 -> 7133 bytes | |||
| -rw-r--r-- | images/card-background-black7@2x.png | bin | 0 -> 17787 bytes | |||
| -rw-r--r-- | pages/Account.qml | 2 | ||||
| -rw-r--r-- | pages/Receive.qml | 3 | ||||
| -rw-r--r-- | qml.qrc | 18 |
22 files changed, 24 insertions, 6 deletions
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-black0.png Binary files differindex 2aa5c46d..2aa5c46d 100755..100644 --- a/images/card-background-black.png +++ b/images/card-background-black0.png diff --git a/images/card-background-black@2x.png b/images/card-background-black0@2x.png Binary files differindex 9e68d910..9e68d910 100755..100644 --- a/images/card-background-black@2x.png +++ b/images/card-background-black0@2x.png diff --git a/images/card-background-black1.png b/images/card-background-black1.png Binary files differnew file mode 100644 index 00000000..4c26a225 --- /dev/null +++ b/images/card-background-black1.png diff --git a/images/card-background-black1@2x.png b/images/card-background-black1@2x.png Binary files differnew file mode 100644 index 00000000..4289d331 --- /dev/null +++ b/images/card-background-black1@2x.png diff --git a/images/card-background-black2.png b/images/card-background-black2.png Binary files differnew file mode 100644 index 00000000..1e9a3d74 --- /dev/null +++ b/images/card-background-black2.png diff --git a/images/card-background-black2@2x.png b/images/card-background-black2@2x.png Binary files differnew file mode 100644 index 00000000..54224feb --- /dev/null +++ b/images/card-background-black2@2x.png diff --git a/images/card-background-black3.png b/images/card-background-black3.png Binary files differnew file mode 100644 index 00000000..d580b8d1 --- /dev/null +++ b/images/card-background-black3.png diff --git a/images/card-background-black3@2x.png b/images/card-background-black3@2x.png Binary files differnew file mode 100644 index 00000000..b87bdeea --- /dev/null +++ b/images/card-background-black3@2x.png diff --git a/images/card-background-black4.png b/images/card-background-black4.png Binary files differnew file mode 100644 index 00000000..0979de87 --- /dev/null +++ b/images/card-background-black4.png diff --git a/images/card-background-black4@2x.png b/images/card-background-black4@2x.png Binary files differnew file mode 100644 index 00000000..9f3ea05d --- /dev/null +++ b/images/card-background-black4@2x.png diff --git a/images/card-background-black5.png b/images/card-background-black5.png Binary files differnew file mode 100644 index 00000000..d6206f23 --- /dev/null +++ b/images/card-background-black5.png diff --git a/images/card-background-black5@2x.png b/images/card-background-black5@2x.png Binary files differnew file mode 100644 index 00000000..d70b0f01 --- /dev/null +++ b/images/card-background-black5@2x.png diff --git a/images/card-background-black6.png b/images/card-background-black6.png Binary files differnew file mode 100644 index 00000000..e6739abc --- /dev/null +++ b/images/card-background-black6.png diff --git a/images/card-background-black6@2x.png b/images/card-background-black6@2x.png Binary files differnew file mode 100644 index 00000000..1760fa8e --- /dev/null +++ b/images/card-background-black6@2x.png diff --git a/images/card-background-black7.png b/images/card-background-black7.png Binary files differnew file mode 100644 index 00000000..ab11744e --- /dev/null +++ b/images/card-background-black7.png diff --git a/images/card-background-black7@2x.png b/images/card-background-black7@2x.png Binary files differnew file mode 100644 index 00000000..cb700997 --- /dev/null +++ b/images/card-background-black7@2x.png 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 } @@ -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/card-background-black@2x.png</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/card-background-black0@2x.png</file> + <file>images/card-background-black1@2x.png</file> + <file>images/card-background-black2@2x.png</file> + <file>images/card-background-black3@2x.png</file> + <file>images/card-background-black4@2x.png</file> + <file>images/card-background-black5@2x.png</file> + <file>images/card-background-black6@2x.png</file> + <file>images/card-background-black7@2x.png</file> <file>images/card-background-white.png</file> <file>images/card-background-white@2x.png</file> <file>images/moneroLogo_white.png</file> |
