From a0638e970800ea3d321c438e724f624957263a21 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Mon, 6 Jan 2014 17:25:42 +0100
Subject: [PATCH] Messages auto-sorted after feed is opened.

---
 resources/skins/base/vergilius.xml    |  2 +-
 src/core/silentnetworkaccessmanager.h |  6 +++---
 src/core/textfactory.h                |  1 +
 src/gui/feedmessageviewer.cpp         |  2 +-
 src/gui/messagesview.cpp              | 10 +++++-----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/resources/skins/base/vergilius.xml b/resources/skins/base/vergilius.xml
index d87d5d8b4..82a5fb5ac 100644
--- a/resources/skins/base/vergilius.xml
+++ b/resources/skins/base/vergilius.xml
@@ -8,5 +8,5 @@
   <style/>
   <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIGJvZHkgew0KICAgICAgICBtYXJnaW46IDBweDsNCiAgICAgICAgcGFkZGluZzogMHB4Ow0KICAgICAgfQ0KICAgIA0KICAgICAgcHJlIHsNCiAgICAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVydGV4dCB7DQogICAgICAgIGZvbnQtc2l6ZTogMjBweDsNCiAgICAgICAgbWFyZ2luLWJvdHRvbTogMTBweDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciB7DQogICAgICAgIGZvbnQtc2l6ZTogMTdweDsNCiAgICAgICAgYmFja2dyb3VuZDogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIGxlZnQgdG9wLCBsZWZ0IGJvdHRvbSwgY29sb3Itc3RvcCgwJSxyZ2JhKDk5LDEzNSwyMjksMSkpLCBjb2xvci1zdG9wKDEwMCUscmdiYSg2NCwxMDksMjM2LDEpKSk7DQogICAgICAgIHBhZGRpbmc6IDZweDsNCiAgICAgICAgbWFyZ2luOiAwcHggYXV0bzsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgICBib3JkZXI6IDAuNXB4IHNvbGlkIGJsYWNrOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVyIGEgew0KICAgICAgICBjb2xvcjogd2hpdGU7DQogICAgICB9DQoNCiAgICAgIC5jb250ZW50IHsNCiAgICAgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIGdyYXk7DQogICAgICAgIGZvbnQtc2l6ZTogMTZweDsNCiAgICAgICAgbWFyZ2luOiAwcHggYXV0bzsNCiAgICAgICAgcGFkZGluZzogNnB4Ow0KICAgICAgICBwYWRkaW5nLXRvcDogMTJweDsNCiAgICAgIH0NCiAgICAgIA0KICAgICAgLmNvbnRhaW5lciB7DQogICAgICAgIGJvcmRlcjogMXB4IHNvbGlkIGdyYXk7DQogICAgICAgIC13ZWJraXQtYm9yZGVyLXJhZGl1czogMnB4Ow0KICAgICAgICBtYXJnaW46IDEwcHg7DQogICAgICAgIC13ZWJraXQtYm94LXNoYWRvdzogMnB4IDJweCAxNnB4IDBweCByZ2JhKDUwLCA1MCwgNTAsIDAuNjIpOw0KICAgICAgfQ0KICAgIDwvc3R5bGU+DQogICAgPHRpdGxlPg0KICAgICAgJTENCiAgICA8L3RpdGxlPg0KICA8L2hlYWQ+DQogIDxib2R5Pg0KICAgICUyDQogIDwvYm9keT4NCjwvaHRtbD4=</markup_wrapper>
   <markup>ICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+DQogICAgICA8ZGl2IGNsYXNzPSJoZWFkZXIiPg0KICAgICAgICA8ZGl2IGNsYXNzPSJoZWFkZXJ0ZXh0Ij4NCiAgICAgICAgICAlMQ0KICAgICAgICA8L2Rpdj4NCiAgICAgICAgJTIgKCU1KQ0KICAgICAgICA8YnI+DQogICAgICAgIDxhIGhyZWY9IiUzIj4NCiAgICAgICAgICAlMw0KICAgICAgICA8L2E+DQogICAgICA8L2Rpdj4NCiAgICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiPg0KICAgICAgICAlNCANCiAgICAgIDwvZGl2Pg0KICAgIDwvZGl2Pg==</markup>
