From 7e9122e3d13bf1d78f71ad70bc9cbcf2eb310d0b Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 5 Jun 2015 13:15:18 -0700 Subject: [PATCH] Replace login background SVGs with QML rectangles --- interface/resources/images/login-circle.svg | 3 --- interface/resources/images/login-rectangle.svg | 3 --- interface/resources/qml/LoginDialog.qml | 14 ++++++++++---- 3 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 interface/resources/images/login-circle.svg delete mode 100644 interface/resources/images/login-rectangle.svg diff --git a/interface/resources/images/login-circle.svg b/interface/resources/images/login-circle.svg deleted file mode 100644 index 8a98902e6b..0000000000 --- a/interface/resources/images/login-circle.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -2015-06-02 19:43ZCanvas 1Login Circle diff --git a/interface/resources/images/login-rectangle.svg b/interface/resources/images/login-rectangle.svg deleted file mode 100644 index 774baf8193..0000000000 --- a/interface/resources/images/login-rectangle.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -2015-06-02 19:42ZCanvas 1Login2 diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml index 0fa6ff43cc..aa6cbb162d 100644 --- a/interface/resources/qml/LoginDialog.qml +++ b/interface/resources/qml/LoginDialog.qml @@ -48,12 +48,15 @@ Dialog { property int maximumY: parent ? parent.height - height : 0 property real tan30: 0.577 // tan(30°) - Image { + Rectangle { id: circularBackground visible: isCircular() - source: "../images/login-circle.svg" width: loginDialog.inputWidth * 1.2 height: width + radius: width / 2 + + color: "#2c86b1" + opacity: 0.85 Item { // Approximage circle with 3 rectangles that together contain the circle in a hexagon. @@ -119,12 +122,15 @@ Dialog { } } - Image { + Rectangle { id: rectangularBackground visible: !isCircular() - source: "../images/login-rectangle.svg" width: loginDialog.inputWidth + loginDialog.borderWidth * 2 height: loginDialog.inputHeight * 6 + loginDialog.closeMargin * 2 + radius: loginDialog.closeMargin * 2 + + color: "#2c86b1" + opacity: 0.85 MouseArea { width: parent.width