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

Some other work.

This commit is contained in:
Martin Rotter 2014-02-04 12:50:02 +01:00
parent 63cb32a098
commit 9de551794c
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/feedsview.cpp
View File

@ -172,6 +172,12 @@ void FeedsView::executeNextAutoUpdate() {
else { else {
// Request update for given feeds. // Request update for given feeds.
emit feedsUpdateRequested(feeds_for_update); emit feedsUpdateRequested(feeds_for_update);
if (SystemTrayIcon::isSystemTrayActivated()) {
SystemTrayIcon::instance()->showMessage(tr("Scheduled update started"),
tr("RSS Guard is performing scheduled update of some feeds."),
QSystemTrayIcon::Information);
}
} }
} }

6
src/gui/formstandardfeeddetails.cpp
View File

@ -40,8 +40,7 @@ FormStandardFeedDetails::~FormStandardFeedDetails() {
int FormStandardFeedDetails::exec(FeedsModelStandardFeed *input_feed) { int FormStandardFeedDetails::exec(FeedsModelStandardFeed *input_feed) {
// Load categories. // Load categories.
loadCategories(m_feedsModel->allCategories().values(), loadCategories(m_feedsModel->allCategories().values(),
m_feedsModel->rootItem(), m_feedsModel->rootItem());
input_feed);
if (input_feed == NULL) { if (input_feed == NULL) {
// User is adding new category. // User is adding new category.
@ -374,8 +373,7 @@ void FormStandardFeedDetails::initialize() {
} }
void FormStandardFeedDetails::loadCategories(const QList<FeedsModelCategory*> categories, void FormStandardFeedDetails::loadCategories(const QList<FeedsModelCategory*> categories,
FeedsModelRootItem *root_item, FeedsModelRootItem *root_item) {
FeedsModelStandardFeed *input_feed) {
m_ui->m_cmbParentCategory->addItem(root_item->icon(), m_ui->m_cmbParentCategory->addItem(root_item->icon(),
root_item->title(), root_item->title(),
QVariant::fromValue((void*) root_item)); QVariant::fromValue((void*) root_item));

3
src/gui/formstandardfeeddetails.h
View File

@ -60,8 +60,7 @@ class FormStandardFeedDetails : public QDialog {
// Loads categories into the dialog from the model. // Loads categories into the dialog from the model.
void loadCategories(const QList<FeedsModelCategory*> categories, void loadCategories(const QList<FeedsModelCategory*> categories,
FeedsModelRootItem *root_item, FeedsModelRootItem *root_item);
FeedsModelStandardFeed *input_feed);
private: private:
Ui::FormStandardFeedDetails *m_ui; Ui::FormStandardFeedDetails *m_ui;

7
src/gui/messagesview.cpp
View File

@ -78,13 +78,6 @@ void MessagesView::reloadSelections(int mark_current_index_read) {
scrollTo(current_index); scrollTo(current_index);
reselectIndexes(selected_indexes); reselectIndexes(selected_indexes);
} }
else if ((row_count = m_proxyModel->rowCount()) > 0) {
current_index = m_proxyModel->index(row_count - 1, 0);
setCurrentIndex(current_index);
scrollTo(current_index);
reselectIndexes(QModelIndexList() << current_index);
}
else { else {
// Messages were probably removed from the model, nothing can // Messages were probably removed from the model, nothing can
// be selected and no message can be displayed. // be selected and no message can be displayed.