diff options
| author | TheKodeToad <TheKodeToad@proton.me> | 2023-07-22 11:26:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-22 11:26:02 +0100 |
| commit | 57430fd189aed592a170d597de61b3acabaaa43d (patch) | |
| tree | b3727db40fdea31d24541c0c8181c43df13e774c /launcher/ui/setupwizard | |
| parent | ec85266860b7503b24ff3840fb6bf74588acc7c8 (diff) | |
| parent | 6ffcfcd7e9d96ae0a2846d1cf23b27425a838709 (diff) | |
| download | PrismLauncher-57430fd189aed592a170d597de61b3acabaaa43d.tar.gz PrismLauncher-57430fd189aed592a170d597de61b3acabaaa43d.tar.bz2 PrismLauncher-57430fd189aed592a170d597de61b3acabaaa43d.zip | |
Merge branch 'develop' into better-launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
Diffstat (limited to 'launcher/ui/setupwizard')
| -rw-r--r-- | launcher/ui/setupwizard/JavaWizardPage.cpp | 1 | ||||
| -rw-r--r-- | launcher/ui/setupwizard/ThemeWizardPage.cpp | 4 | ||||
| -rw-r--r-- | launcher/ui/setupwizard/ThemeWizardPage.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/launcher/ui/setupwizard/JavaWizardPage.cpp b/launcher/ui/setupwizard/JavaWizardPage.cpp index 14683778..2b70c47c 100644 --- a/launcher/ui/setupwizard/JavaWizardPage.cpp +++ b/launcher/ui/setupwizard/JavaWizardPage.cpp @@ -69,6 +69,7 @@ bool JavaWizardPage::validatePage() case JavaSettingsWidget::ValidationStatus::AllOK: { settings->set("JavaPath", m_java_widget->javaPath()); + return true; } case JavaSettingsWidget::ValidationStatus::JavaBad: { diff --git a/launcher/ui/setupwizard/ThemeWizardPage.cpp b/launcher/ui/setupwizard/ThemeWizardPage.cpp index 42826aba..1c336921 100644 --- a/launcher/ui/setupwizard/ThemeWizardPage.cpp +++ b/launcher/ui/setupwizard/ThemeWizardPage.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-only /* * Prism Launcher - Minecraft Launcher - * Copyright (C) 2022 Tayou <tayou@gmx.net> + * Copyright (C) 2022 Tayou <git@tayou.org> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -61,7 +61,7 @@ void ThemeWizardPage::updateIcons() void ThemeWizardPage::updateCat() { qDebug() << "Setting Cat"; - ui->catImagePreviewButton->setIcon(QIcon(QString(R"(:/backgrounds/%1)").arg(ThemeManager::getCatImage()))); + ui->catImagePreviewButton->setIcon(QIcon(QString(R"(%1)").arg(APPLICATION->getCatPack()))); } void ThemeWizardPage::retranslate() diff --git a/launcher/ui/setupwizard/ThemeWizardPage.h b/launcher/ui/setupwizard/ThemeWizardPage.h index 61a3d0c0..f3d40b6d 100644 --- a/launcher/ui/setupwizard/ThemeWizardPage.h +++ b/launcher/ui/setupwizard/ThemeWizardPage.h @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-only /* * Prism Launcher - Minecraft Launcher - * Copyright (C) 2022 Tayou <tayou@gmx.net> + * Copyright (C) 2022 Tayou <git@tayou.org> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |