Skip to content

Commit a7ca960

Browse files
committed
Update visualeditor icons
1 parent 217d475 commit a7ca960

File tree

6 files changed

+21
-12
lines changed

6 files changed

+21
-12
lines changed

src/plugins/coreplugin/internal/CorePlugin.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,6 @@ namespace Core::Internal {
298298
icon.addUrl("image://fluent-system-icons/" + iconName);
299299
CoreInterface::actionRegistry()->addIcon("", id, icon);
300300
};
301-
addIcon("org.diffscope.visualeditor.panel.arrangement", "gantt_chart");
302-
addIcon("org.diffscope.visualeditor.panel.mixer", "options_vertical");
303-
addIcon("org.diffscope.visualeditor.panel.pianoRoll", "midi");
304301
}
305302

306303
void CorePlugin::initializeSettings() const {

src/plugins/visualeditor/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,11 @@ diffscope_add_builtin_plugin(${PROJECT_NAME}
4141
INCLUDE_PRIVATE
4242
internal/**
4343
)
44+
45+
file(GLOB _res_icons res/icons/*)
46+
47+
qt_add_resources(${PROJECT_NAME} icons
48+
PREFIX /diffscope/visualeditor/icons
49+
BASE res/icons
50+
FILES ${_res_icons}
51+
)

src/plugins/visualeditor/qml/SnapControl.qml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Item {
3737
]
3838
textRole: "text"
3939
valueRole: "data"
40-
Component.onCompleted: currentValue = Qt.binding(() => control.positionAlignmentManipulator?.duration ?? 0)
40+
Component.onCompleted: currentIndex = Qt.binding(() => indexOfValue(control.positionAlignmentManipulator?.duration ?? 0))
4141
onCurrentValueChanged: () => {
4242
if (control.positionAlignmentManipulator) {
4343
control.positionAlignmentManipulator.duration = currentValue
@@ -46,7 +46,8 @@ Item {
4646
}
4747
ToolButton {
4848
text: qsTr("Triplet")
49-
// display: AbstractButton.IconOnly
49+
display: AbstractButton.IconOnly
50+
icon.source: "qrc:/diffscope/visualeditor/icons/triplet.svg"
5051
checkable: true
5152
checked: control.positionAlignmentManipulator?.tuplet === PositionAlignmentManipulator.Triplet
5253
onClicked: () => {
@@ -57,7 +58,8 @@ Item {
5758
}
5859
ToolButton {
5960
text: qsTr("Quintuplet")
60-
// display: AbstractButton.IconOnly
61+
display: AbstractButton.IconOnly
62+
icon.source: "qrc:/diffscope/visualeditor/icons/quintuplet.svg"
6163
checkable: true
6264
checked: control.positionAlignmentManipulator?.tuplet === PositionAlignmentManipulator.Quintuplet
6365
onClicked: () => {
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

src/plugins/visualeditor/res/org.diffscope.visualeditor_actions.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
</configuration>
1616

1717
<items>
18-
<action id="org.diffscope.visualeditor.arrangementPanel.pointerTool" shortcut="F5" />
19-
<action id="org.diffscope.visualeditor.arrangementPanel.pencilTool" shortcut="F6" />
20-
<action id="org.diffscope.visualeditor.arrangementPanel.handTool" shortcut="F7" />
18+
<action id="org.diffscope.visualeditor.arrangementPanel.pointerTool" icon="cursor" shortcut="F5" />
19+
<action id="org.diffscope.visualeditor.arrangementPanel.pencilTool" icon="edit" shortcut="F6" />
20+
<action id="org.diffscope.visualeditor.arrangementPanel.handTool" icon="hand_left" shortcut="F7" />
2121
<action id="org.diffscope.visualeditor.arrangementPanel.alignment" diffscope:excludeFromCommands="true" />
2222

23-
<action id="org.diffscope.visualeditor.panel.arrangement" catalog="org.diffscope.core.workspacePanelWidgets" diffscope:excludeFromCommands="true"/>
24-
<action id="org.diffscope.visualeditor.panel.mixer" catalog="org.diffscope.core.workspacePanelWidgets" diffscope:excludeFromCommands="true"/>
25-
<action id="org.diffscope.visualeditor.panel.pianoRoll" catalog="org.diffscope.core.workspacePanelWidgets" diffscope:excludeFromCommands="true"/>
23+
<action id="org.diffscope.visualeditor.panel.arrangement" catalog="org.diffscope.core.workspacePanelWidgets" icon="gantt_chart" diffscope:excludeFromCommands="true"/>
24+
<action id="org.diffscope.visualeditor.panel.mixer" catalog="org.diffscope.core.workspacePanelWidgets" icon="options_vertical" diffscope:excludeFromCommands="true"/>
25+
<action id="org.diffscope.visualeditor.panel.pianoRoll" catalog="org.diffscope.core.workspacePanelWidgets" icon="midi" diffscope:excludeFromCommands="true"/>
2626
</items>
2727

2828
<layouts>

0 commit comments

Comments
 (0)