Skip to content

Commit 4e82145

Browse files
ronso0ronso0
authored
Merge pull request #15862 from xARSENICx/feature/analyze-view-custom-days
Implement configurable 'Recent Days' filter for Analyze view
2 parents aecc34e + f06b5f7 commit 4e82145

13 files changed

Lines changed: 323 additions & 86 deletions

‎res/skins/Deere/style.qss‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,10 @@ WTrackPropertyEditor,
314314
border: 1px solid #006596;
315315
}
316316

317+
#spinBoxRecentDays {
318+
min-width: 55px;
319+
}
320+
317321
/* checkbox in library "Played" column */
318322
#LibraryPlayedCheckbox::indicator:unchecked {
319323
image: url(skin:/../Deere/icon/ic_library_checkbox.svg);
@@ -546,7 +550,6 @@ WLibrarySidebar::branch:open:!has-children:has-siblings:selected {
546550
/* same as QTreeview */
547551
color: #d2d2d2;
548552
margin: 9px 5px 6px 0px;
549-
font-size: 12px;
550553
}
551554

552555
#LibraryFeatureControls QRadioButton::indicator {
@@ -603,7 +606,8 @@ WLibrarySidebar::branch:open:!has-children:has-siblings:selected {
603606

604607
#LibraryFeatureControls QPushButton:focus,
605608
#fadeModeCombobox:focus,
606-
#spinBoxTransition:focus {
609+
#spinBoxTransition:focus
610+
#spinBoxRecentDays:focus {
607611
outline: none;
608612
}
609613

@@ -910,7 +914,8 @@ WSearchLineEdit QAbstractScrollArea,
910914
}
911915

912916
WLabel, #LibraryFeatureControls QLabel,
913-
WPushButton, #LibraryFeatureControls QPushButton {
917+
WPushButton, #LibraryFeatureControls QPushButton,
918+
#LibraryFeatureControls QRadioButton {
914919
font-size: 12px;
915920
font-weight: bold;
916921
text-transform: uppercase;
@@ -988,7 +993,8 @@ WOverview #PassthroughLabel {
988993
}
989994

990995
WBeatSpinBox,
991-
#spinBoxTransition {
996+
#spinBoxTransition,
997+
#spinBoxRecentDays {
992998
color: #c1cabe;
993999
background-color: #1f1e1e;
9941000
border: 1px solid #444342;
@@ -998,50 +1004,63 @@ WBeatSpinBox,
9981004
WBeatSpinBox {
9991005
padding: 2px;
10001006
}
1001-
#spinBoxTransition {
1007+
#spinBoxTransition,
1008+
#spinBoxRecentDays {
10021009
padding: 0px 2px 0px 2px;
10031010
margin: 3px 0px 0px 2px;
10041011
}
10051012
WBeatSpinBox:hover,
10061013
#spinBoxTransition:hover,
1014+
#spinBoxRecentDays:hover,
10071015
WBeatSpinBox:focus,
1008-
#spinBoxTransition:focus {
1016+
#spinBoxTransition:focus,
1017+
#spinBoxRecentDays:focus {
10091018
border: 1px ridge #015d8d;
10101019
}
1020+
#spinBoxRecentDays:disabled {
1021+
color: #555;
1022+
border-color: #333;
1023+
}
10111024
WBeatSpinBox::down-button,
1012-
#spinBoxTransition::down-button {
1025+
#spinBoxTransition::down-button,
1026+
#spinBoxRecentDays::down-button {
10131027
subcontrol-origin: border;
10141028
subcontrol-position: bottom right; /* position at the top right corner */
10151029
padding-right: 4px;
10161030
padding-top: -3px;
10171031
border: 0;
10181032
}
10191033
WBeatSpinBox::down-arrow,
1020-
#spinBoxTransition::down-arrow {
1034+
#spinBoxTransition::down-arrow,
1035+
#spinBoxRecentDays::down-arrow {
10211036
width: 9px;
10221037
height: 7px;
10231038
image: url(skin:/../Deere/icon/ic_chevron_down_selector.svg);
10241039
}
10251040
WBeatSpinBox::down-arrow:hover,
1026-
#spinBoxTransition::down-arrow:hover {
1041+
#spinBoxTransition::down-arrow:hover,
1042+
#spinBoxRecentDays::down-arrow:hover {
10271043
image: url(skin:/../Deere/icon/ic_chevron_down_selector_hover.svg);
10281044
}
10291045
WBeatSpinBox::up-button,
1030-
#spinBoxTransition::up-button {
1046+
#spinBoxTransition::up-button,
1047+
#spinBoxRecentDays::up-button {
10311048
subcontrol-origin: border;
10321049
subcontrol-position: top right; /* position at the top right corner */
10331050
padding-right: 4px;
10341051
padding-bottom: -3px;
10351052
border: 0;
10361053
}
10371054
WBeatSpinBox::up-arrow,
1038-
#spinBoxTransition::up-arrow {
1055+
#spinBoxTransition::up-arrow,
1056+
#spinBoxRecentDays::up-arrow {
10391057
width: 9px;
10401058
height: 7px;
10411059
image: url(skin:/../Deere/icon/ic_chevron_up_selector.svg);
10421060
}
10431061
WBeatSpinBox::up-arrow:hover,
1044-
#spinBoxTransition::up-arrow:hover {
1062+
#spinBoxTransition::up-arrow:hover,
1063+
#spinBoxRecentDays::up-arrow:hover {
10451064
image: url(skin:/../Deere/icon/ic_chevron_up_selector_hover.svg);
10461065
}
10471066

