Merge pull request #26200 from Eism/muse_score_com_logo_change

fixed #23313: changed musescore.com logo

Author: Eism

src/framework/cloud/audiocom/audiocomservice.cpp

@@ -73,7 +73,7 @@ CloudInfo AudioComService::cloudInfo() const
         AUDIOCOM_CLOUD_TITLE,
         AUDIOCOM_CLOUD_URL,
         AUDIOCOM_LOGO_URL,
-        logoColorForTheme(uiConfig()->currentTheme())
+        logoColor()
     };
 }
 

src/framework/cloud/internal/abstractcloudservice.cpp

@@ -33,6 +33,7 @@
 #include "multiinstances/resourcelockguard.h"
 #include "network/networkerrors.h"
 #include "global/iapplication.h"
+#include "draw/types/color.h"
 
 #include "oauthhttpserverreplyhandler.h"
 
@@ -456,10 +457,17 @@ void AbstractCloudService::openUrl(const QUrl& url)
     }
 }
 
-QString AbstractCloudService::logoColorForTheme(const ui::ThemeInfo& theme) const
+QString AbstractCloudService::logoColor() const
 {
-    if (ui::isDarkTheme(theme.codeKey)) {
-        return "#FFFFFF";
+    const ui::ThemeList& themens = uiConfig()->themes();
+    bool isDarkMode = uiConfig()->isDarkMode();
+
+    for (const ui::ThemeInfo& theme : themens) {
+        if ((isDarkMode && theme.codeKey == ui::DARK_THEME_CODE)
+            || (!isDarkMode && theme.codeKey == ui::LIGHT_THEME_CODE)) {
+            return theme.values[ui::FONT_PRIMARY_COLOR].toString();
+        }
     }
-    return "#000000";
+
+    return QString::fromStdString(draw::Color::BLACK.toString());
 }

src/framework/cloud/internal/abstractcloudservice.h

@@ -108,7 +108,7 @@ private slots:
 
     virtual Ret downloadAccountInfo() = 0;
 
-    virtual QString logoColorForTheme(const ui::ThemeInfo& theme) const;
+    QString logoColor() const;
 
     void setAccountInfo(const AccountInfo& info);
 

src/framework/cloud/musescorecom/musescorecomservice.cpp

@@ -51,7 +51,7 @@ static const QUrl MUSESCORECOM_SCORE_DOWNLOAD_SHARED_API_URL(MUSESCORECOM_API_RO
 static const QUrl MUSESCORECOM_UPLOAD_SCORE_API_URL(MUSESCORECOM_API_ROOT_URL + "/score/upload");
 static const QUrl MUSESCORECOM_UPLOAD_AUDIO_API_URL(MUSESCORECOM_API_ROOT_URL + "/score/audio");
 
-static const QString MUSESCORE_TEXT_LOGO("https://musescore.org/themes/musescore_theme/logo.svg");
+static const QString MUSESCORE_TEXT_LOGO("https://musescore.com/static/public/musescore/img/logo/musescore-logo.svg");
 
 static const QString SCORE_ID_KEY("score_id");
 static const QString EDITOR_SOURCE_KEY("editor_source");
@@ -75,7 +75,7 @@ CloudInfo MuseScoreComService::cloudInfo() const
         MUSESCORECOM_CLOUD_TITLE,
         MUSESCORECOM_CLOUD_URL,
         MUSESCORE_TEXT_LOGO,
-        logoColorForTheme(uiConfig()->currentTheme())
+        logoColor()
     };
 }
 
@@ -559,13 +559,3 @@ Ret MuseScoreComService::doUploadAudio(network::INetworkManagerPtr uploadManager
 
     return ret;
 }
-
-QString MuseScoreComService::logoColorForTheme(const ui::ThemeInfo& theme) const
-{
-    if (theme.codeKey == ui::LIGHT_THEME_CODE) {
-        return "#0065C3";
-    } else if (theme.codeKey == ui::DARK_THEME_CODE) {
-        return "#8EC9FF";
-    }
-    return AbstractCloudService::logoColorForTheme(theme);
-}

src/framework/cloud/musescorecom/musescorecomservice.h

@@ -69,8 +69,6 @@ class MuseScoreComService : public IMuseScoreComService, public AbstractCloudSer
 
     bool doUpdateTokens() override;
 
-    QString logoColorForTheme(const ui::ThemeInfo& theme) const override;
-
     network::RequestHeaders headers() const;
 
     Ret doDownloadScore(network::INetworkManagerPtr downloadManager, int scoreId, QIODevice& scoreData,

src/project/qml/MuseScore/Project/SaveToCloudDialog.qml

@@ -90,7 +90,7 @@ StyledDialogView {
                         anchors.left: parent.left
 
                         source: contentItem.cloudInfo.cloudLogoUrl
-                        sourceSize.height: 20
+                        sourceSize.height: 26
                     }
 
                     EffectColorOverlay {