Use standard icon for addAccountButton, fixing sizing

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml
index 34ab12ad916deb96a2352cde4cfe78436291256d..38ef8a8f423c3feacc9ca66a05cf7342b17ef086 100644 (file)
--- a/src/gui/tray/MainWindow.qml
+++ b/src/gui/tray/MainWindow.qml
@@ -319,48 +319,26 @@ ApplicationWindow {
                             onObjectRemoved: accountMenu.removeItem(object)\r
                         }\r
 \r
+                        Rectangle {\r
+                            anchors.left: parent.left\r
+                            anchors.right: parent.right\r
+                            implicitHeight: 1\r
+                            color: palette.dark\r
+                        }\r
+\r
                         MenuItem {\r
                             id: addAccountButton\r
                             height: Systray.enableAddAccount ? Style.addAccountButtonHeight : 0\r
                             hoverEnabled: true\r
                             visible: Systray.enableAddAccount\r
 \r
-                            RowLayout {\r
-                                anchors.fill: parent\r
-                                spacing: 0\r
-\r
-                                Image {\r
-                                    Layout.leftMargin: Style.accountIconsMenuMargin\r
-                                    verticalAlignment: Qt.AlignVCenter\r
-                                    horizontalAlignment: Qt.AlignCenter\r
-                                    source: "image://svgimage-custom-color/add.svg/" + palette.windowText\r
-                                    sourceSize.width: Style.addButtonIconSize\r
-                                    sourceSize.height: Style.addButtonIconSize\r
-                                }\r
-                                EnforcedPlainTextLabel {\r
-                                    Layout.leftMargin: 14\r
-                                    text: qsTr("Add account")\r
-                                    font.pixelSize: Style.topLinePixelSize\r
-                                }\r
-                                // Filler on the right\r
-                                Item {\r
-                                    Layout.fillWidth: true\r
-                                    Layout.fillHeight: true\r
-                                }\r
-                            }\r
+                            icon.source: "image://svgimage-custom-color/add.svg/" + palette.windowText\r
+                            text: qsTr("Add account") \r
                             onClicked: UserModel.addAccount()\r
 \r
                             Accessible.role: Accessible.MenuItem\r
                             Accessible.name: qsTr("Add new account")\r
                             Accessible.onPressAction: addAccountButton.clicked()\r
-\r
-                        }\r
-\r
-                        Rectangle {\r
-                            anchors.left: parent.left\r
-                            anchors.right: parent.right\r
-                            implicitHeight: 1\r
-                            color: palette.dark\r
                         }\r
 \r
                         MenuItem {\r
@@ -371,7 +349,6 @@ ApplicationWindow {
                             Accessible.role: Accessible.MenuItem\r
                             Accessible.name: Systray.syncIsPaused ? qsTr("Resume sync for all") : qsTr("Pause sync for all")\r
                             Accessible.onPressAction: syncPauseButton.clicked()\r
-\r
                         }\r
 \r
                         MenuItem {\r
@@ -383,7 +360,6 @@ ApplicationWindow {
                             Accessible.role: Accessible.MenuItem\r
                             Accessible.name: text\r
                             Accessible.onPressAction: settingsButton.clicked()\r
-\r
                         }\r
 \r
                         MenuItem {\r