FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix false inlines.

This commit is contained in:
Martin Rotter 2017-09-26 07:36:36 +02:00
parent 1395ba2478
commit 589c08bc8b
2 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/services/abstract/feed.cpp
View File

@ -63,38 +63,12 @@ QVariant Feed::data(int column, int role) const {
switch (role) {
case Qt::ToolTipRole:
if (column == FDS_MODEL_TITLE_INDEX) {
QString auto_update_string;
switch (autoUpdateType()) {
case DontAutoUpdate:
//: Describes feed auto-update status.
auto_update_string = tr("does not use auto-update");
break;
case DefaultAutoUpdate:
//: Describes feed auto-update status.
auto_update_string = tr("uses global settings");
break;
case SpecificAutoUpdate:
default:
//: Describes feed auto-update status.
auto_update_string = tr("uses specific settings "
"(%n minute(s) to next auto-update)",
0,
autoUpdateRemainingInterval());
break;
}
//: Tooltip for feed.
return tr("%1"
"%2\n\n"
"Auto-update status: %3").arg(title(),
description().isEmpty() ? QString() : QString('\n') + description(),
auto_update_string);
getAutoUpdateStatusDescription());
}
else {
return RootItem::data(column, role);

20
src/services/standard/standardfeed.h
View File

@ -72,16 +72,16 @@ class StandardFeed : public Feed {
bool editItself(StandardFeed* new_feed_data);
// Other getters/setters.
inline Type type() const;
inline void setType(Type type);
inline bool passwordProtected() const;
inline void setPasswordProtected(bool passwordProtected);
inline QString username() const;
inline void setUsername(const QString& username);
inline QString password() const;
inline void setPassword(const QString& password);
inline QString encoding() const;
inline void setEncoding(const QString& encoding);
Type type() const;
void setType(Type type);
bool passwordProtected() const;
void setPasswordProtected(bool passwordProtected);
QString username() const;
void setUsername(const QString& username);
QString password() const;
void setPassword(const QString& password);
QString encoding() const;
void setEncoding(const QString& encoding);
QNetworkReply::NetworkError networkError() const;