mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-19 05:24:57 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

parte de la integraci?n de YACReaderFlowGL en YACReader terminada

Browse Source 
se ha introducido un bug que hace que la aplicaci?n cierre anormalmente al pasar
al siguiente c?mic
This commit is contained in:
Luis Ángel San Martín
2012-10-03 08:32:43 +02:00
parent 98e5fc648c
commit 91e97ba8ff
12 changed files with 362 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
YACReader/YACReader.pro
View File

@ -7,7 +7,7 @@ DEPENDPATH += . \
release
INCLUDEPATH += .
INCLUDEPATH += ../common
QT += network webkit phonon
QT += network webkit phonon opengl
CONFIG += release
CONFIG -= flat
@ -28,7 +28,11 @@ HEADERS += comic.h \
bookmarks_dialog.h \
render.h \
shortcuts_dialog.h \
translator.h
translator.h \
../common/goto_flow_widget.h \
goto_flow_gl.h \
../common/yacreader_flow_gl.h
SOURCES += comic.cpp \
configuration.cpp \
goto_dialog.cpp \
@ -46,7 +50,11 @@ SOURCES += comic.cpp \
bookmarks_dialog.cpp \
render.cpp \
shortcuts_dialog.cpp \
translator.cpp
translator.cpp \
../common/goto_flow_widget.cpp \
goto_flow_gl.cpp \
../common/yacreader_flow_gl.cpp
RESOURCES += images.qrc \
files.qrc
RC_FILE = icon.rc

2
YACReader/goto_flow.cpp
View File

@ -19,7 +19,7 @@ QMutex mutexGoToFlow;
GoToFlow::GoToFlow(QWidget *parent,PictureFlow::FlowType flowType)
:QWidget(parent),ready(false)
:GoToFlowWidget(parent),ready(false)
{
updateTimer = new QTimer;
connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateImageData()));

5
YACReader/goto_flow.h
View File

@ -12,12 +12,13 @@
#include <QEvent>
#include <QLabel>
#include "custom_widgets.h"
#include "goto_flow_widget.h"
class Comic;
class SlideInitializer;
class PageLoader;
class GoToFlow : public QWidget
class GoToFlow : public GoToFlowWidget
{
Q_OBJECT
public:
@ -31,7 +32,7 @@ private:
QIntValidator * v;
QPushButton * centerButton;
QPushButton * goToButton;
Comic * comic;
//Comic * comic;
QSize imageSize;
QVector<bool> imagesLoaded;

3
YACReader/images.qrc
View File

@ -62,6 +62,7 @@
<file>../images/helpImages/shortcuts.png</file>
<file>../images/helpImages/keyboard.png</file>
<file>../images/helpImages/mouse.png</file>
<file>../images/helpImages/speaker.png</file>
<file>../images/helpImages/speaker.png</file>
<file>../images/defaultCover.png</file>
</qresource>
</RCC>

3
YACReader/viewer.cpp
View File

@ -3,6 +3,7 @@
#include "configuration.h"
#include "magnifying_glass.h"
#include "goto_flow.h"
#include "goto_flow_gl.h"
#include "bookmarks_dialog.h"
#include "render.h"
#include "goto_dialog.h"
@ -65,7 +66,7 @@ drag(false)
goToDialog = new GoToDialog(this);
goToFlow = new GoToFlow(this,Configuration::getConfiguration().getFlowType());
goToFlow = new GoToFlowGL(this,Configuration::getConfiguration().getFlowType());
goToFlow->hide();
showGoToFlowAnimation = new QPropertyAnimation(goToFlow,"pos");
showGoToFlowAnimation->setDuration(150);

3
YACReader/viewer.h
View File

@ -24,6 +24,7 @@ class BookmarksDialog;
class Render;
class GoToDialog;
class YACReaderTranslator;
class GoToFlowWidget;
class Viewer : public QScrollArea
{
@ -78,7 +79,7 @@ virtual void mouseReleaseEvent ( QMouseEvent * event );
QTimer * scroller;
int posByStep;
int nextPos;
GoToFlow * goToFlow;
GoToFlowWidget * goToFlow;
QPropertyAnimation * showGoToFlowAnimation;
GoToDialog * goToDialog;
//!Image properties