diff --git a/YACReader/images_osx.qrc b/YACReader/images_osx.qrc index 9246ef44..0e4466f7 100644 --- a/YACReader/images_osx.qrc +++ b/YACReader/images_osx.qrc @@ -1,28 +1,28 @@ -../images/viewer_toolbar/close_osx.png -../images/viewer_toolbar/flow_osx.png -../images/viewer_toolbar/goto_osx.png -../images/viewer_toolbar/info_osx.png -../images/viewer_toolbar/next_osx.png -../images/viewer_toolbar/openFolder_osx.png -../images/viewer_toolbar/openPrevious_osx.png -../images/viewer_toolbar/previous_osx.png -../images/viewer_toolbar/rotateR_osx.png -../images/viewer_toolbar/shortcuts_osx.png -../images/viewer_toolbar/toHeight_osx.png -../images/viewer_toolbar/translator_osx.png +../images/viewer_toolbar/bookmark_osx.png +../images/viewer_toolbar/close_osx.png +../images/viewer_toolbar/doublePage_osx.png +../images/viewer_toolbar/flow_osx.png +../images/viewer_toolbar/full_osx.png +../images/viewer_toolbar/goto_osx.png +../images/viewer_toolbar/help_osx.png +../images/viewer_toolbar/info_osx.png +../images/viewer_toolbar/magnifyingGlass_osx.png +../images/viewer_toolbar/next_osx.png +../images/viewer_toolbar/open_osx.png +../images/viewer_toolbar/openFolder_osx.png +../images/viewer_toolbar/openNext_osx.png +../images/viewer_toolbar/openPrevious_osx.png +../images/viewer_toolbar/options_osx.png +../images/viewer_toolbar/previous_osx.png +../images/viewer_toolbar/rotateL_osx.png +../images/viewer_toolbar/rotateR_osx.png +../images/viewer_toolbar/save_osx.png +../images/viewer_toolbar/shortcuts_osx.png +../images/viewer_toolbar/showBookmarks_osx.png +../images/viewer_toolbar/toHeight_osx.png +../images/viewer_toolbar/toWidth_osx.png +../images/viewer_toolbar/translator_osx.png \ No newline at end of file diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index 3a49dcc6..fcf7b21a 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -312,8 +312,11 @@ void MainWindowViewer::createToolBars() comicToolBar = addToolBar(tr("&File")); comicToolBar->setStyleSheet("QToolBar{border:none;}"); - +#ifdef Q_OS_MAC + comicToolBar->setIconSize(QSize(17,17)); +#else comicToolBar->setIconSize(QSize(18,18)); +#endif QToolButton * tb = new QToolButton(); tb->addAction(openAction); diff --git a/images/viewer_toolbar/bookmark_osx.png b/images/viewer_toolbar/bookmark_osx.png index 00fa296c..d5621649 100644 Binary files a/images/viewer_toolbar/bookmark_osx.png and b/images/viewer_toolbar/bookmark_osx.png differ diff --git a/images/viewer_toolbar/close_osx.png b/images/viewer_toolbar/close_osx.png index def6fe8a..cc530b62 100644 Binary files a/images/viewer_toolbar/close_osx.png and b/images/viewer_toolbar/close_osx.png differ diff --git a/images/viewer_toolbar/doublePage_osx.png b/images/viewer_toolbar/doublePage_osx.png index 5d608096..c0c3a33e 100644 Binary files a/images/viewer_toolbar/doublePage_osx.png and b/images/viewer_toolbar/doublePage_osx.png differ diff --git a/images/viewer_toolbar/flow_osx.png b/images/viewer_toolbar/flow_osx.png index bf48346d..2519e13f 100644 Binary files a/images/viewer_toolbar/flow_osx.png and b/images/viewer_toolbar/flow_osx.png differ diff --git a/images/viewer_toolbar/full_osx.png b/images/viewer_toolbar/full_osx.png index 2fb8aa50..97b2908d 100644 Binary files a/images/viewer_toolbar/full_osx.png and b/images/viewer_toolbar/full_osx.png differ diff --git a/images/viewer_toolbar/goto_osx.png b/images/viewer_toolbar/goto_osx.png index 8f4ed4e4..1edfb749 100644 Binary files a/images/viewer_toolbar/goto_osx.png and b/images/viewer_toolbar/goto_osx.png differ diff --git a/images/viewer_toolbar/help_osx.png b/images/viewer_toolbar/help_osx.png index 1c4886cc..4fd9af67 100644 Binary files a/images/viewer_toolbar/help_osx.png and b/images/viewer_toolbar/help_osx.png differ diff --git a/images/viewer_toolbar/info_osx.png b/images/viewer_toolbar/info_osx.png index 7c319cbb..b15725fe 100644 Binary files a/images/viewer_toolbar/info_osx.png and b/images/viewer_toolbar/info_osx.png differ diff --git a/images/viewer_toolbar/magnifyingGlass_osx.png b/images/viewer_toolbar/magnifyingGlass_osx.png new file mode 100644 index 00000000..4498e633 Binary files /dev/null and b/images/viewer_toolbar/magnifyingGlass_osx.png differ diff --git a/images/viewer_toolbar/openFolder_osx.png b/images/viewer_toolbar/openFolder_osx.png index 8be4605c..6fcd9572 100644 Binary files a/images/viewer_toolbar/openFolder_osx.png and b/images/viewer_toolbar/openFolder_osx.png differ diff --git a/images/viewer_toolbar/openNext_osx.png b/images/viewer_toolbar/openNext_osx.png index 0fc045a3..cac98be0 100644 Binary files a/images/viewer_toolbar/openNext_osx.png and b/images/viewer_toolbar/openNext_osx.png differ diff --git a/images/viewer_toolbar/openPrevious_osx.png b/images/viewer_toolbar/openPrevious_osx.png index 9b8ad89e..1e12ede2 100644 Binary files a/images/viewer_toolbar/openPrevious_osx.png and b/images/viewer_toolbar/openPrevious_osx.png differ diff --git a/images/viewer_toolbar/open_osx.png b/images/viewer_toolbar/open_osx.png index 9a715a5a..55945cda 100644 Binary files a/images/viewer_toolbar/open_osx.png and b/images/viewer_toolbar/open_osx.png differ diff --git a/images/viewer_toolbar/options_osx.png b/images/viewer_toolbar/options_osx.png index c4877737..43fa5780 100644 Binary files a/images/viewer_toolbar/options_osx.png and b/images/viewer_toolbar/options_osx.png differ diff --git a/images/viewer_toolbar/rotateL_osx.png b/images/viewer_toolbar/rotateL_osx.png index ad2f5008..c4e65d35 100644 Binary files a/images/viewer_toolbar/rotateL_osx.png and b/images/viewer_toolbar/rotateL_osx.png differ diff --git a/images/viewer_toolbar/rotateR_osx.png b/images/viewer_toolbar/rotateR_osx.png index b858f845..627561bd 100644 Binary files a/images/viewer_toolbar/rotateR_osx.png and b/images/viewer_toolbar/rotateR_osx.png differ diff --git a/images/viewer_toolbar/save_osx.png b/images/viewer_toolbar/save_osx.png index 7686f785..76988544 100644 Binary files a/images/viewer_toolbar/save_osx.png and b/images/viewer_toolbar/save_osx.png differ diff --git a/images/viewer_toolbar/shortcuts_osx.png b/images/viewer_toolbar/shortcuts_osx.png index 2037e80c..26e17546 100644 Binary files a/images/viewer_toolbar/shortcuts_osx.png and b/images/viewer_toolbar/shortcuts_osx.png differ diff --git a/images/viewer_toolbar/showBookmarks_osx.png b/images/viewer_toolbar/showBookmarks_osx.png index 6adf7fbf..f63fa04c 100644 Binary files a/images/viewer_toolbar/showBookmarks_osx.png and b/images/viewer_toolbar/showBookmarks_osx.png differ diff --git a/images/viewer_toolbar/toHeight_osx.png b/images/viewer_toolbar/toHeight_osx.png index e530b757..38c5eeb5 100644 Binary files a/images/viewer_toolbar/toHeight_osx.png and b/images/viewer_toolbar/toHeight_osx.png differ diff --git a/images/viewer_toolbar/toWidth_osx.png b/images/viewer_toolbar/toWidth_osx.png index d461fb3f..467f1e44 100644 Binary files a/images/viewer_toolbar/toWidth_osx.png and b/images/viewer_toolbar/toWidth_osx.png differ diff --git a/images/viewer_toolbar/translator_osx.png b/images/viewer_toolbar/translator_osx.png index 19b76858..2e269d91 100644 Binary files a/images/viewer_toolbar/translator_osx.png and b/images/viewer_toolbar/translator_osx.png differ