Merged luisangelsm/yacreader into default

YACReaderLibrary/classic_comics_view.cpp

@@ -94,7 +94,7 @@ ClassicComicsView::ClassicComicsView(QWidget *parent)
     hideFlowViewAction->setText(tr("Hide comic flow"));
     hideFlowViewAction->setData(HIDE_COMIC_VIEW_ACTION_YL);
     hideFlowViewAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(HIDE_COMIC_VIEW_ACTION_YL));
-    hideFlowViewAction->setIcon(QIcon(":/images/hideComicFlow.png"));
+    hideFlowViewAction->setIcon(QIcon(":/images/comics_view_toolbar/hideComicFlow.png"));
     hideFlowViewAction->setCheckable(true);
     hideFlowViewAction->setChecked(false);
 
@@ -337,12 +337,12 @@ void ClassicComicsView::removeItemsFromFlow(const QModelIndex &parent, int from,
 
 void ClassicComicsView::closeEvent(QCloseEvent *event)
 {
+    toolbar->removeAction(toolBarStretchAction);
+    toolbar->removeAction(hideFlowViewAction);
+
     saveTableHeadersStatus();
     saveSplitterStatus();
     ComicsView::closeEvent(event);
-
-    toolbar->removeAction(toolBarStretchAction);
-    toolbar->removeAction(hideFlowViewAction);
 }
 
 void ClassicComicsView::setupSearchingIcon()

YACReaderLibrary/grid_comics_view.cpp

@@ -1,16 +1,37 @@
 #include "grid_comics_view.h"
 
-#include <QtWidgets>
 #include <QtQuick>
+#include <QtWidgets>
 
-#include "yacreader_global.h"
 #include "comic.h"
 #include "comic_files_manager.h"
 #include "QsLog.h"
+#include "yacreader_global.h"
+#include "yacreader_tool_bar_stretch.h"
+
+//values relative to visible cells
+const unsigned int YACREADER_MIN_GRID_ZOOM_WIDTH = 156;
+const unsigned int YACREADER_MAX_GRID_ZOOM_WIDTH = 312;
+
+//GridView cells
+const unsigned int YACREADER_MIN_CELL_CUSTOM_HEIGHT = 295;
+const unsigned int YACREADER_MIN_CELL_CUSTOM_WIDTH = 185;
+
+//Covers
+const unsigned int YACREADER_MAX_COVER_HEIGHT = 236;
+const unsigned int YACREADER_MIN_COVER_WIDTH = YACREADER_MIN_GRID_ZOOM_WIDTH;
+
+//visible cells (realCell in qml), grid cells size is used to create faux inner margings
+const unsigned int YACREADER_MIN_ITEM_HEIGHT = YACREADER_MAX_COVER_HEIGHT + 51; //51 is the height of the bottom rectangle used for title and other info
+const unsigned int YACREADER_MIN_ITEM_WIDTH = YACREADER_MIN_COVER_WIDTH;
+
 
 GridComicsView::GridComicsView(QWidget *parent) :
     ComicsView(parent),_selectionModel(NULL)
 {
+    settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini", QSettings::IniFormat, this);
+    settings->beginGroup("libraryConfig");
+
     qmlRegisterType<ComicModel>("comicModel",1,0,"TableModel");
 
     view = new QQuickView();
@@ -20,6 +41,46 @@ GridComicsView::GridComicsView(QWidget *parent) :
     container->setFocusPolicy(Qt::TabFocus);
     view->setSource(QUrl("qrc:/qml/GridComicsView.qml"));
 
+    createCoverSizeSliderWidget();
+
+    int coverSize = settings->value(COMICS_GRID_COVER_SIZES, YACREADER_MIN_COVER_WIDTH).toInt();
+
+    coverSizeSlider->setValue(coverSize);
+    setCoversSize(coverSize);
+
+    QQmlContext *ctxt = view->rootContext();
+
+#ifdef Q_OS_MAC
+    ctxt->setContextProperty("backgroundColor", "#F6F6F6");
+    ctxt->setContextProperty("cellColor", "#FFFFFF");
+    ctxt->setContextProperty("selectedColor", "#FFFFFF");
+    ctxt->setContextProperty("selectedBorderColor", "#007AFF");
+    ctxt->setContextProperty("borderColor", "#DBDBDB");
+    ctxt->setContextProperty("titleColor", "#121212");
+    ctxt->setContextProperty("textColor", "#636363");
+    //fonts settings
+    ctxt->setContextProperty("fontSize", 11);
+    ctxt->setContextProperty("fontFamily", QApplication::font().family());
+    ctxt->setContextProperty("fontSpacing", 0.5);
+
+#else
+    ctxt->setContextProperty("backgroundColor", "#2A2A2A");
+    ctxt->setContextProperty("cellColor", "#212121");
+    ctxt->setContextProperty("selectedColor", "#121212");
+    ctxt->setContextProperty("selectedBorderColor", "#121212");
+    ctxt->setContextProperty("borderColor", "#121212");
+    ctxt->setContextProperty("titleColor", "#FFFFFF");
+    ctxt->setContextProperty("textColor", "#A8A8A8");
+    ctxt->setContextProperty("dropShadow",false);
+    //fonts settings
+    int fontSize = QApplication::font().pointSize();
+    if(fontSize == -1)
+        fontSize = QApplication::font().pixelSize();
+    ctxt->setContextProperty("fontSize", fontSize);
+    ctxt->setContextProperty("fontFamily", QApplication::font().family());
+    ctxt->setContextProperty("fontSpacing", 0.5);
+#endif
+
     setShowMarks(true);//TODO save this in settings
 
     QVBoxLayout * l = new QVBoxLayout;
@@ -38,11 +99,40 @@ GridComicsView::~GridComicsView()
    delete view;
 }
 
+void GridComicsView::createCoverSizeSliderWidget()
+{
+    toolBarStretch = new YACReaderToolBarStretch(this);
+    coverSizeSliderWidget = new QWidget(this);
+    coverSizeSliderWidget->setFixedWidth(200);
+    coverSizeSlider = new QSlider();
+    coverSizeSlider->setOrientation(Qt::Horizontal);
+    coverSizeSlider->setRange(YACREADER_MIN_GRID_ZOOM_WIDTH, YACREADER_MAX_GRID_ZOOM_WIDTH);
+
+    QHBoxLayout * horizontalLayout = new QHBoxLayout();
+    QLabel * smallLabel = new QLabel();
+    smallLabel->setPixmap(QPixmap(":/images/comics_view_toolbar/small_size_grid_zoom.png"));
+    horizontalLayout->addWidget(smallLabel);
+    horizontalLayout->addWidget(coverSizeSlider, 0, Qt::AlignVCenter);
+    QLabel * bigLabel = new QLabel();
+    bigLabel->setPixmap(QPixmap(":/images/comics_view_toolbar/big_size_grid_zoom.png"));
+    horizontalLayout->addWidget(bigLabel);
+    horizontalLayout->addSpacing(10);
+    horizontalLayout->setMargin(0);
+
+    coverSizeSliderWidget->setLayout(horizontalLayout);
+    //TODO add shortcuts (ctrl-+ and ctrl-- for zooming in out, + ctrl-0 for reseting the zoom)
+
+    connect(coverSizeSlider, SIGNAL(valueChanged(int)), this, SLOT(setCoversSize(int)));
+}
+
 void GridComicsView::setToolBar(QToolBar *toolBar)
 {
     QLOG_INFO() << "setToolBar";
     static_cast<QVBoxLayout *>(this->layout())->insertWidget(1,toolBar);
     this->toolbar = toolBar;
+
+     toolBarStretchAction = toolBar->addWidget(toolBarStretch);
+     coverSizeSliderAction = toolBar->addWidget(coverSizeSliderWidget);
 }
 
 void GridComicsView::setModel(ComicModel *model)
@@ -74,36 +164,6 @@ void GridComicsView::setModel(ComicModel *model)
             setCurrentIndex(model->index(0,0));
     }
 
-#ifdef Q_OS_MAC
-    ctxt->setContextProperty("backgroundColor", "#F5F5F5");
-    ctxt->setContextProperty("cellColor", "#FFFFFF");
-    ctxt->setContextProperty("selectedColor", "#FFFFFF");
-    ctxt->setContextProperty("selectedBorderColor", "#007AFF");
-    ctxt->setContextProperty("borderColor", "#DBDBDB");
-    ctxt->setContextProperty("titleColor", "#121212");
-    ctxt->setContextProperty("textColor", "#636363");
-    //fonts settings
-    ctxt->setContextProperty("fontSize", 11);
-    ctxt->setContextProperty("fontFamily", QApplication::font().family());
-    ctxt->setContextProperty("fontSpacing", 0.5);
-
-#else
-    ctxt->setContextProperty("backgroundColor", "#2A2A2A");
-    ctxt->setContextProperty("cellColor", "#212121");
-    ctxt->setContextProperty("selectedColor", "#121212");
-    ctxt->setContextProperty("selectedBorderColor", "#121212");
-    ctxt->setContextProperty("borderColor", "#121212");
-    ctxt->setContextProperty("titleColor", "#FFFFFF");
-    ctxt->setContextProperty("textColor", "#A8A8A8");
-    ctxt->setContextProperty("dropShadow",false);
-    //fonts settings
-    int fontSize = QApplication::font().pointSize();
-    if(fontSize == -1)
-        fontSize = QApplication::font().pixelSize();
-    ctxt->setContextProperty("fontSize", fontSize);
-    ctxt->setContextProperty("fontFamily", QApplication::font().family());
-    ctxt->setContextProperty("fontSpacing", 0.5);
-#endif
 
 
 }
@@ -185,6 +245,32 @@ void GridComicsView::requestedContextMenu(const QPoint &point)
     emit customContextMenuViewRequested(point);
 }
 
+void GridComicsView::setCoversSize(int width)
+{
+    QQmlContext *ctxt = view->rootContext();
+
+    QQuickItem * grid = view->rootObject()->findChild<QQuickItem *>(QStringLiteral("grid"));
+
+    if(grid != 0)
+    {
+        QLOG_INFO() << "method invoked";
+        QVariant cellCustomWidth = (width * YACREADER_MIN_CELL_CUSTOM_WIDTH) / YACREADER_MIN_GRID_ZOOM_WIDTH;
+        QMetaObject::invokeMethod(grid, "calculateCellWidths",
+                                  Q_ARG(QVariant, cellCustomWidth));
+    }
+
+    int cellBottomMarging = 8 * (1 + 2*(1 - (float(YACREADER_MAX_GRID_ZOOM_WIDTH - width) / (YACREADER_MAX_GRID_ZOOM_WIDTH - YACREADER_MIN_GRID_ZOOM_WIDTH))) );
+
+    ctxt->setContextProperty("cellCustomHeight", ((width * YACREADER_MAX_COVER_HEIGHT) / YACREADER_MIN_COVER_WIDTH) + 51 + cellBottomMarging);
+    ctxt->setContextProperty("cellCustomWidth", (width * YACREADER_MIN_CELL_CUSTOM_WIDTH) / YACREADER_MIN_COVER_WIDTH );
+
+    ctxt->setContextProperty("itemWidth", width);
+    ctxt->setContextProperty("itemHeight", ((width * YACREADER_MAX_COVER_HEIGHT) / YACREADER_MIN_COVER_WIDTH) + 51);
+
+    ctxt->setContextProperty("coverWidth", width);
+    ctxt->setContextProperty("coverHeight", (width * YACREADER_MAX_COVER_HEIGHT) / YACREADER_MIN_COVER_WIDTH);
+}
+
 QSize GridComicsView::sizeHint()
 {
         QLOG_INFO() << "sizeHint";
@@ -208,7 +294,7 @@ void GridComicsView::startDrag()
     QLOG_DEBUG() << "performDrag";
     QDrag *drag = new QDrag(this);
     drag->setMimeData(model->mimeData(_selectionModel->selectedRows()));
-    drag->setPixmap(QPixmap(":/images/openInYACReader.png")); //TODO add better image
+    drag->setPixmap(QPixmap(":/images/comics_view_toolbar/openInYACReader.png")); //TODO add better image
 
     /*Qt::DropAction dropAction =*/ drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction);
 }