‎res/skins/LateNight/style_classic.qss‎

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@ WSearchLineEdit,
297297

298298
WBeatSpinBox,
299299
WBpmEditor QDoubleSpinBox,
300-
#spinBoxTransition {
300+
#spinBoxTransition,
301+
#spinBoxRecentDays {
301302
selection-color: #000;
302303
selection-background-color: #d2d2d2;
303304
}
@@ -635,7 +636,8 @@ WLibrary {
635636

636637
WBeatSpinBox,
637638
WBpmEditor QDoubleSpinBox,
638-
#spinBoxTransition {
639+
#spinBoxTransition,
640+
#spinBoxRecentDays {
639641
background-color: #0f0f0f;
640642
}
641643
WBeatSpinBox {
@@ -648,58 +650,76 @@ WBpmEditor QDoubleSpinBox,
648650
border-image: url(skins:LateNight/classic/buttons/spinbox_elevated_border_focus.svg) 2 19 2 2;
649651
}
650652

651-
#spinBoxTransition {
653+
#spinBoxTransition,
654+
#spinBoxRecentDays {
652655
border-width: 3px 19px 2px 3px;
653656
border-image: url(skins:LateNight/classic/buttons/spinbox_embedded_border.svg) 3 19 2 3;
654-
width: 24px;
655657
height: 19px;
656658
padding: 0px -15px 0px 0px;
657659
margin: 0px 2px 3px 5px;
658660
}
659-
#spinBoxTransition:focus {
661+
#spinBoxTransition {
662+
width: 24px;
663+
}
664+
#spinBoxRecentDays {
665+
width: 45px;
666+
}
667+
#spinBoxTransition:focus,
668+
#spinBoxRecentDays:focus {
660669
border-image: url(skins:LateNight/classic/buttons/spinbox_embedded_border_focus_orange.svg) 3 19 2 3;
661670
}
671+
#spinBoxRecentDays:disabled {
672+
color: #494949;
673+
}
662674

