From 44fc4a3f074e317441ec8e6ff15e44f2aae4231a Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 13 May 2015 07:09:28 +0200
Subject: [PATCH] Some more changes.

---
 src/gui/feedmessageviewer.cpp | 2 +-
 src/gui/messagestoolbar.cpp   | 1 -
 src/gui/messagesview.cpp      | 7 +++----
 src/gui/messagesview.h        | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 1200a72cf..1138587e9 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -179,7 +179,7 @@ void FeedMessageViewer::onFeedUpdatesProgress(FeedsModelFeed *feed, int current,
 void FeedMessageViewer::onFeedUpdatesFinished() {
   qApp->feedUpdateLock()->unlock();
   qApp->mainForm()->statusBar()->clearProgressFeeds();
-  m_messagesView->reloadSelections(1);
+  m_messagesView->reloadSelections(true);
 }
 
 void FeedMessageViewer::switchFeedComponentVisibility() {
diff --git a/src/gui/messagestoolbar.cpp b/src/gui/messagestoolbar.cpp
index f5421c3f7..600cca9b1 100755
--- a/src/gui/messagestoolbar.cpp
+++ b/src/gui/messagestoolbar.cpp
@@ -78,7 +78,6 @@ void MessagesToolBar::loadChangeableActions(const QStringList& actions) {
       // Add new separator.
       addSeparator();
     }
-    // TODO: tydle dve vetve asi vymazat.
     else if (action_name == SEACRH_MESSAGES_ACTION_NAME) {
       // Add search box.
       addAction(m_actionSearchMessages);
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 002a97ab8..7c82d3e18 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -73,7 +73,7 @@ void MessagesView::keyboardSearch(const QString &search) {
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 }
 
-void MessagesView::reloadSelections(int mark_current_index_read) {
+void MessagesView::reloadSelections(bool mark_current_index_read) {
   QModelIndex current_index = selectionModel()->currentIndex();
   QModelIndex mapped_current_index = m_proxyModel->mapToSource(current_index);
   QModelIndexList selected_indexes = selectionModel()->selectedRows();
@@ -89,7 +89,7 @@ void MessagesView::reloadSelections(int mark_current_index_read) {
   current_index = m_proxyModel->mapFromSource(m_sourceModel->index(mapped_current_index.row(), mapped_current_index.column()));
 
   if (current_index.isValid()) {
-    if (mark_current_index_read == 0) {
+    if (mark_current_index_read) {
       // User selected to mark some messages as unread, if one
       // of them will be marked as current, then it will be read again.
       m_batchUnreadSwitch = true;
@@ -436,8 +436,7 @@ void MessagesView::reselectIndexes(const QModelIndexList &indexes) {
   QItemSelection selection;
 
   foreach (const QModelIndex &index, indexes) {
-    // TODO: THIS IS very slow. Try to select 4000 messages
-    // and hit "mark as read" button.
+    // TODO: THIS IS very slow. Try to select 4000 messages and hit "mark as read" button.
     selection.merge(QItemSelection(index, index), QItemSelectionModel::Select);
   }
 
diff --git a/src/gui/messagesview.h b/src/gui/messagesview.h
index 2550927b1..b4af84165 100755
--- a/src/gui/messagesview.h
+++ b/src/gui/messagesview.h
@@ -57,7 +57,7 @@ class MessagesView : public QTreeView {
     // and it needs to be reloaded to the view.
     // If "mark_current_index_read" is 0, then message with
     // "current" index is not marked as read.
-    void reloadSelections(int mark_current_index_read);
+    void reloadSelections(bool mark_current_index_read);
 
     // Loads un-deleted messages from selected feeds.
     void loadFeeds(const FeedsSelection &selection);