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

undo misplaced changeset

Browse Source
This commit is contained in:
Felix Kauselmann 2015-09-08 11:01:55 +02:00
parent f2f78b1542
commit 3d3701f0d4
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
YACReader/main_window_viewer.cpp
View File

@ -107,7 +107,6 @@ MainWindowViewer::~MainWindowViewer()
delete showDictionaryAction; delete showDictionaryAction;
delete alwaysOnTopAction; delete alwaysOnTopAction;
delete adjustToFullSizeAction; delete adjustToFullSizeAction;
delete fitToPageAction;
delete showFlowAction; delete showFlowAction;
} }
@ -412,15 +411,6 @@ void MainWindowViewer::createActions()
adjustToFullSizeAction->setData(ADJUST_TO_FULL_SIZE_ACTION_Y); adjustToFullSizeAction->setData(ADJUST_TO_FULL_SIZE_ACTION_Y);
adjustToFullSizeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_TO_FULL_SIZE_ACTION_Y)); adjustToFullSizeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_TO_FULL_SIZE_ACTION_Y));
connect(adjustToFullSizeAction,SIGNAL(triggered()),this,SLOT(adjustToFullSizeSwitch())); 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 = new QAction(tr("Show go to flow"),this);
showFlowAction->setIcon(QIcon(":/images/viewer_toolbar/flow.png")); showFlowAction->setIcon(QIcon(":/images/viewer_toolbar/flow.png"));
@ -535,7 +525,6 @@ void MainWindowViewer::createToolBars()
comicToolBar->addAction(adjustHeightAction); comicToolBar->addAction(adjustHeightAction);
comicToolBar->addAction(adjustToFullSizeAction); comicToolBar->addAction(adjustToFullSizeAction);
comicToolBar->addAction(fitToPageAction);
comicToolBar->addAction(leftRotationAction); comicToolBar->addAction(leftRotationAction);
comicToolBar->addAction(rightRotationAction); comicToolBar->addAction(rightRotationAction);
comicToolBar->addAction(doublePageAction); comicToolBar->addAction(doublePageAction);
@ -586,7 +575,6 @@ void MainWindowViewer::createToolBars()
viewer->addAction(adjustHeightAction); viewer->addAction(adjustHeightAction);
viewer->addAction(adjustWidthAction); viewer->addAction(adjustWidthAction);
viewer->addAction(adjustToFullSizeAction); viewer->addAction(adjustToFullSizeAction);
viewer->addAction(fitToPageAction);
viewer->addAction(leftRotationAction); viewer->addAction(leftRotationAction);
viewer->addAction(rightRotationAction); viewer->addAction(rightRotationAction);
viewer->addAction(doublePageAction); viewer->addAction(doublePageAction);
@ -836,7 +824,6 @@ void MainWindowViewer::enableActions()
doublePageAction->setDisabled(false); doublePageAction->setDisabled(false);
doubleMangaPageAction->setDisabled(false); doubleMangaPageAction->setDisabled(false);
adjustToFullSizeAction->setDisabled(false); adjustToFullSizeAction->setDisabled(false);
fitToPageAction->setDisabled(false);
//setBookmark->setDisabled(false); //setBookmark->setDisabled(false);
showBookmarksAction->setDisabled(false); showBookmarksAction->setDisabled(false);
showInfoAction->setDisabled(false); //TODO enable goTo and showInfo (or update) when numPages emited showInfoAction->setDisabled(false); //TODO enable goTo and showInfo (or update) when numPages emited
@ -858,7 +845,6 @@ void MainWindowViewer::disableActions()
doublePageAction->setDisabled(true); doublePageAction->setDisabled(true);
doubleMangaPageAction->setDisabled(true); doubleMangaPageAction->setDisabled(true);
adjustToFullSizeAction->setDisabled(true); adjustToFullSizeAction->setDisabled(true);
fitToPageAction->setDisabled(true);
setBookmarkAction->setDisabled(true); setBookmarkAction->setDisabled(true);
showBookmarksAction->setDisabled(true); showBookmarksAction->setDisabled(true);
showInfoAction->setDisabled(true); //TODO enable goTo and showInfo (or update) when numPages emited showInfoAction->setDisabled(true); //TODO enable goTo and showInfo (or update) when numPages emited
@ -1112,8 +1098,7 @@ void MainWindowViewer::setUpShortcutsManagement()
<< rightRotationAction << rightRotationAction
<< doublePageAction << doublePageAction
<< doubleMangaPageAction << doubleMangaPageAction
<< adjustToFullSizeAction << adjustToFullSizeAction);
<< fitToPageAction);
allActions << tmpList; allActions << tmpList;
@ -1402,12 +1387,6 @@ void MainWindowViewer::adjustToFullSizeSwitch()
viewer->updatePage(); viewer->updatePage();
} }
void MainWindowViewer::fitToPageSwitch()
{
Configuration::getConfiguration().setFitToPage(!Configuration::getConfiguration().getFitToPage());
viewer->updatePage();
}
void MainWindowViewer::sendComic() void MainWindowViewer::sendComic()
{ {
YACReaderLocalClient * client = new YACReaderLocalClient; YACReaderLocalClient * client = new YACReaderLocalClient;

2
YACReader/main_window_viewer.h
View File

@ -55,7 +55,6 @@ class EditShortcutsDialog;
void openFolderFromPath(QString pathFile, QString atFileName); void openFolderFromPath(QString pathFile, QString atFileName);
void alwaysOnTopSwitch(); void alwaysOnTopSwitch();
void adjustToFullSizeSwitch(); void adjustToFullSizeSwitch();
void fitToPageSwitch();
void reloadOptions(); void reloadOptions();
void fitToWidth(); void fitToWidth();
void fitToHeight(); void fitToHeight();
@ -126,7 +125,6 @@ class EditShortcutsDialog;
QAction *showDictionaryAction; QAction *showDictionaryAction;
QAction *alwaysOnTopAction; QAction *alwaysOnTopAction;
QAction *adjustToFullSizeAction; QAction *adjustToFullSizeAction;
QAction *fitToPageAction;
QAction *showFlowAction; QAction *showFlowAction;
QAction *showEditShortcutsAction; QAction *showEditShortcutsAction;

1
shortcuts_management/shortcuts_manager.h
View File

@ -110,7 +110,6 @@ public:
#define SHOW_DICTIONARY_ACTION_Y "SHOW_DICTIONARY_ACTION_Y" #define SHOW_DICTIONARY_ACTION_Y "SHOW_DICTIONARY_ACTION_Y"
#define ALWAYS_ON_TOP_ACTION_Y "ALWAYS_ON_TOP_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 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_FLOW_ACTION_Y "SHOW_FLOW_ACTION_Y"
#define SHOW_EDIT_SHORTCUTS_ACTION_Y "SHOW_EDIT_SHORTCUTS_ACTION_Y" #define SHOW_EDIT_SHORTCUTS_ACTION_Y "SHOW_EDIT_SHORTCUTS_ACTION_Y"