Skip to content

Commit 4a4d9c3

Browse files
committed
Add temporary inspector controls
1 parent d499729 commit 4a4d9c3

File tree

3 files changed

+40
-1
lines changed

3 files changed

+40
-1
lines changed

src/inspector/models/text/textsettingsmodel.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ void TextSettingsModel::createProperties()
6464
const Pid fontStyleId = textLine ? mu::engraving::Pid::BEGIN_FONT_STYLE : mu::engraving::Pid::FONT_STYLE;
6565
const Pid fontSizeId = textLine ? mu::engraving::Pid::BEGIN_FONT_SIZE : mu::engraving::Pid::FONT_SIZE;
6666
const Pid fontAlignId = textLine ? mu::engraving::Pid::BEGIN_TEXT_ALIGN : mu::engraving::Pid::ALIGN;
67+
const Pid textPositionId = textLine ? mu::engraving::Pid::BEGIN_TEXT_POSITION : mu::engraving::Pid::POSITION;
6768

6869
auto onPropertyChanged = [this](const mu::engraving::Pid pid, const QVariant& newValue) {
6970
this->propertyChangedCallback(pid, newValue);
@@ -93,6 +94,7 @@ void TextSettingsModel::createProperties()
9394
emit requestReloadPropertyItems();
9495
}, onPropertyReset);
9596

97+
m_horizontalPosition = buildPropertyItem(textPositionId, onPropertyChanged, nullptr, onPropertyReset);
9698
m_symbolSize = buildPropertyItem(mu::engraving::Pid::MUSIC_SYMBOL_SIZE);
9799
m_isSizeSpatiumDependent = buildPropertyItem(mu::engraving::Pid::SIZE_SPATIUM_DEPENDENT);
98100

@@ -132,6 +134,7 @@ void TextSettingsModel::loadProperties()
132134
Pid::FONT_SIZE,
133135
Pid::TEXT_LINE_SPACING,
134136
Pid::ALIGN,
137+
Pid::POSITION,
135138
Pid::MUSIC_SYMBOL_SIZE,
136139
Pid::TEXT_SIZE_SPATIUM_DEPENDENT,
137140
Pid::FRAME_TYPE,
@@ -151,6 +154,7 @@ void TextSettingsModel::loadProperties()
151154
Pid::BEGIN_FONT_SIZE,
152155
Pid::TEXT_LINE_SPACING,
153156
Pid::BEGIN_TEXT_ALIGN,
157+
Pid::BEGIN_TEXT_POSITION,
154158
Pid::MUSIC_SYMBOL_SIZE,
155159
Pid::TEXT_SIZE_SPATIUM_DEPENDENT,
156160
Pid::FRAME_TYPE,
@@ -212,6 +216,10 @@ void TextSettingsModel::loadProperties(const PropertyIdSet& propertyIdSet)
212216
});
213217
}
214218

219+
if (muse::contains(propertyIdSet, Pid::POSITION) || muse::contains(propertyIdSet, Pid::BEGIN_TEXT_POSITION)) {
220+
loadPropertyItem(m_horizontalPosition);
221+
}
222+
215223
if (muse::contains(propertyIdSet, Pid::MUSIC_SYMBOL_SIZE)) {
216224
loadPropertyItem(m_symbolSize);
217225
}
@@ -357,6 +365,11 @@ PropertyItem* TextSettingsModel::verticalAlignment() const
357365
return m_verticalAlignment;
358366
}
359367

368+
PropertyItem* TextSettingsModel::horizontalPosition() const
369+
{
370+
return m_horizontalPosition;
371+
}
372+
360373
PropertyItem* TextSettingsModel::symbolSize() const
361374
{
362375
return m_symbolSize;

src/inspector/models/text/textsettingsmodel.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ class TextSettingsModel : public AbstractInspectorModel
4242
Q_PROPERTY(PropertyItem * horizontalAlignment READ horizontalAlignment CONSTANT)
4343
Q_PROPERTY(PropertyItem * verticalAlignment READ verticalAlignment CONSTANT)
4444

45+
Q_PROPERTY(PropertyItem * horizontalPosition READ horizontalPosition CONSTANT)
46+
4547
Q_PROPERTY(PropertyItem * symbolSize READ symbolSize CONSTANT)
4648
Q_PROPERTY(PropertyItem * isSizeSpatiumDependent READ isSizeSpatiumDependent CONSTANT)
4749
Q_PROPERTY(PropertyItem * frameType READ frameType CONSTANT)
@@ -89,6 +91,8 @@ class TextSettingsModel : public AbstractInspectorModel
8991
PropertyItem* horizontalAlignment() const;
9092
PropertyItem* verticalAlignment() const;
9193

94+
PropertyItem* horizontalPosition() const;
95+
9296
PropertyItem* symbolSize() const;
9397
PropertyItem* isSizeSpatiumDependent() const;
9498
PropertyItem* frameType() const;
@@ -166,6 +170,8 @@ public slots:
166170
PropertyItem* m_horizontalAlignment = nullptr;
167171
PropertyItem* m_verticalAlignment = nullptr;
168172

173+
PropertyItem* m_horizontalPosition = nullptr;
174+
169175
PropertyItem* m_symbolSize = nullptr;
170176
PropertyItem* m_isSizeSpatiumDependent = nullptr;
171177
PropertyItem* m_frameType = nullptr;

src/inspector/view/qml/MuseScore/Inspector/text/TextInspectorView.qml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,13 +305,33 @@ InspectorSectionView {
305305
}
306306
}
307307

308+
FlatRadioButtonGroupPropertyView {
309+
id: positionButtonList
310+
titleText: qsTrc("inspector", "Alignment to parent")
311+
propertyItem: root.model ? root.model.horizontalPosition : null
312+
313+
enabled: root.model ? !root.model.centerOnSymbol.value : false
314+
315+
navigationPanel: root.navigationPanel
316+
navigationRowStart: alignmentSection.navigationRowEnd + 1
317+
318+
requestIconFontSize: 16
319+
requestWidth: 98
320+
321+
model: [
322+
{ iconCode: IconCode.ALIGN_LEFT, value: 0},
323+
{ iconCode: IconCode.ALIGN_HORIZONTAL_CENTER, value: 2},
324+
{ iconCode: IconCode.ALIGN_RIGHT, value: 1 }
325+
]
326+
}
327+
308328
FlatButton {
309329
id: insertSpecCharactersButton
310330
width: parent.width
311331

312332
navigation.panel: root.navigationPanel
313333
navigation.name: "Insert special characters"
314-
navigation.row: alignmentSection.navigationRowEnd + 1
334+
navigation.row: positionButtonList.navigationRowEnd + 1
315335

316336
text: qsTrc("inspector", "Insert special characters")
317337

0 commit comments

Comments
 (0)