Some opacity fixes. Downloader returns number.

This commit is contained in:
Martin Rotter 2015-06-30 08:37:27 +02:00
parent 9447491ef7
commit 60b2aaa37a
4 changed files with 15 additions and 11 deletions

View File

@ -392,7 +392,7 @@ QVariant FeedsModelFeed::data(int column, int role) const {
}
}
void FeedsModelFeed::update() {
int FeedsModelFeed::update() {
QByteArray feed_contents;
int download_timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
m_networkError = NetworkFactory::downloadFeedFile(url(), download_timeout, feed_contents,
@ -401,7 +401,7 @@ void FeedsModelFeed::update() {
if (m_networkError != QNetworkReply::NoError) {
qWarning("Error during fetching of new messages for feed '%s' (id %d).", qPrintable(url()), id());
m_status = NetworkError;
return;
return 0;
}
else {
m_status = Normal;
@ -441,7 +441,7 @@ void FeedsModelFeed::update() {
break;
}
updateMessages(messages);
return updateMessages(messages);
}
bool FeedsModelFeed::removeItself() {
@ -465,8 +465,9 @@ bool FeedsModelFeed::removeItself() {
return query_remove.exec();
}
void FeedsModelFeed::updateMessages(const QList<Message> &messages) {
int FeedsModelFeed::updateMessages(const QList<Message> &messages) {
int feed_id = id();
int updated_messages = 0;
QSqlDatabase database = qApp->database()->connection(QSL("FeedsModelFeed"), DatabaseFactory::FromSettings);
bool remove_duplicates = qApp->settings()->value(GROUP(Messages), SETTING(Messages::RemoveDuplicates)).toBool();
@ -495,7 +496,7 @@ void FeedsModelFeed::updateMessages(const QList<Message> &messages) {
if (!database.transaction()) {
database.rollback();
qDebug("Transaction start for message downloader failed.");
return;
return updated_messages;
}
foreach (Message message, messages) {
@ -540,6 +541,7 @@ void FeedsModelFeed::updateMessages(const QList<Message> &messages) {
if (query_insert.exec() && query_insert.numRowsAffected() == 1) {
setStatus(NewMessages);
updated_messages++;
}
query_insert.finish();
@ -571,6 +573,7 @@ void FeedsModelFeed::updateMessages(const QList<Message> &messages) {
if (query_insert.exec() && query_insert.numRowsAffected() == 1) {
setStatus(NewMessages);
updated_messages++;
}
query_insert.finish();
@ -585,13 +588,14 @@ void FeedsModelFeed::updateMessages(const QList<Message> &messages) {
qDebug("Transaction commit for message downloader failed.");
}
return updated_messages;
}
QNetworkReply::NetworkError FeedsModelFeed::networkError() const {
return m_networkError;
}
FeedsModelFeed::FeedsModelFeed(const QSqlRecord &record) : FeedsModelRootItem(NULL) {
m_kind = FeedsModelRootItem::Feed;

View File

@ -79,8 +79,8 @@ class FeedsModelFeed : public FeedsModelRootItem {
// Obtains data related to this feed.
QVariant data(int column, int role) const;
// Perform fetching of new messages.
void update();
// Perform fetching of new messages. Returns number of newly updated messages.
int update();
// Removes this standard feed from persistent
// storage.
@ -192,7 +192,7 @@ class FeedsModelFeed : public FeedsModelRootItem {
// Persistently stores given messages into the database
// and updates existing messages if newer version is
// available.
void updateMessages(const QList<Message> &messages);
int updateMessages(const QList<Message> &messages);
private:
void init();

View File

@ -143,7 +143,7 @@ void Notification::paintEvent(QPaintEvent *event) {
painter.setFont(font());
if (!underMouse()) {
painter.setOpacity(0.7);
painter.setOpacity(0.8);
}
else {
painter.setOpacity(0.95);

View File

@ -195,7 +195,7 @@ bool SystemFactory::isUpdateNewer(const QString &update_version) {
int current_number = current_version_tkn.takeFirst().toInt();
int new_number = new_version_tkn.takeFirst().toInt();
if (new_number != current_number) {
if (new_number > current_number) {
// New version is indeed higher thatn current version.
return true;
}