Skip to content

Commit 2aa1190

Browse files
CrSjimoCrSjimo
committed
Update property editor
1 parent 5332fa6 commit 2aa1190

28 files changed

Lines changed: 1186 additions & 419 deletions

‎src/libs/3rdparty/svscraft‎

‎src/libs/application/uishell/src/qml/PropertyEditorGroupBox.qml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import QtQml
2+
import QtQuick
3+
import QtQuick.Controls
4+
5+
import SVSCraft
6+
import SVSCraft.UIComponents
7+
8+
GroupBox {
9+
id: groupBox
10+
11+
property bool contentVisible: contentOpacity !== 0
12+
property double contentOpacity: groupBox.ThemedItem.folded ? 0 : 1
13+
property double contentAnimatedHeight: groupBox.ThemedItem.folded ? 0 : contentHeight
14+
ThemedItem.foldable: true
15+
clip: true
16+
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, contentAnimatedHeight + topPadding + bottomPadding)
17+
18+
Behavior on contentOpacity {
19+
NumberAnimation {
20+
duration: Theme.visualEffectAnimationDuration
21+
easing.type: Easing.OutCubic
22+
}
23+
}
24+
Behavior on contentAnimatedHeight {
25+
NumberAnimation {
26+
duration: Theme.visualEffectAnimationDuration
27+
easing.type: Easing.OutCubic
28+
}
29+
}
30+
31+
contentItem.visible: contentVisible
32+
contentItem.opacity: contentOpacity
33+
}

