diff --git a/res/skins/Deere/deck_text_row.xml b/res/skins/Deere/deck_text_row.xml
index 587fe0cc2041..1c54bc1f19bd 100644
--- a/res/skins/Deere/deck_text_row.xml
+++ b/res/skins/Deere/deck_text_row.xml
@@ -76,189 +76,52 @@
-
- BPMGutter
- horizontal
- min,max
+
+
+ BpmKeyEditRow
+ max,
+
+ [Deere],bpm_layout_next
+ [Deere],bpm_layout_prev
-
-
- KeyEditRow
- max,
-
- [Deere],key_layout_next
- [Deere],key_layout_prev
+
+ BpmKeyEditRowCollapsed
+ stacked
-
- KeyEditRowCollapsed
- stacked
-
-
- KeyEditTrigger
- visual_key
- 1
-
- 0
-
-
-
-
-
- [Deere],key_layout_next
-
-
-
- KeyEditTriggerLabel
- 30,20
-
- min,
- false
-
- ,visual_key
-
-
-
-
+
+ BpmKeyEditTrigger
+ visual_bpm
+ 1
+
+ 0
+
+
+
+
+ [Deere],bpm_layout_next
+
+
+
- KeyEditRowExpanded
horizontal
-
- KeyEditRowControls
- horizontal
- p,me
- 80,20
- 120,30
-
-
- pitch_down
- PitchDownButton
-
-
-
-
- icon/ic_remove_48px.svg
- icon/ic_remove_48px.svg
- ,pitch_down
- ,pitch_down_small
-
-
-
- pitch_up
- PitchUpButton
-
-
-
-
- icon/ic_add_48px.svg
- icon/ic_add_48px.svg
- ,pitch_up
- ,pitch_up_small
-
-
-
- sync_reset_key
- SyncKeyButton
- 42,22
- 42,22
- f,f
- Match
-
-
- ,sync_key
- ,reset_key
-
-
-
-
-
-
- stacked
- 60,
-
-
- KeyEditTrigger
- visual_key
- 1
-
- 0
-
-
-
-
-
- [Deere],key_layout_next
-
-
-
-
- KeyEditTriggerLabel
-
- min,
- true
-
- ,visual_key
-
-
-
-
-
-
-
-
-
-
-
- BpmEditRow
- max,
-
- [Deere],bpm_layout_next
- [Deere],bpm_layout_prev
-
-
- KeyEditRowCollapsed
- stacked
-
-
- BpmEditTrigger
- visual_bpm
- 1
-
- 0
-
-
-
-
-
- [Deere],bpm_layout_next
-
-
+
-
- BpmEditTriggerLabel
- 70,20
+ BpmKeyEditTriggerLabel
+ 60,20
right
@@ -284,118 +147,128 @@
-
+
+
+
+
+ BpmKeyEditRowExpanded
+ horizontal
+
- BpmEditRowExpanded
+ BpmKeyEditRowControls
horizontal
+ p,me
+ 100,20
+ 180,30
-
- BpmEditRowControls
- horizontal
- p,me
- 100,20
- 180,30
-
-
- beats_adjust_faster
- BeatsAdjustFasterButton
-
-
-
-
- icon/ic_beats_adjust_faster_48px.svg
- icon/ic_beats_adjust_faster_48px.svg
- ,beats_adjust_faster
-
+
+ beats_adjust_faster
+ BeatsAdjustFasterButton
+
+
+
+
+ icon/ic_beats_adjust_faster_48px.svg
+ icon/ic_beats_adjust_faster_48px.svg
+ ,beats_adjust_faster
+
-
- beats_adjust_slower
- BeatsAdjustSlowerButton
-
-
-
-
- icon/ic_beats_adjust_slower_48px.svg
- icon/ic_beats_adjust_slower_48px.svg
- ,beats_adjust_slower
-
+
+ beats_adjust_slower
+ BeatsAdjustSlowerButton
+
+
+
+
+ icon/ic_beats_adjust_slower_48px.svg
+ icon/ic_beats_adjust_slower_48px.svg
+ ,beats_adjust_slower
+
-
- beats_translate_earlier
- BeatsTranslateEarlierButton
-
-
-
-
- icon/ic_beats_translate_earlier_48px.svg
- icon/ic_beats_translate_earlier_48px.svg
- ,beats_translate_earlier
-
+
+ beats_translate_earlier
+ BeatsTranslateEarlierButton
+
+
+
+
+ icon/ic_beats_translate_earlier_48px.svg
+ icon/ic_beats_translate_earlier_48px.svg
+ ,beats_translate_earlier
+
-
- beats_translate_later
- BeatsTranslateLaterButton
-
-
-
-
- icon/ic_beats_translate_later_48px.svg
- icon/ic_beats_translate_later_48px.svg
- ,beats_translate_later
-
+
+ beats_translate_later
+ BeatsTranslateLaterButton
+
+
+
+
+ icon/ic_beats_translate_later_48px.svg
+ icon/ic_beats_translate_later_48px.svg
+ ,beats_translate_later
+
-
- beats_translate_curpos
- BeatsTranslateCurposButton
-
-
-
-
- icon/ic_beats_translate_curpos_48px.svg
- icon/ic_beats_translate_curpos_48px.svg
- ,beats_translate_curpos
- ,beats_translate_match_alignment
-
+
+ beats_translate_curpos
+ BeatsTranslateCurposButton
+
+
+
+
+ icon/ic_beats_translate_curpos_48px.svg
+ icon/ic_beats_translate_curpos_48px.svg
+ ,beats_translate_curpos
+ ,beats_translate_match_alignment
+
-
- bpm_tap
- 40,20
- 60,30
- 1
-
- 0
- TAP
-
-
- ,bpm_tap
- true
- LeftButton
-
-
-
-
+
+ bpm_tap
+ 40,20
+ 60,30
+ 1
+
+ 0
+ TAP
+
+
+ ,bpm_tap
+ true
+ LeftButton
+
+
+
+
+
+
+ stacked
+
+
+ BpmKeyEditTrigger
+ visual_bpm
+ 1
+
+ 0
+
+
+
+
+ [Deere],bpm_layout_next
+
+
- stacked
+ horizontal
-
- BpmEditTrigger
- visual_bpm
- 1
-
- 0
-
-
-
-
- [Deere],bpm_layout_next
-
-
+
- BpmEditTriggerLabel
+ BpmKeyEditTriggerLabel
right
@@ -403,13 +276,14 @@
-
+
+
-
+
-
+
-
+
@@ -428,63 +302,223 @@
horizontal
me,max
-
-
- track_artist
- artist
- me,min
- right
-
-
- [Deere],show_track_info
- visible
-
-
-
-
-
- StarratingGutter
horizontal
- min,min
+ i,max
-
- starrating
+
+
+ track_artist
+ artist
+ me,min
+ right
-
+
+ [Deere],show_track_info
+ visible
+
+
+
+
+
+
+ StarratingGutter
+ horizontal
+ min,min
+
+
+ starrating
+
+
+
+
+ [Deere],show_starrating
+ visible
+
+
+
+
+ PositionGutter
+ horizontal
+ min,max
+ 70,20
+ 190,30
+
+
+ track_time
+
+
+
+
-
- [Deere],show_starrating
- visible
-
-
-
- PositionGutter
- horizontal
- min,max
- 70,20
- 190,30
+
+
+ BpmKeyEditRow
+ max,
+ [Deere],key_layout_next
+ [Deere],key_layout_prev
-
- track_time
-
-
+
+ BpmKeyEditRowCollapsed
+ stacked
+
+
+ BpmKeyEditTrigger
+ visual_key
+ 1
+
+ 0
+
+
+
+
+ [Deere],key_layout_next
+
+
+
+
+ horizontal
+
+
+
+
+ BpmKeyEditTriggerLabel
+ 30,20
+
+ min,
+ false
+
+ ,visual_key
+
+
+
+
+
+
+
+
+ BpmKeyEditRowExpanded
+ horizontal
+
+
+ BpmKeyEditRowControls
+ horizontal
+ p,me
+ 80,20
+ 120,30
+
+
+ pitch_down
+ PitchDownButton
+
+
+
+
+ icon/ic_remove_48px.svg
+ icon/ic_remove_48px.svg
+ ,pitch_down
+ ,pitch_down_small
+
+
+
+ pitch_up
+ PitchUpButton
+
+
+
+
+ icon/ic_add_48px.svg
+ icon/ic_add_48px.svg
+ ,pitch_up
+ ,pitch_up_small
+
+
+
+ sync_reset_key
+ SyncKeyButton
+ 42,22
+ 42,22
+ f,f
+ Match
+
+
+ ,sync_key
+ ,reset_key
+
+
+
+
+
+
+ stacked
+ 60,
+
+
+ BpmKeyEditTrigger
+ visual_key
+ 1
+
+ 0
+
+
+
+
+
+ [Deere],key_layout_next
+
+
+
+
+ horizontal
+
+
+
+
+ BpmKeyEditTriggerLabel
+
+ min,
+ true
+
+ ,visual_key
+
+
+
+
+
+
+
+
-
+
diff --git a/res/skins/Deere/icon/ic_chevron_left_24x48px.svg b/res/skins/Deere/icon/ic_chevron_left_24x48px.svg
new file mode 100644
index 000000000000..beef3440d71d
--- /dev/null
+++ b/res/skins/Deere/icon/ic_chevron_left_24x48px.svg
@@ -0,0 +1 @@
+
diff --git a/res/skins/Deere/icon/ic_chevron_right_24x48px.svg b/res/skins/Deere/icon/ic_chevron_right_24x48px.svg
new file mode 100644
index 000000000000..732ef59b8e7e
--- /dev/null
+++ b/res/skins/Deere/icon/ic_chevron_right_24x48px.svg
@@ -0,0 +1 @@
+
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index a18bafe38553..80d22fff43e9 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -861,34 +861,38 @@ WBeatSpinBox,
padding: 2px;
}
+#PositionGutter {
+ margin-right: 4px;
+}
+
/* Start editable widgets in decks */
-#BpmEditRowCollapsed:hover, #KeyEditRowCollapsed:hover,
-#BpmEditRowExpanded:hover, #KeyEditRowExpanded:hover,
+#BpmKeyEditRowCollapsed:hover,
+#BpmKeyEditRowExpanded:hover,
#PositionGutter:hover, #StarratingGutter:hover {
/* emphasize editable widgets on hover */
border: 1px solid #FF6600;
background-color: rgba(255, 102, 0, 128);
}
-#BpmEditRowCollapsed, #KeyEditRowCollapsed {
+#BpmKeyEditRowCollapsed {
qproperty-layoutAlignment: 'AlignCenter';
/* emphasize active widget */
border: 1px solid #666666;
}
-#BpmEditRowExpanded, #KeyEditRowExpanded {
+#BpmKeyEditRowExpanded {
/* emphasize active widget */
border: 1px solid #FF6600;
background: rgba(255, 102, 0, 64);
color: #D6D6D6;
}
-#BpmEditTrigger, #KeyEditTrigger {
+#BpmKeyEditTrigger {
/* make trigger button transparent */
background-color: none;
border: none;
}
-#BpmEditRowControls, #KeyEditRowControls {
+#BpmKeyEditRowControls {
/* Make room between buttons */
background-color: #333333;
padding-left: 1px;
@@ -897,9 +901,17 @@ WBeatSpinBox,
qproperty-layoutSpacing: 2;
}
-#BpmEditTriggerLabel, #KeyEditTriggerLabel {
+#BpmKeyEditTriggerLabel {
padding-right: 1px;
}
+
+#BpmKeyInfoShow {
+ image: url(skin:/icon/ic_chevron_left_24x48px.svg) center center;
+}
+
+#BpmKeyInfoHide {
+ image: url(skin:/icon/ic_chevron_right_24x48px.svg) center center;
+}
/* End editable widgets in decks */
#DeckTextRow #ArtistGutter WLabel, #DeckTextRow #BPMGutter WLabel, #DeckTextRow #PositionGutter WLabel {