dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increase icons to include 128x128 and set global application icon

Browse Source 
Fixes #954
This commit is contained in:
Jonas Kvinge
2022-05-19 22:02:35 +02:00
parent a7f27add2d
commit 4a3a379871
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/iconloader.cpp
View File

@@ -63,7 +63,7 @@ QIcon IconLoader::Load(const QString &name, const int fixed_size, const int min_
QList<int> sizes; QList<int> sizes;
if (fixed_size == 0) { if (fixed_size == 0) {
sizes << 22 << 32 << 48 << 64; sizes << 22 << 32 << 48 << 64 << 128;
} }
else { else {
sizes << fixed_size; sizes << fixed_size;

2
src/core/mainwindow.cpp
View File

@@ -346,6 +346,8 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
// Initialize the UI // Initialize the UI
ui_->setupUi(this); ui_->setupUi(this);
setWindowIcon(IconLoader::Load("strawberry"));
album_cover_choice_controller_->Init(app); album_cover_choice_controller_->Init(app);
ui_->multi_loading_indicator->SetTaskManager(app_->task_manager()); ui_->multi_loading_indicator->SetTaskManager(app_->task_manager());

8
src/core/mainwindow.ui
View File

@@ -15,7 +15,7 @@
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../data/icons.qrc"> <iconset resource="../../data/icons.qrc">
<normaloff>:/icons/64x64/strawberry.png</normaloff>:/icons/64x64/strawberry.png</iconset> <normaloff>:/icons/128x128/strawberry.png</normaloff>:/icons/128x128/strawberry.png</iconset>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
<layout class="QVBoxLayout" name="layout_centralWidget"> <layout class="QVBoxLayout" name="layout_centralWidget">
@@ -749,9 +749,9 @@
</property> </property>
</action> </action>
<action name="action_save_all_playlists"> <action name="action_save_all_playlists">
<property name="text"> <property name="text">
<string>&amp;Save all playlists</string> <string>&amp;Save all playlists</string>
</property> </property>
</action> </action>
<action name="action_next_playlist"> <action name="action_next_playlist">
<property name="text"> <property name="text">

1
src/main.cpp
View File

@@ -193,6 +193,7 @@ int main(int argc, char *argv[]) {
return 0; return 0;
} }
QGuiApplication::setQuitOnLastWindowClosed(false); QGuiApplication::setQuitOnLastWindowClosed(false);
QGuiApplication::setWindowIcon(IconLoader::Load("strawberry"));
#if defined(USE_BUNDLE) && (defined(Q_OS_LINUX) || defined(Q_OS_MACOS)) #if defined(USE_BUNDLE) && (defined(Q_OS_LINUX) || defined(Q_OS_MACOS))
qLog(Debug) << "Looking for resources in" << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR; qLog(Debug) << "Looking for resources in" << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR;