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

add textstyles to style editor

Browse source
This commit is contained in:
ws 2018-09-28 14:55:08 +02:00
parent 58fc85be80
commit 097d606ea5
4 changed files with 632 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

219
mscore/editstyle.cpp
View file

@ -28,6 +28,7 @@
#include "libmscore/tuplet.h"
#include "libmscore/layout.h"
#include "inspector/alignSelect.h"
#include "inspector/offsetSelect.h"
namespace Ms {
@ -132,6 +133,7 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
{ Sid::lyricsOddFontItalic, false, lyricsOddFontItalic, resetLyricsOddFontItalic },
{ Sid::lyricsOddFontUnderline, false, lyricsOddFontUnderline, resetLyricsOddFontUnderline },
{ Sid::lyricsOddAlign, false, lyricsOddAlign, resetLyricsOddAlign },
{ Sid::lyricsOddOffset, false, lyricsOddOffset, resetLyricsOddOffset },
{ Sid::lyricsEvenFontFace, false, lyricsEvenFontFace, resetLyricsEvenFontFace },
{ Sid::lyricsEvenFontSize, false, lyricsEvenFontSize, resetLyricsEvenFontSize },
@ -139,6 +141,7 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
{ Sid::lyricsEvenFontItalic, false, lyricsEvenFontItalic, resetLyricsEvenFontItalic },
{ Sid::lyricsEvenFontUnderline, false, lyricsEvenFontUnderline, resetLyricsEvenFontUnderline },
{ Sid::lyricsEvenAlign, false, lyricsEvenAlign, resetLyricsEvenAlign },
{ Sid::lyricsEvenOffset, false, lyricsEvenOffset, resetLyricsEvenOffset },
{ Sid::systemFrameDistance, false, systemFrameDistance, resetSystemFrameDistance },
{ Sid::frameSystemDistance, false, frameSystemDistance, resetFrameSystemDistance },
@ -580,6 +583,8 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
connect(qobject_cast<QButtonGroup*>(sw.widget), SIGNAL(buttonClicked(int)), mapper2, SLOT(map()));
else if (qobject_cast<AlignSelect*>(sw.widget))
connect(qobject_cast<AlignSelect*>(sw.widget), SIGNAL(alignChanged(Align)), mapper2, SLOT(map()));
else if (qobject_cast<OffsetSelect*>(sw.widget))
connect(qobject_cast<OffsetSelect*>(sw.widget), SIGNAL(offsetChanged(const QPointF&)), mapper2, SLOT(map()));
else {
qFatal("unhandled gui widget type %s valueType %s",
sw.widget->metaObject()->className(),
@ -592,10 +597,120 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
connect(mapper, SIGNAL(mapped(int)), SLOT(resetStyleValue(int)));
connect(mapper2, SIGNAL(mapped(int)), SLOT(valueChanged(int)));
textStyles->clear();
for (auto ss : {
Tid::SYSTEM,
Tid::STAFF,
Tid::TEMPO,
Tid::METRONOME,
Tid::REHEARSAL_MARK,
Tid::EXPRESSION,
Tid::REPEAT_LEFT,
Tid::REPEAT_RIGHT,
Tid::FRAME,
Tid::TITLE,
Tid::SUBTITLE,
Tid::COMPOSER,
Tid::POET,
Tid::INSTRUMENT_EXCERPT,
Tid::TRANSLATOR,
Tid::HEADER,
Tid::FOOTER,
Tid::USER1,
Tid::USER2,
Tid::USER3,
Tid::USER4,
Tid::USER5,
Tid::USER6
} )
{
QListWidgetItem* item = new QListWidgetItem(textStyleUserName(ss));
item->setData(Qt::UserRole, int(ss));
textStyles->addItem(item);
}
// font face
resetTextStyleFontFace->setIcon(*icons[int(Icons::reset_ICON)]);
connect(resetTextStyleFontFace, &QToolButton::clicked,
[=](){ resetTextStyle(Pid::FONT_FACE); }
);
connect(textStyleFontFace, &QFontComboBox::currentFontChanged,
[=](){ textStyleValueChanged(Pid::FONT_FACE, QVariant(textStyleFontFace->currentFont().family())); }
);
// font size
resetTextStyleFontSize->setIcon(*icons[int(Icons::reset_ICON)]);
connect(resetTextStyleFontSize, &QToolButton::clicked,
[=](){ resetTextStyle(Pid::FONT_SIZE); }
);
connect(textStyleFontSize, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
[=](){ textStyleValueChanged(Pid::FONT_SIZE, QVariant(textStyleFontSize->value())); }
);
// font bold
resetTextStyleFontBold->setIcon(*icons[int(Icons::reset_ICON)]);
textStyleFontBold->setIcon(*icons[int(Icons::textBold_ICON)]);
connect(resetTextStyleFontBold, &QToolButton::clicked,
[=](){ resetTextStyle(Pid::FONT_BOLD); }
);
connect(textStyleFontBold, &QCheckBox::toggled,
[=](){ textStyleValueChanged(Pid::FONT_BOLD, QVariant(textStyleFontBold->isChecked())); }
);
// font italic
resetTextStyleFontItalic->setIcon(*icons[int(Icons::reset_ICON)]);
textStyleFontItalic->setIcon(*icons[int(Icons::textItalic_ICON)]);
connect(resetTextStyleFontItalic, &QToolButton::clicked,
[=](){ resetTextStyle(Pid::FONT_ITALIC); }
);
connect(textStyleFontItalic, &QCheckBox::toggled,
[=](){ textStyleValueChanged(Pid::FONT_ITALIC, QVariant(textStyleFontItalic->isChecked())); }
);
// font underline
resetTextStyleFontUnderline->setIcon(*icons[int(Icons::reset_ICON)]);
textStyleFontUnderline->setIcon(*icons[int(Icons::textUnderline_ICON)]);
connect(resetTextStyleFontUnderline, &QToolButton::clicked,
[=](){ resetTextStyle(Pid::FONT_UNDERLINE); }
);
connect(textStyleFontUnderline, &QCheckBox::toggled,
[=](){ textStyleValueChanged(Pid::FONT_UNDERLINE, QVariant(textStyleFontUnderline->isChecked())); }
);
// align
resetTextStyleAlign->setIcon(*icons[int(Icons::reset_ICON)]);
connect(resetTextStyleAlign, &QToolButton::clicked, [=](){ resetTextStyle(Pid::ALIGN); });
connect(textStyleAlign, &AlignSelect::alignChanged,
[=](){ textStyleValueChanged(Pid::ALIGN, QVariant::fromValue(textStyleAlign->align())); }
);
// offset
resetTextStyleOffset->setIcon(*icons[int(Icons::reset_ICON)]);
connect(resetTextStyleOffset, &QToolButton::clicked, [=](){ resetTextStyle(Pid::OFFSET); });
connect(textStyleOffset, &OffsetSelect::offsetChanged,
[=](){ textStyleValueChanged(Pid::OFFSET, QVariant(textStyleOffset->offset())); }
);
connect(textStyles, SIGNAL(currentRowChanged(int)), SLOT(textStyleChanged(int)));
textStyles->setCurrentRow(0);
MuseScore::restoreGeometry(this);
cs->startCmd();
}
#if 0
// missing for textStyle:
{ Sid::defaultFontSpatiumDependent, Pid::FONT_SPATIUM_DEPENDENT },
{ Sid::user1Align, Pid::ALIGN },
{ Sid::user1Offset, Pid::OFFSET },
{ Sid::user1OffsetType, Pid::OFFSET_TYPE },
{ Sid::user1FrameType, Pid::FRAME_TYPE },
{ Sid::user1FramePadding, Pid::FRAME_PADDING },
{ Sid::user1FrameWidth, Pid::FRAME_WIDTH },
{ Sid::user1FrameRound, Pid::FRAME_ROUND },
{ Sid::user1FrameFgColor, Pid::FRAME_FG_COLOR },
{ Sid::user1FrameBgColor, Pid::FRAME_BG_COLOR },
}};
#endif
//---------------------------------------------------------
// hideEvent
@ -663,7 +778,7 @@ void EditStyle::applyToAllParts()
static void unhandledType(const StyleWidget* sw)
{
const char* type = MStyle::valueType(sw->idx);
qFatal("unhandled %s <%s>: widget: %s\n", type, MStyle::valueName(sw->idx), sw->widget->metaObject()->className());
qFatal("%s <%s>: widget: %s\n", type, MStyle::valueName(sw->idx), sw->widget->metaObject()->className());
}
//---------------------------------------------------------
@ -724,6 +839,13 @@ QVariant EditStyle::getValue(Sid idx)
MStyle::valueName(idx));
}
else if (!strcmp("QPointF", type)) {
OffsetSelect* cb = qobject_cast<Ms::OffsetSelect*>(sw.widget);
if (cb)
return cb->offset();
else
qFatal("unhandled QPointF");
}
else if (!strcmp("Ms::Direction", type)) {
QComboBox* cb = qobject_cast<QComboBox*>(sw.widget);
if (cb)
@ -821,6 +943,10 @@ void EditStyle::setValues()
AlignSelect* as = qobject_cast<Ms::AlignSelect*>(sw.widget);
as->setAlign(val.value<Align>());
}
else if (!strcmp("QPointF", type)) {
OffsetSelect* as = qobject_cast<Ms::OffsetSelect*>(sw.widget);
as->setOffset(val.value<QPointF>());
}
else
unhandledType(&sw);
if (sw.widget)
@ -1121,5 +1247,96 @@ void EditStyle::resetStyleValue(int i)
cs->update();
}
//---------------------------------------------------------
// textStyleChanged
//---------------------------------------------------------
void EditStyle::textStyleChanged(int row)
{
Tid tid = Tid(textStyles->item(row)->data(Qt::UserRole).toInt());
const TextStyle* ts = textStyle(tid);
for (const StyledProperty& a : *ts) {
switch (a.pid) {
case Pid::FONT_FACE: {
QVariant val = cs->styleV(a.sid);
textStyleFontFace->setCurrentFont(QFont(val.toString()));
resetTextStyleFontFace->setEnabled(val != MScore::defaultStyle().value(a.sid));
}
break;
case Pid::FONT_SIZE:
textStyleFontSize->setValue(cs->styleD(a.sid));
resetTextStyleFontSize->setEnabled(cs->styleV(a.sid) != MScore::defaultStyle().value(a.sid));
break;
case Pid::FONT_BOLD:
textStyleFontBold->setChecked(cs->styleB(a.sid));
resetTextStyleFontBold->setEnabled(cs->styleV(a.sid) != MScore::defaultStyle().value(a.sid));
break;
case Pid::FONT_ITALIC:
textStyleFontItalic->setChecked(cs->styleB(a.sid));
resetTextStyleFontItalic->setEnabled(cs->styleV(a.sid) != MScore::defaultStyle().value(a.sid));
break;
case Pid::FONT_UNDERLINE:
textStyleFontUnderline->setChecked(cs->styleB(a.sid));
resetTextStyleFontUnderline->setEnabled(cs->styleV(a.sid) != MScore::defaultStyle().value(a.sid));
break;
case Pid::ALIGN:
textStyleAlign->setAlign(cs->styleV(a.sid).value<Align>());
resetTextStyleAlign->setEnabled(cs->styleV(a.sid) != MScore::defaultStyle().value(a.sid));
break;
case Pid::OFFSET:
textStyleOffset->setOffset(cs->styleV(a.sid).toPointF());
resetTextStyleOffset->setEnabled(cs->styleV(a.sid) != MScore::defaultStyle().value(a.sid));
break;
default:
break;
}
}
}
//---------------------------------------------------------
// textStyleValueChanged
//---------------------------------------------------------
void EditStyle::textStyleValueChanged(Pid pid, QVariant value)
{
Tid tid = Tid(textStyles->item(textStyles->currentRow())->data(Qt::UserRole).toInt());
const TextStyle* ts = textStyle(tid);
for (const StyledProperty& a : *ts) {
if (a.pid == pid) {
cs->undoChangeStyleVal(a.sid, value);
break;
}
}
textStyleChanged(textStyles->currentRow()); // update GUI (reset buttons)
cs->update();
}
//---------------------------------------------------------
// resetTextStyle
//---------------------------------------------------------
void EditStyle::resetTextStyle(Pid pid)
{
Tid tid = Tid(textStyles->item(textStyles->currentRow())->data(Qt::UserRole).toInt());
const TextStyle* ts = textStyle(tid);
for (const StyledProperty& a : *ts) {
if (a.pid == pid) {
cs->undoChangeStyleVal(a.sid, MScore::defaultStyle().value(a.sid));
break;
}
}
textStyleChanged(textStyles->currentRow()); // update GUI
cs->update();
}
}

