diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc
index 3b1a3bce..1749f282 100644
--- a/YACReaderLibrary/images.qrc
+++ b/YACReaderLibrary/images.qrc
@@ -64,6 +64,7 @@
../images/sidebar/expanded_branch_osx.png
../images/sidebar/libraryIconSelected.png
../images/sidebar/libraryOptions.png
+ ../images/sidebar/libraryOptions@2x.png
../images/sidebar/branch-open.png
../images/sidebar/branch-closed.png
../images/sidebar/expanded_branch_selected.png
diff --git a/custom_widgets/yacreader_library_item_widget.cpp b/custom_widgets/yacreader_library_item_widget.cpp
index b5f6b259..33fb567b 100644
--- a/custom_widgets/yacreader_library_item_widget.cpp
+++ b/custom_widgets/yacreader_library_item_widget.cpp
@@ -16,16 +16,32 @@ YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n/*ame*/, QString
QPixmap iconPixmap(":/images/sidebar/libraryIcon.png");
icon = new QLabel(this);
- icon->setPixmap(iconPixmap);
+ icon->setPixmap(iconPixmap);
nameLabel = new QLabel(name,this);
- options = new QToolButton(this);
+ options = new QToolButton(this);
+#ifdef Q_OS_MAC
+ //TODO fix this crazy hack for having a propper retina icon for the options
+ //this hack has been perpetrated using Qt 5.5.0
+ QString sourceOptionsImage;
+ if(devicePixelRatio()>1)
+ sourceOptionsImage = ":/images/sidebar/libraryOptions@2x.png";
+ else
+ sourceOptionsImage = ":/images/sidebar/libraryOptions.png";
+ QPixmap iconOptionsPixmap(sourceOptionsImage);
+ iconOptionsPixmap.setDevicePixelRatio(devicePixelRatio());
+ QLabel * helperLabel = new QLabel(options);
+ helperLabel->move(4,2);
+ helperLabel->setFixedSize(14,14);
+ helperLabel->setPixmap(iconOptionsPixmap);
+#else
options->setIcon(QIcon(":/images/sidebar/libraryOptions.png"));
+#endif
options->setHidden(true);
- options->setFixedWidth(18);
- options->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum);
- options->setStyleSheet("QToolButton {border:none;}");
+ options->setFixedWidth(18);
+ options->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum);
+ options->setStyleSheet("QToolButton {border:none;}");
connect(options,SIGNAL(clicked()),this,SIGNAL(showOptions()));
/*up = new QToolButton(this);
up->setIcon(QIcon(":/images/libraryUp.png"));
diff --git a/custom_widgets/yacreader_titled_toolbar.cpp b/custom_widgets/yacreader_titled_toolbar.cpp
index 9651a59d..a1d9a973 100644
--- a/custom_widgets/yacreader_titled_toolbar.cpp
+++ b/custom_widgets/yacreader_titled_toolbar.cpp
@@ -1,12 +1,12 @@
#include "yacreader_titled_toolbar.h"
+#include
#include
#include
-#include
-#include
-#include
#include
-
+#include
+#include
+#include
DropShadowLabel::DropShadowLabel(QWidget* parent) :
@@ -95,14 +95,26 @@ void YACReaderTitledToolBar::addAction(QAction * action)
{
QHBoxLayout * mainLayout = dynamic_cast(layout());
- QToolButton * tb = new QToolButton(this);
+//fix for QToolButton and retina support in OSX
+#ifdef Q_OS_MAC
+ QPushButton * pb = new QPushButton(this);
+ pb->setCursor(QCursor(Qt::ArrowCursor));
+ pb->setIcon(action->icon());
+ pb->addAction(action);
+
+ connect(pb, SIGNAL(clicked(bool)), action, SIGNAL(triggered(bool)));
+
+ mainLayout->addWidget(pb);
+#else
+ QToolButton * tb = new QToolButton(this);
tb->setCursor(QCursor(Qt::ArrowCursor));
tb->setDefaultAction(action);
tb->setIconSize(QSize(16,16));
tb->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
//tb->setStyleSheet("QToolButton:hover {background-color:#C5C5C5;}");
- mainLayout->addWidget(tb);
+ mainLayout->addWidget(tb);
+#endif
}
void YACReaderTitledToolBar::addSpacing(int spacing)
diff --git a/images/sidebar/addLabelIcon_osx.png b/images/sidebar/addLabelIcon_osx.png
old mode 100644
new mode 100755
index e1d4eee2..3f8a8a51
Binary files a/images/sidebar/addLabelIcon_osx.png and b/images/sidebar/addLabelIcon_osx.png differ
diff --git a/images/sidebar/addLabelIcon_osx@2x.png b/images/sidebar/addLabelIcon_osx@2x.png
old mode 100644
new mode 100755
index 6f688eab..e0e1fea8
Binary files a/images/sidebar/addLabelIcon_osx@2x.png and b/images/sidebar/addLabelIcon_osx@2x.png differ
diff --git a/images/sidebar/addNew_sidebar_osx.png b/images/sidebar/addNew_sidebar_osx.png
old mode 100644
new mode 100755
index 454b9fc8..aa101d8b
Binary files a/images/sidebar/addNew_sidebar_osx.png and b/images/sidebar/addNew_sidebar_osx.png differ
diff --git a/images/sidebar/addNew_sidebar_osx@2x.png b/images/sidebar/addNew_sidebar_osx@2x.png
old mode 100644
new mode 100755
index 3baf3d1b..30c05b8a
Binary files a/images/sidebar/addNew_sidebar_osx@2x.png and b/images/sidebar/addNew_sidebar_osx@2x.png differ
diff --git a/images/sidebar/colapse_osx.png b/images/sidebar/colapse_osx.png
old mode 100644
new mode 100755
index 96bfa372..b5b33008
Binary files a/images/sidebar/colapse_osx.png and b/images/sidebar/colapse_osx.png differ
diff --git a/images/sidebar/colapse_osx@2x.png b/images/sidebar/colapse_osx@2x.png
old mode 100644
new mode 100755
index eaf7a5f4..9c746a47
Binary files a/images/sidebar/colapse_osx@2x.png and b/images/sidebar/colapse_osx@2x.png differ
diff --git a/images/sidebar/delete_sidebar_osx.png b/images/sidebar/delete_sidebar_osx.png
old mode 100644
new mode 100755
index 6a4808d2..61bf6f9e
Binary files a/images/sidebar/delete_sidebar_osx.png and b/images/sidebar/delete_sidebar_osx.png differ
diff --git a/images/sidebar/delete_sidebar_osx@2x.png b/images/sidebar/delete_sidebar_osx@2x.png
old mode 100644
new mode 100755
index 237e4982..b15e34f6
Binary files a/images/sidebar/delete_sidebar_osx@2x.png and b/images/sidebar/delete_sidebar_osx@2x.png differ
diff --git a/images/sidebar/expand_osx.png b/images/sidebar/expand_osx.png
old mode 100644
new mode 100755
index e537efa3..754d92c1
Binary files a/images/sidebar/expand_osx.png and b/images/sidebar/expand_osx.png differ
diff --git a/images/sidebar/expand_osx@2x.png b/images/sidebar/expand_osx@2x.png
old mode 100644
new mode 100755
index 135314f8..7bb3316e
Binary files a/images/sidebar/expand_osx@2x.png and b/images/sidebar/expand_osx@2x.png differ
diff --git a/images/sidebar/libraryOptions@2x.png b/images/sidebar/libraryOptions@2x.png
new file mode 100644
index 00000000..b8413890
Binary files /dev/null and b/images/sidebar/libraryOptions@2x.png differ
diff --git a/images/sidebar/newLibraryIcon_osx.png b/images/sidebar/newLibraryIcon_osx.png
old mode 100644
new mode 100755
index 60e1eed9..7c4a5aea
Binary files a/images/sidebar/newLibraryIcon_osx.png and b/images/sidebar/newLibraryIcon_osx.png differ
diff --git a/images/sidebar/newLibraryIcon_osx@2x.png b/images/sidebar/newLibraryIcon_osx@2x.png
old mode 100644
new mode 100755
index 3baf3d1b..30c05b8a
Binary files a/images/sidebar/newLibraryIcon_osx@2x.png and b/images/sidebar/newLibraryIcon_osx@2x.png differ
diff --git a/images/sidebar/openLibraryIcon_osx.png b/images/sidebar/openLibraryIcon_osx.png
old mode 100644
new mode 100755
index 51eabbfb..0a61bd9a
Binary files a/images/sidebar/openLibraryIcon_osx.png and b/images/sidebar/openLibraryIcon_osx.png differ
diff --git a/images/sidebar/openLibraryIcon_osx@2x.png b/images/sidebar/openLibraryIcon_osx@2x.png
old mode 100644
new mode 100755
index da93f1f9..0875b44d
Binary files a/images/sidebar/openLibraryIcon_osx@2x.png and b/images/sidebar/openLibraryIcon_osx@2x.png differ
diff --git a/images/sidebar/renameListIcon_osx.png b/images/sidebar/renameListIcon_osx.png
old mode 100644
new mode 100755
index 8f6fffda..3ed190fd
Binary files a/images/sidebar/renameListIcon_osx.png and b/images/sidebar/renameListIcon_osx.png differ
diff --git a/images/sidebar/renameListIcon_osx@2x.png b/images/sidebar/renameListIcon_osx@2x.png
old mode 100644
new mode 100755
index 7270703c..9a6a25c9
Binary files a/images/sidebar/renameListIcon_osx@2x.png and b/images/sidebar/renameListIcon_osx@2x.png differ
diff --git a/images/sidebar/setRoot_osx.png b/images/sidebar/setRoot_osx.png
old mode 100644
new mode 100755
index 6101b824..a2da070d
Binary files a/images/sidebar/setRoot_osx.png and b/images/sidebar/setRoot_osx.png differ
diff --git a/images/sidebar/setRoot_osx@2x.png b/images/sidebar/setRoot_osx@2x.png
old mode 100644
new mode 100755
index e4a110eb..5dfcdd99
Binary files a/images/sidebar/setRoot_osx@2x.png and b/images/sidebar/setRoot_osx@2x.png differ