Shade: add searchbox styles, brighten library font selection

4 files changed, 59 insertions, 11 deletions

diff --git a/res/skins/Shade/btn/btn_search_down_grey.svg b/res/skins/Shade/btn/btn_search_down_grey.svg
new file mode 100644
index 0000000000..7e1cd97a96
--- /dev/null
+++ b/res/skins/Shade/btn/btn_search_down_grey.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <path d="M 1.5003845,3 5.9999999,7.405 10.499616,3 Z" fill="#b3b3b3"/>
+</svg>
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 8a347f5206..b99805454a 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -44,6 +44,8 @@ WOverview /* Hotcue labels in the overview */,
 QComboBox,
 WEffectSelector,
 WEffectSelector QAbstractScrollArea,
+WSearchLineEdit,
+WSearchLineEdit QAbstractScrollArea,
 #fadeModeCombobox,
 #fadeModeCombobox QAbstractScrollArea {
   font-family: "Open Sans";
@@ -182,6 +184,7 @@ WEffectSelector::indicator:unchecked:selected,
   }
   /* Remove 3D border from unchecked effects checkmark space */
   WEffectSelector::item:selected,
+  WSearchLineEdit::item:selected,
   #fadeModeCombobox::item:selected {
     border: 0px;
   }
@@ -289,6 +292,9 @@ WEffectSelector QAbstractScrollArea,
       margin: 0px;
       image: url(skin:/btn/btn_spin_down.png) no-repeat;
     }
+    WSearchLineEdit::down-arrow {
+      image: url(skin:/btn/btn_search_down_grey.svg) no-repeat;
+    }
 
 
 /******** TODO properties identical in all skin, move to common file *************/
@@ -297,8 +303,12 @@ WEffectSelector QAbstractScrollArea,
   WEffectSelector::indicator, /* checkbox, tick mark */
   WEffectSelector::drop-down,
   WEffectSelector::indicator:unchecked,
-  #fadeModeCombobox::checked, /* selected item */
-  #fadeModeCombobox::indicator, /* checkbox, tick mark */
+  WSearchLineEdit::checked,
+  WSearchLineEdit::indicator,
+  WSearchLineEdit::drop-down,
+  WSearchLineEdit::indicator:unchecked,
+  #fadeModeCombobox::checked,
+  #fadeModeCombobox::indicator,
   #fadeModeCombobox::drop-down,
   #fadeModeCombobox::indicator:unchecked,
   WTrackMenu QMenu QCheckBox {
@@ -444,7 +454,7 @@ WLibrarySidebar {
   alternate-background-color: #1a1a1a;
 /* In selected library rows this sets the color of
   * shapes in star rating delegate  */
-  selection-color: #000;
+  selection-color: #fff;
   /* background of Color delegate in selected row */
   selection-background-color: #656d75;
 }
@@ -454,12 +464,25 @@ WLibraryTextBrowser {
 }
 
 WTrackTableView::item:selected,
+WSearchLineEdit::item:selected,
+WSearchLineEdit::item:checked,
 WLibrarySidebar::item:selected,
 WLibrarySidebar::branch:selected,
 #LibraryBPMButton::item:selected {
-  color: #000;
+  color: #fff;
   background-color: #656d75;
-}
+  }
+  WSearchLineEdit::item:checked:!selected {
+    color: #fff;
+    background-color: #32363a;
+  }
+  WSearchLineEdit::item:checked:selected {
+    color: #fff;
+    background-color: #7f8891;
+  }
+  WSearchLineEdit::indicator {
+    width:  0;
+  }
 WLibrarySidebar,
 WLibrarySidebar::item:focus {
   outline: none;
@@ -579,19 +602,26 @@ WEffectSelector::indicator:unchecked:selected,
 WSearchLineEdit {
   margin-top: 2px;
   padding: 2px;
-  border: 1px solid #656565;
-  background: #0f0f0f;
-  color: #cfcfcf;
   }
   WSearchLineEdit:focus {
     padding: 1px;
     border: 2px solid #ff6600;
-    color: #eeeeee;
     selection-color: #0f0f0f;
     selection-background-color: #d2d2d2;
   }
   /* Clear button: see /skins/default.qss */
 
+WSearchLineEdit,
+WSearchLineEdit QAbstractScrollArea,
+WSearchLineEdit::item {
+  background: #0f0f0f;
+  color: #eeeeee;
+  }
+WSearchLineEdit,
+WSearchLineEdit QAbstractScrollArea {
+  border: 1px solid #656565;
+  }
+
 
 WLibrarySidebar {
   min-height: 90px;
@@ -643,6 +673,8 @@ WTrackTableViewHeader::section,
 #LibraryContainer QScrollBar:vertical,
 WEffectSelector QAbstractScrollArea QScrollBar:horizontal,
 WEffectSelector QAbstractScrollArea QScrollBar:vertical,
+WSearchLineEdit QAbstractScrollArea QScrollBar:horizontal,
+WSearchLineEdit QAbstractScrollArea QScrollBar:vertical,
 #fadeModeCombobox QAbstractScrollArea QScrollBar:horizontal,
 #fadeModeCombobox QAbstractScrollArea QScrollBar:vertical {
   background-color: #626f87;
@@ -682,6 +714,7 @@ WTrackTableViewHeader::down-arrow {
 /* Scroll bars */
 #LibraryContainer QScrollBar:horizontal,
 WEffectSelector QAbstractScrollArea QScrollBar:horizontal,
+WSearchLineEdit QAbstractScrollArea QScrollBar:horizontal,
 #fadeModeCombobox QAbstractScrollArea QScrollBar:horizontal {
   min-width: 40px;
   height: 18px;
@@ -689,6 +722,7 @@ WEffectSelector QAbstractScrollArea QScrollBar:horizontal,
 }
 #LibraryContainer QScrollBar:vertical,
 WEffectSelector QAbstractScrollArea QScrollBar:vertical,
+WSearchLineEdit QAbstractScrollArea QScrollBar:vertical,
 #fadeModeCombobox QAbstractScrollArea QScrollBar:vertical {
   min-height: 40px;
   width: 18px;
@@ -699,6 +733,8 @@ WEffectSelector QAbstractScrollArea QScrollBar:vertical,
 #LibraryContainer QScrollBar::sub-page,
 WEffectSelector QAbstractScrollArea QScrollBar::add-page,
 WEffectSelector QAbstractScrollArea QScrollBar::sub-page,
+WSearchLineEdit QAbstractScrollArea QScrollBar::add-page,
+WSearchLineEdit QAbstractScrollArea QScrollBar::sub-page,
 #fadeModeCombobox QAbstractScrollArea QScrollBar::add-page,
 #fadeModeCombobox QAbstractScrollArea QScrollBar::sub-page {
   min-width: 14px;
@@ -709,6 +745,8 @@ WEffectSelector QAbstractScrollArea QScrollBar::sub-page,
 #LibraryContainer QScrollBar::handle:horizontal,
 WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical,
 WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal,
+WSearchLineEdit QAbstractScrollArea QScrollBar::handle:vertical,
+WSearchLineEdit QAbstractScrollArea QScrollBar::handle:horizontal,
 #fadeModeCombobox QAbstractScrollArea QScrollBar::handle:vertical,
 #fadeModeCombobox QAbstractScrollArea QScrollBar::handle:horizontal {
   background: #626f87;
@@ -717,11 +755,13 @@ WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal,
 }
 #LibraryContainer QScrollBar::handle:horizontal,
 WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal,
+WSearchLineEdit QAbstractScrollArea QScrollBar::handle:horizontal,
 #fadeModeCombobox QAbstractScrollArea QScrollBar::handle:horizontal {
   min-width: 40px;
 }
 #LibraryContainer QScrollBar::handle:vertical,
 WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical,
