White theme

1 files changed, 20 insertions, 9 deletions

diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
index e292603b..eed71fa4 100644
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -26,14 +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.7
+import QtQuick 2.9
 import QtQuick.Controls 2.0
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Window 2.0
 
-import "../components" as MoneroComponents
+import "." as MoneroComponents
+import "effects/" as MoneroEffects
 import "../js/Utils.js" as Utils
 
 Item {
@@ -62,7 +63,9 @@ Item {
         errorTextLabel.text = errorText ? errorText : "";
         leftPanel.enabled = false
         middlePanel.enabled = false
-        titleBar.enabled = false
+
+        titleBar.state = "essentials"
+        show()
         root.visible = true;
         passwordInput.forceActiveFocus();
         passwordInput.text = ""
@@ -78,7 +81,8 @@ Item {
         inactiveOverlay.visible = false
         leftPanel.enabled = true
         middlePanel.enabled = true
-        titleBar.enabled = true
+        titleBar.state = "default"
+
         root.visible = false;
         appWindow.hideBalanceForced = false;
         appWindow.updateBalance();
@@ -133,8 +137,8 @@ Item {
                 leftPadding: 10
                 topPadding: 10
                 color: MoneroComponents.Style.defaultFontColor
-                selectionColor: MoneroComponents.Style.dimmedFontColor
-                selectedTextColor: MoneroComponents.Style.defaultFontColor
+                selectionColor: MoneroComponents.Style.textSelectionColor
+                selectedTextColor: MoneroComponents.Style.textSelectedColor
 
                 onTextChanged: {
                     var letter = text[passwordInput.text.length - 1];
@@ -149,19 +153,26 @@ Item {
 
                 background: Rectangle {
                     radius: 2
-                    border.color: Qt.rgba(255, 255, 255, 0.35)
+                    color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
+                    border.color: MoneroComponents.Style.inputBorderColorInActive
                     border.width: 1
-                    color: "black"
+
+                    MoneroEffects.ColorTransition {
+                        targetObj: parent
+                        blackColor: "black"
+                        whiteColor: "#A9FFFFFF"
+                    }
 
                     Image {
                         width: 26 * scaleRatio
                         height: 26 * scaleRatio
                         opacity: 0.7
                         fillMode: Image.PreserveAspectFit
-                        source: isHidden ? "../images/eyeShow.png" : "../images/eyeHide.png"
+                        source: isHidden ? "qrc:///images/eyeShow.png" : "qrc:///images/eyeHide.png"
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.right: parent.right
                         anchors.rightMargin: 20
+
                         MouseArea {
                             anchors.fill: parent
                             cursorShape: Qt.PointingHandCursor