diff --git a/YACReaderLibrary/images_osx.qrc b/YACReaderLibrary/images_osx.qrc
index fc58a97e..b9c36fe4 100644
--- a/YACReaderLibrary/images_osx.qrc
+++ b/YACReaderLibrary/images_osx.qrc
@@ -23,5 +23,23 @@
../images/empty_search.png
../images/iconSearch.png
../images/clearSearch.png
+
+
+ ../images/lists/favorites_osx.png
+ ../images/lists/label_blue_osx.png
+ ../images/lists/label_cyan_osx.png
+ ../images/lists/label_dark_osx.png
+ ../images/lists/label_green_osx.png
+ ../images/lists/label_light_osx.png
+ ../images/lists/label_orange_osx.png
+ ../images/lists/label_pink_osx.png
+ ../images/lists/label_purple_osx.png
+ ../images/lists/label_red_osx.png
+ ../images/lists/label_violet_osx.png
+ ../images/lists/label_white_osx.png
+ ../images/lists/label_yellow_osx.png
+ ../images/lists/list_osx.png
+ ../images/lists/reading_osx.png
+
diff --git a/YACReaderLibrary/images_win.qrc b/YACReaderLibrary/images_win.qrc
index 4fddf59e..c8eae6a5 100644
--- a/YACReaderLibrary/images_win.qrc
+++ b/YACReaderLibrary/images_win.qrc
@@ -25,6 +25,7 @@
../images/iconSearchNew.png
../images/clearSearchNew.png
../images/addLabelIcon.png
+
../images/lists/favorites.png
../images/lists/label_blue.png
../images/lists/label_cyan.png
diff --git a/custom_widgets/yacreader_sidebar.cpp b/custom_widgets/yacreader_sidebar.cpp
index 2f1ace67..11a98ec0 100644
--- a/custom_widgets/yacreader_sidebar.cpp
+++ b/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);
}
diff --git a/custom_widgets/yacreader_treeview.cpp b/custom_widgets/yacreader_treeview.cpp
index f0966461..46c95baa 100644
--- a/custom_widgets/yacreader_treeview.cpp
+++ b/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::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:closed:selected:has-children {image: url(':/images/collapsed_branch_osx.png');}");
+ "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:open:selected:has-children {image: url(':/images/expanded_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:hover {background-color:#2E2E2E; color:white; font:bold;}"
- "QTreeView::branch:selected {background-color:#2E2E2E;}"
+ "QTreeView::item:selected {background-color: #2E2E2E; color:white; font:bold;}"
+ "QTreeView::item:hover {background-color:#2E2E2E; color:white; font:bold;}"
+ "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::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::sub-line:vertical { border: none; background: #404040; 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::sub-line:vertical { border: none; background: #404040; 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; }"
-
- "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');}"
+ "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');}"
);
#endif
diff --git a/images/lists/favorites_osx.png b/images/lists/favorites_osx.png
new file mode 100644
index 00000000..93b55e47
Binary files /dev/null and b/images/lists/favorites_osx.png differ
diff --git a/images/lists/label_blue_osx.png b/images/lists/label_blue_osx.png
new file mode 100644
index 00000000..fb4d538a
Binary files /dev/null and b/images/lists/label_blue_osx.png differ
diff --git a/images/lists/label_cyan_osx.png b/images/lists/label_cyan_osx.png
new file mode 100644
index 00000000..c750224c
Binary files /dev/null and b/images/lists/label_cyan_osx.png differ
diff --git a/images/lists/label_dark_osx.png b/images/lists/label_dark_osx.png
new file mode 100644
index 00000000..5ae096ba
Binary files /dev/null and b/images/lists/label_dark_osx.png differ
diff --git a/images/lists/label_green_osx.png b/images/lists/label_green_osx.png
new file mode 100644
index 00000000..d791c59e
Binary files /dev/null and b/images/lists/label_green_osx.png differ
diff --git a/images/lists/label_light_osx.png b/images/lists/label_light_osx.png
new file mode 100644
index 00000000..a1111a81
Binary files /dev/null and b/images/lists/label_light_osx.png differ
diff --git a/images/lists/label_orange_osx.png b/images/lists/label_orange_osx.png
new file mode 100644
index 00000000..19d6dcb4
Binary files /dev/null and b/images/lists/label_orange_osx.png differ
diff --git a/images/lists/label_pink_osx.png b/images/lists/label_pink_osx.png
new file mode 100644
index 00000000..f17df136
Binary files /dev/null and b/images/lists/label_pink_osx.png differ
diff --git a/images/lists/label_purple_osx.png b/images/lists/label_purple_osx.png
new file mode 100644
index 00000000..3864b692
Binary files /dev/null and b/images/lists/label_purple_osx.png differ
diff --git a/images/lists/label_red_osx.png b/images/lists/label_red_osx.png
new file mode 100644
index 00000000..53e17209
Binary files /dev/null and b/images/lists/label_red_osx.png differ
diff --git a/images/lists/label_violet_osx.png b/images/lists/label_violet_osx.png
new file mode 100644
index 00000000..067104d7
Binary files /dev/null and b/images/lists/label_violet_osx.png differ
diff --git a/images/lists/label_white_osx.png b/images/lists/label_white_osx.png
new file mode 100644
index 00000000..c4c3f855
Binary files /dev/null and b/images/lists/label_white_osx.png differ
diff --git a/images/lists/label_yellow_osx.png b/images/lists/label_yellow_osx.png
new file mode 100644
index 00000000..91e89b46
Binary files /dev/null and b/images/lists/label_yellow_osx.png differ
diff --git a/images/lists/list_osx.png b/images/lists/list_osx.png
new file mode 100644
index 00000000..9d890d42
Binary files /dev/null and b/images/lists/list_osx.png differ
diff --git a/images/lists/reading_osx.png b/images/lists/reading_osx.png
new file mode 100644
index 00000000..b00a0b6f
Binary files /dev/null and b/images/lists/reading_osx.png differ