Skip to content
Snippets Groups Projects
Commit fd3e75e3 authored by Sébastien Blin's avatar Sébastien Blin Committed by Andreas Traczyk
Browse files

accessibility: add autoaccelerator

Turn automatically a button into a button with an automiatic key
accelerator (which is Alt+ first letter of the text)

Change-Id: Idf118673423e8e3125864c67124f194de0220a69
GitLab: #780
parent 682757fd
No related branches found
No related tags found
No related merge requests found
Showing
with 38 additions and 2 deletions
......@@ -74,6 +74,7 @@ BaseModalDialog {
hoveredColor: JamiTheme.buttonTintedRedHovered
pressedColor: JamiTheme.buttonTintedRedPressed
secondary: true
autoAccelerator: true
onClicked: {
close()
......@@ -93,6 +94,7 @@ BaseModalDialog {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
secondary: true
autoAccelerator: true
text: JamiStrings.optionCancel
......
......@@ -92,6 +92,7 @@ BaseModalDialog {
hoveredColor: JamiTheme.buttonTintedBlueHovered
pressedColor: JamiTheme.buttonTintedBluePressed
secondary: true
autoAccelerator: true
onClicked: Qt.quit()
}
......
......@@ -134,6 +134,7 @@ BaseModalDialog {
hoveredColor: JamiTheme.buttonTintedRedHovered
pressedColor: JamiTheme.buttonTintedRedPressed
secondary: true
autoAccelerator: true
text: JamiStrings.optionDelete
......@@ -175,6 +176,7 @@ BaseModalDialog {
secondary: true
text: JamiStrings.optionCancel
autoAccelerator: true
onClicked: close()
}
......
......@@ -28,6 +28,7 @@ import net.jami.Constants 1.1
AbstractButton {
id: root
property bool autoAccelerator: false
property bool boldFont: false
property bool primary: false
property bool secondary: false
......@@ -242,4 +243,15 @@ AbstractButton {
cursorShape: root.hovered ? Qt.PointingHandCursor : Qt.ArrowCursor
}
Shortcut {
enabled: text.length > 0 && parent.visible && autoAccelerator
sequence: {
if (text.length === 0)
return ""
return "Alt+" + text[0]
}
context: Qt.ApplicationShortcut
onActivated: clicked()
}
}
......@@ -187,6 +187,7 @@ BaseModalDialog {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
secondary: true
autoAccelerator: true
enabled: purpose === PasswordDialog.SetPassword
text: (purpose === PasswordDialog.ExportAccount) ? JamiStrings.exportAccount :
......@@ -209,6 +210,7 @@ BaseModalDialog {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
secondary: true
autoAccelerator: true
text: JamiStrings.optionCancel
......
......@@ -122,6 +122,7 @@ BaseModalDialog {
}
}
secondary: true
autoAccelerator: true
text: buttonTitles[modelData]
......
......@@ -130,7 +130,7 @@ Rectangle {
radius: margin
preferredSize: JamiTheme.filesToSendDelegateButtonSize
toolTipText: JamiStrings.remove
toolTipText: JamiStrings.optionRemove
source: JamiResources.cross_black_24dp_svg
......
......@@ -191,6 +191,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter
Layout.topMargin: JamiTheme.preferredMarginSize
autoAccelerator: true
preferredWidth: JamiTheme.aboutButtonPreferredWidth
......
......@@ -60,6 +60,7 @@ Control {
MaterialButton {
text: JamiStrings.removeContact
autoAccelerator: true
font.pointSize: JamiTheme.textFontSize + 2
onClicked: MessagesAdapter.removeContact(
LRCInstance.selectedConvUid)
......@@ -67,6 +68,7 @@ Control {
MaterialButton {
text: JamiStrings.newConversation
autoAccelerator: true
font.pointSize: JamiTheme.textFontSize + 2
onClicked: ConversationsAdapter.restartConversation(
LRCInstance.selectedConvUid)
......
......@@ -369,6 +369,7 @@ Window {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
secondary: true
autoAccelerator: true
text: window ? JamiStrings.shareWindow : JamiStrings.shareScreen
......@@ -398,6 +399,7 @@ Window {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
secondary: true
autoAccelerator: true
text: JamiStrings.optionCancel
......
......@@ -170,6 +170,7 @@ BaseModalDialog {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
secondary: true
autoAccelerator: true
enabled: false
text: JamiStrings.exportAccount
......@@ -189,6 +190,7 @@ BaseModalDialog {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
secondary: true
autoAccelerator: true
enabled: true
text: JamiStrings.optionCancel
......
......@@ -152,6 +152,7 @@ Window {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
text: JamiStrings.logsViewClear
autoAccelerator: true
onClicked: {
logsText.clear()
......@@ -177,6 +178,7 @@ Window {
secondary: true
text: JamiStrings.logsViewCopy
autoAccelerator: true
onClicked: {
logsText.selectAll()
......@@ -215,6 +217,7 @@ Window {
pressedColor: JamiTheme.buttonTintedBlackPressed
text: JamiStrings.logsViewReport
secondary: true
autoAccelerator: true
onClicked: Qt.openUrlExternally(
"https://jami.net/bugs-and-improvements/")
......
......@@ -100,9 +100,10 @@ BaseModalDialog {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
secondary: true
autoAccelerator: true
enabled: false
text: JamiStrings.remove
text: JamiStrings.optionRemove
onClicked: {
revokeDeviceWithPassword(deviceId, passwordEdit.text)
......@@ -122,6 +123,7 @@ BaseModalDialog {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
secondary: true
autoAccelerator: true
enabled: true
text: JamiStrings.optionCancel
......
......@@ -76,6 +76,7 @@ ColumnLayout {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
secondary: true
autoAccelerator: true
toolTipText: JamiStrings.checkForUpdates
text: JamiStrings.checkForUpdates
......@@ -97,6 +98,7 @@ ColumnLayout {
hoveredColor: JamiTheme.buttonTintedBlackHovered
pressedColor: JamiTheme.buttonTintedBlackPressed
secondary: true
autoAccelerator: true
toolTipText: JamiStrings.betaInstall
text: JamiStrings.betaInstall
......
......@@ -198,6 +198,7 @@ Rectangle {
preferredWidth: JamiTheme.wizardButtonWidth
text: JamiStrings.backupAccountBtn
autoAccelerator: true
color: JamiTheme.buttonTintedGrey
hoveredColor: JamiTheme.buttonTintedGreyHovered
pressedColor: JamiTheme.buttonTintedGreyPressed
......@@ -220,6 +221,7 @@ Rectangle {
preferredWidth: JamiTheme.wizardButtonWidth
text: JamiStrings.skip
autoAccelerator: true
color: JamiTheme.buttonTintedGrey
hoveredColor: JamiTheme.buttonTintedGreyHovered
pressedColor: JamiTheme.buttonTintedGreyPressed
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment