Skip to content

Commit

Permalink
Merge pull request #2775 from Jojo-Schmitz/autoplacement
Browse files Browse the repository at this point in the history 
fix #120641, part 2: Move Autoplace checkbox to above the offsets.
  • Loading branch information
@wschweer
wschweer committed Aug 10, 2016
2 parents ceba634 + 6ba852d commit ebd1f20
Showing 1 changed file with 88 additions and 190 deletions.
278 changes: 88 additions & 190 deletions mscore/inspector/inspector_element.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,27 +84,8 @@
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="5" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Vertical offset</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<widget class="QDoubleSpinBox" name="offsetX">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName">
<string>Horizontal offset</string>
</property>
Expand All @@ -125,33 +106,89 @@
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="Awl::ColorLabel" name="color">
<property name="accessibleName">
<string>Color</string>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QCheckBox" name="visible">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="accessibleName">
<string>Visible</string>
</property>
<property name="text">
<string>Visible</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="resetVisible">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Visible' value</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="../musescore.qrc">
<normaloff>:/data/icons/edit-reset.svg</normaloff>:/data/icons/edit-reset.svg</iconset>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Stacking order</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QSpinBox" name="z">
<property name="maximum">
<number>1000000000</number>
</property>
<property name="singleStep">
<number>100</number>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QToolButton" name="resetZ">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Stacking order' value</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="../musescore.qrc">
<normaloff>:/data/icons/edit-reset.svg</normaloff>:/data/icons/edit-reset.svg</iconset>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
</size>
</property>
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
<item row="4" column="3">
<item row="5" column="3">
<widget class="QToolButton" name="resetX">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Reset to default</string>
</property>
Expand All @@ -167,14 +204,8 @@
</property>
</widget>
</item>
<item row="5" column="1">
<item row="6" column="1">
<widget class="QDoubleSpinBox" name="offsetY">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName">
<string>Vertical offset</string>
</property>
Expand All @@ -192,14 +223,8 @@
</property>
</widget>
</item>
<item row="5" column="3">
<item row="6" column="3">
<widget class="QToolButton" name="resetY">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Reset to default</string>
</property>
Expand All @@ -215,26 +240,14 @@
</property>
</widget>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
</size>
</property>
<property name="text">
<string>Horizontal offset</string>
</property>
</widget>
</item>
<item row="5" column="2">
<item row="6" column="2">
<widget class="QToolButton" name="vRaster">
<property name="accessibleName">
<string/>
Expand All @@ -253,12 +266,6 @@
</item>
<item row="3" column="3">
<widget class="QToolButton" name="resetColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Reset to default</string>
</property>
Expand All @@ -274,7 +281,7 @@
</property>
</widget>
</item>
<item row="4" column="2">
<item row="5" column="2">
<widget class="QToolButton" name="hRaster">
<property name="text">
<string notr="true"/>
Expand All @@ -288,91 +295,15 @@
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="Awl::ColorLabel" name="color">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Ignored">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="accessibleName">
<string>Color</string>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QCheckBox" name="visible">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="accessibleName">
<string>Visible</string>
</property>
<property name="text">
<string>Visible</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="resetVisible">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Visible' value</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="../musescore.qrc">
<normaloff>:/data/icons/edit-reset.svg</normaloff>:/data/icons/edit-reset.svg</iconset>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="autoplace">
<item row="6" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Automatic placement</string>
<string>Vertical offset</string>
</property>
</widget>
</item>
<item row="6" column="3">
<item row="4" column="3">
<widget class="QToolButton" name="resetAutoplace">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Reset to default</string>
</property>
Expand All @@ -388,43 +319,10 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Stacking order</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QSpinBox" name="z">
<property name="maximum">
<number>1000000000</number>
</property>
<property name="singleStep">
<number>100</number>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QToolButton" name="resetZ">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Stacking order' value</string>
</property>
<item row="4" column="0" colspan="3">
<widget class="QCheckBox" name="autoplace">
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="../musescore.qrc">
<normaloff>:/data/icons/edit-reset.svg</normaloff>:/data/icons/edit-reset.svg</iconset>
<string>Automatic placement</string>
</property>
</widget>
</item>
Expand Down

0 comments on commit ebd1f20

Please sign in to comment.