emitting signals from Qts Accessibility interaction invocations instead of duplicatin...

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>

diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index a805a04f5177b11be0be27641fd553b26c724966..d4e8e2edd3b5b7db9bd3e34784385d6b52f1b12c 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -130,9 +130,7 @@ MenuItem {
 \r
                 Accessible.role: Accessible.ButtonMenu\r
                 Accessible.name: qsTr("Account actions")\r
-                Accessible.onPressAction: {\r
-                    userMoreButtonMenu.popup()\r
-                }\r
+                Accessible.onPressAction: userMoreButtonMouseArea.clicked()\r
 \r
                 MouseArea {\r
                     id: userMoreButtonMouseArea\r
@@ -187,12 +185,17 @@ MenuItem {
                         Accessible.name: isConnected ? qsTr("Log out") : qsTr("Log in")\r
 \r
                         onPressed: {\r
-                            isConnected ? UserModel.logout(index) : UserModel.login(index)\r
+                            if (isConnected) {\r
+                                UserModel.logout(index)\r
+                            } else {\r
+                                UserModel.login(index)\r
+                            }\r
                             accountMenu.close()\r
                         }\r
                     }\r
 \r
                     MenuItem {\r
+                        id: removeAccountButton\r
                         text: qsTr("Remove account")\r
                         font.pixelSize: Style.topLinePixelSize\r
                         hoverEnabled: true\r
@@ -213,11 +216,7 @@ MenuItem {
 \r
                         Accessible.role: Accessible.Button\r
                         Accessible.name: text\r
-\r
-                        Accessible.onPressAction: {\r
-                            UserModel.removeAccount(index)\r
-                            accountMenu.close()\r
-                        }\r
+                        Accessible.onPressAction: removeAccountButton.clicked()\r
                     }\r
                 }\r
             }\r

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 213739f8bca265247320ba3519c5ed3ff38e2c88..8107fd0d7942ec69a12cadd30d64330f197541b3 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -139,10 +139,7 @@ Window {
 \r
                     Accessible.role: Accessible.ButtonMenu\r
                     Accessible.name: qsTr("Current account")\r
-                    Accessible.onPressAction: {\r
-                        syncPauseButton.text = Systray.syncIsPaused() ? qsTr("Resume sync for all") : qsTr("Pause sync for all")\r
-                        accountMenu.open()\r
-                    }\r
+                    Accessible.onPressAction: currentAccountButton.clicked()\r
 \r
                     MouseArea {\r
                         id: accountBtnMouseArea\r
@@ -244,9 +241,7 @@ Window {
 \r
                                 Accessible.role: Accessible.MenuItem\r
                                 Accessible.name: qsTr("Add new account")\r
-                                Accessible.onPressAction: {\r
-                                    Systray.pauseResumeSync()\r
-                                }\r
+                                Accessible.onPressAction: addAccountButton.clicked()\r
                             }\r
 \r
                             MenuSeparator {\r
@@ -274,12 +269,11 @@ Window {
 \r
                                 Accessible.role: Accessible.MenuItem\r
                                 Accessible.name: Systray.syncIsPaused() ? qsTr("Resume sync for all") : qsTr("Pause sync for all")\r
-                                Accessible.onPressAction: {\r
-                                    Systray.pauseResumeSync()\r
-                                }\r
+                                Accessible.onPressAction: syncPauseButton.clicked()\r
                             }\r
 \r
                             MenuItem {\r
+                                id: settingsButton\r
                                 text: qsTr("Settings")\r
                                 font.pixelSize: Style.topLinePixelSize\r
                                 hoverEnabled: true\r
@@ -297,12 +291,11 @@ Window {
 \r
                                 Accessible.role: Accessible.MenuItem\r
                                 Accessible.name: text\r
-                                Accessible.onPressAction: {\r
-                                    Systray.openSettings()\r
-                                }\r
+                                Accessible.onPressAction: settingsButton.clicked()\r
                             }\r
 \r
                             MenuItem {\r
+                                id: exitButton\r
                                 text: qsTr("Exit");\r
                                 font.pixelSize: Style.topLinePixelSize\r
                                 hoverEnabled: true\r
@@ -320,9 +313,7 @@ Window {
 \r
                                 Accessible.role: Accessible.MenuItem\r
                                 Accessible.name: text\r
-                                Accessible.onPressAction: {\r
-                                    Systray.shutdown()\r
-                                }\r
+                                Accessible.onPressAction: exitButton.clicked()\r
                             }\r
                         }\r
                     }\r
@@ -427,9 +418,7 @@ Window {
 \r
                     Accessible.role: Accessible.Button\r
                     Accessible.name: qsTr("Open local folder of current account")\r
-                    Accessible.onPressAction: {\r
-                        UserModel.openCurrentAccountLocalFolder()\r
-                    }\r
+                    Accessible.onPressAction: openLocalFolderButton.clicked()\r
                 }\r
 \r
                 HeaderButton {\r
@@ -441,9 +430,7 @@ Window {
 \r
                     Accessible.role: Accessible.Button\r
                     Accessible.name: qsTr("Open Nextcloud Talk in browser")\r
-                    Accessible.onPressAction: {\r
-                        UserModel.openCurrentAccountTalk()\r
-                    }\r
+                    Accessible.onPressAction: trayWindowTalkButton.clicked()\r
                 }\r
 \r
                 HeaderButton {\r
@@ -461,10 +448,7 @@ Window {
 \r
                     Accessible.role: Accessible.ButtonMenu\r
                     Accessible.name: qsTr("More apps")\r
-                    Accessible.onPressAction: {\r
-                        appsMenu.open();\r
-                        UserModel.openCurrentAccountServer();\r
-                    }\r
+                    Accessible.onPressAction: trayWindowAppsButton.clicked()\r
 \r
                     Menu {\r
                         id: appsMenu\r
@@ -509,9 +493,7 @@ Window {
 \r
                                 Accessible.role: Accessible.MenuItem\r
                                 Accessible.name: qsTr("Open ") + appName + qsTr(" in browser")\r
-                                Accessible.onPressAction: {\r
-                                    UserAppsModel.openAppUrl(appUrl)\r
-                                }\r
+                                Accessible.onPressAction: appEntry.triggered()\r
                             }\r
                         }\r
                     }\r
@@ -548,13 +530,7 @@ Window {
                 Accessible.role: Accessible.ListItem\r
                 Accessible.name: path !== "" ? qsTr("Open") + " " + displayPath + " " + qsTr("locally")\r
                                                     : message\r
-                Accessible.onPressAction: {\r
-                    if (path !== "") {\r
-                        Qt.openUrlExternally(path)\r
-                    } else {\r
-                        Qt.openUrlExternally(link)\r
-                    }\r
-                }\r
+                Accessible.onPressAction: activityMouseArea.clicked()\r
 \r
                 MouseArea {\r
                     id: activityMouseArea\r
@@ -667,9 +643,7 @@ Window {
 \r
                     Accessible.role: Accessible.Button\r
                     Accessible.name: qsTr("Share") + " " + displayPath\r
-                    Accessible.onPressAction: {\r
-                        Systray.openShareDialog(displayPath,absolutePath)\r
-                    }\r
+                    Accessible.onPressAction: shareButton.clicked()\r
                 }\r
             }\r
 \r