From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Date: Tue, 15 Sep 2020 14:45:22 +0000 (+0200)
Subject: emitting signals from Qts Accessibility interaction invocations instead of duplicatin... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~141^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b96b7e20c79f83e76f046dbc60c27708e2646195;p=nextcloud-desktop.git

emitting signals from Qts Accessibility interaction invocations instead of duplicating actions

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 a805a04f5..d4e8e2edd 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -130,9 +130,7 @@ MenuItem {
 
                 Accessible.role: Accessible.ButtonMenu
                 Accessible.name: qsTr("Account actions")
-                Accessible.onPressAction: {
-                    userMoreButtonMenu.popup()
-                }
+                Accessible.onPressAction: userMoreButtonMouseArea.clicked()
 
                 MouseArea {
                     id: userMoreButtonMouseArea
@@ -187,12 +185,17 @@ MenuItem {
                         Accessible.name: isConnected ? qsTr("Log out") : qsTr("Log in")
 
                         onPressed: {
-                            isConnected ? UserModel.logout(index) : UserModel.login(index)
+                            if (isConnected) {
+                                UserModel.logout(index)
+                            } else {
+                                UserModel.login(index)
+                            }
                             accountMenu.close()
                         }
                     }
 
                     MenuItem {
+                        id: removeAccountButton
                         text: qsTr("Remove account")
                         font.pixelSize: Style.topLinePixelSize
                         hoverEnabled: true
@@ -213,11 +216,7 @@ MenuItem {
 
                         Accessible.role: Accessible.Button
                         Accessible.name: text
-
-                        Accessible.onPressAction: {
-                            UserModel.removeAccount(index)
-                            accountMenu.close()
-                        }
+                        Accessible.onPressAction: removeAccountButton.clicked()
                     }
                 }
             }
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 213739f8b..8107fd0d7 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -139,10 +139,7 @@ Window {
 
                     Accessible.role: Accessible.ButtonMenu
                     Accessible.name: qsTr("Current account")
-                    Accessible.onPressAction: {
-                        syncPauseButton.text = Systray.syncIsPaused() ? qsTr("Resume sync for all") : qsTr("Pause sync for all")
-                        accountMenu.open()
-                    }
+                    Accessible.onPressAction: currentAccountButton.clicked()
 
                     MouseArea {
                         id: accountBtnMouseArea
@@ -244,9 +241,7 @@ Window {
 
                                 Accessible.role: Accessible.MenuItem
                                 Accessible.name: qsTr("Add new account")
-                                Accessible.onPressAction: {
-                                    Systray.pauseResumeSync()
-                                }
+                                Accessible.onPressAction: addAccountButton.clicked()
                             }
 
                             MenuSeparator {
@@ -274,12 +269,11 @@ Window {
 
                                 Accessible.role: Accessible.MenuItem
                                 Accessible.name: Systray.syncIsPaused() ? qsTr("Resume sync for all") : qsTr("Pause sync for all")
-                                Accessible.onPressAction: {
-                                    Systray.pauseResumeSync()
-                                }
+                                Accessible.onPressAction: syncPauseButton.clicked()
                             }
 
                             MenuItem {
+                                id: settingsButton
                                 text: qsTr("Settings")
                                 font.pixelSize: Style.topLinePixelSize
                                 hoverEnabled: true
@@ -297,12 +291,11 @@ Window {
 
                                 Accessible.role: Accessible.MenuItem
                                 Accessible.name: text
-                                Accessible.onPressAction: {
-                                    Systray.openSettings()
-                                }
+                                Accessible.onPressAction: settingsButton.clicked()
                             }
 
                             MenuItem {
+                                id: exitButton
                                 text: qsTr("Exit");
                                 font.pixelSize: Style.topLinePixelSize
                                 hoverEnabled: true
@@ -320,9 +313,7 @@ Window {
 
                                 Accessible.role: Accessible.MenuItem
                                 Accessible.name: text
-                                Accessible.onPressAction: {
-                                    Systray.shutdown()
-                                }
+                                Accessible.onPressAction: exitButton.clicked()
                             }
                         }
                     }
@@ -427,9 +418,7 @@ Window {
 
                     Accessible.role: Accessible.Button
                     Accessible.name: qsTr("Open local folder of current account")
-                    Accessible.onPressAction: {
-                        UserModel.openCurrentAccountLocalFolder()
-                    }
+                    Accessible.onPressAction: openLocalFolderButton.clicked()
                 }
 
                 HeaderButton {
@@ -441,9 +430,7 @@ Window {
 
                     Accessible.role: Accessible.Button
                     Accessible.name: qsTr("Open Nextcloud Talk in browser")
-                    Accessible.onPressAction: {
-                        UserModel.openCurrentAccountTalk()
-                    }
+                    Accessible.onPressAction: trayWindowTalkButton.clicked()
                 }
 
                 HeaderButton {
@@ -461,10 +448,7 @@ Window {
 
                     Accessible.role: Accessible.ButtonMenu
                     Accessible.name: qsTr("More apps")
-                    Accessible.onPressAction: {
-                        appsMenu.open();
-                        UserModel.openCurrentAccountServer();
-                    }
+                    Accessible.onPressAction: trayWindowAppsButton.clicked()
 
                     Menu {
                         id: appsMenu
@@ -509,9 +493,7 @@ Window {
 
                                 Accessible.role: Accessible.MenuItem
                                 Accessible.name: qsTr("Open ") + appName + qsTr(" in browser")
-                                Accessible.onPressAction: {
-                                    UserAppsModel.openAppUrl(appUrl)
-                                }
+                                Accessible.onPressAction: appEntry.triggered()
                             }
                         }
                     }
@@ -548,13 +530,7 @@ Window {
                 Accessible.role: Accessible.ListItem
                 Accessible.name: path !== "" ? qsTr("Open") + " " + displayPath + " " + qsTr("locally")
                                                     : message
-                Accessible.onPressAction: {
-                    if (path !== "") {
-                        Qt.openUrlExternally(path)
-                    } else {
-                        Qt.openUrlExternally(link)
-                    }
-                }
+                Accessible.onPressAction: activityMouseArea.clicked()
 
                 MouseArea {
                     id: activityMouseArea
@@ -667,9 +643,7 @@ Window {
 
                     Accessible.role: Accessible.Button
                     Accessible.name: qsTr("Share") + " " + displayPath
-                    Accessible.onPressAction: {
-                        Systray.openShareDialog(displayPath,absolutePath)
-                    }
+                    Accessible.onPressAction: shareButton.clicked()
                 }
             }