@@ -333,6 +419,9 @@ void GridComicsView::setShowMarks(bool show)
 
 void GridComicsView::closeEvent(QCloseEvent *event)
 {
+    toolbar->removeAction(toolBarStretchAction);
+    toolbar->removeAction(coverSizeSliderAction);
+
     QLOG_INFO() << "closeEvent";
     QObject *object = view->rootObject();
     QMetaObject::invokeMethod(object, "exit");
@@ -340,4 +429,7 @@ void GridComicsView::closeEvent(QCloseEvent *event)
     view->close();
     event->accept();
     ComicsView::closeEvent(event);
+
+    //save settings
+    settings->setValue(COMICS_GRID_COVER_SIZES, coverSizeSlider->value());
 }

YACReaderLibrary/grid_comics_view.h

@@ -10,6 +10,7 @@ class QItemSelectionModel;
 class QQuickView;
 class QQuickView;
 
+class YACReaderToolBarStretch;
 
 class GridComicsView : public ComicsView
 {
@@ -65,14 +66,22 @@ public slots:
 
 protected slots:
     void requestedContextMenu(const QPoint & point);
+    void setCoversSize(int width);
 
 private:
+    QSettings * settings;
     QToolBar * toolbar;
+    YACReaderToolBarStretch * toolBarStretch;
+    QAction * toolBarStretchAction;
+    QWidget * coverSizeSliderWidget;
+    QSlider * coverSizeSlider;
+    QAction * coverSizeSliderAction;
     QItemSelectionModel * _selectionModel;
     QQuickView *view;
     QWidget *container;
     bool dummy;
     void closeEvent ( QCloseEvent * event );
+    void createCoverSizeSliderWidget();
 
 };
 

YACReaderLibrary/images.qrc

@@ -1,88 +1,99 @@
 <RCC>
     <qresource prefix="/">
-        <file>../images/sidebar/folder.png</file>
-        <file>../images/sidebar/folder_finished.png</file>
-        <file>../images/icon.png</file>
-        <file>../images/iconLibrary.png</file>
-        <file>../images/new.png</file>
-        <file>../images/openLibrary.png</file>
-        <file>../images/removeLibraryIcon.png</file>
-        <file>../images/updateLibraryIcon.png</file>
-        <file>../images/comicFolder.png</file>
-        <file>../images/notCover.png</file>
-        <file>../images/edit.png</file>
-        <file>../images/editIcon.png</file>
-        <file>../images/flow1.png</file>
-        <file>../images/flow2.png</file>
-        <file>../images/flow3.png</file>
-        <file>../images/flow4.png</file>
-        <file>../images/flow5.png</file>
-        <file>../images/importLibrary.png</file>
-        <file>../images/importLibraryIcon.png</file>
-        <file>../images/exportLibrary.png</file>
-        <file>../images/exportLibraryIcon.png</file>
-        <file>../images/importLibraryIcon.png</file>
-        <file>../images/open.png</file>
-        <file>../images/coversPackage.png</file>
-        <file>../images/setRead.png</file>
-        <file>../images/setUnread.png</file>
-        <file>../images/showMarks.png</file>
-        <file>../images/editComic.png</file>
-        <file>../images/selectAll.png</file>
-        <file>../images/hideComicFlow.png</file>
-        <file>../images/exportComicsInfo.png</file>
-        <file>../images/importComicsInfo.png</file>
-        <file>../images/exportComicsInfoIcon.png</file>
-        <file>../images/importComicsInfoIcon.png</file>
-        <file>../images/db.png</file>
-        <file>../images/asignNumber.png</file>
-        <file>../images/defaultCover.png</file>
-        <file>../images/iphoneConfig.png</file>
-        <file>../images/onStartFlowSelection.png</file>
-        <file>../images/onStartFlowSelection_es.png</file>
-        <file>../images/useNewFlowButton.png</file>
-        <file>../images/useOldFlowButton.png</file>
-        <file>../images/serverConfigBackground.png</file>
-        <file>../images/noLibrariesIcon.png</file>
-        <file>../images/noLibrariesLine.png</file>
-        <file>../images/importingIcon.png</file>
-        <file>../images/updatingIcon.png</file>
-        <file>../images/importTopCoversDecoration.png</file>
-        <file>../images/importBottomCoversDecoration.png</file>
-        <file>../images/glowLine.png</file>
-        <file>../images/readRibbon.png</file>
-        <file>../images/readingRibbon.png</file>
-        <file>../images/shownCovers.png</file>
-        <file>../images/hiddenCovers.png</file>
-        <file>../images/trash.png</file>
-        <file>../images/setReadButton.png</file>
-        <file>../images/openInYACReader.png</file>
-        <file>../images/main_toolbar/divider.png</file>
-        <file>../images/sidebar/collapsed_branch_osx.png</file>
-        <file>../images/sidebar/expanded_branch_osx.png</file>
-        <file>../images/sidebar/libraryIconSelected.png</file>
-        <file>../images/sidebar/libraryOptions.png</file>
-        <file>../images/sidebar/branch-open.png</file>
-        <file>../images/sidebar/branch-closed.png</file>
-        <file>../images/sidebar/expanded_branch_selected.png</file>
-        <file>../images/sidebar/collapsed_branch_selected.png</file>
-        <file>../images/previousCoverPage.png</file>
-        <file>../images/nextCoverPage.png</file>
-        <file>../images/getInfo.png</file>
+        <file>../images/accept_shortcut.png</file>
+        <file>../images/clear_shortcut.png</file>
+        <file>../images/comic_vine/downArrow.png</file>
+        <file>../images/comic_vine/nextPage.png</file>
+        <file>../images/comic_vine/previousPage.png</file>
         <file>../images/comic_vine/radioChecked.png</file>
         <file>../images/comic_vine/radioUnchecked.png</file>
         <file>../images/comic_vine/radioUnchecked.png</file>
         <file>../images/comic_vine/rowDown.png</file>
         <file>../images/comic_vine/rowUp.png</file>
-        <file>../images/comic_vine/previousPage.png</file>
-        <file>../images/comic_vine/nextPage.png</file>
-        <file>../images/comic_vine/downArrow.png</file>
         <file>../images/comic_vine/upArrow.png</file>
-        <file>../images/find_folder.png</file>
-        <file>../images/clear_shortcut.png</file>
-        <file>../images/accept_shortcut.png</file>
+        <file>../images/comicFolder.png</file>
+        <file>../images/comics_view_toolbar/asignNumber.png</file>
+        <file>../images/comics_view_toolbar/asignNumber@2x.png</file>
+        <file>../images/comics_view_toolbar/big_size_grid_zoom.png</file>
+        <file>../images/comics_view_toolbar/big_size_grid_zoom@2x.png</file>
+        <file>../images/comics_view_toolbar/editComic.png</file>
+        <file>../images/comics_view_toolbar/editComic@2x.png</file>
+        <file>../images/comics_view_toolbar/getInfo.png</file>
+        <file>../images/comics_view_toolbar/getInfo@2x.png</file>
+        <file>../images/comics_view_toolbar/hideComicFlow.png</file>
+        <file>../images/comics_view_toolbar/hideComicFlow@2x.png</file>
+        <file>../images/comics_view_toolbar/openInYACReader.png</file>
+        <file>../images/comics_view_toolbar/openInYACReader@2x.png</file>
+        <file>../images/comics_view_toolbar/selectAll.png</file>
+        <file>../images/comics_view_toolbar/selectAll@2x.png</file>
+        <file>../images/comics_view_toolbar/setReadButton.png</file>
+        <file>../images/comics_view_toolbar/setReadButton@2x.png</file>
+        <file>../images/comics_view_toolbar/setUnread.png</file>
+        <file>../images/comics_view_toolbar/setUnread@2x.png</file>
+        <file>../images/comics_view_toolbar/showMarks.png</file>
+        <file>../images/comics_view_toolbar/showMarks@2x.png</file>
+        <file>../images/comics_view_toolbar/small_size_grid_zoom.png</file>
+        <file>../images/comics_view_toolbar/small_size_grid_zoom@2x.png</file>
+        <file>../images/comics_view_toolbar/trash.png</file>
+        <file>../images/comics_view_toolbar/trash.png</file>
+        <file>../images/coversPackage.png</file>
+        <file>../images/db.png</file>
+        <file>../images/defaultCover.png</file>
+        <file>../images/edit.png</file>
+        <file>../images/empty_current_readings.png</file>
+        <file>../images/empty_favorites.png</file>
+        <file>../images/empty_label.png</file>
+        <file>../images/exportComicsInfo.png</file>
+        <file>../images/exportLibrary.png</file>
         <file>../images/f_overlayed.png</file>
         <file>../images/f_overlayed_retina.png</file>
+        <file>../images/find_folder.png</file>
+        <file>../images/flow1.png</file>
+        <file>../images/flow2.png</file>
+        <file>../images/flow3.png</file>
+        <file>../images/flow4.png</file>
+        <file>../images/flow5.png</file>
+        <file>../images/glowLine.png</file>
+        <file>../images/hiddenCovers.png</file>
+        <file>../images/icon.png</file>
+        <file>../images/iconLibrary.png</file>
+        <file>../images/importBottomCoversDecoration.png</file>
+        <file>../images/importComicsInfo.png</file>
+        <file>../images/importingIcon.png</file>
+        <file>../images/importLibrary.png</file>
+        <file>../images/importTopCoversDecoration.png</file>
+        <file>../images/iphoneConfig.png</file>
+        <file>../images/main_toolbar/divider.png</file>
+        <file>../images/menus_icons/editIcon.png</file>
+        <file>../images/menus_icons/editIcon@2x.png</file>
+        <file>../images/menus_icons/exportComicsInfoIcon.png</file>
+        <file>../images/menus_icons/exportComicsInfoIcon@2x.png</file>
+        <file>../images/menus_icons/exportLibraryIcon.png</file>
+        <file>../images/menus_icons/exportLibraryIcon@2x.png</file>
+        <file>../images/menus_icons/importComicsInfoIcon.png</file>
+        <file>../images/menus_icons/importComicsInfoIcon@2x.png</file>
+        <file>../images/menus_icons/importLibraryIcon.png</file>
+        <file>../images/menus_icons/importLibraryIcon@2x.png</file>
+        <file>../images/menus_icons/open.png</file>
+        <file>../images/menus_icons/open@2x.png</file>
+        <file>../images/menus_icons/removeLibraryIcon.png</file>
+        <file>../images/menus_icons/removeLibraryIcon@2x.png</file>
+        <file>../images/menus_icons/updateLibraryIcon.png</file>
+        <file>../images/menus_icons/updateLibraryIcon@2x.png</file>
+        <file>../images/new.png</file>
+        <file>../images/nextCoverPage.png</file>
+        <file>../images/noLibrariesIcon.png</file>
+        <file>../images/noLibrariesLine.png</file>
+        <file>../images/notCover.png</file>
+        <file>../images/onStartFlowSelection.png</file>
+        <file>../images/onStartFlowSelection_es.png</file>
+        <file>../images/openLibrary.png</file>
+        <file>../images/previousCoverPage.png</file>
+        <file>../images/readingRibbon.png</file>
+        <file>../images/readRibbon.png</file>
+        <file>../images/searching_icon.png</file>
+        <file>../images/serverConfigBackground.png</file>
+        <file>../images/setRead.png</file>
         <file>../images/shortcuts_group_comics.png</file>
         <file>../images/shortcuts_group_folders.png</file>
         <file>../images/shortcuts_group_general.png</file>
@@ -91,9 +102,20 @@
         <file>../images/shortcuts_group_page.png</file>
         <file>../images/shortcuts_group_reading.png</file>
         <file>../images/shortcuts_group_visualization.png</file>
-        <file>../images/searching_icon.png</file>
-        <file>../images/empty_label.png</file>
-        <file>../images/empty_current_readings.png</file>
-        <file>../images/empty_favorites.png</file>
+        <file>../images/shownCovers.png</file>
+        <file>../images/sidebar/branch-closed.png</file>
+        <file>../images/sidebar/branch-open.png</file>
+        <file>../images/sidebar/collapsed_branch_osx.png</file>
+        <file>../images/sidebar/collapsed_branch_selected.png</file>
+        <file>../images/sidebar/expanded_branch_osx.png</file>
+        <file>../images/sidebar/expanded_branch_selected.png</file>
+        <file>../images/sidebar/folder.png</file>
+        <file>../images/sidebar/folder_finished.png</file>
+        <file>../images/sidebar/libraryIconSelected.png</file>
+        <file>../images/sidebar/libraryOptions.png</file>
+        <file>../images/sidebar/libraryOptions@2x.png</file>
+        <file>../images/updatingIcon.png</file>
+        <file>../images/useNewFlowButton.png</file>
+        <file>../images/useOldFlowButton.png</file>
     </qresource>
 </RCC>

YACReaderLibrary/library_window.cpp

@@ -504,49 +504,49 @@ void LibraryWindow::createActions()
     exportComicsInfoAction->setToolTip(tr("Export comics info"));
     exportComicsInfoAction->setData(EXPORT_COMICS_INFO_ACTION_YL);
     exportComicsInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EXPORT_COMICS_INFO_ACTION_YL));
-    exportComicsInfoAction->setIcon(QIcon(":/images/exportComicsInfoIcon.png"));
+    exportComicsInfoAction->setIcon(QIcon(":/images/menus_icons/exportComicsInfoIcon.png"));
 
     importComicsInfoAction = new QAction(tr("Import comics info"),this);
     importComicsInfoAction->setToolTip(tr("Import comics info"));
     importComicsInfoAction->setData(IMPORT_COMICS_INFO_ACTION_YL);
     importComicsInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(IMPORT_COMICS_INFO_ACTION_YL));
-    importComicsInfoAction->setIcon(QIcon(":/images/importComicsInfoIcon.png"));
+    importComicsInfoAction->setIcon(QIcon(":/images/menus_icons/importComicsInfoIcon.png"));
 
     exportLibraryAction = new QAction(tr("Pack covers"),this);
     exportLibraryAction->setToolTip(tr("Pack the covers of the selected library"));
     exportLibraryAction->setData(EXPORT_LIBRARY_ACTION_YL);
     exportLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EXPORT_LIBRARY_ACTION_YL));
-    exportLibraryAction->setIcon(QIcon(":/images/exportLibraryIcon.png"));
+    exportLibraryAction->setIcon(QIcon(":/images/menus_icons/exportLibraryIcon.png"));
 
     importLibraryAction = new QAction(tr("Unpack covers"),this);
     importLibraryAction->setToolTip(tr("Unpack a catalog"));
     importLibraryAction->setData(IMPORT_LIBRARY_ACTION_YL);
     importLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(IMPORT_LIBRARY_ACTION_YL));
-    importLibraryAction->setIcon(QIcon(":/images/importLibraryIcon.png"));
+    importLibraryAction->setIcon(QIcon(":/images/menus_icons/importLibraryIcon.png"));
 
     updateLibraryAction = new QAction(tr("Update library"),this);
     updateLibraryAction->setToolTip(tr("Update current library"));
     updateLibraryAction->setData(UPDATE_LIBRARY_ACTION_YL);
     updateLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(UPDATE_LIBRARY_ACTION_YL));
-    updateLibraryAction->setIcon(QIcon(":/images/updateLibraryIcon.png"));
+    updateLibraryAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.png"));
 
     renameLibraryAction = new QAction(tr("Rename library"),this);
     renameLibraryAction->setToolTip(tr("Rename current library"));
     renameLibraryAction->setData(RENAME_LIBRARY_ACTION_YL);
     renameLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(RENAME_LIBRARY_ACTION_YL));
-    renameLibraryAction->setIcon(QIcon(":/images/editIcon.png"));
+    renameLibraryAction->setIcon(QIcon(":/images/menus_icons/editIcon.png"));
 
     removeLibraryAction = new QAction(tr("Remove library"),this);
     removeLibraryAction->setToolTip(tr("Remove current library from your collection"));
     removeLibraryAction->setData(REMOVE_LIBRARY_ACTION_YL);
     removeLibraryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(REMOVE_LIBRARY_ACTION_YL));
-    removeLibraryAction->setIcon(QIcon(":/images/removeLibraryIcon.png"));
+    removeLibraryAction->setIcon(QIcon(":/images/menus_icons/removeLibraryIcon.png"));
 
     openComicAction = new QAction(tr("Open current comic"),this);
     openComicAction->setToolTip(tr("Open current comic on YACReader"));
     openComicAction->setData(OPEN_COMIC_ACTION_YL);
     openComicAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_COMIC_ACTION_YL));
