diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index 30b9aebb..1be64fe0 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -107,7 +107,6 @@ MainWindowViewer::~MainWindowViewer() delete showDictionaryAction; delete alwaysOnTopAction; delete adjustToFullSizeAction; - delete fitToPageAction; delete showFlowAction; } @@ -412,15 +411,6 @@ void MainWindowViewer::createActions() adjustToFullSizeAction->setData(ADJUST_TO_FULL_SIZE_ACTION_Y); adjustToFullSizeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_TO_FULL_SIZE_ACTION_Y)); connect(adjustToFullSizeAction,SIGNAL(triggered()),this,SLOT(adjustToFullSizeSwitch())); - - fitToPageAction = new QAction(tr("Fit to page"),this); - //fitToPageAction->setIcon(QIcon(":/images/viewer_toolbar/full.png")); - fitToPageAction->setCheckable(true); - fitToPageAction->setDisabled(true); - fitToPageAction->setChecked(Configuration::getConfiguration().getFitToPage()); - fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y); - fitToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FIT_TO_PAGE_ACTION_Y)); - connect(fitToPageAction,SIGNAL(triggered()),this,SLOT(fitToPageSwitch())); showFlowAction = new QAction(tr("Show go to flow"),this); showFlowAction->setIcon(QIcon(":/images/viewer_toolbar/flow.png")); @@ -535,7 +525,6 @@ void MainWindowViewer::createToolBars() comicToolBar->addAction(adjustHeightAction); comicToolBar->addAction(adjustToFullSizeAction); - comicToolBar->addAction(fitToPageAction); comicToolBar->addAction(leftRotationAction); comicToolBar->addAction(rightRotationAction); comicToolBar->addAction(doublePageAction); @@ -586,7 +575,6 @@ void MainWindowViewer::createToolBars() viewer->addAction(adjustHeightAction); viewer->addAction(adjustWidthAction); viewer->addAction(adjustToFullSizeAction); - viewer->addAction(fitToPageAction); viewer->addAction(leftRotationAction); viewer->addAction(rightRotationAction); viewer->addAction(doublePageAction); @@ -836,7 +824,6 @@ void MainWindowViewer::enableActions() doublePageAction->setDisabled(false); doubleMangaPageAction->setDisabled(false); adjustToFullSizeAction->setDisabled(false); - fitToPageAction->setDisabled(false); //setBookmark->setDisabled(false); showBookmarksAction->setDisabled(false); showInfoAction->setDisabled(false); //TODO enable goTo and showInfo (or update) when numPages emited @@ -858,7 +845,6 @@ void MainWindowViewer::disableActions() doublePageAction->setDisabled(true); doubleMangaPageAction->setDisabled(true); adjustToFullSizeAction->setDisabled(true); - fitToPageAction->setDisabled(true); setBookmarkAction->setDisabled(true); showBookmarksAction->setDisabled(true); showInfoAction->setDisabled(true); //TODO enable goTo and showInfo (or update) when numPages emited @@ -1112,8 +1098,7 @@ void MainWindowViewer::setUpShortcutsManagement() << rightRotationAction << doublePageAction << doubleMangaPageAction - << adjustToFullSizeAction - << fitToPageAction); + << adjustToFullSizeAction); allActions << tmpList; @@ -1402,12 +1387,6 @@ void MainWindowViewer::adjustToFullSizeSwitch() viewer->updatePage(); } -void MainWindowViewer::fitToPageSwitch() -{ - Configuration::getConfiguration().setFitToPage(!Configuration::getConfiguration().getFitToPage()); - viewer->updatePage(); -} - void MainWindowViewer::sendComic() { YACReaderLocalClient * client = new YACReaderLocalClient; diff --git a/YACReader/main_window_viewer.h b/YACReader/main_window_viewer.h index f16be0ab..6f27c75b 100644 --- a/YACReader/main_window_viewer.h +++ b/YACReader/main_window_viewer.h @@ -55,7 +55,6 @@ class EditShortcutsDialog; void openFolderFromPath(QString pathFile, QString atFileName); void alwaysOnTopSwitch(); void adjustToFullSizeSwitch(); - void fitToPageSwitch(); void reloadOptions(); void fitToWidth(); void fitToHeight(); @@ -126,7 +125,6 @@ class EditShortcutsDialog; QAction *showDictionaryAction; QAction *alwaysOnTopAction; QAction *adjustToFullSizeAction; - QAction *fitToPageAction; QAction *showFlowAction; QAction *showEditShortcutsAction; diff --git a/shortcuts_management/shortcuts_manager.h b/shortcuts_management/shortcuts_manager.h index c2cd00e8..a67851cc 100644 --- a/shortcuts_management/shortcuts_manager.h +++ b/shortcuts_management/shortcuts_manager.h @@ -110,7 +110,6 @@ public: #define SHOW_DICTIONARY_ACTION_Y "SHOW_DICTIONARY_ACTION_Y" #define ALWAYS_ON_TOP_ACTION_Y "ALWAYS_ON_TOP_ACTION_Y" #define ADJUST_TO_FULL_SIZE_ACTION_Y "ADJUST_TO_FULL_SIZE_ACTION_Y" -#define FIT_TO_PAGE_ACTION_Y "FIT_TO_PAGE_ACTION_Y" #define SHOW_FLOW_ACTION_Y "SHOW_FLOW_ACTION_Y" #define SHOW_EDIT_SHORTCUTS_ACTION_Y "SHOW_EDIT_SHORTCUTS_ACTION_Y"