From 22d5f231d9bf80b205071299b5f3760f0877b4d2 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 8 Mar 2020 15:25:09 +0100 Subject: Roland DJ-505: Allow changing track color via SHIFT + press and turn Browse --- res/controllers/Roland_DJ-505-scripts.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'res') diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js index ceee4d06b3..212d43e0d3 100644 --- a/res/controllers/Roland_DJ-505-scripts.js +++ b/res/controllers/Roland_DJ-505-scripts.js @@ -201,6 +201,8 @@ DJ505.shutdown = function() { DJ505.browseEncoder = new components.Encoder({ longPressTimer: 0, longPressTimeout: 250, + trackColorCycleEnabled: false, + trackColorCycleHappened: false, previewSeekEnabled: false, previewSeekHappened: false, unshift: function() { @@ -249,12 +251,25 @@ DJ505.browseEncoder = new components.Encoder({ shift: function() { this.onKnobEvent = function(rotateValue) { if (rotateValue !== 0) { - engine.setValue("[Playlist]", "SelectPlaylist", rotateValue); + if (this.trackColorCycleEnabled) { + var key = (rotateValue > 0) ? "track_color_next" : "track_color_prev"; + engine.setValue("[Library]", key, 1.0); + this.trackColorCycleHappened = true; + } else { + engine.setValue("[Playlist]", "SelectPlaylist", rotateValue); + } } }; this.onButtonEvent = function(value) { if (value) { - script.triggerControl("[Playlist]", "ToggleSelectedSidebarItem"); + this.trackColorCycleEnabled = true; + this.trackColorCycleHappened = false; + } else { + if (!this.trackColorCycleHappened) { + script.triggerControl("[Playlist]", "ToggleSelectedSidebarItem"); + } + this.trackColorCycleEnabled = false; + this.trackColorCycleHappened = false; } }; }, -- cgit v1.2.3 From 5ae19defd2bf965f423fd7df8ca153d7afc3d1a9 Mon Sep 17 00:00:00 2001 From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> Date: Mon, 23 Mar 2020 19:54:51 +0100 Subject: first fix idea. Yet to test! --- res/controllers/common-controller-scripts.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'res') diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js index c1d2d09f58..a7660afce9 100644 --- a/res/controllers/common-controller-scripts.js +++ b/res/controllers/common-controller-scripts.js @@ -268,13 +268,13 @@ script.absoluteNonLinInverse = function(value, low, mid, high, min, max) { if (!max) { max = 127 } - var center = (max - min) / 2 - var result + var center = (max-min)/2; + var result; - if (value == mid) { - return center - } else if (value < mid) { - result = (center / (mid - low)) * (value - low) + if (value==mid) { + return center; + } else if (value Date: Mon, 23 Mar 2020 19:55:55 +0100 Subject: added filter for accidental bpm.tapButton presses/misses --- res/controllers/common-controller-scripts.js | 39 ++++++++++++++++++---------- 1 file changed, 25 insertions(+), 14 deletions(-) (limited to 'res') diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js index a7660afce9..6f99c7b877 100644 --- a/res/controllers/common-controller-scripts.js +++ b/res/controllers/common-controller-scripts.js @@ -405,8 +405,9 @@ script.softStart = function(channel, control, value, status, group, factor) { bpm = function() { } -bpm.tapTime = 0.0 -bpm.tap = [] // Tap sample values +bpm.tapTime = 0.0; +bpm.previousTapDelta = 0.0; +bpm.tap = []; // Tap sample values /* -------- ------------------------------------------------------ bpm.tapButton @@ -418,18 +419,28 @@ bpm.tap = [] // Tap sample values Output: - -------- ------------------------------------------------------ */ bpm.tapButton = function(deck) { - var now = new Date() / 1000 // Current time in seconds - var tapDelta = now - bpm.tapTime - bpm.tapTime = now - if (tapDelta > 2.0) { // reset if longer than two seconds between taps - bpm.tap = [] - return - } - bpm.tap.push(60 / tapDelta) - if (bpm.tap.length > 8) bpm.tap.shift() // Keep the last 8 samples for averaging - var sum = 0 - for (i = 0; i < bpm.tap.length; i++) { - sum += bpm.tap[i] + var now = new Date()/1000; // Current time in seconds + var tapDelta = now - bpm.tapTime; + bpm.tapTime=now; + if (bpm.tap.lenght<1.0) { + bpm.previousTapDelta=tapDelta; + } + // assign tapDelta in cases where the button has not been pressed previously + if (tapDelta>2.0) { // reset if longer than two seconds between taps + bpm.tap=[]; + return; + } + if ((tapDelta > bpm.previousTapDelta*1.8)||(tapDelta8) bpm.tap.shift(); // Keep the last 8 samples for averaging + var sum = 0; + for (i=0; i Date: Mon, 23 Mar 2020 19:58:07 +0100 Subject: addressed issues from last review --- res/controllers/common-controller-scripts.js | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'res') diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js index 6f99c7b877..080da05a73 100644 --- a/res/controllers/common-controller-scripts.js +++ b/res/controllers/common-controller-scripts.js @@ -421,35 +421,37 @@ bpm.tap = []; // Tap sample values bpm.tapButton = function(deck) { var now = new Date()/1000; // Current time in seconds var tapDelta = now - bpm.tapTime; - bpm.tapTime=now; - if (bpm.tap.lenght<1.0) { - bpm.previousTapDelta=tapDelta; + bpm.tapTime = now; + if (bpm.tap.length < 1) { + bpm.previousTapDelta = tapDelta; } // assign tapDelta in cases where the button has not been pressed previously - if (tapDelta>2.0) { // reset if longer than two seconds between taps - bpm.tap=[]; + if (tapDelta > 2.0) { // reset if longer than two seconds between taps + bpm.tap = []; return; } - if ((tapDelta > bpm.previousTapDelta*1.8)||(tapDelta bpm.previousTapDelta*1.8)||(tapDelta < bpm.previousTapDelta*0.4)) { + return; } - bpm.previousTapDelta=tapDelta; - // the if-case is meant to be a filter to reject accidental double presses - // or when the button was missed for some reason. - bpm.tap.push(60/tapDelta); - if (bpm.tap.length>8) bpm.tap.shift(); // Keep the last 8 samples for averaging + bpm.previousTapDelta = tapDelta; + bpm.tap.push(60 / tapDelta); + if (bpm.tap.length > 8) bpm.tap.shift(); // Keep the last 8 samples for averaging var sum = 0; for (i=0; i Date: Mon, 23 Mar 2020 20:00:35 +0100 Subject: moved comments to proper position --- res/controllers/common-controller-scripts.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'res') diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js index 080da05a73..9f6691c799 100644 --- a/res/controllers/common-controller-scripts.js +++ b/res/controllers/common-controller-scripts.js @@ -419,14 +419,16 @@ bpm.tap = []; // Tap sample values Output: - -------- ------------------------------------------------------ */ bpm.tapButton = function(deck) { - var now = new Date()/1000; // Current time in seconds + var now = new Date() / 1000; // Current time in seconds var tapDelta = now - bpm.tapTime; bpm.tapTime = now; + + // assign tapDelta in cases where the button has not been pressed previously if (bpm.tap.length < 1) { bpm.previousTapDelta = tapDelta; } - // assign tapDelta in cases where the button has not been pressed previously - if (tapDelta > 2.0) { // reset if longer than two seconds between taps + // reset if longer than two seconds between taps + if (tapDelta > 2.0) { bpm.tap = []; return; } @@ -439,25 +441,27 @@ bpm.tapButton = function(deck) { } bpm.previousTapDelta = tapDelta; bpm.tap.push(60 / tapDelta); - if (bpm.tap.length > 8) bpm.tap.shift(); // Keep the last 8 samples for averaging + // Keep the last 8 samples for averaging + if (bpm.tap.length > 8) bpm.tap.shift(); var sum = 0; for (i=0; i Date: Wed, 25 Mar 2020 12:06:52 +0100 Subject: fixed form of unrelated paragraph --- res/controllers/common-controller-scripts.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'res') diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js index 9f6691c799..c7ea1178e5 100644 --- a/res/controllers/common-controller-scripts.js +++ b/res/controllers/common-controller-scripts.js @@ -268,13 +268,13 @@ script.absoluteNonLinInverse = function(value, low, mid, high, min, max) { if (!max) { max = 127 } - var center = (max-min)/2; + var center = (max - min) / 2; var result; - if (value==mid) { + if (value === mid) { return center; - } else if (value Date: Wed, 25 Mar 2020 12:10:49 +0100 Subject: building group string now only once per call --- res/controllers/common-controller-scripts.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'res') diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js index c7ea1178e5..70bf350dd5 100644 --- a/res/controllers/common-controller-scripts.js +++ b/res/controllers/common-controller-scripts.js @@ -449,18 +449,20 @@ bpm.tapButton = function(deck) { } var average = sum / bpm.tap.length + var group = "[Channel" + deck + "]"; + // "bpm" was changed in 1.10 to reflect the *adjusted* bpm, but I presume it // was supposed to return the tracks bpm (which it did before the change). // "file_bpm" is supposed to return the set BPM of the loaded track of the // channel. - var fRateScale = average/engine.getValue("[Channel" + deck + "]", "file_bpm"); + var fRateScale = average/engine.getValue(group, "file_bpm"); // Adjust the rate: - fRateScale = (fRateScale - 1.) / engine.getValue("[Channel" + deck + "]", "rateRange") + fRateScale = (fRateScale - 1.) / engine.getValue(group, "rateRange") engine.setValue( - "[Channel" + deck + "]", "rate", - fRateScale * engine.getValue("[Channel" + deck + "]", "rate_dir")); + group, "rate", + fRateScale * engine.getValue(group, "rate_dir")); }; // ----------------- Common regular expressions -------------------------- -- cgit v1.2.3 From 92d6ce908d68f963202d559e3e8b904abda929cc Mon Sep 17 00:00:00 2001 From: Harshit Maurya Date: Mon, 30 Mar 2020 06:13:25 +0530 Subject: widget/wtrackproperty: add styles for QMenu --- res/skins/Tango/style.qss | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) (limited to 'res') diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss index fd41769564..84404a2e38 100644 --- a/res/skins/Tango/style.qss +++ b/res/skins/Tango/style.qss @@ -35,6 +35,7 @@ WCueMenuPopup, WCueMenuPopup QMenu, WCueMenuPopup QLabel, WCoverArtMenu, +WTrackProperty QMenu, #LibraryContainer QMenu QCheckBox, QToolTip, #LibraryContainer QHeaderView { @@ -2080,11 +2081,14 @@ WCueMenuPopup, WCueMenuPopup QMenu, WCueMenuPopup QLabel, WCoverArtMenu, +WTrackProperty QMenu, #LibraryContainer QMenu::item, WBeatSpinBox QMenu::item, WCueMenuPopup QMenu::item, WCoverArtMenu::item, +WTrackProperty QMenu::item, #LibraryContainer QMenu QCheckBox, +WTrackProperty QMenu QCheckBox, #SkinSettings, WEffectSelector, WEffectSelector QAbstractScrollArea, #fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea, @@ -2098,6 +2102,7 @@ WBeatSpinBox QMenu, WCueMenuPopup, WCueMenuPopup QMenu, WCoverArtMenu, +WTrackProperty QMenu, #SkinSettings, WEffectSelector QAbstractScrollArea, #fadeModeCombobox QAbstractScrollArea { @@ -2115,6 +2120,7 @@ WEffectSelector QAbstractScrollArea, WBeatSpinBox QMenu::separator, WCueMenuPopup QMenu::separator, WCoverArtMenu::separator, + WTrackProperty QMenu::separator, WSpinny QMenu::separator { height: 0px; border-top: 1px solid #000; @@ -2125,6 +2131,8 @@ WEffectSelector QAbstractScrollArea, WBeatSpinBox QMenu::item, WCueMenuPopup QMenu::item, WCoverArtMenu::item, + WTrackProperty QMenu::item, + WTrackProperty QMenu QCheckBox, #LibraryContainer QMenu QCheckBox, #SkinSettingsLabel, #SkinSettingsButton, @@ -2137,13 +2145,15 @@ WEffectSelector QAbstractScrollArea, #LibraryContainer QMenu::item, WBeatSpinBox QMenu::item, WCueMenuPopup QMenu::item, - WCoverArtMenu::item { + WCoverArtMenu::item, + WTrackProperty QMenu::item { /* right padding creates a margin to the menu expand arrow, left padding should be bigger than menu icon width + menu icon margin */ padding: 5px 12px 5px 25px; } - #LibraryContainer QMenu QCheckBox { + #LibraryContainer QMenu QCheckBox, + WTrackProperty QMenu QCheckBox { padding: 2px 10px 2px 3px; } /* icons in editline menu (searchbox, editable track properties) @@ -2153,16 +2163,21 @@ WEffectSelector QAbstractScrollArea, WCueMenuPopup QMenu::icon, /* checkbox in Crate name context menu: "[ ] Auto DJ Track Source" */ - #LibraryContainer QMenu::indicator { + #LibraryContainer QMenu::indicator, + WTrackProperty QMenu::indicator { margin: 0px 4px 0px 2px; } #LibraryContainer QMenu::item:selected, WBeatSpinBox QMenu::item:selected, WCueMenuPopup QMenu::item:selected, WCoverArtMenu::item:selected, + WTrackProperty QMenu::item:selected, #LibraryContainer QMenu QCheckBox:selected, WBeatSpinBox QMenu QCheckBox:focus, /* selected by keyboard */ #LibraryContainer QMenu QCheckBox:hover, /* mouse hover */ + WTrackProperty QMenu QCheckBox:selected, + WTrackProperty QMenu QCheckBox:focus, + WTrackProperty QMenu QCheckBox:hover, #SkinSettingsButton:hover, #SkinSettingsCategoryButton:hover, WEffectSelector::item:selected, @@ -2173,7 +2188,9 @@ WEffectSelector QAbstractScrollArea, outline: none; } #LibraryContainer QMenu QCheckBox::indicator, -#LibraryContainer QMenu::indicator { +WTrackProperty QMenu QCheckBox::indicator, +#LibraryContainer QMenu::indicator, +WTrackProperty QMenu::indicator{ width: 13px; height: 13px; background-color: #0f0f0f; @@ -2183,16 +2200,20 @@ WEffectSelector QAbstractScrollArea, outline: none; } #LibraryContainer QMenu QCheckBox::indicator:checked, - #LibraryContainer QMenu::indicator:checked { + WTrackProperty QMenu QCheckBox::indicator:checked, + #LibraryContainer QMenu::indicator:checked, + WTrackProperty QMenu::indicator:checked { image: url(skin:/buttons/btn_lib_checkmark.svg); border: 1px solid #1e1e1e; } /* disabled menu checkbox */ - #LibraryContainer QMenu QCheckBox::indicator:!enabled { + #LibraryContainer QMenu QCheckBox::indicator:!enabled, + WTrackProperty QMenu QCheckBox::indicator:!enabled { background-color: #333; border: 1px solid #222; } - #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked { + #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked, + WTrackProperty QMenu QCheckBox::indicator:!enabled:checked { image: url(skin:/buttons/btn_lib_checkmark_grey.svg); } @@ -2200,6 +2221,8 @@ WEffectSelector QAbstractScrollArea, WBeatSpinBox QMenu::item:!enabled, WCueMenuPopup QMenu::item:!enabled, WCoverArtMenu::item:!enabled, +WTrackProperty QMenu::item:!enabled, +WTrackProperty QMenu QCheckBox:!enabled, #LibraryContainer QMenu QCheckBox:!enabled { color: #555; } @@ -2211,13 +2234,15 @@ WCoverArtMenu::item:!enabled, #LibraryContainer QCheckBox::indicator:indeterminate:!enabled { image: url(skin:/buttons/btn_lib_checkmark_grey.svg); } -#LibraryContainer QMenu::right-arrow { +#LibraryContainer QMenu::right-arrow, +WTrackProperty QMenu::right-arrow { width: 8px; height: 16px; margin-right: 4px; image: url(skin:/buttons/btn_arrow_right.svg); } -#LibraryContainer QMenu::right-arrow { +#LibraryContainer QMenu::right-arrow, +WTrackProperty QMenu::right-arrow { image: url(skin:/buttons/btn_arrow_right_hover.svg); } -- cgit v1.2.3 From 906b9955586aaf0c486a08af526ae5643ba75645 Mon Sep 17 00:00:00 2001 From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> Date: Fri, 3 Apr 2020 15:39:03 +0200 Subject: common-controller-scripts: change tap threshold res/controllers/common-controller-scripts: increased treshold for detecting duplicate taps as the previous threshold was too low and sometimes failed to identify taps as duplicates --- res/controllers/common-controller-scripts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'res') diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js index 70bf350dd5..3cc31b105f 100644 --- a/res/controllers/common-controller-scripts.js +++ b/res/controllers/common-controller-scripts.js @@ -436,7 +436,7 @@ bpm.tapButton = function(deck) { // a tap is considered missed when the delta of this press is 80% longer than the previous one // and a tap is considered double when the delta is shorter than 40% of the previous one. // these numbers are just guesses that produced good results in practice - if ((tapDelta > bpm.previousTapDelta*1.8)||(tapDelta < bpm.previousTapDelta*0.4)) { + if ((tapDelta > bpm.previousTapDelta*1.8)||(tapDelta < bpm.previousTapDelta*0.6)) { return; } bpm.previousTapDelta = tapDelta; -- cgit v1.2.3 From 5d73481a3560c7403bc0b90adfef5aa471ef750f Mon Sep 17 00:00:00 2001 From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> Date: Fri, 3 Apr 2020 22:57:28 +0200 Subject: common-controller-scripts: incorporate last review Added spaces around operators in bpm.tapButton double/missed taps logic --- res/controllers/common-controller-scripts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'res') diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js index 3cc31b105f..7355649ee1 100644 --- a/res/controllers/common-controller-scripts.js +++ b/res/controllers/common-controller-scripts.js @@ -436,7 +436,7 @@ bpm.tapButton = function(deck) { // a tap is considered missed when the delta of this press is 80% longer than the previous one // and a tap is considered double when the delta is shorter than 40% of the previous one. // these numbers are just guesses that produced good results in practice - if ((tapDelta > bpm.previousTapDelta*1.8)||(tapDelta < bpm.previousTapDelta*0.6)) { + if ((tapDelta > bpm.previousTapDelta * 1.8)||(tapDelta < bpm.previousTapDelta * 0.6)) { return; } bpm.previousTapDelta = tapDelta; -- cgit v1.2.3 From 12a9aa573e2525249c9cdb91b21ea41bbdc5e400 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Mon, 6 Apr 2020 02:41:56 +0200 Subject: add focus border to WTextBrowser --- res/skins/Deere/style.qss | 3 ++- res/skins/LateNight/style.qss | 3 ++- res/skins/Shade/style.qss | 3 ++- res/skins/Shade/style_dark.qss | 3 ++- res/skins/Tango/style.qss | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) (limited to 'res') diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss index 505d62f51d..fbe3f43b6f 100644 --- a/res/skins/Deere/style.qss +++ b/res/skins/Deere/style.qss @@ -228,7 +228,8 @@ } #LibraryContainer QTableView:focus, -#LibraryContainer QTreeView:focus { +#LibraryContainer QTreeView:focus, +#LibraryContainer QTextBrowser:focus { border: 1px solid #FF6600; } diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index 97c0a547b3..17667f8e06 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -2040,7 +2040,8 @@ WLibrary, } #LibraryContainer QTableView:focus, -#LibraryContainer QTreeView:focus { +#LibraryContainer QTreeView:focus, +#LibraryContainer QTextBrowser:focus { border: 1px solid #ff6600; } diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss index 623624f6b9..71a26e6bca 100644 --- a/res/skins/Shade/style.qss +++ b/res/skins/Shade/style.qss @@ -493,8 +493,9 @@ WSearchLineEdit { Defined by SearchBox */ margin: 0px; } + #LibraryContainer QTableView:focus, #LibraryContainer QTreeView:focus, - #LibraryContainer QTableView:focus { /* + #LibraryContainer QTextBrowser:focus { /* New Library navigation COs only work if TreeView or TableView have focus. Clicking on buttons, sliders and visuals elsewhere removes focus from Library. In conjunction with [Library],MoveFocusBackward/..Forward, this helps a lot. */ diff --git a/res/skins/Shade/style_dark.qss b/res/skins/Shade/style_dark.qss index 00e54960c1..335b2ba9f1 100644 --- a/res/skins/Shade/style_dark.qss +++ b/res/skins/Shade/style_dark.qss @@ -94,7 +94,8 @@ WCoverArtMenu::item { #LibraryContainer QTableView:focus, -#LibraryContainer QTreeView:focus { +#LibraryContainer QTreeView:focus, +#LibraryContainer QTextBrowser:focus { border: 1px solid #78C70B; } diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss index fd41769564..f925fe4386 100644 --- a/res/skins/Tango/style.qss +++ b/res/skins/Tango/style.qss @@ -2415,8 +2415,9 @@ WCoverArtMenu::item:!enabled, Shift WSearchLineEdit instead */ margin: 0px; } + #LibraryContainer QTableView:focus, #LibraryContainer QTreeView:focus, - #LibraryContainer QTableView:focus { /* + #LibraryContainer QTextBrowser:focus { /* New Library navigation COs only work if TreeView or TableView have focus. Clicking on buttons, sliders and visuals elsewhere removes focus from Library. In conjunction with [Library],MoveFocusBackward/..Forward, some highlight -- cgit v1.2.3 From a492fbda7029774b4041267564183af5ab555438 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Mon, 6 Apr 2020 19:06:20 +0200 Subject: Tango: don't set Searchbox font in skin --- res/skins/Tango/style.qss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'res') diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss index fd41769564..605a8e4923 100644 --- a/res/skins/Tango/style.qss +++ b/res/skins/Tango/style.qss @@ -23,9 +23,7 @@ WNumber, WTrackProperty, WBeatSpinBox, WEffectSelector, WEffectSelector QAbstractScrollArea, -WSearchLineEdit, WPushButton, -WSearchLineEdit, #LibraryContainer QPushButton, #LibraryContainer QLabel, #LibraryContainer QRadioButton, @@ -48,7 +46,6 @@ WPushButton { } WPushButton, -WSearchLineEdit, #LibraryContainer QPushButton, #LibraryContainer QLabel, #LibraryContainer QRadioButton, @@ -2873,7 +2870,7 @@ WSearchLineEdit { padding: 2px; border: 1px solid #656565; color: #cfcfcf; - background: #0f0f0f; + background-color: #0f0f0f; selection-color: #0f0f0f; selection-background-color: #d2d2d2; /* margin will increase the Qt widget size which is used to position the -- cgit v1.2.3 From e4e8abd6544f9094dbe7fc99ccf2d453ebb0daa2 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Mon, 6 Apr 2020 19:09:18 +0200 Subject: Shade: move Searchbox qss to style.qss --- res/skins/Shade/preview_deck.xml | 507 ++++++++++++++++++++------------------- res/skins/Shade/skin.xml | 33 +-- res/skins/Shade/style.qss | 4 + 3 files changed, 271 insertions(+), 273 deletions(-) (limited to 'res') diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml index 444c389737..3356f10f77 100644 --- a/res/skins/Shade/preview_deck.xml +++ b/res/skins/Shade/preview_deck.xml @@ -1,263 +1,274 @@ diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml index 3ced0911fd..15f6dd36d9 100644 --- a/res/skins/Shade/skin.xml +++ b/res/skins/Shade/skin.xml @@ -444,33 +444,13 @@ vertical - - - - horizontal - -