diff --git a/YACReader/icon.ico b/YACReader/icon.ico index 6c31de5a..e85b1e60 100644 Binary files a/YACReader/icon.ico and b/YACReader/icon.ico differ diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index 2e4d5e8a..f5abf669 100644 --- a/YACReader/main_window_viewer.cpp +++ b/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); diff --git a/YACReaderLibrary/db_helper.cpp b/YACReaderLibrary/db_helper.cpp index 999e7d36..381de0e6 100644 --- a/YACReaderLibrary/db_helper.cpp +++ b/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 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 { diff --git a/YACReaderLibrary/icon.ico b/YACReaderLibrary/icon.ico index b2232648..32f8e29d 100644 Binary files a/YACReaderLibrary/icon.ico and b/YACReaderLibrary/icon.ico differ diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 0c0a1ca8..95cc6293 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -114,8 +114,6 @@ LibraryWindow::LibraryWindow() void LibraryWindow::setupUI() { - setWindowIcon(QIcon(":/images/iconLibrary.png")); - setUnifiedTitleAndToolBarOnMac(true); libraryCreator = new LibraryCreator(); diff --git a/YACReaderLibrary/main.cpp b/YACReaderLibrary/main.cpp index dbdb3684..92226127 100644 --- a/YACReaderLibrary/main.cpp +++ b/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 diff --git a/YACReaderLibraryServer/systemctl_service_instructions.txt b/YACReaderLibraryServer/systemctl_service_instructions.txt new file mode 100644 index 00000000..01b32792 --- /dev/null +++ b/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 diff --git a/images/importBottomCoversDecoration.png b/images/importBottomCoversDecoration.png index 3e0b2906..7508ce17 100644 Binary files a/images/importBottomCoversDecoration.png and b/images/importBottomCoversDecoration.png differ