mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 04:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

emitting signals from Qts Accessibility interaction invocations instead of duplicating actions

Browse source 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
This commit is contained in:
Dominique Fuchs 2020-09-15 16:45:22 +02:00 committed by Kevin Ottens (Rebase PR Action)
parent 1053c58b0f
commit b96b7e20c7
2 changed files with 21 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gui/tray/UserLine.qml
View file

@ -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()
}
}
}

52
src/gui/tray/Window.qml
View file

@ -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()
}
}