remove duplicate shortcuts, more capitals

musescore · Aug 20, 2012 · 2a51c5a · 2a51c5a
1 parent b2243f0
commit 2a51c5a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 70 deletions.
diff --git a/mscore/actions.cpp b/mscore/actions.cpp
@@ -1940,18 +1940,18 @@ Shortcut Shortcut::sc[] = {
          QT_TRANSLATE_NOOP("action","Layers")
          ),
       Shortcut(
-         STATE_NORMAL,
+         STATE_NORMAL | STATE_NOTE_ENTRY,
          0,
          "next-score",
          Qt::ApplicationShortcut,
-         QT_TRANSLATE_NOOP("action","next score")
+         QT_TRANSLATE_NOOP("action","Next Score")
          ),
       Shortcut(
-         STATE_NORMAL,
+         STATE_NORMAL | STATE_NOTE_ENTRY,
          0,
          "previous-score",
          Qt::ApplicationShortcut,
-         QT_TRANSLATE_NOOP("action","previous score")
+         QT_TRANSLATE_NOOP("action","Previous Score")
          ),
       Shortcut(
          STATE_INIT | STATE_DISABLED | STATE_NORMAL | STATE_NOTE_ENTRY | STATE_EDIT | STATE_LYRICS_EDIT | STATE_PLAY | STATE_SEARCH | STATE_FOTO,
@@ -1996,18 +1996,6 @@ Shortcut Shortcut::sc[] = {
          "figured-bass",
          QT_TRANSLATE_NOOP("action","Figured Bass")
          ),
-      Shortcut(
-         STATE_NORMAL | STATE_NOTE_ENTRY,
-         0,
-         "next-score",
-         QT_TRANSLATE_NOOP("action","Next Score")
-         ),
-      Shortcut(
-         STATE_NORMAL | STATE_NOTE_ENTRY,
-         0,
-         "prev-score",
-         QT_TRANSLATE_NOOP("action","Previous Score")
-         ),
       Shortcut(
          STATE_NORMAL,
          0,

diff --git a/mscore/album.ui b/mscore/album.ui
@@ -29,7 +29,7 @@
      <item>
       <widget class="QLineEdit" name="albumName">
        <property name="toolTip">
-        <string>album name</string>
+        <string>Album Name</string>
        </property>
       </widget>
      </item>
@@ -60,7 +60,7 @@
      <item row="6" column="1">
       <widget class="QPushButton" name="remove">
        <property name="toolTip">
-        <string>remove current score</string>
+        <string>Remove Current Score</string>
        </property>
        <property name="text">
         <string>Remove Score</string>
@@ -74,7 +74,7 @@
      <item row="3" column="1">
       <widget class="QPushButton" name="down">
        <property name="toolTip">
-        <string>move current score down in list</string>
+        <string>Move Current Score Down in List</string>
        </property>
        <property name="text">
         <string>Down</string>
@@ -84,7 +84,7 @@
      <item row="2" column="1">
       <widget class="QPushButton" name="up">
        <property name="toolTip">
-        <string>move current score up in list</string>
+        <string>Move Current Score Up in List</string>
        </property>
        <property name="text">
         <string>Up</string>
@@ -101,7 +101,7 @@
      <item>
       <widget class="QPushButton" name="createNew">
        <property name="toolTip">
-        <string>create new album</string>
+        <string>Create New Album</string>
        </property>
        <property name="text">
         <string>New</string>
@@ -111,7 +111,7 @@
      <item>
       <widget class="QPushButton" name="load">
        <property name="toolTip">
-        <string>load an existing album</string>
+        <string>Load an Existing Album</string>
        </property>
        <property name="text">
          <string>Load</string>

diff --git a/mscore/data/shortcuts.xml b/mscore/data/shortcuts.xml
@@ -720,14 +720,6 @@
     <key>figured-bass</key>
     <seq>Ctrl+G</seq>
     </SC>
-  <SC>
-    <key>next-score</key>
-    <seq>F3</seq>
-    </SC>
-  <SC>
-    <key>prev-score</key>
-    <seq>Shift+F3</seq>
-    </SC>
   <SC>
     <key>transpose-up</key>
     <seq>F2</seq>

diff --git a/mscore/instrdialog.ui b/mscore/instrdialog.ui
@@ -211,7 +211,7 @@
       </column>
       <column>
        <property name="text">
-        <string>visible</string>
+        <string>Visible</string>
        </property>
       </column>
       <column>
@@ -221,10 +221,10 @@
       </column>
       <column>
        <property name="text">
-        <string>linked</string>
+        <string>Linked</string>
        </property>
        <property name="toolTip">
-        <string>staff linked to previous</string>
+        <string>Staff Linked to Previous</string>
        </property>
       </column>
      </widget>

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -3803,35 +3803,6 @@ void MuseScore::loadFile(const QUrl& url)
       networkManager->get(QNetworkRequest(url));
       }
 
-//---------------------------------------------------------
-//   gotoNextScore
-//---------------------------------------------------------
-
-void MuseScore::gotoNextScore()
-      {
-      int idx = tab1->currentIndex();
-      int n   = tab1->count();
-      if (idx >= (n-1))
-            idx = 0;
-      else
-            ++idx;
-      tab1->setCurrentIndex(idx);
-      }
-
-//---------------------------------------------------------
-//   gotoPreviousScore
-//---------------------------------------------------------
-
-void MuseScore::gotoPreviousScore()
-      {
-      int idx = tab1->currentIndex();
-      if (idx == 0)
-            idx = tab1->count() -1;
-      else
-            --idx;
-      tab1->setCurrentIndex(idx);
-      }
-
 //---------------------------------------------------------
 //   collectMatch
 //---------------------------------------------------------
@@ -4333,9 +4304,9 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
       else if (cmd == "page-settings")
             showPageSettings();
       else if (cmd == "next-score")
-            gotoNextScore();
+            changeScore(1);
       else if (cmd == "previous-score")
-            gotoPreviousScore();
+            changeScore(1);
       else if (cmd == "transpose")
             transpose();
       else if (cmd == "tuplet-dialog")
@@ -4410,10 +4381,6 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
             addTempo();
       else if (cmd == "metronome")  // no action
             ;
-      else if (cmd == "next-score")
-            changeScore(1);
-      else if (cmd == "prev-score")
-            changeScore(-1);
       else if (cmd == "viewmode") {
             if (cs) {
                   if (cs->layoutMode() == LayoutPage) {

diff --git a/mscore/musescore.h b/mscore/musescore.h
@@ -386,8 +386,6 @@ class MuseScore : public QMainWindow {
       void showMediaDialog();
       void showAlbumManager();
       void showLayerManager();
-      void gotoNextScore();
-      void gotoPreviousScore();
       void updateUndoRedo();
       void cmdAddChordName2();
       static void convertCapella(Score*, Capella* cap);