diff --git a/resources/generate_resources.py b/resources/generate_resources.py index e48795f72..dc0cf1844 100755 --- a/resources/generate_resources.py +++ b/resources/generate_resources.py @@ -18,10 +18,10 @@ def isNotIgnored(file): return file.as_posix() not in ignored_files -all_files = list(filter(isNotIgnored, \ - filter(Path.is_file, Path('.').glob('**/*')))) -image_files = list(filter(isNotIgnored, \ - filter(Path.is_file, Path('.').glob('**/*.png')))) +all_files = sorted(list(filter(isNotIgnored, \ + filter(Path.is_file, Path('.').glob('**/*'))))) +image_files = sorted(list(filter(isNotIgnored, \ + filter(Path.is_file, Path('.').glob('**/*.png'))))) with open('./resources_autogenerated.qrc', 'w') as out: out.write(resources_header) diff --git a/resources/resources_autogenerated.qrc b/resources/resources_autogenerated.qrc index e1ffa3311..9f0569e3d 100644 --- a/resources/resources_autogenerated.qrc +++ b/resources/resources_autogenerated.qrc @@ -1,86 +1,88 @@ - icon.png - emojidata.txt - chatterino.desktop - error.png - .gitignore - tlds.txt - contributors.txt - pajaDank.png - chatterino.icns - icon.ico - emoji.json - buttons/mod.png - buttons/copyDark.svg - buttons/modModeDisabled.png - buttons/unmod.png + .gitignore + avatars/fourtf.png + avatars/pajlada.png + buttons/addSplit.png buttons/addSplitDark.png + buttons/ban.png + buttons/banRed.png + buttons/copyDark.png + buttons/copyDark.svg + buttons/copyDarkTheme.png + buttons/copyLight.png + buttons/copyLight.svg + buttons/emote.svg + buttons/emoteDark.svg + buttons/menuDark.png + buttons/menuLight.png + buttons/mod.png + buttons/modModeDisabled.png + buttons/modModeDisabled2.png + buttons/modModeEnabled.png + buttons/modModeEnabled2.png + buttons/search.png buttons/timeout.png buttons/trashCan.png buttons/trashcan.svg - buttons/modModeEnabled.png - buttons/copyLight.svg - buttons/modModeEnabled2.png - buttons/banRed.png - buttons/ban.png - buttons/emoteDark.svg - buttons/menuLight.png - buttons/emote.svg - buttons/update.png - buttons/addSplit.png - buttons/menuDark.png - buttons/updateError.png buttons/unban.png - buttons/copyLight.png - buttons/modModeDisabled2.png - buttons/copyDark.png + buttons/unmod.png + buttons/update.png + buttons/updateError.png + chatterino.desktop + chatterino.icns + contributors.txt + emoji.json + emojidata.txt + error.png examples/moving.gif examples/splitting.gif - twitch/prime.png - twitch/vip.png - twitch/cheer1.png - twitch/admin.png - twitch/broadcaster.png - twitch/verified.png - twitch/moderator.png - twitch/globalmod.png - twitch/automod.png - twitch/subscriber.png - twitch/staff.png - twitch/turbo.png - licenses/qt_lgpl-3.0.txt - licenses/emoji-data-source.txt - licenses/pajlada_settings.txt - licenses/openssl.txt - licenses/pajlada_signals.txt - licenses/rapidjson.txt - licenses/libcommuni_BSD3.txt + icon.ico + icon.png licenses/boost_boost.txt - licenses/websocketpp.txt + licenses/emoji-data-source.txt licenses/fmt_bsd2.txt - settings/aboutlogo.png - settings/ignore.svg - settings/notification2.svg - settings/theme.svg - settings/externaltools.svg - settings/advanced.svg + licenses/libcommuni_BSD3.txt + licenses/openssl.txt + licenses/pajlada_settings.txt + licenses/pajlada_signals.txt + licenses/qt_lgpl-3.0.txt + licenses/rapidjson.txt + licenses/websocketpp.txt + pajaDank.png + qss/settings.qss settings/about.svg - settings/notifications.svg - settings/behave.svg + settings/aboutlogo.png settings/accounts.svg - settings/emote.svg + settings/advanced.svg + settings/behave.svg + settings/browser.svg settings/commands.svg + settings/emote.svg + settings/externaltools.svg + settings/ignore.svg settings/keybinds.svg settings/moderation.svg - settings/browser.svg - avatars/pajlada.png - avatars/fourtf.png - qss/settings.qss + settings/notification2.svg + settings/notifications.svg + settings/theme.svg sounds/ping2.wav + split/down.png split/left.png split/move.png split/right.png - split/down.png split/up.png + tlds.txt + twitch/admin.png + twitch/automod.png + twitch/broadcaster.png + twitch/cheer1.png + twitch/globalmod.png + twitch/moderator.png + twitch/prime.png + twitch/staff.png + twitch/subscriber.png + twitch/turbo.png + twitch/verified.png + twitch/vip.png \ No newline at end of file diff --git a/src/autogenerated/ResourcesAutogen.cpp b/src/autogenerated/ResourcesAutogen.cpp index 8075ca026..54bd1db6e 100644 --- a/src/autogenerated/ResourcesAutogen.cpp +++ b/src/autogenerated/ResourcesAutogen.cpp @@ -11,6 +11,7 @@ Resources2::Resources2() this->buttons.ban = QPixmap(":/buttons/ban.png"); this->buttons.banRed = QPixmap(":/buttons/banRed.png"); this->buttons.copyDark = QPixmap(":/buttons/copyDark.png"); + this->buttons.copyDarkTheme = QPixmap(":/buttons/copyDarkTheme.png"); this->buttons.copyLight = QPixmap(":/buttons/copyLight.png"); this->buttons.menuDark = QPixmap(":/buttons/menuDark.png"); this->buttons.menuLight = QPixmap(":/buttons/menuLight.png"); diff --git a/src/autogenerated/ResourcesAutogen.hpp b/src/autogenerated/ResourcesAutogen.hpp index 467cbed9a..8d137fe36 100644 --- a/src/autogenerated/ResourcesAutogen.hpp +++ b/src/autogenerated/ResourcesAutogen.hpp @@ -3,8 +3,7 @@ namespace chatterino { -class Resources2 : public Singleton -{ +class Resources2 : public Singleton { public: Resources2(); @@ -18,6 +17,7 @@ public: QPixmap ban; QPixmap banRed; QPixmap copyDark; + QPixmap copyDarkTheme; QPixmap copyLight; QPixmap menuDark; QPixmap menuLight;