Merge pull request #12 from YACReader/develop

9.5.0 release

.gitattributes

@@ -0,0 +1,8 @@
+# List files and directories to exclude from git archive
+/dependencies/pdfium export-ignore
+/dependencies/poppler export-ignore
+/dependencies/qrencode export-ignore
+/dependencies/unarr export-ignore
+/dependencies/create-dmg export-ignore
+.gitignore export-ignore
+.gitattributes export-ignore

.gitignore

@@ -0,0 +1,65 @@
+# YACReader
+release64*
+debug64*
+* MacOSX-Intel*
+dependencies/create-dmg
+signapps.sh
+lib7zip
+
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.dll
+*.dylib
+
+# Qt-es
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
+/.qmake.cache
+/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+*.qmlc
+*.jsc
+Makefile*
+*build-*
+*.build*
+*.app*
+*.pbxproj
+*.mak
+*.xcworkspace*
+*xcshareddata*
+*.swp
+
+# Qt unit tests
+target_wrapper.*
+
+# QtCreator
+*.autosave
+
+# QtCreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCreator CMake
+CMakeLists.txt.user*
+*.stash
+
+*.plist
+*.dmg
+
+YACReaderLibrary/YACReaderLibrary\.xcodeproj/
+.DS_Store

CHANGELOG.md

@@ -4,6 +4,26 @@ Please note: this is a work in progress. Keeping a changelog has been neglected
 in the past so information is missing and older release information is in
 spanish only. Sorry for the mess.
 
+Version counting is based on semantic versioning (Major.Feature.Patch)
+
+## 9.5.0
+* Require at least Qt 5.4 for compiling, Qt 5.6 for qml based views
+
+### Reader and Library
+* Remove legacy OpenGL flow needed for Qt 5.3 compatibility
+* Improve commandline handling
+
+### YACReaderLibrary
+* New current/next comic view in the grid view, available for folders and reading lists.
+* Comics in `Reading` are now sorted by last time opened.
+* Fix system log functions
+* Replace Qrencode executables with dynamic loaded library
+* Add prebuilt qrencode libraries for win and mac
+* Update Qrencode to version 4.0.0
+
+### Server
+* New API V2 implementation.
+
 ## 9.0.0 (2018-2-18)
 
 ### Library and Reader
@@ -45,6 +65,7 @@ spanish only. Sorry for the mess.
 
 ### YACReaderLibraryServer (headless version of YACReaderLibrary)
 * Added a systemd service file to run yacreaderlibraryserver on Linux based systems.
+* Added safety checks to the commandline interface to avoid creation of empty libraries
 
 ## 8.5.0 - 2016-03-28
 * headless version of YACReaderLibrary's server (no gui)

YACReader/YACReader.pro

@@ -45,10 +45,8 @@ SOURCES += main.cpp
 INCLUDEPATH += ../common \
                ../custom_widgets
 
