Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1510 from xslendix/oh_yeah_big_floppa_time_sunglasses_emoji

Browse Source 
Add Floppa :^)
This commit is contained in:
Lenny McLennington 2022-12-06 00:26:00 +00:00 committed by GitHub
commit 3340d2c814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
launcher/resources/backgrounds/backgrounds.qrc
View File

@ -7,5 +7,8 @@
<file alias="jinxCat">jinxbg.png</file>
<file alias="jinxCatmas">jinxmas.png</file>
<file alias="jinxCattiversary">jinxversary.png</file>
<file alias="floppaCat">floppabg.png</file>
<file alias="floppaCatmas">floppaxmas.png</file>
<file alias="floppaCattiversary">floppaversary.png</file>
</qresource>
</RCC>

BIN
launcher/resources/backgrounds/floppabg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 162 KiB

BIN
launcher/resources/backgrounds/floppaversary.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 295 KiB

BIN
launcher/resources/backgrounds/floppaxmas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 326 KiB

7
launcher/ui/MainWindow.cpp
View File

@ -1605,10 +1605,11 @@ void MainWindow::setCatBackground(bool enabled)
QDateTime xmas(QDate(now.date().year(), 12, 25), QTime(0, 0));
QString cat = "default";
if(APPLICATION->settings()->get("CatStyle").toString() == "Jinx")
{
QString catStyleOpt = APPLICATION->settings()->get("CatStyle").toString();
if(catStyleOpt == "Floppa")
cat = "floppa";
else if(catStyleOpt == "Jinx")
cat = "jinx";
}
if(non_stupid_abs(now.daysTo(xmas)) <= 4) {
cat += "Catmas";

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

@ -440,14 +440,13 @@ void LauncherPage::loadSettings()
auto currentCatStyle = s->get("CatStyle").toString();
ui->themeComboBoxCat->addItem("BackgroundCat");
ui->themeComboBoxCat->addItem("Jinx");
if(currentCatStyle == "Jinx")
{
ui->themeComboBoxCat->addItem("Floppa");
if(currentCatStyle == "Floppa")
ui->themeComboBoxCat->setCurrentIndex(2);
else if(currentCatStyle == "Jinx")
ui->themeComboBoxCat->setCurrentIndex(1);
}
else
{
ui->themeComboBoxCat->setCurrentIndex(0);
}
}
// Toolbar/menu bar settings (not applicable if native menu bar is present)