‎src/plugins/coreplugin/core/PropertyEditorManager.cpp‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,64 +13,74 @@ namespace Core {
1313

1414
PropertyEditorManager::~PropertyEditorManager() = default;
1515

16-
void PropertyEditorManager::addLabelComponent(QQmlComponent *component) {
16+
void PropertyEditorManager::addNoneComponent(QQmlComponent *component) {
1717
Q_D(PropertyEditorManager);
18-
d->labelComponents.append(component);
18+
d->noneComponents.append(component);
1919
}
2020

21-
void PropertyEditorManager::addTempoComponent(QQmlComponent *component) {
21+
void PropertyEditorManager::addAnchorNodeComponent(QQmlComponent *component) {
2222
Q_D(PropertyEditorManager);
23-
d->tempoComponents.append(component);
23+
d->anchorNodeComponents.append(component);
2424
}
2525

26-
void PropertyEditorManager::addTrackComponent(QQmlComponent *component) {
26+
void PropertyEditorManager::addClipComponent(QQmlComponent *component) {
2727
Q_D(PropertyEditorManager);
28-
d->trackComponents.append(component);
28+
d->clipComponents.append(component);
2929
}
3030

31-
void PropertyEditorManager::addClipComponent(QQmlComponent *component) {
31+
void PropertyEditorManager::addLabelComponent(QQmlComponent *component) {
3232
Q_D(PropertyEditorManager);
33-
d->clipComponents.append(component);
33+
d->labelComponents.append(component);
3434
}
3535

3636
void PropertyEditorManager::addNoteComponent(QQmlComponent *component) {
3737
Q_D(PropertyEditorManager);
3838
d->noteComponents.append(component);
3939
}
4040

41-
void PropertyEditorManager::addAnchorNodeComponent(QQmlComponent *component) {
41+
void PropertyEditorManager::addTempoComponent(QQmlComponent *component) {
4242
Q_D(PropertyEditorManager);
43-
d->anchorNodeComponents.append(component);
43+
d->tempoComponents.append(component);
4444
}
4545

46-
QList<QQmlComponent *> PropertyEditorManager::labelComponents() const {
47-
Q_D(const PropertyEditorManager);
48-
return d->labelComponents;
46+
void PropertyEditorManager::addTrackComponent(QQmlComponent *component) {
47+
Q_D(PropertyEditorManager);
48+
d->trackComponents.append(component);
4949
}
5050

51-
QList<QQmlComponent *> PropertyEditorManager::tempoComponents() const {
51+
QList<QQmlComponent *> PropertyEditorManager::noneComponents() const {
5252
Q_D(const PropertyEditorManager);
53-
return d->tempoComponents;
53+
return d->noneComponents;
5454
}
5555

56-
QList<QQmlComponent *> PropertyEditorManager::trackComponents() const {
56+
QList<QQmlComponent *> PropertyEditorManager::anchorNodeComponents() const {
5757
Q_D(const PropertyEditorManager);
58-
return d->trackComponents;
58+
return d->anchorNodeComponents;
5959
}
6060

6161
QList<QQmlComponent *> PropertyEditorManager::clipComponents() const {
6262
Q_D(const PropertyEditorManager);
6363
return d->clipComponents;
6464
}
6565

66+
QList<QQmlComponent *> PropertyEditorManager::labelComponents() const {
67+
Q_D(const PropertyEditorManager);
68+
return d->labelComponents;
69+
}
70+
6671
QList<QQmlComponent *> PropertyEditorManager::noteComponents() const {
6772
Q_D(const PropertyEditorManager);
6873
return d->noteComponents;
6974
}
7075

71-
QList<QQmlComponent *> PropertyEditorManager::anchorNodeComponents() const {
76+
QList<QQmlComponent *> PropertyEditorManager::tempoComponents() const {
7277
Q_D(const PropertyEditorManager);
73-
return d->anchorNodeComponents;
78+
return d->tempoComponents;
79+
}
80+
81+
QList<QQmlComponent *> PropertyEditorManager::trackComponents() const {
82+
Q_D(const PropertyEditorManager);
83+
return d->trackComponents;
7484
}
7585

7686
}

‎src/plugins/coreplugin/core/PropertyEditorManager.h‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,33 @@ namespace Core {
1616
QML_UNCREATABLE("")
1717
Q_DECLARE_PRIVATE(PropertyEditorManager)
1818

19+
Q_PROPERTY(QList<QQmlComponent *> noneComponents READ noneComponents CONSTANT)
20+
Q_PROPERTY(QList<QQmlComponent *> anchorNodeComponents READ anchorNodeComponents CONSTANT)
21+
Q_PROPERTY(QList<QQmlComponent *> clipComponents READ clipComponents CONSTANT)
1922
Q_PROPERTY(QList<QQmlComponent *> labelComponents READ labelComponents CONSTANT)
23+
Q_PROPERTY(QList<QQmlComponent *> noteComponents READ noteComponents CONSTANT)
2024
Q_PROPERTY(QList<QQmlComponent *> tempoComponents READ tempoComponents CONSTANT)
2125
Q_PROPERTY(QList<QQmlComponent *> trackComponents READ trackComponents CONSTANT)
22-
Q_PROPERTY(QList<QQmlComponent *> clipComponents READ clipComponents CONSTANT)
23-
Q_PROPERTY(QList<QQmlComponent *> noteComponents READ noteComponents CONSTANT)
24-
Q_PROPERTY(QList<QQmlComponent *> anchorNodeComponents READ anchorNodeComponents CONSTANT)
2526

2627
public:
2728
explicit PropertyEditorManager(QObject *parent = nullptr);
2829
~PropertyEditorManager() override;
2930

31+
void addNoneComponent(QQmlComponent *component);
32+
void addAnchorNodeComponent(QQmlComponent *component);
33+
void addClipComponent(QQmlComponent *component);
3034
void addLabelComponent(QQmlComponent *component);
35+
void addNoteComponent(QQmlComponent *component);
3136
void addTempoComponent(QQmlComponent *component);
3237
void addTrackComponent(QQmlComponent *component);
33-
void addClipComponent(QQmlComponent *component);
34-
void addNoteComponent(QQmlComponent *component);
35-
void addAnchorNodeComponent(QQmlComponent *component);
3638

39+
QList<QQmlComponent *> noneComponents() const;
40+
QList<QQmlComponent *> anchorNodeComponents() const;
41+
QList<QQmlComponent *> clipComponents() const;
3742
QList<QQmlComponent *> labelComponents() const;
43+
QList<QQmlComponent *> noteComponents() const;
3844
QList<QQmlComponent *> tempoComponents() const;
3945
QList<QQmlComponent *> trackComponents() const;
40-
QList<QQmlComponent *> clipComponents() const;
41-
QList<QQmlComponent *> noteComponents() const;
42-
QList<QQmlComponent *> anchorNodeComponents() const;
4346

4447
private:
4548
QScopedPointer<PropertyEditorManagerPrivate> d_ptr;

‎src/plugins/coreplugin/core/PropertyEditorManager_p.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ namespace Core {
1414
public:
1515
PropertyEditorManager *q_ptr;
1616

17+
QList<QQmlComponent *> noneComponents;
18+
QList<QQmlComponent *> anchorNodeComponents;
19+
QList<QQmlComponent *> clipComponents;
1720
QList<QQmlComponent *> labelComponents;
21+
QList<QQmlComponent *> noteComponents;
1822
QList<QQmlComponent *> tempoComponents;
1923
QList<QQmlComponent *> trackComponents;
20-
QList<QQmlComponent *> clipComponents;
21-
QList<QQmlComponent *> noteComponents;
22-
QList<QQmlComponent *> anchorNodeComponents;
2324
};
2425

2526
}

‎src/plugins/coreplugin/internal/CorePlugin.cpp‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -379,26 +379,20 @@ namespace Core::Internal {
379379
}
380380

381381
void CorePlugin::initializePropertyEditors() {
382-
auto labelPropertyEditorComponent = new QQmlComponent(RuntimeInterface::qmlEngine(), "DiffScope.Core", "LabelPropertyEditor", this);
383-
if (labelPropertyEditorComponent->isError()) {
384-
qFatal() << labelPropertyEditorComponent->errorString();
385-
}
386-
CoreInterface::propertyEditorManager()->addLabelComponent(labelPropertyEditorComponent);
387-
auto tempoPropertyEditorComponent = new QQmlComponent(RuntimeInterface::qmlEngine(), "DiffScope.Core", "TempoPropertyEditor", this);
388-
if (tempoPropertyEditorComponent->isError()) {
389-
qFatal() << tempoPropertyEditorComponent->errorString();
390-
}
391-
CoreInterface::propertyEditorManager()->addTempoComponent(tempoPropertyEditorComponent);
392-
auto trackPropertyEditorComponent = new QQmlComponent(RuntimeInterface::qmlEngine(), "DiffScope.Core", "TrackPropertyEditor", this);
393-
if (trackPropertyEditorComponent->isError()) {
394-
qFatal() << trackPropertyEditorComponent->errorString();
395-
}
396-
CoreInterface::propertyEditorManager()->addTrackComponent(trackPropertyEditorComponent);
397-
auto trackControlPropertyEditorComponent = new QQmlComponent(RuntimeInterface::qmlEngine(), "DiffScope.Core", "ControlPropertyEditor", this);
398-
if (trackControlPropertyEditorComponent->isError()) {
399-
qFatal() << trackControlPropertyEditorComponent->errorString();
400-
}
401-
CoreInterface::propertyEditorManager()->addTrackComponent(trackControlPropertyEditorComponent);
382+
const auto f = [=, this](const QString &typeName, void(PropertyEditorManager::*addMethod)(QQmlComponent *)) {
383+
auto component = new QQmlComponent(RuntimeInterface::qmlEngine(), "DiffScope.Core", typeName, this);
384+
if (component->isError()) {
385+
qFatal() << component->errorString();
386+
}
387+
(CoreInterface::propertyEditorManager()->*addMethod)(component);
388+
};
389+
f("LabelPropertyEditor", &PropertyEditorManager::addLabelComponent);
390+
f("TempoPropertyEditor", &PropertyEditorManager::addTempoComponent);
391+
f("TrackPropertyEditor", &PropertyEditorManager::addTrackComponent);
392+
f("ControlPropertyEditor", &PropertyEditorManager::addTrackComponent);
393+
f("MetadataPropertyEditor", &PropertyEditorManager::addNoneComponent);
394+
f("GlobalCentShiftPropertyEditor", &PropertyEditorManager::addNoneComponent);
395+
f("MasterControlPropertyEditor", &PropertyEditorManager::addNoneComponent);
402396
}
403397

404398
void CorePlugin::checkLastRun() {

0 commit comments

Comments
 (0)