LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2963 from Jojo-Schmitz/inspector

Browse source 
Inspector improvements
This commit is contained in:
Werner Schweer 2017-01-17 19:29:15 +01:00 committed by GitHub
commit 45690881bf
3 changed files with 298 additions and 221 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mscore/inspector/inspector_accidental.ui
View file

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>150</width>
<height>115</height>
<width>113</width>
<height>91</height>
</rect>
</property>
<property name="accessibleName">
@ -125,7 +125,7 @@
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Has bracket' value</string>
<string>Reset 'Small' value</string>
</property>
<property name="text">
<string notr="true"/>
@ -144,7 +144,9 @@
<tabstops>
<tabstop>title</tabstop>
<tabstop>small</tabstop>
<tabstop>resetSmall</tabstop>
<tabstop>hasBracket</tabstop>
<tabstop>resetHasBracket</tabstop>
</tabstops>
<resources>
<include location="../musescore.qrc"/>

11
mscore/inspector/inspector_fingering.ui
View file

@ -6,12 +6,12 @@
<rect>
<x>0</x>
<y>0</y>
<width>277</width>
<height>215</height>
<width>154</width>
<height>69</height>
</rect>
</property>
<property name="accessibleName">
<string>Tuplet Inspector</string>
<string>Fingering Inspector</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
@ -81,6 +81,9 @@
<property name="text">
<string>Substyle:</string>
</property>
<property name="buddy">
<cstring>subStyle</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
@ -92,7 +95,7 @@
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Small' value</string>
<string>Reset 'Substyle' value</string>
</property>
<property name="text">
<string notr="true"/>

