From 21d83b31e144a81b07f095e07a84cc1c9f5a7f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 22 Jun 2014 09:22:27 +0200 Subject: [PATCH] add convenience method YACReader::addSeparator(QWidget *) for adding QAction separator to a widget --- YACReader/main_window_viewer.cpp | 28 ++++++------------ YACReaderLibrary/library_window.cpp | 44 +++++++++-------------------- YACReaderLibrary/library_window.h | 2 -- common/yacreader_global.cpp | 8 ++++++ common/yacreader_global.h | 4 +-- 5 files changed, 33 insertions(+), 53 deletions(-) diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index 0c057207..ee3d148e 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -547,9 +547,8 @@ void MainWindowViewer::createToolBars() viewer->addAction(saveImageAction); viewer->addAction(openPreviousComicAction); viewer->addAction(openNextComicAction); - QAction * separator = new QAction("",this); - separator->setSeparator(true); - viewer->addAction(separator); + YACReader::addSperator(viewer); + viewer->addAction(prevAction); viewer->addAction(nextAction); viewer->addAction(goToPage); @@ -558,34 +557,25 @@ void MainWindowViewer::createToolBars() viewer->addAction(adjustToFullSizeAction); viewer->addAction(leftRotationAction); viewer->addAction(rightRotationAction); - viewer->addAction(doublePageAction); - separator = new QAction("",this); - separator->setSeparator(true); - viewer->addAction(separator); + YACReader::addSperator(viewer); + viewer->addAction(showMagnifyingGlass); - separator = new QAction("",this); - separator->setSeparator(true); - viewer->addAction(separator); + YACReader::addSperator(viewer); viewer->addAction(setBookmark); viewer->addAction(showBookmarks); - separator = new QAction("",this); - separator->setSeparator(true); - viewer->addAction(separator); + YACReader::addSperator(viewer); viewer->addAction(showDictionaryAction); viewer->addAction(showFlowAction); viewer->addAction(showInfo); - separator = new QAction("",this); - separator->setSeparator(true); - viewer->addAction(separator); + YACReader::addSperator(viewer); viewer->addAction(showShorcutsAction); viewer->addAction(optionsAction); viewer->addAction(helpAboutAction); - separator = new QAction("",this); - separator->setSeparator(true); - viewer->addAction(separator); + YACReader::addSperator(viewer); + viewer->addAction(closeAction); viewer->setContextMenuPolicy(Qt::ActionsContextMenu); diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 66becfe6..2d5846d6 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -500,9 +500,6 @@ void LibraryWindow::createActions() getInfoAction->setIcon(QIcon(":/images/getInfo.png")); //------------------------------------------------------------------------- - separatorAction = new QAction(this); - separatorAction->setSeparator(true); - //------------------------------------------------------------------------- //disable actions disableAllActions(); } @@ -644,53 +641,40 @@ void LibraryWindow::createToolBars() void LibraryWindow::createMenus() { comicView->addAction(openContainingFolderComicAction); - { comicView->addAction(separatorAction); } + YACReader::addSperator(comicView); + comicView->addAction(resetComicRatingAction); - { comicView->addAction(separatorAction); } + YACReader::addSperator(comicView); + comicView->addAction(editSelectedComicsAction); comicView->addAction(getInfoAction); - //comicView->addAction(asignOrderActions); - { comicView->addAction(separatorAction); } + comicView->addAction(asignOrderActions); + YACReader::addSperator(comicView); + comicView->addAction(setAsReadAction); comicView->addAction(setAsNonReadAction); - { comicView->addAction(separatorAction); } + YACReader::addSperator(comicView); + comicView->addAction(deleteComicsAction); foldersView->addAction(openContainingFolderAction); + YACReader::addSperator(foldersView); - { - QAction *act = new QAction(this); - act->setSeparator(true); - foldersView->addAction(act); - } foldersView->addAction(setFolderAsNotCompletedAction); foldersView->addAction(setFolderAsCompletedAction); - { - QAction *act = new QAction(this); - act->setSeparator(true); - foldersView->addAction(act); - } + YACReader::addSperator(foldersView); + foldersView->addAction(setFolderAsFinishedAction); foldersView->addAction(setFolderAsNotFinishedAction); selectedLibrary->addAction(updateLibraryAction); selectedLibrary->addAction(renameLibraryAction); selectedLibrary->addAction(removeLibraryAction); - - { - QAction *act = new QAction(this); - act->setSeparator(true); - selectedLibrary->addAction(act); - } + YACReader::addSperator(selectedLibrary); selectedLibrary->addAction(exportComicsInfo); selectedLibrary->addAction(importComicsInfo); - - { - QAction *act = new QAction(this); - act->setSeparator(true); - selectedLibrary->addAction(act); - } + YACReader::addSperator(selectedLibrary); selectedLibrary->addAction(exportLibraryAction); selectedLibrary->addAction(importLibraryAction); diff --git a/YACReaderLibrary/library_window.h b/YACReaderLibrary/library_window.h index d0a718d3..5925d897 100644 --- a/YACReaderLibrary/library_window.h +++ b/YACReaderLibrary/library_window.h @@ -161,8 +161,6 @@ private: QAction * deleteComicsAction; QAction * hideComicViewAction; - QAction * separatorAction; //dummy action - #ifdef Q_OS_MAC QToolBar * libraryToolBar; #else diff --git a/common/yacreader_global.cpp b/common/yacreader_global.cpp index 59890bdc..0ac9c43e 100644 --- a/common/yacreader_global.cpp +++ b/common/yacreader_global.cpp @@ -1,4 +1,5 @@ #include "yacreader_global.h" +#include using namespace YACReader; @@ -11,3 +12,10 @@ QString YACReader::getSettingsPath() #endif } + +void YACReader::addSperator(QWidget *w) +{ + QAction * separator = new QAction(w); + separator->setSeparator(true); + w->addAction(separator); +} diff --git a/common/yacreader_global.h b/common/yacreader_global.h index 1aafdb46..f92952c4 100644 --- a/common/yacreader_global.h +++ b/common/yacreader_global.h @@ -7,6 +7,7 @@ #include #endif +#include #define VERSION "7.1.0" @@ -94,8 +95,7 @@ namespace YACReader }; QString getSettingsPath(); - +void addSperator(QWidget * w); } - #endif