fix margins of inspector

musescore · Nov 3, 2014 · 0f25585 · 0f25585
1 parent 4ff52ea
commit 0f25585
Show file tree

Hide file tree

Showing 34 changed files with 329 additions and 44 deletions.
diff --git a/mscore/inspector/inspectorBase.cpp b/mscore/inspector/inspectorBase.cpp
@@ -36,7 +36,7 @@ InspectorBase::InspectorBase(QWidget* parent)
       inspector = static_cast<Inspector*>(parent);
       _layout    = new QVBoxLayout;
       _layout->setSpacing(0);
-      _layout->setContentsMargins(0, 0, 0, 0);
+      _layout->setContentsMargins(0, 10, 0, 0);
       _layout->addStretch(100);
       setLayout(_layout);
       }

diff --git a/mscore/inspector/inspector_accidental.ui b/mscore/inspector/inspector_accidental.ui
@@ -66,7 +66,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="0" column="2">

diff --git a/mscore/inspector/inspector_ambitus.ui b/mscore/inspector/inspector_ambitus.ui
@@ -70,10 +70,13 @@
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
      <property name="leftMargin">
-      <number>0</number>
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
      </property>
      <property name="horizontalSpacing">
-      <number>2</number>
+      <number>3</number>
      </property>
      <property name="verticalSpacing">
       <number>0</number>

diff --git a/mscore/inspector/inspector_articulation.ui b/mscore/inspector/inspector_articulation.ui
@@ -63,7 +63,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="0" column="0">

diff --git a/mscore/inspector/inspector_barline.ui b/mscore/inspector/inspector_barline.ui
@@ -63,7 +63,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="0" column="1">

diff --git a/mscore/inspector/inspector_beam.ui b/mscore/inspector/inspector_beam.ui
@@ -66,7 +66,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="2" column="1" colspan="2">

diff --git a/mscore/inspector/inspector_chord.ui b/mscore/inspector/inspector_chord.ui
@@ -63,7 +63,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="1" column="2">

diff --git a/mscore/inspector/inspector_clef.ui b/mscore/inspector/inspector_clef.ui
@@ -66,7 +66,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="0" column="0" colspan="2">

diff --git a/mscore/inspector/inspector_dynamic.ui b/mscore/inspector/inspector_dynamic.ui
@@ -63,7 +63,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="0" column="0">

diff --git a/mscore/inspector/inspector_element.ui b/mscore/inspector/inspector_element.ui
@@ -43,12 +43,6 @@
    </property>
    <item>
     <widget class="QLabel" name="elementName">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="font">
       <font>
        <weight>75</weight>
@@ -63,6 +57,19 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::HLine</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
+     </property>
+     <property name="lineWidth">
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <property name="leftMargin">

diff --git a/mscore/inspector/inspector_empty.ui b/mscore/inspector/inspector_empty.ui
@@ -48,19 +48,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QFrame" name="frame">
-     <property name="frameShape">
-      <enum>QFrame::HLine</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <property name="lineWidth">
-      <number>2</number>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>

diff --git a/mscore/inspector/inspector_glissando.ui b/mscore/inspector/inspector_glissando.ui
@@ -72,7 +72,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="1" column="0">

diff --git a/mscore/inspector/inspector_group_element.ui b/mscore/inspector/inspector_group_element.ui
@@ -63,7 +63,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="0" column="1">

diff --git a/mscore/inspector/inspector_hairpin.ui b/mscore/inspector/inspector_hairpin.ui
@@ -66,7 +66,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="4" column="0">

diff --git a/mscore/inspector/inspector_hbox.ui b/mscore/inspector/inspector_hbox.ui
@@ -63,7 +63,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
      <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <property name="verticalSpacing">

diff --git a/mscore/inspector/inspector_image.ui b/mscore/inspector/inspector_image.ui
@@ -63,7 +63,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="1" column="0">

diff --git a/mscore/inspector/inspector_jump.ui b/mscore/inspector/inspector_jump.ui
@@ -69,6 +69,18 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
+      <number>0</number>
+     </property>
      <item row="0" column="1">
       <widget class="QLineEdit" name="jumpTo">
        <property name="accessibleName">

diff --git a/mscore/inspector/inspector_keysig.ui b/mscore/inspector/inspector_keysig.ui
@@ -63,7 +63,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="0" column="0">

diff --git a/mscore/inspector/inspector_lasso.ui b/mscore/inspector/inspector_lasso.ui
@@ -63,7 +63,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="0" column="0">

diff --git a/mscore/inspector/inspector_line.ui b/mscore/inspector/inspector_line.ui
@@ -50,7 +50,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="2" column="0">

diff --git a/mscore/inspector/inspector_marker.ui b/mscore/inspector/inspector_marker.ui
@@ -63,7 +63,16 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <property name="spacing">
+     <property name="leftMargin">
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>3</number>
+     </property>
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
      <item row="0" column="2">

diff --git a/mscore/inspector/inspector_note.ui b/mscore/inspector/inspector_note.ui
@@ -67,10 +67,13 @@
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
      <property name="leftMargin">
-      <number>0</number>
+      <number>3</number>
+     </property>
+     <property name="rightMargin">
+      <number>3</number>
      </property>
      <property name="horizontalSpacing">
-      <number>2</number>
+      <number>3</number>
      </property>
      <property name="verticalSpacing">
       <number>0</number>