663675
WBeatSpinBox::up-button,
664676
WBeatSpinBox::down-button,
665677
#spinBoxTransition::up-button,
666-
#spinBoxTransition::down-button {
678+
#spinBoxTransition::down-button,
679+
#spinBoxRecentDays::up-button,
680+
#spinBoxRecentDays::down-button {
667681
subcontrol-origin: content;
668682
position: relative;
669683
/* as with spinbox: border is added to size. */
670684
width: 17px;
671685
padding: 0px;
672686
}
673687
WBeatSpinBox::up-button,
674-
#spinBoxTransition::up-button {
688+
#spinBoxTransition::up-button,
689+
#spinBoxRecentDays::up-button {
675690
height: 11px;
676691
subcontrol-position: top right;
677692
image: url(skins:LateNight/classic/buttons/spinbox_up.svg) no-repeat;
678693
}
679694
WBeatSpinBox::up-button:pressed,
680-
#spinBoxTransition::up-button:pressed {
695+
#spinBoxTransition::up-button:pressed,
696+
#spinBoxRecentDays::up-button:pressed {
681697
image: url(skins:LateNight/classic/buttons/spinbox_up_pressed.svg) no-repeat;
682698
}
683699
WBeatSpinBox::up-button {
684700
margin: -1px 0px 0px 0px;
685701
}
686-
#spinBoxTransition::up-button {
702+
#spinBoxTransition::up-button,
703+
#spinBoxRecentDays::up-button {
687704
margin: -2px -3px 0px 0px;
688705
}
689706
WBeatSpinBox::down-button,
690-
#spinBoxTransition::down-button {
707+
#spinBoxTransition::down-button,
708+
#spinBoxRecentDays::down-button {
691709
height: 11px;
692710
subcontrol-position: bottom right;
693711
image: url(skins:LateNight/classic/buttons/spinbox_down.svg) no-repeat;
694712
}
695713
WBeatSpinBox::down-button:pressed,
696-
#spinBoxTransition::down-button:pressed {
714+
#spinBoxTransition::down-button:pressed,
715+
#spinBoxRecentDays::down-button:pressed {
697716
image: url(skins:LateNight/classic/buttons/spinbox_down_pressed.svg) no-repeat;
698717
}
699718
WBeatSpinBox::down-button {
700719
margin: 0px 0px -2px 0px;
701720
}
702-
#spinBoxTransition::down-button {
721+
#spinBoxTransition::down-button,
722+
#spinBoxRecentDays::down-button {
703723
margin: 0px -3px -1px 0px;
704724
}
705725

@@ -753,6 +773,8 @@ WBpmEditor QDoubleSpinBox::down-button {
753773

754774

755775

776+
777+
756778
/************** Mixer *********************************************************/
757779

758780
#CrossfaderContainer[highlight="1"] {
@@ -1273,6 +1295,7 @@ WSearchLineEdit QAbstractScrollArea,
12731295
#fadeModeCombobox QAbstractScrollArea,
12741296
WBeatSpinBox,
12751297
#spinBoxTransition,
1298+
#spinBoxRecentDays,
12761299
WBpmEditor QDoubleSpinBox,
12771300
#LibraryFeatureControls QLabel,
12781301
#LibraryFeatureControls QRadioButton {

‎res/skins/LateNight/style_palemoon.qss‎

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -673,13 +673,15 @@ WTrackProperty[selected="true"],
673673
/********************** Loop Controls / AutoDJ spinbox ************************/
674674
WBeatSpinBox,
675675
WBpmEditor QDoubleSpinBox,
676-
#spinBoxTransition {
676+
#spinBoxTransition,
677+
#spinBoxRecentDays {
677678
selection-color: #a7998b;
678679
selection-background-color: #111;
679680
}
680681
WBeatSpinBox:focus,
681682
WBpmEditor QDoubleSpinBox:focus,
682683
#spinBoxTransition:focus,
684+
#spinBoxRecentDays:focus,
683685
#LibraryBPMSpinBox:focus {
684686
selection-color: #000;
685687
selection-background-color: #d2d2d2;
@@ -691,50 +693,66 @@ WBeatSpinBox {
691693
border-image: url(skins:LateNight/palemoon/buttons/btn_embedded_spinbox.svg) 3 19 2 3;
692694
}
693695

694-
#spinBoxTransition {
695-
width: 24px;
696+
#spinBoxTransition,
697+
#spinBoxRecentDays {
696698
height: 19px;
697699
padding: 0px -15px 0px 0px;
698700
margin: 0px 2px 3px 5px;
699701
border-width: 3px 19px 2px 3px;
700702
border-image: url(skins:LateNight/palemoon/buttons/btn_embedded_spinbox_autodj.svg) 3 19 2 3;
701703
}
704+
#spinBoxTransition {
705+
width: 24px;
706+
}
707+
#spinBoxRecentDays {
708+
width: 45px;
709+
}
702710
WBeatSpinBox:focus,
703-
#spinBoxTransition:focus {
711+
#spinBoxTransition:focus,
712+
#spinBoxRecentDays:focus {
704713
border-image: url(skins:LateNight/palemoon/buttons/btn_embedded_spinbox_focus_blue.svg) 3 19 2 3;
705714
}
715+
#spinBoxRecentDays:disabled {
716+
color: #494949;
717+
}
706718