-    openComicAction->setIcon(QIcon(":/images/openInYACReader.png"));
+    openComicAction->setIcon(QIcon(":/images/comics_view_toolbar/openInYACReader.png"));
 
     saveCoversToAction = new QAction(tr("Save selected covers to..."),this);
     saveCoversToAction->setToolTip(tr("Save covers of the selected comics as JPG files"));
@@ -557,28 +557,28 @@ void LibraryWindow::createActions()
     setAsReadAction->setToolTip(tr("Set comic as read"));
     setAsReadAction->setData(SET_AS_READ_ACTION_YL);
     setAsReadAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_AS_READ_ACTION_YL));
-    setAsReadAction->setIcon(QIcon(":/images/setReadButton.png"));
+    setAsReadAction->setIcon(QIcon(":/images/comics_view_toolbar/setReadButton.png"));
 
     setAsNonReadAction = new QAction(tr("Set as unread"),this);
     setAsNonReadAction->setToolTip(tr("Set comic as unread"));
     setAsNonReadAction->setData(SET_AS_NON_READ_ACTION_YL);
     setAsNonReadAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_AS_NON_READ_ACTION_YL));
-    setAsNonReadAction->setIcon(QIcon(":/images/setUnread.png"));
+    setAsNonReadAction->setIcon(QIcon(":/images/comics_view_toolbar/setUnread.png"));
 
     /*setAllAsReadAction = new QAction(tr("Set all as read"),this);
         setAllAsReadAction->setToolTip(tr("Set all comics as read"));
-        setAllAsReadAction->setIcon(QIcon(":/images/setAllRead.png"));
+        setAllAsReadAction->setIcon(QIcon(":/images/comics_view_toolbar/setAllRead.png"));
 
         setAllAsNonReadAction = new QAction(tr("Set all as unread"),this);
         setAllAsNonReadAction->setToolTip(tr("Set all comics as unread"));
-        setAllAsNonReadAction->setIcon(QIcon(":/images/setAllUnread.png"));*/
+        setAllAsNonReadAction->setIcon(QIcon(":/images/comics_view_toolbar/setAllUnread.png"));*/
 
     showHideMarksAction = new QAction(tr("Show/Hide marks"),this);
     showHideMarksAction->setToolTip(tr("Show or hide read marks"));
     showHideMarksAction->setData(SHOW_HIDE_MARKS_ACTION_YL);
     showHideMarksAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_HIDE_MARKS_ACTION_YL));
     showHideMarksAction->setCheckable(true);
-    showHideMarksAction->setIcon(QIcon(":/images/showMarks.png"));
+    showHideMarksAction->setIcon(QIcon(":/images/comics_view_toolbar/showMarks.png"));
     showHideMarksAction->setChecked(true);
 #ifndef Q_OS_MAC
     toggleFullScreenAction = new QAction(tr("Fullscreen mode on/off"),this);
@@ -659,7 +659,7 @@ void LibraryWindow::createActions()
     openContainingFolderAction->setText(tr("Open folder..."));
     openContainingFolderAction->setData(OPEN_CONTAINING_FOLDER_ACTION_YL);
     openContainingFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_CONTAINING_FOLDER_ACTION_YL));
-    openContainingFolderAction->setIcon(QIcon(":/images/open.png"));
+    openContainingFolderAction->setIcon(QIcon(":/images/menus_icons/open.png"));
 
     setFolderAsNotCompletedAction = new QAction(this);
     setFolderAsNotCompletedAction->setText(tr("Set as uncompleted"));
@@ -685,7 +685,7 @@ void LibraryWindow::createActions()
     openContainingFolderComicAction->setText(tr("Open containing folder..."));
     openContainingFolderComicAction->setData(OPEN_CONTAINING_FOLDER_COMIC_ACTION_YL);
     openContainingFolderComicAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_CONTAINING_FOLDER_COMIC_ACTION_YL));
-    openContainingFolderComicAction->setIcon(QIcon(":/images/open.png"));
+    openContainingFolderComicAction->setIcon(QIcon(":/images/menus_icons/open.png"));
 
     resetComicRatingAction = new QAction(this);
     resetComicRatingAction->setText(tr("Reset comic rating"));
@@ -697,19 +697,19 @@ void LibraryWindow::createActions()
     selectAllComicsAction->setText(tr("Select all comics"));
     selectAllComicsAction->setData(SELECT_ALL_COMICS_ACTION_YL);
     selectAllComicsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SELECT_ALL_COMICS_ACTION_YL));
-    selectAllComicsAction->setIcon(QIcon(":/images/selectAll.png"));
+    selectAllComicsAction->setIcon(QIcon(":/images/comics_view_toolbar/selectAll.png"));
 
     editSelectedComicsAction = new QAction(this);
     editSelectedComicsAction->setText(tr("Edit"));
     editSelectedComicsAction->setData(EDIT_SELECTED_COMICS_ACTION_YL);
     editSelectedComicsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(EDIT_SELECTED_COMICS_ACTION_YL));
-    editSelectedComicsAction->setIcon(QIcon(":/images/editComic.png"));
+    editSelectedComicsAction->setIcon(QIcon(":/images/comics_view_toolbar/editComic.png"));
 
     asignOrderAction = new QAction(this);
     asignOrderAction->setText(tr("Asign current order to comics"));
     asignOrderAction->setData(ASIGN_ORDER_ACTION_YL);
     asignOrderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ASIGN_ORDER_ACTION_YL));
-    asignOrderAction->setIcon(QIcon(":/images/asignNumber.png"));
+    asignOrderAction->setIcon(QIcon(":/images/comics_view_toolbar/asignNumber.png"));
 
     forceCoverExtractedAction = new QAction(this);
     forceCoverExtractedAction->setText(tr("Update cover"));
@@ -721,13 +721,13 @@ void LibraryWindow::createActions()
     deleteComicsAction->setText(tr("Delete selected comics"));
     deleteComicsAction->setData(DELETE_COMICS_ACTION_YL);
     deleteComicsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(DELETE_COMICS_ACTION_YL));
