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:48 +02:00
parent ceb4e81e3c
commit f2f78b1542
3 changed files with 8 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
YACReader/main_window_viewer.cpp
View File

@ -262,7 +262,7 @@ void MainWindowViewer::createActions()
adjustHeightAction->setIcon(QIcon(":/images/viewer_toolbar/toHeight.png")); adjustHeightAction->setIcon(QIcon(":/images/viewer_toolbar/toHeight.png"));
//adjustWidth->setCheckable(true); //adjustWidth->setCheckable(true);
adjustHeightAction->setDisabled(true); adjustHeightAction->setDisabled(true);
//adjustHeightAction->setChecked(Configuration::getConfiguration().getAdjustToWidth()); adjustHeightAction->setChecked(Configuration::getConfiguration().getAdjustToWidth());
adjustHeightAction->setToolTip(tr("Fit image to height")); adjustHeightAction->setToolTip(tr("Fit image to height"));
//adjustWidth->setIcon(QIcon(":/images/fitWidth.png")); //adjustWidth->setIcon(QIcon(":/images/fitWidth.png"));
adjustHeightAction->setData(ADJUST_HEIGHT_ACTION_Y); adjustHeightAction->setData(ADJUST_HEIGHT_ACTION_Y);
@ -273,7 +273,7 @@ void MainWindowViewer::createActions()
adjustWidthAction->setIcon(QIcon(":/images/viewer_toolbar/toWidth.png")); adjustWidthAction->setIcon(QIcon(":/images/viewer_toolbar/toWidth.png"));
//adjustWidth->setCheckable(true); //adjustWidth->setCheckable(true);
adjustWidthAction->setDisabled(true); adjustWidthAction->setDisabled(true);
//adjustWidthAction->setChecked(Configuration::getConfiguration().getAdjustToWidth()); adjustWidthAction->setChecked(Configuration::getConfiguration().getAdjustToWidth());
adjustWidthAction->setToolTip(tr("Fit image to width")); adjustWidthAction->setToolTip(tr("Fit image to width"));
//adjustWidth->setIcon(QIcon(":/images/fitWidth.png")); //adjustWidth->setIcon(QIcon(":/images/fitWidth.png"));
adjustWidthAction->setData(ADJUST_WIDTH_ACTION_Y); adjustWidthAction->setData(ADJUST_WIDTH_ACTION_Y);
@ -406,9 +406,9 @@ 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(true);
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);
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()));
@ -417,26 +417,10 @@ void MainWindowViewer::createActions()
//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);
fitToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FIT_TO_PAGE_ACTION_Y)); fitToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FIT_TO_PAGE_ACTION_Y));
connect(fitToPageAction,SIGNAL(triggered()),this,SLOT(fitToPageSwitch())); connect(fitToPageAction,SIGNAL(triggered()),this,SLOT(fitToPageSwitch()));
increasePageZoomAction = new QAction(tr("Zoom+"),this);
//fitToPageAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
//fitToPageAction->setDisabled(true);
//fitToPageAction->setChecked(Configuration::getConfiguration().getFitToPage());
//fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y);
increasePageZoomAction->setShortcut(QKeySequence::ZoomIn);
connect(increasePageZoomAction,SIGNAL(triggered()),this,SLOT(increasePageZoomLevel()));
decreasePageZoomAction = new QAction(tr("Zoom-"),this);
//fitToPageAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
//fitToPageAction->setDisabled(true);
//fitToPageAction->setChecked(Configuration::getConfiguration().getFitToPage());
//fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y);
decreasePageZoomAction->setShortcut(QKeySequence::ZoomOut);
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);
showFlowAction->setIcon(QIcon(":/images/viewer_toolbar/flow.png")); showFlowAction->setIcon(QIcon(":/images/viewer_toolbar/flow.png"));
@ -560,8 +544,7 @@ void MainWindowViewer::createToolBars()
comicToolBar->addSeparator(); comicToolBar->addSeparator();
comicToolBar->addAction(showMagnifyingGlassAction); comicToolBar->addAction(showMagnifyingGlassAction);
comicToolBar->addAction(increasePageZoomAction);
comicToolBar->addAction(decreasePageZoomAction);
comicToolBar->addSeparator(); comicToolBar->addSeparator();
@ -1425,18 +1408,6 @@ void MainWindowViewer::fitToPageSwitch()
viewer->updatePage(); viewer->updatePage();
} }
void MainWindowViewer::increasePageZoomLevel()
{
Configuration::getConfiguration().setPageZoomLevel(Configuration::getConfiguration().getPageZoomLevel() + 0.1);
viewer->updatePage();
}
void MainWindowViewer::decreasePageZoomLevel()
{
Configuration::getConfiguration().setPageZoomLevel(Configuration::getConfiguration().getPageZoomLevel() - 0.1);
viewer->updatePage();
}
void MainWindowViewer::sendComic() void MainWindowViewer::sendComic()
{ {
YACReaderLocalClient * client = new YACReaderLocalClient; YACReaderLocalClient * client = new YACReaderLocalClient;

4
YACReader/main_window_viewer.h
View File

@ -56,8 +56,6 @@ class EditShortcutsDialog;
void alwaysOnTopSwitch(); void alwaysOnTopSwitch();
void adjustToFullSizeSwitch(); void adjustToFullSizeSwitch();
void fitToPageSwitch(); void fitToPageSwitch();
void increasePageZoomLevel();
void decreasePageZoomLevel();
void reloadOptions(); void reloadOptions();
void fitToWidth(); void fitToWidth();
void fitToHeight(); void fitToHeight();
@ -129,8 +127,6 @@ class EditShortcutsDialog;
QAction *alwaysOnTopAction; QAction *alwaysOnTopAction;
QAction *adjustToFullSizeAction; QAction *adjustToFullSizeAction;
QAction *fitToPageAction; QAction *fitToPageAction;
QAction *increasePageZoomAction;
QAction *decreasePageZoomAction;
QAction *showFlowAction; QAction *showFlowAction;
QAction *showEditShortcutsAction; QAction *showEditShortcutsAction;

20
YACReader/viewer.cpp
View File

@ -340,16 +340,9 @@ void Viewer::updateContentSize()
} }
else else
{ {
//float aspectRatio = (float)currentPage->width()/currentPage->height(); float aspectRatio = (float)currentPage->width()/currentPage->height();
//Fit to width //Fit to width
if(Configuration::getConfiguration().getAdjustToWidth()) if(Configuration::getConfiguration().getAdjustToWidth())
{
QSize pagefit=currentPage->size();
pagefit.scale(width(), 0, Qt::KeepAspectRatioByExpanding);
content->resize(pagefit);
}
/*
if(Configuration::getConfiguration().getAdjustToWidth())
{ {
adjustToWidthRatio = Configuration::getConfiguration().getFitToWidthRatio(); adjustToWidthRatio = Configuration::getConfiguration().getFitToWidthRatio();
if(static_cast<int>(width()*adjustToWidthRatio/aspectRatio)<height()) if(static_cast<int>(width()*adjustToWidthRatio/aspectRatio)<height())
@ -360,7 +353,6 @@ void Viewer::updateContentSize()
else else
content->resize(width()*adjustToWidthRatio,static_cast<int>(width()*adjustToWidthRatio/aspectRatio)); content->resize(width()*adjustToWidthRatio,static_cast<int>(width()*adjustToWidthRatio/aspectRatio));
} }
//Fit to height or fullsize/custom size //Fit to height or fullsize/custom size
else else
{ {
@ -368,26 +360,18 @@ void Viewer::updateContentSize()
content->resize(width(),static_cast<int>(width()/aspectRatio)); content->resize(width(),static_cast<int>(width()/aspectRatio));
else else
content->resize(static_cast<int>(height()*aspectRatio),height()); content->resize(static_cast<int>(height()*aspectRatio),height());
}*/
else
{
QSize pagefit=currentPage->size();
pagefit.scale(0, height(), Qt::KeepAspectRatioByExpanding);
content->resize(pagefit);
} }
} }
if(Configuration::getConfiguration().getPageZoomLevel()) if(Configuration::getConfiguration().getPageZoomLevel())
{ {
QSize pagesize=content->size(); QSize pagesize=content->size();
pagesize.scale(content->width()*Configuration::getConfiguration().getPageZoomLevel(), 0, Qt::KeepAspectRatioByExpanding); pagesize.scale(content->width()*Configuration::getConfiguration().getPageZoomLevel(), content->height(), Qt::KeepAspectRatio);
content->resize(pagesize); content->resize(pagesize);
} }
if(devicePixelRatio()>1)//only in retina display if(devicePixelRatio()>1)//only in retina display
{ {
qDebug() << "Retina Display detected" << "devicePixelRatio:" << devicePixelRatio();
QPixmap page = currentPage->scaled(content->width()*devicePixelRatio(), content->height()*devicePixelRatio(), Qt::KeepAspectRatio, Qt::SmoothTransformation); QPixmap page = currentPage->scaled(content->width()*devicePixelRatio(), content->height()*devicePixelRatio(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
page.setDevicePixelRatio(devicePixelRatio()); page.setDevicePixelRatio(devicePixelRatio());
content->setPixmap(page); content->setPixmap(page);