lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-10 17:55:40 +02:00
Code Activity

shortcut: fix settings menu selection shortcut

Browse source 
Change-Id: I19cab014fc119ae0fe0b3e742d1ec59ca8dfadc3
This commit is contained in:
Ming Rui Zhang 2021-09-27 16:58:50 -04:00 • committed by Sébastien Blin
parent da18924f90
commit 45b86d56d9
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mainview/MainView.qml
View file

@ -479,7 +479,7 @@ Rectangle {
if (!inSettingsView) { if (!inSettingsView) {
toggleSettingsView() toggleSettingsView()
} }
settingsMenu.btnMediaSettings.clicked() settingsMenu.buttonSelectedManually(SettingsView.Media)
} }
} }
@ -490,7 +490,7 @@ Rectangle {
if (!inSettingsView) { if (!inSettingsView) {
toggleSettingsView() toggleSettingsView()
} }
settingsMenu.btnGeneralSettings.clicked() settingsMenu.buttonSelectedManually(SettingsView.General)
} }
} }
@ -501,7 +501,7 @@ Rectangle {
if (!inSettingsView) { if (!inSettingsView) {
toggleSettingsView() toggleSettingsView()
} }
settingsMenu.btnAccountSettings.clicked() settingsMenu.buttonSelectedManually(SettingsView.Account)
} }
} }
@ -512,7 +512,7 @@ Rectangle {
if (!inSettingsView) { if (!inSettingsView) {
toggleSettingsView() toggleSettingsView()
} }
settingsMenu.btnPluginSettings.clicked() settingsMenu.buttonSelectedManually(SettingsView.Plugin)
} }
} }

14
src/settingsview/components/SettingsMenu.qml
View file

@ -30,6 +30,7 @@ Rectangle {
id: root id: root
signal itemSelected(int index) signal itemSelected(int index)
signal buttonSelectedManually(int index)
Component.onCompleted: { Component.onCompleted: {
listModel.append({ 'type': SettingsView.Account, 'name': JamiStrings.accountSettingsMenuTitle, listModel.append({ 'type': SettingsView.Account, 'name': JamiStrings.accountSettingsMenuTitle,
@ -46,6 +47,8 @@ Rectangle {
color: JamiTheme.backgroundColor color: JamiTheme.backgroundColor
ButtonGroup { ButtonGroup {
id: buttonGroup
buttons: buttons.children buttons: buttons.children
onCheckedButtonChanged: itemSelected(checkedButton.menuType) onCheckedButtonChanged: itemSelected(checkedButton.menuType)
} }
@ -64,8 +67,19 @@ Rectangle {
model: ListModel { id: listModel } model: ListModel { id: listModel }
PushButton { PushButton {
id: pushButton
property int menuType: type property int menuType: type
Connections {
target: root
function onButtonSelectedManually(index) {
if (pushButton.menuType === index)
buttonGroup.checkedButton = pushButton
}
}
Component.onCompleted: checked = type === SettingsView.Account Component.onCompleted: checked = type === SettingsView.Account
preferredHeight: 64 preferredHeight: 64