Fixed #131.
This commit is contained in:
parent
156edc9753
commit
ce7e0f6579
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
Fixed:
|
Fixed:
|
||||||
<ul>
|
<ul>
|
||||||
|
<li>Fixed bug with updating feed. (bug #131)</li>
|
||||||
<li>Solved problem when user selects HUGE number of individual messages and marks them read/unread. Reselecting them after change may cause RSS Guard to hang.</li>
|
<li>Solved problem when user selects HUGE number of individual messages and marks them read/unread. Reselecting them after change may cause RSS Guard to hang.</li>
|
||||||
<li>Better info in popup notification when many feeds are updated.</li>
|
<li>Better info in popup notification when many feeds are updated.</li>
|
||||||
<li>Fixed obtaining of contents in RSS 2.0 feed entries. (bug #130)</li>
|
<li>Fixed obtaining of contents in RSS 2.0 feed entries. (bug #130)</li>
|
||||||
|
|
|
@ -72,11 +72,6 @@ FeedsModel::FeedsModel(QObject *parent)
|
||||||
|
|
||||||
//loadActivatedServiceAccounts();
|
//loadActivatedServiceAccounts();
|
||||||
updateAutoUpdateStatus();
|
updateAutoUpdateStatus();
|
||||||
|
|
||||||
if (qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::FeedsUpdateOnStartup)).toBool()) {
|
|
||||||
qDebug("Requesting update for all feeds on application startup.");
|
|
||||||
QTimer::singleShot(STARTUP_UPDATE_DELAY, this, SLOT(updateAllItems()));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
FeedsModel::~FeedsModel() {
|
FeedsModel::~FeedsModel() {
|
||||||
|
@ -739,6 +734,11 @@ void FeedsModel::loadActivatedServiceAccounts() {
|
||||||
addServiceAccount(root);
|
addServiceAccount(root);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::FeedsUpdateOnStartup)).toBool()) {
|
||||||
|
qDebug("Requesting update for all feeds on application startup.");
|
||||||
|
QTimer::singleShot(STARTUP_UPDATE_DELAY, this, SLOT(updateAllFeeds()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<Feed*> FeedsModel::feedsForIndex(const QModelIndex &index) {
|
QList<Feed*> FeedsModel::feedsForIndex(const QModelIndex &index) {
|
||||||
|
|
|
@ -145,9 +145,6 @@ class FeedsModel : public QAbstractItemModel {
|
||||||
// Schedules given feeds for update.
|
// Schedules given feeds for update.
|
||||||
void updateFeeds(const QList<Feed*> &feeds);
|
void updateFeeds(const QList<Feed*> &feeds);
|
||||||
|
|
||||||
// Schedules all feeds from all accounts for update.
|
|
||||||
void updateAllFeeds();
|
|
||||||
|
|
||||||
// Adds given service root account.
|
// Adds given service root account.
|
||||||
bool addServiceAccount(ServiceRoot *root);
|
bool addServiceAccount(ServiceRoot *root);
|
||||||
|
|
||||||
|
@ -155,6 +152,9 @@ class FeedsModel : public QAbstractItemModel {
|
||||||
void loadActivatedServiceAccounts();
|
void loadActivatedServiceAccounts();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
// Schedules all feeds from all accounts for update.
|
||||||
|
void updateAllFeeds();
|
||||||
|
|
||||||
// Checks if new parent node is different from one used by original node.
|
// Checks if new parent node is different from one used by original node.
|
||||||
// If it is, then it reassigns original_node to new parent.
|
// If it is, then it reassigns original_node to new parent.
|
||||||
void reassignNodeToNewParent(RootItem *original_node, RootItem *new_parent);
|
void reassignNodeToNewParent(RootItem *original_node, RootItem *new_parent);
|
||||||
|
|
|
@ -117,10 +117,6 @@ int main(int argc, char *argv[]) {
|
||||||
qApp->showTrayIcon();
|
qApp->showTrayIcon();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qApp->settings()->value(GROUP(General), SETTING(General::UpdateOnStartup)).toBool()) {
|
|
||||||
QTimer::singleShot(STARTUP_UPDATE_DELAY, application.system(), SLOT(checkForUpdatesOnStartup()));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load activated accounts.
|
// Load activated accounts.
|
||||||
qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->sourceModel()->loadActivatedServiceAccounts();
|
qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->sourceModel()->loadActivatedServiceAccounts();
|
||||||
qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->loadExpandedStates();
|
qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->loadExpandedStates();
|
||||||
|
@ -137,6 +133,11 @@ int main(int argc, char *argv[]) {
|
||||||
qApp->showGuiMessage(QSL(APP_NAME), QObject::tr("Welcome to %1.").arg(APP_LONG_NAME), QSystemTrayIcon::NoIcon);
|
qApp->showGuiMessage(QSL(APP_NAME), QObject::tr("Welcome to %1.").arg(APP_LONG_NAME), QSystemTrayIcon::NoIcon);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (qApp->settings()->value(GROUP(General), SETTING(General::UpdateOnStartup)).toBool()) {
|
||||||
|
QTimer::singleShot(STARTUP_UPDATE_DELAY, application.system(), SLOT(checkForUpdatesOnStartup()));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Enter global event loop.
|
// Enter global event loop.
|
||||||
return Application::exec();
|
return Application::exec();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue