redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-05-01 08:27:45 +00:00
Code Activity

Improve the compatibility tool installer UX

Browse source 
Now there's confirmation dialogs when the installation/removal is
successful, instead of nothing happening.
This commit is contained in:
Joshua Goins 2025-04-29 15:12:07 -04:00
parent 1708aabb14
commit 377f10408c
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
launcher/include/compatibilitytoolinstaller.h
View file

@ -22,6 +22,7 @@ public:
Q_SIGNALS:
void installFinished();
void error(QString message);
void removalFinished();
private:
LauncherCore &m_launcher;

2
launcher/src/compatibilitytoolinstaller.cpp
View file

@ -105,7 +105,7 @@ void CompatibilityToolInstaller::removeCompatibilityTool()
astraToolDir.removeRecursively();
}
Q_EMIT installFinished();
Q_EMIT removalFinished();
}
#include "moc_compatibilitytoolinstaller.cpp"

33
launcher/ui/Settings/CompatibilityToolSetup.qml
View file

@ -3,6 +3,7 @@
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls as QQC2
import org.kde.kirigami as Kirigami
import org.kde.kirigamiaddons.formcard as FormCard
@ -12,7 +13,7 @@ import zone.xiv.astra
FormCard.FormCardPage {
id: page
property var installer: null
readonly property CompatibilityToolInstaller installer: LauncherCore.createCompatInstaller()
title: i18nc("@title:window", "Compatibility Tool")
@ -33,10 +34,7 @@ FormCard.FormCardPage {
text: i18n("Install Tool")
icon.name: "install"
onClicked: {
page.installer = LauncherCore.createCompatInstaller();
page.installer.installCompatibilityTool();
}
onClicked: page.installer.installCompatibilityTool()
}
FormCard.FormDelegateSeparator {
@ -49,34 +47,35 @@ FormCard.FormCardPage {
text: i18n("Remove Tool")
icon.name: "delete"
onClicked: {
page.installer = LauncherCore.createCompatInstaller();
page.installer.removeCompatibilityTool();
}
onClicked: page.installer.removeCompatibilityTool()
}
}
property Kirigami.PromptDialog errorDialog: Kirigami.PromptDialog {
title: i18n("Install error")
readonly property Kirigami.PromptDialog errorDialog: Kirigami.PromptDialog {
showCloseButton: false
standardButtons: Kirigami.Dialog.Ok
onAccepted: applicationWindow().pageStack.layers.pop()
onRejected: applicationWindow().pageStack.layers.pop()
parent: page.QQC2.Overlay.overlay
}
data: Connections {
enabled: page.installer !== null
target: page.installer
function onInstallFinished(): void {
applicationWindow().pageStack.layers.pop();
page.errorDialog.title = i18n("Install Success");
page.errorDialog.subtitle = i18n("Compatibility tool successfully installed!");
page.errorDialog.open();
}
function onError(message: string): void {
page.errorDialog.title = i18n("Install Error");
page.errorDialog.subtitle = message;
page.errorDialog.open();
}
function onRemovalFinished(): void {
page.errorDialog.title = i18n("Removal Success");
page.errorDialog.subtitle = i18n("Compatibility tool successfully removed!");
page.errorDialog.open();
}
}
}