0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #766 from TayouVR/change-cat-on-settings-change

Browse Source 
closes https://github.com/PrismLauncher/PrismLauncher/issues/763
This commit is contained in:
flow 2023-01-20 08:36:08 -08:00 committed by GitHub
commit b9df10c8bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/Application.h
View File

@ -208,6 +208,7 @@ signals:
void updateAllowedChanged(bool status); void updateAllowedChanged(bool status);
void globalSettingsAboutToOpen(); void globalSettingsAboutToOpen();
void globalSettingsClosed(); void globalSettingsClosed();
int currentCatChanged(int index);
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
void clickedOnDock(); void clickedOnDock();

5
launcher/ui/MainWindow.cpp
View File

@ -974,6 +974,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
ui->actionCAT->setChecked(cat_enable); ui->actionCAT->setChecked(cat_enable);
// NOTE: calling the operator like that is an ugly hack to appease ancient gcc... // NOTE: calling the operator like that is an ugly hack to appease ancient gcc...
connect(ui->actionCAT.operator->(), SIGNAL(toggled(bool)), SLOT(onCatToggled(bool))); connect(ui->actionCAT.operator->(), SIGNAL(toggled(bool)), SLOT(onCatToggled(bool)));
connect(APPLICATION, &Application::currentCatChanged, this, &MainWindow::onCatChanged);
setCatBackground(cat_enable); setCatBackground(cat_enable);
} }
@ -2076,6 +2077,10 @@ void MainWindow::newsButtonClicked()
news_dialog.exec(); news_dialog.exec();
} }
void MainWindow::onCatChanged(int) {
setCatBackground(APPLICATION->settings()->get("TheCat").toBool());
}
void MainWindow::on_actionAbout_triggered() void MainWindow::on_actionAbout_triggered()
{ {
AboutDialog dialog(this); AboutDialog dialog(this);

2
launcher/ui/MainWindow.h
View File

@ -90,6 +90,8 @@ protected:
private slots: private slots:
void onCatToggled(bool); void onCatToggled(bool);
void onCatChanged(int);
void on_actionAbout_triggered(); void on_actionAbout_triggered();
void on_actionAddInstance_triggered(); void on_actionAddInstance_triggered();

2
launcher/ui/pages/global/LauncherPage.cpp
View File

@ -106,6 +106,8 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
} }
connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview())); connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview())); connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
connect(ui->themeCustomizationWidget, &ThemeCustomizationWidget::currentCatChanged, APPLICATION, &Application::currentCatChanged);
} }
LauncherPage::~LauncherPage() LauncherPage::~LauncherPage()