Merged luisangelsm/yacreader/develop into develop

YACReader/main_window_viewer.cpp

@@ -127,8 +127,6 @@ void MainWindowViewer::loadConfiguration()
 
 void MainWindowViewer::setupUI()
 {
-	setWindowIcon(QIcon(":/images/icon.png"));
-
     //setUnifiedTitleAndToolBarOnMac(true);
 
 	viewer = new Viewer(this);

YACReaderLibrary/db_helper.cpp

@@ -387,7 +387,7 @@ void DBHelper::updateProgress(qulonglong libraryId, const ComicInfo &comicInfo)
     ComicDB comic = DBHelper::loadComic(comicInfo.id,db);
     comic.info.currentPage = comicInfo.currentPage;
     comic.info.hasBeenOpened = true;
-    comic.info.read = comicInfo.read || comicInfo.currentPage == comicInfo.numPages;
+    comic.info.read = comic.info.read || comic.info.currentPage == comic.info.numPages;
 
     DBHelper::updateReadingRemoteProgress(comic.info,db);
 
@@ -875,7 +875,7 @@ QList<ComicDB> DBHelper::getSortedComicsFromParent(qulonglong parentId, QSqlData
     {
         if(c1.info.number.isNull() && c2.info.number.isNull())
         {
-            return naturalSortLessThanCI(c1.info.title.toString(), c2.info.title.toString());
+            return naturalSortLessThanCI(c1.name, c2.name);
         }
         else
         {

YACReaderLibrary/library_window.cpp

@@ -114,8 +114,6 @@ LibraryWindow::LibraryWindow()
 
 void LibraryWindow::setupUI()
 {
-	setWindowIcon(QIcon(":/images/iconLibrary.png"));
-
 	setUnifiedTitleAndToolBarOnMac(true);
 
 	libraryCreator = new LibraryCreator();

YACReaderLibrary/main.cpp

@@ -217,7 +217,7 @@ int main( int argc, char ** argv )
 
   LibraryWindow * mw = new LibraryWindow();
 
-  mw->connect(localServer,SIGNAL(comicUpdated(quint64, const ComicDB &)),mw,SLOT(updateComicsView(quint64, const ComicDB &)));
+  mw->connect(localServer,SIGNAL(comicUpdated(quint64, const ComicDB &)),mw,SLOT(updateComicsView(quint64, const ComicDB &)), Qt::QueuedConnection);
 
   //connections to localServer
 

YACReaderLibraryServer/systemctl_service_instructions.txt

@@ -0,0 +1,13 @@
+1. change the path used in ExecStart so it points to the location your headless server binary resides, skip this step if yacreaderlibraryserver is in your path.
+
+2. copy the service file to ~/.local/share/systemd/user
+
+3. enable the service file by running:
+"systemclt --user enable yacreaderlibraryserver"
+
+
+4. start the server by running:
+"systemctl --user start yacreaderlibraryserver"
+
+5. check the server status by running:
+systemctl --user status yacreaderlibraryserver