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

Merged in selmf/yacreader/develop (pull request #56)

Browse Source 
Fixes for Qt 5.3 and Haiku
This commit is contained in:
Luis Ángel San Martín 2017-11-19 09:10:46 +00:00
commit 455509f2b8
22 changed files with 201 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
YACReader/YACReader.pro
View File

@ -17,6 +17,11 @@ unix:!macx{
QMAKE_CXXFLAGS += -std=c++11
}
unix:haiku {
DEFINES += _BSD_SOURCE
LIBS += -lnetwork -lbsd
}
CONFIG(force_angle) {
contains(QMAKE_TARGET.arch, x86_64) {
Release:DESTDIR = ../release64_angle

BIN
YACReader/yacreader_es.qm
View File

Binary file not shown.

7
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -19,6 +19,11 @@ QMAKE_MAC_SDK = macosx10.12
include (../config.pri)
include (../dependencies/pdf_backend.pri)
unix:haiku {
DEFINES += _BSD_SOURCE
LIBS += -lnetwork -lbsd
}
CONFIG(legacy_gl_widget) {
INCLUDEPATH += ../common/gl_legacy \
} else {
@ -66,9 +71,7 @@ unix:!macx:!CONFIG(no_opengl) {
}
macx {
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
CONFIG += objective_c
QT += macextras gui-private
}

2
YACReaderLibrary/empty_reading_list_widget.cpp
View File

@ -5,5 +5,5 @@ EmptyReadingListWidget::EmptyReadingListWidget(QWidget *parent)
{
setUpDefaultLayout(true);
setPixmap(QPixmap(":/images/empty_reading_list"));
setText(tr("This reading list doesn't cotain comics yet"));
setText(tr("This reading list does not contain any comics yet"));
}

8
YACReaderLibrary/library_window.cpp
View File

@ -566,7 +566,7 @@ void LibraryWindow::createActions()
expandAllNodesAction->setIcon(QIcon(":/images/sidebar/expand.png"));
colapseAllNodesAction = new QAction(this);
colapseAllNodesAction->setToolTip(tr("Colapse all nodes"));
colapseAllNodesAction->setToolTip(tr("Collapse all nodes"));
colapseAllNodesAction->setData(COLAPSE_ALL_NODES_ACTION_YL);
colapseAllNodesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(COLAPSE_ALL_NODES_ACTION_YL));
colapseAllNodesAction->setIcon(QIcon(":/images/sidebar/colapse.png"));
@ -654,7 +654,7 @@ void LibraryWindow::createActions()
editSelectedComicsAction->setIcon(QIcon(":/images/comics_view_toolbar/editComic.png"));
asignOrderAction = new QAction(this);
asignOrderAction->setText(tr("Asign current order to comics"));
asignOrderAction->setText(tr("Assign current order to comics"));
asignOrderAction->setData(ASIGN_ORDER_ACTION_YL);
asignOrderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ASIGN_ORDER_ACTION_YL));
asignOrderAction->setIcon(QIcon(":/images/comics_view_toolbar/asignNumber.png"));
@ -2240,8 +2240,8 @@ void LibraryWindow::asignNumbers()
if(indexList.count()>1)
{
bool ok;
int n = QInputDialog::getInt(this, tr("Asign comics numbers"),
tr("Asign numbers starting in:"), startingNumber,0,2147483647,1,&ok);
int n = QInputDialog::getInt(this, tr("Assign comics numbers"),
tr("Assign numbers starting in:"), startingNumber,0,2147483647,1,&ok);
if (ok)
startingNumber = n;
else

2
YACReaderLibrary/options_dialog.cpp
View File

@ -63,7 +63,7 @@ OptionsDialog::OptionsDialog(QWidget * parent)
backgroundImageBlurRadiusSlider = new QSlider(Qt::Horizontal);
backgroundImageBlurRadiusSlider->setRange(0,100);
useCurrentComicCoverCheck = new QCheckBox(tr("Use selectec comic cover as background"));
useCurrentComicCoverCheck = new QCheckBox(tr("Use selected comic cover as background"));
resetButton = new QPushButton(tr("Restore defautls"));

2
YACReaderLibrary/properties_dialog.cpp
View File

@ -177,7 +177,7 @@ void PropertiesDialog::createGeneralInfoBox()
arc->addStretch(1);
generalInfoLayout->addRow(tr("Story arc:"), arc);
generalInfoLayout->addRow(tr("Genere:"), genereEdit = new YACReaderFieldEdit());
generalInfoLayout->addRow(tr("Genre:"), genereEdit = new YACReaderFieldEdit());
generalInfoLayout->addRow(tr("Size:"), size = new QLabel("size"));

6
YACReaderLibrary/yacreaderlibrary_de.ts
View File

@ -374,7 +374,7 @@
<name>EmptyReadingListWidget</name>
<message>
<location filename="empty_reading_list_widget.cpp" line="8"/>
<source>This reading list doesn&apos;t cotain comics yet</source>
<source>This reading list doesn&apos;t contain comics yet</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1219,7 +1219,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
<name>NoLibrariesWidget</name>
<message>
<location filename="no_libraries_widget.cpp" line="26"/>
<source>You don&apos;t have any librarires yet</source>
<source>You don&apos;t have any libraries yet</source>
<translation>Sie haben im Augenblick keine Bibliothek</translation>
</message>
<message>
@ -1267,7 +1267,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
</message>
<message>
<location filename="options_dialog.cpp" line="66"/>
<source>Use selectec comic cover as background</source>
<source>Use selected comic cover as background</source>
<translation type="unfinished"></translation>
</message>
<message>

BIN
YACReaderLibrary/yacreaderlibrary_es.qm
View File

Binary file not shown.

6
YACReaderLibrary/yacreaderlibrary_es.ts
View File

@ -374,7 +374,7 @@
<name>EmptyReadingListWidget</name>
<message>
<location filename="empty_reading_list_widget.cpp" line="8"/>
<source>This reading list doesn&apos;t cotain comics yet</source>
<source>This reading list doesn&apos;t contain comics yet</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1220,7 +1220,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
<name>NoLibrariesWidget</name>
<message>
<location filename="no_libraries_widget.cpp" line="26"/>
<source>You don&apos;t have any librarires yet</source>
<source>You don&apos;t have any libraries yet</source>
<translation>Aún no tienes ninguna biblioteca</translation>
</message>
<message>
@ -1268,7 +1268,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
</message>
<message>
<location filename="options_dialog.cpp" line="66"/>
<source>Use selectec comic cover as background</source>
<source>Use selected comic cover as background</source>
<translation type="unfinished"></translation>
</message>
<message>

6
YACReaderLibrary/yacreaderlibrary_fr.ts
View File

@ -370,7 +370,7 @@
<name>EmptyReadingListWidget</name>
<message>
<location filename="empty_reading_list_widget.cpp" line="8"/>
<source>This reading list doesn&apos;t cotain comics yet</source>
<source>This reading list doesn&apos;t contain comics yet</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1214,7 +1214,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
<name>NoLibrariesWidget</name>
<message>
<location filename="no_libraries_widget.cpp" line="26"/>
<source>You don&apos;t have any librarires yet</source>
<source>You don&apos;t have any libraries yet</source>
<translation>Vous n&apos;avez pas encore de librairie</translation>
</message>
<message>
@ -1262,7 +1262,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
</message>
<message>
<location filename="options_dialog.cpp" line="66"/>
<source>Use selectec comic cover as background</source>
<source>Use selected comic cover as background</source>
<translation type="unfinished"></translation>
</message>
<message>

8
YACReaderLibrary/yacreaderlibrary_nl.ts
View File

@ -370,7 +370,7 @@
<name>EmptyReadingListWidget</name>
<message>
<location filename="empty_reading_list_widget.cpp" line="8"/>
<source>This reading list doesn&apos;t cotain comics yet</source>
<source>This reading list doesn&apos;t contain comics yet</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1214,8 +1214,8 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
<name>NoLibrariesWidget</name>
<message>
<location filename="no_libraries_widget.cpp" line="26"/>
<source>You don&apos;t have any librarires yet</source>
<translation type="unfinished">Je hebt geen nog librarires</translation>
<source>You don&apos;t have any libraries yet</source>
<translation type="unfinished">Je hebt geen nog libraries</translation>
</message>
<message>
<location filename="no_libraries_widget.cpp" line="28"/>
@ -1262,7 +1262,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
</message>
<message>
<location filename="options_dialog.cpp" line="66"/>
<source>Use selectec comic cover as background</source>
<source>Use selected comic cover as background</source>
<translation type="unfinished"></translation>
</message>
<message>

6
YACReaderLibrary/yacreaderlibrary_pt.ts
View File

@ -370,7 +370,7 @@
<name>EmptyReadingListWidget</name>
<message>
<location filename="empty_reading_list_widget.cpp" line="8"/>
<source>This reading list doesn&apos;t cotain comics yet</source>
<source>This reading list doesn&apos;t contain comics yet</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1200,7 +1200,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
<name>NoLibrariesWidget</name>
<message>
<location filename="no_libraries_widget.cpp" line="26"/>
<source>You don&apos;t have any librarires yet</source>
<source>You don&apos;t have any libraries yet</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1248,7 +1248,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
</message>
<message>
<location filename="options_dialog.cpp" line="66"/>
<source>Use selectec comic cover as background</source>
<source>Use selected comic cover as background</source>
<translation type="unfinished"></translation>
</message>
<message>

6
YACReaderLibrary/yacreaderlibrary_ru.ts
View File

@ -370,7 +370,7 @@
<name>EmptyReadingListWidget</name>
<message>
<location filename="empty_reading_list_widget.cpp" line="8"/>
<source>This reading list doesn&apos;t cotain comics yet</source>
<source>This reading list doesn&apos;t contain comics yet</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1204,7 +1204,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
<name>NoLibrariesWidget</name>
<message>
<location filename="no_libraries_widget.cpp" line="26"/>
<source>You don&apos;t have any librarires yet</source>
<source>You don&apos;t have any libraries yet</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1252,7 +1252,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
</message>
<message>
<location filename="options_dialog.cpp" line="66"/>
<source>Use selectec comic cover as background</source>
<source>Use selected comic cover as background</source>
<translation type="unfinished"></translation>
</message>
<message>

6
YACReaderLibrary/yacreaderlibrary_source.ts
View File

@ -370,7 +370,7 @@
<name>EmptyReadingListWidget</name>
<message>
<location filename="empty_reading_list_widget.cpp" line="8"/>
<source>This reading list doesn&apos;t cotain comics yet</source>
<source>This reading list doesn&apos;t contain any comics yet</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1190,7 +1190,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
<name>NoLibrariesWidget</name>
<message>
<location filename="no_libraries_widget.cpp" line="26"/>
<source>You don&apos;t have any librarires yet</source>
<source>You don&apos;t have any libraries yet</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1238,7 +1238,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
</message>
<message>
<location filename="options_dialog.cpp" line="66"/>
<source>Use selectec comic cover as background</source>
<source>Use selected comic cover as background</source>
<translation type="unfinished"></translation>
</message>
<message>

6
YACReaderLibrary/yacreaderlibrary_tr.ts
View File

@ -297,7 +297,7 @@
<context>
<name>EmptyReadingListWidget</name>
<message>
<source>This reading list doesn&apos;t cotain comics yet</source>
<source>This reading list doesn&apos;t contain comics yet</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1048,7 +1048,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
<translation>İlk kütüphaneni oluştur</translation>
</message>
<message>
<source>You don&apos;t have any librarires yet</source>
<source>You don&apos;t have any libraries yet</source>
<translation>Henüz bir kütüphaneye sahip değilsin</translation>
</message>
<message>
@ -1087,7 +1087,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k
<translation type="unfinished"></translation>
</message>
<message>
<source>Use selectec comic cover as background</source>
<source>Use selected comic cover as background</source>
<translation type="unfinished"></translation>
</message>
<message>

7
YACReaderLibraryServer/YACReaderLibraryServer.pro
View File

@ -33,6 +33,11 @@ unix {
CONFIG += c++11
}
unix:haiku {
DEFINES += _BSD_SOURCE
LIBS += -lnetwork -lbsd
}
#CONFIG += release
CONFIG -= flat
QT += core sql network
@ -144,7 +149,7 @@ isEmpty(DESTDIR) {
server.path = $$DATADIR/yacreader
server.files = ../release/server
systemd.path = $$LIBDIR/systemd/system
systemd.path = $$LIBDIR/systemd/user
systemd.files = yacreaderlibraryserver.service
translation.path = $$DATADIR/yacreader/languages

2
YACReaderLibraryServer/yacreaderlibraryserver.service
View File

@ -8,4 +8,4 @@ Restart=always
ExecStart=/usr/bin/YACReaderLibraryServer start
[Install]
WantedBy=multi-user.target
WantedBy=default.target

19
common/gl_legacy/yacreader_flow_gl.cpp
View File

@ -200,7 +200,7 @@ struct Preset pressetYACReaderFlowDownConfig = {
};
/*Constructor*/
YACReaderFlowGL::YACReaderFlowGL(QWidget *parent,struct Preset p)
:QGLWidget(QGLFormat(QGL::SampleBuffers), parent),numObjects(0),lazyPopulateObjects(-1),bUseVSync(false),hasBeenInitialized(false)
:QGLWidget(QGLFormat(QGL::SampleBuffers), parent),numObjects(0),lazyPopulateObjects(-1),bUseVSync(false),hasBeenInitialized(false),flowRightToLeft(false)
{
updateCount = 0;
config = p;
@ -354,6 +354,9 @@ void YACReaderFlowGL::udpatePerspective(int width, int height)
/*Private*/
void YACReaderFlowGL::calcPos(YACReader3DImage & image, int pos)
{
if(flowRightToLeft){
pos = pos * -1;
}
if(pos == 0){
image.current = centerPos;
}else{
@ -1025,6 +1028,11 @@ void YACReaderFlowGL::render()
//do nothing
}
void YACReaderFlowGL::setFlowRightToLeft(bool b)
{
flowRightToLeft = b;
}
//EVENTOS
void YACReaderFlowGL::wheelEvent(QWheelEvent * event)
{
@ -1045,7 +1053,7 @@ void YACReaderFlowGL::wheelEvent(QWheelEvent * event)
void YACReaderFlowGL::keyPressEvent(QKeyEvent *event)
{
if(event->key() == Qt::Key_Left)
if((event->key() == Qt::Key_Left && !flowRightToLeft) || (event->key() == Qt::Key_Right && flowRightToLeft))
{
if(event->modifiers() == Qt::ControlModifier)
setCurrentIndex((currentSelected-10<0)?0:currentSelected-10);
@ -1055,7 +1063,7 @@ void YACReaderFlowGL::keyPressEvent(QKeyEvent *event)
return;
}
if(event->key() == Qt::Key_Right)
if((event->key() == Qt::Key_Right && !flowRightToLeft) || (event->key() == Qt::Key_Left && flowRightToLeft))
{
if(event->modifiers() == Qt::ControlModifier)
setCurrentIndex((currentSelected+10>=numObjects)?numObjects-1:currentSelected+10);
@ -1098,7 +1106,7 @@ void YACReaderFlowGL::mousePressEvent(QMouseEvent *event)
gluUnProject( winX, winY, winZ, modelview, projection, viewport, &posX, &posY, &posZ);
if(posX >= 0.5)
if((posX >= 0.5 && !flowRightToLeft) || (posX <=-0.5 && flowRightToLeft))
{
//int index = currentSelected+1;
//while((cfImages[index].current.x-cfImages[index].width/(2.0*config.rotation)) < posX)
@ -1106,7 +1114,7 @@ void YACReaderFlowGL::mousePressEvent(QMouseEvent *event)
//setCurrentIndex(index-1);
showNext();
}
else if(posX <=-0.5)
else if((posX <=-0.5 && !flowRightToLeft) || (posX >= 0.5 && flowRightToLeft) )
showPrevious();
} else
QGLWidget::mousePressEvent(event);
@ -1595,4 +1603,3 @@ QImage ImageLoaderByteArrayGL::result()
{
return img;
}

5
common/gl_legacy/yacreader_flow_gl.h
View File

@ -143,6 +143,9 @@ protected:
QVector<YACReader3DImage> images;
bool hasBeenInitialized;
// sets flow direction right-to-left (manga mode)
bool flowRightToLeft;
Performance performance;
bool bUseVSync;
@ -248,6 +251,8 @@ public:
void useVSync(bool b);
void setFlowRightToLeft(bool b);
virtual void updateImageData() = 0;
void reset();

31
generateVS2010Projects.bat
View File

@ -1,31 +0,0 @@
echo Setting up a Qt environment...
set QTDIR=D:\Desarrollo\Qt\4.8.5
echo -- QTDIR set to D:\Desarrollo\Qt\4.8.5
set PATH=D:\Desarrollo\Qt\4.8.5\bin;%PATH%
echo -- Added D:\Desarrollo\Qt\4.8.5\bin to PATH
set QMAKESPEC=win32-msvc2010
echo -- QMAKESPEC set to "win32-msvc2010"
if not "%1"=="vsvars" goto ENDVSVARS
call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
:ENDVSVARS
if not "%1"=="vsstart" goto ENDVSSTART
call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
devenv /useenv
:ENDVSSTART
cd YACReader
echo Entering YACReader
qmake -spec win32-msvc2010 -tp vc YACReader.pro
echo qmake -spec win32-msvc2010 -tp vc YACReader.pro
cd ..
echo leaving YACReader
cd YACReaderLibrary
echo Entering YACReaderLibrary
qmake -spec win32-msvc2010 -tp vc YACReaderLibrary.pro
echo qmake -spec win32-msvc2010 -tp vc YACReaderLibrary.pro
cd ..