Merge pull request #3114 from IsaacWeiss/184381-dialog-titles-2.1

Fix #184381: Unnecessary "MuseScore: " prepended to most window titles and wrong title of Split Staff dialog for 2.1
musescore · Mar 28, 2017 · a94d6c4 · a94d6c4
2 parents ced3364 + ae31f1d
commit a94d6c4
Show file tree

Hide file tree

Showing 69 changed files with 153 additions and 169 deletions.
diff --git a/awl/colorlabel.cpp b/awl/colorlabel.cpp
@@ -95,7 +95,7 @@ void ColorLabel::mousePressEvent(QMouseEvent*)
       if (_pixmap)
             return;
       QColor c = QColorDialog::getColor(_color, this,
-         tr("MuseScore: Select Color"),
+         tr("Select Color"),
          QColorDialog::ShowAlphaChannel
          );
       if (c.isValid()) {

diff --git a/libmscore/scorefile.cpp b/libmscore/scorefile.cpp
@@ -384,7 +384,7 @@ bool Score::saveFile()
             }
 
       if (temp.error() != QFile::NoError) {
-            MScore::lastError = tr("MuseScore: Save File failed: %1").arg(temp.errorString());
+            MScore::lastError = tr("Save File failed: %1").arg(temp.errorString());
             return false;
             }
       temp.close();
@@ -403,7 +403,7 @@ bool Score::saveFile()
             if (dir.exists(backupName)) {
                   if (!dir.remove(backupName)) {
 //                      if (!MScore::noGui)
-//                            QMessageBox::critical(0, tr("MuseScore: Save File"),
+//                            QMessageBox::critical(0, tr("Save File"),
 //                               tr("Removing old backup file ") + backupName + tr(" failed"));
                         }
                   }
