fix #116156: buttons don't render properly on HDPI screens

musescore · Jun 23, 2016 · 3695e6a · 3695e6a
1 parent 8e8c277
commit 3695e6a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/mscore/harmonyedit.ui b/mscore/harmonyedit.ui
@@ -98,7 +98,13 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="fileButton">
+      <widget class="QToolButton" name="fileButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string notr="true"/>
        </property>

diff --git a/mscore/instrwizard.ui b/mscore/instrwizard.ui
@@ -160,7 +160,11 @@
         <string>Up</string>
        </property>
        <property name="text">
-        <string>Up</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>
@@ -176,7 +180,11 @@
         <string>Down</string>
        </property>
        <property name="text">
-        <string>Down</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>
@@ -293,6 +301,8 @@
   <tabstop>linkedButton</tabstop>
   <tabstop>partiturList</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="musescore.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/mscore/measureproperties.ui b/mscore/measureproperties.ui
@@ -444,6 +444,12 @@
          </property>
          <item>
           <widget class="QToolButton" name="previousButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="toolTip">
             <string>Go to previous measure</string>
            </property>
@@ -458,6 +464,12 @@
          </item>
          <item>
           <widget class="QToolButton" name="nextButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="toolTip">
             <string>Go to next measure</string>
            </property>

diff --git a/mscore/toolbarEditor.ui b/mscore/toolbarEditor.ui
@@ -93,7 +93,7 @@
    <item row="2" column="3">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QPushButton" name="add">
+      <widget class="QToolButton" name="add">
        <property name="text">
         <string notr="true"/>
        </property>
@@ -104,7 +104,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="remove">
+      <widget class="QToolButton" name="remove">
        <property name="text">
         <string notr="true"/>
        </property>
@@ -115,7 +115,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="up">
+      <widget class="QToolButton" name="up">
        <property name="text">
         <string notr="true"/>
        </property>
@@ -126,7 +126,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="down">
+      <widget class="QToolButton" name="down">
        <property name="text">
         <string/>
        </property>