KISS. Removed description for now, instead clarified some Accessible.name

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 89297344d014ddb04d275731dd9d3fdabdee31a8..a805a04f5177b11be0be27641fd553b26c724966 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -13,7 +13,6 @@ MenuItem {
 \r
     Accessible.role: Accessible.MenuItem\r
     Accessible.name: qsTr("Account entry")\r
-    Accessible.description: qsTr("Menu entry corresponding to a specific account")\r
 \r
         RowLayout {\r
             id: userLineLayout\r
@@ -30,8 +29,7 @@ MenuItem {
                 flat: true\r
 \r
                 Accessible.role: Accessible.Button\r
-                Accessible.name: name\r
-                Accessible.description: qsTr("Account button, selecting the corresponding account as active when clicked")\r
+                Accessible.name: qsTr("Switch to account") + " " + name\r
 \r
                 MouseArea {\r
                     anchors.fill: parent\r
@@ -91,8 +89,7 @@ MenuItem {
                             sourceSize.height: Style.accountAvatarStateIndicatorSize\r
 \r
                             Accessible.role: Accessible.Indicator\r
-                            Accessible.name: isConnected ? qsTr("Connected") : qsTr("Disconnected")\r
-                            Accessible.description: qsTr("Icon that indicates current connection state for the corresponding account")\r
+                            Accessible.name: isConnected ? qsTr("Account connected") : qsTr("Account not connected")\r
                         }\r
                     }\r
 \r
@@ -132,8 +129,7 @@ MenuItem {
                 icon.color: "transparent"\r
 \r
                 Accessible.role: Accessible.ButtonMenu\r
-                Accessible.name: qsTr("More")\r
-                Accessible.description: qsTr("Menu button providing more account actions when clicked")\r
+                Accessible.name: qsTr("Account actions")\r
                 Accessible.onPressAction: {\r
                     userMoreButtonMenu.popup()\r
                 }\r
@@ -189,7 +185,6 @@ MenuItem {
 \r
                         Accessible.role: Accessible.Button\r
                         Accessible.name: isConnected ? qsTr("Log out") : qsTr("Log in")\r
-                        Accessible.description: qsTr("Logs user account in or out depending on current connection state")\r
 \r
                         onPressed: {\r
                             isConnected ? UserModel.logout(index) : UserModel.login(index)\r
@@ -198,7 +193,7 @@ MenuItem {
                     }\r
 \r
                     MenuItem {\r
-                        text: qsTr("Remove Account")\r
+                        text: qsTr("Remove account")\r
                         font.pixelSize: Style.topLinePixelSize\r
                         hoverEnabled: true\r
                         onClicked: {\r
@@ -217,8 +212,7 @@ MenuItem {
                         }\r
 \r
                         Accessible.role: Accessible.Button\r
-                        Accessible.name: qsTr("Remove Account")\r
-                        Accessible.description: qsTr("Permanently removes account from Nextcloud client configuration")\r
+                        Accessible.name: text\r
 \r
                         Accessible.onPressAction: {\r
                             UserModel.removeAccount(index)\r

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 2cc8996e0825dcd897c45cdb31d6d3111afbae0a..213739f8bca265247320ba3519c5ed3ff38e2c88 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -22,7 +22,7 @@ Window {
     readonly property int maxMenuHeight: Style.trayWindowHeight - Style.trayWindowHeaderHeight - 2 * Style.trayWindowBorderWidth\r
 \r
     Accessible.role: Accessible.Application\r
-    Accessible.name: qsTr("Nextcloud client tray window")\r
+    Accessible.name: qsTr("Nextcloud desktop main dialog")\r
 \r
     // Close tray window when focus is lost (e.g. click somewhere else on the screen)\r
     onActiveChanged: {\r
@@ -100,7 +100,7 @@ Window {
         border.color:   Style.menuBorder\r
 \r
         Accessible.role: Accessible.Grouping\r
-        Accessible.name: qsTr("Nextcloud client tray window")\r
+        Accessible.name: qsTr("Nextcloud desktop main dialog")\r
 \r
         Rectangle {\r
             id: trayWindowHeaderBackground\r
@@ -139,7 +139,6 @@ Window {
 \r
                     Accessible.role: Accessible.ButtonMenu\r
                     Accessible.name: qsTr("Current account")\r
-                    Accessible.description: qsTr("Shows the currently selected account and opens a dropdown list for all accounts when clicked")\r
                     Accessible.onPressAction: {\r
                         syncPauseButton.text = Systray.syncIsPaused() ? qsTr("Resume sync for all") : qsTr("Pause sync for all")\r
                         accountMenu.open()\r
@@ -186,8 +185,7 @@ Window {
                             }\r
 \r
                             Accessible.role: PopupMenu\r
-                            Accessible.name: qsTr("Account menu")\r
-                            Accessible.description: qsTr("Popup menu showing a list of accounts and general client actions")\r
+                            Accessible.name: qsTr("Account switcher and settings menu")\r
 \r
                             onClosed: {\r
                                 // HACK: reload account Instantiator immediately by restting it - could be done better I guess\r
@@ -246,7 +244,6 @@ Window {
 \r
                                 Accessible.role: Accessible.MenuItem\r
                                 Accessible.name: qsTr("Add new account")\r
-                                Accessible.description: qsTr("Opens setup window to add a new account connection")\r
                                 Accessible.onPressAction: {\r
                                     Systray.pauseResumeSync()\r
                                 }\r
@@ -277,7 +274,6 @@ Window {
 \r
                                 Accessible.role: Accessible.MenuItem\r
                                 Accessible.name: Systray.syncIsPaused() ? qsTr("Resume sync for all") : qsTr("Pause sync for all")\r
-                                Accessible.description: qsTr("Button that pauses or resumes sync activity")\r
                                 Accessible.onPressAction: {\r
                                     Systray.pauseResumeSync()\r
                                 }\r
@@ -301,7 +297,6 @@ Window {
 \r
                                 Accessible.role: Accessible.MenuItem\r
                                 Accessible.name: text\r
-                                Accessible.description: qsTr("Button that opens the client settings window")\r
                                 Accessible.onPressAction: {\r
                                     Systray.openSettings()\r
                                 }\r
@@ -325,7 +320,6 @@ Window {
 \r
                                 Accessible.role: Accessible.MenuItem\r
                                 Accessible.name: text\r
-                                Accessible.description: qsTr("Quits the nextcloud client application")\r
                                 Accessible.onPressAction: {\r
                                     Systray.shutdown()\r
                                 }\r
@@ -379,7 +373,6 @@ Window {
 \r
                                 Accessible.role: Accessible.Indicator\r
                                 Accessible.name: UserModel.isUserConnected(UserModel.currentUserId()) ? qsTr("Connected") : qsTr("Disconnected")\r
-                                Accessible.description: qsTr("Icon that indicates connection state for the currently selected account")\r
                             }\r
                         }\r
 \r
@@ -433,8 +426,7 @@ Window {
                     onClicked: UserModel.openCurrentAccountLocalFolder()\r
 \r
                     Accessible.role: Accessible.Button\r
-                    Accessible.name: qsTr("Local folder button")\r
-                    Accessible.description: qsTr("Opens the local folder corresponding to the currently selected account")\r
+                    Accessible.name: qsTr("Open local folder of current account")\r
                     Accessible.onPressAction: {\r
                         UserModel.openCurrentAccountLocalFolder()\r
                     }\r
@@ -448,8 +440,7 @@ Window {
                     onClicked: UserModel.openCurrentAccountTalk()\r
 \r
                     Accessible.role: Accessible.Button\r
-                    Accessible.name: qsTr("Open Nextcloud Talk")\r
-                    Accessible.description: qsTr("Opens Nextcloud Talk corresponding the currently sdelected users server in a new browser window")\r
+                    Accessible.name: qsTr("Open Nextcloud Talk in browser")\r
                     Accessible.onPressAction: {\r
                         UserModel.openCurrentAccountTalk()\r
                     }\r
@@ -469,8 +460,7 @@ Window {
                     }\r
 \r
                     Accessible.role: Accessible.ButtonMenu\r
-                    Accessible.name: qsTr("Show other apps")\r
-                    Accessible.description: qsTr("Opens a popup menu with all other supported Nextcloud apps from the currently selected users server")\r
+                    Accessible.name: qsTr("More apps")\r
                     Accessible.onPressAction: {\r
                         appsMenu.open();\r
                         UserModel.openCurrentAccountServer();\r
@@ -518,8 +508,7 @@ Window {
                                 }\r
 \r
                                 Accessible.role: Accessible.MenuItem\r
-                                Accessible.name: appName\r
-                                Accessible.description: qsTr("Opens the corresponding Nextcloud app in a new browser window")\r
+                                Accessible.name: qsTr("Open ") + appName + qsTr(" in browser")\r
                                 Accessible.onPressAction: {\r
                                     UserAppsModel.openAppUrl(appUrl)\r
                                 }\r
@@ -546,7 +535,6 @@ Window {
 \r
             Accessible.role: Accessible.List\r
             Accessible.name: qsTr("Activity list")\r
-            Accessible.description: qsTr("A list of activities for the currently selected user account")\r
 \r
             model: activityModel\r
 \r
@@ -558,8 +546,8 @@ Window {
                 spacing: 0\r
 \r
                 Accessible.role: Accessible.ListItem\r
-                Accessible.name: activityTextColumn.text\r
-                Accessible.description: qsTr("Activity item - if applicable opens local folder containing the corresponding sync object when clicked")\r
+                Accessible.name: path !== "" ? qsTr("Open") + " " + displayPath + " " + qsTr("locally")\r
+                                                    : message\r
                 Accessible.onPressAction: {\r
                     if (path !== "") {\r
                         Qt.openUrlExternally(path)\r
@@ -678,8 +666,7 @@ Window {
                     onClicked: Systray.openShareDialog(displayPath,absolutePath)\r
 \r
                     Accessible.role: Accessible.Button\r
-                    Accessible.name: qsTr("Share button")\r
-                    Accessible.description: qsTr("Opens share window for the corresponding sync object")\r
+                    Accessible.name: qsTr("Share") + " " + displayPath\r
                     Accessible.onPressAction: {\r
                         Systray.openShareDialog(displayPath,absolutePath)\r
                     }\r