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/8.0.0-release (pull request #25)

Browse Source 
unarr inclusion and build system updates
This commit is contained in:
Luis Ángel San Martín 2015-05-23 11:39:27 +02:00
commit 5fbc8f3b9e
4 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
YACReaderLibrary/db_helper.cpp
View File

@ -604,16 +604,21 @@ qulonglong DBHelper::insertReadingSubList(const QString &name, qulonglong parent
void DBHelper::insertComicsInFavorites(const QList<ComicDB> &comicsList, QSqlDatabase &db) void DBHelper::insertComicsInFavorites(const QList<ComicDB> &comicsList, QSqlDatabase &db)
{ {
QSqlQuery getNumComicsInFavoritesQuery("SELECT count(*) FROM comic_default_reading_list WHERE default_reading_list_id = 1;",db);
getNumComicsInFavoritesQuery.next();
QSqlRecord record = getNumComicsInFavoritesQuery.record();
int numComics = record.value(0).toInt();
db.transaction(); db.transaction();
QSqlQuery query(db); QSqlQuery query(db);
query.prepare("INSERT INTO comic_default_reading_list (default_reading_list_id, comic_id) " query.prepare("INSERT INTO comic_default_reading_list (default_reading_list_id, comic_id, ordering) "
"VALUES (1, :comic_id)"); "VALUES (1, :comic_id, :ordering)");
foreach(ComicDB comic, comicsList) foreach(ComicDB comic, comicsList)
{ {
query.bindValue(":comic_id", comic.id); query.bindValue(":comic_id", comic.id);
//query.bindValue(":order", numComics++); query.bindValue(":ordering", numComics++);
query.exec(); query.exec();
} }
@ -622,16 +627,22 @@ void DBHelper::insertComicsInFavorites(const QList<ComicDB> &comicsList, QSqlDat
void DBHelper::insertComicsInLabel(const QList<ComicDB> &comicsList, qulonglong labelId, QSqlDatabase &db) void DBHelper::insertComicsInLabel(const QList<ComicDB> &comicsList, qulonglong labelId, QSqlDatabase &db)
{ {
QSqlQuery getNumComicsInFavoritesQuery(QString("SELECT count(*) FROM comic_label WHERE label_id = %1;").arg(labelId) ,db);
getNumComicsInFavoritesQuery.next();
QSqlRecord record = getNumComicsInFavoritesQuery.record();
int numComics = record.value(0).toInt();
db.transaction(); db.transaction();
QSqlQuery query(db); QSqlQuery query(db);
query.prepare("INSERT INTO comic_label (label_id, comic_id) " query.prepare("INSERT INTO comic_label (label_id, comic_id, ordering) "
"VALUES (:label_id, :comic_id)"); "VALUES (:label_id, :comic_id, :ordering)");
foreach(ComicDB comic, comicsList) foreach(ComicDB comic, comicsList)
{ {
query.bindValue(":label_id", labelId); query.bindValue(":label_id", labelId);
query.bindValue(":comic_id", comic.id); query.bindValue(":comic_id", comic.id);
query.bindValue(":ordering", numComics++);
query.exec(); query.exec();
} }
@ -640,7 +651,7 @@ void DBHelper::insertComicsInLabel(const QList<ComicDB> &comicsList, qulonglong
void DBHelper::insertComicsInReadingList(const QList<ComicDB> &comicsList, qulonglong readingListId, QSqlDatabase &db) void DBHelper::insertComicsInReadingList(const QList<ComicDB> &comicsList, qulonglong readingListId, QSqlDatabase &db)
{ {
QSqlQuery getNumComicsInFavoritesQuery("SELECT count(*) from comic_reading_list;",db); QSqlQuery getNumComicsInFavoritesQuery("SELECT count(*) FROM comic_reading_list;",db);
getNumComicsInFavoritesQuery.next(); getNumComicsInFavoritesQuery.next();
QSqlRecord record = getNumComicsInFavoritesQuery.record(); QSqlRecord record = getNumComicsInFavoritesQuery.record();
int numComics = record.value(0).toInt(); int numComics = record.value(0).toInt();

11
YACReaderLibrary/qml/GridComicsView.qml
View File

@ -150,11 +150,14 @@ Rectangle {
} }
onReleased: { onReleased: {
/*if(mouse.button != Qt.RightButton && !(mouse.modifiers & Qt.ControlModifier || mouse.modifiers & Qt.ShiftModifier)) if(mouse.button == Qt.LeftButton && !(mouse.modifiers & Qt.ControlModifier || mouse.modifiers & Qt.ShiftModifier))
{ {
comicsSelectionHelper.setCurrentIndex(index) if(comicsSelectionHelper.isSelectedIndex(index))
grid.currentIndex = index; {
}*/ comicsSelectionHelper.setCurrentIndex(index)
grid.currentIndex = index;
}
}
} }
} }

4
common/gl/yacreader_flow_gl.cpp
View File

@ -1269,6 +1269,8 @@ void YACReaderComicFlowGL::updateImageData()
return; return;
} }
} }
delete[] indexes;
} }
void YACReaderComicFlowGL::remove(int item) void YACReaderComicFlowGL::remove(int item)
@ -1405,6 +1407,8 @@ void YACReaderPageFlowGL::updateImageData()
return; return;
} }
} }
delete[] indexes;
} }
void YACReaderPageFlowGL::populate(int n) void YACReaderPageFlowGL::populate(int n)

2
common/gl_legacy/yacreader_flow_gl.cpp
View File

@ -1243,6 +1243,7 @@ void YACReaderComicFlowGL::updateImageData()
return; return;
} }
} }
delete[] indexes;
} }
void YACReaderComicFlowGL::remove(int item) void YACReaderComicFlowGL::remove(int item)
@ -1369,6 +1370,7 @@ void YACReaderPageFlowGL::updateImageData()
return; return;
} }
} }
delete[] indexes;
} }
void YACReaderPageFlowGL::populate(int n) void YACReaderPageFlowGL::populate(int n)