From 9de551794c82a1ca6151bbcf5e353a8e1bb22e0f Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 4 Feb 2014 12:50:02 +0100
Subject: [PATCH] Some other work.

---
 src/gui/feedsview.cpp               | 6 ++++++
 src/gui/formstandardfeeddetails.cpp | 6 ++----
 src/gui/formstandardfeeddetails.h   | 3 +--
 src/gui/messagesview.cpp            | 7 -------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index a17910ccb..8331250bd 100644
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -172,6 +172,12 @@ void FeedsView::executeNextAutoUpdate() {
   else {
     // Request update for given feeds.
     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);
+    }
   }
 }
 
diff --git a/src/gui/formstandardfeeddetails.cpp b/src/gui/formstandardfeeddetails.cpp
index 7c930d3c1..d7a9d1b92 100644
--- a/src/gui/formstandardfeeddetails.cpp
+++ b/src/gui/formstandardfeeddetails.cpp
@@ -40,8 +40,7 @@ FormStandardFeedDetails::~FormStandardFeedDetails() {
 int FormStandardFeedDetails::exec(FeedsModelStandardFeed *input_feed) {
   // Load categories.
   loadCategories(m_feedsModel->allCategories().values(),
-                 m_feedsModel->rootItem(),
-                 input_feed);
+                 m_feedsModel->rootItem());
 
   if (input_feed == NULL) {
     // User is adding new category.
@@ -374,8 +373,7 @@ void FormStandardFeedDetails::initialize() {
 }
 
 void FormStandardFeedDetails::loadCategories(const QList<FeedsModelCategory*> categories,
-                                             FeedsModelRootItem *root_item,
-                                             FeedsModelStandardFeed *input_feed) {
+                                             FeedsModelRootItem *root_item) {
   m_ui->m_cmbParentCategory->addItem(root_item->icon(),
                                      root_item->title(),
                                      QVariant::fromValue((void*) root_item));
diff --git a/src/gui/formstandardfeeddetails.h b/src/gui/formstandardfeeddetails.h
index 2aeefd7f0..f577643a3 100644
--- a/src/gui/formstandardfeeddetails.h
+++ b/src/gui/formstandardfeeddetails.h
@@ -60,8 +60,7 @@ class FormStandardFeedDetails : public QDialog {
 
     // Loads categories into the dialog from the model.
     void loadCategories(const QList<FeedsModelCategory*> categories,
-                        FeedsModelRootItem *root_item,
-                        FeedsModelStandardFeed *input_feed);
+                        FeedsModelRootItem *root_item);
 
   private:
     Ui::FormStandardFeedDetails *m_ui;
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index eaa8cfc8d..1dc772025 100644
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -78,13 +78,6 @@ void MessagesView::reloadSelections(int mark_current_index_read) {
     scrollTo(current_index);
     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 {
     // Messages were probably removed from the model, nothing can
     // be selected and no message can be displayed.