Skip to content

Commit

Permalink
🪩 main: v1.2.0-alpha.3 (#68)
Browse files Browse the repository at this point in the history
New icons & logo
  • Loading branch information
Sclafus authored Jun 11, 2023
2 parents d70d1cc + ba2e59e commit 3f02351
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 13 deletions.
10 changes: 5 additions & 5 deletions forms/preferences.ui
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/images/resources/images/gosumemory.ico</normaloff>:/images/resources/images/gosumemory.ico</iconset>
<normaloff>:/resources/images/logo_gosumemory.ico</normaloff>:/resources/images/logo_gosumemory.ico</iconset>
</property>
</item>
<item>
Expand All @@ -56,7 +56,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/images/resources/images/twitch_logo.png</normaloff>:/images/resources/images/twitch_logo.png</iconset>
<normaloff>:/resources/images/logo_twitch.png</normaloff>:/resources/images/logo_twitch.png</iconset>
</property>
</item>
<item>
Expand All @@ -65,7 +65,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/images/resources/images/osu_logo.png</normaloff>:/images/resources/images/osu_logo.png</iconset>
<normaloff>:/resources/images/logo_osu.png</normaloff>:/resources/images/logo_osu.png</iconset>
</property>
</item>
<item>
Expand All @@ -74,7 +74,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/images/resources/images/backup_and_restore.png</normaloff>:/images/resources/images/backup_and_restore.png</iconset>
<normaloff>:/resources/images/icons8-backup.png</normaloff>:/resources/images/icons8-backup.png</iconset>
</property>
</item>
<item>
Expand All @@ -83,7 +83,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/images/resources/images/format_paint.png</normaloff>:/images/resources/images/format_paint.png</iconset>
<normaloff>:/resources/images/icons8-paint-bucket.png</normaloff>:/resources/images/icons8-paint-bucket.png</iconset>
</property>
</item>
</widget>
Expand Down
20 changes: 13 additions & 7 deletions resources.qrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<RCC>
<qresource prefix="/images">
<file>resources/images/format_paint.png</file>
<file>resources/images/gosumemory.ico</file>
<file>resources/images/twitch_logo.png</file>
<file>resources/images/osu_logo.png</file>
<file>resources/images/backup_and_restore.png</file>
</qresource>
<qresource>
<!-- Logo -->
<file>resources/logo/logo.svg</file>
<file>resources/logo/logo.ico</file>
<file>resources/logo/logo.png</file>
<!-- Icons8 -->
<file>resources/images/icons8-backup.png</file>
<file>resources/images/icons8-paint-bucket.png</file>
<!-- Others -->
<file>resources/images/logo_gosumemory.ico</file>
<file>resources/images/logo_twitch.png</file>
<file>resources/images/logo_osu.png</file>
</qresource>
</RCC>
Binary file removed resources/images/backup_and_restore.png
Binary file not shown.
Binary file removed resources/images/format_paint.png
Binary file not shown.
Binary file added resources/images/icons8-backup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/images/icons8-paint-bucket.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes
File renamed without changes
Binary file added resources/logo/logo.ico
Binary file not shown.
Binary file added resources/logo/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
4 changes: 3 additions & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <QApplication>
#include <QIcon>
#include <QSettings>
#include "mainwindow.h"

Expand All @@ -7,7 +8,8 @@ int main(int argc, char **argv) {
app.setOrganizationName("miraya");
app.setOrganizationDomain("github.com/MirayaProject");
app.setApplicationName("bot");
app.setApplicationVersion("1.2.0-alpha.2");
app.setApplicationVersion("1.2.0-alpha.3");
app.setWindowIcon(QIcon(":/resources/logo/logo.png"));
MainWindow mw;
mw.show();
return app.exec();
Expand Down

0 comments on commit 3f02351

Please sign in to comment.