diff --git a/YACReader/configuration.h b/YACReader/configuration.h index 4208c0ff..cb170786 100644 --- a/YACReader/configuration.h +++ b/YACReader/configuration.h @@ -18,7 +18,7 @@ using namespace YACReader; class Configuration : public QObject { Q_OBJECT - + private: QSettings * settings; @@ -43,8 +43,8 @@ using namespace YACReader; Configuration(); //Configuration(const Configuration & conf); void load(const QString & path = CONF_FILE_PATH); - - + + public: static Configuration & getConfiguration() { @@ -58,18 +58,18 @@ using namespace YACReader; void setMagnifyingGlassSize(const QSize & mgs) { settings->setValue(MAG_GLASS_SIZE,mgs);} QSize getGotoSlideSize() { return settings->value(GO_TO_FLOW_SIZE).toSize();} void setGotoSlideSize(const QSize & gss) { settings->setValue(GO_TO_FLOW_SIZE,gss);} - float getZoomLevel() { return settings->value(ZOOM_LEVEL).toFloat();} - void setZoomLevel(float zl) { settings->setValue(ZOOM_LEVEL,zl);} - + float getZoomLevel() { return settings->value(ZOOM_LEVEL).toFloat();} + void setZoomLevel(float zl) { settings->setValue(ZOOM_LEVEL,zl);} + //Unified enum based fitmode - YACReader::FitMode getFitMode() { return static_cast(settings->value(FITMODE, YACReader::FitMode::FullPage).toInt()); } + YACReader::FitMode getFitMode() { return static_cast(settings->value(FITMODE, YACReader::FitMode::FullPage).toInt()); } void setFitMode ( YACReader::FitMode fitMode ){ settings->setValue(FITMODE, static_cast(fitMode)); } - + //openRecent QStringList openRecentList() { return settings->value("recentFiles").toStringList(); } void updateOpenRecentList (QString path); void clearOpenRecentList() { settings->remove("recentFiles"); } - + //Old fitmodes /* bool getAdjustToWidth() {return settings->value(FIT).toBool();} @@ -79,12 +79,12 @@ using namespace YACReader; bool getAdjustToFullSize(){return settings->value(ADJUST_TO_FULL_SIZE).toBool();} void setAdjustToFullSize(bool b){settings->setValue(ADJUST_TO_FULL_SIZE,b);} */ - + FlowType getFlowType(){return (FlowType)settings->value(FLOW_TYPE_SW).toInt();} void setFlowType(FlowType type){settings->setValue(FLOW_TYPE_SW,type);} bool getFullScreen(){return settings->value(FULLSCREEN).toBool();} void setFullScreen(bool f){settings->setValue(FULLSCREEN,f);} - + QPoint getPos(){return settings->value(Y_WINDOW_POS).toPoint();} void setPos(QPoint p){settings->setValue(Y_WINDOW_POS,p);} QSize getSize(){return settings->value(Y_WINDOW_SIZE).toSize();} @@ -95,7 +95,7 @@ using namespace YACReader; void setDoublePage(bool b){settings->setValue(DOUBLE_PAGE,b);} bool getDoubleMangaPage(){return settings->value(DOUBLE_MANGA_PAGE).toBool();} void setDoubleMangaPage(bool b){settings->setValue(DOUBLE_MANGA_PAGE,b);} - + QColor getBackgroundColor(){return settings->value(BACKGROUND_COLOR).value();} void setBackgroundColor(const QColor& color){settings->value(BACKGROUND_COLOR,color);} bool getAlwaysOnTop(){return settings->value(ALWAYS_ON_TOP).toBool();} diff --git a/YACReader/goto_flow.cpp b/YACReader/goto_flow.cpp index fdb17057..a4b8118b 100644 --- a/YACReader/goto_flow.cpp +++ b/YACReader/goto_flow.cpp @@ -27,7 +27,7 @@ GoToFlow::GoToFlow(QWidget *parent,FlowType flowType) -:GoToFlowWidget(parent),ready(false) + :GoToFlowWidget(parent),ready(false) { updateTimer = new QTimer; connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateImageData())); @@ -43,12 +43,12 @@ GoToFlow::GoToFlow(QWidget *parent,FlowType flowType) connect(flow,SIGNAL(selected(unsigned int)),this,SIGNAL(goToPage(unsigned int))); connect(toolBar,SIGNAL(goTo(unsigned int)),this,SIGNAL(goToPage(unsigned int))); - connect(toolBar,SIGNAL(setCenter(unsigned int)),flow,SLOT(showSlide(unsigned int))); + connect(toolBar,SIGNAL(setCenter(unsigned int)),flow,SLOT(showSlide(unsigned int))); - mainLayout->addWidget(flow); - toolBar->raise(); + mainLayout->addWidget(flow); + toolBar->raise(); - resize(static_cast(5*imageSize.width()),toolBar->height() + static_cast(imageSize.height()*1.7)); + resize(static_cast(5*imageSize.width()),toolBar->height() + static_cast(imageSize.height()*1.7)); this->setCursor(QCursor(Qt::ArrowCursor)); } @@ -64,11 +64,11 @@ void GoToFlow::keyPressEvent(QKeyEvent *event) { switch (event->key()) { - case Qt::Key_Left: case Qt::Key_Right: case Qt::Key_Up: - QApplication::sendEvent(flow,event); - return; - default: - break; + case Qt::Key_Left: case Qt::Key_Right: case Qt::Key_Up: + QApplication::sendEvent(flow,event); + return; + default: + break; } GoToFlowWidget::keyPressEvent(event); @@ -76,10 +76,10 @@ void GoToFlow::keyPressEvent(QKeyEvent *event) void GoToFlow::resizeEvent(QResizeEvent *event) { - QWidget::resizeEvent(event); + QWidget::resizeEvent(event); - toolBar->move(0, event->size().height() - toolBar->height()); - toolBar->setFixedWidth(width()); + toolBar->move(0, event->size().height() - toolBar->height()); + toolBar->setFixedWidth(width()); } @@ -169,11 +169,11 @@ void GoToFlow::updateImageData() imagesLoaded[idx]=true; } - } + } - // try to load only few images on the left and right side + // try to load only few images on the left and right side // i.e. all visible ones plus some extra -#define COUNT 8 +#define COUNT 8 int indexes[2*COUNT+1]; int center = flow->centerIndex(); indexes[0] = center; @@ -181,7 +181,7 @@ void GoToFlow::updateImageData() { indexes[j*2+1] = center+j+1; indexes[j*2+2] = center-j-1; - } + } for(int c = 0; c < 2*COUNT+1; c++) { int i = indexes[c]; @@ -189,7 +189,7 @@ void GoToFlow::updateImageData() if(!imagesLoaded[i]&&imagesReady[i])//slide(i).isNull()) { // schedule thumbnail generation - + worker->generate(i, flow->slideSize(),rawImages[i]); return; } @@ -229,7 +229,7 @@ void GoToFlow::updateConfig(QSettings * settings) //SlideInitializer //----------------------------------------------------------------------------- SlideInitializer::SlideInitializer(QMutex * m,PictureFlow * flow,int slides) -:QThread(),mutex(m),_flow(flow),_slides(slides) + :QThread(),mutex(m),_flow(flow),_slides(slides) { } @@ -249,8 +249,8 @@ void SlideInitializer::run() //----------------------------------------------------------------------------- -PageLoader::PageLoader(QMutex * m): -QThread(),mutex(m), restart(false), working(false), idx(-1) +PageLoader::PageLoader(QMutex * m): + QThread(),mutex(m), restart(false), working(false), idx(-1) { } @@ -265,7 +265,7 @@ PageLoader::~PageLoader() bool PageLoader::busy() const { return isRunning() ? working : false; -} +} void PageLoader::generate(int index, QSize size,const QByteArray & rImage) { diff --git a/YACReader/goto_flow_gl.cpp b/YACReader/goto_flow_gl.cpp index 0612540a..7ea941d8 100644 --- a/YACReader/goto_flow_gl.cpp +++ b/YACReader/goto_flow_gl.cpp @@ -26,12 +26,12 @@ GoToFlowGL::GoToFlowGL(QWidget* parent, FlowType flowType) connect(flow,SIGNAL(selected(unsigned int)),this,SIGNAL(goToPage(unsigned int))); connect(toolBar,SIGNAL(goTo(unsigned int)),this,SIGNAL(goToPage(unsigned int))); - connect(toolBar,SIGNAL(setCenter(unsigned int)),flow,SLOT(setCenterIndex(unsigned int))); + connect(toolBar,SIGNAL(setCenter(unsigned int)),flow,SLOT(setCenterIndex(unsigned int))); - mainLayout->addWidget(flow); - toolBar->raise(); + mainLayout->addWidget(flow); + toolBar->raise(); - resize(static_cast(5*imageSize.width()),toolBar->height() + static_cast(imageSize.height()*1.7)); + resize(static_cast(5*imageSize.width()),toolBar->height() + static_cast(imageSize.height()*1.7)); this->setCursor(QCursor(Qt::ArrowCursor)); } @@ -138,7 +138,7 @@ void GoToFlowGL::updateConfig(QSettings * settings) flow->setLightStrenght(settings->value(LIGHT_STRENGTH).toInt()); flow->setMaxAngle(settings->value(MAX_ANGLE).toInt()); -/* flow->setVisibility(settings->value("visibilityDistance").toInt()); + /* flow->setVisibility(settings->value("visibilityDistance").toInt()); flow->setLightStrenght(settings->value("lightStrength").toInt())*/; } @@ -147,11 +147,11 @@ void GoToFlowGL::keyPressEvent(QKeyEvent* event) { switch (event->key()) { - case Qt::Key_Left: case Qt::Key_Right: case Qt::Key_Up: - QApplication::sendEvent(flow,event); - return; - default: - break; + case Qt::Key_Left: case Qt::Key_Right: case Qt::Key_Up: + QApplication::sendEvent(flow,event); + return; + default: + break; } GoToFlowWidget::keyPressEvent(event); @@ -159,8 +159,8 @@ void GoToFlowGL::keyPressEvent(QKeyEvent* event) void GoToFlowGL::resizeEvent(QResizeEvent *event) { - QWidget::resizeEvent(event); + QWidget::resizeEvent(event); - toolBar->move(0, event->size().height() - toolBar->height()); - toolBar->setFixedWidth(width()); + toolBar->move(0, event->size().height() - toolBar->height()); + toolBar->setFixedWidth(width()); } diff --git a/YACReader/options_dialog.cpp b/YACReader/options_dialog.cpp index 77f1d4e9..c70f2ee8 100644 --- a/YACReader/options_dialog.cpp +++ b/YACReader/options_dialog.cpp @@ -19,7 +19,7 @@ #endif OptionsDialog::OptionsDialog(QWidget * parent) -:YACReaderOptionsDialog(parent) + :YACReaderOptionsDialog(parent) { QTabWidget * tabWidget = new QTabWidget(); @@ -49,7 +49,7 @@ OptionsDialog::OptionsDialog(QWidget * parent) QHBoxLayout * path = new QHBoxLayout(); path->addWidget(pathEdit = new QLineEdit()); - path->addWidget(pathFindButton = new QPushButton(QIcon(":/images/find_folder.png"),"")); + path->addWidget(pathFindButton = new QPushButton(QIcon(":/images/find_folder.png"),"")); pathBox->setLayout(path); connect(pathFindButton,SIGNAL(clicked()),this,SLOT(findFolder())); @@ -91,7 +91,7 @@ OptionsDialog::OptionsDialog(QWidget * parent) //brightnessS->setText(tr("Brightness")); brightnessS->setTracking(false); connect(brightnessS,SIGNAL(valueChanged(int)),this,SLOT(brightnessChanged(int))); - + contrastS = new YACReaderSpinSliderWidget(this,true); contrastS->setRange(0,250); //contrastS->setText(tr("Contrast")); @@ -115,7 +115,7 @@ OptionsDialog::OptionsDialog(QWidget * parent) layoutGeneral->addWidget(slideSizeBox); //layoutGeneral->addWidget(fitBox); layoutGeneral->addWidget(colorBox); - layoutGeneral->addWidget(shortcutsBox); + layoutGeneral->addWidget(shortcutsBox); layoutGeneral->addStretch(); layoutFlow->addWidget(sw); #ifndef NO_OPENGL @@ -177,7 +177,7 @@ void OptionsDialog::findFolder() void OptionsDialog::saveOptions() { - + settings->setValue(GO_TO_FLOW_SIZE,QSize(static_cast(slideSize->sliderPosition()/SLIDE_ASPECT_RATIO),slideSize->sliderPosition())); if(sw->radio1->isChecked()) @@ -198,22 +198,22 @@ void OptionsDialog::saveOptions() void OptionsDialog::restoreOptions(QSettings * settings) { YACReaderOptionsDialog::restoreOptions(settings); - + slideSize->setSliderPosition(settings->value(GO_TO_FLOW_SIZE).toSize().height()); switch(settings->value(FLOW_TYPE_SW).toInt()) { - case 0: - sw->radio1->setChecked(true); - break; - case 1: - sw->radio2->setChecked(true); - break; - case 2: - sw->radio3->setChecked(true); - break; - default: - sw->radio1->setChecked(true); - break; + case 0: + sw->radio1->setChecked(true); + break; + case 1: + sw->radio2->setChecked(true); + break; + case 2: + sw->radio3->setChecked(true); + break; + default: + sw->radio1->setChecked(true); + break; } pathEdit->setText(settings->value(PATH).toString()); @@ -234,7 +234,7 @@ void OptionsDialog::updateColor(const QColor & color) backgroundColor->setPalette(pal); backgroundColor->setAutoFillBackground(true); colorDialog->setCurrentColor(color); - + settings->setValue(BACKGROUND_COLOR,color); emit(changedOptions()); diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp index 00ac5b7d..492fa373 100644 --- a/YACReader/viewer.cpp +++ b/YACReader/viewer.cpp @@ -7,7 +7,7 @@ #include "goto_flow_gl.h" #else #include -#endif +#endif #include "bookmarks_dialog.h" #include "render.h" #include "goto_dialog.h" @@ -23,21 +23,21 @@ #include Viewer::Viewer(QWidget * parent) -:QScrollArea(parent), -currentPage(0), -magnifyingGlassShowed(false), -fullscreen(false), -information(false), -doublePage(false), -doubleMangaPage(false), -wheelStop(false), -direction(1), -restoreMagnifyingGlass(false), -drag(false), -numScrollSteps(22), -shouldOpenNext(false), -shouldOpenPrevious(false), -zoom(100) + :QScrollArea(parent), + currentPage(0), + magnifyingGlassShowed(false), + fullscreen(false), + information(false), + doublePage(false), + doubleMangaPage(false), + wheelStop(false), + direction(1), + restoreMagnifyingGlass(false), + drag(false), + numScrollSteps(22), + shouldOpenNext(false), + shouldOpenPrevious(false), + zoom(100) { translator = new YACReaderTranslator(this); translator->hide(); @@ -68,25 +68,25 @@ zoom(100) showCursor(); goToDialog = new GoToDialog(this); - + QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReader.ini",QSettings::IniFormat); - //CONFIG GOTO_FLOW-------------------------------------------------------- + //CONFIG GOTO_FLOW-------------------------------------------------------- #ifndef NO_OPENGL - OpenGLChecker openGLChecker; - bool openGLAvailable = openGLChecker.hasCompatibleOpenGLVersion(); + OpenGLChecker openGLChecker; + bool openGLAvailable = openGLChecker.hasCompatibleOpenGLVersion(); - if(openGLAvailable && !settings->contains(USE_OPEN_GL)) - settings->setValue(USE_OPEN_GL,2); - else - if(!openGLAvailable) - settings->setValue(USE_OPEN_GL,0); + if(openGLAvailable && !settings->contains(USE_OPEN_GL)) + settings->setValue(USE_OPEN_GL,2); + else + if(!openGLAvailable) + settings->setValue(USE_OPEN_GL,0); - if((settings->value(USE_OPEN_GL).toBool() == true)) - goToFlow = new GoToFlowGL(this,Configuration::getConfiguration().getFlowType()); - else - goToFlow = new GoToFlow(this,Configuration::getConfiguration().getFlowType()); + if((settings->value(USE_OPEN_GL).toBool() == true)) + goToFlow = new GoToFlowGL(this,Configuration::getConfiguration().getFlowType()); + else + goToFlow = new GoToFlow(this,Configuration::getConfiguration().getFlowType()); #else goToFlow = new GoToFlow(this,Configuration::getConfiguration().getFlowType()); #endif @@ -94,17 +94,17 @@ zoom(100) goToFlow->hide(); showGoToFlowAnimation = new QPropertyAnimation(goToFlow,"pos"); showGoToFlowAnimation->setDuration(150); - + bd = new BookmarksDialog(this->parentWidget()); - + render = new Render(); hideCursorTimer = new QTimer(); - hideCursorTimer->setSingleShot(true); + hideCursorTimer->setSingleShot(true); if(Configuration::getConfiguration().getDoublePage()) doublePageSwitch(); - + if(Configuration::getConfiguration().getDoubleMangaPage()) doubleMangaPageSwitch(); @@ -224,13 +224,13 @@ void Viewer::open(QString pathFile, const ComicDB & comic) void Viewer::showMessageErrorOpening() { - QMessageBox::critical(this,tr("Not found"),tr("Comic not found")); + QMessageBox::critical(this,tr("Not found"),tr("Comic not found")); //resetContent(); --> not needed } void Viewer::showMessageErrorOpening(QString message) { - QMessageBox::critical(this,tr("Error opening comic"),message); + QMessageBox::critical(this,tr("Error opening comic"),message); resetContent(); } @@ -263,7 +263,7 @@ void Viewer::prev() } else { - render->previousPage(); + render->previousPage(); } updateInformation(); shouldOpenNext = false; @@ -330,32 +330,32 @@ void Viewer::updateContentSize() YACReader::FitMode fitmode = Configuration::getConfiguration().getFitMode(); switch (fitmode) { - case YACReader::FitMode::FullRes: - pagefit=currentPage->size(); - break; - case YACReader::FitMode::ToWidth: - pagefit=currentPage->size(); - pagefit.scale(width(), 0, Qt::KeepAspectRatioByExpanding); - break; - case YACReader::FitMode::ToHeight: - pagefit=currentPage->size(); - pagefit.scale(0, height(), Qt::KeepAspectRatioByExpanding); - break; + case YACReader::FitMode::FullRes: + pagefit=currentPage->size(); + break; + case YACReader::FitMode::ToWidth: + pagefit=currentPage->size(); + pagefit.scale(width(), 0, Qt::KeepAspectRatioByExpanding); + break; + case YACReader::FitMode::ToHeight: + pagefit=currentPage->size(); + pagefit.scale(0, height(), Qt::KeepAspectRatioByExpanding); + break; //if everything fails showing the full page is a good idea - case YACReader::FitMode::FullPage: - default: - pagefit=currentPage->size(); - pagefit.scale(size(), Qt::KeepAspectRatio); - break; + case YACReader::FitMode::FullPage: + default: + pagefit=currentPage->size(); + pagefit.scale(size(), Qt::KeepAspectRatio); + break; } - - if(zoom != 100) - { - pagefit.scale(floor(pagefit.width()*zoom/100.0f), 0, Qt::KeepAspectRatioByExpanding); + + if(zoom != 100) + { + pagefit.scale(floor(pagefit.width()*zoom/100.0f), 0, Qt::KeepAspectRatioByExpanding); } //apply scaling content->resize(pagefit); - + //TODO: updtateContentSize should only scale the pixmap once if(devicePixelRatio()>1)//only in retina display { @@ -371,23 +371,23 @@ void Viewer::updateContentSize() void Viewer::increaseZoomFactor() { - zoom = std::min(zoom + 10, 500); + zoom = std::min(zoom + 10, 500); updateContentSize(); - notificationsLabel->setText(QString::number(getZoomFactor())+"%"); + notificationsLabel->setText(QString::number(getZoomFactor())+"%"); notificationsLabel->flash(); - emit zoomUpdated(zoom); + emit zoomUpdated(zoom); } void Viewer::decreaseZoomFactor() { - zoom = std::max(zoom - 10, 30); + zoom = std::max(zoom - 10, 30); updateContentSize(); - notificationsLabel->setText(QString::number(getZoomFactor())+"%"); + notificationsLabel->setText(QString::number(getZoomFactor())+"%"); notificationsLabel->flash(); - emit zoomUpdated(zoom); + emit zoomUpdated(zoom); } int Viewer::getZoomFactor() @@ -399,14 +399,14 @@ int Viewer::getZoomFactor() void Viewer::setZoomFactor(int z) { //this function is mostly used to reset the zoom after a fitmode switch - if (z > 500) - zoom = 500; - else if (z < 30) - zoom = 30; + if (z > 500) + zoom = 500; + else if (z < 30) + zoom = 30; else zoom = z; - emit zoomUpdated(zoom); + emit zoomUpdated(zoom); } void Viewer::updateVerticalScrollBar() @@ -457,108 +457,108 @@ void Viewer::scrollUp() void Viewer::keyPressEvent(QKeyEvent *event) { - if(render->hasLoadedComic()) - { - int _key = event->key(); - Qt::KeyboardModifiers modifiers = event->modifiers(); + if(render->hasLoadedComic()) + { + int _key = event->key(); + Qt::KeyboardModifiers modifiers = event->modifiers(); - if(modifiers & Qt::ShiftModifier) - _key |= Qt::SHIFT; - if (modifiers & Qt::ControlModifier) - _key |= Qt::CTRL; - if (modifiers & Qt::MetaModifier) - _key |= Qt::META; - if (modifiers & Qt::AltModifier) - _key |= Qt::ALT; + if(modifiers & Qt::ShiftModifier) + _key |= Qt::SHIFT; + if (modifiers & Qt::ControlModifier) + _key |= Qt::CTRL; + if (modifiers & Qt::MetaModifier) + _key |= Qt::META; + if (modifiers & Qt::AltModifier) + _key |= Qt::ALT; - QKeySequence key(_key); - /*if(goToFlow->isVisible() && event->key()!=Qt::Key_S) - QCoreApplication::sendEvent(goToFlow,event); - else*/ + QKeySequence key(_key); + /*if(goToFlow->isVisible() && event->key()!=Qt::Key_S) + QCoreApplication::sendEvent(goToFlow,event); + else*/ - if (key == ShortcutsManager::getShortcutsManager().getShortcut(AUTO_SCROLL_FORWARD_ACTION_Y)) - { - posByStep = height()/numScrollSteps; - nextPos=verticalScrollBar()->sliderPosition()+static_cast((height()*0.80)); - scrollDown(); - } + if (key == ShortcutsManager::getShortcutsManager().getShortcut(AUTO_SCROLL_FORWARD_ACTION_Y)) + { + posByStep = height()/numScrollSteps; + nextPos=verticalScrollBar()->sliderPosition()+static_cast((height()*0.80)); + scrollDown(); + } - else if (key == ShortcutsManager::getShortcutsManager().getShortcut(AUTO_SCROLL_BACKWARD_ACTION_Y)) - { - posByStep = height()/numScrollSteps; - nextPos=verticalScrollBar()->sliderPosition()-static_cast((height()*0.80)); - scrollUp(); - } + else if (key == ShortcutsManager::getShortcutsManager().getShortcut(AUTO_SCROLL_BACKWARD_ACTION_Y)) + { + posByStep = height()/numScrollSteps; + nextPos=verticalScrollBar()->sliderPosition()-static_cast((height()*0.80)); + scrollUp(); + } - else if (key == ShortcutsManager::getShortcutsManager().getShortcut(MOVE_DOWN_ACTION_Y) || - key == ShortcutsManager::getShortcutsManager().getShortcut(MOVE_UP_ACTION_Y) || - key == ShortcutsManager::getShortcutsManager().getShortcut(MOVE_LEFT_ACTION_Y) || - key == ShortcutsManager::getShortcutsManager().getShortcut(MOVE_RIGHT_ACTION_Y)) - { - QAbstractScrollArea::keyPressEvent(event); - emit backgroundChanges(); - } + else if (key == ShortcutsManager::getShortcutsManager().getShortcut(MOVE_DOWN_ACTION_Y) || + key == ShortcutsManager::getShortcutsManager().getShortcut(MOVE_UP_ACTION_Y) || + key == ShortcutsManager::getShortcutsManager().getShortcut(MOVE_LEFT_ACTION_Y) || + key == ShortcutsManager::getShortcutsManager().getShortcut(MOVE_RIGHT_ACTION_Y)) + { + QAbstractScrollArea::keyPressEvent(event); + emit backgroundChanges(); + } - else if (key == ShortcutsManager::getShortcutsManager().getShortcut(GO_TO_FIRST_PAGE_ACTION_Y)) - { - goTo(0); - } + else if (key == ShortcutsManager::getShortcutsManager().getShortcut(GO_TO_FIRST_PAGE_ACTION_Y)) + { + goTo(0); + } - else if (key == ShortcutsManager::getShortcutsManager().getShortcut(GO_TO_LAST_PAGE_ACTION_Y)) - { - goTo(this->render->numPages()-1); - } + else if (key == ShortcutsManager::getShortcutsManager().getShortcut(GO_TO_LAST_PAGE_ACTION_Y)) + { + goTo(this->render->numPages()-1); + } - else - QAbstractScrollArea::keyPressEvent(event); + else + QAbstractScrollArea::keyPressEvent(event); - if(mglass->isVisible() && (key == ShortcutsManager::getShortcutsManager().getShortcut(SIZE_UP_MGLASS_ACTION_Y) || - key == ShortcutsManager::getShortcutsManager().getShortcut(SIZE_DOWN_MGLASS_ACTION_Y) || - key == ShortcutsManager::getShortcutsManager().getShortcut(ZOOM_IN_MGLASS_ACTION_Y) || - key == ShortcutsManager::getShortcutsManager().getShortcut(ZOOM_OUT_MGLASS_ACTION_Y))) - { - QCoreApplication::sendEvent(mglass,event); - } + if(mglass->isVisible() && (key == ShortcutsManager::getShortcutsManager().getShortcut(SIZE_UP_MGLASS_ACTION_Y) || + key == ShortcutsManager::getShortcutsManager().getShortcut(SIZE_DOWN_MGLASS_ACTION_Y) || + key == ShortcutsManager::getShortcutsManager().getShortcut(ZOOM_IN_MGLASS_ACTION_Y) || + key == ShortcutsManager::getShortcutsManager().getShortcut(ZOOM_OUT_MGLASS_ACTION_Y))) + { + QCoreApplication::sendEvent(mglass,event); + } - } - else - QAbstractScrollArea::keyPressEvent(event); + } + else + QAbstractScrollArea::keyPressEvent(event); } void Viewer::wheelEvent(QWheelEvent * event) { if(render->hasLoadedComic()) { - if((event->delta()<0)&&(verticalScrollBar()->sliderPosition()==verticalScrollBar()->maximum())) - { - if(wheelStop) - { - if(getMovement(event) == Forward) - { - next(); - verticalScroller->stop(); - event->accept(); - wheelStop = false; - } - return; - } - else - wheelStop = true; - } - else + if((event->delta()<0)&&(verticalScrollBar()->sliderPosition()==verticalScrollBar()->maximum())) + { + if(wheelStop) + { + if(getMovement(event) == Forward) + { + next(); + verticalScroller->stop(); + event->accept(); + wheelStop = false; + } + return; + } + else + wheelStop = true; + } + else { if((event->delta()>0)&&(verticalScrollBar()->sliderPosition()==verticalScrollBar()->minimum())) { if(wheelStop) - { - if(getMovement(event) == Backward) - { - prev(); - verticalScroller->stop(); - event->accept(); - wheelStop = false; - } - return; + { + if(getMovement(event) == Backward) + { + prev(); + verticalScroller->stop(); + event->accept(); + wheelStop = false; + } + return; } else wheelStop = true; @@ -604,23 +604,23 @@ void Viewer::mouseMoveEvent(QMouseEvent * event) { if(showGoToFlowAnimation->state()!=QPropertyAnimation::Running) { - if(goToFlow->isVisible()) - { - QPoint gtfPos = goToFlow->mapFrom(this,event->pos()); - if(gtfPos.y() < 0 || gtfPos.x()<0 || gtfPos.x()>goToFlow->width())//TODO this extra check is for Mavericks (mouseMove over goToFlowGL seems to be broken) - animateHideGoToFlow(); - //goToFlow->hide(); - } - else - { - int umbral = (width()-goToFlow->width())/2; - if((event->y()>height()-15)&&(event->x()>umbral)&&(event->x()isVisible()) { - - animateShowGoToFlow(); - hideCursorTimer->stop(); + QPoint gtfPos = goToFlow->mapFrom(this,event->pos()); + if(gtfPos.y() < 0 || gtfPos.x()<0 || gtfPos.x()>goToFlow->width())//TODO this extra check is for Mavericks (mouseMove over goToFlowGL seems to be broken) + animateHideGoToFlow(); + //goToFlow->hide(); + } + else + { + int umbral = (width()-goToFlow->width())/2; + if((event->y()>height()-15)&&(event->x()>umbral)&&(event->x()stop(); + } } - } } if(drag) @@ -654,7 +654,7 @@ void Viewer::showMagnifyingGlass() QPoint p = QPoint(cursor().pos().x(),cursor().pos().y()); p = this->parentWidget()->mapFromGlobal(p); mglass->move(static_cast(p.x()-float(mglass->width())/2) - ,static_cast(p.y()-float(mglass->height())/2)); + ,static_cast(p.y()-float(mglass->height())/2)); mglass->show(); mglass->updateImage(mglass->x()+mglass->width()/2,mglass->y()+mglass->height()/2); magnifyingGlassShowed = true; @@ -718,7 +718,7 @@ void Viewer::animateShowGoToFlow() goToFlow->centerSlide(render->getIndex()); goToFlow->setPageNumber(render->getIndex()); goToFlow->show(); - goToFlow->setFocus(Qt::OtherFocusReason); + goToFlow->setFocus(Qt::OtherFocusReason); } } @@ -732,30 +732,30 @@ void Viewer::animateHideGoToFlow() showGoToFlowAnimation->setEndValue(QPoint((width()-goToFlow->width())/2,height())); showGoToFlowAnimation->start(); goToFlow->centerSlide(render->getIndex()); - goToFlow->setPageNumber(render->getIndex()); - this->setFocus(Qt::OtherFocusReason); + goToFlow->setPageNumber(render->getIndex()); + this->setFocus(Qt::OtherFocusReason); } } void Viewer::moveCursoToGoToFlow() { - //Move cursor to goToFlow widget on show (this avoid hide when mouse is moved) - int y = goToFlow->pos().y(); - int x1 = goToFlow->pos().x(); - int x2 = x1 + goToFlow->width(); - QPoint cursorPos = mapFromGlobal(cursor().pos()); - int cursorX = cursorPos.x(); - int cursorY = cursorPos.y(); + //Move cursor to goToFlow widget on show (this avoid hide when mouse is moved) + int y = goToFlow->pos().y(); + int x1 = goToFlow->pos().x(); + int x2 = x1 + goToFlow->width(); + QPoint cursorPos = mapFromGlobal(cursor().pos()); + int cursorX = cursorPos.x(); + int cursorY = cursorPos.y(); - if(cursorY <= y) - cursorY = y + 10; - if(cursorX <= x1) - cursorX = x1 + 10; - if(cursorX >= x2) - cursorX = x2 - 10; - cursor().setPos(mapToGlobal(QPoint(cursorX,cursorY))); - hideCursorTimer->stop(); - showCursor(); + if(cursorY <= y) + cursorY = y + 10; + if(cursorX <= x1) + cursorX = x1 + 10; + if(cursorX >= x2) + cursorX = x2 - 10; + cursor().setPos(mapToGlobal(QPoint(cursorX,cursorY))); + hideCursorTimer->stop(); + showCursor(); } void Viewer::rotateLeft() @@ -773,18 +773,18 @@ void Viewer::setBookmark(bool set) render->setBookmark(); if(set) //add bookmark { - render->setBookmark(); + render->setBookmark(); } else //remove bookmark { - render->removeBookmark(); + render->removeBookmark(); } } void Viewer::save () { if(render->hasLoadedComic()) - render->save(); + render->save(); } void Viewer::doublePageSwitch() @@ -833,8 +833,8 @@ void Viewer::setPageUnavailableMessage() void Viewer::configureContent(QString msg) { content->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); - if(!(devicePixelRatio()>1)) - content->setScaledContents(true); + if(!(devicePixelRatio()>1)) + content->setScaledContents(true); content->setAlignment(Qt::AlignTop|Qt::AlignHCenter); content->setText(msg); content->setFont(QFont("courier new", 12)); @@ -861,7 +861,7 @@ void Viewer::showCursor() void Viewer::updateOptions() { - + goToFlow->setFlowType(Configuration::getConfiguration().getFlowType()); updateBackgroundColor(Configuration::getConfiguration().getBackgroundColor()); updateContentSize(); @@ -914,27 +914,27 @@ void Viewer::animateHideTranslator() void Viewer::mousePressEvent ( QMouseEvent * event ) { - if (event->button() == Qt::LeftButton) - { - drag = true; - yDragOrigin = event->y(); - xDragOrigin = event->x(); - setCursor(Qt::ClosedHandCursor); - event->accept(); - } + if (event->button() == Qt::LeftButton) + { + drag = true; + yDragOrigin = event->y(); + xDragOrigin = event->x(); + setCursor(Qt::ClosedHandCursor); + event->accept(); + } } void Viewer::mouseReleaseEvent ( QMouseEvent * event ) { - drag = false; - setCursor(Qt::OpenHandCursor); - event->accept(); + drag = false; + setCursor(Qt::OpenHandCursor); + event->accept(); } void Viewer::updateZoomRatio(int ratio) { - zoom = ratio; - updateContentSize(); + zoom = ratio; + updateContentSize(); } void Viewer::updateConfig(QSettings * settings) @@ -978,7 +978,7 @@ void Viewer::showIsCoverMessage() shouldOpenNext = false; //single page comic } - + void Viewer::showIsLastMessage() { if(!shouldOpenNext) @@ -1010,31 +1010,31 @@ void Viewer::updateComic(ComicDB & comic) { if(render->hasLoadedComic()) { - //set currentPage - comic.info.currentPage = render->getIndex()+1; - //set bookmarks - Bookmarks * boomarks = render->getBookmarks(); - QList boomarksList = boomarks->getBookmarkPages(); - int numBookmarks = boomarksList.size(); - if(numBookmarks > 0) - comic.info.bookmark1 = boomarksList[0]; - if(numBookmarks > 1) - comic.info.bookmark2 = boomarksList[1]; - if(numBookmarks > 2) - comic.info.bookmark3 = boomarksList[2]; - //set filters - //TODO: avoid use settings for this... - QSettings settings(YACReader::getSettingsPath()+"/YACReader.ini",QSettings::IniFormat); - int brightness = settings.value(BRIGHTNESS,0).toInt(); - int contrast = settings.value(CONTRAST,100).toInt(); - int gamma = settings.value(GAMMA,100).toInt(); + //set currentPage + comic.info.currentPage = render->getIndex()+1; + //set bookmarks + Bookmarks * boomarks = render->getBookmarks(); + QList boomarksList = boomarks->getBookmarkPages(); + int numBookmarks = boomarksList.size(); + if(numBookmarks > 0) + comic.info.bookmark1 = boomarksList[0]; + if(numBookmarks > 1) + comic.info.bookmark2 = boomarksList[1]; + if(numBookmarks > 2) + comic.info.bookmark3 = boomarksList[2]; + //set filters + //TODO: avoid use settings for this... + QSettings settings(YACReader::getSettingsPath()+"/YACReader.ini",QSettings::IniFormat); + int brightness = settings.value(BRIGHTNESS,0).toInt(); + int contrast = settings.value(CONTRAST,100).toInt(); + int gamma = settings.value(GAMMA,100).toInt(); - if(brightness != 0 || comic.info.brightness!=-1) - comic.info.brightness = brightness; - if(contrast != 100 || comic.info.contrast!=-1) - comic.info.contrast = contrast; - if(gamma != 100 || comic.info.gamma!=-1) - comic.info.gamma = gamma; + if(brightness != 0 || comic.info.brightness!=-1) + comic.info.brightness = brightness; + if(contrast != 100 || comic.info.contrast!=-1) + comic.info.contrast = contrast; + if(gamma != 100 || comic.info.gamma!=-1) + comic.info.gamma = gamma; }