merged

YACReaderLibrary/images_osx.qrc

@@ -23,5 +23,23 @@
     <file alias="images/empty_search.png">../images/empty_search.png</file>
     <file>../images/iconSearch.png</file>
     <file>../images/clearSearch.png</file>
+
+    <!--reading lists-->
+    <file alias="images/lists/favorites.png">../images/lists/favorites_osx.png</file>     
+    <file alias="images/lists/label_blue.png">../images/lists/label_blue_osx.png</file>
+    <file alias="images/lists/label_cyan.png">../images/lists/label_cyan_osx.png</file>
+    <file alias="images/lists/label_dark.png">../images/lists/label_dark_osx.png</file>
+    <file alias="images/lists/label_green.png">../images/lists/label_green_osx.png</file>
+    <file alias="images/lists/label_light.png">../images/lists/label_light_osx.png</file>
+    <file alias="images/lists/label_orange.png">../images/lists/label_orange_osx.png</file>
+    <file alias="images/lists/label_pink.png">../images/lists/label_pink_osx.png</file>
+    <file alias="images/lists/label_purple.png">../images/lists/label_purple_osx.png</file>
+    <file alias="images/lists/label_red.png">../images/lists/label_red_osx.png</file>
+    <file alias="images/lists/label_violet.png">../images/lists/label_violet_osx.png</file>
+    <file alias="images/lists/label_white.png">../images/lists/label_white_osx.png</file>
+    <file alias="images/lists/label_yellow.png">../images/lists/label_yellow_osx.png</file>
+    <file alias="images/lists/list.png">../images/lists/list_osx.png</file>
+    <file alias="images/lists/reading.png">../images/lists/reading_osx.png</file>   
+
   </qresource>
 </RCC>

YACReaderLibrary/images_win.qrc

@@ -25,6 +25,7 @@
         <file alias="images/iconSearch.png">../images/iconSearchNew.png</file>
         <file alias="images/clearSearch.png">../images/clearSearchNew.png</file>
         <file>../images/addLabelIcon.png</file>
+        <!--reading lists-->
         <file>../images/lists/favorites.png</file>     
 		<file>../images/lists/label_blue.png</file>
 		<file>../images/lists/label_cyan.png</file>

custom_widgets/yacreader_sidebar.cpp

@@ -33,7 +33,7 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent) :
                             " }"
                             "QSplitter::handle:vertical { height: 39px;}");
 #else
-
+    splitter->setStyleSheet("QSplitter::handle:vertical { height: 26px; background-color: transparent;}");
 #endif
 
 	selectedLibrary->setContextMenuPolicy(Qt::ActionsContextMenu);
@@ -133,8 +133,6 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent) :
     l->addWidget(splitter);
     l->setSpacing(0);
 
-
-
 	setLayout(l);
 }
 

custom_widgets/yacreader_treeview.cpp

