fix(GODT-2967): tray menu entries close the setup wizard when needed.
This commit is contained in:
parent
50acc0dcfb
commit
bb67d95669
|
@ -106,18 +106,28 @@ ApplicationWindow {
|
||||||
Connections {
|
Connections {
|
||||||
function onSelectUser(userID, forceShowWindow) {
|
function onSelectUser(userID, forceShowWindow) {
|
||||||
contentWrapper.selectUser(userID);
|
contentWrapper.selectUser(userID);
|
||||||
|
if (setupWizard.visible) {
|
||||||
|
setupWizard.closeWizard()
|
||||||
|
}
|
||||||
if (forceShowWindow) {
|
if (forceShowWindow) {
|
||||||
root.showAndRise();
|
root.showAndRise();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function onShowHelp() {
|
function onShowHelp() {
|
||||||
root.showHelp();
|
root.showHelp();
|
||||||
|
if (setupWizard.visible) {
|
||||||
|
setupWizard.closeWizard()
|
||||||
|
}
|
||||||
|
|
||||||
root.showAndRise();
|
root.showAndRise();
|
||||||
}
|
}
|
||||||
function onShowMainWindow() {
|
function onShowMainWindow() {
|
||||||
root.showAndRise();
|
root.showAndRise();
|
||||||
}
|
}
|
||||||
function onShowSettings() {
|
function onShowSettings() {
|
||||||
|
if (setupWizard.visible) {
|
||||||
|
setupWizard.closeWizard()
|
||||||
|
}
|
||||||
root.showSettings();
|
root.showSettings();
|
||||||
root.showAndRise();
|
root.showAndRise();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue