added icon for dialog

musescore · Feb 28, 2025 · 0bbe67b · 0bbe67b
1 parent 1372c0a
commit 0bbe67b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 0 deletions.
diff --git a/src/app/app.qrc b/src/app/app.qrc
@@ -12,5 +12,7 @@
         <file>configs/data/shortcuts_mac.xml</file>
         <file>configs/data/shortcuts_azerty.xml</file>
         <file>configs/workspaces.cfg</file>
+        <file>configs/ui.cfg</file>
+        <file alias="resources/appIcon.png">../../share/icons/AppIcon/MS4_AppIcon_96x96.png</file>
     </qresource>
 </RCC>
diff --git a/src/app/configs/ui.cfg b/src/app/configs/ui.cfg
@@ -0,0 +1,3 @@
+{
+    "appIconPath": ":/resources/appIcon.png"
+}
diff --git a/src/framework/ui/internal/uiconfiguration.cpp b/src/framework/ui/internal/uiconfiguration.cpp
@@ -59,6 +59,8 @@ static const int TOOLTIP_DELAY = 500;
 
 void UiConfiguration::init()
 {
+    m_config = ConfigReader::read(":/configs/ui.cfg");
+
     settings()->setDefaultValue(UI_CURRENT_THEME_CODE_KEY, Val(LIGHT_THEME_CODE));
     settings()->setDefaultValue(UI_FOLLOW_SYSTEM_THEME_KEY, Val(false));
     settings()->setDefaultValue(UI_FONT_FAMILY_KEY, Val(defaultFontFamily()));
@@ -513,6 +515,11 @@ muse::async::Notification UiConfiguration::iconsFontChanged() const
     return m_iconsFontChanged;
 }
 
+io::path_t UiConfiguration::appIconPath() const
+{
+    return m_config.value("appIconPath").toPath();
+}
+
 std::string UiConfiguration::musicalFontFamily() const
 {
     return settings()->value(UI_MUSICAL_FONT_FAMILY_KEY).toString();

diff --git a/src/framework/ui/internal/uiconfiguration.h b/src/framework/ui/internal/uiconfiguration.h
@@ -81,6 +81,8 @@ class UiConfiguration : public IUiConfiguration, public Injectable, public async
     int iconsFontSize(IconSizeType type) const override;
     async::Notification iconsFontChanged() const override;
 
+    io::path_t appIconPath() const override;
+
     std::string musicalFontFamily() const override;
     int musicalFontSize() const override;
     async::Notification musicalFontChanged() const override;
@@ -156,6 +158,8 @@ class UiConfiguration : public IUiConfiguration, public Injectable, public async
     ThemeList m_themes;
     size_t m_currentThemeIndex = 0;
     std::optional<double> m_customDPI;
+
+    Config m_config;
 };
 }
 

diff --git a/src/framework/ui/iuiconfiguration.h b/src/framework/ui/iuiconfiguration.h
@@ -75,6 +75,8 @@ class IUiConfiguration : MODULE_EXPORT_INTERFACE
     virtual int iconsFontSize(IconSizeType type) const = 0;
     virtual async::Notification iconsFontChanged() const = 0;
 
+    virtual io::path_t appIconPath() const = 0;
+
     virtual std::string musicalFontFamily() const = 0;
     virtual int musicalFontSize() const = 0;
     virtual async::Notification musicalFontChanged() const = 0;

diff --git a/src/framework/ui/tests/mocks/uiconfigurationmock.h b/src/framework/ui/tests/mocks/uiconfigurationmock.h
@@ -61,6 +61,8 @@ class UiConfigurationMock : public IUiConfiguration
     MOCK_METHOD(int, iconsFontSize, (IconSizeType), (const, override));
     MOCK_METHOD(async::Notification, iconsFontChanged, (), (const, override));
 
+    MOCK_METHOD(io::path_t, appIconPath, (), (const, override));
+
     MOCK_METHOD(std::string, musicalFontFamily, (), (const, override));
     MOCK_METHOD(int, musicalFontSize, (), (const, override));
     MOCK_METHOD(async::Notification, musicalFontChanged, (), (const, override));

diff --git a/src/framework/uicomponents/view/popupwindow/popupwindow_qquickview.cpp b/src/framework/uicomponents/view/popupwindow/popupwindow_qquickview.cpp
@@ -63,6 +63,7 @@ void PopupWindow_QQuickView::init(QQmlEngine* engine, bool isDialogMode, bool is
     // dialog
     if (isDialogMode) {
         m_view->setFlags(Qt::Dialog);
+        m_view->setIcon(QIcon(uiConfiguration()->appIconPath().toString()));
 
         if (isFrameless) {
             m_view->setColor(QColor(Qt::transparent));