Use different colors for different subaccounts

This commit is contained in:
rating89us 2022-09-25 11:12:38 +02:00 committed by malinero
parent 57fefba386
commit b801ef594b
22 changed files with 24 additions and 6 deletions

View file

@ -120,7 +120,7 @@ Rectangle {
width: 260 width: 260
height: 135 height: 135
fillMode: Image.PreserveAspectFit 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 { DropShadow {

View file

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

View file

@ -81,6 +81,7 @@ QtObject {
property string leftPanelBackgroundGradientStart: blackTheme ? _b_leftPanelBackgroundGradientStart : _w_leftPanelBackgroundGradientStart property string leftPanelBackgroundGradientStart: blackTheme ? _b_leftPanelBackgroundGradientStart : _w_leftPanelBackgroundGradientStart
property string leftPanelBackgroundGradientStop: blackTheme ? _b_leftPanelBackgroundGradientStop : _w_leftPanelBackgroundGradientStop property string leftPanelBackgroundGradientStop: blackTheme ? _b_leftPanelBackgroundGradientStop : _w_leftPanelBackgroundGradientStop
property string historyHeaderTextColor: blackTheme ? _b_historyHeaderTextColor : _w_historyHeaderTextColor property string historyHeaderTextColor: blackTheme ? _b_historyHeaderTextColor : _w_historyHeaderTextColor
property var accountColors: blackTheme ? _b_accountColors : _w_accountColors
property string _b_defaultFontColor: "white" property string _b_defaultFontColor: "white"
property string _b_dimmedFontColor: "#BBBBBB" property string _b_dimmedFontColor: "#BBBBBB"
@ -142,6 +143,7 @@ QtObject {
property string _b_leftPanelBackgroundGradientStart: "#222222" property string _b_leftPanelBackgroundGradientStart: "#222222"
property string _b_leftPanelBackgroundGradientStop: "#1a1a1a" property string _b_leftPanelBackgroundGradientStop: "#1a1a1a"
property string _b_historyHeaderTextColor: "#C0C0C0" 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_defaultFontColor: "black"
property string _w_dimmedFontColor: "#3f3f3f" property string _w_dimmedFontColor: "#3f3f3f"
@ -203,4 +205,5 @@ QtObject {
property string _w_leftPanelBackgroundGradientStart: "white" property string _w_leftPanelBackgroundGradientStart: "white"
property string _w_leftPanelBackgroundGradientStop: "#f5f5f5" property string _w_leftPanelBackgroundGradientStop: "#f5f5f5"
property string _w_historyHeaderTextColor: "#515151" property string _w_historyHeaderTextColor: "#515151"
property var _w_accountColors: ["#6E513C", "#6E513C", "#842129", "#458421", "#742184", "#291DBE", "#846F21", "#217F84", "#696969"]
} }

View file

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View file

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View file

@ -238,7 +238,7 @@ Rectangle {
Layout.fillHeight: true Layout.fillHeight: true
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
color: "darkgrey" color: MoneroComponents.Style.accountColors[currentAccountIndex % MoneroComponents.Style.accountColors.length]
width: 2 width: 2
} }

View file

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

18
qml.qrc
View file

@ -119,8 +119,22 @@
<file>components/RemoteNodeEdit.qml</file> <file>components/RemoteNodeEdit.qml</file>
<file>pages/Keys.qml</file> <file>pages/Keys.qml</file>
<file>images/appicon.ico</file> <file>images/appicon.ico</file>
<file>images/card-background-black.png</file> <file>images/card-background-black0.png</file>
<file>images/card-background-black@2x.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.png</file>
<file>images/card-background-white@2x.png</file> <file>images/card-background-white@2x.png</file>
<file>images/moneroLogo_white.png</file> <file>images/moneroLogo_white.png</file>