White theme

1 files changed, 73 insertions, 75 deletions

diff --git a/LeftPanel.qml b/LeftPanel.qml
index c48f62d1..6cb6059e 100644
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -26,13 +26,15 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.2
+import QtQuick 2.9
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 import moneroComponents.Wallet 1.0
 import moneroComponents.NetworkType 1.0
 import moneroComponents.Clipboard 1.0
+
 import "components" as MoneroComponents
+import "components/effects/" as MoneroEffects
 
 Rectangle {
     id: panel
@@ -86,13 +88,18 @@ Rectangle {
     anchors.bottom: parent.bottom
     anchors.top: parent.top
 
-    Image {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        height: panel.height
-        source: "images/leftPanelBg.jpg"
-        z: 1
+    MoneroEffects.GradientBackground {
+        anchors.fill: parent
+        fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor
+        initialStartColor: MoneroComponents.Style.leftPanelBackgroundGradientStart
+        initialStopColor: MoneroComponents.Style.leftPanelBackgroundGradientStop
+        blackColorStart: MoneroComponents.Style._b_leftPanelBackgroundGradientStart
+        blackColorStop: MoneroComponents.Style._b_leftPanelBackgroundGradientStop
+        whiteColorStart: MoneroComponents.Style._w_leftPanelBackgroundGradientStart
+        whiteColorStop: MoneroComponents.Style._w_leftPanelBackgroundGradientStop
+        posStart: 0.6
+        start: Qt.point(0, 0)
+        end: Qt.point(height, width)
     }
 
     // card with monero logo
@@ -107,7 +114,6 @@ Rectangle {
         anchors.topMargin: (persistentSettings.customDecorations)? 50 : 0
 
         RowLayout {
-            visible: true
             Item {
                 anchors.left: parent.left
                 anchors.top: parent.top
@@ -118,12 +124,27 @@ Rectangle {
                 width: 260 * scaleRatio
 
                 Image {
-                    width: 260; height: 170
+                    id: card
+                    visible: !isOpenGL || MoneroComponents.Style.blackTheme
+                    width: 260
+                    height: 170
                     fillMode: Image.PreserveAspectFit
-                    source: "images/card-background.png"
+                    source: "qrc:///images/card-background.png"
                 }
 
-                Text {
+                DropShadow {
+                    visible: isOpenGL && !MoneroComponents.Style.blackTheme
+                    anchors.fill: card
+                    horizontalOffset: 3
+                    verticalOffset: 3
+                    radius: 10.0
+                    samples: 15
+                    color: "#3B000000"
+                    source: card
+                    cached: true
+                }
+
+                MoneroComponents.TextPlain {
                     id: testnetLabel
                     visible: persistentSettings.nettype != NetworkType.MAINNET
                     text: (persistentSettings.nettype == NetworkType.TESTNET ? qsTr("Testnet") : qsTr("Stagenet")) + translationManager.emptyString
@@ -134,9 +155,10 @@ Rectangle {
                     font.bold: true
                     font.pixelSize: 12
                     color: "#f33434"
+                    themeTransition: false
                 }
 
-                Text {
+                MoneroComponents.TextPlain {
                     id: viewOnlyLabel
                     visible: viewOnly
                     text: qsTr("View Only") + translationManager.emptyString
@@ -147,6 +169,7 @@ Rectangle {
                     font.pixelSize: 12
                     font.bold: true
                     color: "#ff9323"
+                    themeTransition: false
                 }
 
                 Rectangle {
@@ -164,7 +187,7 @@ Rectangle {
                         anchors.horizontalCenter: parent.horizontalCenter
                         height: 16 * scaleRatio
                         width: 13 * scaleRatio
-                        source: "../images/logout.png"
+                        source: "qrc:///images/logout.png"
                     }
 
                     MouseArea{
@@ -190,9 +213,10 @@ Rectangle {
                 height: 490 * scaleRatio
                 width: 50 * scaleRatio
 
-                Text {
+                MoneroComponents.TextPlain {
                     visible: !isMobile
                     id: balanceText
+                    themeTransition: false
                     anchors.left: parent.left
                     anchors.leftMargin: 20
                     anchors.top: parent.top
@@ -228,9 +252,10 @@ Rectangle {
                     }
                 }
 
-                Text {
+                MoneroComponents.TextPlain {
                     id: unlockedBalanceText
                     visible: true
+                    themeTransition: false
                     anchors.left: parent.left
                     anchors.leftMargin: 20
                     anchors.top: parent.top
@@ -270,17 +295,20 @@ Rectangle {
                     id: unlockedBalanceLabel
                     visible: true
                     text: qsTr("Unlocked balance") + translationManager.emptyString
+                    color: "white"
                     fontSize: 14
                     anchors.left: parent.left
                     anchors.leftMargin: 20
                     anchors.top: parent.top
                     anchors.topMargin: 110
+                    themeTransition: false
                 }
 
                 MoneroComponents.Label {
                     visible: !isMobile
                     id: balanceLabel
                     text: qsTr("Balance") + translationManager.emptyString
+                    color: "white"
                     fontSize: 14
                     anchors.left: parent.left
                     anchors.leftMargin: 20
@@ -288,6 +316,7 @@ Rectangle {
                     anchors.topMargin: 60
                     elide: Text.ElideRight
                     textWidth: 238
+                    themeTransition: false
                 }
                 Item { //separator
                     anchors.left: parent.left
@@ -307,7 +336,6 @@ Rectangle {
         anchors.top: (isMobile)? parent.top : column1.bottom
         color: "transparent"
 
-
         Flickable {
             id:flicker
             contentHeight: menuColumn.height
@@ -317,7 +345,6 @@ Rectangle {
             clip: true
 
         Column {
-
             id: menuColumn
             anchors.left: parent.left
             anchors.right: parent.right
@@ -326,12 +353,10 @@ Rectangle {
             property var previousButton: transferButton
 
             // top border
-            Rectangle {
+            MoneroComponents.MenuButtonDivider {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
 
             // ------------- Account tab ---------------
@@ -349,13 +374,11 @@ Rectangle {
                 }
             }
 
-            Rectangle {
+            MoneroComponents.MenuButtonDivider {
                 visible: accountButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
 
             // ------------- Transfer tab ---------------
@@ -373,13 +396,11 @@ Rectangle {
                 }
             }
 
-            Rectangle {
+            MoneroComponents.MenuButtonDivider {
                 visible: transferButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
 
             // ------------- AddressBook tab ---------------
@@ -399,13 +420,11 @@ Rectangle {
                 }
             }
 
-            Rectangle {
+            MoneroComponents.MenuButtonDivider {
                 visible: addressBookButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
 
             // ------------- Receive tab ---------------
@@ -422,13 +441,12 @@ Rectangle {
                     panel.receiveClicked()
                 }
             }
-            Rectangle {
+
+            MoneroComponents.MenuButtonDivider {
                 visible: receiveButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
 
             // ------------- Merchant tab ---------------
@@ -449,13 +467,11 @@ Rectangle {
                 }
             }
 
-            Rectangle {
+            MoneroComponents.MenuButtonDivider {
                 visible: merchantButton.present && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
 
             // ------------- History tab ---------------
@@ -473,13 +489,12 @@ Rectangle {
                     panel.historyClicked()
                 }
             }
-            Rectangle {
+
+            MoneroComponents.MenuButtonDivider {
                 visible: historyButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
 
             // ------------- Advanced tab ---------------
@@ -497,13 +512,11 @@ Rectangle {
                 }
             }
 
-            Rectangle {
+            MoneroComponents.MenuButtonDivider {
                 visible: advancedButton.present && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
 
             // ------------- Mining tab ---------------
@@ -523,14 +536,13 @@ Rectangle {
                 }
             }
 
-            Rectangle {
+            MoneroComponents.MenuButtonDivider {
                 visible: miningButton.present && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: miningButton.checked || settingsButton.checked ? "#1C1C1C" : "#313131"
-                height: 1
             }
+
             // ------------- TxKey tab ---------------
             MoneroComponents.MenuButton {
                 id: txkeyButton
@@ -547,14 +559,14 @@ Rectangle {
                     panel.txkeyClicked()
                 }
             }
-            Rectangle {
+
+            MoneroComponents.MenuButtonDivider {
                 visible: txkeyButton.present && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
+
             // ------------- Shared RingDB tab ---------------
             MoneroComponents.MenuButton {
                 id: sharedringdbButton
@@ -571,16 +583,14 @@ Rectangle {
                     panel.sharedringdbClicked()
                 }
             }
-            Rectangle {
+
+            MoneroComponents.MenuButtonDivider {
                 visible: sharedringdbButton.present && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
 
-
             // ------------- Sign/verify tab ---------------
             MoneroComponents.MenuButton {
                 id: signButton
@@ -597,14 +607,14 @@ Rectangle {
                     panel.signClicked()
                 }
             }
-            Rectangle {
+
+            MoneroComponents.MenuButtonDivider {
                 visible: signButton.present && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
+
             // ------------- Settings tab ---------------
             MoneroComponents.MenuButton {
                 id: settingsButton
@@ -619,14 +629,14 @@ Rectangle {
                     panel.settingsClicked()
                 }
             }
-            Rectangle {
+
+            MoneroComponents.MenuButtonDivider {
                 visible: settingsButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
+
             // ------------- Sign/verify tab ---------------
             MoneroComponents.MenuButton {
                 id: keysButton
@@ -643,13 +653,12 @@ Rectangle {
                     panel.keysClicked()
                 }
             }
-            Rectangle {
-                visible: settingsButton.present && appWindow.walletMode >= 2
+
+            MoneroComponents.MenuButtonDivider {
+                visible: settingsButton.present && settingsButton.checked && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
             }
 
         } // Column
@@ -697,16 +706,5 @@ Rectangle {
             visible: networkStatus.connected
             height: 62 * scaleRatio
         }
-    } // menuRect
-
-
-
-    // indicate disabled state
-//    Desaturate {
-//        anchors.fill: parent
-//        source: parent
-//        desaturation: panel.enabled ? 0.0 : 1.0
-//    }
-
-
+    }
 }