707719
WBeatSpinBox::up-button,
708720
WBeatSpinBox::down-button,
709721
#spinBoxTransition::up-button,
710-
#spinBoxTransition::down-button {
722+
#spinBoxTransition::down-button,
723+
#spinBoxRecentDays::up-button,
724+
#spinBoxRecentDays::down-button {
711725
subcontrol-origin: content;
712726
position: relative;
713727
padding: 0px;
714728
width: 18px;
715729
}
716730

717731
WBeatSpinBox::up-button,
718-
#spinBoxTransition::up-button {
732+
#spinBoxTransition::up-button,
733+
#spinBoxRecentDays::up-button {
719734
subcontrol-position: top right;
720735
image: url(skins:LateNight/palemoon/buttons/btn__spinbox_up.svg) no-repeat;
721736
height: 11px;
722737
}
723738
WBeatSpinBox::up-button {
724739
margin: -2px -1px 0px 0px;
725740
}
726-
#spinBoxTransition::up-button {
741+
#spinBoxTransition::up-button,
742+
#spinBoxRecentDays::up-button {
727743
margin: -2px -3px 0px 0px;
728744
}
729745

730746
WBeatSpinBox::down-button,
731-
#spinBoxTransition::down-button {
747+
#spinBoxTransition::down-button,
748+
#spinBoxRecentDays::down-button {
732749
subcontrol-position: bottom right;
733750
image: url(skins:LateNight/palemoon/buttons/btn__spinbox_down.svg) no-repeat;
734751
height: 11px;
735752
margin: 0px -1px -3px 0px;
736753
}
737-
#spinBoxTransition::down-button {
754+
#spinBoxTransition::down-button,
755+
#spinBoxRecentDays::down-button {
738756
margin: 0px -3px -1px 0px;
739757
}
740758

@@ -1360,7 +1378,8 @@ WEffectChainPresetSelector:!editable:on,
13601378

13611379
WBeatSpinBox,
13621380
WBpmEditor QDoubleSpinBox,
1363-
#spinBoxTransition {
1381+
#spinBoxTransition,
1382+
#spinBoxRecentDays {
13641383
color: #a7998b;
13651384
}
13661385

@@ -1729,6 +1748,8 @@ WBpmEditor QDoubleSpinBox {
17291748
/* library controls */
17301749
#spinBoxTransition::up-button,
17311750
#spinBoxTransition::down-button,
1751+
#spinBoxRecentDays::up-button,
1752+
#spinBoxRecentDays::down-button,
17321753
QPushButton#pushButtonAutoDJ:enabled:!checked,
17331754
#LibraryFeatureControls QPushButton:enabled {
17341755
background-color: #222;
@@ -1816,7 +1837,9 @@ WBpmEditor QDoubleSpinBox::down-button:pressed,
18161837
WBeatSpinBox::up-button:pressed,
18171838
WBeatSpinBox::down-button:pressed,
18181839
#spinBoxTransition::up-button:pressed,
1819-
#spinBoxTransition::down-button:pressed {
1840+
#spinBoxTransition::down-button:pressed,
1841+
#spinBoxRecentDays::up-button:pressed,
1842+
#spinBoxRecentDays::down-button:pressed {
18201843
background-color: #257b82;
18211844
}
18221845
/* Dim blue for assign buttons Fx34 */
@@ -2954,6 +2977,7 @@ WTrackPropertyEditor,
29542977
WLibrary QLineEdit,
29552978
WLibrary QPlainTextEdit,
29562979
#spinBoxTransition,
2980+
#spinBoxRecentDays,
29572981
#LibraryBPMSpinBox {
29582982
background-color: #0f0f0f;
29592983
}
@@ -3321,7 +3345,8 @@ WSearchLineEdit {
33213345
/* add margin to compensate for frameless library table */
33223346
#LibraryFeatureControls QPushButton,
33233347
/* #fadeModeCombobox set below */
3324-
#spinBoxTransition {
3348+
#spinBoxTransition,
3349+
#spinBoxRecentDays {
33253350
margin-top: 4px;
33263351
}
33273352
QLabel#labelProgress, /* Analysis progress */

0 commit comments

Comments
 (0)