@@ -20,34 +20,42 @@ YACReaderTreeView::YACReaderTreeView(QWidget *parent) :
 
 #ifdef Q_OS_MAC
     setStyleSheet("QTreeView {background-color:transparent; border: none;}"
-                               "QTreeView::item:selected {background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6BAFE4, stop: 1 #3984D2); border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5EA3DF, stop: 1 #73B8EA); border-left:none;border-right:none;border-bottom:1px solid #3577C2;}"
+                  "QTreeView::item:selected {background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6BAFE4, stop: 1 #3984D2); border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5EA3DF, stop: 1 #73B8EA); border-left:none;border-right:none;border-bottom:1px solid #3577C2;}"
-                               "QTreeView::branch:selected {background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6BAFE4, stop: 1 #3984D2); border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5EA3DF, stop: 1 #73B8EA); border-left:none;border-right:none;border-bottom:1px solid #3577C2;}"
+                  "QTreeView::branch:selected {background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6BAFE4, stop: 1 #3984D2); border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5EA3DF, stop: 1 #73B8EA); border-left:none;border-right:none;border-bottom:1px solid #3577C2;}"
-                               "QTreeView::branch:open:selected:has-children {image: url(':/images/expanded_branch_osx.png');}"
+                  "QTreeView::branch:open:selected:has-children {image: url(':/images/expanded_branch_osx.png');}"
-                               "QTreeView::branch:closed:selected:has-children {image: url(':/images/collapsed_branch_osx.png');}");
+                  "QTreeView::branch:closed:selected:has-children {image: url(':/images/collapsed_branch_osx.png');}"
+
+                  "QScrollBar:vertical { border: none; background: #EFEFEF; width: 9px; margin: 0 3px 0 0; }"
+                  "QScrollBar::handle:vertical { background: #DDDDDD; width: 7px; min-height: 20px; margin: 1px; border: 1px solid #D0D0D0; }"
+                  "QScrollBar::add-line:vertical { border: none; background: #EFEFEF; height: 10px; subcontrol-position: bottom; subcontrol-origin: margin; margin: 0 3px 0 0;}"
+
+                  "QScrollBar::sub-line:vertical {  border: none; background: #EFEFEF; height: 10px; subcontrol-position: top; subcontrol-origin: margin; margin: 0 3px 0 0;}"
+                  "QScrollBar::up-arrow:vertical {border:none;width: 9px;height: 6px;background: url(':/images/folders_view/line-up.png') center top no-repeat;}"
+                  "QScrollBar::down-arrow:vertical {border:none;width: 9px;height: 6px;background: url(':/images/folders_view/line-down.png') center top no-repeat;}"
+
+                  "QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {background: none; }"
+                  );
 #else
     setStyleSheet("QTreeView {background-color:transparent; border: none; color:#DDDFDF; outline:0; show-decoration-selected: 0;}"
-                                "QTreeView::item:selected {background-color: #2E2E2E; color:white; font:bold;}"
+                  "QTreeView::item:selected {background-color: #2E2E2E; color:white; font:bold;}"
-                                "QTreeView::item:hover {background-color:#2E2E2E; color:white; font:bold;}"
+                  "QTreeView::item:hover {background-color:#2E2E2E; color:white; font:bold;}"
-                               "QTreeView::branch:selected {background-color:#2E2E2E;}"
+                  "QTreeView::branch:selected {background-color:#2E2E2E;}"
 
+                  "QScrollBar:vertical { border: none; background: #404040; width: 7px; margin: 0 3px 0 0; }"
+                  "QScrollBar::handle:vertical { background: #DDDDDD; width: 7px; min-height: 20px; }"
+                  "QScrollBar::add-line:vertical { border: none; background: #404040; height: 10px; subcontrol-position: bottom; subcontrol-origin: margin; margin: 0 3px 0 0;}"
 
-                               "QScrollBar:vertical { border: none; background: #404040; width: 7px; margin: 0 3px 0 0; }"
+                  "QScrollBar::sub-line:vertical {  border: none; background: #404040; height: 10px; subcontrol-position: top; subcontrol-origin: margin; margin: 0 3px 0 0;}"
-    "QScrollBar::handle:vertical { background: #DDDDDD; width: 7px; min-height: 20px; }"
+                  "QScrollBar::up-arrow:vertical {border:none;width: 9px;height: 6px;background: url(':/images/folders_view/line-up.png') center top no-repeat;}"
-    "QScrollBar::add-line:vertical { border: none; background: #404040; height: 10px; subcontrol-position: bottom; subcontrol-origin: margin; margin: 0 3px 0 0;}"
+                  "QScrollBar::down-arrow:vertical {border:none;width: 9px;height: 6px;background: url(':/images/folders_view/line-down.png') center top no-repeat;}"
 
-    "QScrollBar::sub-line:vertical {  border: none; background: #404040; height: 10px; subcontrol-position: top; subcontrol-origin: margin; margin: 0 3px 0 0;}"
+                  "QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {background: none; }"
-  "QScrollBar::up-arrow:vertical {border:none;width: 9px;height: 6px;background: url(':/images/folders_view/line-up.png') center top no-repeat;}"
-  "QScrollBar::down-arrow:vertical {border:none;width: 9px;height: 6px;background: url(':/images/folders_view/line-down.png') center top no-repeat;}"
-
-  "QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {background: none; }"
-
-  "QTreeView::branch:has-children:!has-siblings:closed,QTreeView::branch:closed:has-children:has-siblings {border-image: none;image: url(':/images/branch-closed.png');}"
-  "QTreeView::branch:has-children:selected:!has-siblings:closed,QTreeView::branch:closed:selected:has-children:has-siblings {border-image: none;image: url(':/images/collapsed_branch_selected.png');}"
-
- "QTreeView::branch:open:has-children:!has-siblings,QTreeView::branch:open:has-children:has-siblings  {border-image: none;image: url(':/images/branch-open.png');}"
- "QTreeView::branch:open:has-children:selected:!has-siblings,QTreeView::branch:open:has-children:selected:has-siblings {border-image: none;image: url(':/images/expanded_branch_selected.png');}"
 
+                  "QTreeView::branch:has-children:!has-siblings:closed,QTreeView::branch:closed:has-children:has-siblings {border-image: none;image: url(':/images/branch-closed.png');}"
+                  "QTreeView::branch:has-children:selected:!has-siblings:closed,QTreeView::branch:closed:selected:has-children:has-siblings {border-image: none;image: url(':/images/collapsed_branch_selected.png');}"
 
+                  "QTreeView::branch:open:has-children:!has-siblings,QTreeView::branch:open:has-children:has-siblings  {border-image: none;image: url(':/images/branch-open.png');}"
+                  "QTreeView::branch:open:has-children:selected:!has-siblings,QTreeView::branch:open:has-children:selected:has-siblings {border-image: none;image: url(':/images/expanded_branch_selected.png');}"
                                );
 #endif