]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Streamlined 'Add account' button with account entries
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Sat, 11 Jan 2020 19:28:00 +0000 (20:28 +0100)
committerDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Sat, 11 Jan 2020 19:28:00 +0000 (20:28 +0100)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
src/gui/tray/Window.qml
theme.qrc
theme/black/add.svg [new file with mode: 0644]
theme/white/add.svg [new file with mode: 0644]

index 4cea7dd6dd17497bd44af7e42b7f1928dec9a68d..4c8072e84a68ff2979fbe305c13a741d6bc6ae46 100644 (file)
@@ -128,7 +128,32 @@ Window {
                             }\r
 \r
                             MenuItem {\r
-                                text: "Add account"\r
+                                id: addAccountButton\r
+                                height: 60\r
+\r
+                                RowLayout {\r
+                                    width: addAccountButton.width\r
+                                    height: addAccountButton.height\r
+                                    spacing: 0\r
+\r
+                                    Image {\r
+                                        Layout.leftMargin: 8\r
+                                        verticalAlignment: Qt.AlignCenter\r
+                                        source: "qrc:///client/theme/black/add.svg"\r
+                                        sourceSize.width: addAccountButton.height - 24\r
+                                        sourceSize.height: addAccountButton.height - 24\r
+                                    }\r
+                                    Label {\r
+                                        Layout.leftMargin: 10\r
+                                        text: "Add account"\r
+                                        color: "black"\r
+                                        font.pixelSize: 12\r
+                                    }\r
+                                    Item {\r
+                                        Layout.fillWidth: true\r
+                                        Layout.fillHeight: true\r
+                                    }\r
+                                }\r
                                 onClicked: userModelBackend.addAccount()\r
                             }\r
 \r
index 710ef0ff2a15ccc3cd1bdde19d679c1bc04c68e1..42bda010fd40e6a63fa00e35b1aab21168b7f8d5 100644 (file)
--- a/theme.qrc
+++ b/theme.qrc
         <file>theme/black/caret-down.svg</file>
         <file>theme/white/user.svg</file>
         <file>theme/black/user.svg</file>
+        <file>theme/white/add.svg</file>
+        <file>theme/black/add.svg</file>
     </qresource>
 </RCC>
diff --git a/theme/black/add.svg b/theme/black/add.svg
new file mode 100644 (file)
index 0000000..4b2d213
--- /dev/null
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path fill="#000" d="M9.02 13.98h-2v-5h-5v-2h5v-5h2v5l5-.028V8.98h-5z"/></svg>
\ No newline at end of file
diff --git a/theme/white/add.svg b/theme/white/add.svg
new file mode 100644 (file)
index 0000000..0604ed0
--- /dev/null
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path fill="#fff" d="M9.02 13.98h-2v-5h-5v-2h5v-5h2v5l5-.028V8.98h-5z"/></svg>
\ No newline at end of file