Change toolbar controls to new fitmode

This commit is contained in:
Felix Kauselmann 2015-09-14 10:14:41 +02:00
parent 1fd8713121
commit dffe34ba25

View File

@ -405,7 +405,7 @@ void MainWindowViewer::createActions()
adjustToFullSizeAction = new QAction(tr("Show full size"),this); adjustToFullSizeAction = new QAction(tr("Show full size"),this);
adjustToFullSizeAction->setIcon(QIcon(":/images/viewer_toolbar/full.png")); adjustToFullSizeAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
adjustToFullSizeAction->setCheckable(true); adjustToFullSizeAction->setCheckable(false);
adjustToFullSizeAction->setDisabled(true); adjustToFullSizeAction->setDisabled(true);
adjustToFullSizeAction->setChecked(Configuration::getConfiguration().getAdjustToFullSize()); adjustToFullSizeAction->setChecked(Configuration::getConfiguration().getAdjustToFullSize());
adjustToFullSizeAction->setData(ADJUST_TO_FULL_SIZE_ACTION_Y); adjustToFullSizeAction->setData(ADJUST_TO_FULL_SIZE_ACTION_Y);
@ -956,21 +956,13 @@ void MainWindowViewer::showToolBars()
} }
void MainWindowViewer::fitToWidth() void MainWindowViewer::fitToWidth()
{ {
Configuration & conf = Configuration::getConfiguration(); Configuration::getConfiguration().setFitMode(YACReader::FitMode::ToWidth);
if(!conf.getAdjustToWidth()) viewer->updatePage();
{
conf.setAdjustToWidth(true);
viewer->updatePage();
}
} }
void MainWindowViewer::fitToHeight() void MainWindowViewer::fitToHeight()
{ {
Configuration & conf = Configuration::getConfiguration(); Configuration::getConfiguration().setFitMode(YACReader::FitMode::ToHeight);
if(conf.getAdjustToWidth()) viewer->updatePage();
{
conf.setAdjustToWidth(false);
viewer->updatePage();
}
} }
void MainWindowViewer::checkNewVersion() void MainWindowViewer::checkNewVersion()
@ -1383,7 +1375,7 @@ void MainWindowViewer::alwaysOnTopSwitch()
void MainWindowViewer::adjustToFullSizeSwitch() void MainWindowViewer::adjustToFullSizeSwitch()
{ {
Configuration::getConfiguration().setAdjustToFullSize(!Configuration::getConfiguration().getAdjustToFullSize()); Configuration::getConfiguration().setFitMode(YACReader::FitMode::FullRes);
viewer->updatePage(); viewer->updatePage();
} }