mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 21:14:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged luisangelsm/yacreader/develop into develop

Browse Source
This commit is contained in:
Felix Kauselmann
2017-12-11 11:00:52 +01:00
parent 3f1b1f620b
commit 1c232b0549
8 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
YACReaderLibrary/db_helper.cpp
View File

@ -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
{

BIN
YACReaderLibrary/icon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 163 KiB

2
YACReaderLibrary/library_window.cpp
View File

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

2
YACReaderLibrary/main.cpp
View File

@ -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