diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index 7518d664..1227a908 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -102,6 +102,11 @@ include(../custom_widgets/custom_widgets.pri) RESOURCES += images.qrc \ files.qrc + +win32:RESOURCES += images_win.qrc +unix:!macx:RESOURCES += images_win.qrc +macx:RESOURCES += images_osx.qrc + RC_FILE = icon.rc macx { diff --git a/YACReader/images_osx.qrc b/YACReader/images_osx.qrc new file mode 100644 index 00000000..9246ef44 --- /dev/null +++ b/YACReader/images_osx.qrc @@ -0,0 +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 + + \ No newline at end of file diff --git a/YACReader/images_win.qrc b/YACReader/images_win.qrc new file mode 100644 index 00000000..b438d2fb --- /dev/null +++ b/YACReader/images_win.qrc @@ -0,0 +1,28 @@ + + +../images/viewer_toolbar/bookmark.png +../images/viewer_toolbar/close.png +../images/viewer_toolbar/doublePage.png +../images/viewer_toolbar/flow.png +../images/viewer_toolbar/full.png +../images/viewer_toolbar/goto.png +../images/viewer_toolbar/help.png +../images/viewer_toolbar/info.png +../images/viewer_toolbar/magnifyingGlass.png +../images/viewer_toolbar/next.png +../images/viewer_toolbar/open.png +../images/viewer_toolbar/openFolder.png +../images/viewer_toolbar/openNext.png +../images/viewer_toolbar/openPrevious.png +../images/viewer_toolbar/options.png +../images/viewer_toolbar/previous.png +../images/viewer_toolbar/rotateL.png +../images/viewer_toolbar/rotateR.png +../images/viewer_toolbar/save.png +../images/viewer_toolbar/shortcuts.png +../images/viewer_toolbar/showBookmarks.png +../images/viewer_toolbar/toHeight.png +../images/viewer_toolbar/toWidth.png +../images/viewer_toolbar/translator.png + + diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index c836b1ae..3a49dcc6 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -134,76 +134,84 @@ void MainWindowViewer::createActions() { openAction = new QAction(tr("&Open"),this); openAction->setShortcut(tr("O")); - openAction->setIcon(QIcon(":/images/open.png")); + openAction->setIcon(QIcon(":/images/viewer_toolbar/open.png")); openAction->setToolTip(tr("Open a comic")); connect(openAction, SIGNAL(triggered()), this, SLOT(open())); openFolderAction = new QAction(tr("Open Folder"),this); openFolderAction->setShortcut(tr("Ctrl+O")); - openFolderAction->setIcon(QIcon(":/images/openFolder.png")); + openFolderAction->setIcon(QIcon(":/images/viewer_toolbar/openFolder.png")); openFolderAction->setToolTip(tr("Open image folder")); connect(openFolderAction, SIGNAL(triggered()), this, SLOT(openFolder())); saveImageAction = new QAction(tr("Save"),this); - saveImageAction->setIcon(QIcon(":/images/save.png")); + saveImageAction->setIcon(QIcon(":/images/viewer_toolbar/save.png")); saveImageAction->setToolTip(tr("Save current page")); saveImageAction->setDisabled(true); connect(saveImageAction,SIGNAL(triggered()),this,SLOT(saveImage())); openPreviousComicAction = new QAction(tr("Previous Comic"),this); - openPreviousComicAction->setIcon(QIcon(":/images/previousComic.png")); + openPreviousComicAction->setIcon(QIcon(":/images/viewer_toolbar/openPrevious.png")); openPreviousComicAction->setShortcut(Qt::CTRL + Qt::Key_Left); openPreviousComicAction->setToolTip(tr("Open previous comic")); openPreviousComicAction->setDisabled(true); connect(openPreviousComicAction,SIGNAL(triggered()),this,SLOT(openPreviousComic())); openNextComicAction = new QAction(tr("Next Comic"),this); - openNextComicAction->setIcon(QIcon(":/images/nextComic.png")); + openNextComicAction->setIcon(QIcon(":/images/viewer_toolbar/openNext.png")); openNextComicAction->setShortcut(Qt::CTRL + Qt::Key_Right); openNextComicAction->setToolTip(tr("Open next comic")); openNextComicAction->setDisabled(true); connect(openNextComicAction,SIGNAL(triggered()),this,SLOT(openNextComic())); prevAction = new QAction(tr("&Previous"),this); - prevAction->setIcon(QIcon(":/images/prev.png")); + prevAction->setIcon(QIcon(":/images/viewer_toolbar/previous.png")); prevAction->setShortcut(Qt::Key_Left); prevAction->setToolTip(tr("Go to previous page")); prevAction->setDisabled(true); connect(prevAction, SIGNAL(triggered()),viewer,SLOT(prev())); nextAction = new QAction(tr("&Next"),this); - nextAction->setIcon(QIcon(":/images/next.png")); + nextAction->setIcon(QIcon(":/images/viewer_toolbar/next.png")); nextAction->setShortcut(Qt::Key_Right); nextAction->setToolTip(tr("Go to next page")); nextAction->setDisabled(true); connect(nextAction, SIGNAL(triggered()),viewer,SLOT(next())); + adjustHeight = new QAction(tr("Fit Width"),this); + adjustHeight->setIcon(QIcon(":/images/viewer_toolbar/toHeight.png")); + //adjustWidth->setCheckable(true); + adjustHeight->setDisabled(true); + adjustHeight->setChecked(Configuration::getConfiguration().getAdjustToWidth()); + adjustHeight->setToolTip(tr("Fit image to ...")); + //adjustWidth->setIcon(QIcon(":/images/fitWidth.png")); + connect(adjustHeight, SIGNAL(triggered()),this,SLOT(fitToHeight())); + adjustWidth = new QAction(tr("Fit Width"),this); - adjustWidth->setShortcut(tr("A")); - adjustWidth->setIcon(QIcon(":/images/fit.png")); - adjustWidth->setCheckable(true); + adjustWidth->setIcon(QIcon(":/images/viewer_toolbar/toWidth.png")); + //adjustWidth->setCheckable(true); adjustWidth->setDisabled(true); adjustWidth->setChecked(Configuration::getConfiguration().getAdjustToWidth()); adjustWidth->setToolTip(tr("Fit image to ...")); //adjustWidth->setIcon(QIcon(":/images/fitWidth.png")); - connect(adjustWidth, SIGNAL(triggered()),this,SLOT(changeFit())); + connect(adjustWidth, SIGNAL(triggered()),this,SLOT(fitToWidth())); leftRotationAction = new QAction(tr("Rotate image to the left"),this); leftRotationAction->setShortcut(tr("L")); - leftRotationAction->setIcon(QIcon(":/images/rotateL.png")); + leftRotationAction->setIcon(QIcon(":/images/viewer_toolbar/rotateL.png")); leftRotationAction->setDisabled(true); connect(leftRotationAction, SIGNAL(triggered()),viewer,SLOT(rotateLeft())); rightRotationAction = new QAction(tr("Rotate image to the right"),this); rightRotationAction->setShortcut(tr("R")); - rightRotationAction->setIcon(QIcon(":/images/rotateR.png")); + rightRotationAction->setIcon(QIcon(":/images/viewer_toolbar/rotateR.png")); rightRotationAction->setDisabled(true); connect(rightRotationAction, SIGNAL(triggered()),viewer,SLOT(rotateRight())); doublePageAction = new QAction(tr("Double page mode"),this); doublePageAction->setToolTip(tr("Switch to double page mode")); doublePageAction->setShortcut(tr("D")); - doublePageAction->setIcon(QIcon(":/images/doublePage.png")); + doublePageAction->setIcon(QIcon(":/images/viewer_toolbar/doublePage.png")); doublePageAction->setDisabled(true); doublePageAction->setCheckable(true); doublePageAction->setChecked(Configuration::getConfiguration().getDoublePage()); @@ -211,7 +219,7 @@ void MainWindowViewer::createActions() goToPage = new QAction(tr("Go To"),this); goToPage->setShortcut(tr("G")); - goToPage->setIcon(QIcon(":/images/goto.png")); + goToPage->setIcon(QIcon(":/images/viewer_toolbar/goto.png")); goToPage->setDisabled(true); goToPage->setToolTip(tr("Go to page ...")); connect(goToPage, SIGNAL(triggered()),viewer,SLOT(showGoToDialog())); @@ -219,20 +227,20 @@ void MainWindowViewer::createActions() optionsAction = new QAction(tr("Options"),this); optionsAction->setShortcut(tr("C")); optionsAction->setToolTip(tr("YACReader options")); - optionsAction->setIcon(QIcon(":/images/options.png")); + optionsAction->setIcon(QIcon(":/images/viewer_toolbar/options.png")); connect(optionsAction, SIGNAL(triggered()),optionsDialog,SLOT(show())); helpAboutAction = new QAction(tr("Help"),this); helpAboutAction->setToolTip(tr("Help, About YACReader")); helpAboutAction->setShortcut(Qt::Key_F1); - helpAboutAction->setIcon(QIcon(":/images/help.png")); + helpAboutAction->setIcon(QIcon(":/images/viewer_toolbar/help.png")); connect(helpAboutAction, SIGNAL(triggered()),had,SLOT(show())); showMagnifyingGlass = new QAction(tr("Magnifying glass"),this); showMagnifyingGlass->setToolTip(tr("Switch Magnifying glass")); showMagnifyingGlass->setShortcut(tr("Z")); - showMagnifyingGlass->setIcon(QIcon(":/images/zoom.png")); + showMagnifyingGlass->setIcon(QIcon(":/images/viewer_toolbar/magnifyingGlass.png")); showMagnifyingGlass->setDisabled(true); showMagnifyingGlass->setCheckable(true); connect(showMagnifyingGlass, SIGNAL(triggered()),viewer,SLOT(magnifyingGlassSwitch())); @@ -240,7 +248,7 @@ void MainWindowViewer::createActions() setBookmark = new QAction(tr("Set bookmark"),this); setBookmark->setToolTip(tr("Set a bookmark on the current page")); setBookmark->setShortcut(Qt::CTRL+Qt::Key_M); - setBookmark->setIcon(QIcon(":/images/setBookmark.png")); + setBookmark->setIcon(QIcon(":/images/viewer_toolbar/bookmark.png")); setBookmark->setDisabled(true); setBookmark->setCheckable(true); connect(setBookmark,SIGNAL(triggered (bool)),viewer,SLOT(setBookmark(bool))); @@ -250,28 +258,28 @@ void MainWindowViewer::createActions() showBookmarks = new QAction(tr("Show bookmarks"),this); showBookmarks->setToolTip(tr("Show the bookmarks of the current comic")); showBookmarks->setShortcut(tr("M")); - showBookmarks->setIcon(QIcon(":/images/bookmark.png")); + showBookmarks->setIcon(QIcon(":/images/viewer_toolbar/showBookmarks.png")); showBookmarks->setDisabled(true); connect(showBookmarks, SIGNAL(triggered()),viewer->getBookmarksDialog(),SLOT(show())); showShorcutsAction = new QAction(tr("Show keyboard shortcuts"), this ); - showShorcutsAction->setIcon(QIcon(":/images/shortcuts.png")); + showShorcutsAction->setIcon(QIcon(":/images/viewer_toolbar/shortcuts.png")); connect(showShorcutsAction, SIGNAL(triggered()),shortcutsDialog,SLOT(show())); showInfo = new QAction(tr("Show Info"),this); showInfo->setShortcut(tr("I")); - showInfo->setIcon(QIcon(":/images/properties.png")); + showInfo->setIcon(QIcon(":/images/viewer_toolbar/info.png")); showInfo->setDisabled(true); connect(showInfo, SIGNAL(triggered()),viewer,SLOT(informationSwitch())); closeAction = new QAction(tr("Close"),this); closeAction->setShortcut(Qt::Key_Escape); - closeAction->setIcon(QIcon(":/images/deleteLibrary.png")); + closeAction->setIcon(QIcon(":/images/viewer_toolbar/close.png")); connect(closeAction,SIGNAL(triggered()),this,SLOT(close())); showDictionaryAction = new QAction(tr("Show Dictionary"),this); showDictionaryAction->setShortcut(Qt::Key_T); - showDictionaryAction->setIcon(QIcon(":/images/dictionary.png")); + showDictionaryAction->setIcon(QIcon(":/images/viewer_toolbar/translator.png")); showDictionaryAction->setCheckable(true); showDictionaryAction->setDisabled(true); connect(showDictionaryAction,SIGNAL(triggered()),viewer,SLOT(translatorSwitch())); @@ -286,17 +294,27 @@ void MainWindowViewer::createActions() adjustToFullSizeAction = new QAction(tr("Show full size"),this); adjustToFullSizeAction->setShortcut(Qt::Key_W); - adjustToFullSizeAction->setIcon(QIcon(":/images/adjustToFullSize.png")); + adjustToFullSizeAction->setIcon(QIcon(":/images/viewer_toolbar/full.png")); adjustToFullSizeAction->setCheckable(true); adjustToFullSizeAction->setDisabled(true); adjustToFullSizeAction->setChecked(Configuration::getConfiguration().getAdjustToFullSize()); connect(adjustToFullSizeAction,SIGNAL(triggered()),this,SLOT(adjustToFullSizeSwitch())); + + showFlowAction = new QAction(tr("Show go to flow"),this); + showFlowAction->setShortcut(Qt::Key_S); + showFlowAction->setIcon(QIcon(":/images/viewer_toolbar/flow.png")); + showFlowAction->setDisabled(true); + connect(showFlowAction,SIGNAL(triggered()),viewer,SLOT(goToFlowSwitch())); } void MainWindowViewer::createToolBars() { comicToolBar = addToolBar(tr("&File")); + comicToolBar->setStyleSheet("QToolBar{border:none;}"); + + comicToolBar->setIconSize(QSize(18,18)); + QToolButton * tb = new QToolButton(); tb->addAction(openAction); tb->addAction(openFolderAction); @@ -337,6 +355,9 @@ void MainWindowViewer::createToolBars() //comicToolBar->addWidget(widget); //comicToolBar->addAction(adjustWidth); + + comicToolBar->addAction(adjustHeight); + QMenu * menu = new QMenu(); sliderAction = new YACReaderSliderAction(this); menu->setAutoFillBackground(false); @@ -372,10 +393,11 @@ void MainWindowViewer::createToolBars() comicToolBar->addWidget(new QToolBarStretch()); + comicToolBar->addAction(showFlowAction); comicToolBar->addAction(showShorcutsAction); comicToolBar->addAction(optionsAction); comicToolBar->addAction(helpAboutAction); - comicToolBar->addAction(closeAction); + //comicToolBar->addAction(closeAction); comicToolBar->setMovable(false); @@ -495,6 +517,7 @@ void MainWindowViewer::enableActions() saveImageAction->setDisabled(false); prevAction->setDisabled(false); nextAction->setDisabled(false); + adjustHeight->setDisabled(false); adjustWidth->setDisabled(false); goToPage->setDisabled(false); alwaysOnTopAction->setDisabled(false); @@ -507,12 +530,14 @@ void MainWindowViewer::enableActions() showBookmarks->setDisabled(false); showInfo->setDisabled(false); //TODO enable goTo and showInfo (or update) when numPages emited showDictionaryAction->setDisabled(false); + showFlowAction->setDisabled(false); } void MainWindowViewer::disableActions() { saveImageAction->setDisabled(true); prevAction->setDisabled(true); nextAction->setDisabled(true); + adjustHeight->setDisabled(true); adjustWidth->setDisabled(true); goToPage->setDisabled(true); alwaysOnTopAction->setDisabled(true); @@ -527,6 +552,7 @@ void MainWindowViewer::disableActions() openPreviousComicAction->setDisabled(true); openNextComicAction->setDisabled(true); showDictionaryAction->setDisabled(true); + showFlowAction->setDisabled(true); } void MainWindowViewer::keyPressEvent(QKeyEvent *event) @@ -545,6 +571,9 @@ void MainWindowViewer::keyPressEvent(QKeyEvent *event) case Qt::Key_O: open(); break; + case Qt::Key_A: + changeFit(); + break; default: QWidget::keyPressEvent(event); break; @@ -613,7 +642,24 @@ void MainWindowViewer::showToolBars() this->comicToolBar->show(); toolbars = true; } - +void MainWindowViewer::fitToWidth() +{ + Configuration & conf = Configuration::getConfiguration(); + if(!conf.getAdjustToWidth()) + { + conf.setAdjustToWidth(true); + viewer->updatePage(); + } +} +void MainWindowViewer::fitToHeight() +{ + Configuration & conf = Configuration::getConfiguration(); + if(conf.getAdjustToWidth()) + { + conf.setAdjustToWidth(false); + viewer->updatePage(); + } +} void MainWindowViewer::changeFit() { Configuration & conf = Configuration::getConfiguration(); diff --git a/YACReader/main_window_viewer.h b/YACReader/main_window_viewer.h index 4e7cfcfd..d509b559 100644 --- a/YACReader/main_window_viewer.h +++ b/YACReader/main_window_viewer.h @@ -43,6 +43,8 @@ class YACReaderSliderAction; void alwaysOnTopSwitch(); void adjustToFullSizeSwitch(); void reloadOptions(); + void fitToWidth(); + void fitToHeight(); /*void viewComic(); void prev(); void next(); @@ -92,6 +94,8 @@ class YACReaderSliderAction; QAction *showDictionaryAction; QAction *alwaysOnTopAction; QAction *adjustToFullSizeAction; + QAction *showFlowAction; + YACReaderSliderAction * sliderAction; HttpVersionChecker * versionChecker; diff --git a/images/viewer_toolbar/bookmark.png b/images/viewer_toolbar/bookmark.png new file mode 100644 index 00000000..5d3dc1a6 Binary files /dev/null and b/images/viewer_toolbar/bookmark.png differ diff --git a/images/viewer_toolbar/bookmark_osx.png b/images/viewer_toolbar/bookmark_osx.png new file mode 100644 index 00000000..00fa296c Binary files /dev/null and b/images/viewer_toolbar/bookmark_osx.png differ diff --git a/images/viewer_toolbar/close.png b/images/viewer_toolbar/close.png new file mode 100644 index 00000000..187eff20 Binary files /dev/null and b/images/viewer_toolbar/close.png differ diff --git a/images/viewer_toolbar/close_osx.png b/images/viewer_toolbar/close_osx.png new file mode 100644 index 00000000..def6fe8a Binary files /dev/null and b/images/viewer_toolbar/close_osx.png differ diff --git a/images/viewer_toolbar/doublePage.png b/images/viewer_toolbar/doublePage.png new file mode 100644 index 00000000..67344d3b Binary files /dev/null and b/images/viewer_toolbar/doublePage.png differ diff --git a/images/viewer_toolbar/doublePage_osx.png b/images/viewer_toolbar/doublePage_osx.png new file mode 100644 index 00000000..5d608096 Binary files /dev/null and b/images/viewer_toolbar/doublePage_osx.png differ diff --git a/images/viewer_toolbar/flow.png b/images/viewer_toolbar/flow.png new file mode 100644 index 00000000..6f8cf403 Binary files /dev/null and b/images/viewer_toolbar/flow.png differ diff --git a/images/viewer_toolbar/flow_osx.png b/images/viewer_toolbar/flow_osx.png new file mode 100644 index 00000000..bf48346d Binary files /dev/null and b/images/viewer_toolbar/flow_osx.png differ diff --git a/images/viewer_toolbar/full.png b/images/viewer_toolbar/full.png new file mode 100644 index 00000000..34d6dfe0 Binary files /dev/null and b/images/viewer_toolbar/full.png differ diff --git a/images/viewer_toolbar/full_osx.png b/images/viewer_toolbar/full_osx.png new file mode 100644 index 00000000..2fb8aa50 Binary files /dev/null and b/images/viewer_toolbar/full_osx.png differ diff --git a/images/viewer_toolbar/goto.png b/images/viewer_toolbar/goto.png new file mode 100644 index 00000000..e451b1b0 Binary files /dev/null and b/images/viewer_toolbar/goto.png differ diff --git a/images/viewer_toolbar/goto_osx.png b/images/viewer_toolbar/goto_osx.png new file mode 100644 index 00000000..8f4ed4e4 Binary files /dev/null and b/images/viewer_toolbar/goto_osx.png differ diff --git a/images/viewer_toolbar/help.png b/images/viewer_toolbar/help.png new file mode 100644 index 00000000..a3ae397d Binary files /dev/null and b/images/viewer_toolbar/help.png differ diff --git a/images/viewer_toolbar/help_osx.png b/images/viewer_toolbar/help_osx.png new file mode 100644 index 00000000..1c4886cc Binary files /dev/null and b/images/viewer_toolbar/help_osx.png differ diff --git a/images/viewer_toolbar/info.png b/images/viewer_toolbar/info.png new file mode 100644 index 00000000..0a97b1cf Binary files /dev/null and b/images/viewer_toolbar/info.png differ diff --git a/images/viewer_toolbar/info_osx.png b/images/viewer_toolbar/info_osx.png new file mode 100644 index 00000000..7c319cbb Binary files /dev/null and b/images/viewer_toolbar/info_osx.png differ diff --git a/images/viewer_toolbar/magnifyingGlass.png b/images/viewer_toolbar/magnifyingGlass.png new file mode 100644 index 00000000..18afa28b Binary files /dev/null and b/images/viewer_toolbar/magnifyingGlass.png differ diff --git a/images/viewer_toolbar/next.png b/images/viewer_toolbar/next.png new file mode 100644 index 00000000..233507cc Binary files /dev/null and b/images/viewer_toolbar/next.png differ diff --git a/images/viewer_toolbar/next_osx.png b/images/viewer_toolbar/next_osx.png new file mode 100644 index 00000000..5754a8ec Binary files /dev/null and b/images/viewer_toolbar/next_osx.png differ diff --git a/images/viewer_toolbar/open.png b/images/viewer_toolbar/open.png new file mode 100644 index 00000000..0cd51686 Binary files /dev/null and b/images/viewer_toolbar/open.png differ diff --git a/images/viewer_toolbar/openFolder.png b/images/viewer_toolbar/openFolder.png new file mode 100644 index 00000000..fd40f6bd Binary files /dev/null and b/images/viewer_toolbar/openFolder.png differ diff --git a/images/viewer_toolbar/openFolder_osx.png b/images/viewer_toolbar/openFolder_osx.png new file mode 100644 index 00000000..8be4605c Binary files /dev/null and b/images/viewer_toolbar/openFolder_osx.png differ diff --git a/images/viewer_toolbar/openNext.png b/images/viewer_toolbar/openNext.png new file mode 100644 index 00000000..4d65863e Binary files /dev/null and b/images/viewer_toolbar/openNext.png differ diff --git a/images/viewer_toolbar/openNext_osx.png b/images/viewer_toolbar/openNext_osx.png new file mode 100644 index 00000000..0fc045a3 Binary files /dev/null and b/images/viewer_toolbar/openNext_osx.png differ diff --git a/images/viewer_toolbar/openPrevious.png b/images/viewer_toolbar/openPrevious.png new file mode 100644 index 00000000..53c703f3 Binary files /dev/null and b/images/viewer_toolbar/openPrevious.png differ diff --git a/images/viewer_toolbar/openPrevious_osx.png b/images/viewer_toolbar/openPrevious_osx.png new file mode 100644 index 00000000..9b8ad89e Binary files /dev/null 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 new file mode 100644 index 00000000..9a715a5a Binary files /dev/null and b/images/viewer_toolbar/open_osx.png differ diff --git a/images/viewer_toolbar/options.png b/images/viewer_toolbar/options.png new file mode 100644 index 00000000..2eda3a5f Binary files /dev/null and b/images/viewer_toolbar/options.png differ diff --git a/images/viewer_toolbar/options_osx.png b/images/viewer_toolbar/options_osx.png new file mode 100644 index 00000000..c4877737 Binary files /dev/null and b/images/viewer_toolbar/options_osx.png differ diff --git a/images/viewer_toolbar/previous.png b/images/viewer_toolbar/previous.png new file mode 100644 index 00000000..b30acf76 Binary files /dev/null and b/images/viewer_toolbar/previous.png differ diff --git a/images/viewer_toolbar/previous_osx.png b/images/viewer_toolbar/previous_osx.png new file mode 100644 index 00000000..0651aaf5 Binary files /dev/null and b/images/viewer_toolbar/previous_osx.png differ diff --git a/images/viewer_toolbar/rotateL.png b/images/viewer_toolbar/rotateL.png new file mode 100644 index 00000000..a696da3e Binary files /dev/null and b/images/viewer_toolbar/rotateL.png differ diff --git a/images/viewer_toolbar/rotateL_osx.png b/images/viewer_toolbar/rotateL_osx.png new file mode 100644 index 00000000..ad2f5008 Binary files /dev/null and b/images/viewer_toolbar/rotateL_osx.png differ diff --git a/images/viewer_toolbar/rotateR.png b/images/viewer_toolbar/rotateR.png new file mode 100644 index 00000000..38d8620e Binary files /dev/null and b/images/viewer_toolbar/rotateR.png differ diff --git a/images/viewer_toolbar/rotateR_osx.png b/images/viewer_toolbar/rotateR_osx.png new file mode 100644 index 00000000..b858f845 Binary files /dev/null and b/images/viewer_toolbar/rotateR_osx.png differ diff --git a/images/viewer_toolbar/save.png b/images/viewer_toolbar/save.png new file mode 100644 index 00000000..b48e2946 Binary files /dev/null and b/images/viewer_toolbar/save.png differ diff --git a/images/viewer_toolbar/save_osx.png b/images/viewer_toolbar/save_osx.png new file mode 100644 index 00000000..7686f785 Binary files /dev/null and b/images/viewer_toolbar/save_osx.png differ diff --git a/images/viewer_toolbar/shortcuts.png b/images/viewer_toolbar/shortcuts.png new file mode 100644 index 00000000..43a88d5e Binary files /dev/null and b/images/viewer_toolbar/shortcuts.png differ diff --git a/images/viewer_toolbar/shortcuts_osx.png b/images/viewer_toolbar/shortcuts_osx.png new file mode 100644 index 00000000..2037e80c Binary files /dev/null and b/images/viewer_toolbar/shortcuts_osx.png differ diff --git a/images/viewer_toolbar/showBookmarks.png b/images/viewer_toolbar/showBookmarks.png new file mode 100644 index 00000000..5c3cbe36 Binary files /dev/null and b/images/viewer_toolbar/showBookmarks.png differ diff --git a/images/viewer_toolbar/showBookmarks_osx.png b/images/viewer_toolbar/showBookmarks_osx.png new file mode 100644 index 00000000..6adf7fbf Binary files /dev/null and b/images/viewer_toolbar/showBookmarks_osx.png differ diff --git a/images/viewer_toolbar/toHeight.png b/images/viewer_toolbar/toHeight.png new file mode 100644 index 00000000..82d0121b Binary files /dev/null and b/images/viewer_toolbar/toHeight.png differ diff --git a/images/viewer_toolbar/toHeight_osx.png b/images/viewer_toolbar/toHeight_osx.png new file mode 100644 index 00000000..e530b757 Binary files /dev/null and b/images/viewer_toolbar/toHeight_osx.png differ diff --git a/images/viewer_toolbar/toWidth.png b/images/viewer_toolbar/toWidth.png new file mode 100644 index 00000000..819c5811 Binary files /dev/null and b/images/viewer_toolbar/toWidth.png differ diff --git a/images/viewer_toolbar/toWidth_osx.png b/images/viewer_toolbar/toWidth_osx.png new file mode 100644 index 00000000..d461fb3f Binary files /dev/null and b/images/viewer_toolbar/toWidth_osx.png differ diff --git a/images/viewer_toolbar/translator.png b/images/viewer_toolbar/translator.png new file mode 100644 index 00000000..05026239 Binary files /dev/null and b/images/viewer_toolbar/translator.png differ diff --git a/images/viewer_toolbar/translator_osx.png b/images/viewer_toolbar/translator_osx.png new file mode 100644 index 00000000..19b76858 Binary files /dev/null and b/images/viewer_toolbar/translator_osx.png differ