From dffe34ba25060cffd0843d2fad3be64c5785801b Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Mon, 14 Sep 2015 10:14:41 +0200 Subject: [PATCH] Change toolbar controls to new fitmode --- YACReader/main_window_viewer.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index 1be64fe0..d27a0c14 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -405,7 +405,7 @@ void MainWindowViewer::createActions() adjustToFullSizeAction = new QAction(tr("Show full size"),this); adjustToFullSizeAction->setIcon(QIcon(":/images/viewer_toolbar/full.png")); - adjustToFullSizeAction->setCheckable(true); + adjustToFullSizeAction->setCheckable(false); adjustToFullSizeAction->setDisabled(true); adjustToFullSizeAction->setChecked(Configuration::getConfiguration().getAdjustToFullSize()); adjustToFullSizeAction->setData(ADJUST_TO_FULL_SIZE_ACTION_Y); @@ -956,21 +956,13 @@ void MainWindowViewer::showToolBars() } void MainWindowViewer::fitToWidth() { - Configuration & conf = Configuration::getConfiguration(); - if(!conf.getAdjustToWidth()) - { - conf.setAdjustToWidth(true); - viewer->updatePage(); - } + Configuration::getConfiguration().setFitMode(YACReader::FitMode::ToWidth); + viewer->updatePage(); } void MainWindowViewer::fitToHeight() { - Configuration & conf = Configuration::getConfiguration(); - if(conf.getAdjustToWidth()) - { - conf.setAdjustToWidth(false); - viewer->updatePage(); - } + Configuration::getConfiguration().setFitMode(YACReader::FitMode::ToHeight); + viewer->updatePage(); } void MainWindowViewer::checkNewVersion() @@ -1383,7 +1375,7 @@ void MainWindowViewer::alwaysOnTopSwitch() void MainWindowViewer::adjustToFullSizeSwitch() { - Configuration::getConfiguration().setAdjustToFullSize(!Configuration::getConfiguration().getAdjustToFullSize()); + Configuration::getConfiguration().setFitMode(YACReader::FitMode::FullRes); viewer->updatePage(); }