AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed display of cancel button on install/uninstall pages

Browse source
This commit is contained in:
vladimir.kuznetsov 2024-03-31 12:40:42 +05:00
parent db8d966fac
commit e9468a4c2f
5 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/ui/controllers/pageController.h
View file

@ -110,6 +110,7 @@ signals:
void showBusyIndicator(bool visible);
void disableControls(bool disabled);
void disableTabBar(bool disabled);
void hideMainWindow();
void raiseMainWindow();

4
client/ui/qml/Pages2/PageDeinstalling.qml
View file

@ -14,8 +14,8 @@ import "../Config"
PageType {
id: root
Component.onCompleted: PageController.disableControls(true)
Component.onDestruction: PageController.disableControls(false)
Component.onCompleted: PageController.disableTabBar(true)
Component.onDestruction: PageController.disableTabBar(false)
SortFilterProxyModel {
id: proxyServersModel

4
client/ui/qml/Pages2/PageSetupWizardInstalling.qml
View file

@ -14,8 +14,8 @@ import "../Config"
PageType {
id: root
Component.onCompleted: PageController.disableControls(true)
Component.onDestruction: PageController.disableControls(false)
Component.onCompleted: PageController.disableTabBar(true)
Component.onDestruction: PageController.disableTabBar(false)
property bool isTimerRunning: true
property string progressBarText: qsTr("Usually it takes no more than 5 minutes")

4
client/ui/qml/Pages2/PageSetupWizardStart.qml
View file

@ -48,6 +48,10 @@ PageType {
isControlsDisabled = disabled
}
function onDisableTabBar(disabled) {
isControlsDisabled = disabled
}
function onEscapePressed() {
if (isControlsDisabled) {
return

9
client/ui/qml/Pages2/PageStart.qml
View file

@ -15,6 +15,7 @@ PageType {
id: root
property bool isControlsDisabled: false
property bool isTabBarDisabled: false
Connections {
target: PageController
@ -38,6 +39,10 @@ PageType {
isControlsDisabled = disabled
}
function onDisableTabBar(disabled) {
isTabBarDisabled = disabled
}
function onClosePage() {
if (tabBarStackView.depth <= 1) {
return
@ -63,7 +68,7 @@ PageType {
}
function onEscapePressed() {
if (root.isControlsDisabled) {
if (root.isControlsDisabled || root.isTabBarDisabled) {
return
}
@ -179,7 +184,7 @@ PageType {
leftPadding: 96
rightPadding: 96
enabled: !root.isControlsDisabled
enabled: !root.isControlsDisabled && !root.isTabBarDisabled
background: Shape {
width: parent.width