use icons from resource in ui files rather than use setIcon()

so the dialogs look closer to reality in QtCreator, also reduce strings to translate
musescore · Jun 20, 2016 · cc19cb4 · cc19cb4
1 parent a6eae81
commit cc19cb4
Show file tree

Hide file tree

Showing 64 changed files with 1,296 additions and 380 deletions.
diff --git a/fluid/fluid_gui.ui b/fluid/fluid_gui.ui
@@ -50,7 +50,11 @@
         <string/>
        </property>
        <property name="text">
-        <string notr="true" extracomment="gets replaced with arrowUp icon">↑</string>
+        <string notr="true"/>
+       </property>
+       <property name="icon">
+        <iconset resource="../mscore/musescore.qrc">
+         <normaloff>:/data/icons/arrow_up.svg</normaloff>:/data/icons/arrow_up.svg</iconset>
        </property>
       </widget>
      </item>
@@ -69,7 +73,11 @@
         <string>Move Soundfont down</string>
        </property>
        <property name="text">
-        <string notr="true" extracomment="gets replaced with arrowDown icon">↓</string>
+        <string notr="true"/>
+       </property>
+       <property name="icon">
+        <iconset resource="../mscore/musescore.qrc">
+         <normaloff>:/data/icons/arrow_down.svg</normaloff>:/data/icons/arrow_down.svg</iconset>
        </property>
       </widget>
      </item>
@@ -116,6 +124,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../mscore/musescore.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/fluid/fluidgui.cpp b/fluid/fluidgui.cpp
@@ -85,8 +85,6 @@ FluidGui::FluidGui(Synthesizer* s)
       connect(soundFontDelete, SIGNAL(clicked()), SLOT(soundFontDeleteClicked()));
       connect(soundFonts,      SIGNAL(itemSelectionChanged ()),  SLOT(updateUpDownButtons()));
       updateUpDownButtons();
-      soundFontUp->setIcon(*icons[int(Icons::arrowUp_ICON)]);
-      soundFontDown->setIcon(*icons[int(Icons::arrowDown_ICON)]);
       }
 
 //---------------------------------------------------------

diff --git a/mscore/aboutbox.ui b/mscore/aboutbox.ui
@@ -132,6 +132,10 @@
              <property name="text">
               <string notr="true"/>
              </property>
+             <property name="icon">
+              <iconset resource="musescore.qrc">
+               <normaloff>:/data/icons/edit-copy.svg</normaloff>:/data/icons/edit-copy.svg</iconset>
+             </property>
             </widget>
            </item>
            <item>