+WSearchLineEdit QAbstractScrollArea QScrollBar::handle:vertical,
 #fadeModeCombobox QAbstractScrollArea QScrollBar::handle:vertical {
   min-height: 40px;
 }
@@ -730,6 +770,8 @@ WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical,
 #LibraryContainer QScrollBar::add-line:vertical,
 WEffectSelector QAbstractScrollArea QScrollBar::add-line:horizontal,
 WEffectSelector QAbstractScrollArea QScrollBar::add-line:vertical,
+WSearchLineEdit QAbstractScrollArea QScrollBar::add-line:horizontal,
+WSearchLineEdit QAbstractScrollArea QScrollBar::add-line:vertical,
 #fadeModeCombobox QAbstractScrollArea QScrollBar::add-line:horizontal,
 #fadeModeCombobox QAbstractScrollArea QScrollBar::add-line:vertical {
   width: 0px;
@@ -739,6 +781,8 @@ WEffectSelector QAbstractScrollArea QScrollBar::add-line:vertical,
 #LibraryContainer QScrollBar::sub-line:vertical,
 WEffectSelector QAbstractScrollArea QScrollBar::sub-line:horizontal,
 WEffectSelector QAbstractScrollArea QScrollBar::sub-line:vertical,
+WSearchLineEdit QAbstractScrollArea QScrollBar::sub-line:horizontal,
+WSearchLineEdit QAbstractScrollArea QScrollBar::sub-line:vertical,
 #fadeModeCombobox QAbstractScrollArea QScrollBar::sub-line:horizontal,
 #fadeModeCombobox QAbstractScrollArea QScrollBar::sub-line:vertical {
   width: 0px;
@@ -748,6 +792,7 @@ WEffectSelector QAbstractScrollArea QScrollBar::sub-line:vertical,
 /* Corner in between two scrollbars */
 #LibraryContainer QAbstractScrollArea::corner,
 WEffectSelector QAbstractScrollArea::corner,
+WSearchLineEdit QAbstractScrollArea::corner,
 #fadeModeCombobox QAbstractScrollArea::corner {
   background-color: #0f0f0f;
   border-top: 1px solid #585858;
diff --git a/res/skins/Shade/style/style_branch_closed_selected.svg b/res/skins/Shade/style/style_branch_closed_selected.svg
index ca65bcc58b..f63555e3cf 100644
--- a/res/skins/Shade/style/style_branch_closed_selected.svg
+++ b/res/skins/Shade/style/style_branch_closed_selected.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <path d="M 4,3.7810002 12,8 4,12.219 V 3.7810002" stroke-width=".703157"/>
+  <path d="M 4,3.7810002 12,8 4,12.219 V 3.7810002" fill="#ffffff" stroke-width=".703157"/>
 </svg>
diff --git a/res/skins/Shade/style/style_branch_open_selected.svg b/res/skins/Shade/style/style_branch_open_selected.svg
index b73fd23b60..ba7edda6ff 100644
--- a/res/skins/Shade/style/style_branch_open_selected.svg
+++ b/res/skins/Shade/style/style_branch_open_selected.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <path d="M 12.219,4 8,12 3.7810002,4 H 12.219" stroke-width=".703157"/>
+  <path d="M 12.219,4 8,12 3.7810002,4 H 12.219" fill="#fefefe" stroke-width=".703157"/>
 </svg>