Skip to content

Commit 6d8fde5

Browse files
authored
Merge pull request #13216 from acolombier/feat/saved-jump
Saved beat jumps
2 parents 927457d + 394c4a4 commit 6d8fde5

File tree

81 files changed

+6224
-274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+6224
-274
lines changed

res/qml/WaveformDisplay.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ Item {
100100
color: "#00d9ff"
101101
textColor: "#1a1a1a"
102102
text: " %1 "
103+
endIcon: Qt.resolvedUrl("images/jump_%1.svg")
103104
}
104105

105106
untilMark.showTime: true

res/qml/images/jump_backward.svg

Lines changed: 6 additions & 0 deletions
Loading

res/qml/images/jump_forward.svg

Lines changed: 6 additions & 0 deletions
Loading

res/skins/Deere/style.qss

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2439,6 +2439,18 @@ WEffectChainPresetSelector::indicator:unchecked:selected,
24392439
outline: none;
24402440
}
24412441

2442+
#CueStandardButton {
2443+
/* tall button, about the same height as cue number + label edit box */
2444+
width: 28px;
2445+
height: 46px;
2446+
/* make the icon slightly larger than default 16px */
2447+
qproperty-iconSize: 20px;
2448+
qproperty-icon: url(skin:/../Deere/icon/ic_loop_in_48px.svg);
2449+
background-color: #3B3B3B;
2450+
border-radius: 2px;
2451+
outline: none;
2452+
}
2453+
24422454
#CueSavedLoopButton {
24432455
/* tall button, about the same height as cue number + label edit box */
24442456
width: 28px;
@@ -2451,11 +2463,23 @@ WEffectChainPresetSelector::indicator:unchecked:selected,
24512463
outline: none;
24522464
}
24532465

2454-
#CueDeleteButton:hover, #CueSavedLoopButton:hover {
2466+
#CueSavedJumpButton {
2467+
/* tall button, about the same height as cue number + label edit box */
2468+
width: 28px;
2469+
height: 46px;
2470+
/* make the icon slightly larger than default 16px */
2471+
qproperty-iconSize: 20px;
2472+
qproperty-icon: url(skin:/../Deere/icon/ic_beatjump_forward_48px.svg);
2473+
background-color: #3B3B3B;
2474+
border-radius: 2px;
2475+
outline: none;
2476+
}
2477+
2478+
#CueDeleteButton:hover, #CueStandardButton:hover, #CueSavedLoopButton:hover, #CueSavedJumpButton:hover {
24552479
background-color: #4B4B4B;
24562480
}
24572481

2458-
#CueSavedLoopButton:checked {
2482+
#CueDeleteButton:checked, #CueStandardButton:checked, #CueSavedLoopButton:checked, #CueSavedJumpButton:checked {
24592483
background-color: #006596;
24602484
}
24612485

Lines changed: 51 additions & 0 deletions
Loading
Lines changed: 51 additions & 0 deletions
Loading
Lines changed: 138 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)