Merge pull request #5217 from Jojo-Schmitz/translations

fix #291992 and fix #291991: “Play Panel” and "Mixer" is untranslated
musescore · Jul 11, 2019 · fa50dff · fa50dff
2 parents 91b4788 + 2030719
commit fa50dff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/mscore/mixer.cpp b/mscore/mixer.cpp
@@ -72,7 +72,7 @@ char userRangeToReverb(double v) { return (char)qBound(0, (int)(v / 100.0 * 128.
 //---------------------------------------------------------
 
 Mixer::Mixer(QWidget* parent)
-    : QDockWidget("Mixer", parent),
+    : QDockWidget(qApp->translate("Mixer", "Mixer"), parent),
       showDetails(true),
       trackHolder(nullptr)
       {
@@ -221,7 +221,7 @@ void Mixer::on_partOnlyCheckBox_toggled(bool checked)
 
 void Mixer::retranslate(bool firstTime)
       {
-      setWindowTitle(tr("Mixer"));
+      setWindowTitle(qApp->translate("Mixer", "Mixer"));
       if (!firstTime) {
             for (int i = 0; i < trackAreaLayout->count(); i++) {
                   PartEdit* p = getPartAtIndex(i);

diff --git a/mscore/playpanel.cpp b/mscore/playpanel.cpp
@@ -34,7 +34,7 @@ namespace Ms {
 //---------------------------------------------------------
 
 PlayPanel::PlayPanel(QWidget* parent)
-    : QDockWidget("Play Panel", parent)
+    : QDockWidget(qApp->translate("PlayPanelBase", "Play Panel"), parent)
       {
       cachedTickPosition = -1;
       cachedTimePosition = -1;

diff --git a/mscore/plugin/mscorePlugins.cpp b/mscore/plugin/mscorePlugins.cpp
@@ -434,7 +434,7 @@ void MuseScore::pluginTriggered(QString pp)
             //view->setHeight(p->height());
             view->setResizeMode(QQuickView::SizeRootObjectToView);
             if (p->pluginType() == "dock") {
-                  QDockWidget* dock = new QDockWidget("Plugin", 0);
+                  QDockWidget* dock = new QDockWidget(view->title(), 0);
                   dock->setAttribute(Qt::WA_DeleteOnClose);
                   Qt::DockWidgetArea area = Qt::RightDockWidgetArea;
                   if (p->dockArea() == "left")

diff --git a/mscore/plugin/pluginCreator.cpp b/mscore/plugin/pluginCreator.cpp
@@ -342,7 +342,7 @@ void PluginCreator::runClicked()
             item->setParentItem(view->contentItem());
 
             if (item->pluginType() == "dock") {
-                  dock = new QDockWidget("Plugin", 0);
+                  dock = new QDockWidget(view->title(), 0);
                   dock->setAttribute(Qt::WA_DeleteOnClose);
                   dock->setWidget(QWidget::createWindowContainer(view));
                   dock->widget()->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));