-!CONFIG(no_opengl):CONFIG(legacy_gl_widget) {
-    INCLUDEPATH += ../common/gl_legacy \
-} else {
-    INCLUDEPATH += ../common/gl \
+!CONFIG(no_opengl) {
+    INCLUDEPATH += ../common/gl
 }
 
 #there are going to be two builds for windows, OpenGL based and ANGLE based
@@ -124,14 +122,8 @@ HEADERS +=  ../common/comic.h \
             ../common/pdf_comic.h
 
 !CONFIG(no_opengl) {
-    CONFIG(legacy_gl_widget) {
-        message("Using legacy YACReaderFlowGL (QGLWidget) header")
-        DEFINES += YACREADER_LEGACY_FLOW_GL
-        HEADERS += ../common/gl_legacy/yacreader_flow_gl.h
-    } else {
-        HEADERS += ../common/gl/yacreader_flow_gl.h
-    }
-    HEADERS +=   goto_flow_gl.h
+    HEADERS += ../common/gl/yacreader_flow_gl.h \
+                goto_flow_gl.h
 }
 
 SOURCES +=  ../common/comic.cpp \
@@ -169,13 +161,8 @@ SOURCES +=  ../common/comic.cpp \
             ../common/opengl_checker.cpp
 
 !CONFIG(no_opengl) {
-    CONFIG(legacy_gl_widget) {
-        message("using legacy YACReaderFlowGL (QGLWidget) source code")
-        SOURCES += ../common/gl_legacy/yacreader_flow_gl.cpp
-    } else {
-        SOURCES += ../common/gl/yacreader_flow_gl.cpp
-    }
-    SOURCES += goto_flow_gl.cpp
+        SOURCES += ../common/gl/yacreader_flow_gl.cpp \
+                    goto_flow_gl.cpp
 }
 
 include(../custom_widgets/custom_widgets_yacreader.pri)
@@ -214,14 +201,19 @@ TRANSLATIONS =    yacreader_es.ts \
                   yacreader_source.ts
 
 unix:!macx {
-#set install prefix if it's empty
+# set install prefix if it's empty
 isEmpty(PREFIX) {
   PREFIX = /usr
 }
-
-BINDIR = $$PREFIX/bin
-LIBDIR = $$PREFIX/lib
-DATADIR = $$PREFIX/share
+isEmpty(BINDIR) {
+  BINDIR = $$PREFIX/bin
+}
+isEmpty(LIBDIR) {
+  LIBDIR = $$PREFIX/lib
+}
+isEmpty(DATADIR) {
+  DATADIR = $$PREFIX/share
+}
 
 DEFINES += "LIBDIR=\\\"$$LIBDIR\\\""  "DATADIR=\\\"$$DATADIR\\\""
 

YACReader/goto_flow_toolbar.cpp

@@ -56,7 +56,7 @@ GoToFlowToolBar::GoToFlowToolBar(QWidget * parent)
 		                      "QPushButton:pressed  {background-image: url(:/images/imgCenterSlidePressed.png); width: 100%; height:100%; background-repeat: none; border: none;} ";
 	centerButton = new QPushButton(this);
 	//centerButton->setIcon(QIcon(":/images/center.png"));
-	centerButton->setStyleSheet(centerButtonCSS); 
+	centerButton->setStyleSheet(centerButtonCSS);
 	centerButton->setFixedSize(26,50);
     centerButton->setAttribute(Qt::WA_LayoutUsesWidgetRect,true);
 	connect(centerButton,SIGNAL(clicked()),this,SLOT(centerSlide()));
@@ -66,10 +66,10 @@ GoToFlowToolBar::GoToFlowToolBar(QWidget * parent)
 		                    "QPushButton:pressed  {background-image: url(:/images/imgGoToSlidePressed.png); width: 100%; height:100%; background-repeat: none; border: none;} ";
 	goToButton = new QPushButton(this);
 	//goToButton->setIcon(QIcon(":/images/goto.png"));
-	goToButton->setStyleSheet(goToButtonCSS); 
+	goToButton->setStyleSheet(goToButtonCSS);
 	goToButton->setFixedSize(32,50);
 	goToButton->setAttribute(Qt::WA_LayoutUsesWidgetRect,true);
-	
+
 	connect(goToButton,SIGNAL(clicked()),this,SLOT(goTo()));
 
 	normalLayout->setMargin(0);
@@ -94,12 +94,7 @@ GoToFlowToolBar::GoToFlowToolBar(QWidget * parent)
 void GoToFlowToolBar::paintEvent(QPaintEvent *)
 {
     QPainter painter(this);
-
-#ifdef YACREADER_LEGACY_FLOW_GL
-    painter.fillRect(0,0,width(),height(),QColor("#FF000000"));
-#else
     painter.fillRect(0,0,width(),height(),QColor("#99000000"));
-#endif
 }
 
 void GoToFlowToolBar::setPage(int pageNumber)