add convenience method YACReader::addSeparator(QWidget *) for adding QAction separator to a widget

This commit is contained in:
Luis Ángel San Martín 2014-06-22 09:22:27 +02:00
parent 616d109c09
commit 21d83b31e1
5 changed files with 33 additions and 53 deletions

View File

@ -547,9 +547,8 @@ void MainWindowViewer::createToolBars()
viewer->addAction(saveImageAction); viewer->addAction(saveImageAction);
viewer->addAction(openPreviousComicAction); viewer->addAction(openPreviousComicAction);
viewer->addAction(openNextComicAction); viewer->addAction(openNextComicAction);
QAction * separator = new QAction("",this); YACReader::addSperator(viewer);
separator->setSeparator(true);
viewer->addAction(separator);
viewer->addAction(prevAction); viewer->addAction(prevAction);
viewer->addAction(nextAction); viewer->addAction(nextAction);
viewer->addAction(goToPage); viewer->addAction(goToPage);
@ -558,34 +557,25 @@ void MainWindowViewer::createToolBars()
viewer->addAction(adjustToFullSizeAction); viewer->addAction(adjustToFullSizeAction);
viewer->addAction(leftRotationAction); viewer->addAction(leftRotationAction);
viewer->addAction(rightRotationAction); viewer->addAction(rightRotationAction);
viewer->addAction(doublePageAction); YACReader::addSperator(viewer);
separator = new QAction("",this);
separator->setSeparator(true);
viewer->addAction(separator);
viewer->addAction(showMagnifyingGlass); viewer->addAction(showMagnifyingGlass);
separator = new QAction("",this); YACReader::addSperator(viewer);
separator->setSeparator(true);
viewer->addAction(separator);
viewer->addAction(setBookmark); viewer->addAction(setBookmark);
viewer->addAction(showBookmarks); viewer->addAction(showBookmarks);
separator = new QAction("",this); YACReader::addSperator(viewer);
separator->setSeparator(true);
viewer->addAction(separator);
viewer->addAction(showDictionaryAction); viewer->addAction(showDictionaryAction);
viewer->addAction(showFlowAction); viewer->addAction(showFlowAction);
viewer->addAction(showInfo); viewer->addAction(showInfo);
separator = new QAction("",this); YACReader::addSperator(viewer);
separator->setSeparator(true);
viewer->addAction(separator);
viewer->addAction(showShorcutsAction); viewer->addAction(showShorcutsAction);
viewer->addAction(optionsAction); viewer->addAction(optionsAction);
viewer->addAction(helpAboutAction); viewer->addAction(helpAboutAction);
separator = new QAction("",this); YACReader::addSperator(viewer);
separator->setSeparator(true);
viewer->addAction(separator);
viewer->addAction(closeAction); viewer->addAction(closeAction);
viewer->setContextMenuPolicy(Qt::ActionsContextMenu); viewer->setContextMenuPolicy(Qt::ActionsContextMenu);

View File

@ -500,9 +500,6 @@ void LibraryWindow::createActions()
getInfoAction->setIcon(QIcon(":/images/getInfo.png")); getInfoAction->setIcon(QIcon(":/images/getInfo.png"));
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
separatorAction = new QAction(this);
separatorAction->setSeparator(true);
//-------------------------------------------------------------------------
//disable actions //disable actions
disableAllActions(); disableAllActions();
} }
@ -644,53 +641,40 @@ void LibraryWindow::createToolBars()
void LibraryWindow::createMenus() void LibraryWindow::createMenus()
{ {
comicView->addAction(openContainingFolderComicAction); comicView->addAction(openContainingFolderComicAction);
{ comicView->addAction(separatorAction); } YACReader::addSperator(comicView);
comicView->addAction(resetComicRatingAction); comicView->addAction(resetComicRatingAction);
{ comicView->addAction(separatorAction); } YACReader::addSperator(comicView);
comicView->addAction(editSelectedComicsAction); comicView->addAction(editSelectedComicsAction);
comicView->addAction(getInfoAction); comicView->addAction(getInfoAction);
//comicView->addAction(asignOrderActions); comicView->addAction(asignOrderActions);
{ comicView->addAction(separatorAction); } YACReader::addSperator(comicView);
comicView->addAction(setAsReadAction); comicView->addAction(setAsReadAction);
comicView->addAction(setAsNonReadAction); comicView->addAction(setAsNonReadAction);
{ comicView->addAction(separatorAction); } YACReader::addSperator(comicView);
comicView->addAction(deleteComicsAction); comicView->addAction(deleteComicsAction);
foldersView->addAction(openContainingFolderAction); foldersView->addAction(openContainingFolderAction);
YACReader::addSperator(foldersView);
{
QAction *act = new QAction(this);
act->setSeparator(true);
foldersView->addAction(act);
}
foldersView->addAction(setFolderAsNotCompletedAction); foldersView->addAction(setFolderAsNotCompletedAction);
foldersView->addAction(setFolderAsCompletedAction); foldersView->addAction(setFolderAsCompletedAction);
{ YACReader::addSperator(foldersView);
QAction *act = new QAction(this);
act->setSeparator(true);
foldersView->addAction(act);
}
foldersView->addAction(setFolderAsFinishedAction); foldersView->addAction(setFolderAsFinishedAction);
foldersView->addAction(setFolderAsNotFinishedAction); foldersView->addAction(setFolderAsNotFinishedAction);
selectedLibrary->addAction(updateLibraryAction); selectedLibrary->addAction(updateLibraryAction);
selectedLibrary->addAction(renameLibraryAction); selectedLibrary->addAction(renameLibraryAction);
selectedLibrary->addAction(removeLibraryAction); selectedLibrary->addAction(removeLibraryAction);
YACReader::addSperator(selectedLibrary);
{
QAction *act = new QAction(this);
act->setSeparator(true);
selectedLibrary->addAction(act);
}
selectedLibrary->addAction(exportComicsInfo); selectedLibrary->addAction(exportComicsInfo);
selectedLibrary->addAction(importComicsInfo); selectedLibrary->addAction(importComicsInfo);
YACReader::addSperator(selectedLibrary);
{
QAction *act = new QAction(this);
act->setSeparator(true);
selectedLibrary->addAction(act);
}
selectedLibrary->addAction(exportLibraryAction); selectedLibrary->addAction(exportLibraryAction);
selectedLibrary->addAction(importLibraryAction); selectedLibrary->addAction(importLibraryAction);

View File

@ -161,8 +161,6 @@ private:
QAction * deleteComicsAction; QAction * deleteComicsAction;
QAction * hideComicViewAction; QAction * hideComicViewAction;
QAction * separatorAction; //dummy action
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QToolBar * libraryToolBar; QToolBar * libraryToolBar;
#else #else

View File

@ -1,4 +1,5 @@
#include "yacreader_global.h" #include "yacreader_global.h"
#include <QAction>
using namespace YACReader; using namespace YACReader;
@ -11,3 +12,10 @@ QString YACReader::getSettingsPath()
#endif #endif
} }
void YACReader::addSperator(QWidget *w)
{
QAction * separator = new QAction(w);
separator->setSeparator(true);
w->addAction(separator);
}

View File

@ -7,6 +7,7 @@
#include <QDesktopServices> #include <QDesktopServices>
#endif #endif
#include <QWidget>
#define VERSION "7.1.0" #define VERSION "7.1.0"
@ -94,8 +95,7 @@ namespace YACReader
}; };
QString getSettingsPath(); QString getSettingsPath();
void addSperator(QWidget * w);
} }
#endif #endif