mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

new toolbar configuration for MacOSX

Browse Source
This commit is contained in:
Luis Ángel San Martín 2013-06-23 22:51:40 +02:00
parent 0b499fb63c
commit 140c01d35f
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
YACReader/main_window_viewer.cpp
View File

@ -16,6 +16,17 @@
#include <ctime> #include <ctime>
#include <algorithm> #include <algorithm>
#ifdef Q_OS_MAC
class MacToolBarSeparator : public QWidget
{
MacToolBarSeparator(int width = 10, QWidget * parent =0)
:QWidget(parent)
{
setFixedWidth(width);
}
};
#endif
MainWindowViewer::MainWindowViewer() MainWindowViewer::MainWindowViewer()
:QMainWindow(),fullscreen(false),toolbars(true),alwaysOnTop(false),currentDirectory("."),currentDirectoryImgDest(".") :QMainWindow(),fullscreen(false),toolbars(true),alwaysOnTop(false),currentDirectory("."),currentDirectoryImgDest(".")
{ {
@ -313,7 +324,7 @@ void MainWindowViewer::createToolBars()
comicToolBar->setStyleSheet("QToolBar{border:none;}"); comicToolBar->setStyleSheet("QToolBar{border:none;}");
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
comicToolBar->setIconSize(QSize(17,17)); comicToolBar->setIconSize(QSize(16,16));
#else #else
comicToolBar->setIconSize(QSize(18,18)); comicToolBar->setIconSize(QSize(18,18));
#endif #endif
@ -328,8 +339,11 @@ void MainWindowViewer::createToolBars()
comicToolBar->addAction(saveImageAction); comicToolBar->addAction(saveImageAction);
comicToolBar->addAction(openPreviousComicAction); comicToolBar->addAction(openPreviousComicAction);
comicToolBar->addAction(openNextComicAction); comicToolBar->addAction(openNextComicAction);
#ifdef Q_OS_MAC
comicToolBar->addWidget(new MacToolBarSeparator);
#else
comicToolBar->addSeparator(); comicToolBar->addSeparator();
#endif
comicToolBar->addAction(prevAction); comicToolBar->addAction(prevAction);
comicToolBar->addAction(nextAction); comicToolBar->addAction(nextAction);
comicToolBar->addAction(goToPage); comicToolBar->addAction(goToPage);
@ -340,7 +354,11 @@ void MainWindowViewer::createToolBars()
alwaysOnTopAction->setEnabled(false); alwaysOnTopAction->setEnabled(false);
#endif #endif
#ifdef Q_OS_MAC
comicToolBar->addWidget(new MacToolBarSeparator(5));
#else
comicToolBar->addSeparator(); comicToolBar->addSeparator();
#endif
//QWidget * widget = new QWidget(); //QWidget * widget = new QWidget();
@ -359,7 +377,7 @@ void MainWindowViewer::createToolBars()
//comicToolBar->addAction(adjustWidth); //comicToolBar->addAction(adjustWidth);
comicToolBar->addAction(adjustHeight);
QMenu * menu = new QMenu(); QMenu * menu = new QMenu();
sliderAction = new YACReaderSliderAction(this); sliderAction = new YACReaderSliderAction(this);
@ -379,19 +397,32 @@ void MainWindowViewer::createToolBars()
tb2->setPopupMode(QToolButton::MenuButtonPopup); tb2->setPopupMode(QToolButton::MenuButtonPopup);
tb2->setDefaultAction(adjustWidth); tb2->setDefaultAction(adjustWidth);
comicToolBar->addWidget(tb2); comicToolBar->addWidget(tb2);
comicToolBar->addAction(adjustHeight);
comicToolBar->addAction(adjustToFullSizeAction); comicToolBar->addAction(adjustToFullSizeAction);
comicToolBar->addAction(leftRotationAction); comicToolBar->addAction(leftRotationAction);
comicToolBar->addAction(rightRotationAction); comicToolBar->addAction(rightRotationAction);
comicToolBar->addAction(doublePageAction); comicToolBar->addAction(doublePageAction);
#ifdef Q_OS_MAC
comicToolBar->addWidget(new MacToolBarSeparator);
#else
comicToolBar->addSeparator(); comicToolBar->addSeparator();
#endif
comicToolBar->addAction(showMagnifyingGlass); comicToolBar->addAction(showMagnifyingGlass);
#ifdef Q_OS_MAC
comicToolBar->addWidget(new MacToolBarSeparator);
#else
comicToolBar->addSeparator(); comicToolBar->addSeparator();
#endif
comicToolBar->addAction(setBookmark); comicToolBar->addAction(setBookmark);
comicToolBar->addAction(showBookmarks); comicToolBar->addAction(showBookmarks);
#ifdef Q_OS_MAC
comicToolBar->addWidget(new MacToolBarSeparator);
#else
comicToolBar->addSeparator(); comicToolBar->addSeparator();
#endif
comicToolBar->addAction(showDictionaryAction); comicToolBar->addAction(showDictionaryAction);
comicToolBar->addWidget(new QToolBarStretch()); comicToolBar->addWidget(new QToolBarStretch());