-    deleteComicsAction->setIcon(QIcon(":/images/trash.png"));
+    deleteComicsAction->setIcon(QIcon(":/images/comics_view_toolbar/trash.png"));
 
     getInfoAction = new QAction(this);
     getInfoAction->setData(GET_INFO_ACTION_YL);
     getInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(GET_INFO_ACTION_YL));
     getInfoAction->setText(tr("Download tags from Comic Vine"));
-    getInfoAction->setIcon(QIcon(":/images/getInfo.png"));
+    getInfoAction->setIcon(QIcon(":/images/comics_view_toolbar/getInfo.png"));
     //-------------------------------------------------------------------------
 
     showEditShortcutsAction = new QAction(tr("Edit shortcuts"),this);
@@ -737,12 +737,12 @@ void LibraryWindow::createActions()
     addAction(showEditShortcutsAction);
 
     updateFolderAction = new QAction(tr("Update folder"), this);
-    updateFolderAction->setIcon(QIcon(":/images/updateLibraryIcon.png"));
+    updateFolderAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.png"));
 
     updateCurrentFolderAction = new QAction(tr("Update current folder"), this);
     updateCurrentFolderAction->setData(UPDATE_CURRENT_FOLDER_ACTION_YL);
     updateCurrentFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(UPDATE_CURRENT_FOLDER_ACTION_YL));
-    updateCurrentFolderAction->setIcon(QIcon(":/images/updateLibraryIcon.png"));
+    updateCurrentFolderAction->setIcon(QIcon(":/images/menus_icons/updateLibraryIcon.png"));
 
     addReadingListAction = new QAction(tr("Add new reading list"), this);
     addReadingListAction->setData(ADD_READING_LIST_ACTION_YL);

YACReaderLibrary/qml.qrc

@@ -5,5 +5,6 @@
         <file>qml/tick.png</file>
         <file>qml/reading.png</file>
         <file>qml/star_menu.png</file>
+        <file>qml/star_menu@2x.png</file>
     </qresource>
 </RCC>

YACReaderLibrary/qml/GridComicsView.qml

@@ -48,7 +48,9 @@ Rectangle {
                         dragging = false;
                 }
 
-                width: 156; height: 287
+                width: itemWidth
+                height: itemHeight
+
                 color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index))?selectedColor:cellColor;
                 border.color: ((dummyValue || !dummyValue) && comicsSelectionHelper.isSelectedIndex(index))?selectedBorderColor:borderColor;
                 border.width: (Qt.platform.os === "osx")?1:0;
@@ -159,9 +161,7 @@ Rectangle {
                             }
                         }
                     }
-
                 }
-
             }
 
             /**/
