From 3e040377b6d94d37dbcba1b03cd3cfc9ad5fac5c Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 29 Nov 2015 09:22:17 +0100
Subject: [PATCH] Some refactoring + #112.

---
 resources/text/CHANGELOG        |  3 ++-
 src/core/messagesproxymodel.cpp | 32 ++++++++++++++++++++++++++++++++
 src/core/messagesproxymodel.h   |  4 ++++
 src/gui/dialogs/formmain.cpp    |  2 ++
 src/gui/dialogs/formmain.ui     | 16 ++++++++++++++--
 src/gui/feedmessageviewer.cpp   |  2 ++
 src/gui/feedsview.cpp           | 10 ----------
 src/gui/feedsview.h             |  2 --
 src/gui/messagesview.cpp        | 19 ++++++-------------
 9 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 376e1bb66..f523affbc 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -17,11 +17,12 @@
 	  Added:
 	  <ul>
 		  <li style="color: red;">Brand new "service plugin system" - HIGHLY EXPERIMENTAL and REWRITTEN from scratch. Expect bugs and misunderstandings now! Major parts of RSS Guard were completely rewritten.</li>
+      <li>Added ability to completely disable notifications (bug #128).</li>
+      <li>Added ability to go to next <font style="font-weight: bold;">unread</font> message. (partially bug #112)</li>
 	  </ul>
 	  
 	  Fixed:
 	  <ul>
-      <li>Added ability to completely disable notifications (bug #128).</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>Improved popup informing about changes in newly installed version.</li>
diff --git a/src/core/messagesproxymodel.cpp b/src/core/messagesproxymodel.cpp
index 4fc5f9ece..992cc49fe 100755
--- a/src/core/messagesproxymodel.cpp
+++ b/src/core/messagesproxymodel.cpp
@@ -38,6 +38,38 @@ MessagesProxyModel::~MessagesProxyModel() {
   qDebug("Destroying MessagesProxyModel instance.");
 }
 
+QModelIndex MessagesProxyModel::getNextPreviousUnreadItemIndex(int default_row) {
+  bool started_from_zero = default_row == 0;
+  QModelIndex next_index = getNextUnreadItemIndex(default_row, rowCount() - 1);
+
+  // There is no next message, check previous.
+  if (!next_index.isValid() && !started_from_zero) {
+    next_index = getNextUnreadItemIndex(0, default_row - 1);
+  }
+
+  return next_index;
+}
+
+QModelIndex MessagesProxyModel::getNextUnreadItemIndex(int default_row, int max_row) {
+  while (default_row <= max_row) {
+    // Get info if the message is read or not.
+    QModelIndex proxy_index = index(default_row, 0);
+
+    bool is_read = m_sourceModel->data(mapToSource(proxy_index).row(),
+                                       MSG_DB_READ_INDEX, Qt::EditRole).toInt() == 1;
+
+    if (!is_read) {
+      // We found unread message, mark it.
+      return proxy_index;
+    }
+    else {
+      default_row++;
+    }
+  }
+
+  return QModelIndex();
+}
+
 bool MessagesProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const {
   if (left.column() == MSG_DB_TITLE_INDEX && right.column() == MSG_DB_TITLE_INDEX) {
     return QString::localeAwareCompare(m_sourceModel->data(left).toString(),
diff --git a/src/core/messagesproxymodel.h b/src/core/messagesproxymodel.h
index 2b81ea652..1bb2faaa1 100755
--- a/src/core/messagesproxymodel.h
+++ b/src/core/messagesproxymodel.h
@@ -36,6 +36,8 @@ class MessagesProxyModel : public QSortFilterProxyModel {
       return m_sourceModel;
     }
 
+    QModelIndex getNextPreviousUnreadItemIndex(int default_row);
+
     // Maps list of indexes.
     QModelIndexList mapListToSource(const QModelIndexList &indexes);
     QModelIndexList mapListFromSource(const QModelIndexList &indexes, bool deep = false);
@@ -44,6 +46,8 @@ class MessagesProxyModel : public QSortFilterProxyModel {
     QModelIndexList match(const QModelIndex &start, int role, const QVariant &entered_value, int hits, Qt::MatchFlags flags) const;
 
   private:
+    QModelIndex getNextUnreadItemIndex(int default_row, int max_row);
+
     // Compares two rows of data.
     bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
 
diff --git a/src/gui/dialogs/formmain.cpp b/src/gui/dialogs/formmain.cpp
index 349794e44..226f0c638 100755
--- a/src/gui/dialogs/formmain.cpp
+++ b/src/gui/dialogs/formmain.cpp
@@ -135,6 +135,7 @@ QList<QAction*> FormMain::allActions() {
   actions << m_ui->m_actionSelectPreviousItem;
   actions << m_ui->m_actionSelectNextMessage;
   actions << m_ui->m_actionSelectPreviousMessage;
+  actions << m_ui->m_actionSelectNextUnreadMessage;
   actions << m_ui->m_actionExpandCollapseItem;
 
   return actions;
@@ -361,6 +362,7 @@ void FormMain::setupIcons() {
   m_ui->m_actionSelectPreviousItem->setIcon(icon_theme_factory->fromTheme(QSL("go-up")));
   m_ui->m_actionSelectNextMessage->setIcon(icon_theme_factory->fromTheme(QSL("go-down")));
   m_ui->m_actionSelectPreviousMessage->setIcon(icon_theme_factory->fromTheme(QSL("go-up")));
+  m_ui->m_actionSelectNextUnreadMessage->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-unread")));
   m_ui->m_actionShowOnlyUnreadItems->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-unread")));
   m_ui->m_actionExpandCollapseItem->setIcon(icon_theme_factory->fromTheme(QSL("expand-collapse")));
   m_ui->m_actionRestoreSelectedMessages->setIcon(icon_theme_factory->fromTheme(QSL("recycle-bin-restore-one")));
diff --git a/src/gui/dialogs/formmain.ui b/src/gui/dialogs/formmain.ui
index 8a15ea446..fe4f645ce 100755
--- a/src/gui/dialogs/formmain.ui
+++ b/src/gui/dialogs/formmain.ui
@@ -125,7 +125,7 @@
    </widget>
    <widget class="QMenu" name="m_menuFeeds">
     <property name="title">
-     <string>Fee&amp;ds &amp;&amp; categories</string>
+     <string>Feeds &amp;&amp; categories &amp;&amp; accounts</string>
     </property>
     <widget class="QMenu" name="m_menuAddItem">
      <property name="title">
@@ -165,6 +165,7 @@
     <addaction name="separator"/>
     <addaction name="m_actionSelectNextMessage"/>
     <addaction name="m_actionSelectPreviousMessage"/>
+    <addaction name="m_actionSelectNextUnreadMessage"/>
     <addaction name="separator"/>
     <addaction name="m_actionMarkSelectedMessagesAsRead"/>
     <addaction name="m_actionMarkSelectedMessagesAsUnread"/>
@@ -174,7 +175,7 @@
    </widget>
    <widget class="QMenu" name="m_menuRecycleBin">
     <property name="title">
-     <string>&amp;Recycle bin</string>
+     <string>&amp;Recycle bin(s)</string>
     </property>
     <addaction name="m_actionRestoreAllRecycleBins"/>
     <addaction name="m_actionEmptyAllRecycleBins"/>
@@ -729,6 +730,17 @@
    <property name="text">
     <string>&amp;Empty all recycle bins</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
+  </action>
+  <action name="m_actionSelectNextUnreadMessage">
+   <property name="text">
+    <string>Select next &amp;unread message</string>
+   </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
  </widget>
  <customwidgets>
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index cbe2d9fac..69a978993 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -304,6 +304,8 @@ void FeedMessageViewer::createConnections() {
           SIGNAL(triggered()), m_feedsView, SLOT(selectPreviousItem()));
   connect(form_main->m_ui->m_actionSelectNextMessage,
           SIGNAL(triggered()), m_messagesView, SLOT(selectNextItem()));
+  connect(form_main->m_ui->m_actionSelectNextUnreadMessage,
+          SIGNAL(triggered()), m_messagesView, SLOT(selectNextUnreadItem()));
   connect(form_main->m_ui->m_actionSelectPreviousMessage,
           SIGNAL(triggered()), m_messagesView, SLOT(selectPreviousItem()));
   connect(form_main->m_ui->m_actionSwitchMessageListOrientation, SIGNAL(triggered()),
diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index f750ff432..8c67483d8 100755
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -98,16 +98,6 @@ RootItem *FeedsView::selectedItem() const {
   }
 }
 
-Category *FeedsView::selectedCategory() const {
-  QModelIndex current_mapped = m_proxyModel->mapToSource(currentIndex());
-  return m_sourceModel->categoryForIndex(current_mapped);
-}
-
-Feed *FeedsView::selectedFeed() const {
-  QModelIndex current_mapped = m_proxyModel->mapToSource(currentIndex());
-  return m_sourceModel->feedForIndex(current_mapped);
-}
-
 void FeedsView::saveExpandedStates() {
   Settings *settings = qApp->settings();
   QList<RootItem*> expandable_items;
diff --git a/src/gui/feedsview.h b/src/gui/feedsview.h
index 0f85374d4..05f9f8a31 100755
--- a/src/gui/feedsview.h
+++ b/src/gui/feedsview.h
@@ -56,8 +56,6 @@ class FeedsView : public QTreeView {
     // Returns pointers to selected feed/category if they are really
     // selected.
     RootItem *selectedItem() const;
-    Category *selectedCategory() const;
-    Feed *selectedFeed() const;
 
     // Saves/loads expand states of all nodes (feeds/categories) of the list to/from settings.
     void saveExpandedStates();
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index c52d68104..95b493ef8 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -481,20 +481,13 @@ void MessagesView::selectNextUnreadItem() {
     active_row = 0;
   }
 
-  while (++active_row < m_proxyModel->rowCount()) {
-    // Get info if the message is read or not.
-    QModelIndex proxy_index = m_proxyModel->index(active_row, 0);
+  QModelIndex next_unread = m_proxyModel->getNextPreviousUnreadItemIndex(active_row);
 
-    bool is_read = m_sourceModel->data(m_proxyModel->mapToSource(proxy_index).row(),
-                                       MSG_DB_READ_INDEX, Qt::EditRole).toInt() == 1;
-
-    if (!is_read) {
-      // We found unread message, mark it.
-      setCurrentIndex(proxy_index);
-      selectionModel()->select(proxy_index, QItemSelectionModel::Select | QItemSelectionModel::Rows);
-      setFocus();
-      break;
-    }
+  if (next_unread.isValid()) {
+    // We found unread message, mark it.
+    setCurrentIndex(next_unread);
+    selectionModel()->select(next_unread, QItemSelectionModel::Select | QItemSelectionModel::Rows);
+    setFocus();
   }
 }