[4.4.3] MuseSound promo: added the ability to specify the name of the cancel button from the server

Author: igorkorsukov

src/framework/update/internal/musesoundscheckupdatescenario.cpp

@@ -39,6 +39,7 @@ using namespace muse::actions;
 
 static const char* DEFAULT_IMAGE_URL = "qrc:/qml/Muse/Update/resources/muse_sounds_promo.png";
 static const TranslatableString DEFAULT_ACTION_TITLE("update", "Take me to Muse Hub");
+static const TranslatableString DEFAULT_CANCEL_TITLE("update", "No thanks");
 
 void MuseSoundsCheckUpdateScenario::delayedInit()
 {
@@ -152,6 +153,12 @@ void MuseSoundsCheckUpdateScenario::showReleaseInfo(const ReleaseInfo& info)
         query.addParam("actionTitle", Val(QString::fromStdString(info.actionTitle)));
     }
 
+    if (info.cancelTitle.empty()) {
+        query.addParam("cancelTitle", Val(DEFAULT_CANCEL_TITLE.qTranslated()));
+    } else {
+        query.addParam("cancelTitle", Val(QString::fromStdString(info.cancelTitle)));
+    }
+
     if (info.imageUrl.empty()) {
         query.addParam("imageUrl", Val(QString(DEFAULT_IMAGE_URL)));
     } else {

src/framework/update/internal/musesoundscheckupdateservice.cpp

@@ -22,8 +22,6 @@
 
 #include "musesoundscheckupdateservice.h"
 
-#include <QSslSocket>
-
 #include <QBuffer>
 #include <QJsonParseError>
 #include <QJsonObject>
@@ -195,6 +193,8 @@ muse::RetVal<ReleaseInfo> MuseSoundsCheckUpdateService::parseRelease(const QByte
     result.val.additionInfo.insert({ "features", Val(featuresList) });
 
     result.val.actionTitle = contentLocaleObj.value("action_title").toString().toStdString();
+    result.val.cancelTitle = contentLocaleObj.value("cancel_title").toString().toStdString();
+
     QJsonObject actionsObj = releaseObj.value("actions").toObject();
 
 #ifdef Q_OS_WIN

src/framework/update/qml/Muse/Update/MuseSoundsReleaseInfoDialog.qml

@@ -35,6 +35,7 @@ StyledDialogView {
     property alias features: featuresViewRepeater.model
     property alias imageUrl: image.source
     property alias actionTitle: buttons.defaultButtonName
+    property alias cancelTitle: buttons.cancelButtonName
 
     contentWidth: 530
     contentHeight: 510

src/framework/update/qml/Muse/Update/internal/MuseSoundsReleaseInfoBottomPanel.qml

@@ -29,6 +29,7 @@ RowLayout {
     id: root
 
     property alias defaultButtonName: openMuseHubButton.text
+    property alias cancelButtonName: cancelBtn.text
 
     property NavigationPanel navigationPanel: NavigationPanel {
         name: "UpdateBottomPanel"
@@ -45,11 +46,10 @@ RowLayout {
     }
 
     FlatButton {
+        id: cancelBtn
         Layout.alignment: Qt.AlignVCenter
         Layout.preferredWidth: (root.width - root.spacing) / 2
 
-        text: qsTrc("update", "No thanks")
-
         navigation.name: "NoButton"
         navigation.panel: root.navigationPanel
         navigation.column: 2

src/framework/update/updatetypes.h

@@ -54,6 +54,7 @@ struct ReleaseInfo {
     ValMap additionInfo;
 
     std::string actionTitle;        // title of action button
+    std::string cancelTitle;        // title of cancel button
     ValList actions;                // open app or web page url, try in order
 
     bool isValid() const