500
mscore/inspector/inspector_text.ui
View file

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>225</width>
<height>385</height>
<width>308</width>
<height>282</height>
</rect>
</property>
<property name="accessibleName">
@ -82,16 +82,6 @@
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Font face:</string>
</property>
<property name="buddy">
<cstring>fontFace</cstring>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QToolButton" name="resetFontFace">
<property name="toolTip">
@ -109,33 +99,6 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Font size:</string>
</property>
<property name="buddy">
<cstring>fontSize</cstring>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="resetFontSize">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Font size' 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="13" column="1" colspan="2">
<widget class="QDoubleSpinBox" name="frameWidth">
<property name="singleStep">
@ -146,73 +109,6 @@
</property>
</widget>
</item>
<item row="13" column="3">
<widget class="QToolButton" name="resetFrameWidth">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Frame width' 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="15" column="1" colspan="2">
<widget class="QSpinBox" name="frameRound"/>
</item>
<item row="9" column="1" colspan="2">
<widget class="Awl::ColorLabel" name="frameColor">
<property name="accessibleName">
<string>Color:</string>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QFontComboBox" name="fontFace">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="14" column="1" colspan="2">
<widget class="QDoubleSpinBox" name="paddingWidth">
<property name="singleStep">
<double>0.200000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QSpinBox" name="fontSize"/>
</item>
<item row="14" column="3">
<widget class="QToolButton" name="resetPaddingWidth">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Padding width' 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="16" column="0" colspan="4">
<widget class="QPushButton" name="resetToStyle">
<property name="text">
@ -220,63 +116,32 @@
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Padding width:</string>
</property>
<property name="buddy">
<cstring>paddingWidth</cstring>
</property>
</widget>
</item>
<item row="15" column="3">
<widget class="QToolButton" name="resetFrameRound">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Frame round' 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="9" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Frame color:</string>
</property>
<property name="buddy">
<cstring>frameColor</cstring>
</property>
</widget>
</item>
<item row="15" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Frame round:</string>
</property>
<property name="buddy">
<cstring>frameRound</cstring>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Frame width:</string>
<string>Border thickness:</string>
</property>
<property name="buddy">
<cstring>frameWidth</cstring>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Alignment:</string>
</property>
<property name="buddy">
<cstring>align</cstring>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QSpinBox" name="fontSize"/>
</item>
<item row="15" column="1" colspan="2">
<widget class="QSpinBox" name="frameRound"/>
</item>
<item row="8" column="3">
<widget class="QToolButton" name="resetHasFrame">
<property name="toolTip">
@ -294,13 +159,13 @@
</property>
</widget>
</item>
<item row="9" column="3">
<widget class="QToolButton" name="resetFrameColor">
<item row="14" column="3">
<widget class="QToolButton" name="resetPaddingWidth">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Frame color' value</string>
<string>Reset Text margin' value</string>
</property>
<property name="text">
<string notr="true"/>
@ -311,78 +176,37 @@
</property>
</widget>
</item>
<item row="8" column="0" colspan="3">
<widget class="QCheckBox" name="hasFrame">
<property name="text">
<string>Frame</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Align:</string>
</property>
</widget>
</item>
<item row="6" column="3">
<widget class="QToolButton" name="resetAlign">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Align' 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="1" colspan="2">
<widget class="Ms::AlignSelect" name="align" native="true"/>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Background:</string>
<string>Background color:</string>
</property>
<property name="buddy">
<cstring>bgColor</cstring>
</property>
</widget>
</item>
<item row="10" column="3">
<widget class="QToolButton" name="resetBgColor">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Background' value</string>
</property>
<item row="14" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string notr="true"/>
<string>Text margin:</string>
</property>
<property name="icon">
<iconset resource="../musescore.qrc">
<normaloff>:/data/icons/edit-reset.svg</normaloff>:/data/icons/edit-reset.svg</iconset>
<property name="buddy">
<cstring>paddingWidth</cstring>
</property>
</widget>
</item>
<item row="10" column="1" colspan="2">
<widget class="Awl::ColorLabel" name="bgColor">
<property name="accessibleName">
<string>Color:</string>
<item row="9" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Foreground color:</string>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<property name="buddy">
<cstring>frameColor</cstring>
</property>
</widget>
</item>
<item row="11" column="0" colspan="4">
<item row="8" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="circle">
@ -411,7 +235,7 @@
<item>
<widget class="QCheckBox" name="square">
<property name="text">
<string>Square</string>
<string>Box</string>
</property>
</widget>
</item>
@ -421,7 +245,7 @@
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Square' value</string>
<string>Reset 'Box' value</string>
</property>
<property name="text">
<string notr="true"/>
@ -432,9 +256,46 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="2" column="0" colspan="4">
<item row="15" column="3">
<widget class="QToolButton" name="resetFrameRound">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Border radius' 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_9">
<property name="text">
<string>Font style:</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="bold">
@ -464,6 +325,19 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="italic">
<property name="icon">
@ -492,6 +366,19 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="underline">
<property name="sizePolicy">
@ -526,8 +413,183 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="13" column="3">
<widget class="QToolButton" name="resetFrameWidth">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset Border thickness' 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="1" column="3">
<widget class="QToolButton" name="resetFontSize">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Font size' 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="9" column="3">
<widget class="QToolButton" name="resetFrameColor">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Foreground color' 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="15" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Border radius:</string>
</property>
<property name="buddy">
<cstring>frameRound</cstring>
</property>
</widget>
</item>
<item row="10" column="3">
<widget class="QToolButton" name="resetBgColor">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Background color' 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="3">
<widget class="QToolButton" name="resetAlign">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Alignment' 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="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Font face:</string>
</property>
<property name="buddy">
<cstring>fontFace</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QFontComboBox" name="fontFace">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="14" column="1" colspan="2">
<widget class="QDoubleSpinBox" name="paddingWidth">
<property name="singleStep">
<double>0.200000000000000</double>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Font size:</string>
</property>
<property name="buddy">
<cstring>fontSize</cstring>
</property>
</widget>
</item>
<item row="10" column="1" colspan="2">
<widget class="Awl::ColorLabel" name="bgColor">
<property name="accessibleName">
<string>Color:</string>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
</widget>
</item>
<item row="9" column="1" colspan="2">
<widget class="Awl::ColorLabel" name="frameColor">
<property name="accessibleName">
<string>Color:</string>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
</widget>
</item>
<item row="6" column="1" colspan="2">
<widget class="Ms::AlignSelect" name="align" native="true"/>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="hasFrame">
<property name="text">
<string>Frame:</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -553,8 +615,18 @@
<tabstop>resetFontFace</tabstop>
<tabstop>fontSize</tabstop>
<tabstop>resetFontSize</tabstop>
<tabstop>bold</tabstop>
<tabstop>resetBold</tabstop>
<tabstop>italic</tabstop>
<tabstop>resetItalic</tabstop>
<tabstop>underline</tabstop>
<tabstop>resetUnderline</tabstop>
<tabstop>resetAlign</tabstop>
<tabstop>hasFrame</tabstop>
<tabstop>circle</tabstop>
<tabstop>resetCircle</tabstop>
<tabstop>square</tabstop>
<tabstop>resetSquare</tabstop>
<tabstop>resetHasFrame</tabstop>
<tabstop>resetFrameColor</tabstop>
<tabstop>resetBgColor</tabstop>