FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update locale script and some more code.

Browse Source
This commit is contained in:
Martin Rotter 2016-04-05 06:43:29 +02:00
parent b76a3167b1
commit f73535faa1
5 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/binaries

@ -1 +1 @@
Subproject commit 572da127bb14842bba6f84e6315a5ecefb44ed07
Subproject commit 2392b936c08eac92a6a34361a916a739f53836d0

2
resources/scripts/update-localizations.sh
View File

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

15
src/core/messagesmodel.cpp
View File

@ -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>() << 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<QPair<Message,RootItem::Importance> >() << pair);
}

18
src/miscellaneous/databasequeries.cpp
View File

@ -20,7 +20,7 @@
#include <QVariant>
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() {
}

4
src/miscellaneous/databasequeries.h
View File

@ -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();