Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add teawie as a cat #715

Merged
merged 6 commits into from
Jan 9, 2023
Merged

add teawie as a cat #715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8140f51
feat: add teawie
getchoo Jan 7, 2023
a505132
feat: add spooky teawie
getchoo Jan 7, 2023
2dbd775
feat: add xmas teawie
getchoo Jan 7, 2023
e018b30
fix: make spooky teawie load
getchoo Jan 7, 2023
f5955a4
feat: add bday teawie
getchoo Jan 7, 2023
9de6927
feat: add CC BY-SA 4.0 info for teawie images
getchoo Jan 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions launcher/resources/backgrounds/backgrounds.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,17 @@
<file alias="rory-flat-xmas">rory-flat-xmas.png</file>
<file alias="rory-flat-bday">rory-flat-bday.png</file>
<file alias="rory-flat-spooky">rory-flat-spooky.png</file>
<!-- teawie images -->
<!-- copyright (c) SympathyTea 2023 -->
<!-- these are licensed under the CC BY-SA 4.0 and have been unmodified aside from downscaling -->
<!-- the full license with appropriate notices is avalible at https://creativecommons.org/licenses/by-sa/4.0/ -->
<file alias="teawie">teawie.png</file>
<!-- https://commons.wikimedia.org/wiki/File:Teawie.png -->
<file alias="teawie-xmas">teawie-xmas.png</file>
<!-- https://commons.wikimedia.org/wiki/File:Teawie_Holiday.png -->
<file alias="teawie-bday">teawie-bday.png</file>
<!-- https://commons.wikimedia.org/wiki/File:Teawie_Party.png -->
<file alias="teawie-spooky">teawie-spooky.png</file>
<!-- https://commons.wikimedia.org/wiki/File:Teawie_Halloween.png -->
</qresource>
</RCC>
Binary file added launcher/resources/backgrounds/teawie-bday.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/resources/backgrounds/teawie-spooky.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/resources/backgrounds/teawie-xmas.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added launcher/resources/backgrounds/teawie.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions launcher/ui/pages/global/LauncherPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,9 @@ void LauncherPage::applySettings()
case 2: // rory the cat flat edition
s->set("BackgroundCat", "rory-flat");
break;
case 3: // teawie
s->set("BackgroundCat", "teawie");
break;
}

s->set("MenuBarInsteadOfToolBar", ui->preferMenuBarCheckBox->isChecked());
Expand Down Expand Up @@ -424,6 +427,8 @@ void LauncherPage::loadSettings()
ui->themeBackgroundCat->setCurrentIndex(1);
} else if (cat == "rory-flat") {
ui->themeBackgroundCat->setCurrentIndex(2);
} else if (cat == "teawie") {
ui->themeBackgroundCat->setCurrentIndex(3);
}

{
Expand Down
5 changes: 5 additions & 0 deletions launcher/ui/pages/global/LauncherPage.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,11 @@
<string>Rory ID 11 (flat edition, drawn by Ashtaka)</string>
</property>
</item>
<item>
<property name="text">
<string>Teawie (drawn by SympathyTea)</string>
</property>
</item>
</widget>
</item>
</layout>
Expand Down