@@ -169,8 +169,8 @@ Rectangle {
             //cover
             Image {
                 id: coverElement
-                width: 156
-                height: 236
+                width: coverWidth
+                height: coverHeight
                 anchors {horizontalCenter: parent.horizontalCenter; top: realCell.top; topMargin: 0}
                 source: cover_path
                 fillMode: Image.PreserveAspectCrop
@@ -183,8 +183,8 @@ Rectangle {
 
             //border
             Rectangle {
-                width: 156
-                height: 236
+                width: coverElement.width
+                height: coverElement.height
                 anchors {horizontalCenter: parent.horizontalCenter; top: realCell.top; topMargin: 0}
                 color: "transparent"
                 border {
@@ -206,8 +206,8 @@ Rectangle {
             //title
             Text {
                 id : titleText
-                anchors { top: realCell.top; left: realCell.left; leftMargin: 4; rightMargin: 4; topMargin: 238; }
-                width: 148
+                anchors { top: coverElement.bottom; left: realCell.left; leftMargin: 4; rightMargin: 4; topMargin: 4; }
+                width: itemWidth - 8
                 maximumLineCount: 2
                 wrapMode: Text.WordWrap
                 text: title
@@ -218,6 +218,7 @@ Rectangle {
                 font.pointSize: fontSize
                 font.family: fontFamily
             }
+
             //number
             Text {
                 anchors {bottom: realCell.bottom; left: realCell.left; margins: 4}
@@ -227,12 +228,16 @@ Rectangle {
                 font.pointSize: fontSize
                 font.family: fontFamily
             }
+
             //page icon
             Image {
                 id: pageImage
                 anchors {bottom: realCell.bottom; right: realCell.right; bottomMargin: 5; rightMargin: 4; leftMargin: 4}
                 source: "page.png"
+                width: 8
+                height: 10
             }
+
             //numPages
             Text {
                 id: pages
@@ -243,11 +248,14 @@ Rectangle {
                 font.pointSize: fontSize
                 font.family: fontFamily
             }
+
             //rating icon
             Image {
                 id: ratingImage
                 anchors {bottom: realCell.bottom; right: pageImage.left; bottomMargin: 5; rightMargin: Math.floor(pages.width)+12}
                 source: "star.png"
+                width: 13
+                height: 11
 
                 MouseArea  {
                     anchors.fill: parent
@@ -335,13 +343,13 @@ Rectangle {
                     }
                 }
             }
-
         }
 
         GridView {
             id:grid
+            objectName: "grid"
             anchors.fill: parent
-            cellHeight: 295
+            cellHeight: cellCustomHeight
             highlight: appHighlight
             focus: true
             model: comicsList
@@ -388,20 +396,23 @@ Rectangle {
             }
 
             function numCellsPerRow() {
-                return Math.floor(width / 185);
+                return Math.floor(width / cellCustomWidth);
             }
 
-            onWidthChanged: {
-                var numCells = numCellsPerRow();
-                var rest = width % 185;
-
-                if(numCells > 0)
-                {
-                    cellWidth = Math.floor(width / numCells) ;
-                    //console.log("numCells=",numCells,"rest=",rest,"cellWidth=",cellWidth,"width=",width);
-                }
+           onWidthChanged: {
+                calculateCellWidths(cellCustomWidth);
             }
+
+           function calculateCellWidths(cWidth) {
+
+               var wholeCells = Math.floor(width / cWidth);
+               var rest = width - (cWidth * wholeCells)
+
+               grid.cellWidth = cWidth + Math.floor(rest / wholeCells);
+               console.log("cWidth",cWidth,"wholeCells=",wholeCells,"rest=",rest,"cellWidth=",cellWidth,"width=",width);
+           }
         }
+
         focus: true
         Keys.onPressed: {
             if (event.modifiers & Qt.ControlModifier || event.modifiers & Qt.ShiftModifier)

YACReaderLibrary/qml_osx.qrc

@@ -1,6 +1,8 @@
 <RCC>
     <qresource prefix="/">
         <file alias="qml/page.png">qml/page-macosx.png</file>
+        <file alias="qml/page.png">qml/page-macosx@2x.png</file>
         <file alias="qml/star.png">qml/star-macosx.png</file>
+        <file alias="qml/star.png">qml/star-macosx@2x.png</file>
     </qresource>
 </RCC>

common/yacreader_global.h

@@ -63,6 +63,7 @@
 #define COMICS_VIEW_STATUS "COMICS_VIEW_STATUS"
 #define COMICS_VIEW_FLOW_SPLITTER_STATUS "COMICS_VIEW_FLOW_SPLITTER_STATUS"
 #define SIDEBAR_SPLITTER_STATUS "SIDEBAR_SPLITTER_STATUS"
+#define COMICS_GRID_COVER_SIZES "COMICS_GRID_COVER_SIZES"
 
 #define NUM_DAYS_BETWEEN_VERSION_CHECKS "NUM_DAYS_BETWEEN_VERSION_CHECKS"
 #define LAST_VERSION_CHECK "LAST_VERSION_CHECK"

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"));

custom_widgets/yacreader_sidebar.cpp

@@ -23,9 +23,15 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent) :
     readingListsView = new YACReaderReadingListsView;
 	selectedLibrary = new YACReaderLibraryListWidget;
 
-	librariesTitle = new YACReaderTitledToolBar(tr("LIBRARIES"));
-	foldersTitle = new YACReaderTitledToolBar(tr("FOLDERS"));
+#ifdef Q_OS_MAC
+    librariesTitle = new YACReaderTitledToolBar(tr("Libraries"));
+    foldersTitle = new YACReaderTitledToolBar(tr("Folders"));
+    readingListsTitle = new YACReaderTitledToolBar(tr("Reading Lists"));
+#else
+    librariesTitle = new YACReaderTitledToolBar(tr("LIBRARIES"));
+    foldersTitle = new YACReaderTitledToolBar(tr("FOLDERS"));
     readingListsTitle = new YACReaderTitledToolBar(tr("READING LISTS"));
+#endif
 
     splitter = new QSplitter(this);
     splitter->setOrientation(Qt::Vertical);
@@ -150,7 +156,7 @@ void YACReaderSideBar::paintEvent(QPaintEvent * event)
 #ifdef Q_OS_MAC
 	QPainter painter(this);
 
-    painter.fillRect(0,0,width(),height(),QColor("#FFFFFF"));
+    painter.fillRect(0,0,width(),height(),QColor("#F1F1F1"));
 #else
 	QPainter painter(this);
 

custom_widgets/yacreader_table_view.cpp

@@ -158,7 +158,7 @@ void YACReaderTableView::performDrag()
     QLOG_DEBUG() << "performDrag";
     QDrag *drag = new QDrag(this);
     drag->setMimeData(model()->mimeData(selectionModel()->selectedRows()));
-    drag->setPixmap(QPixmap(":/images/openInYACReader.png")); //TODO add better image
+    drag->setPixmap(QPixmap(":/images/comics_view_toolbar/openInYACReader.png")); //TODO add better image
 
     /*Qt::DropAction dropAction =*/ drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction);
 }

custom_widgets/yacreader_titled_toolbar.cpp

@@ -1,12 +1,12 @@
 #include "yacreader_titled_toolbar.h"
 
+#include <QAction>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QPixmap>
-#include <QToolButton>
-#include <QGraphicsDropShadowEffect>
 #include <QPainter>
-
+#include <QPixmap>
+#include <QPushButton>
+#include <QToolButton>
 
 
 DropShadowLabel::DropShadowLabel(QWidget* parent) :
@@ -40,8 +40,9 @@ void DropShadowLabel::paintEvent(QPaintEvent *event)
 
 	QPainter painter(this);
 	painter.setFont(font());
-	//TODO find where is the '3' comming from?
+#ifndef Q_OS_MAC
 	drawTextEffect(&painter, QPoint(contentsMargins().left(), 1));
+#endif
 	drawText(&painter, QPoint(contentsMargins().left(), 0));
 }
 
@@ -71,8 +72,8 @@ YACReaderTitledToolBar::YACReaderTitledToolBar(const QString & title, QWidget *p
 	nameLabel->setText(title);
 #ifdef Q_OS_MAC
 	QString nameLabelStyleSheet = "QLabel {padding:0 0 0 10px; margin:0px; font-size:11px; font-weight:bold;}";
-	nameLabel->setColor(QColor("#707E8C"));
-	nameLabel->setDropShadowColor(QColor("#F9FAFB"));
+    nameLabel->setColor(QColor("#808080"));
+    //nameLabel->setDropShadowColor(QColor("#F9FAFB"));
 #else
 	QString nameLabelStyleSheet = "QLabel {padding:0 0 0 10px; margin:0px; font-size:11px; font-weight:bold;}";
 	nameLabel->setColor(QColor("#BDBFBF"));
@@ -95,14 +96,26 @@ void YACReaderTitledToolBar::addAction(QAction * action)
 {
 	QHBoxLayout * mainLayout = dynamic_cast<QHBoxLayout *>(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)