dguglielmi/sunny-overlay
1
0
Fork 0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 13:52:40 +01:00
Code Issues Releases Wiki Activity
Files
8d3e7ee2d794452065182fdd77e25fd4a9daff13
sunny-overlay/media-sound/mixxx/files/mixxx-2.1.0-library-improvements-for-all-skins-fix-lp1772202-in-tango.patch

6337 lines
246 KiB
Diff
Raw Blame History

From 43f33764db7ca6520cd9cbe67e8ccb2eb6c8fbb2 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 21 May 2018 02:53:05 +0200
Subject: [PATCH 01/45] Tango: improve Library sort buttons
---
res/skins/Tango/graphics/library_sort_down.svg | 42 ++++++++++++-----
.../Tango/graphics/library_sort_down_hover.svg | 37 ---------------
res/skins/Tango/graphics/library_sort_up.svg | 52 +++++++++++++++-------
res/skins/Tango/graphics/library_sort_up_hover.svg | 37 ---------------
res/skins/Tango/style.qss | 29 +++++++-----
5 files changed, 87 insertions(+), 110 deletions(-)
delete mode 100644 res/skins/Tango/graphics/library_sort_down_hover.svg
delete mode 100644 res/skins/Tango/graphics/library_sort_up_hover.svg
diff --git a/res/skins/Tango/graphics/library_sort_down.svg b/res/skins/Tango/graphics/library_sort_down.svg
index aab977383c..f60ad295e7 100644
--- a/res/skins/Tango/graphics/library_sort_down.svg
+++ b/res/skins/Tango/graphics/library_sort_down.svg
@@ -1,17 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- version="1.1"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="14.83"
width="24"
- height="15"
- viewBox="0 0 23.999998 15"
- id="svg2">
+ version="1.1"
+ viewBox="0 0 23.999998 14.83"
+ id="svg2"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="style_sort_down.svg">
<metadata
id="metadata12">
<rdf:RDF>
@@ -20,19 +22,39 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs10" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1059"
+ id="namedview8"
+ showgrid="false"
+ inkscape:zoom="12.208333"
+ inkscape:cx="-9.788396"
+ inkscape:cy="17.179724"
+ inkscape:window-x="0"
+ inkscape:window-y="21"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
<g
- transform="translate(-315.44,-310.49)"
+ transform="translate(-315.44,-310.66)"
id="g4"
- style="fill:#cccccc">
+ style="display:inline">
<path
d="m 315.44,313.49 2.83,-2.83 9.17,9.17 9.17,-9.17 2.83,2.83 -12,12 z"
+ fill="#FF7100"
id="path6"
- style="fill:#cccccc" />
+ style="fill-opacity:1" />
</g>
</svg>
diff --git a/res/skins/Tango/graphics/library_sort_down_hover.svg b/res/skins/Tango/graphics/library_sort_down_hover.svg
deleted file mode 100644
index 4dcd5a0aef..0000000000
--- a/res/skins/Tango/graphics/library_sort_down_hover.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- version="1.1"
- width="24"
- height="15"
- viewBox="0 0 23.999998 15"
- id="svg3077">
- <metadata
- id="metadata3087">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs3085" />
- <g
- transform="translate(-315.44,-310.49)"
- id="g3079">
- <path
- d="m 315.44,322.66 2.83,2.83 9.17,-9.17 9.17,9.17 2.83,-2.83 -12,-12 z"
- id="path3081"
- style="fill:#ff6600" />
- </g>
-</svg>
diff --git a/res/skins/Tango/graphics/library_sort_up.svg b/res/skins/Tango/graphics/library_sort_up.svg
index 978557775a..e92f24780d 100644
--- a/res/skins/Tango/graphics/library_sort_up.svg
+++ b/res/skins/Tango/graphics/library_sort_up.svg
@@ -1,38 +1,60 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- version="1.1"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="14.83"
width="24"
- height="15"
- viewBox="0 0 23.999998 15"
- id="svg3077">
+ version="1.1"
+ viewBox="0 0 23.999998 14.83"
+ id="svg2"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="style_sort_up.svg">
<metadata
- id="metadata3087">
+ id="metadata12">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
- id="defs3085" />
+ id="defs10" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1059"
+ id="namedview8"
+ showgrid="false"
+ inkscape:zoom="12.208333"
+ inkscape:cx="11.918089"
+ inkscape:cy="7.415"
+ inkscape:window-x="0"
+ inkscape:window-y="21"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
<g
- transform="translate(-315.44,-310.49)"
- id="g3079"
- style="fill:#b3b3b3">
+ transform="translate(-315.44 -310.66)"
+ id="g4"
+ style="display:inline">
<path
- d="m 315.44,322.66 2.83,2.83 9.17,-9.17 9.17,9.17 2.83,-2.83 -12,-12 z"
- id="path3081"
- style="fill:#b3b3b3" />
+ d="m315.44 322.66 2.83 2.83 9.17-9.17 9.17 9.17 2.83-2.83-12-12z"
+ fill="#FF7100"
+ id="path6"
+ style="fill-opacity:1" />
</g>
</svg>
diff --git a/res/skins/Tango/graphics/library_sort_up_hover.svg b/res/skins/Tango/graphics/library_sort_up_hover.svg
deleted file mode 100644
index f07d0afc34..0000000000
--- a/res/skins/Tango/graphics/library_sort_up_hover.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- version="1.1"
- width="24"
- height="15"
- viewBox="0 0 23.999998 15"
- id="svg2">
- <metadata
- id="metadata12">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs10" />
- <g
- transform="translate(-315.44,-310.49)"
- id="g4">
- <path
- d="m 315.44,313.49 2.83,-2.83 9.17,9.17 9.17,-9.17 2.83,2.83 -12,12 z"
- id="path6"
- style="fill:#ff6600" />
- </g>
-</svg>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 6d24ddaaee..8fb6d79729 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2106,20 +2106,27 @@ QHeaderView {
QHeaderView::up-arrow,
QHeaderView::down-arrow {
- font-size: 10pt;
- }
- QHeaderView::up-arrow {
- image: url(skin:/graphics/library_sort_up.svg)
- }
- QHeaderView::up-arrow:hover {
- image: url(skin:/graphics/library_sort_up_hover.svg)
- }
- QHeaderView::down-arrow {
- image: url(skin:/graphics/library_sort_down.svg)
+ width: 12px;
+ padding-right: 2px;
+ border-right: 1px solid #585858;
+ background-color: #333;
}
+ QHeaderView::up-arrow:hover,
QHeaderView::down-arrow:hover {
- image: url(skin:/graphics/library_sort_down_hover.svg)
+ background-color: #585858;
}
+ QHeaderView::up-arrow {
+ image: url(skin:/graphics/library_sort_up.svg)
+ }
+ QHeaderView::up-arrow:hover {
+ image: url(skin:/graphics/library_sort_down.svg)
+ }
+ QHeaderView::down-arrow {
+ image: url(skin:/graphics/library_sort_down.svg)
+ }
+ QHeaderView::down-arrow:hover {
+ image: url(skin:/graphics/library_sort_up.svg)
+ }
/* Scroll bars */
QScrollBar:horizontal {
From e58b2bbd463def2a31370c9efccb0a27cea2aa08 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 21 May 2018 03:22:10 +0200
Subject: [PATCH 02/45] Tango: fix height of effect slot > static size/position
even if an effect is cleared
---
res/skins/Tango/fx_parameter_row.xml | 2 +-
res/skins/Tango/fx_unit_right.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/res/skins/Tango/fx_parameter_row.xml b/res/skins/Tango/fx_parameter_row.xml
index 1271e979ff..0b64a08ec9 100644
--- a/res/skins/Tango/fx_parameter_row.xml
+++ b/res/skins/Tango/fx_parameter_row.xml
@@ -9,7 +9,7 @@ Variables passed through from fx_unit:
<WidgetGroup>
<ObjectName>FxParameters<Variable name="Side"/></ObjectName>
<Layout>horizontal</Layout>
- <Size>min,max</Size>
+ <Size>min,47f</Size>
<Children>
<Template src="skin:fx_parameter_knob.xml">
diff --git a/res/skins/Tango/fx_unit_right.xml b/res/skins/Tango/fx_unit_right.xml
index 97417fe301..5db527dcbc 100644
--- a/res/skins/Tango/fx_unit_right.xml
+++ b/res/skins/Tango/fx_unit_right.xml
@@ -204,6 +204,7 @@ Variables:
<WidgetGroup><Size>4f,1min</Size></WidgetGroup>
<Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
<Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+ <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
<Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
<WidgetGroup><Size>5f,1min</Size></WidgetGroup>
<Template src="skin:fx_parameter_row.xml">
From 174c3ae069f37733fadfaa5e22a6cb22ba5ecd46 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 21 May 2018 17:57:57 +0200
Subject: [PATCH 03/45] Tango: override system theme for selected tree items
---
res/skins/Tango/style.qss | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 8fb6d79729..fec5d448a2 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2069,16 +2069,28 @@ QTreeView::branch:open:has-children:has-siblings {
image: url(skin:/graphics/branch_open.png);
background-color: #333;
}
+ /* space left of selected child item */
+ QTreeView::branch:!has-children:!has-siblings:closed:selected,
+ QTreeView::branch:closed:!has-children:has-siblings:selected,
+ QTreeView::branch:open:!has-children:!has-siblings:selected,
+ QTreeView::branch:open:!has-children:has-siblings:selected {
+ border-image: none;
+ background-color: #0f0f0f;
+ }
QTreeView::item:selected {
border-image: none;
background-image: none;
background-color: #333;
- color: #cfcfcf;
+ color: #d2d2d2;
}
-QTableView {
-}
+QTreeView::item:!selected {
+ border-image: none;
+ background-image: none;
+ background-color: #0f0f0f;
+ color: #999;
+ }
QHeaderView {
font-family: Ubuntu;
From 2f5dd00626f174b010c9508a94fe8c40ffe16876 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 21 May 2018 17:58:27 +0200
Subject: [PATCH 04/45] Tango: fix styling of library feature buttons
---
res/skins/Tango/style.qss | 79 ++++++++++++++++++++++++++++++++---------------
1 file changed, 54 insertions(+), 25 deletions(-)
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index fec5d448a2..fc00fc38c9 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -993,7 +993,8 @@ WWidgetGroup {
background-color: #0f0f0f;
}
-WBeatSpinBox {
+WBeatSpinBox,
+#DlgAutoDJ QSpinBox {
/* Note(ronso0):
make it 2px smaller in each dimension,
border is added for final size.
@@ -1009,21 +1010,37 @@ WBeatSpinBox {
selection-color: #0f0f0f;
selection-background-color: #d2d2d2;
font-size: 13px/13px;
- /* Note(ronso0):
- Apparently, a top and bottom padding needs to be set to make
- the spinbox expand vertically to available 22px */
- padding: 1px 0px 1px 3px;
- margin: 0px 15px 0px 0px;
-}
- WBeatSpinBox:hover {
+ }
+ WBeatSpinBox {
+ /* Note(ronso0):
+ Apparently, a top and bottom padding needs to be set to make
+ the spinbox expand vertically to available 22px */
+ padding: 1px 0px 1px 3px;
+ margin: 0px 15px 0px 0px;
+ }
+ #DlgAutoDJ QSpinBox {
+ /* Note(ronso0):
+ Individual padding/margin in AutoDJ feature */
+ padding: -1px 3px -1px 3px;
+ margin: 0px 17px 3px 7px;
+ }
+ #DlgAutoDJ QLabel {
+ margin: 0px 0px 3px 2px;
+ }
+ WBeatSpinBox:hover,
+ #DlgAutoDJ QSpinBox:hover {
border-color: #888;
}
- WBeatSpinBox:focus {
+ WBeatSpinBox:focus,
+ #DlgAutoDJ QSpinBox:focus {
border-color: #d2d2d2;
color: #ccc;
}
- WBeatSpinBox::up-button, WBeatSpinBox::down-button {
+ WBeatSpinBox::up-button,
+ WBeatSpinBox::down-button,
+ #DlgAutoDJ QSpinBox::up-button,
+ #DlgAutoDJ QSpinBox::down-button {
subcontrol-origin: padding;
position: relative;
background-color: #1e1e1e;
@@ -1034,11 +1051,15 @@ WBeatSpinBox {
height: 20%;
width: 20%; */
}
- WBeatSpinBox::up-button:hover, WBeatSpinBox::down-button:hover {
+ WBeatSpinBox::up-button:hover,
+ WBeatSpinBox::down-button:hover,
+ #DlgAutoDJ QSpinBox::up-button:hover,
+ #DlgAutoDJ QSpinBox::down-button:hover {
background-color: #0f0f0f;
}
- WBeatSpinBox::up-button {
+ WBeatSpinBox::up-button,
+ #DlgAutoDJ QSpinBox::up-button {
subcontrol-position: center right;
/* Note(ronso0):
Regularly, up/down buttons would be stacked vertically.
@@ -1048,16 +1069,19 @@ WBeatSpinBox {
right: -16px;
image: url(skin:/buttons/btn_beatbox_up.svg) no-repeat;
}
- WBeatSpinBox::up-button:hover {
+ WBeatSpinBox::up-button:hover,
+ #DlgAutoDJ QSpinBox::up-button:hover {
image: url(skin:/buttons/btn_beatbox_up_hover.svg) no-repeat;
}
- WBeatSpinBox::down-button {
+ WBeatSpinBox::down-button,
+ #DlgAutoDJ QSpinBox::down-button {
subcontrol-position: center right;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
image: url(skin:/buttons/btn_beatbox_down.svg) no-repeat;
}
- WBeatSpinBox::down-button:hover {
+ WBeatSpinBox::down-button:hover,
+ #DlgAutoDJ QSpinBox::down-button:hover {
image: url(skin:/buttons/btn_beatbox_down_hover.svg) no-repeat;
}
@@ -2227,33 +2251,38 @@ WLibrary QPushButton {
font-size: 14px/14px;
Setting height/width here will prevent the buttons being scaled properly
min-height: 22px;
- max-height: 22px; */
- height: 22px;
+ max-height: 22px;
+ height: 22px; */
color: #ccc;
border-radius: 2px;
margin: 1px 2px 5px 1px;
- padding: 1px 6px 1px 6px;
+ padding: 3px 6px 3px 6px;
background-color: #333;
background-position: center;
}
- QPushButton:hover {
- background-color: #666;
+ WLibrary QPushButton:!enabled {
+ color: #888;
}
- QPushButton:unchecked {
+ WLibrary QPushButton:hover {
+ border: 1px solid #888;
+ }
+ WLibrary QPushButton:unchecked {
color: #888;
background-color: #444;
}
- QPushButton:checked {
+ WLibrary QPushButton:checked {
color: #000;
font-weight: bold;
background-color: #ff7b00;
}
- QPushButton:checked:hover {
+ WLibrary QPushButton:checked:hover {
border: 1px solid #ff3f00;
}
/* 'Enable AutoDJ' button */
- QPushButton#pushButtonAutoDJ:unchecked:hover {
- background-color: #ff7b00;
+ QPushButton#pushButtonAutoDJ:hover,
+ QPushButton#pushButtonRecording:hover,
+ QPushButton#pushButtonAnalyze:hover {
+ border: 1px solid #ff6600;
}
/* 'Start/Stop Recording' button */
QPushButton#pushButtonRecording {
From 91cd599d3d9c4530e2c9d49afa539fa4ea19aeeb Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Wed, 23 May 2018 01:43:49 +0200
Subject: [PATCH 05/45] LateNight: unify splitter names
---
res/skins/LateNight/library.xml | 6 ++---
res/skins/LateNight/skin.xml | 2 +-
res/skins/LateNight/style.qss | 58 ++++++++++++++++++++---------------------
3 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/res/skins/LateNight/library.xml b/res/skins/LateNight/library.xml
index 748965813b..f8bdc8d68d 100644
--- a/res/skins/LateNight/library.xml
+++ b/res/skins/LateNight/library.xml
@@ -13,19 +13,19 @@
**********************************************
-->
<WidgetGroup>
+ <ObjectName>Library</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,me</SizePolicy>
<Children>
<Splitter>
- <ObjectName>LibrarySplitter</ObjectName>
+ <ObjectName>VerticalSplitter</ObjectName>
<SizePolicy>me,me</SizePolicy>
<SplitSizes>1,10</SplitSizes>
<SplitSizesConfigKey>[LateNight],LibrarySidebarSplitSize</SplitSizesConfigKey>
<Collapsible>1,0</Collapsible>
<Children>
<WidgetGroup>
- <ObjectName>LibrarySidebar_X</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>min,me</SizePolicy>
<MinimumSize>100,-1</MinimumSize>
@@ -37,7 +37,7 @@
<SearchBox></SearchBox>
<Splitter>
- <ObjectName>CoverArtSplitter</ObjectName>
+ <ObjectName>HorizontalSplitter</ObjectName>
<Size>me,me</Size>
<SplitSizes>1,1</SplitSizes>
<SplitSizesConfigKey>[LateNight],CoverArtSplitSize</SplitSizesConfigKey>
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index 8f7d5df78c..67e1d6239e 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -122,7 +122,7 @@
<!-- Decks, Effects ... Library -->
<Splitter>
- <ObjectName>CoverArtSplitter</ObjectName>
+ <ObjectName>HorizontalSplitter</ObjectName>
<Orientation>vertical</Orientation>
<SizePolicy>me,min</SizePolicy>
<SplitSizes>1,5</SplitSizes>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 483dbd6f13..15521aa965 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1501,42 +1501,40 @@ WCoverArt {
color: #ACACAC;
}
-/* splitter between treeview and library */
-#LibrarySplitter::handle {
- image: url(skin:/style/style_handle_unchecked.png);
- background-color: #1e1e1e;
-}
-#LibrarySplitter::handle:pressed,
-#LibrarySplitter::handle:hover {
- image: url(skin:/style/style_handle_checked.png);
- background-color: #1e1e1e;
-}
-#LibrarySplitter::handle:horizontal {
- width: 5px;
- background-color: #0e0e0e;
-}
-#LibrarySplitter::handle:vertical {
- height: 5px;
- background-color: #0e0e0e;
+/* HorizontalSplitter
+ (the splitter itself is horizontal)
+ Used to split
+ - Waveforms & Decks/FX/etc
+ - Library feature & Coverart */
+#HorizontalSplitter {
+ padding: 0px;
+ margin: 0px;
}
-/* splitter between treeview and coverart */
-#CoverArtSplitter::handle {
- image: url(skin:/style/style_handle_horizontal_unchecked.png);
- background-color: #1e1e1e;
+#HorizontalSplitter::handle {
+ image: url(skin:/style/splitter_handle_horizontal_unchecked.png);
}
- #CoverArtSplitter::handle:pressed,
- #CoverArtSplitter::handle:hover {
- image: url(skin:/style/style_handle_horizontal_checked.png);
- background-color: #1e1e1e;
+ #HorizontalSplitter::handle:pressed,
+ #HorizontalSplitter::handle:hover {
+ image: url(skin:/style/splitter_handle_horizontal_checked.png);
}
-#CoverArtSplitter::handle:horizontal {
- width: 10px;
- background-color: #0e0e0e;
+#HorizontalSplitter::handle:vertical {
+ height: 10px;
}
-#CoverArtSplitter::handle:vertical {
+
+/* VerticalSplitter
+ (the splitter itself is vertical)
+ Used to split Library sidebar & Tracks table */
+#VerticalSplitter::handle {
+ image: url(skin:/style/splitter_handle_unchecked.png);
+}
+#VerticalSplitter::handle:pressed,
+#VerticalSplitter::handle:hover {
+ image: url(skin:/style/splitter_handle_checked.png);
+}
+#VerticalSplitter::handle:vertical {
+ /* 'height' works although it's actually the width of the handle */
height: 10px;
- background-color: #0e0e0e;
}
/* Extra declaration for QRadioButton otherwise it shows up with wrong colors in Linux with Gnome */
From cb43a17e0af0871a9bfe25d7e415d1f9622f4590 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Wed, 23 May 2018 01:44:58 +0200
Subject: [PATCH 06/45] LateNight: same style for beatsize & AutoDJ spinboxes
---
res/skins/LateNight/style.qss | 47 ++++++++++++++++++++++++++++---------------
1 file changed, 31 insertions(+), 16 deletions(-)
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 15521aa965..8746640e6c 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -619,58 +619,73 @@ WEffectButtonParameter*/
border: 1px solid #eeeeee;
}
-WBeatSpinBox {
+WBeatSpinBox,
+#DlgAutoDJ QSpinBox {
/* make it 2px smaller in each dimension,
border is added for final size */
width: 55px;
height: 22px;
border: 1px solid #666;
- /* size of spinbox: 54x22px
- incl. up/down button: 70x22px */
border-radius: 2px;
color: #cfb32c;
background-color: #0f0f0f;
selection-color: #0f0f0f;
selection-background-color: #d2d2d2;
font-size: 13px/13px;
- padding: 0px;
- padding: 1px 2px 1px 1px;
- margin: 0px -1px 2px 0px;
-}
- WBeatSpinBox:hover {
+ }
+ WBeatSpinBox {
+ padding: 1px 2px 1px 1px;
+ margin: 0px -1px 2px 0px;
+ }
+ /* Eliminate overlapping right border for transition time in Auto DJ tab */
+ #DlgAutoDJ QSpinBox {
+ border-right: 0px;
+ margin: 0px 0px 0px 2px;
+ padding: 1px 2px 1px 1px;
+ }
+ WBeatSpinBox:hover,
+ #DlgAutoDJ QSpinBox:hover {
border-color: #888;
}
- WBeatSpinBox:focus {
+ WBeatSpinBox:focus,
+ #DlgAutoDJ QSpinBox:focus {
border-color: #d2d2d2;
color: #cfb32c;
}
- WBeatSpinBox::up-button, WBeatSpinBox::down-button {
+ WBeatSpinBox::up-button,
+ WBeatSpinBox::down-button,
+ #DlgAutoDJ QSpinBox::up-button,
+ #DlgAutoDJ QSpinBox::down-button {
subcontrol-origin: padding;
position: relative;
/* as with spinbox: border is added to size.
define it with same width as hover border, otherwise size jumps */
width: 18px;
height: 12px;
- margin: 0px 0px 0px 0px;
+ margin: 0px;
padding: 0px;
border: 0px;
- }
+ }
- WBeatSpinBox::up-button {
+ WBeatSpinBox::up-button,
+ #DlgAutoDJ QSpinBox::up-button {
subcontrol-position: top right;
margin-top: -1px;
image: url(skin:/buttons/btn_beatbox_double.svg) no-repeat;
}
- WBeatSpinBox::up-button:pressed {
+ WBeatSpinBox::up-button:pressed,
+ #DlgAutoDJ QSpinBox::up-button:pressed {
image: url(skin:/buttons/btn_beatbox_double_pressed.svg) no-repeat;
}
- WBeatSpinBox::down-button {
+ WBeatSpinBox::down-button,
+ #DlgAutoDJ QSpinBox::down-button {
subcontrol-position: bottom right;
margin-bottom: -1px;
image: url(skin:/buttons/btn_beatbox_halve.svg) no-repeat;
}
- WBeatSpinBox::down-button:pressed {
+ WBeatSpinBox::down-button:pressed,
+ #DlgAutoDJ QSpinBox::down-button:pressed {
image: url(skin:/buttons/btn_beatbox_halve_pressed.svg) no-repeat;
}
From d661b5b44333ebbaec6f71a561ae2dbd1408885f Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Wed, 23 May 2018 01:50:25 +0200
Subject: [PATCH 07/45] LateNight: style library scrollbars & table header
---
res/skins/LateNight/library.xml | 1 -
res/skins/LateNight/style.qss | 199 +++++++++++++++++++++-------------------
2 files changed, 104 insertions(+), 96 deletions(-)
diff --git a/res/skins/LateNight/library.xml b/res/skins/LateNight/library.xml
index f8bdc8d68d..bf2c763264 100644
--- a/res/skins/LateNight/library.xml
+++ b/res/skins/LateNight/library.xml
@@ -1,6 +1,5 @@
<Template>
<WidgetGroup>
- <ObjectName>Library</ObjectName>
<SizePolicy>me,i</SizePolicy>
<MinimumSize>1270,-</MinimumSize>
<Layout>vertical</Layout>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 8746640e6c..f90497cd36 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -110,21 +110,6 @@ WTime {
qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
}
-#LibrarySingleton {
- /* This doesn't work as expected:
- it appears LibrarySingleton is displayed twice, so
- padding/margin would double.
- Placed a plain spacer in library.xml which works reliably
- padding-top: 5px;*/
-}
-
-#Library {
- border-left: 0px solid #585858;
- background-color: #0e0e0e;
- padding-bottom: 2px;
- /*border-top: 1px solid #585858;*/
-}
-
#DeckRow_1_KeyVinylFx {
qproperty-layoutAlignment: 'AlignLeft | AlignTop';
border-bottom: 1px solid #585858;
@@ -1358,13 +1343,30 @@ WEffectSelector {
/* Library styling is hard */
+#LibrarySingleton {
+ /* This doesn't work as expected:
+ it appears LibrarySingleton is displayed twice, so
+ padding/margin would double.
+ Placed a plain spacer in library.xml which works reliably
+ padding-top: 5px;*/
+}
+
+#Library {
+ padding-bottom: 2px;
+ /* make a smooth transition from toolbar at the bottom to
+ darker skin background at the top.
+ Splitter handles should be transparent for this to work. */
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #0f0f0f,
+ stop:1 #1e1e1e);
+}
+
QTableView, QTextBrowser, QTreeView {
border: 1px solid #585858;
/*font-size: 15px/18px;*/
color: #cfb32c;
background-color: #0f0f0f;
alternate-background-color: #1a1a1a;
-
selection-color: #cfb32c;
selection-background-color: #725309;
}
@@ -1416,95 +1418,102 @@ QHeaderView {
font-size: 13px/15px;
color: #cfb32c;
font-weight: bold;
- background-color: #0f0f0f;
-}
-QHeaderView::section {
- height: 18px;
- border: 1px solid #585858;
- border-left: 0px;
- padding-left: 1px;
+ border-bottom: 1px solid #585858;
background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 #585858,
stop:1 #0f0f0f);
-}
+ }
+ QHeaderView::section {
+ height: 18px;
+ border: 1px solid #585858;
+ border-left: 0px;
+ padding-left: 1px;
+ background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #585858,
+ stop:1 #0f0f0f);
+ }
-/* QScrollbar styling is even harder */
-QScrollBar:horizontal {
- border: 1px solid #585858;
- min-width: 12px;
- height: 15px;
- background: #1a1a1a;
- border-radius: 3px;
- padding: 1px;
-}
-QScrollBar:vertical {
+QHeaderView::up-arrow,
+QHeaderView::down-arrow {
+ background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #585858, stop:1 #0f0f0f);
+ width: 12px;
+ padding-left: 3px;
+ padding-right: 3px;
+ border-right: 1px solid #585858;
+ }
+ QHeaderView::up-arrow {
+ image: url(skin:/style/library_sort_up.svg);
+ }
+ QHeaderView::up-arrow:hover {
+ image: url(skin:/style/library_sort_down.svg);
+ }
+ QHeaderView::down-arrow:hover {
+ image: url(skin:/style/library_sort_up.svg);
+ }
+
+
+
+/* QScrollBar styling is even harder */
+QScrollBar {
border: 1px solid #585858;
- min-height: 12px;
- width: 15px;
background: #1a1a1a;
border-radius: 3px;
padding: 1px;
-}
-/* "add-page" and "sub-page" are the gutter of the scrollbar */
-QScrollBar::add-page, QScrollBar::sub-page {
- min-width: 15px;
- min-height: 15px;
- border: 2px;
- background-color: #1a1a1a;
- border-radius: 3px;
-}
-QScrollBar::handle:horizontal {
- min-width: 25px;
- border-radius: 3px;
- border: 1px solid #725309;
- background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
- stop:0 #725309,
- stop:1 #412f05);
-}
-QScrollBar::handle:vertical {
- min-height: 25px;
- border-radius: 3px;
- border: 1px solid #725309;
- background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
- stop:0 #725309,
- stop:1 #412f05);
-}
-/* Turn off buttons */
-QScrollBar::add-line:horizontal, QScrollBar::add-line:vertical {
- width: 0px;
- height: 0px;
- border: 0px solid white;
-}
-QScrollBar::sub-line:horizontal, QScrollBar::sub-line:vertical {
- width: 0px;
- height: 0px;
- border: 0px solid white;
-}
+ color: #999999;
+ font-size: 8pt;
+ }
+ QScrollBar:horizontal {
+ min-width: 12px;
+ height: 15px;
+ border-top-left-radius: 0px;
+ border-top-right-radius: 0px;
+ border-top: 0px;
+ background-color: #0f0f0f;
+ }
+ QScrollBar:vertical {
+ min-height: 12px;
+ width: 15px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border-left: 0px;
+ color: #b3b3b3;
+ background-color: #0f0f0f;
+ }
-/* transition time in Auto DJ tab */
-QSpinBox:editable {
- background: transparent;
- color: #cfb32c;
-}
-QSpinBox {
- min-height: 20px;
- max-height: 20px;
- min-width: 40px;
- max-width: 40px;
-}
+ /* "add-page" and "sub-page" are the gutter of the scrollbar */
+ QScrollBar::add-page, QScrollBar::sub-page {
+ min-width: 15px;
+ min-height: 15px;
+ background-color: #0f0f0f;
+ border-radius: 3px;
+ }
+ QScrollBar::handle:horizontal {
+ min-width: 25px;
+ border-radius: 3px;
+ border: 1px solid #725309;
+ background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #725309,
+ stop:1 #412f05);
+ }
+ QScrollBar::handle:vertical {
+ min-height: 25px;
+ border-radius: 3px;
+ border: 1px solid #725309;
+ background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #725309,
+ stop:1 #412f05);
+ }
+ /* Turn off buttons */
+ QScrollBar::add-line, QScrollBar::sub-line {
+ width: 0px;
+ height: 0px;
+ border: 0px;
+ }
-/* library search bar */
-WSearchLineEdit {
- padding: 2px;
- border: 1px solid #656565;
- background: #181818;
- color: #cfb32c;
-}
-WSearchLineEdit:focus {
- padding: 2px;
- border: 2px solid #FF6600;
- background: #0f0f0f;
-}
+ /* Corner in between two scrollbars */
+ QAbstractScrollArea::corner {
+ background-color: #1e1e1e;
+ }
#SidebarContainer{
margin-top: -5px;
From 87c0b448d95e77fc2a05a13a78c79ecbc5fd2b90 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Wed, 23 May 2018 01:52:35 +0200
Subject: [PATCH 08/45] LateNight: style library searchbox, buttons &
indicators
---
res/skins/LateNight/style.qss | 154 ++++++++++++++++++++++--------------------
1 file changed, 81 insertions(+), 73 deletions(-)
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index f90497cd36..c9603387c4 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1376,20 +1376,23 @@ QTableView:focus, QTreeView:focus {
}
/* checkbox in library "Played" column */
-QTableView::indicator { width: 12px; height: 12px;}
-QTableView::indicator:checked { background: url(skin:/style/style_checkbox_checked.png);}
-QTableView::indicator:unchecked { background: url(skin:/style/style_checkbox_unchecked.png);}
-QTableView::item:selected {
- color: #cfb32c;
- background-color: #725309;
-}
+QTableView::indicator {
+ width: 12px;
+ height: 12px;
+ }
+ QTableView::indicator:checked {
+ background: url(skin:/style/library_checkbox_checked.png);
+ }
+ QTableView::indicator:unchecked {
+ background: url(skin:/style/library_checkbox_unchecked.png);
+ }
/* BPM lock icon in the library "BPM" column. */
#LibraryBPMButton::indicator:checked {
- image: url(:/images/library/ic_library_checked.png);
+ image: url(skin:/style/library_lock_checked.png);
}
#LibraryBPMButton::indicator:unchecked {
- image: url(:/images/library/ic_library_unchecked.png);
+ image: url(skin:/style/library_lock_unchecked.png);
}
#LibraryBPMButton::item:selected {
color: #cfb32c;
@@ -1397,22 +1400,19 @@ QTableView::item:selected {
}
/* Button in library "Preview" column */
-QPushButton#LibraryPreviewButton {
+#LibraryPreviewButton {
width: 23px;
height: 12px;
- background: transparent;
+ image: url(skin:/style/library_preview_play.png);
+ background-color: transparent;
border: 0px;
-}
-/*QPushButton#LibraryPreviewButton:focus {
- background-color: #725309;
-}*/
-
-QPushButton#LibraryPreviewButton:!checked{
- image: url(skin:/style/style_library_preview_play.png);
-}
-QPushButton#LibraryPreviewButton:checked{
- image: url(skin:/style/style_library_preview_pause.png);
-}
+ }
+ QPushButton#LibraryPreviewButton:!checked{
+ image: url(skin:/style/library_preview_play.png);
+ }
+ QPushButton#LibraryPreviewButton:checked{
+ image: url(skin:/style/library_preview_pause.png);
+ }
QHeaderView {
font-size: 13px/15px;
@@ -1515,9 +1515,23 @@ QScrollBar {
background-color: #1e1e1e;
}
-#SidebarContainer{
- margin-top: -5px;
-}
+/* library search bar */
+WSearchLineEdit {
+ margin-bottom: 5px;
+ padding: 2px;
+ border: 1px solid #656565;
+ background: #181818;
+ color: #cfb32c;
+ }
+ WSearchLineEdit:focus {
+ padding: 2px;
+ border: 2px solid #FF6600;
+ background: #0f0f0f;
+ }
+ /* Clear button next to text field */
+ WSearchLineEdit QToolButton {
+ margin-bottom: 4px;
+ }
/* cover art */
WCoverArt {
@@ -1528,7 +1542,7 @@ WCoverArt {
/* HorizontalSplitter
(the splitter itself is horizontal)
Used to split
- - Waveforms & Decks/FX/etc
+ - Waveforms & Decks/FX/etc
- Library feature & Coverart */
#HorizontalSplitter {
padding: 0px;
@@ -1585,32 +1599,38 @@ WLibrary QRadioButton::indicator:unchecked {
background: url(skin:/buttons/btn_lib_radio_button_off.svg);
}
-/* Additional space for the QPushButtons */
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton {
- margin: 5px 3px 5px 3px;
+/* Library feature pushbuttons */
+WLibrary QPushButton {
+ margin: 5px 3px 4px 3px;
padding: 3px 8px;
min-width: 65px;
border: 1px solid #585858;
border-radius: 2px;
- color: #eeeeee;
-}
+ color: #d2d2d2;
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+ stop:0 #252525,
+ stop:1 #0f0f0f);
+ }
+ WLibrary QPushButton:hover,
+ WLibrary QPushButton:focus {
+ border: 1px solid #888;
+ }
+ WLibrary QPushButton:!enabled {
+ color: #666;
+ }
/* Additional space for the first QPushButton in the row */
+#DlgAutoDJ > QPushButton#pushButtonShuffle {
+ margin: 5px 3px 5px 12px;
+}
+
+/* Additional space for the last QPushButton in the row */
#DlgMissing > QPushButton#btnPurge,
#DlgHidden > QPushButton#btnUnhide,
#DlgAutoDJ > QPushButton#pushButtonAutoDJ,
#DlgRecording > QPushButton#pushButtonRecording,
#DlgAnalysis > QPushButton#pushButtonAnalyze {
- margin: 5px 12px 5px 3px;
-}
-
-/* Additional space for the last QPushButton in the row */
-#DlgAutoDJ > QPushButton#pushButtonShuffle {
- margin: 5px 3px 5px 12px;
+ margin: 5px 17px 5px 3px;
}
#DlgAutoDJ > QPushButton:checked {
@@ -1625,21 +1645,6 @@ WLibrary QRadioButton::indicator:unchecked {
stop:1 #AD0800);
}
-#DlgMissing > QPushButton:!checked,
-#DlgHidden > QPushButton:!checked,
-#DlgAutoDJ > QPushButton:!checked,
-#DlgRecording > QPushButton:!checked,
-#DlgAnalysis > QPushButton:!checked {
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
- stop:0 #6F7176,
- stop:1 #626468);
-}
-
-/* Spacing between treeview and searchbar */
-QTreeView {
- margin: 10px 0px 0px 0px;
-}
-
/* triangle for closed/opened branches in treeview */
QTreeView {
show-decoration-selected: 0;
@@ -1649,36 +1654,39 @@ QTreeView {
QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings {
border-image: none;
- image: url(skin:/style/style_branch_closed.png);
- background-color:#0f0f0f;
+ image: url(skin:/style/library_branch_closed.png);
}
QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings {
border-image: none;
- image: url(skin:/style/style_branch_open.png);
- background-color:#0f0f0f;
+ image: url(skin:/style/library_branch_open.png);
}
+/* closed branch * selected item */
QTreeView::branch:has-children:!has-siblings:closed:selected,
QTreeView::branch:closed:has-children:has-siblings:selected {
border-image: none;
- image: url(skin:/style/style_branch_closed.png);
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
- stop:0 #585858,
- stop:1 #0f0f0f);
+ image: url(skin:/style/library_branch_closed_selected.png);
+ background-color: #725309;
}
+/* open branch * selected item */
QTreeView::branch:open:has-children:!has-siblings:selected,
QTreeView::branch:open:has-children:has-siblings:selected {
border-image: none;
- image: url(skin:/style/style_branch_open.png);
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
- stop:0 #585858,
- stop:1 #0f0f0f);
-}
+ image: url(skin:/style/library_branch_open_selected.png);
+ background-color: #725309;
+ }
+ /* space left of selected child item */
+ QTreeView::branch:!has-children:!has-siblings:closed:selected,
+ QTreeView::branch:closed:!has-children:has-siblings:selected,
+ QTreeView::branch:open:!has-children:!has-siblings:selected,
+ QTreeView::branch:open:!has-children:has-siblings:selected {
+ border-image: none;
+ background-color: #151515;
+ }
+
QTreeView::item:selected {
- color: #cfb32c;
- background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
- stop:0 #585858,
- stop:1 #0f0f0f);
+ color: #fff;
+ background-color: #725309;
}
QToolTip {
From 1cf8e9685046763d6e29b962ef8150e5743ac627 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Wed, 23 May 2018 01:54:33 +0200
Subject: [PATCH 09/45] LateNight: unify library icon naming
---
res/skins/LateNight/style.qss | 4 ++--
...tyle_branch_closed.png => library_branch_closed.png} | Bin
.../LateNight/style/library_branch_closed_selected.png | Bin 0 -> 208 bytes
.../{style_branch_open.png => library_branch_open.png} | Bin
.../LateNight/style/library_branch_open_selected.png | Bin 0 -> 215 bytes
...heckbox_checked.png => library_checkbox_checked.png} | Bin
...box_unchecked.png => library_checkbox_unchecked.png} | Bin
...rary_preview_pause.png => library_preview_pause.png} | Bin
...ibrary_preview_play.png => library_preview_play.png} | Bin
...e_handle_checked.png => splitter_handle_checked.png} | Bin
...ecked.png => splitter_handle_horizontal_checked.png} | Bin
...ked.png => splitter_handle_horizontal_unchecked.png} | Bin
...ndle_unchecked.png => splitter_handle_unchecked.png} | Bin
res/skins/LateNight/style/toolbar_divider.png | Bin 178 -> 180 bytes
14 files changed, 2 insertions(+), 2 deletions(-)
rename res/skins/LateNight/style/{style_branch_closed.png => library_branch_closed.png} (100%)
create mode 100644 res/skins/LateNight/style/library_branch_closed_selected.png
rename res/skins/LateNight/style/{style_branch_open.png => library_branch_open.png} (100%)
create mode 100644 res/skins/LateNight/style/library_branch_open_selected.png
rename res/skins/LateNight/style/{style_checkbox_checked.png => library_checkbox_checked.png} (100%)
rename res/skins/LateNight/style/{style_checkbox_unchecked.png => library_checkbox_unchecked.png} (100%)
rename res/skins/LateNight/style/{style_library_preview_pause.png => library_preview_pause.png} (100%)
rename res/skins/LateNight/style/{style_library_preview_play.png => library_preview_play.png} (100%)
rename res/skins/LateNight/style/{style_handle_checked.png => splitter_handle_checked.png} (100%)
rename res/skins/LateNight/style/{style_handle_horizontal_checked.png => splitter_handle_horizontal_checked.png} (100%)
rename res/skins/LateNight/style/{style_handle_horizontal_unchecked.png => splitter_handle_horizontal_unchecked.png} (100%)
rename res/skins/LateNight/style/{style_handle_unchecked.png => splitter_handle_unchecked.png} (100%)
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index c9603387c4..d70cf34cf4 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1389,10 +1389,10 @@ QTableView::indicator {
/* BPM lock icon in the library "BPM" column. */
#LibraryBPMButton::indicator:checked {
- image: url(skin:/style/library_lock_checked.png);
+ image: url(:/images/library/ic_library_checked.png);
}
#LibraryBPMButton::indicator:unchecked {
- image: url(skin:/style/library_lock_unchecked.png);
+ image: url(:/images/library/ic_library_unchecked.png);
}
#LibraryBPMButton::item:selected {
color: #cfb32c;
diff --git a/res/skins/LateNight/style/style_branch_closed.png b/res/skins/LateNight/style/library_branch_closed.png
similarity index 100%
rename from res/skins/LateNight/style/style_branch_closed.png
rename to res/skins/LateNight/style/library_branch_closed.png
diff --git a/res/skins/LateNight/style/library_branch_closed_selected.png b/res/skins/LateNight/style/library_branch_closed_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..d55311cfc0d6eadc7635159d589e6f3bf43d449b
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^96-#;!3HGxgLCzO6kC$Fy9>jA5L~c#`DBoEfk$L9
zP{(x;W^~e+T>%tiFY)wsWq-sf%%>%g8a6EtC=~1I;us=vx%a|G-ev~@my4FmzdR5-
z5!-Wnp)7k|tC@#^7-t>J4Nj{G`?p-I>n&5CadDyJH(_aEwmX4Yhx)~<?)0(zs1cUm
wA?7hx^<>3L9hFM;O0~@Y`yPJjzAP8^`v0k7f7ToAK#LeWUHx3vIVCg!09Z*yT>t<8
literal 0
HcmV?d00001
diff --git a/res/skins/LateNight/style/style_branch_open.png b/res/skins/LateNight/style/library_branch_open.png
similarity index 100%
rename from res/skins/LateNight/style/style_branch_open.png
rename to res/skins/LateNight/style/library_branch_open.png
diff --git a/res/skins/LateNight/style/library_branch_open_selected.png b/res/skins/LateNight/style/library_branch_open_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee4730690ed34dae08551a914fcf1d83df820d6f
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRM!3HF?&tBaMq}Y<Y-CY>|gW!U_%O``B6nI1y
z19e;nVMZs7*%d%R_7YEDSN2D&!hBi^&i%^{0fkaLT^vIsE|;F#$a^S2gxR59s_V@G
z1)jrRk*%o_$|jyHLZ>d;2z33((}}+R!K28>{=D-f!;`ldvnLr!82p^i=`0Xq@cuwd
zz1@n3ZEFvN?f$#yLC?|)LDtnGF&|g?@y{(-|L<S^bK8Sen`Rw&1GJC9)78&qol`;+
E0GlvO%K!iX
literal 0
HcmV?d00001
diff --git a/res/skins/LateNight/style/style_checkbox_checked.png b/res/skins/LateNight/style/library_checkbox_checked.png
similarity index 100%
rename from res/skins/LateNight/style/style_checkbox_checked.png
rename to res/skins/LateNight/style/library_checkbox_checked.png
diff --git a/res/skins/LateNight/style/style_checkbox_unchecked.png b/res/skins/LateNight/style/library_checkbox_unchecked.png
similarity index 100%
rename from res/skins/LateNight/style/style_checkbox_unchecked.png
rename to res/skins/LateNight/style/library_checkbox_unchecked.png
diff --git a/res/skins/LateNight/style/style_library_preview_pause.png b/res/skins/LateNight/style/library_preview_pause.png
similarity index 100%
rename from res/skins/LateNight/style/style_library_preview_pause.png
rename to res/skins/LateNight/style/library_preview_pause.png
diff --git a/res/skins/LateNight/style/style_library_preview_play.png b/res/skins/LateNight/style/library_preview_play.png
similarity index 100%
rename from res/skins/LateNight/style/style_library_preview_play.png
rename to res/skins/LateNight/style/library_preview_play.png
diff --git a/res/skins/LateNight/style/style_handle_checked.png b/res/skins/LateNight/style/splitter_handle_checked.png
similarity index 100%
rename from res/skins/LateNight/style/style_handle_checked.png
rename to res/skins/LateNight/style/splitter_handle_checked.png
diff --git a/res/skins/LateNight/style/style_handle_horizontal_checked.png b/res/skins/LateNight/style/splitter_handle_horizontal_checked.png
similarity index 100%
rename from res/skins/LateNight/style/style_handle_horizontal_checked.png
rename to res/skins/LateNight/style/splitter_handle_horizontal_checked.png
diff --git a/res/skins/LateNight/style/style_handle_horizontal_unchecked.png b/res/skins/LateNight/style/splitter_handle_horizontal_unchecked.png
similarity index 100%
rename from res/skins/LateNight/style/style_handle_horizontal_unchecked.png
rename to res/skins/LateNight/style/splitter_handle_horizontal_unchecked.png
diff --git a/res/skins/LateNight/style/style_handle_unchecked.png b/res/skins/LateNight/style/splitter_handle_unchecked.png
similarity index 100%
rename from res/skins/LateNight/style/style_handle_unchecked.png
rename to res/skins/LateNight/style/splitter_handle_unchecked.png
diff --git a/res/skins/LateNight/style/toolbar_divider.png b/res/skins/LateNight/style/toolbar_divider.png
index 501d58a7587df6e387306f87bb4d680c72bc5009..1aeee90ae580cde54e36e72e6c3cc1823d5f43d5 100644
GIT binary patch
delta 105
zcmdnQxP?)%Gr-TCmrII^fq{Y7)59eQNHYO3KL;C-Jf|V|Yoek7*CSS89(m2#&p7r?
zjMgxe@pN$v;kcfh;K1IKo16PzQbIyvhC~5V*2+d^hS+ZQy|?57rvr5}c)I$ztaD0e
F0st5#8|wf7
delta 103
zcmdnOxQS7*Gr-TCmrII^fq{Y7)59eQNHYU5CkGpl{JweG&54QzTn~AKxj8vp@2t+9
z7_Ff%<>}%W!f`#hr=#P?c?MP=9uJ0AXO#q%b0!SN3M`Uy87f+UdKo-j{an^LB{Ts5
D5~CXt
From f74ab1e9f84e956076914dadcb8aa47f068e9538 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 24 May 2018 12:36:08 +0200
Subject: [PATCH 10/45] Tango: push AutoDJ & Recording button away from skin
border
---
res/skins/Tango/style.qss | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index fc00fc38c9..7de4ad4036 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2284,8 +2284,11 @@ WLibrary QPushButton {
QPushButton#pushButtonAnalyze:hover {
border: 1px solid #ff6600;
}
- /* 'Start/Stop Recording' button */
+ /* Push 'Start/Stop Recording' button and
+ 'Enable AutoDJ' button away from skin border */
+ QPushButton#pushButtonAutoDJ,
QPushButton#pushButtonRecording {
+ margin: 1px 9px 5px 1px;
}
QPushButton#pushButtonRecording:unchecked {
color: #888;
@@ -2314,6 +2317,7 @@ WLibrary QPushButton {
color: #ededed;
background-color: #666;
}
+
#LibraryTimesPlayed::item {
color: #cfcfcf;
}
From d3d2e884c8ec879055fa32a5c76a481fee901f4e Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 24 May 2018 12:41:05 +0200
Subject: [PATCH 11/45] Tango: adapt CoverArt toggle style next to lib
searchbox
---
res/skins/Tango/style.qss | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 7de4ad4036..2a2e2794ac 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2028,16 +2028,14 @@ QToolTip {
#LibCoverArtButton {
margin: 0px 0px 4px 2px;
}
+ #LibCoverArtButton:hover {
+ background-color: #0f0f0f;
+ }
#LibCoverArtButton[displayValue="0"] {
image: url(skin:/buttons/btn_lib_cover_off.svg) no-repeat center center;
}
- #LibCoverArtButton[displayValue="1"],
- #LibCoverArtButton[displayValue="0"]:hover {
+ #LibCoverArtButton[displayValue="1"] {
image: url(skin:/buttons/btn_lib_cover_on.svg) no-repeat center center;
- background-color: #0f0f0f;
- }
- #LibCoverArtButton[displayValue="1"]:hover {
- border: 1px solid #d2d2d2;
}
QTableView,
From 9eac01cfe717af3ac68c02630dbb620c23b2216b Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 24 May 2018 12:51:38 +0200
Subject: [PATCH 12/45] LateNight: unify appearance of selected item in
tree/table
---
res/skins/LateNight/style.qss | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index d70cf34cf4..a8bc12a700 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1375,6 +1375,13 @@ QTableView:focus, QTreeView:focus {
border: 1px solid #FF6600;
}
+/* selected items in Tree and Tracks table */
+QTreeView::item:selected,
+QTableView::item:selected {
+ color: #fff;
+ background-color: #725309;
+}
+
/* checkbox in library "Played" column */
QTableView::indicator {
width: 12px;
@@ -1684,11 +1691,6 @@ QTreeView::branch:open:has-children:has-siblings:selected {
background-color: #151515;
}
-QTreeView::item:selected {
- color: #fff;
- background-color: #725309;
-}
-
QToolTip {
background-color: #0f0f0f;
color: #cfb32c;
From 31412b5599d2f01f07c984e5d7086e5c2f320c40 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 24 May 2018 12:54:22 +0200
Subject: [PATCH 13/45] LateNight: bold text in QSpinBox
---
res/skins/LateNight/style.qss | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index a8bc12a700..74b78cea2a 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -8,7 +8,8 @@
WLabel, QLabel,
WPushButton, QPushButton,
WEffect, WEffectSelector,
-WBeatSpinBox {/**/
+WBeatSpinBox,
+QSpinBox {
font-family: Ubuntu;
text-transform: uppercase;
font-weight: bold;
From 061d72f7ed4c3e3d8693bf8191bb9e966de03ef2 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Fri, 25 May 2018 22:12:45 +0200
Subject: [PATCH 14/45] LateNight: restore library Preview button icon, as
padding was applied from 'WLibrary QPushButton
---
res/skins/LateNight/style.qss | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 74b78cea2a..2d8cc0a4cf 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1408,12 +1408,13 @@ QTableView::indicator {
}
/* Button in library "Preview" column */
-#LibraryPreviewButton {
+QPushButton#LibraryPreviewButton {
width: 23px;
height: 12px;
- image: url(skin:/style/library_preview_play.png);
background-color: transparent;
border: 0px;
+ margin: 0px;
+ padding: 0px;
}
QPushButton#LibraryPreviewButton:!checked{
image: url(skin:/style/library_preview_play.png);
@@ -1607,8 +1608,15 @@ WLibrary QRadioButton::indicator:unchecked {
background: url(skin:/buttons/btn_lib_radio_button_off.svg);
}
-/* Library feature pushbuttons */
-WLibrary QPushButton {
+/* Library feature pushbuttons
+ Don't use WLibrary QPushButton here, as this would apply padding
+ to the Preview & BPM lock buttons as well.
+ Define the buttons fore every Library feature instead. */
+#DlgMissing > QPushButton,
+#DlgHidden > QPushButton,
+#DlgAutoDJ > QPushButton,
+#DlgRecording > QPushButton,
+#DlgAnalysis > QPushButton {
margin: 5px 3px 4px 3px;
padding: 3px 8px;
min-width: 65px;
@@ -1619,6 +1627,7 @@ WLibrary QPushButton {
stop:0 #252525,
stop:1 #0f0f0f);
}
+ /* Interesting though: this WOULDN'T affect Preview & BPM button */
WLibrary QPushButton:hover,
WLibrary QPushButton:focus {
border: 1px solid #888;
From 2e2236b48c2dfe718a46a4eec9de4837afb25591 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sat, 26 May 2018 06:17:57 +0200
Subject: [PATCH 15/45] LateNight: style LibraryBPM button & spinbox
---
res/skins/LateNight/style.qss | 53 +++++++++++++++++++++++++++++++++++--------
1 file changed, 43 insertions(+), 10 deletions(-)
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 2d8cc0a4cf..4819cb5991 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1395,17 +1395,50 @@ QTableView::indicator {
background: url(skin:/style/library_checkbox_unchecked.png);
}
-/* BPM lock icon in the library "BPM" column. */
-#LibraryBPMButton::indicator:checked {
- image: url(:/images/library/ic_library_checked.png);
-}
-#LibraryBPMButton::indicator:unchecked {
- image: url(:/images/library/ic_library_unchecked.png);
-}
-#LibraryBPMButton::item:selected {
+/* BPM field in tracks table. */
+#LibraryBPMButton::item {
color: #cfb32c;
- background-color: #725309;
-}
+ background-color: transparent;
+ margin: 0px;
+ padding: 0px;
+ }
+ #LibraryBPMButton::item:focus {
+ color: #cfb32c;
+ background-color: #0f0f0f;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+ }
+ #LibraryBPMButton::item:selected {
+ color: #fff;
+ background-color: #725309;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+ }
+ #LibraryBPMSpinBox {
+ color: #fff;
+ selection-color: #0f0f0f;
+ background-color: #0f0f0f;
+ selection-background-color: #888;
+ /* This combination of negative top/bottom padding & margin
+ creates a 1px border around the spinbox' text area.
+ Increased left/right padding/margin removes the overlap of
+ text of activated spinbox and left-over text from regular
+ BPM value display. */
+ padding: -1px -8px -1px -4px;
+ margin: -2px 0px -2px -2px;
+ /* As soon as a border is defined, the up/down buttons
+ lose their style & icons
+ border: 0px;*/
+ }
+ /* Lock icon next to BPM value */
+ #LibraryBPMButton::indicator:checked {
+ image: url(:/images/library/ic_library_checked.png);
+ }
+ #LibraryBPMButton::indicator:unchecked {
+ image: url(:/images/library/ic_library_unchecked.png);
+ }
/* Button in library "Preview" column */
QPushButton#LibraryPreviewButton {
From 3471ba7e36aa2929ef45e99b3ca1120f28167334 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sat, 26 May 2018 06:18:29 +0200
Subject: [PATCH 16/45] LateNight: style LibraryPreview button
---
res/skins/LateNight/style.qss | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 4819cb5991..91adb988a4 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1444,16 +1444,17 @@ QTableView::indicator {
QPushButton#LibraryPreviewButton {
width: 23px;
height: 12px;
- background-color: transparent;
+ background-color: #0f0f0f;
border: 0px;
margin: 0px;
padding: 0px;
}
QPushButton#LibraryPreviewButton:!checked{
- image: url(skin:/style/library_preview_play.png);
+ image: url(:/images/library/ic_library_preview_play.png);
}
QPushButton#LibraryPreviewButton:checked{
- image: url(skin:/style/library_preview_pause.png);
+ image: url(:/images/library/ic_library_preview_pause.png);
+ background-color: #573F07;
}
QHeaderView {
From 36abdb3c8edb2b6166ba392292f1712088cb4fa7 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sat, 26 May 2018 18:22:46 +0200
Subject: [PATCH 17/45] Tango: style LibraryBPM button & spinbox
---
res/skins/Tango/style.qss | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 2a2e2794ac..6743fc29a5 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2303,18 +2303,34 @@ WLibrary QPushButton {
/* BPM lock icon in the library "BPM" column. */
#LibraryBPMButton::indicator:checked {
- image: url(skin:/buttons/btn_bpm_locked.png);
+ image: url(:/images/library/ic_library_checked.png);
}
#LibraryBPMButton::indicator:unchecked {
- image: url(skin:/buttons/btn_bpm_unlocked.png);
- }
- #LibraryBPMButton::item {
- color: #cfcfcf;
+ image: url(:/images/library/ic_library_unchecked.png);
}
+ #LibraryBPMButton::item {
+ color: #cfcfcf;
+ }
#LibraryBPMButton::item:selected {
color: #ededed;
background-color: #666;
}
+ #LibraryBPMSpinBox {
+ color: #fff;
+ selection-color: #0f0f0f;
+ background-color: #0f0f0f;
+ selection-background-color: #888;
+ /* This combination of negative top/bottom padding & margin
+ creates a 1px border around the spinbox' text area.
+ Increased left/right padding/margin removes the overlap of
+ text of activated spinbox and left-over text from regular
+ BPM value display. */
+ padding: -1px -8px -1px -4px;
+ margin: -2px 0px -2px -2px;
+ /* As soon as a border is defined, the up/down buttons
+ lose their style & icons
+ border: 0px;*/
+ }
#LibraryTimesPlayed::item {
color: #cfcfcf;
From 60ed765b5b315055aba783269bf5cd26d891f340 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sat, 26 May 2018 18:23:43 +0200
Subject: [PATCH 18/45] Tango: style Library Preview button, clean up
---
res/skins/Tango/style.qss | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 6743fc29a5..f3466e9071 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2355,8 +2355,7 @@ WLibrary QPushButton {
}
QPushButton#LibraryPreviewButton:checked {
image: url(skin:/graphics/library_preview_pause.png);
- background-color: #000;
- border: 1px solid #ff6600;
+ background-color: #333;
}
/* checkbox in library "Played" column */
@@ -2387,11 +2386,6 @@ WLibrary QSpinBox {
max-width: 40px;
}
-WLibrary QSpinBox:editable {
- background: #0f0f0f;
- color: #ffa600;
-}
-
/* library search text box */
WSearchLineEdit {
padding: 2px;
From 451605b4be6a64c68c3cbb13550523d1a3e198f7 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sat, 26 May 2018 18:28:31 +0200
Subject: [PATCH 19/45] LateNight/Tango: use common ressources for library
Preview & BPM lock button
---
res/skins/LateNight/style/library_preview_pause.png | Bin 965 -> 0 bytes
res/skins/LateNight/style/library_preview_play.png | Bin 1018 -> 0 bytes
res/skins/Tango/buttons/btn_bpm_locked.png | Bin 949 -> 0 bytes
res/skins/Tango/buttons/btn_bpm_unlocked.png | Bin 794 -> 0 bytes
res/skins/Tango/graphics/library_preview_pause.png | Bin 965 -> 0 bytes
res/skins/Tango/graphics/library_preview_play.png | Bin 1018 -> 0 bytes
res/skins/Tango/style.qss | 4 ++--
7 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 res/skins/LateNight/style/library_preview_pause.png
delete mode 100644 res/skins/LateNight/style/library_preview_play.png
delete mode 100644 res/skins/Tango/buttons/btn_bpm_locked.png
delete mode 100644 res/skins/Tango/buttons/btn_bpm_unlocked.png
delete mode 100644 res/skins/Tango/graphics/library_preview_pause.png
delete mode 100644 res/skins/Tango/graphics/library_preview_play.png
diff --git a/res/skins/LateNight/style/library_preview_pause.png b/res/skins/LateNight/style/library_preview_pause.png
deleted file mode 100644
index 67fe2cd7c1e5e114a907550b8f96c1d7a512c791..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 965
zcmeAS@N?(olHy`uVBq!ia0vp^;y}#9!3HEdt<`=2DVAa<&kznEsNqQI0P;BtJR*yM
z>aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QZPj!nI$=?
z48EBa6%`7GdWMGD3Yp3IdBv$E%`px@H4u{=OG`5Hix`Ual8O@ZQc4_hLCQfU)i+qr
z11h=-vd$&7IJqdZpd>RtkHHgShC*6?kwR&4szPR-0+JPa3jRQ4xtUd|DPR>Q76law
z8ir;C6`CN+6^el}dJ4|@c_oRNdBqS1ffW`MrKY78rRF84D&(f-m8L2HU8A6olL>TI
zQKdq8W=eW$2^W`pQD%xlQerXCbdX`C>FKG(AXgPDq!s1oDrA(D6j<r&m!u|VfE4Lv
zr+@=RKcFZ-D>b>KSl_>*GCeg<Ke(haCskcJ^gPgm5+Dyc7o{eG%uxu*%uQu5GB7mM
zH8269m-%yE0o8~=!o0L784}{~K>9TA>Pn!zC)kYqg36-I^o$aQfYPL#%wz?Z{9K?X
zVU9`$TTzypoS&NubTBB0^?|BVfe})yUjWvT0@k1(dHCNc1_s7DPZ!4!i{7b|_Ikwx
zinQ*pebyx<A;80->@r&<>=#ql)CqApN8A=oZqQFKWefVjz$mG6H0{8xup`I(HVB4X
z5ov1GP;Q#JGkv{?@xO`HoaKi##i~EfEfqVi!gyfLREdPv1L8+m7>)^^)BFBs(L#@d
zhMphpx)qi+#3k@=yx;22c=>?*oJh0MKpwtjsoz+hFI;z2XL5M%<s&nAja_~J^)JlI
zX1KETTUh&#sg~mX3l9~=H5D8;Z@*n})~RplHQV<k1?fQ_CeONb=ewy$aJq7-TCr{9
z!XSzIsz-0?-SUgyoU0J55OTHDy;!y4mU|G}>G>A5FTb|8w%@N&duYZcCmg6Z#fFQc
zr=pv=+;7(OGdB9Or=QtT{79Ft;o=IV438L|lP}HLc~aJ&o^r0-X@SH1&Vx=LUep-8
z_@Z!Oc8MYD>o~Dn0^VPq6ohRq5prdIt@6g?OWmRa4H6S9Z_j+O>)PfLqb*BS&%CLc
xr=6f6bvE5!dRB+@gH@ZBIzKR2-?Zi@_umCeH6DF-EdfR^gQu&X%Q~loCICLgbrJvo
diff --git a/res/skins/LateNight/style/library_preview_play.png b/res/skins/LateNight/style/library_preview_play.png
deleted file mode 100644
index 9bcb35359b5141f984c64b7759f752776e1604b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1018
zcmeAS@N?(olHy`uVBq!ia0vp^;y}#9!3HEdt<`=2DVAa<&kznEsNqQI0P;BtJR*yM
z>aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QZPj!nI$=?
z48EBa6%`7GdWMGD3Yp3IdBv$E%`px@H4u{=OG`5Hix`Ual8O@ZQc4_hLCQfU)i+qr
z11h=-vd$&7IJqdZpd>RtkHHgShC*6?kwR&4szPR-0+JPa3jRQ4xtUd|DPR>Q76law
z8ir;C6`CN+6^el}dJ4|@c_oRNdBqS1ffW`MrKY78rRF84D&(f-m8L2HU8A6olL>TI
zQKdq8W=eW$2^W`pQD%xlQerXCbdX`C>FKG(AXgPDq!s1oDrA(D6j<r&m!u|VfE4Lv
zr+@=RKcFZ-D>b>KSl_>*GCeg<Ke(haCskcJ^gPgm5+Dyc7o{eG%uxu*%uQu5GB7mM
zH8269m-%yE0o8~=!o0L784}{~K>9TA>Pn!zC)kYqg36-I^o$aQfYPL#%wz?Z{9K?X
zVU9`$TTzypoS&NubTBB0^?|BVfe})yUjWvT0@k1(dHCNc1_s8>o-U3d7QIsgH+BgJ
zir7B4H1;S^P-qd^#FecqcKc@JP3^F2#{_1ieC9p;$EnNwv54Z<rCeoV)4HbK&|R_N
zsKJ6w3dWO7-^X#A?|6_h*|uPI@wwg4@BLn}ilITp(`Wtl-RV6$c^CBW*Km2VLg)1N
zLK$v7&Q)4s-LBg+XQ`{KXZVrT^OKE1sYv*MZfNPMUrJqz=1=F_aLw-QrZ*E;En2%~
zEB|E^*%ey1zue3zTik1&IqRNkWt7O#)xIxNBloFAMrZTiD!KoCern{m3cLC3&numa
z{9W$FmRz>zJ8Jp8@yWeqZy9BDrk~E7we0(3m5&SuR%F@p9G1VG_k51_$M=hG3!i9s
z(p<OSe&e-!A3fO4Sx$dm$?lMDB2~-2AiI9v^XrTui4yb7e1&tQAMxyOR><IC2noF^
zI<c`sCMx^;b-wJk`#NO0PApip>fN?JmF(wtW-rp%^swN^QRV_&4yOFAQL#ThoVk2c
zLA#+}<-VWV<SgGRhCjR3J^cNT@AjcB6O}&I*vN_hpXvJKvtI1$U2UuCvM%3}Vr~$3
zz34s3=kk}9C!q|di+@deq91BI({K54hQ4yilwNy>Ro^u0zs&|^W(H4JKbLh*2~7Yv
Cv6xi=
diff --git a/res/skins/Tango/buttons/btn_bpm_locked.png b/res/skins/Tango/buttons/btn_bpm_locked.png
deleted file mode 100644
index 7d48fcc07d2855783dbae4ff419e5f4ae8b99642..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 949
zcmV;m14{gfP)<h;3K|Lk000e1NJLTq000UA000aK1^@s6TWc(!0007{dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1V<j@&Q^{_j)t2nKAx$H5Pz-k`@Xc9QMvs9mXQ
zi83aD;p1UXT0g#f`nE|mr&2|^G3TJtN<#}q^F^EQ@nXF55-I10Ah+{-C>`TV{7I3=
zEyg$by@I_tDtC0~pB0ZB_017p3+({GL%AKbn*j>(Zz6M3$>rC#-2wbgk);+^sfi~e
zW+GgK@yZpAG669eZQg=c+>#o637HYmc6gjcblEk!5uGhaQK<%7@yJgCbXWdGenM?U
z6l?oR@2O<G6d&JDGw4k|@+V3M9)+4-jQIDR`KmGLtInLXUJ6~x&EaP`a>n!u&wZ-<
zIu^wW$AI!ZVNddK+r^j`x^?GCzu13!{?gG0mVb5h9}v0kegm8XJ<eDJF5GQFIF1M|
zv*-fwNBRCt94`80zdf8C^+A-M>3yMcWHmNQzQ)6Vpa4U=!<N^O=}&<lWB3~1Gd7k^
z#&n^IO*_#{9)RZPGyuG+wBaEctt{!Id&36M2RgOZD(G^vo(lF_3pJ060bPWqip)tW
z(?O>(u9X+L;ZiM=q^&%M%dm)F7noG3BacLRg{S4>Jr@QC#xjW8#t>sJlSN^o7gDn7
zIk+&0`vlC1r#5S&tH;F#Vd(+ObTy9yx3ZP00jz25$Q`A`iVY|5u*nlJ?y<;=ts+Qd
zyH@Lv1iTsP5Z-rxmD0HpEh<u{*JU-XKn}wqInwD)YWp-6iBzdt7FWx)Q<Aw5X6tpv
zr3=Oycrj>I<7pdp3|Spq1QZ8lfer>>Gxw#LM{RSuIi%(TYG9wjfw{8>8wF^Cusc(U
zrj%M4S*I5D+E{gT3D0b$)%Zv2Xfi3mj1W<mortWgaR$gWj%IW(=A)&bgp!M>auXHH
z00004b3#c}2nYxWd<bNS0002INkl<Z7*}IpfP(-3|H}dKIv{=y#7}^DH4sa{<QYK>
zpa2Jux&_3%K)fD^nSo+~jEsy=fNUKg{ST}GDCh*lAmEK;Ln>5E6C}n2RcHiNa0I3h
zNFRmDnZOkSjb?!=_=%+O8Hf#(6NW29lElem{P*u)DNt7;Pz4(he?d|S@+dbD{{*^q
z0VBx4#Fz+k8^|O#ApVZ7324rIpp6D3n+S>te|W$`jRlG^0mU`~xiX-@UIGnReAE&E
XBguu(!PaP100000NkvXXu0mjfRYIit
diff --git a/res/skins/Tango/buttons/btn_bpm_unlocked.png b/res/skins/Tango/buttons/btn_bpm_unlocked.png
deleted file mode 100644
index fffa4eb8b2e3c828e3c99965dd28ee440f3d5b68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 794
zcmYk3dq`7J9LH~zGN*$qrD+hSBGMkan`n&`a&zhi`Cg&)!0q0%?YiAZ=bY=dD3XD=
zq=F#-2!}n0us>#h^+uAcKMa&fh(Qq~30YB~_?M45cf;s%?mg$;^Euz&_xHV5nj7m4
z`eHr9Fb0>?(Mo4+ou|vD&(py}cj&YQ+g)xQy)NqbIDOAioE@0*v)aAMUNRV=AB#wB
zJ86@BB<w+u35UZbK?-8dqd=34{DZ%$iZ>v)Kthmd5F(KXu$U}m2Z6xJ5{4uYT-m$<
z*;Epc5ra)$<dJw%Eo!)?bh)Q;h(a@3IS0fX5)>lH664Bf0H2J2iXjjr@LvfNXrh=X
zT!4I<D7PvRP+~cvL`t>d0Mi{4sF5Y&5hR>3lm-<9eGoy3gFu9m3ITNkKuDmrP!xm(
z-VcdhUylSHcs-b^YhtS353%M710Rw_5FkW3#<B!*0Sz(*`E)33Gm^U?M=;wIiTa_$
zwvlKECgvuO(guxMgEa_xG#%g;M97qxEtbRPayk~|#COURWHMI~mr49zNQ*-=59z)u
ztsyH>B=`e_X;!@<fddX%q)l#^;?gC$At#F>HLOL<QVP-^f>|Yff=?e{JI2@FQPKA<
zhs|vqxR%=8Sktn#_lx}bB>?W~*s$IEEj!havYr|n2xZMYWwv#X6(49WEGejHH>d88
z?wGE3ZU<|V`FQHqgd<r<&W7W;dDETO`w~k#9m$ikYUQ&9LsQ^<f0l%&_I2RcrBCyT
z+bf2>XXcEL8sw_i`_HYKf2+D2G}U%OT%7(fvi=|$pWxB1eE+LSrKdKzZ1JqF-8=qa
z+-gfMkBT2x=F#&T&eFGCk6-l1ZLzrVX6wkHZ|Q4mf4sf#iF7qyRQIQ%?#<8K-n%W<
T%Hcgdv^~aE+vpgvcgFq#mCPrV
diff --git a/res/skins/Tango/graphics/library_preview_pause.png b/res/skins/Tango/graphics/library_preview_pause.png
deleted file mode 100644
index 67fe2cd7c1e5e114a907550b8f96c1d7a512c791..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 965
zcmeAS@N?(olHy`uVBq!ia0vp^;y}#9!3HEdt<`=2DVAa<&kznEsNqQI0P;BtJR*yM
z>aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QZPj!nI$=?
z48EBa6%`7GdWMGD3Yp3IdBv$E%`px@H4u{=OG`5Hix`Ual8O@ZQc4_hLCQfU)i+qr
z11h=-vd$&7IJqdZpd>RtkHHgShC*6?kwR&4szPR-0+JPa3jRQ4xtUd|DPR>Q76law
z8ir;C6`CN+6^el}dJ4|@c_oRNdBqS1ffW`MrKY78rRF84D&(f-m8L2HU8A6olL>TI
zQKdq8W=eW$2^W`pQD%xlQerXCbdX`C>FKG(AXgPDq!s1oDrA(D6j<r&m!u|VfE4Lv
zr+@=RKcFZ-D>b>KSl_>*GCeg<Ke(haCskcJ^gPgm5+Dyc7o{eG%uxu*%uQu5GB7mM
zH8269m-%yE0o8~=!o0L784}{~K>9TA>Pn!zC)kYqg36-I^o$aQfYPL#%wz?Z{9K?X
zVU9`$TTzypoS&NubTBB0^?|BVfe})yUjWvT0@k1(dHCNc1_s7DPZ!4!i{7b|_Ikwx
zinQ*pebyx<A;80->@r&<>=#ql)CqApN8A=oZqQFKWefVjz$mG6H0{8xup`I(HVB4X
z5ov1GP;Q#JGkv{?@xO`HoaKi##i~EfEfqVi!gyfLREdPv1L8+m7>)^^)BFBs(L#@d
zhMphpx)qi+#3k@=yx;22c=>?*oJh0MKpwtjsoz+hFI;z2XL5M%<s&nAja_~J^)JlI
zX1KETTUh&#sg~mX3l9~=H5D8;Z@*n})~RplHQV<k1?fQ_CeONb=ewy$aJq7-TCr{9
z!XSzIsz-0?-SUgyoU0J55OTHDy;!y4mU|G}>G>A5FTb|8w%@N&duYZcCmg6Z#fFQc
zr=pv=+;7(OGdB9Or=QtT{79Ft;o=IV438L|lP}HLc~aJ&o^r0-X@SH1&Vx=LUep-8
z_@Z!Oc8MYD>o~Dn0^VPq6ohRq5prdIt@6g?OWmRa4H6S9Z_j+O>)PfLqb*BS&%CLc
xr=6f6bvE5!dRB+@gH@ZBIzKR2-?Zi@_umCeH6DF-EdfR^gQu&X%Q~loCICLgbrJvo
diff --git a/res/skins/Tango/graphics/library_preview_play.png b/res/skins/Tango/graphics/library_preview_play.png
deleted file mode 100644
index 9bcb35359b5141f984c64b7759f752776e1604b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1018
zcmeAS@N?(olHy`uVBq!ia0vp^;y}#9!3HEdt<`=2DVAa<&kznEsNqQI0P;BtJR*yM
z>aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QZPj!nI$=?
z48EBa6%`7GdWMGD3Yp3IdBv$E%`px@H4u{=OG`5Hix`Ual8O@ZQc4_hLCQfU)i+qr
z11h=-vd$&7IJqdZpd>RtkHHgShC*6?kwR&4szPR-0+JPa3jRQ4xtUd|DPR>Q76law
z8ir;C6`CN+6^el}dJ4|@c_oRNdBqS1ffW`MrKY78rRF84D&(f-m8L2HU8A6olL>TI
zQKdq8W=eW$2^W`pQD%xlQerXCbdX`C>FKG(AXgPDq!s1oDrA(D6j<r&m!u|VfE4Lv
zr+@=RKcFZ-D>b>KSl_>*GCeg<Ke(haCskcJ^gPgm5+Dyc7o{eG%uxu*%uQu5GB7mM
zH8269m-%yE0o8~=!o0L784}{~K>9TA>Pn!zC)kYqg36-I^o$aQfYPL#%wz?Z{9K?X
zVU9`$TTzypoS&NubTBB0^?|BVfe})yUjWvT0@k1(dHCNc1_s8>o-U3d7QIsgH+BgJ
zir7B4H1;S^P-qd^#FecqcKc@JP3^F2#{_1ieC9p;$EnNwv54Z<rCeoV)4HbK&|R_N
zsKJ6w3dWO7-^X#A?|6_h*|uPI@wwg4@BLn}ilITp(`Wtl-RV6$c^CBW*Km2VLg)1N
zLK$v7&Q)4s-LBg+XQ`{KXZVrT^OKE1sYv*MZfNPMUrJqz=1=F_aLw-QrZ*E;En2%~
zEB|E^*%ey1zue3zTik1&IqRNkWt7O#)xIxNBloFAMrZTiD!KoCern{m3cLC3&numa
z{9W$FmRz>zJ8Jp8@yWeqZy9BDrk~E7we0(3m5&SuR%F@p9G1VG_k51_$M=hG3!i9s
z(p<OSe&e-!A3fO4Sx$dm$?lMDB2~-2AiI9v^XrTui4yb7e1&tQAMxyOR><IC2noF^
zI<c`sCMx^;b-wJk`#NO0PApip>fN?JmF(wtW-rp%^swN^QRV_&4yOFAQL#ThoVk2c
zLA#+}<-VWV<SgGRhCjR3J^cNT@AjcB6O}&I*vN_hpXvJKvtI1$U2UuCvM%3}Vr~$3
zz34s3=kk}9C!q|di+@deq91BI({K54hQ4yilwNy>Ro^u0zs&|^W(H4JKbLh*2~7Yv
Cv6xi=
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index f3466e9071..7ca045c0d0 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2350,11 +2350,11 @@ WLibrary QPushButton {
border: 1px solid #eeeeee;
}
QPushButton#LibraryPreviewButton:!checked {
- image: url(skin:/graphics/library_preview_play.png);
+ image: url(:/images/library/ic_library_preview_play.png);
background-color: #0f0f0f;
}
QPushButton#LibraryPreviewButton:checked {
- image: url(skin:/graphics/library_preview_pause.png);
+ image: url(:/images/library/ic_library_preview_pause.png);
background-color: #333;
}
From 40025dc454ec48ead47774e1ceecc40d569da644 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sun, 27 May 2018 23:44:08 +0200
Subject: [PATCH 20/45] Tango: adjust library Preview button bg, hover & active
state
---
res/skins/Tango/graphics/checkbox_checked.png | Bin 358 -> 824 bytes
res/skins/Tango/graphics/checkbox_checked_.png | Bin 0 -> 358 bytes
res/skins/Tango/graphics/checkbox_unchecked.png | Bin 159 -> 632 bytes
res/skins/Tango/graphics/checkbox_unchecked_.png | Bin 0 -> 159 bytes
res/skins/Tango/style.qss | 51 ++++++++++++++++-------
5 files changed, 35 insertions(+), 16 deletions(-)
create mode 100644 res/skins/Tango/graphics/checkbox_checked_.png
create mode 100644 res/skins/Tango/graphics/checkbox_unchecked_.png
diff --git a/res/skins/Tango/graphics/checkbox_checked.png b/res/skins/Tango/graphics/checkbox_checked.png
index cf78c71ebd1f23489a7e01efe96eda90821e6b27..91ec8a6e87bd43a3cd37e7177677312873e5c1fc 100644
GIT binary patch
literal 824
zcmYk3ZAcVB7{|A$ye_pevofl&qAs*sFQiwEJkRo!^w296&b+<7xw|=UU)r7Z_Qc49
zLJ`drgD?yWvob=76jLFo{NQ~kqUeQQD8lGXND7Len!Q74m}iHX`91%6p8q!53J=8T
zll2ru#aZ(##bk}uLbrf?4=aujWSJ+Mt#%z5wK{hL*)J6H%4Nbo)nbm>(5aHcRXDc{
zmk1slWF$xhgFz$Wt7MiDp;3^$ozt1gvydI(0Hh8gRaJq>Xi857h!uDl;y_pGUIHa)
zO4$nb2@>U3<b5PC$Dn}G4Z~Td_Y>lYMp&TCN=U>=;3;cV0C)rmC^7_y2mk3CK@q_?
zR0G`+B4ekh0)uJ0sBY0-1~R!Zf*gUz4C3WzH4#vhpa)8jXCdGquRy@?ZU6$vB{5P6
z1d-bdv0i^bLT=z<WTLK#DPAv>wW?&`kpvF-Fcx>yG={8CgN#+~h$FO368w<GGF_yG
zypX3$a3}zO-UMZ&!IfHrITB<v9biWsq_(A-Ok2}4$owdr|3sL?sNsslM(yS_Lp85w
zx}IDm_tuDpAciF5^<m1UxB`d;7J*pF&lbf-o~VYbz;UEtEt@73B!5Gu#Yl!bl0cW=
z{WD2KzgsQYcEg#Dwz2#iCic{Y+FEnL(WPrFOL|||1A`h<@zP<ra;aF9aZ+h+=15cD
z$i*RWqz*58y#7V|X#Cf2G5&$)2{Tj25?uZbn;K&8G=8akwdZo?U^lDOI8wTH9$EyN
zmyb%i>r9%xC-FG<aIm9pY{`jd^L5$P&HW$C#%MiAX?b*xpW|rFa_ZGLg9YQ)V^;4P
zpnY=}-&zrWZP(h?a7yu(srg~g%OCgOwL1H%yNB{^`nJ+N4QHEv7pD#9rL^=uh%r>g
z*S|OAC7-;#u77&Gx#{zV*E=TZjen2!44W&Q%blKkZynClo$X^2n<svu+;DSXob*pw
La|<mu%+C6M?ldn$
delta 311
zcmV-70m%Ni2Ic~gBo78+OGiWi{{a60|De66laVnPe+P6)O+^Rb0ul}|Ey_na+5i9m
z^GQTOR4C7tlD$epVGM?!e0)NSxQGrSh?BP<2nyao7dICX>Zlal9G%5g5zp@8>aOT5
zh!-H;1ht6vB(Foy@dsM5*%I<5PhMhbGgf2(PV~R-9jgSRqGL^ZTp^w~RSO{fDR|`&
zSi_jFe@iJw(X?$PU@t@<b^$_=T|?G%tl1X@kPt`dOt%0o$R02Oyl>m3V8(-uoY)sE
z0S}EA4(d4`kjo0G6mx=QGw%9gp(5C7T<EP9l!D~-4Wi}Zz7&ftQi$WJ^8w1&20`)|
zB$I`@AF%Ghjf?B&-Z#oGB>&;kY@sf&3NSsy9XJ=*<K}p;@d;@PW=Hj}{=NVJ002ov
JPDHLkV1m)ci7o&D
diff --git a/res/skins/Tango/graphics/checkbox_checked_.png b/res/skins/Tango/graphics/checkbox_checked_.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf78c71ebd1f23489a7e01efe96eda90821e6b27
GIT binary patch
literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI
zppNSx%;=;sy8<Z4UgGKN%Km^!h|fUxl)Kd}pwMSe7sn8d^HV47^>R++X`5eD<J7&Q
zgHNer@^%Fdu6vH+=Hh~{R*2k@nR_%;@cg?+uhzZL?GRVE%d)lOo636U^B>uxHr^Ea
zq~;%&lw};2!r=F1|2x^$EQ=Q<`&Pv$&a(*RR`{z~@l+t<@Qn4|nr;`j<f<m<yC{?~
zI!%amzE-m4ra0>a0r!_a+Zpsu$Qdy1$-lic;aGF;oEzdgjQqXge6K9!CY<J4DN@{&
zYW(h3(n6&hSuroxicM*H@|Abd(?|P6y7huO9<Th&c<MTv<0lD~$*sHOH@rL8+x`0a
zJ@ZrgD*qo|%2}wlfy==5h=ur#$ImL(f8@;MN^}3Z{@*^J_Zd80{an^LB{Ts5HI0t6
literal 0
HcmV?d00001
diff --git a/res/skins/Tango/graphics/checkbox_unchecked.png b/res/skins/Tango/graphics/checkbox_unchecked.png
index b7b3bd5ef1a647833ff929f58480c3f73688e334..0aca84f6f21246191849b54e911ee8690c231928 100644
GIT binary patch
literal 632
zcmYk3F=!M)6ow}x9+%_Nhy=ZA%9G&ktsEkvVlEqVTbLZ?kOVB;+kLk;x!s**W;VAc
z7M>t#8nKR~u@b>1ppAuM5ztB`h-hUKVqsxrCBE4s;IMCpnfcy7@BQ<rwY)S_s+0&J
zGfvaKj&oT@v4H;@>CFS2rewou7jfJv`VVnEoix`a@?UgJG^*PfZk|$$YigBu)xZ@%
z27`gY;=c6U1Pm^M?OzuwM^Kxo5Xd!_Wf`>$t2RfO$72a9+?l(K(5zOPPgRc#vXROw
z7%FmEX!!8)(&MX0>}$dX=?Ru7#$)1)1!$KGno6K7rvK?1bOo`9-3C7=>gSV;R;_bM
zc3R&|C7u{`fyc^au^d;EgNcAH2#7tP5yUA_H})wFSx2~HNC(UhK$S{Mg88)LN>tZk
zX%K+aRY}?vJfc0Nk_)D(!0Tzq==-@NW=rr5@RT%HvS9$RxvGXC{Mn^z*x*Us;DP{G
z>(DlffSj#a)|pxzzeE1?Co(6-hNr?C+Z|~`wb#FQ_MhXqlWXu~C|J-_q?L9;=24rY
zmGMzgUVg<Ucsz=*V4ZCu1^61$O!5prPcYZt|NVfXb;q7>SD$#_-wbyrC#Ub;AB{%u
z_Vx~lwe>pu`s1y=by&vntWtPTm@O2V<>N0V$hTv~Pp>}rbz{U?T((~}Zr%F__^i|l
delta 110
zcmeytGM{mR3O`$tx4R3&e-K=-clqRrh7uv{C7!;n><^fP_zd{v)vN6o7#MUsT^vI+
z&L`j5Q)$es+0fe9*m&^x@pg@)(c5wo6Ot4Jd$J^Cq#_awJ#-itOqa6<{&h$y0P17#
MboFyt=akR{06xwo2LJ#7
diff --git a/res/skins/Tango/graphics/checkbox_unchecked_.png b/res/skins/Tango/graphics/checkbox_unchecked_.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7b3bd5ef1a647833ff929f58480c3f73688e334
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI
zppNSx%;=;sy8<Z4UgGKN%Km^!h|hpuUcK55D5T@*;uxZFKKag`N@HfthStW$#)HR?
vw`&}Y-j<V?kfb2klO-V|6_H@*p~Jvnx|}`muR~G+P#=S*tDnm{r-UW|{mv_1
literal 0
HcmV?d00001
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 7ca045c0d0..e6f6cd989b 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2046,10 +2046,17 @@ QTreeView {
color: #9e9e9e;
background-color: #0f0f0f;
alternate-background-color: #1a1a1a;
+ /* not applied: */
selection-color: #e6e6e6;
selection-background-color: #666;
}
+/* selected table row */
+QTableView::item:selected {
+ color: #fff;
+ background-color: #666;
+}
+
QTreeView {
min-height: 90px;
min-width: 90px;
@@ -2311,6 +2318,8 @@ WLibrary QPushButton {
#LibraryBPMButton::item {
color: #cfcfcf;
}
+ /* BPM button in selected row. Should match 'selection-color' &
+ 'selection-background-color' of QTableView */
#LibraryBPMButton::item:selected {
color: #ededed;
background-color: #666;
@@ -2337,7 +2346,7 @@ WLibrary QPushButton {
}
/* Button in library "Preview" column */
- QPushButton#LibraryPreviewButton {
+ #LibraryPreviewButton {
width: 23px;
height: 12px;
background: transparent;
@@ -2345,18 +2354,32 @@ WLibrary QPushButton {
margin: 0px;
padding: 0px;
}
- QPushButton#LibraryPreviewButton:hover,
- QPushButton#LibraryPreviewButton:checked:hover {
- border: 1px solid #eeeeee;
- }
- QPushButton#LibraryPreviewButton:!checked {
- image: url(:/images/library/ic_library_preview_play.png);
- background-color: #0f0f0f;
+ #LibraryPreviewButton:!checked {
+ image: url(:/images/library/ic_library_preview_play.png);/*
+ background-color: #141414;*/
}
- QPushButton#LibraryPreviewButton:checked {
- image: url(:/images/library/ic_library_preview_pause.png);
- background-color: #333;
+ #LibraryPreviewButton:!checked:hover {
+ border: 1px solid #666;
}
+ #LibraryPreviewButton:checked {
+ image: url(:/images/library/ic_library_preview_pause.png);/*
+ background-color: #000;*/
+ border: 1px solid #333;
+ }
+ #LibraryPreviewButton:checked:hover {
+ border: 1px solid #888;
+ }
+ /* None of these would style the Preview button background if
+ the respective table row is selected:
+ #LibraryPreviewButton {
+ show-decoration-selected: 0;
+ }
+ #LibraryPreviewButton:selected,
+ #LibraryPreviewButton::item,
+ #LibraryPreviewButton::item:selected,
+ #LibraryPreviewButton:focus {
+ background: #451212;
+ }*/
/* checkbox in library "Played" column */
QTableView::indicator {
@@ -2374,11 +2397,7 @@ WLibrary QPushButton {
background: transparent url(skin:/graphics/checkbox_unchecked.png) no-repeat center center;
color: #cfcfcf;
}
- /* selected table row */
- QTableView::item:selected {
- color: #fff;
- background-color: #666;
- }
+
WLibrary QSpinBox {
min-height: 22px;
max-height: 22px;
From cb986d861f51a490fa2a507018b7046275390a8f Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 28 May 2018 02:35:51 +0200
Subject: [PATCH 21/45] Tango: adapt to daschuer/lp1773709, adjust Preview,
BPM, chcekbox
---
res/skins/Tango/style.qss | 101 +++++++++++++++++++++++++++++-----------------
1 file changed, 64 insertions(+), 37 deletions(-)
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index e6f6cd989b..7a396ebac4 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2046,16 +2046,33 @@ QTreeView {
color: #9e9e9e;
background-color: #0f0f0f;
alternate-background-color: #1a1a1a;
- /* not applied: */
- selection-color: #e6e6e6;
- selection-background-color: #666;
+ /* unfocused Stars in selected row
+ selection-color: #D32323; */
+ /* empty CoverArt cell in selected row until
+ daschuer:lp1773709 402483053e3ebd224cce83f1cb0bde361ada1aa8
+ selection-background-color: #3B9097; */
}
/* selected table row */
QTableView::item:selected {
color: #fff;
- background-color: #666;
-}
+ background-color: #555;
+ /* overrides color:
+ selection-color: #ff5411;
+ not applied anywhere:
+ selection-background-color: #125454; */
+ }
+ /* focused cell */
+ QTableView::item:focus {/*
+ background-color: #666; */
+ /* overrides font color:
+ selection-color: #ff5411; */
+ /* not applied anywhere:
+ selection-background-color: #125454; */
+ /* this outer border is drawn in addition to inner (dotted)
+ focus border defined by OS theme
+ border: 1px solid #ccc; */
+ }
QTreeView {
min-height: 90px;
@@ -2065,29 +2082,29 @@ QTreeView {
border-color: #585858;
show-decoration-selected: 0;
/* Don't define top margin here, it won't shift ScrollBar.
- Defined by SearchBox */
+ Shift WSearchLineEdit instead */
margin: 0px;
}
QTreeView:focus,
QTableView: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 conjuction with [Library],MoveFocusBackward/..Forward, this helps a lot. */
+ In conjuction with [Library],MoveFocusBackward/..Forward, some highlight
+ helps a lot. */
border-color: #ff6600;
}
-/* Closed branch of tree */
+/* Closed branch icon in tree */
QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings {
image: url(skin:/graphics/branch_closed.png);
}
QTreeView::branch:has-children:!has-siblings:closed:selected,
QTreeView::branch:closed:has-children:has-siblings:selected {
- image: url(skin:/graphics/branch_closed.png);
background-color: #333;
}
-/* Open branch of tree */
+/* Open branch icon in tree */
QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings {
image: url(skin:/graphics/branch_open.png);
@@ -2095,9 +2112,15 @@ QTreeView::branch:open:has-children:has-siblings {
QTreeView::branch:open:has-children:!has-siblings:selected,
QTreeView::branch:open:has-children:has-siblings:selected {
border-image: none;
- image: url(skin:/graphics/branch_open.png);
background-color: #333;
}
+/* Text label of branch item */
+QTreeView::item:selected {
+ border-image: none;
+ background-image: none;
+ background-color: #333;
+ color: #d2d2d2;
+ }
/* space left of selected child item */
QTreeView::branch:!has-children:!has-siblings:closed:selected,
QTreeView::branch:closed:!has-children:has-siblings:selected,
@@ -2107,13 +2130,6 @@ QTreeView::branch:open:has-children:has-siblings {
background-color: #0f0f0f;
}
-QTreeView::item:selected {
- border-image: none;
- background-image: none;
- background-color: #333;
- color: #d2d2d2;
- }
-
QTreeView::item:!selected {
border-image: none;
background-image: none;
@@ -2308,21 +2324,23 @@ WLibrary QPushButton {
border: 1px solid #ca0000;
}
- /* BPM lock icon in the library "BPM" column. */
+ /* Entire BPM cell */
+ /* Lock icon at the left */
#LibraryBPMButton::indicator:checked {
- image: url(:/images/library/ic_library_checked.png);
+ image: url(skin:/graphics/library_locked.png);
}
- #LibraryBPMButton::indicator:unchecked {
- image: url(:/images/library/ic_library_unchecked.png);
- }
+ #LibraryBPMButton::indicator:unchecked {
+ image: url(skin:/graphics/library_unlocked.png);
+ }
+ /* BPM value */
#LibraryBPMButton::item {
color: #cfcfcf;
}
- /* BPM button in selected row. Should match 'selection-color' &
+ /* BPM value in selected row. Should match 'selection-color' &
'selection-background-color' of QTableView */
#LibraryBPMButton::item:selected {
color: #ededed;
- background-color: #666;
+ background-color: #555;
}
#LibraryBPMSpinBox {
color: #fff;
@@ -2350,21 +2368,20 @@ WLibrary QPushButton {
width: 23px;
height: 12px;
background: transparent;
- border: 1px solid transparent;
margin: 0px;
padding: 0px;
}
#LibraryPreviewButton:!checked {
- image: url(:/images/library/ic_library_preview_play.png);/*
- background-color: #141414;*/
+ image: url(skin:/graphics/library_preview_play.png);
}
#LibraryPreviewButton:!checked:hover {
- border: 1px solid #666;
+ border: 1px solid #888;
+ background: #0f0f0f;
}
#LibraryPreviewButton:checked {
- image: url(:/images/library/ic_library_preview_pause.png);/*
- background-color: #000;*/
- border: 1px solid #333;
+ image: url(:/images/library/ic_library_preview_pause.png);
+ background-color: #000;
+ border: 1px solid #555;
}
#LibraryPreviewButton:checked:hover {
border: 1px solid #888;
@@ -2388,14 +2405,24 @@ WLibrary QPushButton {
margin: 0px;
padding: 0px;
color: #cfcfcf;
+ /* border is added to size defined above */
+ border: 1px solid #444;
}
- QTableView::indicator:checked {
- background: transparent url(skin:/graphics/checkbox_checked.png) no-repeat center center;
+ QTableView::indicator:hover {
color: #cfcfcf;
- }
+ border: 1px solid #888;
+ }
+ QTableView::indicator:checked {
+ image: url(skin:/graphics/library_checkbox_checked.png);
+ }
QTableView::indicator:unchecked {
- background: transparent url(skin:/graphics/checkbox_unchecked.png) no-repeat center center;
- color: #cfcfcf;
+ image: url(skin:/graphics/library_checkbox_unchecked.png);
+ }
+ QTableView::indicator:selected {
+ border: 1px solid #888;
+ }
+ QTableView::indicator:selected:hover {
+ border: 1px solid #aaa;
}
WLibrary QSpinBox {
From 8fcb5f86bac25fdd443df64ab483efa88ac9e9ba Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 28 May 2018 03:36:15 +0200
Subject: [PATCH 22/45] LateNight: adapt to daschuer/lp1773709, adjust Preview,
BPM, chceckbox, restore graphics
---
res/skins/LateNight/style.qss | 128 ++++++++++++---------
.../LateNight/style/library_checkbox_checked.png | Bin 824 -> 299 bytes
.../LateNight/style/library_checkbox_unchecked.png | Bin 632 -> 149 bytes
res/skins/LateNight/style/library_locked.png | Bin 0 -> 809 bytes
res/skins/LateNight/style/library_preview_play.png | Bin 0 -> 579 bytes
res/skins/LateNight/style/library_unlocked.png | Bin 0 -> 794 bytes
res/skins/Tango/graphics/checkbox_checked.png | Bin 824 -> 0 bytes
res/skins/Tango/graphics/checkbox_checked_.png | Bin 358 -> 0 bytes
res/skins/Tango/graphics/checkbox_unchecked.png | Bin 632 -> 0 bytes
res/skins/Tango/graphics/checkbox_unchecked_.png | Bin 159 -> 0 bytes
.../Tango/graphics/library_checkbox_checked.png | Bin 0 -> 299 bytes
.../graphics/library_checkbox_checked_hover.png | Bin 0 -> 311 bytes
.../Tango/graphics/library_checkbox_unchecked.png | Bin 0 -> 149 bytes
.../graphics/library_checkbox_unchecked_hover.png | Bin 0 -> 792 bytes
res/skins/Tango/graphics/library_locked.png | Bin 0 -> 809 bytes
res/skins/Tango/graphics/library_preview_play.png | Bin 0 -> 551 bytes
res/skins/Tango/graphics/library_unlocked.png | Bin 0 -> 794 bytes
res/skins/Tango/style.qss | 4 +-
18 files changed, 78 insertions(+), 54 deletions(-)
create mode 100644 res/skins/LateNight/style/library_locked.png
create mode 100644 res/skins/LateNight/style/library_preview_play.png
create mode 100644 res/skins/LateNight/style/library_unlocked.png
delete mode 100644 res/skins/Tango/graphics/checkbox_checked.png
delete mode 100644 res/skins/Tango/graphics/checkbox_checked_.png
delete mode 100644 res/skins/Tango/graphics/checkbox_unchecked.png
delete mode 100644 res/skins/Tango/graphics/checkbox_unchecked_.png
create mode 100644 res/skins/Tango/graphics/library_checkbox_checked.png
create mode 100644 res/skins/Tango/graphics/library_checkbox_checked_hover.png
create mode 100644 res/skins/Tango/graphics/library_checkbox_unchecked.png
create mode 100644 res/skins/Tango/graphics/library_checkbox_unchecked_hover.png
create mode 100644 res/skins/Tango/graphics/library_locked.png
create mode 100644 res/skins/Tango/graphics/library_preview_play.png
create mode 100644 res/skins/Tango/graphics/library_unlocked.png
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 91adb988a4..abf9f4c6be 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -25,6 +25,7 @@ QToolTip {/*
#BpmText,
#RateText,
WBeatSpinBox,
+QSpinBox,
WOverview {
font-family: "Open Sans";
}
@@ -1385,77 +1386,100 @@ QTableView::item:selected {
/* checkbox in library "Played" column */
QTableView::indicator {
- width: 12px;
- height: 12px;
+ width: 10px;
+ height: 10px;
+ margin: 0px;
+ padding: 0px;
+ color: #cfb32c;
+ /* border is added to size defined above */
+ border: 1px solid transparent;
}
- QTableView::indicator:checked {
- background: url(skin:/style/library_checkbox_checked.png);
+ QTableView::indicator:hover {
+ color: #cfcfcf;
+ border: 1px solid #888;
}
+ QTableView::indicator:checked,
+ QTableView::indicator:checked:selected {
+ image: url(skin:/style/library_checkbox_checked.png);
+ border: 1px solid #ff6600;
+ }
+ QTableView::indicator:checked:hover {
+ border: 1px solid #aaa;
+ }
QTableView::indicator:unchecked {
- background: url(skin:/style/library_checkbox_unchecked.png);
- }
+ image: url(skin:/style/library_checkbox_unchecked.png);
+ border: 1px solid #444;
+ }
+ QTableView::indicator:unchecked:hover {
+ border: 1px solid #888;
+ }
+ QTableView::indicator:selected {
+ border: 1px solid #888;
+ }
+ QTableView::indicator:selected:hover {
+ border: 1px solid #aaa;
+ }
-/* BPM field in tracks table. */
+/* Entire BPM cell */
+/* Lock icon at the left */
+#LibraryBPMButton::indicator:checked {
+ image: url(skin:/style/library_locked.png);
+ }
+#LibraryBPMButton::indicator:unchecked {
+ image: url(skin:/style/library_unlocked.png);
+ }
+/* BPM value */
#LibraryBPMButton::item {
color: #cfb32c;
- background-color: transparent;
- margin: 0px;
- padding: 0px;
- }
- #LibraryBPMButton::item:focus {
- color: #cfb32c;
- background-color: #0f0f0f;
- border: none;
- margin: 0px;
- padding: 0px;
}
+ /* BPM value in selected row. Should match 'selection-color' &
+ 'selection-background-color' of QTableView */
#LibraryBPMButton::item:selected {
- color: #fff;
+ color: #ededed;
background-color: #725309;
- border: none;
- margin: 0px;
- padding: 0px;
- }
- #LibraryBPMSpinBox {
- color: #fff;
- selection-color: #0f0f0f;
- background-color: #0f0f0f;
- selection-background-color: #888;
- /* This combination of negative top/bottom padding & margin
- creates a 1px border around the spinbox' text area.
- Increased left/right padding/margin removes the overlap of
- text of activated spinbox and left-over text from regular
- BPM value display. */
- padding: -1px -8px -1px -4px;
- margin: -2px 0px -2px -2px;
- /* As soon as a border is defined, the up/down buttons
- lose their style & icons
- border: 0px;*/
}
- /* Lock icon next to BPM value */
- #LibraryBPMButton::indicator:checked {
- image: url(:/images/library/ic_library_checked.png);
- }
- #LibraryBPMButton::indicator:unchecked {
- image: url(:/images/library/ic_library_unchecked.png);
+#LibraryBPMSpinBox {
+ border-radius: 2px;
+ color: #cfb32c;
+ background-color: #0f0f0f;
+ selection-color: #0f0f0f;
+ selection-background-color: #d2d2d2;
+ /* This combination of negative top/bottom padding & margin
+ creates a 1px border around the spinbox' text area.
+ Increased left/right padding/margin removes the overlap of
+ text of activated spinbox and left-over text from regular
+ BPM value display. */
+ padding: -1px -8px -1px -4px;
+ margin: -2px 0px -2px -2px;
+ /* As soon as a border is defined, the up/down buttons
+ lose their style & icons
+ border: 0px;*/
}
/* Button in library "Preview" column */
-QPushButton#LibraryPreviewButton {
+#LibraryPreviewButton {
width: 23px;
height: 12px;
- background-color: #0f0f0f;
- border: 0px;
+ background: transparent;
margin: 0px;
padding: 0px;
+ border-radius: 2px;
}
- QPushButton#LibraryPreviewButton:!checked{
- image: url(:/images/library/ic_library_preview_play.png);
- }
- QPushButton#LibraryPreviewButton:checked{
+ #LibraryPreviewButton:!checked{
+ image: url(skin:/style/library_preview_play.png);
+ }
+ #LibraryPreviewButton:!checked:hover {
+ border: 1px solid #725309;
+ background: #0f0f0f;
+ }
+ #LibraryPreviewButton:checked{
image: url(:/images/library/ic_library_preview_pause.png);
- background-color: #573F07;
- }
+ background-color: #000;
+ border: 1px solid #725309;
+ }
+ #LibraryPreviewButton:checked:hover {
+ border: 1px solid #888;
+ }
QHeaderView {
font-size: 13px/15px;
diff --git a/res/skins/LateNight/style/library_checkbox_checked.png b/res/skins/LateNight/style/library_checkbox_checked.png
index 91ec8a6e87bd43a3cd37e7177677312873e5c1fc..e6bb87b5dfa61405039282c5ecf1e1cac271777a 100644
GIT binary patch
delta 285
zcmV+&0pk9+2CD)yiBL{Q4GJ0x0000DNk~Le0000A0000A2nGNE0F5%wy#N3J24YJ`
zL;(K){{a7>y{D6rF&KXbbV*G`2jT@B01Y}e)zE<e006j2L_t&-)0NP%E(1^;h4J6L
z?VyXvK!ljQg2Z6$+Qp8<jKOB?19b1u2k2n+1o{e%N3e*XNPF+!&{QPagtMNL?@JDU
zOj=dMm6kVm!c*$&<duk5T^vcap}CZH?yzzx)XW9sWy)z7l#pRd)k}T%-^7nIx4}lK
zjz6DW2m5$fdvUV>G+`FDf`gQdrePN~IBgBRFNSk<=#(&?g}oAT4ZZcjT>0ys#}k{4
jYAA`xM0@84?O*u<Yj{BqFq!?v00000NkvXXu0mjfK}UQ&
literal 824
zcmYk3ZAcVB7{|A$ye_pevofl&qAs*sFQiwEJkRo!^w296&b+<7xw|=UU)r7Z_Qc49
zLJ`drgD?yWvob=76jLFo{NQ~kqUeQQD8lGXND7Len!Q74m}iHX`91%6p8q!53J=8T
zll2ru#aZ(##bk}uLbrf?4=aujWSJ+Mt#%z5wK{hL*)J6H%4Nbo)nbm>(5aHcRXDc{
zmk1slWF$xhgFz$Wt7MiDp;3^$ozt1gvydI(0Hh8gRaJq>Xi857h!uDl;y_pGUIHa)
zO4$nb2@>U3<b5PC$Dn}G4Z~Td_Y>lYMp&TCN=U>=;3;cV0C)rmC^7_y2mk3CK@q_?
zR0G`+B4ekh0)uJ0sBY0-1~R!Zf*gUz4C3WzH4#vhpa)8jXCdGquRy@?ZU6$vB{5P6
z1d-bdv0i^bLT=z<WTLK#DPAv>wW?&`kpvF-Fcx>yG={8CgN#+~h$FO368w<GGF_yG
zypX3$a3}zO-UMZ&!IfHrITB<v9biWsq_(A-Ok2}4$owdr|3sL?sNsslM(yS_Lp85w
zx}IDm_tuDpAciF5^<m1UxB`d;7J*pF&lbf-o~VYbz;UEtEt@73B!5Gu#Yl!bl0cW=
z{WD2KzgsQYcEg#Dwz2#iCic{Y+FEnL(WPrFOL|||1A`h<@zP<ra;aF9aZ+h+=15cD
z$i*RWqz*58y#7V|X#Cf2G5&$)2{Tj25?uZbn;K&8G=8akwdZo?U^lDOI8wTH9$EyN
zmyb%i>r9%xC-FG<aIm9pY{`jd^L5$P&HW$C#%MiAX?b*xpW|rFa_ZGLg9YQ)V^;4P
zpnY=}-&zrWZP(h?a7yu(srg~g%OCgOwL1H%yNB{^`nJ+N4QHEv7pD#9rL^=uh%r>g
z*S|OAC7-;#u77&Gx#{zV*E=TZjen2!44W&Q%blKkZynClo$X^2n<svu+;DSXob*pw
La|<mu%+C6M?ldn$
diff --git a/res/skins/LateNight/style/library_checkbox_unchecked.png b/res/skins/LateNight/style/library_checkbox_unchecked.png
index 0aca84f6f21246191849b54e911ee8690c231928..f0a75df8005493d280d7e6a44615ba1100ba8e57 100644
GIT binary patch
delta 100
zcmeytGL><H3O`$tx4R3&e-K=-clqRrh7w-vC7!;n?2lMw82DIM&s$f|z`&s7>Ealo
zaX$IWmrtn*oD&uuynK3kV`rm_!K%c9j06?aOa_J%7nrA-n{9doRL$V&>gTe~DWM4f
DVhbgT
literal 632
zcmYk3F=!M)6ow}x9+%_Nhy=ZA%9G&ktsEkvVlEqVTbLZ?kOVB;+kLk;x!s**W;VAc
z7M>t#8nKR~u@b>1ppAuM5ztB`h-hUKVqsxrCBE4s;IMCpnfcy7@BQ<rwY)S_s+0&J
zGfvaKj&oT@v4H;@>CFS2rewou7jfJv`VVnEoix`a@?UgJG^*PfZk|$$YigBu)xZ@%
z27`gY;=c6U1Pm^M?OzuwM^Kxo5Xd!_Wf`>$t2RfO$72a9+?l(K(5zOPPgRc#vXROw
z7%FmEX!!8)(&MX0>}$dX=?Ru7#$)1)1!$KGno6K7rvK?1bOo`9-3C7=>gSV;R;_bM
zc3R&|C7u{`fyc^au^d;EgNcAH2#7tP5yUA_H})wFSx2~HNC(UhK$S{Mg88)LN>tZk
zX%K+aRY}?vJfc0Nk_)D(!0Tzq==-@NW=rr5@RT%HvS9$RxvGXC{Mn^z*x*Us;DP{G
z>(DlffSj#a)|pxzzeE1?Co(6-hNr?C+Z|~`wb#FQ_MhXqlWXu~C|J-_q?L9;=24rY
zmGMzgUVg<Ucsz=*V4ZCu1^61$O!5prPcYZt|NVfXb;q7>SD$#_-wbyrC#Ub;AB{%u
z_Vx~lwe>pu`s1y=by&vntWtPTm@O2V<>N0V$hTv~Pp>}rbz{U?T((~}Zr%F__^i|l
diff --git a/res/skins/LateNight/style/library_locked.png b/res/skins/LateNight/style/library_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4a403d62a84878bb05b21793a3261c158b0c2dc
GIT binary patch
literal 809
zcmYk3ZAep59LBFK#f_9cl$b%C-pDlXb-v73GUrT}sB^B+ifX$%+pgPv;oP%!mx8?s
z3PlBJks?7MMl-ZG2<$@)ETYmt(?$d?kjygbON0=eyJ2)W_nvd_`JLzg{GZ!nX{brj
zW#}l1N-@`(tYlW#Ym<}6^N4rPO){;Kjb>XixjK@a-Q-;>)warnpH=S!V`jfXK5oR-
zEx1{9;eZ`MDi8?JoZyvNy98+wx%-#PGgcuRhkcN$=M+T&dRm{C4LDX5WQaZ970oJC
z>Bk-sQ8Mj7cEO4F@hYw=b)GI8B+!gn&IDx^aT4Z4filN6fJ;QcFGIiy;J*?yXe1cV
zor2C7QBW)?AX9IUl-+7^Ad?*$REYw%bAlW<6ays$T@XQmg@A{G9|GbA03Szep&$rw
zPB+9lT@B)#z+sn(x+>;(yP>SQl7S0}Jn&#Fl`;&5tVe}tuQL`3V?kmYWU<UNDnU0C
zm}VUG!GY-OBGO>G+F%uec2x)1I37}Yxq5w0ZUGsK;=mWetdD2zM{GRte<A%GoVi2x
z%`pv83L?(!!IZ`C@Nq0Ki9Bg?)f5{maT2m3&lAIH#0;Sz`5`hR#ZEY52bk9IpO-{5
zYBp8c(tF|L*a1z`x~}=}LLV6J9f?F*y5~M?TC@&+YvlI*SM75X`}?OI^P5Z~p~NN7
zw=F@t{Bi6>QbE~_v@p==vYM!;4|}q|-kQj#Q=%HHX{xSH31=-&J=0Fi8M=?Yky1y`
zY(J-X3>Tz}Ipb-U!$K-bFRUynH$*mHwRDvPBm9l5@uF{s148J*p`5nGC1XXGjP<|E
z!g)hiJ`7Ffzg>8AH{^P3j*ikDOh)PZ`qAch`JZ%y)4a8Cm!am;&gUg7zl=?p=i5Wq
lD(u&bHylgjp7bP!k8k;LaMrhXcn9g0GFLa4?io*<{R>3uEXDu;
literal 0
HcmV?d00001
diff --git a/res/skins/LateNight/style/library_preview_play.png b/res/skins/LateNight/style/library_preview_play.png
new file mode 100644
index 0000000000000000000000000000000000000000..7922c51c085e036a00794d39ee1e43a288ea186b
GIT binary patch
literal 579
zcmV-J0=)f+P)<h;3K|Lk000e1NJLTq000*N000aK1^@s6i906v00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;sqQ54J^aM59a^?0nkZA
zK~y-)ol?JRlTj2s_vO8hDvAh-rD!YWBmRO~s3O>*IMmspP({HdgNqcwKR_tBmVlsx
zixjm<rF9X(iYWmHM+L3s%NLpwJ~L#|#?Z&hd)L7zieJ*kGv0IVx!iLvp^fFt;Lf3b
z^^`<n7{H!(`71m7zEU%j6VvNW^auigaB1X%GmXa}K>(^miMIg2Y|jEX2zJcO*HTmA
z^Iiw2VmA3DSV*mQ5)`w^k3r6_HKM$V<3Bt)ax<<jf}DSkh+1pW=4dDLO3j=G30*Cu
zAI9;X5_f`}|2bS79{bB2B+gjJnQoa*Os_YswNC_Lq)WU*)_i|i%qCwiX9oBEG-r1}
z_3h1Xm7TTx0>J*R2P8@m(YeC|eWg$H$-5FH6u9-Rv~ctkfK>n3{b#!d&Km$|M0r(v
zbNwQKBFP<*GYz@TJ6b8dx&Q#9H^!Om3bUQ77Sc1n6xBj{hS|<B+ZCfX#<%`G(P~-u
zYAxD4<WH{NmH<2{z1{3g*S@w!b)XqQi9lD6UoOA<-2*^qt>Gzw|AlpY<JhI}!9TCa
z&Q`W#ptS}wm*coNV*rq;sqh2<73BO|ARz%;|AViCgaNze$t&eq0JFVp^aBRi!wXNx
R^-=%;002ovPDHLkV1mS81RMYW
literal 0
HcmV?d00001
diff --git a/res/skins/LateNight/style/library_unlocked.png b/res/skins/LateNight/style/library_unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..fffa4eb8b2e3c828e3c99965dd28ee440f3d5b68
GIT binary patch
literal 794
zcmYk3dq`7J9LH~zGN*$qrD+hSBGMkan`n&`a&zhi`Cg&)!0q0%?YiAZ=bY=dD3XD=
zq=F#-2!}n0us>#h^+uAcKMa&fh(Qq~30YB~_?M45cf;s%?mg$;^Euz&_xHV5nj7m4
z`eHr9Fb0>?(Mo4+ou|vD&(py}cj&YQ+g)xQy)NqbIDOAioE@0*v)aAMUNRV=AB#wB
zJ86@BB<w+u35UZbK?-8dqd=34{DZ%$iZ>v)Kthmd5F(KXu$U}m2Z6xJ5{4uYT-m$<
z*;Epc5ra)$<dJw%Eo!)?bh)Q;h(a@3IS0fX5)>lH664Bf0H2J2iXjjr@LvfNXrh=X
zT!4I<D7PvRP+~cvL`t>d0Mi{4sF5Y&5hR>3lm-<9eGoy3gFu9m3ITNkKuDmrP!xm(
z-VcdhUylSHcs-b^YhtS353%M710Rw_5FkW3#<B!*0Sz(*`E)33Gm^U?M=;wIiTa_$
zwvlKECgvuO(guxMgEa_xG#%g;M97qxEtbRPayk~|#COURWHMI~mr49zNQ*-=59z)u
ztsyH>B=`e_X;!@<fddX%q)l#^;?gC$At#F>HLOL<QVP-^f>|Yff=?e{JI2@FQPKA<
zhs|vqxR%=8Sktn#_lx}bB>?W~*s$IEEj!havYr|n2xZMYWwv#X6(49WEGejHH>d88
z?wGE3ZU<|V`FQHqgd<r<&W7W;dDETO`w~k#9m$ikYUQ&9LsQ^<f0l%&_I2RcrBCyT
z+bf2>XXcEL8sw_i`_HYKf2+D2G}U%OT%7(fvi=|$pWxB1eE+LSrKdKzZ1JqF-8=qa
z+-gfMkBT2x=F#&T&eFGCk6-l1ZLzrVX6wkHZ|Q4mf4sf#iF7qyRQIQ%?#<8K-n%W<
T%Hcgdv^~aE+vpgvcgFq#mCPrV
literal 0
HcmV?d00001
diff --git a/res/skins/Tango/graphics/checkbox_checked.png b/res/skins/Tango/graphics/checkbox_checked.png
deleted file mode 100644
index 91ec8a6e87bd43a3cd37e7177677312873e5c1fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 824
zcmYk3ZAcVB7{|A$ye_pevofl&qAs*sFQiwEJkRo!^w296&b+<7xw|=UU)r7Z_Qc49
zLJ`drgD?yWvob=76jLFo{NQ~kqUeQQD8lGXND7Len!Q74m}iHX`91%6p8q!53J=8T
zll2ru#aZ(##bk}uLbrf?4=aujWSJ+Mt#%z5wK{hL*)J6H%4Nbo)nbm>(5aHcRXDc{
zmk1slWF$xhgFz$Wt7MiDp;3^$ozt1gvydI(0Hh8gRaJq>Xi857h!uDl;y_pGUIHa)
zO4$nb2@>U3<b5PC$Dn}G4Z~Td_Y>lYMp&TCN=U>=;3;cV0C)rmC^7_y2mk3CK@q_?
zR0G`+B4ekh0)uJ0sBY0-1~R!Zf*gUz4C3WzH4#vhpa)8jXCdGquRy@?ZU6$vB{5P6
z1d-bdv0i^bLT=z<WTLK#DPAv>wW?&`kpvF-Fcx>yG={8CgN#+~h$FO368w<GGF_yG
zypX3$a3}zO-UMZ&!IfHrITB<v9biWsq_(A-Ok2}4$owdr|3sL?sNsslM(yS_Lp85w
zx}IDm_tuDpAciF5^<m1UxB`d;7J*pF&lbf-o~VYbz;UEtEt@73B!5Gu#Yl!bl0cW=
z{WD2KzgsQYcEg#Dwz2#iCic{Y+FEnL(WPrFOL|||1A`h<@zP<ra;aF9aZ+h+=15cD
z$i*RWqz*58y#7V|X#Cf2G5&$)2{Tj25?uZbn;K&8G=8akwdZo?U^lDOI8wTH9$EyN
zmyb%i>r9%xC-FG<aIm9pY{`jd^L5$P&HW$C#%MiAX?b*xpW|rFa_ZGLg9YQ)V^;4P
zpnY=}-&zrWZP(h?a7yu(srg~g%OCgOwL1H%yNB{^`nJ+N4QHEv7pD#9rL^=uh%r>g
z*S|OAC7-;#u77&Gx#{zV*E=TZjen2!44W&Q%blKkZynClo$X^2n<svu+;DSXob*pw
La|<mu%+C6M?ldn$
diff --git a/res/skins/Tango/graphics/checkbox_checked_.png b/res/skins/Tango/graphics/checkbox_checked_.png
deleted file mode 100644
index cf78c71ebd1f23489a7e01efe96eda90821e6b27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI
zppNSx%;=;sy8<Z4UgGKN%Km^!h|fUxl)Kd}pwMSe7sn8d^HV47^>R++X`5eD<J7&Q
zgHNer@^%Fdu6vH+=Hh~{R*2k@nR_%;@cg?+uhzZL?GRVE%d)lOo636U^B>uxHr^Ea
zq~;%&lw};2!r=F1|2x^$EQ=Q<`&Pv$&a(*RR`{z~@l+t<@Qn4|nr;`j<f<m<yC{?~
zI!%amzE-m4ra0>a0r!_a+Zpsu$Qdy1$-lic;aGF;oEzdgjQqXge6K9!CY<J4DN@{&
zYW(h3(n6&hSuroxicM*H@|Abd(?|P6y7huO9<Th&c<MTv<0lD~$*sHOH@rL8+x`0a
zJ@ZrgD*qo|%2}wlfy==5h=ur#$ImL(f8@;MN^}3Z{@*^J_Zd80{an^LB{Ts5HI0t6
diff --git a/res/skins/Tango/graphics/checkbox_unchecked.png b/res/skins/Tango/graphics/checkbox_unchecked.png
deleted file mode 100644
index 0aca84f6f21246191849b54e911ee8690c231928..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 632
zcmYk3F=!M)6ow}x9+%_Nhy=ZA%9G&ktsEkvVlEqVTbLZ?kOVB;+kLk;x!s**W;VAc
z7M>t#8nKR~u@b>1ppAuM5ztB`h-hUKVqsxrCBE4s;IMCpnfcy7@BQ<rwY)S_s+0&J
zGfvaKj&oT@v4H;@>CFS2rewou7jfJv`VVnEoix`a@?UgJG^*PfZk|$$YigBu)xZ@%
z27`gY;=c6U1Pm^M?OzuwM^Kxo5Xd!_Wf`>$t2RfO$72a9+?l(K(5zOPPgRc#vXROw
z7%FmEX!!8)(&MX0>}$dX=?Ru7#$)1)1!$KGno6K7rvK?1bOo`9-3C7=>gSV;R;_bM
zc3R&|C7u{`fyc^au^d;EgNcAH2#7tP5yUA_H})wFSx2~HNC(UhK$S{Mg88)LN>tZk
zX%K+aRY}?vJfc0Nk_)D(!0Tzq==-@NW=rr5@RT%HvS9$RxvGXC{Mn^z*x*Us;DP{G
z>(DlffSj#a)|pxzzeE1?Co(6-hNr?C+Z|~`wb#FQ_MhXqlWXu~C|J-_q?L9;=24rY
zmGMzgUVg<Ucsz=*V4ZCu1^61$O!5prPcYZt|NVfXb;q7>SD$#_-wbyrC#Ub;AB{%u
z_Vx~lwe>pu`s1y=by&vntWtPTm@O2V<>N0V$hTv~Pp>}rbz{U?T((~}Zr%F__^i|l
diff --git a/res/skins/Tango/graphics/checkbox_unchecked_.png b/res/skins/Tango/graphics/checkbox_unchecked_.png
deleted file mode 100644
index b7b3bd5ef1a647833ff929f58480c3f73688e334..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI
zppNSx%;=;sy8<Z4UgGKN%Km^!h|hpuUcK55D5T@*;uxZFKKag`N@HfthStW$#)HR?
vw`&}Y-j<V?kfb2klO-V|6_H@*p~Jvnx|}`muR~G+P#=S*tDnm{r-UW|{mv_1
diff --git a/res/skins/Tango/graphics/library_checkbox_checked.png b/res/skins/Tango/graphics/library_checkbox_checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6bb87b5dfa61405039282c5ecf1e1cac271777a
GIT binary patch
literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u_bxCyD<C*!3BGlPX>x`7I;J!
z19e;nVMZs7*%d%R_7YEDSN2D&G7P*{W>+sX0)=*Xx;TbNT%LMiqaJgBOzX${d*3eT
zKIzahV^7nOgtxbj_8sXtnD&Ob<oyNq7YSckesT4>Z|GRyQT_h@g%FinEt}^}e(%j!
z?-LbzWa>2Y@<YL|UO$=I5gse!xozRjDP`|A6lq>L!}=ukRHnp~3Eo$|Yro$=(r>)|
zpxeqm`}wi#zbhiD3pX>EB#LcoYM#=wEK%IlBA0isep_+rizx>4TK5VS@$UV4Fy`m$
qdB=rk_hxByo^+{x&i*$3CsTHXBfr7SzsG=nVDNPHb6Mw<&;$TAqJ6jk
literal 0
HcmV?d00001
diff --git a/res/skins/Tango/graphics/library_checkbox_checked_hover.png b/res/skins/Tango/graphics/library_checkbox_checked_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..2992dae4ddb97a8679bd1e2585ed1c4c288429c0
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI
zppNSx%;=;sy8<Z4UgGKN%KnH|T3kj)H0^W`Q0R!Ki(`n!`Kgx-y_f?<S|8@it@q4V
zX53iB-L&8V-=!T5D>5Vn-?W%qQ_K(**vt}L?YdoI-2uM~4QG?rwYG8!vlYMke7K%}
z`z!gmEuxbizAFp*yS%2NMr!9)!!xqR{D;~DUpi*7?u$wEU%Gq27L(_d?CDOuj@AZe
zWD~nodU{S53rjqyUb9lxLvKT?`FuTT?Zyp#xl_dxnN5E!ds;2$QS9JfA!^pD(i8iC
zrAg!LPkpsp)gNv=BNjSM{xA32ZD+&R{*toqRkr$Fv(+~r=pP18S3j3^P6<r_$-H%n
literal 0
HcmV?d00001
diff --git a/res/skins/Tango/graphics/library_checkbox_unchecked.png b/res/skins/Tango/graphics/library_checkbox_unchecked.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0a75df8005493d280d7e6a44615ba1100ba8e57
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v_d#0*}aI
zppNSx%;=;sy8<Z4UgGKN%KnH|hJlZD^}KcUKp`bh7sn8d^T}Vnd`eZ|oUrKN<<rv}
mI~!dLRwWi>B&e8XGBBLDz&zF5Y||s4Y6eeNKbLh*2~7a#XDjsp
literal 0
HcmV?d00001
diff --git a/res/skins/Tango/graphics/library_checkbox_unchecked_hover.png b/res/skins/Tango/graphics/library_checkbox_unchecked_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f163e0f539794a9b7123431744ae23621179a4b
GIT binary patch
literal 792
zcmV+z1LypSP)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG0007-dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+ND)(k{lrj{qHGq1OY`nj_pTPZjj^WY1^Bb&g>+$
zYn2~^^aCE?xc=+sa6jhA$-5AfX;$?ZA&1Nb2lMBc=L3^5+bJ^j*C3zQx`y-hL;Q4c
z$%$|By;HdXg>9XV=Zj0ub_3#blW72F3L7Zz0|~@0ENiyp!=K+}8yGu8O);pY=(H)b
z7vV09nNDlsg~X&_k62j@I#X68U@syvffg97r^(UwNap7(U@FtRxa2DU*~~x47wo(M
zSrg0ML-BlG+)0NUujT&Anl5-+Rxc%eotbxuaqlv-!g?S&gni;?c^aPGqkCgC8>26c
zP=caBbywIGJZ(LcX_zrY0EW3bgcR4$h=6ph<~#f|P@B9FfsF>HI|U+&SOq(nCMBam
z2lhnWVVS~%BUS3~nfOd!q{7M>lR4ACiu(BQg_c=e<_vCT=aFq@puz%wW4QlS9HY*L
zpw-ZIP58w#Eet7vqq#v1S)jCQjr_YYc})9@xKcqo{htmPXyvlLY{Sge{<Z31YWakm
zWc!W!xgUb8vX2|qwl2XpE~TW}a&;**R7|dD@t8H%V9-C^4n+S5@~o)^?pAZ)0~w&`
zOAxF6LH095r>h0{>iWN#TP-xp5_Kb30*cPv;#R=&Vg4vcvE(igDC(73wvK9~Ito#%
zN6cAqUjt`Q!gwL;$l>xQe-Q6K@n)71&GaQ|^yq|Juk1ixj}Z+rcrx<A7QtNWL&=w;
zX%AXsA+1u|y(CVf?hJa2N#2);-l=lrzmuy8aU!?{QJ%P=ciaf<WxAK<@@Tf0t`}IU
zCmR9(AyzoXUdm`yt;cA1A7VdZ9URs_((qy?aHY+M|2Nz~rd5C)wdMc-00eVFNmK|3
z2nc)#WQYI&04YgCK~yMHV{B?^`_DiMAVot{OWS`YbU{L3R0A=9_8J&TiD?D~1_l6^
WQVK!zz}b=j0000<MNUMnLSTaBKWs4o
literal 0
HcmV?d00001
diff --git a/res/skins/Tango/graphics/library_locked.png b/res/skins/Tango/graphics/library_locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4a403d62a84878bb05b21793a3261c158b0c2dc
GIT binary patch
literal 809
zcmYk3ZAep59LBFK#f_9cl$b%C-pDlXb-v73GUrT}sB^B+ifX$%+pgPv;oP%!mx8?s
z3PlBJks?7MMl-ZG2<$@)ETYmt(?$d?kjygbON0=eyJ2)W_nvd_`JLzg{GZ!nX{brj
zW#}l1N-@`(tYlW#Ym<}6^N4rPO){;Kjb>XixjK@a-Q-;>)warnpH=S!V`jfXK5oR-
zEx1{9;eZ`MDi8?JoZyvNy98+wx%-#PGgcuRhkcN$=M+T&dRm{C4LDX5WQaZ970oJC
z>Bk-sQ8Mj7cEO4F@hYw=b)GI8B+!gn&IDx^aT4Z4filN6fJ;QcFGIiy;J*?yXe1cV
zor2C7QBW)?AX9IUl-+7^Ad?*$REYw%bAlW<6ays$T@XQmg@A{G9|GbA03Szep&$rw
zPB+9lT@B)#z+sn(x+>;(yP>SQl7S0}Jn&#Fl`;&5tVe}tuQL`3V?kmYWU<UNDnU0C
zm}VUG!GY-OBGO>G+F%uec2x)1I37}Yxq5w0ZUGsK;=mWetdD2zM{GRte<A%GoVi2x
z%`pv83L?(!!IZ`C@Nq0Ki9Bg?)f5{maT2m3&lAIH#0;Sz`5`hR#ZEY52bk9IpO-{5
zYBp8c(tF|L*a1z`x~}=}LLV6J9f?F*y5~M?TC@&+YvlI*SM75X`}?OI^P5Z~p~NN7
zw=F@t{Bi6>QbE~_v@p==vYM!;4|}q|-kQj#Q=%HHX{xSH31=-&J=0Fi8M=?Yky1y`
zY(J-X3>Tz}Ipb-U!$K-bFRUynH$*mHwRDvPBm9l5@uF{s148J*p`5nGC1XXGjP<|E
z!g)hiJ`7Ffzg>8AH{^P3j*ikDOh)PZ`qAch`JZ%y)4a8Cm!am;&gUg7zl=?p=i5Wq
lD(u&bHylgjp7bP!k8k;LaMrhXcn9g0GFLa4?io*<{R>3uEXDu;
literal 0
HcmV?d00001
diff --git a/res/skins/Tango/graphics/library_preview_play.png b/res/skins/Tango/graphics/library_preview_play.png
new file mode 100644
index 0000000000000000000000000000000000000000..663374c18ccdeff45648dde3be56c5aa7ecfa60b
GIT binary patch
literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq000*N000aK1^@s6i906v00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;sqNQH7>s{HA?^h0kla(
zK~y-)ol-H26G0e#Z{68K2sRp1D0UVWDyRrrTxV@zDOe@NCI$q5z`%j+VK6gEFa$a9
z8Vef{MD$uqEfnPt1kq(lqs8uq+xf=A2q$iG7hn0_H*aR%`-nNT)`#o$`ja3C&H^|x
zr+<jZyEIL2Xst7>2m-)lGPzb1#bc5L@HGg6Hvk|amjRsczi}&$<7ca0po}r!2ZO<f
zMFYl|_tx6Pd#|eWUaxnjiVv){mSmYE$%RGcX_{UnIWxvQs(hVN_pG%a$K&zUzsyNq
z5|R7MGSymV&bcj;=a<BLYBrm_Fvh&nS|0^~z<YnZR;#_<FFWVla{$Md7Dyf<d8N^4
z?DYHn2O&x2oclQ(4$lEN-D<U-lH3IV@4Xt0M%Mv+ilXRSQ54|;dvsA0O#=YPvTRL6
zwnb#q7_+{o$aN9f6p`&L%hvW?J+gGpy-bqiWV6}SA%G}~qFPy&OApRx)B@Q9*dckd
z)9JkZLxuo?JkOz&!v8`<ZnxX*hySdih<rJSL7wOE-hZyrs*C|3jN|wW0A;PcOELs7
p-J?%Q?t1UDZnwJuU}KdZ{Q}K##twL#L@odT002ovPDHLkV1oS_@J0Xt
literal 0
HcmV?d00001
diff --git a/res/skins/Tango/graphics/library_unlocked.png b/res/skins/Tango/graphics/library_unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..fffa4eb8b2e3c828e3c99965dd28ee440f3d5b68
GIT binary patch
literal 794
zcmYk3dq`7J9LH~zGN*$qrD+hSBGMkan`n&`a&zhi`Cg&)!0q0%?YiAZ=bY=dD3XD=
zq=F#-2!}n0us>#h^+uAcKMa&fh(Qq~30YB~_?M45cf;s%?mg$;^Euz&_xHV5nj7m4
z`eHr9Fb0>?(Mo4+ou|vD&(py}cj&YQ+g)xQy)NqbIDOAioE@0*v)aAMUNRV=AB#wB
zJ86@BB<w+u35UZbK?-8dqd=34{DZ%$iZ>v)Kthmd5F(KXu$U}m2Z6xJ5{4uYT-m$<
z*;Epc5ra)$<dJw%Eo!)?bh)Q;h(a@3IS0fX5)>lH664Bf0H2J2iXjjr@LvfNXrh=X
zT!4I<D7PvRP+~cvL`t>d0Mi{4sF5Y&5hR>3lm-<9eGoy3gFu9m3ITNkKuDmrP!xm(
z-VcdhUylSHcs-b^YhtS353%M710Rw_5FkW3#<B!*0Sz(*`E)33Gm^U?M=;wIiTa_$
zwvlKECgvuO(guxMgEa_xG#%g;M97qxEtbRPayk~|#COURWHMI~mr49zNQ*-=59z)u
ztsyH>B=`e_X;!@<fddX%q)l#^;?gC$At#F>HLOL<QVP-^f>|Yff=?e{JI2@FQPKA<
zhs|vqxR%=8Sktn#_lx}bB>?W~*s$IEEj!havYr|n2xZMYWwv#X6(49WEGejHH>d88
z?wGE3ZU<|V`FQHqgd<r<&W7W;dDETO`w~k#9m$ikYUQ&9LsQ^<f0l%&_I2RcrBCyT
z+bf2>XXcEL8sw_i`_HYKf2+D2G}U%OT%7(fvi=|$pWxB1eE+LSrKdKzZ1JqF-8=qa
z+-gfMkBT2x=F#&T&eFGCk6-l1ZLzrVX6wkHZ|Q4mf4sf#iF7qyRQIQ%?#<8K-n%W<
T%Hcgdv^~aE+vpgvcgFq#mCPrV
literal 0
HcmV?d00001
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 7a396ebac4..46c1124974 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2400,8 +2400,8 @@ WLibrary QPushButton {
/* checkbox in library "Played" column */
QTableView::indicator {
- width: 12px;
- height: 12px;
+ width: 10px;
+ height: 10px;
margin: 0px;
padding: 0px;
color: #cfcfcf;
From 3b85461743d8e33a2cc4b3117cf16791aa6b560f Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 28 May 2018 05:22:30 +0200
Subject: [PATCH 23/45] LateNight: repair BPM spinbox, add comments
---
res/skins/LateNight/style.qss | 6 +++---
res/skins/Tango/style.qss | 20 ++++++++------------
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index abf9f4c6be..d5f60bde24 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1439,7 +1439,6 @@ QTableView::indicator {
background-color: #725309;
}
#LibraryBPMSpinBox {
- border-radius: 2px;
color: #cfb32c;
background-color: #0f0f0f;
selection-color: #0f0f0f;
@@ -1451,9 +1450,10 @@ QTableView::indicator {
BPM value display. */
padding: -1px -8px -1px -4px;
margin: -2px 0px -2px -2px;
- /* As soon as a border is defined, the up/down buttons
+ /* As soon as any border property is set, the up/down buttons
lose their style & icons
- border: 0px;*/
+ border: 0px;
+ border-radius: 2px; */
}
/* Button in library "Preview" column */
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 46c1124974..db4e90ea95 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -22,7 +22,8 @@ WLabel,
WNumber,
WTrackProperty,
WBeatSpinBox,
-WEffectSelector, WEffectSelector QAbstractItemView {
+WEffectSelector, WEffectSelector QAbstractItemView,
+WSearchLineEdit {
font-family: Ubuntu;
font-weight: normal;
}
@@ -2354,13 +2355,10 @@ WLibrary QPushButton {
BPM value display. */
padding: -1px -8px -1px -4px;
margin: -2px 0px -2px -2px;
- /* As soon as a border is defined, the up/down buttons
+ /* As soon as any border property is set, the up/down buttons
lose their style & icons
- border: 0px;*/
- }
-
- #LibraryTimesPlayed::item {
- color: #cfcfcf;
+ border: 0px;
+ border-radius: 2px; */
}
/* Button in library "Preview" column */
@@ -2435,15 +2433,13 @@ WLibrary QSpinBox {
/* library search text box */
WSearchLineEdit {
padding: 2px;
+ margin-bottom: 5px;
border: 1px solid #656565;
border-left: 0px;
- font-family: Ubuntu;
- font-weight: normal;
- background: #0f0f0f;
color: #cfcfcf;
- selection-background-color: #d2d2d2;
+ background: #0f0f0f;
selection-color: #0f0f0f;
- margin-bottom: 5px;
+ selection-background-color: #d2d2d2;
}
WSearchLineEdit:focus {
border: 2px solid #ff6600;
From 2fa55946333706fb9f1975471754171fc6de961b Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 28 May 2018 18:09:06 +0200
Subject: [PATCH 24/45] Deere: adapt to daschuer/lp1773709, adjust library
Preview button
---
res/skins/Deere/style.qss | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 1d76ef7f26..dae12d1f05 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -218,16 +218,29 @@ QPushButton#LibraryPreviewButton {
width: 23px;
height: 12px;
border: none;
+ border-radius: 2px;
+ background: transparent;
+ margin: 0px;
+ padding: 0px;
}
QPushButton#LibraryPreviewButton:!checked {
image: url(skin:/image/style_library_preview_play.png);
+}
+
+QPushButton#LibraryPreviewButton:!checked:hover {
background-color: #1A1A1A;
+ border: 1px solid #00ABFD;
}
QPushButton#LibraryPreviewButton:checked {
image: url(skin:/image/style_library_preview_pause.png);
- background-color: #006596;
+ background-color: #0f0f0f;
+ border: 1px solid #006596;
+}
+
+QPushButton#LibraryPreviewButton:checked:hover {
+ border: 1px solid #00ABFD;
}
/* library header row */
From 92f4ab1082795e5dd15ec1e48927edb18927bac3 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 28 May 2018 18:10:06 +0200
Subject: [PATCH 25/45] Deere: make library searchbox & BPM spinbox consistent
with beat spinbox
---
res/skins/Deere/style.qss | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index dae12d1f05..d8a0358be4 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -213,6 +213,24 @@ QTableView::indicator:unchecked {
image: url(:/images/library/ic_library_unchecked.png);
}
+#LibraryBPMSpinBox {
+ color: #fff;
+ selection-color: #0f0f0f;
+ background-color: #0f0f0f;
+ selection-background-color: #888;
+ /* This combination of negative top/bottom padding & margin
+ creates a 1px border around the spinbox' text area.
+ Increased left/right padding/margin removes the overlap of
+ text of activated spinbox and left-over text from regular
+ BPM value display. */
+ padding: -1px -8px -1px -4px;
+ margin: -2px 0px -2px -2px;
+ /* As soon as any border property is set, the up/down buttons
+ lose their style & icons
+ border: 0px;
+ border-radius: 2px; */
+}
+
/* button in library "Preview" column */
QPushButton#LibraryPreviewButton {
width: 23px;
@@ -284,18 +302,19 @@ QHeaderView::down-arrow {
WSearchLineEdit {
margin: 0px 0px 0px 1px;
padding: 2px;
- border: 1px solid #1A1A1A;
- background-color: #4B4B4B;
+ border: 1px solid #4B4B4B;
+ background-color: #1e1e1e;
color: #d2d2d2;
}
WSearchLineEdit:focus {
- margin: 2px 0px 0px 1px;
+ margin: 0px 0px 0px 1px;
padding: 2px;
border: 1px solid #FF6600;
- background-color: #4B4B4B;
+ background-color: #1e1e1e;
color: #D6D6D6;
selection-color: #222222;
+ selection-background-color: #d2d2d2;
}
/* library preview deck */
From 079c4e9756d5b5dbf2db8990e95dbb0dba0faac4 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 28 May 2018 18:10:53 +0200
Subject: [PATCH 26/45] Deere: remove blue bg-color from space left of tree
child items
---
res/skins/Deere/style.qss | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index d8a0358be4..5707e0dca6 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -370,6 +370,15 @@ QTreeView::branch:open:has-children:has-siblings {
border-image: none; image: url(skin:/image/style_branch_open.png);
}
+/* space left of selected child item */
+QTreeView::branch:!has-children:!has-siblings:closed:selected,
+QTreeView::branch:closed:!has-children:has-siblings:selected,
+QTreeView::branch:open:!has-children:!has-siblings:selected,
+QTreeView::branch:open:!has-children:has-siblings:selected {
+ border-image: none;
+ background-color: #1F1F1F;
+}
+
/* QSplitter between LibrarySidebar and Library */
#LibrarySplitter::handle {
image: url(skin:/image/style_handle_horizontal_unchecked.svg);
From 536ffcf5488bf4e290445dc5374a28dd11cb91cc Mon Sep 17 00:00:00 2001
From: Stefan <stifisax@gmx.ch>
Date: Sat, 26 May 2018 23:50:16 +0200
Subject: [PATCH 27/45] shade library styling
---
res/skins/Shade/style.qss | 250 ++++++++++++++++++++++++++++++++++++----------
1 file changed, 195 insertions(+), 55 deletions(-)
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 17cd14344d..dd2399a31d 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -83,32 +83,202 @@ WEffectSelector::checked
qproperty-layoutAlignment:AlignTop;
}
-QTableView, QTextBrowser, QTreeView {
- border: 1px solid #656565;
- background: transparent; color: #ACACAC;
- /* we use "background: transparent" as workaround, else "alternate-background-color" wont work, QT 4.7.x bug?*/
- alternate-background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(43, 43, 43, 255), stop:0.049 rgba(43, 43, 43, 255), stop:0.050 rgba(43, 43, 43, 100), stop:0.949 rgba(43, 43, 43, 100), stop:0.95 rgba(43, 43, 43, 255), stop:1 rgba(43, 43, 43, 255));}
-
-QTableView:focus, QTreeView:focus {
- border: 1px solid #FF6600;
-}
-/* checkbox in library "Played" column */
-QTableView::indicator { width: 12px; height: 12px;}
-QTableView::indicator:checked { background: url(skin:/style/style_checkbox_checked.png);}
-QTableView::indicator:unchecked { background: url(skin:/style/style_checkbox_unchecked.png);}
-/* BPM lock icon in the library "BPM" column. */
-#LibraryBPMButton::indicator:checked { image: url(:/images/library/ic_library_checked.png); }
-#LibraryBPMButton::indicator:unchecked { image: url(:/images/library/ic_library_unchecked.png); }
-/* Button in library "Preview" column */
-QPushButton#LibraryPreviewButton { width: 23px; height: 12px; background: transparent; border: 0; }
-QPushButton#LibraryPreviewButton:!checked{ image: url(skin:/style/style_library_preview_play.png); }
-QPushButton#LibraryPreviewButton:checked{ image: url(skin:/style/style_library_preview_pause.png); }
+/*################################################################
+ ###### Library styling is hard ###############################
+ ################### most of it was LateNight & Deere & Tango ##########
+############ added styling for AutoDJ & Recording etc ##### */
+
+QTableView,
+QTextBrowser,
+QTreeView {
+ border: 1px solid #585858;
+ font-weight: normal;
+ color: #9e9e9e;
+ background-color: #0f0f0f;
+ alternate-background-color: #1a1a1a;
+ selection-color: #e6e6e6;
+ selection-background-color: #666;
+}
-QPushButton#LibraryBPMButton {background: transparent; border: 0;}
-QPushButton#LibraryBPMButton::checked {image: url(:/images/library/ic_library_checked.png);}
-QPushButton#LibraryBPMButton::!checked {image: url(:/images/library/ic_library_unchecked.png);}
+QTreeView {
+ min-height: 90px;
+ min-width: 90px;
+ border-width: 1px 1px 1px 0px;
+ border-style: solid;
+ border-color: #585858;
+ show-decoration-selected: 0;
+ /* Don't define top margin here, it won't shift ScrollBar.
+ Defined by SearchBox */
+ margin: 0px;
+ }
+ QTreeView:focus,
+ QTableView: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 conjuction with [Library],MoveFocusBackward/..Forward, this helps a lot. */
+ border-color: #ff6600;
+ }
+ QTreeView::item:hover {
+ border: 1px solid #eeeeee;
+ }
+
+/* Closed branch of tree */
+QTreeView::branch:has-children:!has-siblings:closed,
+QTreeView::branch:closed:has-children:has-siblings {
+ image: url(skin:/style/style_branch_closed.png);
+ }
+ QTreeView::branch:has-children:!has-siblings:closed:selected,
+ QTreeView::branch:closed:has-children:has-siblings:selected {
+ image: url(skin:/style/style_branch_closed.png);
+ background-color: #333;
+ }
+
+/* Open branch of tree */
+QTreeView::branch:open:has-children:!has-siblings,
+QTreeView::branch:open:has-children:has-siblings {
+ image: url(skin:/style/style_branch_open.png);
+ }
+ QTreeView::branch:open:has-children:!has-siblings:selected,
+ QTreeView::branch:open:has-children:has-siblings:selected {
+ border-image: none;
+ image: url(skin:/style/style_branch_open.png);
+ background-color: #333;
+ }
+ /* space left of selected child item */
+ QTreeView::branch:!has-children:!has-siblings:closed:selected,
+ QTreeView::branch:closed:!has-children:has-siblings:selected,
+ QTreeView::branch:open:!has-children:!has-siblings:selected,
+ QTreeView::branch:open:!has-children:has-siblings:selected {
+ border-image: none;
+ background-color: #0f0f0f;
+ }
+
+QTreeView::item:selected {
+ border-image: none;
+ background-image: none;
+ background-color: #333;
+ color: #d2d2d2;
+ }
+
+QTreeView::item:!selected {
+ border-image: none;
+ background-image: none;
+ background-color: #0f0f0f;
+ color: #999;
+ }
+
+ /* BPM lock icon in the library "BPM" column. */
+ #LibraryBPMButton::indicator:checked {
+ image: url(:/images/library/ic_library_checked.png);
+ }
+ #LibraryBPMButton::indicator:unchecked {
+ image: url(:/images/library/ic_library_unchecked.png);
+ }
+ #LibraryBPMButton::item {
+ color: #cfcfcf;
+ }
+ #LibraryBPMButton::item:selected {
+ color: #ededed;
+ background-color: #666;
+ }
+ #LibraryBPMButton::item:hover,
+ #LibraryBPMButton::item:checked:hover {
+ border: 1px solid #eeeeee;
+ }
+
+ #LibraryBPMSpinBox {
+ color: #fff;
+ selection-color: #0f0f0f;
+ background-color: #0f0f0f;
+ selection-background-color: #888;
+ /* This combination of negative top/bottom padding & margin
+ creates a 1px border around the spinbox' text area.
+ Increased left/right padding/margin removes the overlap of
+ text of activated spinbox and left-over text from regular
+ BPM value display. */
+ padding: -1px -8px -1px -4px;
+ margin: -2px 0px -2px -2px;
+ /* As soon as a border is defined, the up/down buttons
+ lose their style & icons
+ border: 0px;*/
+ }
+
+ #LibraryTimesPlayed::item {
+ color: #cfcfcf;
+ }
+
+ /* Button in library "Preview" column */
+ QPushButton#LibraryPreviewButton {
+ width: 23px;
+ height: 12px;
+ background: transparent;
+ border: 1px solid transparent;
+ margin: 0px;
+ padding: 0px;
+ }
+ QPushButton#LibraryPreviewButton:hover,
+ QPushButton#LibraryPreviewButton:checked:hover {
+ border: 1px solid #eeeeee;
+ }
+ QPushButton#LibraryPreviewButton:!checked {
+ image: url(:/images/library/ic_library_preview_play.png);
+ background-color: #0f0f0f;
+ }
+ QPushButton#LibraryPreviewButton:checked {
+ image: url(:/images/library/ic_library_preview_pause.png);
+ background-color: #333;
+ }
+
+ /* checkbox in library "Played" column */
+ QTableView::indicator {
+ width: 12px;
+ height: 12px;
+ margin: 0px;
+ padding: 0px;
+ color: #cfcfcf;
+ }
+ QTableView::indicator:checked {
+ background: transparent url(skin:/style/style_checkbox_checked.png) no-repeat center center;
+ color: #cfcfcf;
+ }
+ QTableView::indicator:unchecked {
+ background: transparent url(skin:/style/style_checkbox_unchecked.png) no-repeat center center;
+ color: #cfcfcf;
+ }
+ /* selected table row */
+ QTableView::item:selected {
+ color: #fff;
+ background-color: #666;
+ }
+ QTableView::indicator:hover,
+ QTableView::indicator:checked:hover {
+ border: 1px solid #eeeeee;
+ }
+
+/* library search text box */
+WSearchLineEdit {
+ padding: 2px;
+ border: 1px solid #656565;
+ border-left: 0px;
+ font-size: 10pt;
+ font-family: "Open Sans";
+ background: #0f0f0f;
+ color: #cfcfcf;
+ selection-background-color: #d2d2d2;
+ selection-color: #0f0f0f;
+ margin-bottom: 5px;
+ }
+ WSearchLineEdit:focus {
+ border: 2px solid #ff6600;
+ color: #eeeeee;
+ padding: 2px;
+ }
+ /* Clear button next to text field */
+ WSearchLineEdit QToolButton {
+ margin-bottom: 4px;
+ }
QHeaderView { font-size: 10pt; }
@@ -124,24 +294,6 @@ QSpinBox:editable {
color: #ACACAC; }
QSpinBox { min-height: 20px; max-height: 20px;min-width: 40px; max-width: 40px;}
-/* library search bar*/
-WSearchLineEdit {
- margin: 2px 0px 3px 3px;
- padding: 2px;
- border: 1px solid #656565;
- font-size: 10pt;
- font-family: "Open Sans";
- background: transparent;
- color: #ACACAC;
-}
-WSearchLineEdit:focus {
- padding: 2px;
- border: 2px solid #FF6600;
- font-size: 10pt;
- font-family: "Open Sans";
- background: rgba(255, 102, 0,50);
- color: #D6D6D6;}
-
/* Cover Art*/
WCoverArt {
font: 11px/15px sans-serif;
@@ -164,6 +316,7 @@ QLabel, QRadioButton {
background: transparent;
color: #C1C1C1;}
+
WLibrary { margin: 2px 3px 0px 0px; }
/* Additional space for QRadionButtons and QLabels*/
@@ -183,6 +336,7 @@ WLibrary QRadioButton#radioButtonRecentlyAdded { margin: 9px 3px 6px 12px; }
min-width: 65px;
}
+
/* Additional space for the first QPushButton in the row*/
#DlgMissing > QPushButton#btnPurge,
#DlgHidden > QPushButton#btnUnhide,
@@ -190,18 +344,4 @@ WLibrary QRadioButton#radioButtonRecentlyAdded { margin: 9px 3px 6px 12px; }
#DlgRecording > QPushButton#pushButtonRecording,
#DlgAnalysis > QPushButton#pushButtonAnalyze { margin: 9px 12px 6px 3px; }
-/* Additional space for the last QPushButton in the row*/
-#DlgAutoDJ > QPushButton#pushButtonShuffle { margin: 9px 3px 6px 12px; }
-
-/* Spacing between treeview and searchbar*/
-QTreeView { margin: 2px 0px 0px 3px; }
-
-/* triangle for closed/opened branches in treeview*/
-QTreeView { show-decoration-selected: 0;} /* Suppresses that selected sidebar items branch indicator shows wrong color when out of focus ; lp:880588*/
-QTreeView::branch:has-children:!has-siblings:closed,
-QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style/style_branch_closed.png);}
-QTreeView::branch:open:has-children:!has-siblings,
-QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style/style_branch_open.png);}
-
-
From 2721a60c4bf197892667c5ec3995883c723ec5ac Mon Sep 17 00:00:00 2001
From: Stefan <stifisax@gmx.ch>
Date: Sun, 27 May 2018 09:54:54 +0200
Subject: [PATCH 28/45] add striping back for preview button
---
res/skins/Shade/style.qss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index dd2399a31d..00770b185d 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -224,11 +224,11 @@ QTreeView::item:!selected {
}
QPushButton#LibraryPreviewButton:!checked {
image: url(:/images/library/ic_library_preview_play.png);
- background-color: #0f0f0f;
+
}
QPushButton#LibraryPreviewButton:checked {
image: url(:/images/library/ic_library_preview_pause.png);
- background-color: #333;
+
}
/* checkbox in library "Played" column */
From 183c8d4ddf4e6142723256640e1168324bdd130a Mon Sep 17 00:00:00 2001
From: Stefan <stifisax@gmx.ch>
Date: Sun, 27 May 2018 10:01:40 +0200
Subject: [PATCH 29/45] change hover color
---
res/skins/Shade/style.qss | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 00770b185d..74439096f5 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -121,7 +121,7 @@ QTreeView {
border-color: #ff6600;
}
QTreeView::item:hover {
- border: 1px solid #eeeeee;
+ border: 1px solid #898989;
}
/* Closed branch of tree */
@@ -185,7 +185,7 @@ QTreeView::item:!selected {
}
#LibraryBPMButton::item:hover,
#LibraryBPMButton::item:checked:hover {
- border: 1px solid #eeeeee;
+ border: 1px solid #898989;
}
#LibraryBPMSpinBox {
@@ -220,7 +220,7 @@ QTreeView::item:!selected {
}
QPushButton#LibraryPreviewButton:hover,
QPushButton#LibraryPreviewButton:checked:hover {
- border: 1px solid #eeeeee;
+ border: 1px solid #898989;
}
QPushButton#LibraryPreviewButton:!checked {
image: url(:/images/library/ic_library_preview_play.png);
@@ -254,7 +254,7 @@ QTreeView::item:!selected {
}
QTableView::indicator:hover,
QTableView::indicator:checked:hover {
- border: 1px solid #eeeeee;
+ border: 1px solid #898989;
}
/* library search text box */
From 8cd7cb870ce4a465109aa2cd03a499e26fc52c22 Mon Sep 17 00:00:00 2001
From: Stefan <stifisax@gmx.ch>
Date: Mon, 28 May 2018 21:22:20 +0200
Subject: [PATCH 30/45] fix os theme shining
---
res/skins/Shade/style.qss | 77 +++++++++++++++++++++++++----------------------
1 file changed, 41 insertions(+), 36 deletions(-)
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 74439096f5..b92a082d67 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -188,48 +188,53 @@ QTreeView::item:!selected {
border: 1px solid #898989;
}
- #LibraryBPMSpinBox {
- color: #fff;
- selection-color: #0f0f0f;
- background-color: #0f0f0f;
- selection-background-color: #888;
- /* This combination of negative top/bottom padding & margin
- creates a 1px border around the spinbox' text area.
- Increased left/right padding/margin removes the overlap of
- text of activated spinbox and left-over text from regular
- BPM value display. */
- padding: -1px -8px -1px -4px;
- margin: -2px 0px -2px -2px;
- /* As soon as a border is defined, the up/down buttons
- lose their style & icons
- border: 0px;*/
- }
+ #LibraryBPMSpinBox {
+ color: #fff;
+ selection-color: #0f0f0f;
+ background-color: #0f0f0f;
+ selection-background-color: #888;
+ /* This combination of negative top/bottom padding & margin
+ creates a 1px border around the spinbox' text area.
+ Increased left/right padding/margin removes the overlap of
+ text of activated spinbox and left-over text from regular
+ BPM value display. */
+ padding: -1px -8px -1px -4px;
+ margin: -2px 0px -2px -2px;
+ /* As soon as any border property is set, the up/down buttons
+ lose their style & icons
+ border: 0px;
+ border-radius: 2px; */
+ }
#LibraryTimesPlayed::item {
color: #cfcfcf;
}
- /* Button in library "Preview" column */
- QPushButton#LibraryPreviewButton {
- width: 23px;
- height: 12px;
- background: transparent;
- border: 1px solid transparent;
- margin: 0px;
- padding: 0px;
- }
- QPushButton#LibraryPreviewButton:hover,
- QPushButton#LibraryPreviewButton:checked:hover {
- border: 1px solid #898989;
- }
- QPushButton#LibraryPreviewButton:!checked {
- image: url(:/images/library/ic_library_preview_play.png);
-
- }
- QPushButton#LibraryPreviewButton:checked {
- image: url(:/images/library/ic_library_preview_pause.png);
+ /* Button in library "Preview" column */
+ #LibraryPreviewButton {
+ width: 23px;
+ height: 12px;
+ background: transparent;
+ margin: 0px;
+ padding: 0px;
+ border-radius: 2px;
+ }
+ #LibraryPreviewButton:!checked{
+ image: url(:/images/library/ic_library_preview_play.png);
+ }
+ #LibraryPreviewButton:!checked:hover {
+ border: 1px solid #898989;
+ background: #0f0f0f;
+ }
+ #LibraryPreviewButton:checked{
+ image: url(:/images/library/ic_library_preview_pause.png);
+ background-color: #000;
+ border: 1px solid #898989;
+ }
+ #LibraryPreviewButton:checked:hover {
+ border: 1px solid #888;
+ }
- }
/* checkbox in library "Played" column */
QTableView::indicator {
From b7cd53971c4149669cace422d072160c15d4cea2 Mon Sep 17 00:00:00 2001
From: Stefan <stifisax@gmx.ch>
Date: Mon, 28 May 2018 21:26:32 +0200
Subject: [PATCH 31/45] remove hover for tree view
---
res/skins/Shade/style.qss | 3 ---
1 file changed, 3 deletions(-)
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index b92a082d67..a62815ffdd 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -120,9 +120,6 @@ QTreeView {
In conjuction with [Library],MoveFocusBackward/..Forward, this helps a lot. */
border-color: #ff6600;
}
- QTreeView::item:hover {
- border: 1px solid #898989;
- }
/* Closed branch of tree */
QTreeView::branch:has-children:!has-siblings:closed,
From be3ee3af3c5b3316577e4c5517eb025f54d1fe35 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Tue, 29 May 2018 16:50:06 +0200
Subject: [PATCH 32/45] Shade: style Library header, respect color schemes
---
res/skins/Shade/btn_lib_sort_down.png | Bin 0 -> 1895 bytes
res/skins/Shade/btn_lib_sort_down_dark.png | Bin 0 -> 1903 bytes
res/skins/Shade/btn_lib_sort_down_summer.png | Bin 0 -> 1924 bytes
res/skins/Shade/btn_lib_sort_up.png | Bin 0 -> 1829 bytes
res/skins/Shade/btn_lib_sort_up_dark.png | Bin 0 -> 1825 bytes
res/skins/Shade/btn_lib_sort_up_summer.png | Bin 0 -> 1835 bytes
res/skins/Shade/dark.qss | 20 +++++++++++++++++
res/skins/Shade/style.qss | 32 ++++++++++++++++++++++++++-
res/skins/Shade/summer_sunset.qss | 20 +++++++++++++++++
9 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 res/skins/Shade/btn_lib_sort_down.png
create mode 100644 res/skins/Shade/btn_lib_sort_down_dark.png
create mode 100644 res/skins/Shade/btn_lib_sort_down_summer.png
create mode 100644 res/skins/Shade/btn_lib_sort_up.png
create mode 100644 res/skins/Shade/btn_lib_sort_up_dark.png
create mode 100644 res/skins/Shade/btn_lib_sort_up_summer.png
diff --git a/res/skins/Shade/btn_lib_sort_down.png b/res/skins/Shade/btn_lib_sort_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a63d6b3cc09916f6977bc2cabcb509ba9a21609
GIT binary patch
literal 1895
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
literal 0
HcmV?d00001
diff --git a/res/skins/Shade/btn_lib_sort_down_dark.png b/res/skins/Shade/btn_lib_sort_down_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..d11236c29506fef4e23379e91a0e16223a134734
GIT binary patch
literal 1903
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
literal 0
HcmV?d00001
diff --git a/res/skins/Shade/btn_lib_sort_down_summer.png b/res/skins/Shade/btn_lib_sort_down_summer.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b8602dceb8b690102f249d25c23aa01d4c3ffb0
GIT binary patch
literal 1924
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
KMNUMnLSTZs{%el_
literal 0
HcmV?d00001
diff --git a/res/skins/Shade/btn_lib_sort_up.png b/res/skins/Shade/btn_lib_sort_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..037f350fdd37dc1b718585afee3a07c8bdfca655
GIT binary patch
literal 1829
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
R3-+Y}L11V=6F26&{{y_G8AJd8
literal 0
HcmV?d00001
diff --git a/res/skins/Shade/btn_lib_sort_up_dark.png b/res/skins/Shade/btn_lib_sort_up_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..10339ffebd09553fc0ef27e9fd75c011d947c661
GIT binary patch
literal 1825
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
P00000NkvXXu0mjf7l0){
literal 0
HcmV?d00001
diff --git a/res/skins/Shade/btn_lib_sort_up_summer.png b/res/skins/Shade/btn_lib_sort_up_summer.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d47483d470bc6576e91001fa655e0050169b2b8
GIT binary patch
literal 1835
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
Z{{x8+v0WkVG)Djc002ovPDHLkV1n|kD*ylh
literal 0
HcmV?d00001
diff --git a/res/skins/Shade/dark.qss b/res/skins/Shade/dark.qss
index 838b82cd17..f7c3d275bf 100644
--- a/res/skins/Shade/dark.qss
+++ b/res/skins/Shade/dark.qss
@@ -24,6 +24,26 @@ WSearchLineEdit:focus {
border: 2px solid #78C70B;
}
+QHeaderView {
+ color: #000;
+}
+/* Library header 'buttons' */
+QHeaderView::section {
+ border-right: 1px solid #3F3041;
+ background-color: #5C5B5D;
+ border-radius: 0px;
+}
+QHeaderView::up-arrow,
+QHeaderView::down-arrow {
+ background-color: rgba(92,91,93,160);
+}
+QHeaderView::up-arrow {
+ image: url(skin:/btn_lib_sort_up_dark.png)
+}
+QHeaderView::down-arrow {
+ image: url(skin:/btn_lib_sort_down_dark.png)
+}
+
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index a62815ffdd..1f12650df0 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -1,3 +1,4 @@
+/* Shade */
#Mixxx {
background-color: #191919;
background-repeat:no-repeat;
@@ -282,7 +283,36 @@ WSearchLineEdit {
margin-bottom: 4px;
}
-QHeaderView { font-size: 10pt; }
+QHeaderView {
+ /* Note(ronso0)
+ Interferes with skin scaling
+ font-size: 13px/13px; */
+ font-size: 10pt;
+ font-weight: bold;
+ color: #0f0f0f;
+}
+/* Library header 'buttons' */
+QHeaderView::section {
+ padding: 2px;
+ /* set right border so that first column header
+ on the left doesn't have double border on the left */
+ border-right: 1px solid #626F87;
+ background-color: #8D98A3;
+ border-radius: 0px;
+}
+
+QHeaderView::up-arrow,
+QHeaderView::down-arrow {
+ width: 12px;
+ padding-right: 2px;
+ background-color: rgba(141,152,163,160);
+}
+QHeaderView::up-arrow {
+ image: url(skin:/btn_lib_sort_up.png)
+}
+QHeaderView::down-arrow {
+ image: url(skin:/btn_lib_sort_down.png)
+}
/* Styling a QSpinbox is complex and it took ages to figure out how to remove the surrounding frame and make the background transparent without affecting the subcontrols (up/down-buttons).
You could easily style a subcontrol like in the QT-Docs, but if you want to have the OS-native subcontrols, this is the only way i found ( there are probably others ).
diff --git a/res/skins/Shade/summer_sunset.qss b/res/skins/Shade/summer_sunset.qss
index 6c72b2254a..94f972d8b8 100644
--- a/res/skins/Shade/summer_sunset.qss
+++ b/res/skins/Shade/summer_sunset.qss
@@ -15,3 +15,23 @@ WEffectSelector {
border: 0px solid #f8ba54;
}
+QHeaderView {
+ color: #0f0f0f;
+}
+/* Library header 'buttons' */
+QHeaderView::section {
+ border-right: 1px solid #626F87;
+ background-color: #998A3D;
+ border-radius: 0px;
+}
+QHeaderView::up-arrow,
+QHeaderView::down-arrow {
+ background-color: rgba(153,138,60,160);
+}
+QHeaderView::up-arrow {
+ image: url(skin:/btn_lib_sort_up_summer.png)
+}
+QHeaderView::down-arrow {
+ image: url(skin:/btn_lib_sort_down_summer.png)
+}
+
From 2d545acff3f998186a00ef16c587862bef36c8f0 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Tue, 29 May 2018 17:13:03 +0200
Subject: [PATCH 33/45] Shade: style Library scrool bars, respect color schemes
---
res/skins/Shade/dark.qss | 14 +++++++++++-
res/skins/Shade/style.qss | 46 ++++++++++++++++++++++++++++++++++++++-
res/skins/Shade/summer_sunset.qss | 15 ++++++++++++-
3 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/res/skins/Shade/dark.qss b/res/skins/Shade/dark.qss
index f7c3d275bf..889459e690 100644
--- a/res/skins/Shade/dark.qss
+++ b/res/skins/Shade/dark.qss
@@ -1,4 +1,4 @@
-
+/* Dark */
WBeatSpinBox {
color: #000000;
background-color: #717171;
@@ -44,6 +44,18 @@ QHeaderView::down-arrow {
image: url(skin:/btn_lib_sort_down_dark.png)
}
+/* Scroll bars */
+/* "add-page" and "sub-page" are the gutter of the scrollbar */
+QScrollBar::add-page,
+QScrollBar::sub-page {
+ background-color: #000;
+}
+QScrollBar::handle:vertical,
+QScrollBar::handle:horizontal {
+ background: #5C5B5D;
+ border: 1px solid #3F3041;
+}
+
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 1f12650df0..439d884d16 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -296,7 +296,7 @@ QHeaderView::section {
padding: 2px;
/* set right border so that first column header
on the left doesn't have double border on the left */
- border-right: 1px solid #626F87;
+ border-right: 1px solid #0f0f0f;
background-color: #8D98A3;
border-radius: 0px;
}
@@ -314,6 +314,50 @@ QHeaderView::down-arrow {
image: url(skin:/btn_lib_sort_down.png)
}
+/* Scroll bars */
+QScrollBar:horizontal {
+ min-width: 40px;
+ height: 18px;
+ padding: 1px;
+ background-color: #5C5B5D;
+}
+QScrollBar:vertical {
+ min-height: 40px;
+ width: 18px;
+ padding: 1px;
+ background-color: #5C5B5D;
+}
+/* "add-page" and "sub-page" are the gutter of the scrollbar */
+QScrollBar::add-page,
+QScrollBar::sub-page {
+ min-width: 14px;
+ min-height: 14px;
+ background-color: #191919;
+}
+QScrollBar::handle:vertical,
+QScrollBar::handle:horizontal {
+ background: #8D98A3;
+ border: 1px solid #1e1e1e;
+ border-radius: 1px;
+}
+QScrollBar::handle:horizontal {
+ min-width: 40px;
+}
+QScrollBar::handle:vertical {
+ min-height: 40px;
+}
+/* Turn off scroll buttons */
+QScrollBar::add-line:horizontal,
+QScrollBar::add-line:vertical {
+ width: 0px;
+ height: 0px;
+}
+QScrollBar::sub-line:horizontal,
+QScrollBar::sub-line:vertical {
+ width: 0px;
+ height: 0px;
+}
+
/* Styling a QSpinbox is complex and it took ages to figure out how to remove the surrounding frame and make the background transparent without affecting the subcontrols (up/down-buttons).
You could easily style a subcontrol like in the QT-Docs, but if you want to have the OS-native subcontrols, this is the only way i found ( there are probably others ).
In our case make sure that the "frame"-property in the corresponding dlgautodj.ui file is set to "false"
diff --git a/res/skins/Shade/summer_sunset.qss b/res/skins/Shade/summer_sunset.qss
index 94f972d8b8..40a146e8e5 100644
--- a/res/skins/Shade/summer_sunset.qss
+++ b/res/skins/Shade/summer_sunset.qss
@@ -1,3 +1,4 @@
+/* Summer Sunset */
WBeatSpinBox {
color: #101307;
background-color: #ad9e4f;
@@ -20,7 +21,7 @@ QHeaderView {
}
/* Library header 'buttons' */
QHeaderView::section {
- border-right: 1px solid #626F87;
+ border-right: 1px solid #0f0f0f;
background-color: #998A3D;
border-radius: 0px;
}
@@ -35,3 +36,15 @@ QHeaderView::down-arrow {
image: url(skin:/btn_lib_sort_down_summer.png)
}
+/* Scroll bars */
+/* "add-page" and "sub-page" are the gutter of the scrollbar */
+QScrollBar::add-page,
+QScrollBar::sub-page {
+ background-color: #000;
+}
+QScrollBar::handle:vertical,
+QScrollBar::handle:horizontal {
+ background: #998A3C;
+ border: 1px solid #524A20;
+}
+
From ca1ffedcfc25292eb084e6c4663e0e4858d28ee3 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Tue, 29 May 2018 18:41:53 +0200
Subject: [PATCH 34/45] Shade: subtle hover effect for lib Preview, remove
hover for Played and BPM fields
---
res/skins/Shade/style.qss | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 439d884d16..2a06b5f781 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -181,10 +181,6 @@ QTreeView::item:!selected {
color: #ededed;
background-color: #666;
}
- #LibraryBPMButton::item:hover,
- #LibraryBPMButton::item:checked:hover {
- border: 1px solid #898989;
- }
#LibraryBPMSpinBox {
color: #fff;
@@ -215,19 +211,18 @@ QTreeView::item:!selected {
background: transparent;
margin: 0px;
padding: 0px;
- border-radius: 2px;
+ border: 1px solid transparent;
}
#LibraryPreviewButton:!checked{
image: url(:/images/library/ic_library_preview_play.png);
}
#LibraryPreviewButton:!checked:hover {
- border: 1px solid #898989;
- background: #0f0f0f;
+ background: #454545;
}
#LibraryPreviewButton:checked{
image: url(:/images/library/ic_library_preview_pause.png);
- background-color: #000;
- border: 1px solid #898989;
+ background-color: #0f0f0f;
+ border: 1px solid #333;
}
#LibraryPreviewButton:checked:hover {
border: 1px solid #888;
@@ -255,10 +250,6 @@ QTreeView::item:!selected {
color: #fff;
background-color: #666;
}
- QTableView::indicator:hover,
- QTableView::indicator:checked:hover {
- border: 1px solid #898989;
- }
/* library search text box */
WSearchLineEdit {
From 4d711ec698ff11eaa1b971adb9ea0fc34726682d Mon Sep 17 00:00:00 2001
From: Stefan <stifisax@gmx.ch>
Date: Tue, 29 May 2018 23:13:50 +0200
Subject: [PATCH 35/45] changed colors of btn_lib_sort to same as border of
selected object
---
res/skins/Shade/btn_lib_sort_down.png | Bin 1895 -> 813 bytes
res/skins/Shade/btn_lib_sort_down_dark.png | Bin 1903 -> 846 bytes
res/skins/Shade/btn_lib_sort_down_summer.png | Bin 1924 -> 0 bytes
res/skins/Shade/btn_lib_sort_up.png | Bin 1829 -> 750 bytes
res/skins/Shade/btn_lib_sort_up_dark.png | Bin 1825 -> 740 bytes
res/skins/Shade/btn_lib_sort_up_summer.png | Bin 1835 -> 0 bytes
res/skins/Shade/summer_sunset.qss | 4 ++--
7 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 res/skins/Shade/btn_lib_sort_down_summer.png
delete mode 100644 res/skins/Shade/btn_lib_sort_up_summer.png
diff --git a/res/skins/Shade/btn_lib_sort_down.png b/res/skins/Shade/btn_lib_sort_down.png
index 6a63d6b3cc09916f6977bc2cabcb509ba9a21609..85a8f9726a3ef50d73b038f1387c9ab0e3af0edb 100644
GIT binary patch
delta 769
zcmaFPx0Y>!3O`$tx4R3&e-K=-clqRrh7$GcC7!;n?2lMwMcJ9$GTX8l7?^f>x;TbZ
z+<JS*J51S-hxNjgYX`o)IJ$9f8voG_y9@39cIzhT#-5irvh9nW=NyS`wfFV=`>xyH
z-tRdt?%Ug>DYA<<_f3@k^(uX_+P=WZ<0p6>Z?NBAu_pOTo5Gvse3xs5M?j4C7uP&q
z!RuHLlv9p8E;&PCP5=9Q$B#yKfEe?RAD>wPVqB|ylw%@r?Rfd=nu(39hkpH7H`jdA
z1cwOu`=+1W)%ZAGKmMIN_k<f`Vr`B6T5;oqh7JDb|HqrBIWi>9kE@TdPveq5WM^A<
z|M<7>KaFBv=xzP>la;@>iQj?a_BW%nx}DAS8_M|S$9>aHt3S`07+W(xu1T>)|M3LL
z)pP6=*R;Ps?aa~gVQ%aD+rb7vy77H<gTSG3wte!9P8|0y{-|T+P^@u(w3|zz<%4YN
z`>Y0mRX;gu%o$q(*1Ah{E*2Nysc~j>TCr`S+M_qDiY@sZ4jfmF4mqUcGaTCYqm7|O
zU|&f+(7@?@0!}|J0ga5ea^QIA%?>p5B?HhIvOr^(GJ{m1DmrkE<Kb+U1oxH?zHA$W
zoqnjX-e6R$nasSVM_`{TLzoN4{Uio$pml)_q5_AuTO61wcqp9ZK^MnEZMFi{mJfIB
zx7E)7pI`b%{=lps^~>tnVpdM93X@Q1DXkWj;+Ag^*!I>p!=#46>Bctkg&#jKawOiq
z<t&iJ7NC%u&3kZ#pabL9wYn@z)fiZ>eT&?yb3p50XnlON)Pq-yWfmb**>_}3h_wsL
zVl3F|U|qZHCfft8gJr+NmWv*^$^7oe)FkVM&1`qS2Dy4SY-YXp(=FXUx?wZR{l9+6
z*$p=tVpgyk@G{jfENg7wKVTy9fpG>Kiygz|1qav@q$GYY_%t)iH)J+EU^d`Y1S(Q&
q0V-+%Dryq|DiSyZROIyIoqYc7>axpI0w&8b0D-5gpUXO@geCx#VpBr^
delta 1880
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
S<4oiL0000<MNUMnLSTYD`FExO
diff --git a/res/skins/Shade/btn_lib_sort_down_dark.png b/res/skins/Shade/btn_lib_sort_down_dark.png
index d11236c29506fef4e23379e91a0e16223a134734..934ef7d21680e7e3da4f01d8bd6e0928fdb42766 100644
GIT binary patch
literal 846
zcmeAS@N?(olHy`uVBq!ia0vp^3xGJ8gAGW^Z00rxQfx`y?k)`fL2$v|<&%LToCO|{
z#S9EFZXnDkGR4^uD9B#o>Fdh=h*eg^fa_-YkthZRrrVw_jv*Dd-rn&IVpbG5TKHnE
zWkBCD^%EDrI7D{uo)R@{ePiW?_viIO*<RG`@0rQ6cJ0<prF&{+^d`^gdmbf`>HdDr
z;^%Gus?MC~TpxbzVzINrmxI@}U%%L^DDdmS>xrd3Hv~9pKjfaZa?9mtvHP(tMYcMD
zDY35Ryq*3xCzeBhe$1<^d(+9@^7EsumH(SwHW0%oUSmUpf&ISf=e(jq0?&?@pZ~M)
z2qRE!-df=-5rs4T?{8HZGP4Q%`ts-dE<<i6Ami8XUxvXy6u!Ltc>DOn%~OJ2z5ac=
zWMT1&s}ET3MQLu$v!8Hksz6P&02?p!{G2PdlAgtvE1ao*s=amF<&QFkzpM2Gp6&TG
zx9|CmJFLwDHP-i2;_e*PDxa_5)BL`D<BqS)CSo;<Km6qsXnAm(`~H3gM~;2AA7WWK
zoIdm(D;HMaIA|_(KNch!_~RWLhf|hZ<9o#hg(cSn-IBgAu`usj$KdFZYwLUD9(R*K
zO)Nvxgs3VBj<0MEFS^%rI|wxS^8pQ>%*>+r;|b6ZJ4+&k(pw(PW?7)@^ud?y0;l2+
zHP#mm0yUGF&-4h?bTgdk0FsPnT7V?e8K8JKbBv_ok4X$Mf<Tfn2B?0X{MM~M|A)2z
zXPzN^|4aCRsZyTjg_v0q@5Qn9vdS|!X55~=;Nk;j1&-WmK@+(e29|}nZyg1$@HjAS
zTx-hFCdKICux%@=W1uht=b3M-=7}Xtd$4K$dSBjxuMDzzt1dCen0id_pQ^*KPHe^H
z^jT&M;hfjrM$2k9Y-WG+W9lN=1Ch;Twjqg}1=|kH_5X5%X^v{ecjMk`3|AQ}0=OL{
zSw1iZurbvzOgYFP&yebHfZah-1SG@;5@G}jHGqVifI@8oKp{mIpb*DFgwXkZecSB%
VV~3h1<^fYagQu&X%Q~loCIGoqUoQXv
delta 1888
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
aiv9<@UoIiVRYl|g0000<MNUMnLSTYM3~P7*
diff --git a/res/skins/Shade/btn_lib_sort_down_summer.png b/res/skins/Shade/btn_lib_sort_down_summer.png
deleted file mode 100644
index 7b8602dceb8b690102f249d25c23aa01d4c3ffb0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1924
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
KMNUMnLSTZs{%el_
diff --git a/res/skins/Shade/btn_lib_sort_up.png b/res/skins/Shade/btn_lib_sort_up.png
index 037f350fdd37dc1b718585afee3a07c8bdfca655..ae53038219a09f36f90bcd9c294ecd1879683c27 100644
GIT binary patch
literal 750
zcmeAS@N?(olHy`uVBq!ia0vp^3xGJ8gAGW^Z00rxQfx`y?k)`fL2$v|<&%LToCO|{
z#S9EFZXnDkGR4^uD9B#o>Fdh=h*egU&6=UyUWtK$soK-UF{I+w+q;fIw;e=S0#=`Y
z@Ot9mgC8eZYjB%sa&ervq5E=wWai?T^Zu<5c{+7^X{`RWZC{^X-xQ}e{q)z$*ex4#
zU0Jt3tp1(D_#>c3fGOfQyJABrR>lr#3!pqZGf-Xw#9#t4BtQ&CAcI4Ik9`L_!(~A>
zyGRC;4;wj{=jSj;eTZmj^bcd;Ezvo2K;625%|a~kL9sXkZ;s9(i7C4oGaQoNOEedT
zGw`OonVT%|j!&T`*}CJAB8$MjjdNWt3NUfpztOiSf`hRoKPNr#$+yzlxaqe4T@MQi
zu<d*M<6iZ(hn@^_tnw}DEEOg-0`oW?1b%d^U}|tb&i=5GaUM{Dou$I8MnI0^K_pOu
zp&=b8(Z}d_ko_Saqu*g5o5AlWkj>zCoIO!cp+?{u!y)!WUg8<g^|niK)CiaXJ<Tzj
zgIT`Cx22K)klLXG?1{pO51Kc08hmiP;Ue)vAxDV^kFur@FR$MD^!p{#{gc=A><wP4
z?{9keS+(X$*CB;9On0IUempCwu8o}jMpL4u*lORtJ<m?WH61ix{<{ABc{vc{^Y-V<
zWO?>ka@@DpKb!F3tmBW1mYJ;0`Fw}YfAd!cY7+RDf8WLm#HdT%Z({^zl+L%&0yCcf
zwNU~yzVE&Bo8iYZg*!&C?-+wb^5&Ml69t)@KeP0mAeb??v<_^}zawk@GhK|W@E6ZY
Rwg9F~22WQ%mvv4FO#l+G9x(s_
delta 1814
zcmV+x2kH3k1*Hy<B!2{RLP=Bz2nYy#2xN!=000SaNLh0L09-}@09-}^6qG|j0000P
zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$WqDe$SRCt{2-1l-5Nf5{J
zpL}=oG(5pQ2VjGV9upkMTuy*(u*u0)CWt#O=fFeUJKX@*{ePiuv&fdTVRolyw!c-b
zqAcxB@9d{6%9h>f^?K0C<&6Cb0F3Ki4n0e(y&HOfSR;Iw=--O4WD}tWh_Ng_>Joo7
z)QY753+9ad5^v+<F41FJffQhY2-v8X+RKWtSPC#_Iq-3cus{khM+NY4iZEvia7@nF
zFHj60cbSgWMt`ILM?`?GR5-;IML0SII3y4FI7K)j1-L`b*w5hyA9sb$sSTt62O=m-
zHJo}$5pGWbW~vb%rw9j9fRr=#Gt`TZTcWizC_n&P_?8=7a#<1fYdydK_&7y~mIDlk
zk83@`)&g|Keu}X8xMiB9m9-Ke-SCyrb7Wd+E5g<R6n}`1YbC-~0d&TG0-5-@6`HX%
zwFV&F*sG!E$kEj{A#4S}i12Z(L6|(i2=Q^PK$tW@XY9v_6CZb#t|8fy1xPpUTIe}E
zbS-6sNdim=AD1k`<N!KjKSEmgxNCH6NtF~px<RX<=cuvO)DR{Eum$+Iq!1<nutoT|
zWDrIV(0>{GA=-tHTcvA{x~Kut4Ok03N5Ix%M;I+Y#kW<|2%`k(jQs$LFWVaJNpwXA
zkT&{y=s5&-Jw}940aScriw<El0EOan^dYIJ5Jmye8G8{j@$I1xi3l%-9wJZT0n$d^
z2tCI@F9GZ^uKU8c?hEu0z6?CmU^ikwC>o$(e1E$M9sq#;y&H<KaAE;EV=q7^zCBrd
zoba!N7eWs)ERg_d!)}J2V<5)&&#))ZV-gYGl!{Osz*zBdim+Is01C#pHxE9Jp1T){
zaBN}#I%Cg6F228u9!SSXMR-2+5S$2rv>~@b&oNMGe4Jo}x1=Bp4p1<@$tw6bI>#gw
z;eU<=1?Y@D2f6tE@^wNwmsEu3LJklNAYJ(FQ0ouLJ3dY@!rLJc1_3A--&7s=I6C(f
z6ya8l0~Cty75e!8ta~9^V~W<4R1k!X0(8cng-m>tP2l5btx3p4c(%y}8v{recBiTJ
za@IILPB6kdO(JXrpkREByzCB3@XK*y2!Cq_=!`uBx%mDFJqXPp72%n>7pWB>UBKNs
z*C>$~e4Jo}ck4!28$iMM_DRCW(M<c$GK94N6prur(1Q$%W@{Bf?*N^#r=j>tCmi8v
z-zW77kOsWx^PC=f1z>*+_&Az%Kjb02=Nq9nfWq<p7J87P(agys^a9WsdkTurdw;?a
zp7L>`$^dDQ`yOWT*((6kG2`Rt8m1u+;e8(nD*+Ua@7K_S_=>J2Nra^V3dQ#tiQ(fi
z2w#VuWuQt3O96DoE<*7&o^XVVWezM1kQRDSX0aM$e7}Sqr0(b%B_e!K24Nw9icdx<
zA<PX>FuntA!pG4yA3)>?a{+Y5E`LBSzMn%65-PfOsR$SHJaH^QI?=<*Bl)fM_&C7`
zALc<g5};sw2NmC&XfF;TLWDyBI%DS{7vE2z2ay)-iByF1!yeobARVw?+eqb7d}9)f
zaD5oUZ2$%1JEZu=M|*S#ksy2vpx~F?L&kM~3_VCJ(OyYJxb5Y53!pQ04u5@oou;Q6
zk>V?vP=p=y5zg@^CV(w`>yU@<u;MEp?cHI>L%7ZeJO8~mBN^Whp$ADJXY4e9=K$Ub
zJxit@fQ1PFyC4hSCKR97XfF?=zqeBA0N6DFU=hGZ;9)q$S5pEJZU9)EFs|DJFpuyE
z8Q=GT=SVi%TL}m^0L&ZL?SD-GKnCHXKm#ehh7y4A5eOfU`8EuFVh+tC+yrn$@iiCi
z^$|3W@DYGH#s>_1BRT*=#`j%A>uD72`4KdSa2q~ghabgd5I(MXAjKEB1`$5S4)}l}
zZ$_Xeo<w~JHvt?~eBq;ea1`|+d<@{^PWXTkZ^z0YeByZ^#`mq~^M7h3qkB;Y!Y3Gk
z4;b@?R66hk{2^3)LaPDc696Yh;RABKCEp{$O#m~BPi}N?W>6hrE_^`FUrNd#d|GlK
z#`nDB@mfRCJ*tB6DRSZi3jA6oo$xq{BUF5mRRQ5s0LSy<0}B3PdI^M^0IcGRFS=(I
z`4JYz2bB2J92tb&F@H~GeBTsZLz5BRyF3WHD1i?s`NxT9p<@`1Q1K;F4uo9*$I9RX
zD*So248msv4{ZXNReb40_i`575k5l&d_cuNP)Q5V;tfK^_jQ%?YVx9cnnm~w{d-*+
z9{_ZEy-LRe0GzQM^nc{?ui{HPXY5e`@1x}Z`3CzRTC1_;+z$xcw*UYD07*qoM6N<$
Ef-)r?pa1{>
diff --git a/res/skins/Shade/btn_lib_sort_up_dark.png b/res/skins/Shade/btn_lib_sort_up_dark.png
index 10339ffebd09553fc0ef27e9fd75c011d947c661..a9830218c30f29eceab77d71b2882724f21e9368 100644
GIT binary patch
literal 740
zcmeAS@N?(olHy`uVBq!ia0vp^3xGJ8gAGW^Z00rxQfx`y?k)`fL2$v|<&%LToCO|{
z#S9EFZXnDkGR4^uD9B#o>Fdh=h*eg^K<@Bb0d)ojrb15_$B>F!Z|^!5T@Dan3D~{8
zV1W#;--E>m8~2!NuUZk(;L>+De%AN!TORwDKVSRy^V>3O%iHI^&yUYve)(ld<<5Cq
zH@<aY{r<4}?;D06AvFR_5y#mT8%nV<cJRn>Fs^BC6gXfd0%S0Q7(5`61|Wllqn$a1
z@jyvSqrVt~ZjH{N1M1QZVm4xl4<?H`aLaZZd^pLsfVIz6;>Q`L1+BfV65U2Xd6TkZ
z5j~NNTPAEYKCX0zPoXB+y5o@|i@?5(b6qY9Fmc?!(YGjqgRvz)Cq3}Vw_>1s!~b=+
z*(&hV-2S-t>zc#O40pKgIQTgV@_#7U2prh^sQCi}!}mV^L$b^^Ty`Ag93L`%DBKY|
zu=r7P0XsuKP@<L5?;!ibCWhq?n+p^hf<HR$U^wvdhk_1M3;!W0haU=S7>Q?`DO%rn
zfIU$-@j>&3PJ<7QH(VrsDC8*d)Ciafve|LW=3tg@@oj13KcsdDud?&^>uMU`KRCYr
z$>HUvZGpb^TOO$^QB%BY@1B_Rk(xl3)xWvQt67@!{jS&Fn=jgQ(0uvl>))5j^6azZ
zxW7yPY{G}Ljz6|nU*clBFVph>SDn<s2eX?$)Zah5x%r?u`@`ye)6?0S^Z5>auTwt{
zRwG|&f1U%RSiV-je;)(TnC)+@`guSi(dBd9SwV`c%jUWRtpqa4=bq;SNzLE*IzIDi
WdF0Y9FWG_Vk-^i|&t;ucLK6UL1uZE6
delta 1810
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
Ai2wiq
diff --git a/res/skins/Shade/btn_lib_sort_up_summer.png b/res/skins/Shade/btn_lib_sort_up_summer.png
deleted file mode 100644
index 5d47483d470bc6576e91001fa655e0050169b2b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1835
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
Z{{x8+v0WkVG)Djc002ovPDHLkV1n|kD*ylh
diff --git a/res/skins/Shade/summer_sunset.qss b/res/skins/Shade/summer_sunset.qss
index 40a146e8e5..42f94c0700 100644
--- a/res/skins/Shade/summer_sunset.qss
+++ b/res/skins/Shade/summer_sunset.qss
@@ -30,10 +30,10 @@ QHeaderView::down-arrow {
background-color: rgba(153,138,60,160);
}
QHeaderView::up-arrow {
- image: url(skin:/btn_lib_sort_up_summer.png)
+ image: url(skin:/btn_lib_sort_up.png)
}
QHeaderView::down-arrow {
- image: url(skin:/btn_lib_sort_down_summer.png)
+ image: url(skin:/btn_lib_sort_down.png)
}
/* Scroll bars */
From df4587bf06526327921f29dd9da8211ee8b75617 Mon Sep 17 00:00:00 2001
From: Stefan <stifisax@gmx.ch>
Date: Wed, 30 May 2018 06:48:50 +0200
Subject: [PATCH 36/45] smal fix
---
res/skins/Shade/style.qss | 3 +++
1 file changed, 3 insertions(+)
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 2a06b5f781..1011ad5644 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -281,6 +281,9 @@ QHeaderView {
font-size: 10pt;
font-weight: bold;
color: #0f0f0f;
+ border-right: 1px solid #0f0f0f;
+ background-color: #8D98A3;
+ border-radius: 0px;
}
/* Library header 'buttons' */
QHeaderView::section {
From 8925d846846d1698e5db09096536700ec9dcaf8e Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 31 May 2018 10:49:37 +0200
Subject: [PATCH 37/45] Shade: unify appearance of selected tree & table items
---
res/skins/Shade/style.qss | 22 ++++++++-------------
.../Shade/style/style_branch_closed_selected.png | Bin 0 -> 240 bytes
.../Shade/style/style_branch_open_selected.png | Bin 0 -> 236 bytes
3 files changed, 8 insertions(+), 14 deletions(-)
create mode 100644 res/skins/Shade/style/style_branch_closed_selected.png
create mode 100644 res/skins/Shade/style/style_branch_open_selected.png
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 1011ad5644..ee665d1f6e 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -106,7 +106,6 @@ QTreeView {
QTreeView {
min-height: 90px;
min-width: 90px;
- border-width: 1px 1px 1px 0px;
border-style: solid;
border-color: #585858;
show-decoration-selected: 0;
@@ -129,8 +128,8 @@ QTreeView::branch:closed:has-children:has-siblings {
}
QTreeView::branch:has-children:!has-siblings:closed:selected,
QTreeView::branch:closed:has-children:has-siblings:selected {
- image: url(skin:/style/style_branch_closed.png);
- background-color: #333;
+ image: url(skin:/style/style_branch_closed_selected.png);
+ background-color: #666;
}
/* Open branch of tree */
@@ -141,8 +140,8 @@ QTreeView::branch:open:has-children:has-siblings {
QTreeView::branch:open:has-children:!has-siblings:selected,
QTreeView::branch:open:has-children:has-siblings:selected {
border-image: none;
- image: url(skin:/style/style_branch_open.png);
- background-color: #333;
+ image: url(skin:/style/style_branch_open_selected.png);
+ background-color: #666;
}
/* space left of selected child item */
QTreeView::branch:!has-children:!has-siblings:closed:selected,
@@ -153,11 +152,12 @@ QTreeView::branch:open:has-children:has-siblings {
background-color: #0f0f0f;
}
-QTreeView::item:selected {
+QTreeView::item:selected,
+QTableView::item:selected {
border-image: none;
background-image: none;
- background-color: #333;
- color: #d2d2d2;
+ color: #fff;
+ background-color: #666;
}
QTreeView::item:!selected {
@@ -245,17 +245,11 @@ QTreeView::item:!selected {
background: transparent url(skin:/style/style_checkbox_unchecked.png) no-repeat center center;
color: #cfcfcf;
}
- /* selected table row */
- QTableView::item:selected {
- color: #fff;
- background-color: #666;
- }
/* library search text box */
WSearchLineEdit {
padding: 2px;
border: 1px solid #656565;
- border-left: 0px;
font-size: 10pt;
font-family: "Open Sans";
background: #0f0f0f;
diff --git a/res/skins/Shade/style/style_branch_closed_selected.png b/res/skins/Shade/style/style_branch_closed_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa927a6db708830a8fdada1da8df4ea7901127a6
GIT binary patch
literal 240
zcmeAS@N?(olHy`uVBq!ia0vp^96-#;!3HGxgLCzO6kC$Fy9>jA5L~c#`DBoEfk$L9
zP{(x;W^~e+T>%tiFY)wsWq-sf&!H#c!4pym6sq-faSV~TTzWy5?@)k%>%;ZFqJ6$S
zM>ossBnnmtxtJdiE2s!-s4QL6I7Qx3ZkfKKZ}pjuV&j=RL%m-1GJg}iC>^+TiqX6u
z3GKlyPlQ&q?>r!+n-_b1?Q!XUCo3K{y$xCL;ppOd0#BD2hn@BKwj)_sFkGYYrv5BP
dndenM7>{x5Y`$E53Fr<622WQ%mvv4FO#r#dR3`uc
literal 0
HcmV?d00001
diff --git a/res/skins/Shade/style/style_branch_open_selected.png b/res/skins/Shade/style/style_branch_open_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..93cf3385dcd3c17751a70ba6b54f2d741e093894
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRM!3HF?&tBaMq}Y<Y-CY>|gW!U_%O``B6nI1y
z19e;nVMZs7*%d%R_7YEDSN2D&@*H~7H#U2|018!lx;TbNTrNGck@t{;0PDqcbru&9
zhh1|mUEdvX-NEzxOM&7d2Bs1-mJ=%6LL6$5XRl|>4m!mv{eS0n34{NfX*|A~soln9
z_KUc`<+_A?SrPB(DlfS8Y~m5l>|e9&oVW!yE;>BvVv}C^dVi%y9i03=FYOjRX~@23
a?*H$%vP}HHKv$q67(8A5T-G@yGywom{!qRE
literal 0
HcmV?d00001
From b08d3842f25331f2ba64bd47624d86b1bfe9708b Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 31 May 2018 10:53:08 +0200
Subject: [PATCH 38/45] Shade: unify appearance of selected tree & table items
Conflicts:
res/skins/Shade/style.qss
---
res/skins/Shade/style.qss | 1 -
1 file changed, 1 deletion(-)
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index ee665d1f6e..6c27fd6a52 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -275,7 +275,6 @@ QHeaderView {
font-size: 10pt;
font-weight: bold;
color: #0f0f0f;
- border-right: 1px solid #0f0f0f;
background-color: #8D98A3;
border-radius: 0px;
}
From bc32f672e8ea4d8d5ca33b32eee84753429fa0f0 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 31 May 2018 10:56:46 +0200
Subject: [PATCH 39/45] Shade: style preview deck like a sampler
---
res/skins/Shade/btn_clipping_previewdeck.png | Bin 2515 -> 137 bytes
res/skins/Shade/btn_clipping_previewdeck_over.png | Bin 2503 -> 615 bytes
res/skins/Shade/btn_play_previewdeck_over.png | Bin 0 -> 212 bytes
res/skins/Shade/btn_play_previewdeck_overdown.png | Bin 0 -> 215 bytes
res/skins/Shade/btn_volume_display_previewdeck.png | Bin 2485 -> 142 bytes
.../Shade/btn_volume_display_previewdeck_over.png | Bin 2506 -> 156 bytes
res/skins/Shade/dark.qss | 1 +
res/skins/Shade/knob_volume_previewdeck.png | Bin 1292 -> 246 bytes
res/skins/Shade/preview_deck.xml | 277 +++++++++++++++++++++
res/skins/Shade/skin.xml | 202 +--------------
res/skins/Shade/summer_sunset.qss | 1 +
11 files changed, 281 insertions(+), 200 deletions(-)
create mode 100644 res/skins/Shade/btn_play_previewdeck_over.png
create mode 100644 res/skins/Shade/btn_play_previewdeck_overdown.png
create mode 100644 res/skins/Shade/preview_deck.xml
diff --git a/res/skins/Shade/btn_clipping_previewdeck.png b/res/skins/Shade/btn_clipping_previewdeck.png
index 2ee6521b2254a4ff2f7564091a1a9fe6206d0ee1..8f51f5736e49ce27ad0656ceb82ea9b8b8fdda6c 100644
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c!3HD^Kbl$tDYhhUcNd2LAh=-f^2tCE&H|6f
zVg?3oVGw3ym^DWND9B#o>Fdh=h*geXStYF_y8<XA=IP=X!f`!$%9QY*=Ns5&NNi|m
b6lGy}@{ln*u2Z%TsDi=M)z4*}Q$iB};8h}Y
literal 2515
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
G2~7Z?2+`*N
diff --git a/res/skins/Shade/btn_clipping_previewdeck_over.png b/res/skins/Shade/btn_clipping_previewdeck_over.png
index 7d5737e5e281161ea390545050b513b7ebb5f9b7..4222cb6f35155dc2e18f8a2febda3f3a35643a7f 100644
GIT binary patch
literal 615
zcmV-t0+{`YP)<h;3K|Lk000e1NJLTq000F5000OG1^@s6G4VA!0005|dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+ND%!(%Ucy{m&_S1QxBwaT05$H|X*Ekfp?SmM@)>
zF_IB}zypQWKffFOaw#!Th`FSi5<@}_RTpduZ{qt49>sIpOeOIY;o5Z<;&?Y74knoB
z$v#$DPC#LPa5)}KyOtA>Zi{&U>?I7KIyPc3zlfY_$s8W<%Lvd$i7CgBN{*CnNtMlX
zHN}&+XvQX1Y{43#&7;7Qw>@+;2kKymo}HtSk@@FpV5*8AOnWcD2J<_659J3S%dzNO
z3hQ=of1k~;lfCdksHbN*ww+UY-I-5~p--LZW$lO#VeIs1$E+#s(`)TkT3fqESVF>p
zrZHi&co}{e(_p>ufFCrWq}X303QAoUUXfn`wV8_uUoq7SuM$KgLK{{vElG+rxnRw*
z5|kS+8s#c0au(g%7iH0;6_09_295c+=OR69>fs8~ti<THDo_zY|3m0o$JVZXA*8px
zbas%JdRr7$0Y|>T4PB79qxQX|ySF^N>5X&b3_kpC<l3jq<6_?C)vo}F(b|9vvYYI;
zG62hnE(oIe0Wor-FCjcDvBvTY@v*cWguZ~_=Q`+zLJ}bKGsF|nnG0*$vp7=TulTqz
zt@&452om`xx(8RnXRhdL2z>#uE0n%%`h>Xozu{khY-vz0)Xwt&000DYLP=Bz2nYy#
z2xN!=000+BL_t&tTVwps!0?{|4KSe#Ffa_XAOKIS0uKL$o}2&x002ovPDHLkV1l+<
B5mEpE
literal 2503
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
diff --git a/res/skins/Shade/btn_play_previewdeck_over.png b/res/skins/Shade/btn_play_previewdeck_over.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d3fff26136e0ed22b3a4c9960c10a4c47b42779
GIT binary patch
literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VTavfC3&Vd9T(EcfWS|IVfk$L9
z0|U1Z2s2)~TlWVj$X?><>&pI!RZf6GjJ;>&6`)X}r;B5V#p&cJQ^J3qcW^y$=)i#k
zAD+x)4&|9V(dxi~BMzwsExa-3e@t08^`q5c{<i%UM>n`}nF*Y&;5xVN-}=tr9EsM4
zD;lpD2TW<4t6|vm^26=@4vUVsDYyP&GYZ-bbalx&Db|G_SGWN!WAJqKb6Mw<&;$Up
Cu1p^Q
literal 0
HcmV?d00001
diff --git a/res/skins/Shade/btn_play_previewdeck_overdown.png b/res/skins/Shade/btn_play_previewdeck_overdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..7494a550ad29796b3c948872f3ad2f3458235ddf
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VTavfC3&Vd9T(EcfWS|IVfk$L9
z0|U1Z2s2)~TlWVj$X?><>&pI!RgT|UcK5VuO`uSUr;B5V#p&cJQ^J3qcW^y$=)i#k
z8{Td;4CVPOWPAF+5r<TR7T!DG|BD`;Q~zC}&hXD+?Kab(4UMbnrz`Z-^YCc;cv&26
z3zX=S@~~xQmAu&@q&$Pq-(a_Zs+pAL74r!bZ-p{2@T`^ne}&&c185(Er>mdKI;Vst
E0E|OMVgLXD
literal 0
HcmV?d00001
diff --git a/res/skins/Shade/btn_volume_display_previewdeck.png b/res/skins/Shade/btn_volume_display_previewdeck.png
index 74b150f880b7d2a55685d9b4d7849478b9918cfb..da348f787173998a9ab0e889f6c83c965f97436b 100644
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^tU#>E!3HG%GCp1bq}Y<Y-CY>|gW!U_%O?XxI14-?
ziy0WWg+Z8+Vb&Z8pdfpRr>`sfBUU+nW&Mv)n?3-Aq&;06Lp07OPni<_^Lzu_42ca5
gfd_%maS{uo_+7@e2X<`k0xDzhboFyt=akR{0CE*57XSbN
literal 2485
zcmeAS@N?(olHy`uVBq!ia0vp^oItG0!3HF2);Jn4FtDg(Iy(n=Iy)-_6y>L7=A<$(
zSO~U;-p{`sB4XE>AGAcwULnH0z3b@u(BSBu(o$=Wv3X8j`qoQq>B}2hDo?D;J6B4x
z-+sAmm49`kIolsbhnvj&9yW@+Y)REOza7}(8QiY5%G0Cz#Swl*wYRLH4|kU(sRtj4
z`TFa$<$cTN*3aW^yV%BOZk;6=+A(eQy1D07rcPciHf5e~*QL!@yqT}8e(9$>@$^|C
zy@R6P&%J&q+r@GE?ZkKg{Jtsguj;;Yu~W(aK%S^<t>h1$z%y5}w|R@~XaD^pb35Ce
z&oUn_o3SvhW}03*N2ucBadlfiMSIS^3tF#5*K+J(v)OYaO@Di0JhQ}!$qz&Gq<1N$
zP29Y8Qex5hhx+}6+YSHo>&-6x@+P)9;`f}TJCk?tciz+f7P7C?{`%H0G9SD*#IN7!
znOM*IqyN{X8m0>Qz%MH&)t20Q?j9e%R^%SrJ=W@r1<Sd8e`l2%R?A3iy!ci1^^6nB
z7S~JDg*Gn{Z+IW}W6O=?7ZX>U2+n+v_~4*d?W&pavkJqWwcI_uIcnw^CguK={maij
zX<%=#-?Dbk3f8litjvuUiGA`8&(2%7((%^1S&@O<e~o5Z$Mv7k%-ucp&=mR8e7njP
zN}d+;I(G4;TK(Fzs&v6yH&}Pi6TdZK{@qJ&O4uYSZ`kj#(tpM#b367*P|~)=2i#w{
zxG4LH=_XxW>1DknV4l&GBYWM<Y*dX-w6q>RooJ}!e@Q6kZlz`a<Krzoo5c6(E(%;~
zeSCev{*xOc?1OJI{*h1G{Kh~!U3kd`^Bc3@aCjfII>^V$Rg`Nbs&%<m<Ll=={-q&e
zR(=7W{y5ZXbOfHe`CjVR+5UfRvo?5Ze^K_oU}zHkR#<^uIHT13lHKy`Z2LESHmBHj
z|2X${Uv_rMpTf_*ce`_sn{CKDw(Zc58|ydf{>cquvQDV#nzr!Nhq6PQ70R-<F^rd0
zd0*#0h`ews=+?%?OJDtLyr8Uh(EfzonM*q#URd>S(Z7{>E8<s(U%79c)go!VOr=(<
zR{O6;t$MBgU!Sg$$X!Z*Rbr>^o2bWXx%>Uz`KmXn*T*Lc-|dRcxSBoRR6W@5RP___
zr&Ipy`LoGJdV|Q$c)7{TpX~kchV$E5p1-ntB}%w9XZdce*8RvLVZyJ<Hka-Cv5=!J
zt4qWpZ_l5+EXeG{u^V5MmzTxNc{;7D!fIZZx<}{xZvP|49~m=kpSR~n+z+)4%b36Z
zn=EW#W%VFe$4B*q@uRs`g<-B=xJqVUI2&8XcAsyN=jyU+W~W5MZ?0dpUX!!t)DENA
ztM2WhXH7)UKh-cR-?8^l_hOZO%}RYQ9Pj<!=UR4`C-+^nOZ)#r)~~}dqE`slz7_bo
zU+Pxd2fvzU#*4byzwX-m==oxgCu|dgtv1~ME&I~@(cO~m7b_aRhn`n=v6eTN`oGRx
z$~s=@zu3jp&-RfFg%vr{+QOg$q`)Jxn1O*?2!t6g-L3lrEJU7XhD4M^`1)8S=jZAr
zrsOB3>Q&?x097+E*i={nnYpPYi3%0DIeEoa6}C!X6;?ntNLXJ<0j#7X+g2&UH$cHT
zzbI9~RL@Y)NXd>%K|#T$C?(A*$i)q+9mum)$|xx*u+rBrFE7_CH`dE9O4m2Ew6xSW
zFw!?N(gmu}Ew0QfNvzP#D^`XW0yD=YwK%ybv!En1KTiQ<Zemh?X^E|p638MrfVi_H
zGYw%=UNO{LKo9DJWb_U74D{h<1GU<KM6H5Si}Q0zLB@yXWtP|(+JF_K3nOfU=yJ}_
zEhtJYE(U6|GlgnF7DHDbfw0ET*c9k-Qv;|jWEpf_{zaLoz)%4>4(>2yF?98jIBh|e
zf$Fl+2L&fm@PgwG6fS7ugn~V_A`?fjgJdv+9VBWMkXezM6XBAXo0<m>L`xfetl~&s
z1j{?;=j0a!7bGU9f<gpc2wgSUmPmvxCcwBtSc4=%?J!A6h9~)g(xM!2f=@}-Pt8dM
zdbp$*7$}CQX)z_)s<<>MD>b<U77dWZ4UP<_#B_ZmVH<r+)l`d3VAh8_9VHJ{Bo<)C
zB~Z1MZ+=Q<TBS>3NvfTZfuWHu2$_Z$npqhdS(zEx=%cAYiX)JWb5UwyNq$jCetwP}
zIJ$B{Tm>UwabgV7i>v}~JVC+$Sn$|!0d>L(F*~l+>!0rgmTNAaE{-7<g2`8|UHe!6
z^pvPupy$m0JQ)wZepc^s_*w6h@kk=ZO+jG=$CB)jix~nv%bG6s7(|IRI3?_u&icQR
d;f=oy3&Zs(yw_ZwU8n{Xl%B4BF6*2UngCHF!)E{h
diff --git a/res/skins/Shade/btn_volume_display_previewdeck_over.png b/res/skins/Shade/btn_volume_display_previewdeck_over.png
index 48fe01cb5b3f7e19975a358828a12f7bb79d9a3e..1a9a555ba9bd183a6ec814c4c97c5706c3e7161a 100644
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^tU#>E!3HG%GCp1bq}Y<Y-CY>|gW!U_%O?XxI14-?
ziy0WWg+Z8+Vb&Z8pdfpRr>`sfBUU+nWur+k_cVb*nw~C>AsXkC|NNi-(4JW;A?W~9
whT@4!--BeFCro_U^YMUXW=KKEgs3Kl$@AFmIPZ9_57flq>FVdQ&MBb@0N|G{jsO4v
literal 2506
zcmeAS@N?(olHy`uVBq!ia0vp^oItG0!3HF2);Jn4FtDg(Iy(n=Iy)-_6y>L7=A<$(
zSO~U;-p{`sB4XE>AGAcwULnH0z3b@u(BSBu(o$=Wv3X8j`qoQq>B}2hDo?D;J6B4x
z-+sAmm49`kIolsbhnvj&9yW@+Y)REOza7}(8QiY5%G0Cz#Swl*wYRLH4|kU(sRtj4
z`TFa$<$cTN*3aW^yV%BOZk;6=+A(eQy1D07rcPciHf5e~*QL!@yqT}8e(9$>@$^|C
zy@R6P&%J&q+r@GE?ZkKg{Jtsguj;;Yu~W(aK%S^<t>h1$z%y5}w|R@~XaD^pb35Ce
z&oUn_o3SvhW}03*N2ucBadlfiMSIS^3tF#5*K+J(v)OYaO@Di0JhQ}!$qz&Gq<1N$
zP29Y8Qex5hhx+}6+YSHo>&-6x@+P)9;`f}TJCk?tciz+f7P7C?{`%H0G9SD*#IN7!
znOM*IqyN{X8m0>Qz%MH&)t20Q?j9e%R^%SrJ=W@r1<Sd8e`l2%R?A3iy!ci1^^6nB
z7S~JDg*Gn{Z+IW}W6O=?7ZX>U2+n+v_~4*d?W&pavkJqWwcI_uIcnw^CguK={maij
zX<%=#-?Dbk3f8litjvuUiGA`8&(2%7((%^1S&@O<e~o5Z$Mv7k%-ucp&=mR8e7njP
zN}d+;I(G4;TK(Fzs&v6yH&}Pi6TdZK{@qJ&O4uYSZ`kj#(tpM#b367*P|~)=2i#w{
zxG4LH=_XxW>1DknV4l&GBYWM<Y*dX-w6q>RooJ}!e@Q6kZlz`a<Krzoo5c6(E(%;~
zeSCev{*xOc?1OJI{*h1G{Kh~!U3kd`^Bc3@aCjfII>^V$Rg`Nbs&%<m<Ll=={-q&e
zR(=7W{y5ZXbOfHe`CjVR+5UfRvo?5Ze^K_oU}zHkR#<^uIHT13lHKy`Z2LESHmBHj
z|2X${Uv_rMpTf_*ce`_sn{CKDw(Zc58|ydf{>cquvQDV#nzr!Nhq6PQ70R-<F^rd0
zd0*#0h`ews=+?%?OJDtLyr8Uh(EfzonM*q#URd>S(Z7{>E8<s(U%79c)go!VOr=(<
zR{O6;t$MBgU!Sg$$X!Z*Rbr>^o2bWXx%>Uz`KmXn*T*Lc-|dRcxSBoRR6W@5RP___
zr&Ipy`LoGJdV|Q$c)7{TpX~kchV$E5p1-ntB}%w9XZdce*8RvLVZyJ<Hka-Cv5=!J
zt4qWpZ_l5+EXeG{u^V5MmzTxNc{;7D!fIZZx<}{xZvP|49~m=kpSR~n+z+)4%b36Z
zn=EW#W%VFe$4B*q@uRs`g<-B=xJqVUI2&8XcAsyN=jyU+W~W5MZ?0dpUX!!t)DENA
ztM2WhXH7)UKh-cR-?8^l_hOZO%}RYQ9Pj<!=UR4`C-+^nOZ)#r)~~}dqE`slz7_bo
zU+Pxd2fvzU#*4byzwX-m==oxgCu|dgtv1~ME&I~@(cO~m7b_aRhn`n=v6eTN`oGRx
z$~s=@zu3jp&-RfFg%vr{+QOg$q`)Jxn1O*?2!t6g-L3lrEJU7XhD4M^`1)8S=jZAr
zrsOB3>Q&?x097+E*i={nnYpPYi3%0DIeEoa6}C!X6;?ntNLXJ<0j#7X+g2&UH$cHT
zzbI9~RL@Y)NXd>%K|#T$C?(A*$i)q+9mum)$|xx*u+rBrFE7_CH`dE9O4m2Ew6xSW
zFw!?N(gmu}Ew0QfNvzP#D^`XW0yD=YwK%ybv!En1KTiQ<Zemh?X^E|p638MrfVi_H
zGYw%=UNO{LKo9DJWb_U74D{h<1GU<KM6H5Si}Q0zLB@yXWtP|(+JF_K3nOfU=yJ}_
zEhtJYE(U6|GlgnF7DHDbfw0ET*c9k-Qv;|jWEpf_{zaLoz)%4>4(>2yF?98jIBh|e
zf$Fl+2L&fm@PgwG6fS7ugn~V_A`?fjgJdv+9VBWMkXezM6XBAXo0<m>L`xfetl~&s
z1j{?;=j0a!7bGU9f<gpc2wgSUmPmvxCcwBtSc4=%?J!A6h9~)g(xM!2f=@}-Pt8dM
zdbp$*7$}CQX)z_)s<<>MD>b<U77dWZ4UP<_#B_ZmVH<r+)l`d3VAh8_9VHJ{Bo<)C
zB~Z1MZ+=Q<TBS>3NvfTZfuWHu2$_Z$npqhdSs4QZ98C>U9D!t<i&7Iy@{2<9^K<OL
z(UlA0Di{Ha6Jv;8WEFVh2@(dtg2#>vs1sI**>PpCtGxr3YmuHVjv*F;$rr9&`^V41
z^Z$P_vu4Sk`HtS+ujPfA84qx<u!uIEk+|0tk#I2N|0LmKEth*A38=+foKt<Mz*B;G
zSw=<s<rVMSD%~V{A6(>M6Z`g{i#2S^!v&0H?FuWGo}TLlDm^`2{an^LB{Ts5l_$zj
diff --git a/res/skins/Shade/dark.qss b/res/skins/Shade/dark.qss
index 889459e690..55d6173af4 100644
--- a/res/skins/Shade/dark.qss
+++ b/res/skins/Shade/dark.qss
@@ -26,6 +26,7 @@ WSearchLineEdit:focus {
QHeaderView {
color: #000;
+ background-color: #5C5B5D;
}
/* Library header 'buttons' */
QHeaderView::section {
diff --git a/res/skins/Shade/knob_volume_previewdeck.png b/res/skins/Shade/knob_volume_previewdeck.png
index d1ece1c71271229ddf4f1fd4cc9629f5c78b7bf4..b8e7238393a702ba69ee223a5d46fa4d0f9843b6 100644
GIT binary patch
delta 200
zcmV;(05|`P3ibhzBM<-vVoOIv0RI600RN!9r<0RW1Q>q@bV*G`2jT@D4=@L%09%*<
z004tYL_t&-(}mD64gpaVh2ifFAu<sw7&ai$o7y%cT7}Ttf=0_SY+>})Fbj~^P|_en
zUgDPLo^$fw8zd%{MUE{tS#xne?m{e!IcluX4UN<k2aJ%v^$^Qqh&^WLAv9atxS)?#
ziYLPaC)_OX_%-}x_*^ll>T_qY9%G5?tMMBs^@k_lE*cV`SfA(s0000<MNUMnLSTZe
CrBfpS
delta 1273
zcmV<V1P1%|0gMWeBYy-WX+uL$Nkc;*P;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~
zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH<T^KrsT&8|>9(p*dx19w`~g7O0}n_%Aq@s%
zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~<wJAdb1+eAHIX|<XeRfv|W
zuAR>$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y
zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC
zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw
ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~=
zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$<SjQ)%E~;K53Ls+nJ!aaQJp
z-OICDnalzsk7U26&E$XwfIqaYyr>1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr
zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g
zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs
z7riZ_QKdV_uW-M~u~<J-*#Z0?VzcZp8)p-wus7J7><CN2I>8PF3UX~a6)MwxDE0Ha
zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X
z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1
z4eM{<S<u>2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa
zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH>
zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+n<xB
zQZ~rO*z_Z(c3hn0mWp^fo{A?(iSLU~#DB-)GXl4sy!c-DCa|Uh_5PC+FgiNmZ7fVB
z$TQ-dI&oG-^a^yF(9K<b2Hy^%Nvn3&Hp&%O*{`avDG7YaxH4VUM~4;7G!@U~C^mPv
zy~2y5B))?pj_5(&`@ThX-3)E+TSSNd!aM6$Xj`ZgeeDqSzZ%+x@J@W@Gop(J^?$m(
z;^(7C<OY#bI<VjS9qCKr-E_Cnc!2j+&nHAXA2%BRt~VMxUn2h&(Pi^LSpac(Y#S>R
z00009a7bBm000fw000fw0YWI7cmMzZj!8s8R2Ug!{Qv(y13Fl|criB<6H^UPu8;*y
zl5xqBC9y!s2|!79Mn*<<Mwkge334l-z-*ufc_8M7X=DK!CkNCq2`JzS#GF9P2$KZS
zEI`SNK$;h*n;BUG#%B8W@1H)9vju3?Hz1ASVuEgfD}Wja_65*7m@l}PV0J<2|1mK!
ji-6Y30u@aHTKf|K!52ECCS3G#00000NkvXXu0mjfFneD?
diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml
new file mode 100644
index 0000000000..3f6eebb94c
--- /dev/null
+++ b/res/skins/Shade/preview_deck.xml
@@ -0,0 +1,277 @@
+<Template>
+ <WidgetGroup>
+ <Size>i,72f</Size>
+ <Layout>vertical</Layout>
+ <Children>
+ <WidgetGroup>
+ <ObjectName>SamplerTopBorder</ObjectName>
+ <Size>0e,5f</Size>
+ <BackPath>style/style_bg_deck_border.png</BackPath>
+ <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+ </WidgetGroup>
+
+ <!-- Middle part: left border, text/overview, VU, volume, right border -->
+ <WidgetGroup>
+ <Size>0e,54f</Size>
+ <Layout>horizontal</Layout>
+ <Style>QGroupBox { border: 0px solid red;} QWidget { margin: 0; padding: 0; }</Style>
+ <Children>
+ <WidgetGroup>
+ <ObjectName>SamplerLeftBorder</ObjectName>
+ <Size>5f,0e</Size>
+ <BackPath>style/style_bg_deck_border.png</BackPath>
+ </WidgetGroup>
+
+ <WidgetGroup>
+ <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
+ <BackPath>style/style_bg_sampler_mid.png</BackPath>
+ <Layout>vertical</Layout>
+ <Children>
+
+ <WidgetGroup>
+ <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
+ <Layout>horizontal</Layout>
+ <Children>
+ <WidgetGroup>
+ <Size>0e,18f</Size>
+ <Style>QGroupBox {border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
+ <Children>
+ <Text>
+ <TooltipId>text</TooltipId>
+ <Style>QLabel { font: bold 12px/14px sans-serif;
+ font-family: "Open Sans";
+ background-color: transparent;
+ color: #191F24;
+ text-align: left;
+ padding-left: 1px;
+ padding-top: 2px;}
+ </Style>
+ <Group>[PreviewDeck1]</Group>
+ <SizePolicy>me,max</SizePolicy>
+ <Elide>right</Elide>
+ </Text>
+ </Children>
+ </WidgetGroup>
+ <WidgetGroup>
+ <Size>35f,18f</Size>
+ <Style>QGroupBox {border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
+ <Children>
+ <Number>
+ <TooltipId>visual_bpm</TooltipId>
+ <Style>QLabel { font: bold 9px sans-serif;
+ font-family: "Open Sans";
+ background-color: transparent;
+ color: #191F24;
+ padding-right: 0;
+ padding-top: 2px;}
+ </Style>
+ <Size>35f,18f</Size>
+ <Group>[PreviewDeck1]</Group>
+ <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
+ <Alignment>right</Alignment>
+ <Connection>
+ <ConfigKey>[PreviewDeck1],visual_bpm</ConfigKey>
+ </Connection>
+ </Number>
+ </Children>
+ </WidgetGroup>
+
+ <WidgetGroup>
+ <ObjectName>SamplerRightBorder</ObjectName>
+ <Size>1f,0e</Size>
+ <BackPath>style/style_bg_deck_border.png</BackPath>
+ </WidgetGroup>
+
+ <WidgetGroup>
+ <Size>20f,18f</Size>
+ <Style>QGroupBox {border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
+ <Children>
+ <PushButton>
+ <TooltipId>eject</TooltipId>
+ <Style></Style>
+ <NumberStates>1</NumberStates>
+ <State>
+ <Number>0</Number>
+ <Pressed>btn_eject1_over.png</Pressed>
+ <Unpressed>btn_eject1.png</Unpressed>
+ </State>
+ <Connection>
+ <ConfigKey>[PreviewDeck1],eject</ConfigKey>
+ <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+ <ButtonState>LeftButton</ButtonState>
+ <ConnectValueToWidget>false</ConnectValueToWidget>
+ </Connection>
+ </PushButton>
+ </Children>
+ </WidgetGroup>
+ </Children>
+ </WidgetGroup>
+
+ <WidgetGroup>
+ <Size>0e,1f</Size>
+ <BackPath>style/style_bg_deck_border.png</BackPath>
+ </WidgetGroup>
+
+ <WidgetGroup>
+ <ObjectName>SamplerMid</ObjectName>
+ <Size>0e,35f</Size>
+ <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+ <Layout>horizontal</Layout>
+ <Children>
+
+ <WidgetGroup>
+ <ObjectName>SamplerMid</ObjectName>
+ <Size>27f,35f</Size>
+ <BackPath>style/style_bg_sampler_mid.png</BackPath>
+ <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+ <Children>
+ <PushButton>
+ <TooltipId>play_start</TooltipId>
+ <Style></Style>
+ <NumberStates>2</NumberStates>
+ <RightClickIsPushButton>true</RightClickIsPushButton>
+ <State>
+ <Number>0</Number>
+ <Pressed>btn_play_sampler_down.png</Pressed>
+ <Unpressed>btn_play_sampler.png</Unpressed>
+ </State>
+ <State>
+ <Number>1</Number>
+ <Pressed>btn_play_previewdeck_overdown.png</Pressed>
+ <Unpressed>btn_play_previewdeck_over.png</Unpressed>
+ </State>
+ <Pos>3,7</Pos>
+ <Connection>
+ <ConfigKey>[PreviewDeck1],play</ConfigKey>
+ <EmitOnDownPress>true</EmitOnDownPress>
+ <ButtonState>LeftButton</ButtonState>
+ </Connection>
+ <Connection>
+ <ConfigKey>[PreviewDeck1],start</ConfigKey>
+ <EmitOnDownPress>true</EmitOnDownPress>
+ <ButtonState>RightButton</ButtonState>
+ <ConnectValueToWidget>false</ConnectValueToWidget>
+ </Connection>
+ </PushButton>
+ </Children>
+ </WidgetGroup>
+
+ <WidgetGroup>
+ <ObjectName>SamplerMid</ObjectName>
+ <Size>0e,35f</Size>
+ <BackPath>style/style_bg_sampler_mid.png</BackPath>
+ <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+ <Layout>horizontal</Layout>
+ <Children>
+ <Overview>
+ <TooltipId>waveform_overview</TooltipId>
+ <Style></Style>
+ <Group>[PreviewDeck1]</Group>
+ <Pos>0,0</Pos>
+ <Size>0e,35f</Size>
+ <BgColor>#8D98A3</BgColor>
+ <PlayedOverlayColor>#60000000</PlayedOverlayColor>
+ <SignalHighColor></SignalHighColor>
+ <SignalMidColor></SignalMidColor>
+ <SignalLowColor></SignalLowColor>
+ <SignalColor>#191F24</SignalColor>
+ <PlayPosColor>#00FF00</PlayPosColor>
+ <DefaultMark>
+ <Align>top</Align>
+ <Color>#FD0564</Color>
+ <TextColor>#FFFFFF</TextColor>
+ <Text> %1 </Text>
+ </DefaultMark>
+ <Connection>
+ <ConfigKey>[PreviewDeck1],playposition</ConfigKey>
+ <EmitOnDownPress>false</EmitOnDownPress>
+ </Connection>
+ </Overview>
+ </Children>
+ </WidgetGroup>
+ </Children>
+ </WidgetGroup>
+ </Children>
+ </WidgetGroup>
+
+ <WidgetGroup>
+ <ObjectName>SamplerRightBorder</ObjectName>
+ <Size>1f,0e</Size>
+ <BackPath>style/style_bg_deck_border.png</BackPath>
+ </WidgetGroup>
+
+ <WidgetGroup>
+ <ObjectName>SamplerVUMeter</ObjectName>
+ <BackPath>style/style_bg_deck_pane.png</BackPath>
+ <Size>9f,54f</Size>
+ <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 2px; }</Style>
+ <Children>
+ <StatusLight>
+ <TooltipId>sampler_PeakIndicator</TooltipId>
+ <Style></Style>
+ <PathStatusLight>btn_clipping_previewdeck_over.png</PathStatusLight>
+ <PathBack>btn_clipping_previewdeck.png</PathBack>
+ <Pos>2,2</Pos>
+ <Size>5f,8f</Size>
+ <Connection>
+ <ConfigKey>[PreviewDeck1],PeakIndicator</ConfigKey>
+ </Connection>
+ </StatusLight>
+ <VuMeter>
+ <TooltipId>sampler_VuMeter</TooltipId>
+ <Style></Style>
+ <PathVu>btn_volume_display_previewdeck_over.png</PathVu>
+ <PathBack>btn_volume_display_previewdeck.png</PathBack>
+ <Pos>2,11</Pos>
+ <Size>5f,41f</Size>
+ <Horizontal>false</Horizontal>
+ <PeakHoldSize>5</PeakHoldSize>
+ <PeakHoldTime>500</PeakHoldTime>
+ <PeakFallTime>50</PeakFallTime>
+ <PeakFallStep>2</PeakFallStep>
+ <Connection>
+ <ConfigKey>[PreviewDeck1],VuMeter</ConfigKey>
+ </Connection>
+ </VuMeter>
+ </Children>
+ </WidgetGroup>
+
+ <WidgetGroup>
+ <BackPath>style/style_bg_deck_pane.png</BackPath>
+ <Size>10f,54f</Size>
+ <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; }</Style>
+ <Children>
+ <SliderComposed>
+ <TooltipId>pregain</TooltipId>
+ <Style></Style>
+ <Pos>0,1</Pos>
+ <Size>8f,52f</Size>
+ <Handle>knob_volume_previewdeck.png</Handle>
+ <Horizontal>false</Horizontal>
+ <Connection>
+ <ConfigKey>[PreviewDeck1],pregain</ConfigKey>
+ <EmitOnDownPress>false</EmitOnDownPress>
+ </Connection>
+ </SliderComposed>
+ </Children>
+ </WidgetGroup>
+
+ <WidgetGroup>
+ <ObjectName>SamplerRightBorder</ObjectName>
+ <Size>5f,0e</Size>
+ <BackPath>style/style_bg_deck_border.png</BackPath>
+ </WidgetGroup>
+ </Children>
+ </WidgetGroup>
+ <!-- /Middle part: left border, text/overview, VU, volume, right border -->
+
+ <WidgetGroup>
+ <ObjectName>SamplerBottomBorder</ObjectName>
+ <Size>0e,5f</Size>
+ <BackPath>style/style_bg_deck_border.png</BackPath>
+ <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+ </WidgetGroup>
+ </Children>
+ </WidgetGroup>
+</Template>
+
diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
index 2345b17a80..ab79a407c6 100644
--- a/res/skins/Shade/skin.xml
+++ b/res/skins/Shade/skin.xml
@@ -464,215 +464,17 @@
<Style>QGroupBox {}</Style>
<Layout>vertical</Layout>
<Children>
- <!-- Preview Deck-->
<WidgetGroup>
<Style>
QGroupBox {
- margin: 2px 0px 2px 3px;
+ margin: 2px 0px 6px 3px;
padding: 0px;
- border: 1px solid #656565;
background: transparent;
}
</Style>
<Layout>horizontal</Layout>
<Children>
- <!-- Preview Deck Column 1 Row 1-->
- <WidgetGroup>
- <Layout>vertical</Layout>
- <Children>
- <WidgetGroup>
- <Style> QGroupBox {
- margin: 0px;
- padding: 0px 0px 0px 0px;
- border-left: 0px solid #656565;
- border-right: 0px solid #2B2B2B;
- border-top: 0px solid #656565;
- border-bottom: 1px solid #2B2B2B;
- background: transparent;
- }
- </Style>
- <Layout>horizontal</Layout>
- <Children>
- <!--
- **********************************************
- Text- Track Title
- **********************************************
- -->
- <Text>
- <TooltipId>text</TooltipId>
- <Style> QLabel {
- font: 11px/13px sans-serif;
- font-family: "Open Sans";
- background-color: transparent;
- color: #ACACAC;
- text-align: left;
- padding-left: 1px;
- }
- </Style>
- <Group>[PreviewDeck1]</Group>
- <Size>50me,15f</Size>
- <Elide>right</Elide>
- </Text>
- <!--
- **********************************************
- Button- Eject
- **********************************************
- -->
- <PushButton>
- <TooltipId>eject</TooltipId>
- <Style></Style>
- <NumberStates>1</NumberStates>
- <State>
- <Number>0</Number>
- <Pressed>btn_eject1_over.png</Pressed>
- <Unpressed>btn_eject1.png</Unpressed>
- </State>
- <Connection>
- <ConfigKey>[PreviewDeck1],eject</ConfigKey>
- <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
- <ButtonState>LeftButton</ButtonState>
- <ConnectValueToWidget>false</ConnectValueToWidget>
- </Connection>
- </PushButton>
- </Children>
- </WidgetGroup>
- <!-- Preview Deck Column 1 Row 2-->
- <WidgetGroup>
- <Style>
- QGroupBox {
- padding: 0px;
- margin: 0px;
- border: 0px;
- }
- </Style>
- <Layout>horizontal</Layout>
- <Children>
- <PushButton>
- <TooltipId>play_start</TooltipId>
- <Style></Style>
- <NumberStates>2</NumberStates>
- <RightClickIsPushButton>true</RightClickIsPushButton>
- <State>
- <Number>0</Number>
- <Pressed>btn_play_sampler_down.png</Pressed>
- <Unpressed>btn_play_sampler.png</Unpressed>
- </State>
- <State>
- <Number>1</Number>
- <Pressed>btn_play_sampler_overdown.png</Pressed>
- <Unpressed>btn_play_sampler_over.png</Unpressed>
- </State>
- <Connection>
- <ConfigKey>[PreviewDeck1],play</ConfigKey>
- <EmitOnDownPress>true</EmitOnDownPress>
- <ButtonState>LeftButton</ButtonState>
- </Connection>
- <Connection>
- <ConfigKey>[PreviewDeck1],start</ConfigKey>
- <EmitOnDownPress>true</EmitOnDownPress>
- <ButtonState>RightButton</ButtonState>
- <ConnectValueToWidget>false</ConnectValueToWidget>
- </Connection>
- </PushButton>
- <WidgetGroup>
- <ObjectName>SamplerLeftBorder</ObjectName>
- <Size>3f,37f</Size>
- <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
- </WidgetGroup>
- <Overview>
- <TooltipId>waveform_overview</TooltipId>
- <Style></Style>
- <Group>[PreviewDeck1]</Group>
- <Size>me,37f</Size>
- <PlayedOverlayColor>#40FFFFFF</PlayedOverlayColor>
- <SignalHighColor>#FFE300</SignalHighColor>
- <SignalMidColor>#0099FF</SignalMidColor>
- <SignalLowColor>#FF0035</SignalLowColor>
- <SignalColor>#FF8000</SignalColor>
- <PlayPosColor>#00FF00</PlayPosColor>
- <DefaultMark>
- <Align>bottom</Align>
- <Color>#FFFFFF</Color>
- <TextColor>#00FF00</TextColor>
- <Text> %1 </Text>
- </DefaultMark>
- <Mark>
- <Control>cue_point</Control>
- <Text> C </Text>
- <Align>top</Align>
- <Color>#FF001C</Color>
- <TextColor>#00FF00</TextColor>
- </Mark>
- <Connection>
- <ConfigKey>[PreviewDeck1],playposition</ConfigKey>
- <EmitOnDownPress>false</EmitOnDownPress>
- </Connection>
- </Overview>
- </Children>
- </WidgetGroup>
- </Children>
- </WidgetGroup>
-
- <!-- Preview Deck Column 2-->
- <WidgetGroup>
- <MinimumSize>20,62</MinimumSize>
- <Children>
- <!--
- **********************************************
- Visual- Volume peak indicator
- **********************************************
- -->
- <StatusLight>
- <TooltipId>preview_PeakIndicator</TooltipId>
- <Style></Style>
- <PathStatusLight>btn_clipping_previewdeck_over.png</PathStatusLight>
- <PathBack>btn_clipping_previewdeck.png</PathBack>
- <Pos>0,3</Pos>
- <Connection>
- <ConfigKey>[PreviewDeck1],PeakIndicator</ConfigKey>
- </Connection>
- </StatusLight>
-
- <!--
- **********************************************
- Visual - Volume level display
- **********************************************
- -->
- <VuMeter>
- <TooltipId>channel_VuMeter</TooltipId>
- <Style></Style>
- <PathVu>btn_volume_display_previewdeck_over.png</PathVu>
- <PathBack>btn_volume_display_previewdeck.png</PathBack>
- <Pos>0,14</Pos>
- <Horizontal>false</Horizontal>
- <PeakHoldSize>3</PeakHoldSize>
- <PeakHoldTime>250</PeakHoldTime>
- <PeakFallTime>50</PeakFallTime>
- <PeakFallStep>3</PeakFallStep>
- <Connection>
- <ConfigKey>[PreviewDeck1],VuMeter</ConfigKey>
- </Connection>
- </VuMeter>
-
- <!--
- **********************************************
- Slider- Channel Volume
- **********************************************
- -->
- <SliderComposed>
- <TooltipId>pregain</TooltipId>
- <Style></Style>
- <Handle>knob_volume_previewdeck.png</Handle>
- <Slider>slider_volume_previewdeck.png</Slider>
- <Pos>10,2</Pos>
- <Horizontal>false</Horizontal>
- <Connection>
- <ConfigKey>[PreviewDeck1],pregain</ConfigKey>
- <EmitOnDownPress>false</EmitOnDownPress>
- </Connection>
- </SliderComposed>
- </Children>
- </WidgetGroup>
+ <Template src="skin:preview_deck.xml"/>
</Children>
<Connection>
<ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
diff --git a/res/skins/Shade/summer_sunset.qss b/res/skins/Shade/summer_sunset.qss
index 42f94c0700..d02076e6ed 100644
--- a/res/skins/Shade/summer_sunset.qss
+++ b/res/skins/Shade/summer_sunset.qss
@@ -18,6 +18,7 @@ WEffectSelector {
QHeaderView {
color: #0f0f0f;
+ background-color: #998A3D;
}
/* Library header 'buttons' */
QHeaderView::section {
From 46c1a016dc3210a2cd62bf5b42952022951d522d Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 31 May 2018 11:43:04 +0200
Subject: [PATCH 40/45] Shade: remove double inner border from lib scrollbars
---
res/skins/Shade/style.qss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 6c27fd6a52..6e13cdadf4 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -305,13 +305,13 @@ QHeaderView::down-arrow {
QScrollBar:horizontal {
min-width: 40px;
height: 18px;
- padding: 1px;
+ padding: 0px 1px 1px 1px;
background-color: #5C5B5D;
}
QScrollBar:vertical {
min-height: 40px;
width: 18px;
- padding: 1px;
+ padding: 1px 1px 1px 0px;
background-color: #5C5B5D;
}
/* "add-page" and "sub-page" are the gutter of the scrollbar */
From 7803433c0da08eae1cc390df8b431da9eaa5a6e1 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 31 May 2018 11:47:39 +0200
Subject: [PATCH 41/45] Shade: add Layout to PreviewDeck title cnotainer to
make title appear after first skin load
---
res/skins/Shade/preview_deck.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml
index 3f6eebb94c..30885fa819 100644
--- a/res/skins/Shade/preview_deck.xml
+++ b/res/skins/Shade/preview_deck.xml
@@ -35,6 +35,7 @@
<WidgetGroup>
<Size>0e,18f</Size>
<Style>QGroupBox {border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
+ <Layout>horizontal</Layout>
<Children>
<Text>
<TooltipId>text</TooltipId>
@@ -47,7 +48,7 @@
padding-top: 2px;}
</Style>
<Group>[PreviewDeck1]</Group>
- <SizePolicy>me,max</SizePolicy>
+ <SizePolicy>me,min</SizePolicy>
<Elide>right</Elide>
</Text>
</Children>
From 0540cc99ce54ec59c2fd6e381198463b627dafd2 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 31 May 2018 12:13:50 +0200
Subject: [PATCH 42/45] Shade: rebuilt/unblur launch logo
---
res/skins/Shade/style/mixxx-icon-logo-symbolic.png | Bin 7084 -> 4824 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/res/skins/Shade/style/mixxx-icon-logo-symbolic.png b/res/skins/Shade/style/mixxx-icon-logo-symbolic.png
index 6abf7f07575134b32e942a6754c200a242a5c2b1..aa410100d845827d6062bbad1a1c3490f13efa85 100644
GIT binary patch
literal 4824
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
literal 7084
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
From 77c2c16d8508f72a646b7524cc6d40bf37625afd Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 31 May 2018 12:45:27 +0200
Subject: [PATCH 43/45] Shade: fix SearchBox alignment with/without PreviewDeck
---
res/skins/Shade/skin.xml | 4 ++--
res/skins/Shade/style.qss | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
index ab79a407c6..575f6de2e8 100644
--- a/res/skins/Shade/skin.xml
+++ b/res/skins/Shade/skin.xml
@@ -467,7 +467,7 @@
<WidgetGroup>
<Style>
QGroupBox {
- margin: 2px 0px 6px 3px;
+ margin: 2px 0px 4px 3px;
padding: 0px;
background: transparent;
}
@@ -488,7 +488,7 @@
<Size>e,me</Size>
<Style></Style>
<SplitSizes>1,e</SplitSizes>
- <Collapsible>0,0</Collapsible>
+ <Collapsible>0,0</Collapsible>
<Children>
<LibrarySidebar></LibrarySidebar>
<!--Cover Art-->
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 6e13cdadf4..895af90734 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -249,6 +249,7 @@ QTreeView::item:!selected {
/* library search text box */
WSearchLineEdit {
padding: 2px;
+ margin-top: 2px;
border: 1px solid #656565;
font-size: 10pt;
font-family: "Open Sans";
From 67c7355879d4f73a4e3b270d9f95faafba445733 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Thu, 31 May 2018 13:16:27 +0200
Subject: [PATCH 44/45] Shade: adapt Library buttons to color schemes
---
res/skins/Shade/dark.qss | 17 +++++++++++
res/skins/Shade/style.qss | 59 +++++++++++++++++++++++++++------------
res/skins/Shade/summer_sunset.qss | 21 ++++++++++++++
3 files changed, 79 insertions(+), 18 deletions(-)
diff --git a/res/skins/Shade/dark.qss b/res/skins/Shade/dark.qss
index 55d6173af4..1efba9cc8f 100644
--- a/res/skins/Shade/dark.qss
+++ b/res/skins/Shade/dark.qss
@@ -57,6 +57,23 @@ QScrollBar::handle:horizontal {
border: 1px solid #3F3041;
}
+WLibrary QPushButton {
+ background-color: #717171;
+ }
+ WLibrary QPushButton:!enabled {
+ background-color: #4C4B4D;
+ }
+ WLibrary QPushButton:checked {
+ color: #000;
+ background-color: #B79E00;
+ }
+ /* 'Enable AutoDJ' button */
+ QPushButton#pushButtonAutoDJ:hover,
+ QPushButton#pushButtonRecording:hover,
+ QPushButton#pushButtonAnalyze:hover {
+ border: 1px solid #B79E00;
+ }
+
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 895af90734..bd4f4873d7 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -389,23 +389,46 @@ WLibrary QRadioButton, WLibrary QLabel { margin: 9px 3px 6px 3px; }
/* Additional space for the first QRadionButton in the row*/
WLibrary QRadioButton#radioButtonRecentlyAdded { margin: 9px 3px 6px 12px; }
-/* Additional space for the QPushButtons*/
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton {
- margin: 9px 3px 6px 3px;
- padding: 3px 8px;
- min-width: 65px;
-}
-
-
-/* Additional space for the first QPushButton in the row*/
-#DlgMissing > QPushButton#btnPurge,
-#DlgHidden > QPushButton#btnUnhide,
-#DlgAutoDJ > QPushButton#pushButtonAutoDJ,
-#DlgRecording > QPushButton#pushButtonRecording,
-#DlgAnalysis > QPushButton#pushButtonAnalyze { margin: 9px 12px 6px 3px; }
+WLibrary QPushButton {
+ text-align: center;
+ font-size: 9pt;
+ font-weight: normal;
+ /* Note(ronso0)
+ Interferes with skin scaling, system font size respectively
+ font-size: 14px/14px;
+ Setting height/width here will prevent the buttons being scaled properly
+ min-height: 22px;
+ max-height: 22px;
+ height: 22px; */
+ color: #0f0f0f;
+ margin: 1px 2px 3px 1px;
+ padding: 2px 4px 2px 4px;
+ background-color: #99A0A4;
+ background-position: center;
+ border: 0px;
+ }
+ WLibrary QPushButton:!enabled {
+ background-color: #72777A;
+ }
+ WLibrary QPushButton:unchecked {
+ color: #888;
+ background-color: #444;
+ }
+ WLibrary QPushButton:checked {
+ color: #000;
+ background-color: #F90562;
+ }
+ /* 'Enable AutoDJ' button */
+ QPushButton#pushButtonAutoDJ:hover,
+ QPushButton#pushButtonRecording:hover,
+ QPushButton#pushButtonAnalyze:hover {
+ border: 1px solid #F90562;
+ }
+ /* Push 'Start/Stop Recording' button and
+ 'Enable AutoDJ' button away from skin border */
+ QPushButton#pushButtonAutoDJ,
+ QPushButton#pushButtonRecording {
+ margin: 1px 20px 3px 1px;
+ }
diff --git a/res/skins/Shade/summer_sunset.qss b/res/skins/Shade/summer_sunset.qss
index d02076e6ed..3669c9ab44 100644
--- a/res/skins/Shade/summer_sunset.qss
+++ b/res/skins/Shade/summer_sunset.qss
@@ -49,3 +49,24 @@ QScrollBar::handle:horizontal {
border: 1px solid #524A20;
}
+WLibrary QPushButton {
+ background-color: #9E9048;
+ }
+ WLibrary QPushButton:!enabled {
+ background-color: #706633;
+ }
+ WLibrary QPushButton:unchecked {
+ color: #888;
+ background-color: #444;
+ }
+ WLibrary QPushButton:checked {
+ color: #000;
+ background-color: #52F904;
+ }
+ /* 'Enable AutoDJ' button */
+ QPushButton#pushButtonAutoDJ:hover,
+ QPushButton#pushButtonRecording:hover,
+ QPushButton#pushButtonAnalyze:hover {
+ border: 1px solid #52F904;
+ }
+
From 2daf983892d8e5c1d896a41dc3b4141713477a34 Mon Sep 17 00:00:00 2001
From: Stefan <stifisax@gmx.ch>
Date: Thu, 31 May 2018 14:44:42 +0200
Subject: [PATCH 45/45] Shade: style library radio button
---
res/skins/Shade/btn_lib_radio_button_off.svg | 33 +++++++++++++
res/skins/Shade/btn_lib_radio_button_on.svg | 61 ++++++++++++++++++++++++
res/skins/Shade/btn_lib_radio_button_on_dark.svg | 61 ++++++++++++++++++++++++
res/skins/Shade/dark.qss | 4 +-
res/skins/Shade/style.qss | 8 ++++
5 files changed, 166 insertions(+), 1 deletion(-)
create mode 100644 res/skins/Shade/btn_lib_radio_button_off.svg
create mode 100644 res/skins/Shade/btn_lib_radio_button_on.svg
create mode 100644 res/skins/Shade/btn_lib_radio_button_on_dark.svg
diff --git a/res/skins/Shade/btn_lib_radio_button_off.svg b/res/skins/Shade/btn_lib_radio_button_off.svg
new file mode 100644
index 0000000000..1fec6d85c5
--- /dev/null
+++ b/res/skins/Shade/btn_lib_radio_button_off.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.1"
+ width="100%"
+ height="100%"
+ viewBox="0 0 18 18"
+ id="svg2">
+ <metadata
+ id="metadata12">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs10" />
+ <path
+ d="M 9,2 C 5.1323,2 2,5.1323 2,9 c 0,3.8677 3.1323,7 7,7 3.8677,0 7,-3.1323 7,-7 C 16,5.1323 12.868,2 9,2 z M 9,14.6 C 5.906,14.6 3.4,12.094 3.4,9 3.4,5.906 5.906,3.4 9,3.4 c 3.094,0 5.6,2.506 5.6,5.6 0,3.094 -2.506,5.6 -5.6,5.6 z"
+ id="path4"
+ style="fill:#d2d2d2;fill-opacity:1" />
+</svg>
diff --git a/res/skins/Shade/btn_lib_radio_button_on.svg b/res/skins/Shade/btn_lib_radio_button_on.svg
new file mode 100644
index 0000000000..0dff87675f
--- /dev/null
+++ b/res/skins/Shade/btn_lib_radio_button_on.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ width="100%"
+ height="100%"
+ viewBox="0 0 18 18"
+ id="svg2"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="btn_lib_radio_button_on.svg">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1029"
+ id="namedview7"
+ showgrid="false"
+ inkscape:zoom="13.111111"
+ inkscape:cx="-2.0211864"
+ inkscape:cy="9"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <metadata
+ id="metadata12">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs10" />
+ <path
+ d="M 9,5.1042489 C 6.8495453,5.1042489 5.1042489,6.8495453 5.1042489,9 c 0,2.150454 1.7452964,3.895751 3.8957511,3.895751 2.150454,0 3.895751,-1.745297 3.895751,-3.895751 C 12.895751,6.8495453 11.150454,5.1042489 9,5.1042489 z"
+ id="path2987"
+ style="fill:#eb5d00;fill-opacity:1" />
+ <path
+ d="M 9,2 C 5.1325,2 2,5.1325 2,9 c 0,3.8675 3.1325,7 7,7 3.8675,0 7,-3.1325 7,-7 C 16,5.1325 12.868,2 9,2 z M 9,3.40625 C 12.094,3.40625 14.59375,5.906 14.59375,9 14.59375,12.094 12.094,14.59375 9,14.59375 5.906,14.59375 3.40625,12.094 3.40625,9 3.40625,5.906 5.906,3.40625 9,3.40625 z"
+ id="path2985"
+ style="fill:#d2d2d2;fill-opacity:1" />
+</svg>
diff --git a/res/skins/Shade/btn_lib_radio_button_on_dark.svg b/res/skins/Shade/btn_lib_radio_button_on_dark.svg
new file mode 100644
index 0000000000..1a0d2ac702
--- /dev/null
+++ b/res/skins/Shade/btn_lib_radio_button_on_dark.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ width="100%"
+ height="100%"
+ viewBox="0 0 18 18"
+ id="svg2"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="btn_lib_radio_button_on_dark.svg">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1029"
+ id="namedview7"
+ showgrid="false"
+ inkscape:zoom="13.111111"
+ inkscape:cx="-2.0211864"
+ inkscape:cy="9"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <metadata
+ id="metadata12">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs10" />
+ <path
+ d="M 9,5.1042489 C 6.8495453,5.1042489 5.1042489,6.8495453 5.1042489,9 c 0,2.150454 1.7452964,3.895751 3.8957511,3.895751 2.150454,0 3.895751,-1.745297 3.895751,-3.895751 C 12.895751,6.8495453 11.150454,5.1042489 9,5.1042489 z"
+ id="path2987"
+ style="fill:#78c70b;fill-opacity:1" />
+ <path
+ d="M 9,2 C 5.1325,2 2,5.1325 2,9 c 0,3.8675 3.1325,7 7,7 3.8675,0 7,-3.1325 7,-7 C 16,5.1325 12.868,2 9,2 z M 9,3.40625 C 12.094,3.40625 14.59375,5.906 14.59375,9 14.59375,12.094 12.094,14.59375 9,14.59375 5.906,14.59375 3.40625,12.094 3.40625,9 3.40625,5.906 5.906,3.40625 9,3.40625 z"
+ id="path2985"
+ style="fill:#d2d2d2;fill-opacity:1" />
+</svg>
diff --git a/res/skins/Shade/dark.qss b/res/skins/Shade/dark.qss
index 1efba9cc8f..655052271b 100644
--- a/res/skins/Shade/dark.qss
+++ b/res/skins/Shade/dark.qss
@@ -74,7 +74,9 @@ WLibrary QPushButton {
border: 1px solid #B79E00;
}
-
+WLibrary QRadioButton::indicator:checked {
+ background: url(skin:btn_lib_radio_button_on_dark.svg);
+}
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index bd4f4873d7..98facdaf87 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -389,6 +389,14 @@ WLibrary QRadioButton, WLibrary QLabel { margin: 9px 3px 6px 3px; }
/* Additional space for the first QRadionButton in the row*/
WLibrary QRadioButton#radioButtonRecentlyAdded { margin: 9px 3px 6px 12px; }
+WLibrary QRadioButton::indicator:checked {
+ background: url(skin:btn_lib_radio_button_on.svg);
+}
+
+WLibrary QRadioButton::indicator:unchecked {
+ background: url(skin:btn_lib_radio_button_off.svg);
+}
+
WLibrary QPushButton {
text-align: center;
font-size: 9pt;
Reference in New Issue View Git Blame Copy Permalink