4
mscore/editstyle.h
View file

@ -75,7 +75,9 @@ class EditStyle : public QDialog, private Ui::EditStyleBase {
void systemMaxDistanceValueChanged(double);
void resetStyleValue(int);
void valueChanged(int);
void textStyleChanged(int);
void resetTextStyle(Pid);
void textStyleValueChanged(Pid, QVariant);
void on_comboFBFont_currentIndexChanged(int index);
public:

455
mscore/editstyle.ui
View file

@ -6,14 +6,40 @@
<rect>
<x>0</x>
<y>0</y>
<width>1115</width>
<height>962</height>
<width>1099</width>
<height>876</height>
</rect>
</property>
<property name="windowTitle">
<string>Edit General Style</string>
</property>
<layout class="QGridLayout" name="gridLayout_39">
<item row="1" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QSplitter" name="splitter">
<property name="orientation">
@ -191,10 +217,15 @@
<string>Lyrics</string>
</property>
</item>
<item>
<property name="text">
<string>Text Styles</string>
</property>
</item>
</widget>
<widget class="QStackedWidget" name="pageStack">
<property name="currentIndex">
<number>25</number>
<number>33</number>
</property>
<widget class="QWidget" name="PageScore">
<layout class="QVBoxLayout" name="verticalLayout_20">
@ -11794,33 +11825,13 @@
<property name="spacing">
<number>0</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label_170">
<item row="1" column="3">
<widget class="QLabel" name="label_171">
<property name="text">
<string>Font face:</string>
<string>Size:</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QDoubleSpinBox" name="lyricsEvenFontSize">
<property name="suffix">
<string>sp</string>
</property>
<property name="minimum">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QFontComboBox" name="lyricsEvenFontFace">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>false</bool>
<property name="indent">
<number>10</number>
</property>
</widget>
</item>
@ -11927,13 +11938,33 @@
</item>
</layout>
</item>
<item row="1" column="3">
<widget class="QLabel" name="label_171">
<item row="1" column="0">
<widget class="QLabel" name="label_170">
<property name="text">
<string>Size:</string>
<string>Font face:</string>
</property>
<property name="indent">
<number>10</number>
</widget>
</item>
<item row="1" column="4">
<widget class="QDoubleSpinBox" name="lyricsEvenFontSize">
<property name="suffix">
<string>sp</string>
</property>
<property name="minimum">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QFontComboBox" name="lyricsEvenFontFace">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>false</bool>
</property>
</widget>
</item>
@ -12008,6 +12039,33 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_186">
<property name="text">
<string>Offset:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="Ms::OffsetSelect" name="lyricsEvenOffset" native="true"/>
</item>
<item row="3" column="2">
<widget class="QToolButton" name="resetLyricsEvenOffset">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Font face' 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>
</layout>
</widget>
</item>
@ -12204,7 +12262,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<item row="3" column="0">
<spacer name="verticalSpacer_17">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -12244,6 +12302,33 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_201">
<property name="text">
<string>Offset:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Ms::OffsetSelect" name="lyricsOddOffset" native="true"/>
</item>
<item row="2" column="2">
<widget class="QToolButton" name="resetLyricsOddOffset">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Font face' 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>
</layout>
</widget>
</item>
@ -12263,35 +12348,279 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="pageTextStyles">
<layout class="QGridLayout" name="gridLayout_41">
<item row="0" column="0">
<widget class="QListWidget" name="textStyles"/>
</item>
<item row="0" column="1">
<widget class="QWidget" name="showMeasureNumber_8" native="true">
<layout class="QGridLayout" name="_12">
<property name="spacing">
<number>0</number>
</property>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_27">
<item>
<widget class="QPushButton" name="textStyleFontBold">
<property name="accessibleName">
<string>Bold</string>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons/format-text-bold.svg</normaloff>:/data/icons/format-text-bold.svg</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="resetTextStyleFontBold">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Bold' 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>
<widget class="QPushButton" name="textStyleFontItalic">
<property name="accessibleName">
<string>Italic</string>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons/format-text-italic.svg</normaloff>:/data/icons/format-text-italic.svg</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="resetTextStyleFontItalic">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Italic' 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>
<widget class="QToolButton" name="textStyleFontUnderline">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleName">
<string>Underline</string>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons/format-text-underline.svg</normaloff>:/data/icons/format-text-underline.svg</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="resetTextStyleFontUnderline">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Underline' 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>
</layout>
</item>
<item row="2" column="2">
<widget class="QToolButton" name="resetTextStyleFontSize">
<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="3" column="0">
<widget class="QLabel" name="label_209">
<property name="text">
<string>Style:</string>
</property>
<property name="indent">
<number>11</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_210">
<property name="text">
<string>Align:</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="resetTextStyleFontFace">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Font face' 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="4" column="2">
<widget class="QToolButton" name="resetTextStyleAlign">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Font face' 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="4" column="1">
<widget class="Ms::AlignSelect" name="textStyleAlign" native="true"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_207">
<property name="text">
<string>Size:</string>
</property>
<property name="indent">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QFontComboBox" name="textStyleFontFace">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_208">
<property name="text">
<string>Font face:</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QToolButton" name="resetTextStyleOffset">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="accessibleName">
<string>Reset 'Font face' 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="5" column="1">
<widget class="Ms::OffsetSelect" name="textStyleOffset" native="true"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_211">
<property name="text">
<string>Offset:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="textStyleFontSize">
<property name="suffix">
<string>sp</string>
</property>
<property name="minimum">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="6" column="1">
<spacer name="verticalSpacer_32">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
@ -12301,6 +12630,12 @@
<header>inspector/alignSelect.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>Ms::OffsetSelect</class>
<extends>QWidget</extends>
<header>inspector/offsetSelect.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>pageList</tabstop>

39
mscore/inspector/inspector_text.ui
View file

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>497</width>
<height>398</height>
<height>344</height>
</rect>
</property>
<property name="accessibleName">
@ -158,7 +158,7 @@
<property name="spacing">
<number>0</number>
</property>
<item row="3" column="1">
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="frameWidth">
<property name="accessibleName">
<string>Border</string>
@ -177,7 +177,7 @@
</property>
</widget>
</item>
<item row="2" column="1">
<item row="1" column="1">
<widget class="Awl::ColorLabel" name="bgColor">
<property name="accessibleName">
<string>Background</string>
@ -187,7 +187,7 @@
</property>
</widget>
</item>
<item row="1" column="0">
<item row="0" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Foreground:</string>
@ -200,7 +200,7 @@
</property>
</widget>
</item>
<item row="1" column="1">
<item row="0" column="1">
<widget class="Awl::ColorLabel" name="frameColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@ -216,7 +216,7 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Border:</string>
@ -229,7 +229,7 @@
</property>
</widget>
</item>
<item row="1" column="2">
<item row="0" column="2">
<widget class="QToolButton" name="resetFrameColor">
<property name="toolTip">
<string>Reset to default</string>
@ -246,7 +246,7 @@
</property>
</widget>
</item>
<item row="4" column="1">
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="paddingWidth">
<property name="accessibleName">
<string>Text margin</string>
@ -259,7 +259,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Background:</string>
@ -272,7 +272,7 @@
</property>
</widget>
</item>
<item row="4" column="0">
<item row="3" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Text margin:</string>
@ -285,7 +285,7 @@
</property>
</widget>
</item>
<item row="5" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Border radius:</string>
@ -298,14 +298,14 @@
</property>
</widget>
</item>
<item row="5" column="1">
<item row="4" column="1">
<widget class="QSpinBox" name="frameRound">
<property name="accessibleName">
<string>Border radius</string>
</property>
</widget>
</item>
<item row="2" column="2">
<item row="1" column="2">
<widget class="QToolButton" name="resetBgColor">
<property name="toolTip">
<string>Reset to default</string>
@ -322,7 +322,7 @@
</property>
</widget>
</item>
<item row="3" column="2">
<item row="2" column="2">
<widget class="QToolButton" name="resetFrameWidth">
<property name="toolTip">
<string>Reset to default</string>
@ -339,7 +339,7 @@
</property>
</widget>
</item>
<item row="4" column="2">
<item row="3" column="2">
<widget class="QToolButton" name="resetPaddingWidth">
<property name="toolTip">
<string>Reset to default</string>
@ -356,7 +356,7 @@
</property>
</widget>
</item>
<item row="5" column="2">
<item row="4" column="2">
<widget class="QToolButton" name="resetFrameRound">
<property name="toolTip">
<string>Reset to default</string>
@ -373,13 +373,6 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>