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 10:37:40 +02:00
parent 2154e71921
commit ced8b4e38e
6 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
YACReader/configuration.cpp
View File

@ -39,11 +39,8 @@ void Configuration::load(QSettings * settings)
settings->setValue(FLOW_TYPE,0); settings->setValue(FLOW_TYPE,0);
if(!settings->contains(FULLSCREEN)) if(!settings->contains(FULLSCREEN))
settings->setValue(FULLSCREEN,false); settings->setValue(FULLSCREEN,false);
//TODO: Replace this with zoom mode
if(!settings->contains(FIT_TO_WIDTH_RATIO)) if(!settings->contains(FIT_TO_WIDTH_RATIO))
settings->setValue(FIT_TO_WIDTH_RATIO,1); settings->setValue(FIT_TO_WIDTH_RATIO,1);
if(!settings->contains(Y_WINDOW_SIZE)) if(!settings->contains(Y_WINDOW_SIZE))
settings->setValue(Y_WINDOW_SIZE,QSize(0,0)); settings->setValue(Y_WINDOW_SIZE,QSize(0,0));
if(!settings->contains(MAXIMIZED)) if(!settings->contains(MAXIMIZED))

2
YACReader/configuration.h
View File

@ -27,7 +27,7 @@ using namespace YACReader;
QSize magnifyingGlassSize; QSize magnifyingGlassSize;
QSize gotoSlideSize; QSize gotoSlideSize;
float zoomLevel; float zoomLevel;
//bool adjustToWidth; bool adjustToWidth;
bool fullScreen; bool fullScreen;
FlowType flowType; FlowType flowType;
float fitToWidthRatio; float fitToWidthRatio;

25
YACReader/main_window_viewer.cpp
View File

@ -415,7 +415,7 @@ void MainWindowViewer::createActions()
fitToPageAction = new QAction(tr("Fit to page"),this); fitToPageAction = new QAction(tr("Fit to page"),this);
//fitToPageAction->setIcon(QIcon(":/images/viewer_toolbar/full.png")); //fitToPageAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
//fitToPageAction->setCheckable(true); fitToPageAction->setCheckable(true);
fitToPageAction->setDisabled(true); fitToPageAction->setDisabled(true);
//fitToPageAction->setChecked(Configuration::getConfiguration().getFitToPage()); //fitToPageAction->setChecked(Configuration::getConfiguration().getFitToPage());
fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y); fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y);
@ -423,20 +423,19 @@ void MainWindowViewer::createActions()
connect(fitToPageAction,SIGNAL(triggered()),this,SLOT(fitToPageSwitch())); connect(fitToPageAction,SIGNAL(triggered()),this,SLOT(fitToPageSwitch()));
increasePageZoomAction = new QAction(tr("Zoom+"),this); increasePageZoomAction = new QAction(tr("Zoom+"),this);
//increasePageZoomAction->setIcon(QIcon(":/images/viewer_toolbar/full.png")); //fitToPageAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
increasePageZoomAction->setDisabled(true); //fitToPageAction->setDisabled(true);
increasePageZoomAction->setData(ZOOM_PLUS_ACTION_Y); //fitToPageAction->setChecked(Configuration::getConfiguration().getFitToPage());
increasePageZoomAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ZOOM_PLUS_ACTION_Y)); //fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y);
increasePageZoomAction->setShortcut(QKeySequence::ZoomIn);
connect(increasePageZoomAction,SIGNAL(triggered()),this,SLOT(increasePageZoomLevel())); connect(increasePageZoomAction,SIGNAL(triggered()),this,SLOT(increasePageZoomLevel()));
decreasePageZoomAction = new QAction(tr("Zoom-"),this); decreasePageZoomAction = new QAction(tr("Zoom-"),this);
//decreasePageZoomAction->setIcon(QIcon(":/images/viewer_toolbar/full.png")); //fitToPageAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
decreasePageZoomAction->setDisabled(true); //fitToPageAction->setDisabled(true);
decreasePageZoomAction->setData(ZOOM_MINUS_ACTION_Y); //fitToPageAction->setChecked(Configuration::getConfiguration().getFitToPage());
decreasePageZoomAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ZOOM_MINUS_ACTION_Y)); //fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y);
//decreasePageZoomAction->setShortcut(QKeySequence::ZoomOut); decreasePageZoomAction->setShortcut(QKeySequence::ZoomOut);
connect(decreasePageZoomAction,SIGNAL(triggered()),this,SLOT(decreasePageZoomLevel())); connect(decreasePageZoomAction,SIGNAL(triggered()),this,SLOT(decreasePageZoomLevel()));
showFlowAction = new QAction(tr("Show go to flow"),this); showFlowAction = new QAction(tr("Show go to flow"),this);
@ -855,8 +854,6 @@ void MainWindowViewer::enableActions()
doubleMangaPageAction->setDisabled(false); doubleMangaPageAction->setDisabled(false);
adjustToFullSizeAction->setDisabled(false); adjustToFullSizeAction->setDisabled(false);
fitToPageAction->setDisabled(false); fitToPageAction->setDisabled(false);
increasePageZoomAction->setDisabled(false);
decreasePageZoomAction->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

