fix #23976: Common Time and Alla Breve symbols in Create New Score to…

…o small
musescore · Dec 19, 2013 · f8187c9 · f8187c9
1 parent 62fac7d
commit f8187c9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/mscore/newwizard.cpp b/mscore/newwizard.cpp
@@ -547,12 +547,6 @@ TimesigWizard::TimesigWizard(QWidget* parent)
    : QWidget(parent)
       {
       setupUi(this);
-      QPixmap ct = gscore->scoreFont()->sym2pixmap(SymId::timeSigCommon, 3.0);
-      tsCommonTime->setIcon(QIcon(ct));
-      tsCommonTime->setText(QString());
-      ct = gscore->scoreFont()->sym2pixmap(SymId::timeSigCutCommon, 3.0);
-      tsCutTime->setIcon(QIcon(ct));
-      tsCutTime->setText(QString());
       connect(tsCommonTime, SIGNAL(toggled(bool)), SLOT(commonTimeToggled(bool)));
       connect(tsCutTime,    SIGNAL(toggled(bool)), SLOT(cutTimeToggled(bool)));
       connect(tsFraction,   SIGNAL(toggled(bool)), SLOT(fractionToggled(bool)));

diff --git a/mscore/timesigwizard.ui b/mscore/timesigwizard.ui
@@ -132,15 +132,29 @@
       </item>
       <item>
        <widget class="QRadioButton" name="tsCutTime">
+        <property name="toolTip">
+         <string>Cut time</string>
+        </property>
         <property name="text">
-         <string notr="true">cut time</string>
+         <string notr="true"/>
+        </property>
+        <property name="icon">
+         <iconset resource="musescore.qrc">
+          <normaloff>:/data/icons/timesig_allabreve.svg</normaloff>:/data/icons/timesig_allabreve.svg</iconset>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="tsCommonTime">
+        <property name="toolTip">
+         <string>Common time</string>
+        </property>
         <property name="text">
-         <string notr="true">common time</string>
+         <string notr="true"/>
+        </property>
+        <property name="icon">
+         <iconset resource="musescore.qrc">
+          <normaloff>:/data/icons/timesig_common.svg</normaloff>:/data/icons/timesig_common.svg</iconset>
         </property>
        </widget>
       </item>
@@ -334,6 +348,8 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="musescore.qrc"/>
+ </resources>
  <connections/>
 </ui>