diff --git a/mscore/albummanager.cpp b/mscore/albummanager.cpp
@@ -38,8 +38,6 @@ AlbumManager::AlbumManager(QWidget* parent)
       {
       setupUi(this);
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
-      up->setIcon(*icons[int(Icons::arrowUp_ICON)]);
-      down->setIcon(*icons[int(Icons::arrowDown_ICON)]);
 
       album = 0;
       connect(add,         SIGNAL(clicked()), SLOT(addClicked()));

diff --git a/mscore/albummanager.ui b/mscore/albummanager.ui
@@ -85,7 +85,11 @@
         <string>Move current score up in list</string>
        </property>
        <property name="text">
-        <string notr="true" extracomment="gets replaced with arrowUp Icon">↑</string>
+        <string notr="true"/>
+       </property>
+       <property name="icon">
+        <iconset resource="musescore.qrc">
+         <normaloff>:/data/icons/arrow_up.svg</normaloff>:/data/icons/arrow_up.svg</iconset>
        </property>
       </widget>
      </item>
@@ -114,7 +118,11 @@
         <string>Move current score down in list</string>
        </property>
        <property name="text">
-        <string notr="true" extracomment="gets replaced with arrowDown Icon">↓</string>
+        <string notr="true"/>
+       </property>
+       <property name="icon">
+        <iconset resource="musescore.qrc">
+         <normaloff>:/data/icons/arrow_down.svg</normaloff>:/data/icons/arrow_down.svg</iconset>
        </property>
       </widget>
      </item>
@@ -248,7 +256,9 @@
   <tabstop>checkBoxAddPageBreak</tabstop>
   <tabstop>createScore</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="musescore.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

diff --git a/mscore/debugger/measure.ui b/mscore/debugger/measure.ui
@@ -31,14 +31,22 @@
            <string notr="true"/>
           </property>
           <property name="text">
-           <string notr="true">previous</string>
+           <string notr="true"/>
+          </property>
+          <property name="icon">
+           <iconset resource="../musescore.qrc">
+            <normaloff>:/data/icons/go-previous.svg</normaloff>:/data/icons/go-previous.svg</iconset>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="nextButton">
           <property name="text">
-           <string notr="true">next</string>
+           <string notr="true"/>
+          </property>
+          <property name="icon">
+           <iconset resource="../musescore.qrc">
+            <normaloff>:/data/icons/go-next.svg</normaloff>:/data/icons/go-next.svg</iconset>
           </property>
          </widget>
         </item>
@@ -510,6 +518,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../musescore.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/mscore/editstaff.cpp b/mscore/editstaff.cpp
@@ -55,12 +55,6 @@ EditStaff::EditStaff(Staff* s, int /*tick*/, QWidget* parent)
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
       setModal(true);
 
-      const QIcon &editIcon = *icons[int(Icons::edit_ICON)];
-      minPitchASelect->setIcon(editIcon);
-      maxPitchASelect->setIcon(editIcon);
-      minPitchPSelect->setIcon(editIcon);
-      maxPitchPSelect->setIcon(editIcon);
-
       Part* part        = orgStaff->part();
       instrument        = *part->instrument(/*tick*/);
       Score* score      = part->score();

diff --git a/mscore/editstaff.ui b/mscore/editstaff.ui
@@ -188,7 +188,11 @@
         <item>
          <widget class="QToolButton" name="minPitchASelect">
           <property name="text">
-           <string notr="true">...</string>
+           <string notr="true"/>
+          </property>
+          <property name="icon">
+           <iconset resource="musescore.qrc">
+            <normaloff>:/data/icons/edit.svg</normaloff>:/data/icons/edit.svg</iconset>
           </property>
          </widget>
         </item>
@@ -209,7 +213,11 @@
         <item>
          <widget class="QToolButton" name="maxPitchASelect">
           <property name="text">
-           <string notr="true">...</string>
+           <string notr="true"/>
+          </property>
+          <property name="icon">
+           <iconset resource="musescore.qrc">
+            <normaloff>:/data/icons/edit.svg</normaloff>:/data/icons/edit.svg</iconset>
           </property>
          </widget>
         </item>
@@ -249,7 +257,11 @@
         <item>
          <widget class="QToolButton" name="minPitchPSelect">
           <property name="text">
-           <string notr="true">...</string>
+           <string notr="true"/>
+          </property>
+          <property name="icon">
+           <iconset resource="musescore.qrc">
+            <normaloff>:/data/icons/edit.svg</normaloff>:/data/icons/edit.svg</iconset>
           </property>
          </widget>
         </item>
@@ -270,7 +282,11 @@
         <item>
          <widget class="QToolButton" name="maxPitchPSelect">
           <property name="text">
-           <string notr="true">...</string>
+           <string notr="true"/>
+          </property>
+          <property name="icon">
+           <iconset resource="musescore.qrc">
+            <normaloff>:/data/icons/edit.svg</normaloff>:/data/icons/edit.svg</iconset>
           </property>
          </widget>
         </item>
@@ -920,7 +936,9 @@
   <tabstop>numOfStrings</tabstop>
   <tabstop>editStringData</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="musescore.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

diff --git a/mscore/editstyle.cpp b/mscore/editstyle.cpp
@@ -245,9 +245,6 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
       };
 
 
-      const QIcon &editIcon = *icons[int(Icons::edit_ICON)];
-      chordDescriptionFileButton->setIcon(editIcon);
-
       pageList->setCurrentRow(0);
 
       articulationTable->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -389,8 +386,6 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
                   Direction::fillComboBox(cb);
                   }
             if (sw.reset) {
-                  sw.reset->setIcon(*icons[int(Icons::reset_ICON)]);
-                  sw.reset->setToolTip(tr("reset to default"));
                   connect(sw.reset, SIGNAL(clicked()), mapper, SLOT(map()));
                   mapper->setMapping(sw.reset, int(sw.idx));
                   }