From 1053c58b0f99a79dfa83fba092fc06efba000b02 Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Tue, 25 Aug 2020 16:52:05 +0200 Subject: [PATCH] KISS. Removed description for now, instead clarified some Accessible.name Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/tray/UserLine.qml | 16 +++++----------- src/gui/tray/Window.qml | 33 ++++++++++----------------------- 2 files changed, 15 insertions(+), 34 deletions(-) diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml index 89297344d..a805a04f5 100644 --- a/src/gui/tray/UserLine.qml +++ b/src/gui/tray/UserLine.qml @@ -13,7 +13,6 @@ MenuItem { Accessible.role: Accessible.MenuItem Accessible.name: qsTr("Account entry") - Accessible.description: qsTr("Menu entry corresponding to a specific account") RowLayout { id: userLineLayout @@ -30,8 +29,7 @@ MenuItem { flat: true Accessible.role: Accessible.Button - Accessible.name: name - Accessible.description: qsTr("Account button, selecting the corresponding account as active when clicked") + Accessible.name: qsTr("Switch to account") + " " + name MouseArea { anchors.fill: parent @@ -91,8 +89,7 @@ MenuItem { sourceSize.height: Style.accountAvatarStateIndicatorSize Accessible.role: Accessible.Indicator - Accessible.name: isConnected ? qsTr("Connected") : qsTr("Disconnected") - Accessible.description: qsTr("Icon that indicates current connection state for the corresponding account") + Accessible.name: isConnected ? qsTr("Account connected") : qsTr("Account not connected") } } @@ -132,8 +129,7 @@ MenuItem { icon.color: "transparent" Accessible.role: Accessible.ButtonMenu - Accessible.name: qsTr("More") - Accessible.description: qsTr("Menu button providing more account actions when clicked") + Accessible.name: qsTr("Account actions") Accessible.onPressAction: { userMoreButtonMenu.popup() } @@ -189,7 +185,6 @@ MenuItem { Accessible.role: Accessible.Button Accessible.name: isConnected ? qsTr("Log out") : qsTr("Log in") - Accessible.description: qsTr("Logs user account in or out depending on current connection state") onPressed: { isConnected ? UserModel.logout(index) : UserModel.login(index) @@ -198,7 +193,7 @@ MenuItem { } MenuItem { - text: qsTr("Remove Account") + text: qsTr("Remove account") font.pixelSize: Style.topLinePixelSize hoverEnabled: true onClicked: { @@ -217,8 +212,7 @@ MenuItem { } Accessible.role: Accessible.Button - Accessible.name: qsTr("Remove Account") - Accessible.description: qsTr("Permanently removes account from Nextcloud client configuration") + Accessible.name: text Accessible.onPressAction: { UserModel.removeAccount(index) diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index 2cc8996e0..213739f8b 100644 --- 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 Accessible.role: Accessible.Application - Accessible.name: qsTr("Nextcloud client tray window") + Accessible.name: qsTr("Nextcloud desktop main dialog") // Close tray window when focus is lost (e.g. click somewhere else on the screen) onActiveChanged: { @@ -100,7 +100,7 @@ Window { border.color: Style.menuBorder Accessible.role: Accessible.Grouping - Accessible.name: qsTr("Nextcloud client tray window") + Accessible.name: qsTr("Nextcloud desktop main dialog") Rectangle { id: trayWindowHeaderBackground @@ -139,7 +139,6 @@ Window { Accessible.role: Accessible.ButtonMenu Accessible.name: qsTr("Current account") - Accessible.description: qsTr("Shows the currently selected account and opens a dropdown list for all accounts when clicked") Accessible.onPressAction: { syncPauseButton.text = Systray.syncIsPaused() ? qsTr("Resume sync for all") : qsTr("Pause sync for all") accountMenu.open() @@ -186,8 +185,7 @@ Window { } Accessible.role: PopupMenu - Accessible.name: qsTr("Account menu") - Accessible.description: qsTr("Popup menu showing a list of accounts and general client actions") + Accessible.name: qsTr("Account switcher and settings menu") onClosed: { // HACK: reload account Instantiator immediately by restting it - could be done better I guess @@ -246,7 +244,6 @@ Window { Accessible.role: Accessible.MenuItem Accessible.name: qsTr("Add new account") - Accessible.description: qsTr("Opens setup window to add a new account connection") Accessible.onPressAction: { Systray.pauseResumeSync() } @@ -277,7 +274,6 @@ Window { Accessible.role: Accessible.MenuItem Accessible.name: Systray.syncIsPaused() ? qsTr("Resume sync for all") : qsTr("Pause sync for all") - Accessible.description: qsTr("Button that pauses or resumes sync activity") Accessible.onPressAction: { Systray.pauseResumeSync() } @@ -301,7 +297,6 @@ Window { Accessible.role: Accessible.MenuItem Accessible.name: text - Accessible.description: qsTr("Button that opens the client settings window") Accessible.onPressAction: { Systray.openSettings() } @@ -325,7 +320,6 @@ Window { Accessible.role: Accessible.MenuItem Accessible.name: text - Accessible.description: qsTr("Quits the nextcloud client application") Accessible.onPressAction: { Systray.shutdown() } @@ -379,7 +373,6 @@ Window { Accessible.role: Accessible.Indicator Accessible.name: UserModel.isUserConnected(UserModel.currentUserId()) ? qsTr("Connected") : qsTr("Disconnected") - Accessible.description: qsTr("Icon that indicates connection state for the currently selected account") } } @@ -433,8 +426,7 @@ Window { onClicked: UserModel.openCurrentAccountLocalFolder() Accessible.role: Accessible.Button - Accessible.name: qsTr("Local folder button") - Accessible.description: qsTr("Opens the local folder corresponding to the currently selected account") + Accessible.name: qsTr("Open local folder of current account") Accessible.onPressAction: { UserModel.openCurrentAccountLocalFolder() } @@ -448,8 +440,7 @@ Window { onClicked: UserModel.openCurrentAccountTalk() Accessible.role: Accessible.Button - Accessible.name: qsTr("Open Nextcloud Talk") - Accessible.description: qsTr("Opens Nextcloud Talk corresponding the currently sdelected users server in a new browser window") + Accessible.name: qsTr("Open Nextcloud Talk in browser") Accessible.onPressAction: { UserModel.openCurrentAccountTalk() } @@ -469,8 +460,7 @@ Window { } Accessible.role: Accessible.ButtonMenu - Accessible.name: qsTr("Show other apps") - Accessible.description: qsTr("Opens a popup menu with all other supported Nextcloud apps from the currently selected users server") + Accessible.name: qsTr("More apps") Accessible.onPressAction: { appsMenu.open(); UserModel.openCurrentAccountServer(); @@ -518,8 +508,7 @@ Window { } Accessible.role: Accessible.MenuItem - Accessible.name: appName - Accessible.description: qsTr("Opens the corresponding Nextcloud app in a new browser window") + Accessible.name: qsTr("Open ") + appName + qsTr(" in browser") Accessible.onPressAction: { UserAppsModel.openAppUrl(appUrl) } @@ -546,7 +535,6 @@ Window { Accessible.role: Accessible.List Accessible.name: qsTr("Activity list") - Accessible.description: qsTr("A list of activities for the currently selected user account") model: activityModel @@ -558,8 +546,8 @@ Window { spacing: 0 Accessible.role: Accessible.ListItem - Accessible.name: activityTextColumn.text - Accessible.description: qsTr("Activity item - if applicable opens local folder containing the corresponding sync object when clicked") + Accessible.name: path !== "" ? qsTr("Open") + " " + displayPath + " " + qsTr("locally") + : message Accessible.onPressAction: { if (path !== "") { Qt.openUrlExternally(path) @@ -678,8 +666,7 @@ Window { onClicked: Systray.openShareDialog(displayPath,absolutePath) Accessible.role: Accessible.Button - Accessible.name: qsTr("Share button") - Accessible.description: qsTr("Opens share window for the corresponding sync object") + Accessible.name: qsTr("Share") + " " + displayPath Accessible.onPressAction: { Systray.openShareDialog(displayPath,absolutePath) } -- 2.30.2