6
common/yacreader_global.h
View File

@ -19,8 +19,8 @@
#define SLIDE_SIZE "SLIDE_SIZE" #define SLIDE_SIZE "SLIDE_SIZE"
#define GO_TO_FLOW_SIZE "GO_TO_FLOW_SIZE" #define GO_TO_FLOW_SIZE "GO_TO_FLOW_SIZE"
#define FLOW_TYPE_SW "FLOW_TYPE_SW" #define FLOW_TYPE_SW "FLOW_TYPE_SW"
//#define FIT "FIT" #define FIT "FIT"
//#define PAGEFIT "PAGEFIT" #define PAGEFIT "PAGEFIT"
#define FITMODE "FITMODE" #define FITMODE "FITMODE"
#define FLOW_TYPE "FLOW_TYPE" #define FLOW_TYPE "FLOW_TYPE"
#define FULLSCREEN "FULLSCREEN" #define FULLSCREEN "FULLSCREEN"
@ -30,7 +30,7 @@
#define MAXIMIZED "MAXIMIZED" #define MAXIMIZED "MAXIMIZED"
#define DOUBLE_PAGE "DOUBLE_PAGE" #define DOUBLE_PAGE "DOUBLE_PAGE"
#define DOUBLE_MANGA_PAGE "DOUBLE_MANGA_PAGE" #define DOUBLE_MANGA_PAGE "DOUBLE_MANGA_PAGE"
//#define ADJUST_TO_FULL_SIZE "ADJUST_TO_FULL_SIZE" #define ADJUST_TO_FULL_SIZE "ADJUST_TO_FULL_SIZE"
#define BACKGROUND_COLOR "BACKGROUND_COLOR" #define BACKGROUND_COLOR "BACKGROUND_COLOR"
#define ALWAYS_ON_TOP "ALWAYS_ON_TOP" #define ALWAYS_ON_TOP "ALWAYS_ON_TOP"
#define SHOW_TOOLBARS "SHOW_TOOLBARS" #define SHOW_TOOLBARS "SHOW_TOOLBARS"

4
shortcuts_management/shortcuts_manager.cpp
View File

@ -52,9 +52,7 @@ void ShortcutsManager::initDefaultShorcuts()
defaultShorcuts.insert(ALWAYS_ON_TOP_ACTION_Y, Qt::Key_Q); //deprecated defaultShorcuts.insert(ALWAYS_ON_TOP_ACTION_Y, Qt::Key_Q); //deprecated
defaultShorcuts.insert(ADJUST_TO_FULL_SIZE_ACTION_Y, Qt::Key_W); defaultShorcuts.insert(ADJUST_TO_FULL_SIZE_ACTION_Y, Qt::Key_W);
defaultShorcuts.insert(SHOW_FLOW_ACTION_Y, Qt::Key_S); defaultShorcuts.insert(SHOW_FLOW_ACTION_Y, Qt::Key_S);
defaultShorcuts.insert(ZOOM_PLUS_ACTION_Y, QKeySequence::ZoomIn);
defaultShorcuts.insert(ZOOM_MINUS_ACTION_Y, QKeySequence::ZoomOut);
//main_window_viewer //main_window_viewer
defaultShorcuts.insert(TOGGLE_FULL_SCREEN_ACTION_Y, Qt::Key_F); defaultShorcuts.insert(TOGGLE_FULL_SCREEN_ACTION_Y, Qt::Key_F);
defaultShorcuts.insert(TOGGLE_TOOL_BARS_ACTION_Y, Qt::Key_H); defaultShorcuts.insert(TOGGLE_TOOL_BARS_ACTION_Y, Qt::Key_H);

2
shortcuts_management/shortcuts_manager.h
View File

@ -111,8 +111,6 @@ public:
#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 FIT_TO_PAGE_ACTION_Y "FIT_TO_PAGE_ACTION_Y"
#define ZOOM_PLUS_ACTION_Y "ZOOM_PLUS_ACTION_Y"
#define ZOOM_MINUS_ACTION_Y "ZOOM_MINUS_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"