Skip to content

Commit 27b3c44

Browse files
committed
Add tabs to track settings dialog
1 parent de5da87 commit 27b3c44

File tree

4 files changed

+226
-202
lines changed

4 files changed

+226
-202
lines changed

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ New features:
1515

1616
* Adjustable track header font size
1717

18+
* Add tabs to track settings dialog
19+
1820
Bug fixes:
1921

2022
* Fix auto note-off offset calculation

src/view/qml/Constants.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import QtQuick 2.15
44
QtObject {
55
readonly property int columnHeaderHeight: 40
66
readonly property double defaultWindowScale: 0.8
7+
readonly property double defaultDialogScale: 0.7
78
readonly property int minWindowWidth: 1024
89
readonly property int minWindowHeight: 768
910
readonly property color lineNumberColumnBackgroundColor: "black"

src/view/qml/Dialogs/TrackSettingsDialog.qml

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,45 @@ Dialog {
5656
ToolTip.text: qsTr("Don't save current settings")
5757
}
5858
}
59-
ColumnLayout {
59+
Column {
6060
anchors.fill: parent
61-
spacing: 12
62-
TrackSettingsDialog_MidiInstrumentSettings {
63-
id: midiInstrumentSettings
64-
Layout.fillWidth: true
65-
}
66-
TrackSettingsDialog_MidiCcSettings_Standard {
67-
id: midiCcSettingsPredefined
68-
Layout.fillWidth: true
69-
}
70-
TrackSettingsDialog_MidiCcSettings_Custom {
71-
id: midiCcSettingsGeneric
72-
Layout.fillWidth: true
61+
spacing: 10
62+
StackLayout {
63+
height: parent.height - tabBar.height
64+
width: parent.width
65+
currentIndex: tabBar.currentIndex
66+
TrackSettingsDialog_MidiInstrumentSettings {
67+
id: midiInstrumentSettings
68+
Layout.fillWidth: true
69+
}
70+
TrackSettingsDialog_MidiCcSettings_Standard {
71+
id: midiCcSettingsPredefined
72+
Layout.fillWidth: true
73+
}
74+
TrackSettingsDialog_MidiCcSettings_Custom {
75+
id: midiCcSettingsGeneric
76+
Layout.fillWidth: true
77+
}
78+
TrackSettingsDialog_MidiSettingsMiscellaneous {
79+
id: midiSettingsMiscellaneous
80+
Layout.fillWidth: true
81+
}
7382
}
74-
TrackSettingsDialog_MidiSettingsMiscellaneous {
75-
id: midiSettingsMiscellaneous
76-
Layout.fillWidth: true
83+
TabBar {
84+
id: tabBar
85+
width: parent.width
86+
TabButton {
87+
text: qsTr("MIDI Instrument")
88+
}
89+
TabButton {
90+
text: qsTr("Standard MIDI CC")
91+
}
92+
TabButton {
93+
text: qsTr("Custom MIDI CC")
94+
}
95+
TabButton {
96+
text: qsTr("Miscellaneous MIDI")
97+
}
7798
}
7899
}
79100
Component.onCompleted: {

0 commit comments

Comments
 (0)