-  <data/>
+  <data>UVRyZWVWaWV3OjpicmFuY2g6aGFzLXNpYmxpbmdzOiFhZGpvaW5zLWl0ZW0gIHsNCiAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCn0NCg0KUVRyZWVWaWV3OjpicmFuY2g6aGFzLXNpYmxpbmdzOmFkam9pbnMtaXRlbSB7DQogIGJvcmRlci1pbWFnZTogdXJsKHFzcy9kdW1teS5wbmcpIDA7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOiFoYXMtY2hpbGRyZW46IWhhcy1zaWJsaW5nczphZGpvaW5zLWl0ZW0gIHsNCiAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCn0NCg0KUVRyZWVWaWV3OjpicmFuY2g6aGFzLWNoaWxkcmVuOiFoYXMtc2libGluZ3M6Y2xvc2VkLA0KUVRyZWVWaWV3OjpicmFuY2g6Y2xvc2VkOmhhcy1jaGlsZHJlbjpoYXMtc2libGluZ3MgIHsNCiAgYm9yZGVyLWltYWdlOiBub25lOw0KICBpbWFnZTogdXJsKHFzcy9icmFuY2gtY2xvc2VkLnBuZyk7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOm9wZW46aGFzLWNoaWxkcmVuOiFoYXMtc2libGluZ3MsDQpRVHJlZVZpZXc6OmJyYW5jaDpvcGVuOmhhcy1jaGlsZHJlbjpoYXMtc2libGluZ3MgIHsNCiAgYm9yZGVyLWltYWdlOiBub25lOw0KICBpbWFnZTogdXJsKHFzcy9icmFuY2gtb3Blbi5wbmcpOw0KfQ0KDQpRVHJlZVZpZXc6Oml0ZW0gew0KICBwYWRkaW5nOiAxcHggMXB4IDFweCAxcHg7DQp9IA0KDQpRVHJlZVZpZXdbaGlkZVRyZWU9InRydWUiXTo6YnJhbmNoOiFoYXMtY2hsaWRyZW46aGFzU2libGluZ3Mgew0KICBib3JkZXItaW1hZ2U6IG5vbmU7DQogIGltYWdlOiBub25lOw0KfQ0K</data>
 </skin>
\ No newline at end of file
diff --git a/src/core/silentnetworkaccessmanager.h b/src/core/silentnetworkaccessmanager.h
index 3db09dbbc..7662afaa5 100644
--- a/src/core/silentnetworkaccessmanager.h
+++ b/src/core/silentnetworkaccessmanager.h
@@ -1,5 +1,5 @@
-#ifndef SILENTNETWORKACCESSMANAGES_H
-#define SILENTNETWORKACCESSMANAGES_H
+#ifndef SILENTNETWORKACCESSMANAGER_H
+#define SILENTNETWORKACCESSMANAGER_H
 
 #include "core/basenetworkaccessmanager.h"
 
@@ -18,4 +18,4 @@ class SilentNetworkAccessManager : public BaseNetworkAccessManager {
     void onAuthenticationRequired(QNetworkReply * reply, QAuthenticator *authenticator);
 };
 
-#endif // SILENTNETWORKACCESSMANAGES_H
+#endif // SILENTNETWORKACCESSMANAGER_H
diff --git a/src/core/textfactory.h b/src/core/textfactory.h
index 9c5d2929b..78190def3 100644
--- a/src/core/textfactory.h
+++ b/src/core/textfactory.h
@@ -4,6 +4,7 @@
 #include "core/defs.h"
 
 #include <QDateTime>
+#include <QMap>
 
 
 class TextFactory {
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index ed9335bb7..e2c88e5fa 100644
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -139,7 +139,7 @@ void FeedMessageViewer::createConnections() {
   connect(m_messagesView, SIGNAL(openMessagesInNewspaperView(QList<Message>)),
           FormMain::getInstance()->m_ui->m_tabWidget,
           SLOT(addBrowserWithMessages(QList<Message>)));
-  connect(m_messagesView, SIGNAL(openLinkMessageNewTabRequested(QString)),
+  connect(m_messagesView, SIGNAL(openLinkNewTab(QString)),
           FormMain::getInstance()->m_ui->m_tabWidget,
           SLOT(addLinkedBrowser(QString)));
   connect(m_feedsView, SIGNAL(feedsSelected(QList<int>)),
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 109f12f34..525391b8a 100644
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -115,11 +115,6 @@ void MessagesView::setupAppearance() {
   setSortingEnabled(true);
   setAllColumnsShowFocus(true);
   setSelectionMode(QAbstractItemView::ExtendedSelection);
-
-  // Make sure that initial sorting is that unread messages are visible
-  // first.
-  // NOTE: This can be rewritten so that it's changeable.
-  sortByColumn(MSG_DB_DCREATED_INDEX, Qt::DescendingOrder);
 }
 
 void MessagesView::keyPressEvent(QKeyEvent *event) {
@@ -222,6 +217,11 @@ void MessagesView::loadFeeds(const QList<int> &feed_ids) {
   // column/order AND possibly hide/show user-defined columns.
   m_sourceModel->loadMessages(feed_ids);
 
+  // Make sure that initial sorting is that unread messages are visible
+  // first.
+  // NOTE: This can be rewritten so that it's changeable.
+  sortByColumn(MSG_DB_DCREATED_INDEX, Qt::DescendingOrder);
+
   // Messages are loaded, make sure that previously
   // active message is not shown in browser.
   emit currentMessagesRemoved();