From 63d1c98b90c8435d1bf6152fc80758aea9c0e7db Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 16 Sep 2023 18:15:11 -0400 Subject: [PATCH] Organize and clean up QML imports --- launcher/ui/Components/FormFileDelegate.qml | 9 ++---- launcher/ui/Components/FormFolderDelegate.qml | 9 ++---- launcher/ui/Main.qml | 16 +++++----- launcher/ui/Pages/BrowserPage.qml | 9 ++---- launcher/ui/Pages/LoginPage.qml | 31 ++++++++++--------- launcher/ui/Pages/MainPage.qml | 16 +++++----- launcher/ui/Pages/NewsPage.qml | 19 ++++++------ launcher/ui/Pages/StatusPage.qml | 11 +++---- launcher/ui/Settings/AboutPage.qml | 8 ++--- launcher/ui/Settings/AccountSettings.qml | 19 ++++++------ launcher/ui/Settings/AccountsPage.qml | 17 +++++----- .../ui/Settings/CompatibilityToolSetup.qml | 14 ++++----- launcher/ui/Settings/DeveloperSettings.qml | 14 ++++----- launcher/ui/Settings/GeneralSettings.qml | 10 ++---- launcher/ui/Settings/ProfileSettings.qml | 25 ++++++++------- launcher/ui/Settings/ProfilesPage.qml | 13 ++++---- launcher/ui/Settings/SettingsPage.qml | 6 +--- launcher/ui/Setup/AccountSetup.qml | 14 ++++----- launcher/ui/Setup/AddSapphire.qml | 14 ++++----- launcher/ui/Setup/AddSquareEnix.qml | 14 ++++----- launcher/ui/Setup/DownloadSetup.qml | 14 ++++----- launcher/ui/Setup/ExistingSetup.qml | 13 ++++---- launcher/ui/Setup/InstallProgress.qml | 13 ++++---- launcher/ui/Setup/SetupPage.qml | 13 ++++---- 24 files changed, 160 insertions(+), 181 deletions(-) diff --git a/launcher/ui/Components/FormFileDelegate.qml b/launcher/ui/Components/FormFileDelegate.qml index 6a36cfd..cf4f626 100644 --- a/launcher/ui/Components/FormFileDelegate.qml +++ b/launcher/ui/Components/FormFileDelegate.qml @@ -2,14 +2,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later import QtCore -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm import QtQuick.Dialogs -import zone.xiv.astra 1.0 + +import org.kde.kirigamiaddons.labs.mobileform as MobileForm MobileForm.FormButtonDelegate { id: control diff --git a/launcher/ui/Components/FormFolderDelegate.qml b/launcher/ui/Components/FormFolderDelegate.qml index 2f52830..d6d3c45 100644 --- a/launcher/ui/Components/FormFolderDelegate.qml +++ b/launcher/ui/Components/FormFolderDelegate.qml @@ -2,14 +2,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later import QtCore -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm import QtQuick.Dialogs -import zone.xiv.astra 1.0 + +import org.kde.kirigamiaddons.labs.mobileform as MobileForm MobileForm.FormButtonDelegate { id: control diff --git a/launcher/ui/Main.qml b/launcher/ui/Main.qml index ee60767..a4620a5 100644 --- a/launcher/ui/Main.qml +++ b/launcher/ui/Main.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Controls as QQC2 + +import org.kde.kirigami as Kirigami + +import zone.xiv.astra import "Pages" @@ -102,7 +102,7 @@ Kirigami.ApplicationWindow { Component.onCompleted: checkSetup() - property Item hoverLinkIndicator: Controls.Control { + property Item hoverLinkIndicator: QQC2.Control { parent: overlay.parent property alias text: linkText.text opacity: text.length > 0 ? 1 : 0 @@ -116,7 +116,7 @@ Kirigami.ApplicationWindow { z: 999990 x: 0 y: parent.height - implicitHeight - contentItem: Controls.Label { + contentItem: QQC2.Label { id: linkText } Kirigami.Theme.colorSet: Kirigami.Theme.View diff --git a/launcher/ui/Pages/BrowserPage.qml b/launcher/ui/Pages/BrowserPage.qml index 9f65707..80d58ed 100644 --- a/launcher/ui/Pages/BrowserPage.qml +++ b/launcher/ui/Pages/BrowserPage.qml @@ -1,12 +1,9 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import QtWebView 1.10 +import QtWebView + +import org.kde.kirigami as Kirigami Kirigami.Page { id: page diff --git a/launcher/ui/Pages/LoginPage.qml b/launcher/ui/Pages/LoginPage.qml index 2d78552..1e10dd4 100644 --- a/launcher/ui/Pages/LoginPage.qml +++ b/launcher/ui/Pages/LoginPage.qml @@ -1,16 +1,17 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.kirigamiaddons.components as Components -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -Controls.Control { +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.kirigamiaddons.components as Components + +import zone.xiv.astra + +QQC2.Control { id: page property var profile: LauncherCore.profileManager.getProfile(0) @@ -60,16 +61,16 @@ Controls.Control { text: i18n("Current Profile") description: page.profile.name - Controls.Menu { + QQC2.Menu { id: profileMenu Repeater { model: LauncherCore.profileManager - Controls.MenuItem { + QQC2.MenuItem { required property var profile - Controls.MenuItem { + QQC2.MenuItem { text: profile.name onClicked: { @@ -99,16 +100,16 @@ Controls.Control { leadingPadding: Kirigami.Units.largeSpacing * 2 - Controls.Menu { + QQC2.Menu { id: accountMenu Repeater { model: LauncherCore.accountManager - Controls.MenuItem { + QQC2.MenuItem { required property var account - Controls.MenuItem { + QQC2.MenuItem { text: account.name icon.name: account.avatarUrl.length === 0 ? "actor" : "" icon.source: account.avatarUrl diff --git a/launcher/ui/Pages/MainPage.qml b/launcher/ui/Pages/MainPage.qml index 6991435..7cfc1eb 100644 --- a/launcher/ui/Pages/MainPage.qml +++ b/launcher/ui/Pages/MainPage.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami + +import zone.xiv.astra Kirigami.Page { id: page @@ -60,7 +60,7 @@ Kirigami.Page { Layout.fillWidth: true Layout.fillHeight: true - sourceComponent: Controls.ScrollView { + sourceComponent: QQC2.ScrollView { id: scrollView NewsPage { diff --git a/launcher/ui/Pages/NewsPage.qml b/launcher/ui/Pages/NewsPage.qml index 95ff0f5..5e36ff2 100644 --- a/launcher/ui/Pages/NewsPage.qml +++ b/launcher/ui/Pages/NewsPage.qml @@ -1,16 +1,17 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import Qt5Compat.GraphicalEffects 1.0 -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import Qt5Compat.GraphicalEffects -Controls.Control { +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard + +import zone.xiv.astra + +QQC2.Control { id: page Component.onCompleted: LauncherCore.refreshNews() diff --git a/launcher/ui/Pages/StatusPage.qml b/launcher/ui/Pages/StatusPage.qml index 2537f9e..77642e0 100644 --- a/launcher/ui/Pages/StatusPage.qml +++ b/launcher/ui/Pages/StatusPage.qml @@ -1,12 +1,11 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import zone.xiv.astra 1.0 +import QtQuick + +import org.kde.kirigami as Kirigami + +import zone.xiv.astra Kirigami.Page { property var gameInstaller diff --git a/launcher/ui/Settings/AboutPage.qml b/launcher/ui/Settings/AboutPage.qml index 7c5f9c2..bdd33c2 100644 --- a/launcher/ui/Settings/AboutPage.qml +++ b/launcher/ui/Settings/AboutPage.qml @@ -1,12 +1,8 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigamiaddons.formcard as FormCard + import org.kde.coreaddons FormCard.AboutPage { diff --git a/launcher/ui/Settings/AccountSettings.qml b/launcher/ui/Settings/AccountSettings.qml index 715dc9b..c39dcdd 100644 --- a/launcher/ui/Settings/AccountSettings.qml +++ b/launcher/ui/Settings/AccountSettings.qml @@ -1,13 +1,14 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard + +import zone.xiv.astra FormCard.FormCardPage { id: page @@ -142,7 +143,7 @@ FormCard.FormCardPage { onAccepted: page.account.lodestoneId = lodestoneIdField.text - Controls.TextField { + QQC2.TextField { id: lodestoneIdField text: page.account.lodestoneId placeholderText: qsTr("123456...") @@ -205,7 +206,7 @@ FormCard.FormCardPage { onAccepted: page.account.setOTPSecret(otpSecretField.text) - Controls.TextField { + QQC2.TextField { id: otpSecretField placeholderText: qsTr("ABCD EFGH...") } diff --git a/launcher/ui/Settings/AccountsPage.qml b/launcher/ui/Settings/AccountsPage.qml index 18c7898..739b875 100644 --- a/launcher/ui/Settings/AccountsPage.qml +++ b/launcher/ui/Settings/AccountsPage.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import QtQuick +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard import org.kde.kirigamiaddons.components as Components -import zone.xiv.astra 1.0 + +import zone.xiv.astra FormCard.FormCardPage { FormCard.FormHeader { @@ -26,8 +26,7 @@ FormCard.FormCardPage { text: account.name - leading: Components.Avatar - { + leading: Components.Avatar { source: account.avatarUrl } diff --git a/launcher/ui/Settings/CompatibilityToolSetup.qml b/launcher/ui/Settings/CompatibilityToolSetup.qml index 4421579..136fa35 100644 --- a/launcher/ui/Settings/CompatibilityToolSetup.qml +++ b/launcher/ui/Settings/CompatibilityToolSetup.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard + +import zone.xiv.astra FormCard.FormCardPage { id: page diff --git a/launcher/ui/Settings/DeveloperSettings.qml b/launcher/ui/Settings/DeveloperSettings.qml index f1c6d58..4298249 100644 --- a/launcher/ui/Settings/DeveloperSettings.qml +++ b/launcher/ui/Settings/DeveloperSettings.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard + +import zone.xiv.astra import "../Components" diff --git a/launcher/ui/Settings/GeneralSettings.qml b/launcher/ui/Settings/GeneralSettings.qml index d919546..fd10104 100644 --- a/launcher/ui/Settings/GeneralSettings.qml +++ b/launcher/ui/Settings/GeneralSettings.qml @@ -1,13 +1,9 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import zone.xiv.astra 1.0 +import org.kde.kirigamiaddons.formcard as FormCard + +import zone.xiv.astra FormCard.FormCardPage { title: i18n("General") diff --git a/launcher/ui/Settings/ProfileSettings.qml b/launcher/ui/Settings/ProfileSettings.qml index 0c84f90..e2cd337 100644 --- a/launcher/ui/Settings/ProfileSettings.qml +++ b/launcher/ui/Settings/ProfileSettings.qml @@ -1,13 +1,14 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard + +import zone.xiv.astra import "../Components" @@ -193,29 +194,29 @@ FormCard.FormCardPage { title: i18n("Configure Gamescope") Kirigami.FormLayout { - Controls.CheckBox { + QQC2.CheckBox { Kirigami.FormData.label: "Fullscreen:" checked: page.profile.gamescopeFullscreen onCheckedChanged: page.profile.gamescopeFullscreen = checked } - Controls.CheckBox { + QQC2.CheckBox { Kirigami.FormData.label: "Borderless:" checked: page.profile.gamescopeBorderless onCheckedChanged: page.profile.gamescopeBorderless = checked } - Controls.SpinBox { + QQC2.SpinBox { Kirigami.FormData.label: "Width:" to: 4096 value: page.profile.gamescopeWidth onValueModified: page.profile.gamescopeWidth = value } - Controls.SpinBox { + QQC2.SpinBox { Kirigami.FormData.label: "Height:" to: 4096 value: page.profile.gamescopeHeight onValueModified: page.profile.gamescopeHeight = value } - Controls.SpinBox { + QQC2.SpinBox { Kirigami.FormData.label: "Refresh Rate:" to: 512 value: page.profile.gamescopeRefreshRate diff --git a/launcher/ui/Settings/ProfilesPage.qml b/launcher/ui/Settings/ProfilesPage.qml index 4cfc80f..aa62dde 100644 --- a/launcher/ui/Settings/ProfilesPage.qml +++ b/launcher/ui/Settings/ProfilesPage.qml @@ -1,13 +1,12 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Layouts + +import org.kde.kirigamiaddons.formcard as FormCard + +import zone.xiv.astra FormCard.FormCardPage { title: i18n("General") diff --git a/launcher/ui/Settings/SettingsPage.qml b/launcher/ui/Settings/SettingsPage.qml index cf18b50..f09e2be 100644 --- a/launcher/ui/Settings/SettingsPage.qml +++ b/launcher/ui/Settings/SettingsPage.qml @@ -1,11 +1,7 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import org.kde.kirigami 2.18 as Kirigami -import org.kde.kirigamiaddons.settings 1.0 as KirigamiSettings -import QtQuick.Layouts 1.15 -import zone.xiv.astra 1.0 +import org.kde.kirigamiaddons.settings as KirigamiSettings KirigamiSettings.CategorizedSettings { id: settingsPage diff --git a/launcher/ui/Setup/AccountSetup.qml b/launcher/ui/Setup/AccountSetup.qml index a5f907d..6829cec 100644 --- a/launcher/ui/Setup/AccountSetup.qml +++ b/launcher/ui/Setup/AccountSetup.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.mobileform as MobileForm + +import zone.xiv.astra Kirigami.Page { id: page diff --git a/launcher/ui/Setup/AddSapphire.qml b/launcher/ui/Setup/AddSapphire.qml index 779c081..798f0bb 100644 --- a/launcher/ui/Setup/AddSapphire.qml +++ b/launcher/ui/Setup/AddSapphire.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.mobileform as MobileForm + +import zone.xiv.astra Kirigami.Page { id: page diff --git a/launcher/ui/Setup/AddSquareEnix.qml b/launcher/ui/Setup/AddSquareEnix.qml index 17fee82..47a3411 100644 --- a/launcher/ui/Setup/AddSquareEnix.qml +++ b/launcher/ui/Setup/AddSquareEnix.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.mobileform as MobileForm + +import zone.xiv.astra Kirigami.Page { id: page diff --git a/launcher/ui/Setup/DownloadSetup.qml b/launcher/ui/Setup/DownloadSetup.qml index abff04d..a14b6b6 100644 --- a/launcher/ui/Setup/DownloadSetup.qml +++ b/launcher/ui/Setup/DownloadSetup.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.mobileform as MobileForm + +import zone.xiv.astra Kirigami.Page { id: page diff --git a/launcher/ui/Setup/ExistingSetup.qml b/launcher/ui/Setup/ExistingSetup.qml index a997fc4..61f5b2e 100644 --- a/launcher/ui/Setup/ExistingSetup.qml +++ b/launcher/ui/Setup/ExistingSetup.qml @@ -1,12 +1,13 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm +import QtQuick +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.mobileform as MobileForm + +import zone.xiv.astra Kirigami.Page { title: i18n("Find Game Installation") diff --git a/launcher/ui/Setup/InstallProgress.qml b/launcher/ui/Setup/InstallProgress.qml index 3165e9a..49aed3f 100644 --- a/launcher/ui/Setup/InstallProgress.qml +++ b/launcher/ui/Setup/InstallProgress.qml @@ -1,12 +1,13 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import zone.xiv.astra 1.0 +import QtQuick +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.mobileform as MobileForm + +import zone.xiv.astra Kirigami.Page { property var gameInstaller diff --git a/launcher/ui/Setup/SetupPage.qml b/launcher/ui/Setup/SetupPage.qml index e7367d1..d922386 100644 --- a/launcher/ui/Setup/SetupPage.qml +++ b/launcher/ui/Setup/SetupPage.qml @@ -1,12 +1,13 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Window 2.15 -import org.kde.kirigami 2.20 as Kirigami -import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm +import QtQuick +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.mobileform as MobileForm + +import zone.xiv.astra Kirigami.Page { id: page