diff --git a/resources/binaries b/resources/binaries index 572da127b..2392b936c 160000 --- a/resources/binaries +++ b/resources/binaries @@ -1 +1 @@ -Subproject commit 572da127bb14842bba6f84e6315a5ecefb44ed07 +Subproject commit 2392b936c08eac92a6a34361a916a739f53836d0 diff --git a/resources/scripts/update-localizations.sh b/resources/scripts/update-localizations.sh index f11901d47..5b19a7e69 100755 --- a/resources/scripts/update-localizations.sh +++ b/resources/scripts/update-localizations.sh @@ -9,7 +9,7 @@ read -p "Password: " PASSWORD # Setup parameters. RESOURCE=../../localization/rssguard-en_GB.ts -CODES="cs_CZ da_DK de_DE en_US fr_FR it_IT nl_NL pt_BR sv_SE" +CODES="cs_CZ da_DK de_DE en_US fr_FR he_IL id_ID it_IT ja_JP lt_LT nl_NL pt_BR sv_SE" TRANSLATION='../../localization/rssguard-$CODE.ts' declare PARAMS diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp index 7d5511298..f6a8fc9e8 100755 --- a/src/core/messagesmodel.cpp +++ b/src/core/messagesmodel.cpp @@ -259,7 +259,7 @@ bool MessagesModel::setMessageRead(int row_index, RootItem::ReadStatus read) { return false; } - if (DatabaseQueries::markMessageReadUnread(database(), message.m_id, read)) { + if (DatabaseQueries::markMessageRead(database(), message.m_id, read)) { return m_selectedItem->getParentServiceRoot()->onAfterSetMessagesRead(m_selectedItem, QList() << message, read); } else { @@ -289,19 +289,8 @@ bool MessagesModel::switchMessageImportance(int row_index) { return false; } - QSqlQuery query_importance_msg(database()); - query_importance_msg.setForwardOnly(true); - - if (!query_importance_msg.prepare(QSL("UPDATE Messages SET is_important = :important WHERE id = :id;"))) { - qWarning("Query preparation failed for message importance switch."); - return false; - } - - query_importance_msg.bindValue(QSL(":id"), message.m_id); - query_importance_msg.bindValue(QSL(":important"), (int) next_importance); - // Commit changes. - if (query_importance_msg.exec()) { + if (DatabaseQueries::markMessageImportant(database(), message.m_id, next_importance)) { return m_selectedItem->getParentServiceRoot()->onAfterSwitchMessageImportance(m_selectedItem, QList >() << pair); } diff --git a/src/miscellaneous/databasequeries.cpp b/src/miscellaneous/databasequeries.cpp index 25bee0a4b..f9501a20f 100644 --- a/src/miscellaneous/databasequeries.cpp +++ b/src/miscellaneous/databasequeries.cpp @@ -20,7 +20,7 @@ #include -bool DatabaseQueries::markMessageReadUnread(QSqlDatabase db, int id, RootItem::ReadStatus read) { +bool DatabaseQueries::markMessageRead(QSqlDatabase db, int id, RootItem::ReadStatus read) { QSqlQuery query_read_msg(db); query_read_msg.setForwardOnly(true); @@ -35,5 +35,21 @@ bool DatabaseQueries::markMessageReadUnread(QSqlDatabase db, int id, RootItem::R return query_read_msg.exec(); } +bool DatabaseQueries::markMessageImportant(QSqlDatabase db, int id, RootItem::Importance importance) { + QSqlQuery query_importance_msg(db); + query_importance_msg.setForwardOnly(true); + + if (!query_importance_msg.prepare(QSL("UPDATE Messages SET is_important = :important WHERE id = :id;"))) { + qWarning("Query preparation failed for message importance switch."); + return false; + } + + query_importance_msg.bindValue(QSL(":id"), id); + query_importance_msg.bindValue(QSL(":important"), (int) importance); + + // Commit changes. + return query_importance_msg.exec(); +} + DatabaseQueries::DatabaseQueries() { } diff --git a/src/miscellaneous/databasequeries.h b/src/miscellaneous/databasequeries.h index 95cda5b1f..a73892a5e 100644 --- a/src/miscellaneous/databasequeries.h +++ b/src/miscellaneous/databasequeries.h @@ -25,8 +25,8 @@ class DatabaseQueries { public: - static bool markMessageReadUnread(QSqlDatabase db, int id, RootItem::ReadStatus read); - + static bool markMessageRead(QSqlDatabase db, int id, RootItem::ReadStatus read); + static bool markMessageImportant(QSqlDatabase db, int id, RootItem::Importance importance); private: explicit DatabaseQueries();