diff options
author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-30 15:33:46 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-30 15:33:46 -0700 |
commit | b9fe37aec14b7cc61cbef09d5d2256f68a48d220 (patch) | |
tree | d2f5422ffe3a2c4732068bdee3b6fede3404fb8e /launcher/ui/setupwizard | |
parent | 520594e5296b09205e55bc018b1f759df5725e96 (diff) | |
parent | 9137721e8e5b44f2338a36874a393435cbc6daa3 (diff) | |
download | PrismLauncher-b9fe37aec14b7cc61cbef09d5d2256f68a48d220.tar.gz PrismLauncher-b9fe37aec14b7cc61cbef09d5d2256f68a48d220.tar.bz2 PrismLauncher-b9fe37aec14b7cc61cbef09d5d2256f68a48d220.zip |
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/ui/setupwizard')
-rw-r--r-- | launcher/ui/setupwizard/ThemeWizardPage.cpp | 4 | ||||
-rw-r--r-- | launcher/ui/setupwizard/ThemeWizardPage.h | 2 |
2 files changed, 3 insertions, 3 deletions
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 |