fix #17588: Place border around colour boxes

musescore · Jul 30, 2012 · a625599 · a625599
1 parent 06bcedd
commit a625599
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 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("MuseScore: Select Color"),
          QColorDialog::ShowAlphaChannel
          );
       if (c.isValid()) {

diff --git a/mscore/element.ui b/mscore/element.ui
@@ -240,6 +240,9 @@
           <property name="toolTip">
            <string notr="true"/>
           </property>
+          <property name="frameShape">
+            <set>QFrame::Box</set>
+          </property>
          </widget>
         </item>
         <item row="0" column="5">

diff --git a/mscore/inspector_element.ui b/mscore/inspector_element.ui
@@ -139,7 +139,11 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="Awl::ColorLabel" name="color"/>
+      <widget class="Awl::ColorLabel" name="color">
+       <property name="frameShape">
+        <set>QFrame::Box</set>
+       </property>
+      </widget>
      </item>
      <item row="1" column="0" colspan="2">
       <widget class="QCheckBox" name="visible">

diff --git a/mscore/inspector_group_element.ui b/mscore/inspector_group_element.ui
@@ -53,7 +53,11 @@
       </widget>
      </item>
      <item row="0" column="0">
-      <widget class="Awl::ColorLabel" name="color"/>
+      <widget class="Awl::ColorLabel" name="color">
+       <property name="frameShape">
+        <set>QFrame::Box</set>
+       </property>      
+      </widget>
      </item>
      <item row="1" column="0">
       <widget class="QPushButton" name="setVisible">

diff --git a/mscore/lineproperties.ui b/mscore/lineproperties.ui
@@ -112,6 +112,9 @@
           <height>0</height>
          </size>
         </property>
+        <property name="frameShape">
+          <set>QFrame::Box</set>
+        </property>
        </widget>
       </item>
       <item>

diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui
@@ -683,7 +683,11 @@
              <number>0</number>
             </property>
             <item>
-             <widget class="Awl::ColorLabel" name="bgColorLabel"/>
+             <widget class="Awl::ColorLabel" name="bgColorLabel">
+              <property name="frameShape">
+                <set>QFrame::Box</set>
+              </property>
+             </widget>
             </item>
            </layout>
           </item>
@@ -734,7 +738,11 @@
              <number>0</number>
             </property>
             <item>
-             <widget class="Awl::ColorLabel" name="fgColorLabel"/>
+             <widget class="Awl::ColorLabel" name="fgColorLabel">
+                <property name="frameShape">
+                  <set>QFrame::Box</set>
+                </property>
+             </widget>
             </item>
            </layout>
           </item>

diff --git a/mscore/textproperties.ui b/mscore/textproperties.ui
@@ -500,6 +500,9 @@
           <property name="toolTip">
            <string>text color</string>
           </property>
+          <property name="frameShape">
+            <set>QFrame::Box</set>
+          </property>      
          </widget>
         </item>
         <item>
@@ -912,13 +915,19 @@
              <property name="toolTip">
               <string>frame color</string>
              </property>
+             <property name="frameShape">
+              <set>QFrame::Box</set>
+             </property>
             </widget>
            </item>
            <item row="2" column="1">
             <widget class="Awl::ColorLabel" name="frameColor">
              <property name="toolTip">
               <string>frame color</string>
              </property>
+             <property name="frameShape">
+              <set>QFrame::Box</set>
+             </property>             
             </widget>
            </item>
            <item row="2" column="2">