@@ -415,7 +415,7 @@ bool Score::saveFile()
             if (dir.exists(name)) {
                   if (!dir.rename(name, backupName)) {
 //                      if (!MScore::noGui)
-//                            QMessageBox::critical(0, tr("MuseScore: Save File"),
+//                            QMessageBox::critical(0, tr("Save File"),
 //                               tr("Renaming old file <")
 //                               + name + tr("> to backup <") + backupName + tr("> failed"));
                         }
@@ -431,7 +431,7 @@ bool Score::saveFile()
             if (dir.exists(name)) {
                   if (!dir.remove(name)) {
 //                      if (!MScore::noGui)
-//                            QMessageBox::critical(0, tr("MuseScore: Save File"),
+//                            QMessageBox::critical(0, tr("Save File"),
 //                               tr("Removing old file") + name + tr(" failed"));
                         }
                   }

diff --git a/mscore/album.cpp b/mscore/album.cpp
@@ -240,7 +240,7 @@ bool Album::read(const QString& p)
       QFile f(_path);
       if (!f.open(QIODevice::ReadOnly)) {
             QMessageBox::warning(0,
-               QWidget::tr("MuseScore: Open Album failed"),
+               QWidget::tr("Open Album failed"),
                QString(strerror(errno)),
                QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
             return false;

diff --git a/mscore/albummanager.cpp b/mscore/albummanager.cpp
@@ -73,7 +73,7 @@ void AlbumManager::addClicked()
       {
       QStringList files = mscore->getOpenScoreNames(
          tr("MuseScore Files") + " (*.mscz *.mscx)",
-         tr("MuseScore: Add Score")
+         tr("Add Score")
          );
       if (files.isEmpty())
             return;
@@ -99,7 +99,7 @@ void AlbumManager::loadClicked()
       {
       QStringList files = mscore->getOpenScoreNames(
          tr("MuseScore Album Files") + " (*.album)",
-         tr("MuseScore: Load Album")
+         tr("Load Album")
          );
       if (files.isEmpty())
             return;
@@ -139,14 +139,14 @@ void AlbumManager::createScoreClicked()
                   saveDirectory = preferences.myScoresPath;
             QString fname   = QString("%1/%2.mscz").arg(saveDirectory).arg(album->name());
             QString fn     = mscore->getSaveScoreName(
-            QWidget::tr("MuseScore: Save Album into Score"),
+            QWidget::tr("Save Album into Score"),
                   fname,
                   filter
             );
             if (fn.isEmpty())
                   return;
             if (!album->createScore(fn, checkBoxAddPageBreak->isChecked(), checkBoxAddSectionBreak->isChecked()))
-                  QMessageBox::critical(mscore, QWidget::tr("MuseScore: Save File"), tr("Error while creating score from album."));
+                  QMessageBox::critical(mscore, QWidget::tr("Save File"), tr("Error while creating score from album."));
             }
       }
 
@@ -304,7 +304,7 @@ void AlbumManager::writeAlbum()
             QString home = preferences.myScoresPath;
             QString albumName = album->name();
             QString fn = mscore->getSaveScoreName(
-               QWidget::tr("MuseScore: Save Album"),
+               QWidget::tr("Save Album"),
                albumName,
                QWidget::tr("MuseScore Files") + " (*.album)"
                );
@@ -320,14 +320,14 @@ void AlbumManager::writeAlbum()
       if (!f.open(QIODevice::WriteOnly)) {
             QString s = QWidget::tr("Open Album File\n%1\nfailed: ")
                + QString(strerror(errno));
-            QMessageBox::critical(mscore, QWidget::tr("MuseScore: Open Album File"), s.arg(album->path()));
+            QMessageBox::critical(mscore, QWidget::tr("Open Album File"), s.arg(album->path()));
             return;
             }
       Xml xml(&f);
       album->write(xml);
       if (f.error() != QFile::NoError) {
             QString s = QWidget::tr("Write Album failed: ") + f.errorString();
-            QMessageBox::critical(0, QWidget::tr("MuseScore: Write Album"), s);
+            QMessageBox::critical(0, QWidget::tr("Write Album"), s);
             }
       }
 

diff --git a/mscore/albummanager.ui b/mscore/albummanager.ui
@@ -14,7 +14,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Album Manager</string>
+   <string>Album Manager</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

diff --git a/mscore/alsa.cpp b/mscore/alsa.cpp
@@ -667,7 +667,7 @@ void AlsaAudio::alsaLoop()
       rt_param.sched_priority = 50;
       int rv = pthread_setschedparam(pthread_self(), SCHED_FIFO, &rt_param);
       if (rv == -1)
-            perror("MuseScore: set realtime scheduler failed");
+            perror("Set realtime scheduler failed");
 
       if (!alsa->pcmStart()) {
             alsa->pcmStop();

diff --git a/mscore/articulation.ui b/mscore/articulation.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Articulation Properties</string>
+   <string>Articulation Properties</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>

diff --git a/mscore/bend.ui b/mscore/bend.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Bend Properties</string>
+   <string>Bend Properties</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="verticalSpacing">

diff --git a/mscore/breaksdialog.ui b/mscore/breaksdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Add/Remove Line Breaks</string>
+   <string>Add/Remove Line Breaks</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>

diff --git a/mscore/capella.cpp b/mscore/capella.cpp
@@ -2673,7 +2673,7 @@ Score::FileError importCapella(Score* score, const QString& name)
       catch (Capella::Error errNo) {
             if (!MScore::noGui) {
                   QMessageBox::warning(0,
-                     QWidget::tr("MuseScore: Import Capella"),
+                     QWidget::tr("Import Capella"),
                      QWidget::tr("Load failed: ") + cf.error(errNo),
                      QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
                   }

diff --git a/mscore/debugger/debugger.cpp b/mscore/debugger/debugger.cpp
@@ -598,7 +598,7 @@ void Debugger::updateElement(Element* el)
       if (!found)
             qDebug("Debugger: element not found %s\n", el->name());
 
-      setWindowTitle(QString("MuseScore: Debugger: ") + el->name());
+      setWindowTitle(QString("Debugger: ") + el->name());
 
       ShowElementBase* ew = elementViews[int(el->type())];
       if (ew == 0) {

diff --git a/mscore/drumroll.cpp b/mscore/drumroll.cpp
@@ -194,7 +194,7 @@ void DrumrollEditor::setStaff(Staff* st)
       {
       staff = st;
       _score = staff->score();
-      setWindowTitle(tr("MuseScore: <%1> Staff: %2").arg(_score->name()).arg(st->idx()));
+      setWindowTitle(tr("<%1> Staff: %2").arg(_score->name()).arg(st->idx()));
       TempoMap* tl = _score->tempomap();
       TimeSigMap*  sl = _score->sigmap();
       for (int i = 0; i < 3; ++i)

diff --git a/mscore/editdrumset.cpp b/mscore/editdrumset.cpp
@@ -370,7 +370,7 @@ void EditDrumset::save()
       if (!f.open(QIODevice::WriteOnly)) {
             QString s = tr("Open File\n%1\nfailed: ")
                + QString(strerror(errno));
-            QMessageBox::critical(mscore, tr("MuseScore: Open File"), s.arg(f.fileName()));
+            QMessageBox::critical(mscore, tr("Open File"), s.arg(f.fileName()));
             return;
             }
       valueChanged();  //save last changes in name
@@ -381,7 +381,7 @@ void EditDrumset::save()
       xml.etag();
       if (f.error() != QFile::NoError) {
             QString s = tr("Write File failed: ") + f.errorString();
-            QMessageBox::critical(this, tr("MuseScore: Write Drumset"), s);
+            QMessageBox::critical(this, tr("Write Drumset"), s);
             }
       }
 

diff --git a/mscore/editdrumset.ui b/mscore/editdrumset.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Edit Drumset</string>
+   <string>Edit Drumset</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

diff --git a/mscore/editinstrument.ui b/mscore/editinstrument.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Edit Instrument Properties</string>
+   <string>Edit Instrument Properties</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">

diff --git a/mscore/editraster.ui b/mscore/editraster.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Edit Grid</string>
+   <string>Edit Grid</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>

diff --git a/mscore/editstaff.ui b/mscore/editstaff.ui
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Edit Staff/Part Properties</string>
+   <string>Edit Staff/Part Properties</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="0" colspan="2">

diff --git a/mscore/editstafftype.ui b/mscore/editstafftype.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Edit Staff Type</string>
+   <string>Edit Staff Type</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>

diff --git a/mscore/editstyle.ui b/mscore/editstyle.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Edit Style</string>
+   <string>Edit Style</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_11">
    <item row="0" column="1">

diff --git a/mscore/excerptsdialog.ui b/mscore/excerptsdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MuseScore: Parts</string>
+   <string>Parts</string>
   </property>
   <layout class="QGridLayout">
    <item row="0" column="0">