From d5ccfd86695527a244cf5e164c67fa031167fb05 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Thu, 3 Dec 2015 13:03:29 +0100
Subject: [PATCH] Version bumped.

---
 CMakeLists.txt                                |  4 ++--
 resources/text/CHANGELOG                      |  2 +-
 src/core/rootitem.cpp                         | 12 ++++++++++
 src/services/abstract/recyclebin.cpp          |  2 +-
 src/services/standard/standardcategory.cpp    |  6 +----
 src/services/standard/standardfeed.cpp        |  6 +----
 src/services/standard/standardserviceroot.cpp |  6 +----
 src/services/tt-rss/gui/formeditaccount.cpp   | 23 +++++++++++--------
 src/services/tt-rss/ttrssserviceroot.cpp      | 16 ++++++++-----
 9 files changed, 43 insertions(+), 34 deletions(-)
 mode change 100644 => 100755 src/services/abstract/recyclebin.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a49c1871..1246d12a8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,8 +65,8 @@ project(rssguard)
 
 set(APP_NAME "RSS Guard")
 set(APP_LOW_NAME "rssguard")
-set(APP_VERSION "2.5.3")
-set(FILE_VERSION "2,5,3,0")
+set(APP_VERSION "2.6.0")
+set(FILE_VERSION "2,6,0,0")
 set(APP_AUTHOR "Martin Rotter")
 set(APP_URL "http://bitbucket.org/skunkos/rssguard")
 set(APP_URL_ISSUES "http://bitbucket.org/skunkos/rssguard/issues")
diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 045a7e7d5..9da0d179d 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -12,7 +12,7 @@
 	  </style>
 	</head>
 	<body>
-  	<center><h2>2.5.3</h2></center>
+  	<center><h2>2.6.0</h2></center>
 		
 	  Added:
 	  <ul>
diff --git a/src/core/rootitem.cpp b/src/core/rootitem.cpp
index d2c78a5e3..ff9b3ed8a 100755
--- a/src/core/rootitem.cpp
+++ b/src/core/rootitem.cpp
@@ -115,6 +115,18 @@ QVariant RootItem::data(int column, int role) const {
   Q_UNUSED(role)
 
   switch (role) {
+    case Qt::ToolTipRole:
+      if (column == FDS_MODEL_TITLE_INDEX) {
+        return m_title;
+      }
+      else if (column == FDS_MODEL_COUNTS_INDEX) {
+        //: Tooltip for "unread" column of feed list.
+        return tr("%n unread message(s).", 0, countOfUnreadMessages());
+      }
+      else {
+        return QVariant();
+      }
+
     case Qt::EditRole:
       if (column == FDS_MODEL_TITLE_INDEX) {
         return m_title;
diff --git a/src/services/abstract/recyclebin.cpp b/src/services/abstract/recyclebin.cpp
old mode 100644
new mode 100755
index 042c5c989..dc29f0117
--- a/src/services/abstract/recyclebin.cpp
+++ b/src/services/abstract/recyclebin.cpp
@@ -35,7 +35,7 @@ RecycleBin::~RecycleBin() {
 QVariant RecycleBin::data(int column, int role) const {
   switch (role) {
     case Qt::ToolTipRole:
-      return tr("Recycle bin\n%1").arg(tr("%n deleted message(s).", 0, countOfAllMessages()));
+      return tr("Recycle bin\n\n%1").arg(tr("%n deleted message(s).", 0, countOfAllMessages()));
 
     default:
       return RootItem::data(column, role);
diff --git a/src/services/standard/standardcategory.cpp b/src/services/standard/standardcategory.cpp
index 1aabaa01f..8c7add25c 100755
--- a/src/services/standard/standardcategory.cpp
+++ b/src/services/standard/standardcategory.cpp
@@ -77,12 +77,8 @@ QVariant StandardCategory::data(int column, int role) const {
                                 tr("\nThis category does not contain any nested items.") :
                                 QString());
       }
-      else if (column == FDS_MODEL_COUNTS_INDEX) {
-        //: Tooltip for "unread" column of feed list.
-        return tr("%n unread message(s).", "", countOfUnreadMessages());
-      }
       else {
-        return QVariant();
+        return Category::data(column, role);
       }
 
     default:
diff --git a/src/services/standard/standardfeed.cpp b/src/services/standard/standardfeed.cpp
index bfc240d00..09107d65f 100755
--- a/src/services/standard/standardfeed.cpp
+++ b/src/services/standard/standardfeed.cpp
@@ -416,12 +416,8 @@ QVariant StandardFeed::data(int column, int role) const {
                                                 auto_update_string,
                                                 NetworkFactory::networkErrorText(m_networkError));
       }
-      else if (column == FDS_MODEL_COUNTS_INDEX) {
-        //: Tooltip for "unread" column of feed list.
-        return tr("%n unread message(s).", 0, countOfUnreadMessages());
-      }
       else {
-        return QVariant();
+        return Feed::data(column, role);
       }
 
     case Qt::ForegroundRole:
diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp
index 6dfa10890..ec9c7d861 100755
--- a/src/services/standard/standardserviceroot.cpp
+++ b/src/services/standard/standardserviceroot.cpp
@@ -144,12 +144,8 @@ QVariant StandardServiceRoot::data(int column, int role) const {
       if (column == FDS_MODEL_TITLE_INDEX) {
         return tr("This is service account for standard RSS/RDF/ATOM feeds.\n\nAccount ID: %1").arg(accountId());
       }
-      else if (column == FDS_MODEL_COUNTS_INDEX) {
-        //: Tooltip for "unread" column of feed list.
-        return tr("%n unread message(s).", 0, countOfUnreadMessages());
-      }
       else {
-        return QVariant();
+        return ServiceRoot::data(column, role);
       }
 
     default:
diff --git a/src/services/tt-rss/gui/formeditaccount.cpp b/src/services/tt-rss/gui/formeditaccount.cpp
index 36f543f9b..fbfb43375 100755
--- a/src/services/tt-rss/gui/formeditaccount.cpp
+++ b/src/services/tt-rss/gui/formeditaccount.cpp
@@ -32,9 +32,9 @@ FormEditAccount::FormEditAccount(QWidget *parent)
   setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint);
   setWindowIcon(qApp->icons()->fromTheme(QSL("application-ttrss")));
 
-  m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your TT-RSS account."));
-  m_ui->m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your TT-RSS account."));
-  m_ui->m_txtUrl->lineEdit()->setPlaceholderText(tr("FULL URL of your TT-RSS instance WITH trailing \"/api/\" string."));
+  m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your TT-RSS account"));
+  m_ui->m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your TT-RSS account"));
+  m_ui->m_txtUrl->lineEdit()->setPlaceholderText(tr("FULL URL of your TT-RSS instance WITH trailing \"/api/\" string"));
   m_ui->m_lblTestResult->setStatus(WidgetWithStatus::Information,
                                    tr("No test done yet."),
                                    tr("Here, results of connection test are shown."));
@@ -48,12 +48,12 @@ FormEditAccount::FormEditAccount(QWidget *parent)
   connect(m_ui->m_checkShowPassword, SIGNAL(toggled(bool)), this, SLOT(displayPassword(bool)));
   connect(m_ui->m_buttonBox, SIGNAL(accepted()), this, SLOT(onClickedOk()));
   connect(m_ui->m_buttonBox, SIGNAL(rejected()), this, SLOT(onClickedCancel()));
-  connect(m_ui->m_txtPassword->lineEdit(), SIGNAL(textEdited(QString)), this, SLOT(onPasswordChanged()));
-  connect(m_ui->m_txtUsername->lineEdit(), SIGNAL(textEdited(QString)), this, SLOT(onUsernameChanged()));
-  connect(m_ui->m_txtUrl->lineEdit(), SIGNAL(textEdited(QString)), this, SLOT(onUrlChanged()));
-  connect(m_ui->m_txtPassword->lineEdit(), SIGNAL(textEdited(QString)), this, SLOT(checkOkButton()));
-  connect(m_ui->m_txtUsername->lineEdit(), SIGNAL(textEdited(QString)), this, SLOT(checkOkButton()));
-  connect(m_ui->m_txtUrl->lineEdit(), SIGNAL(textEdited(QString)), this, SLOT(checkOkButton()));
+  connect(m_ui->m_txtPassword->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onPasswordChanged()));
+  connect(m_ui->m_txtUsername->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onUsernameChanged()));
+  connect(m_ui->m_txtUrl->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onUrlChanged()));
+  connect(m_ui->m_txtPassword->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkOkButton()));
+  connect(m_ui->m_txtUsername->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkOkButton()));
+  connect(m_ui->m_txtUrl->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkOkButton()));
   connect(m_ui->m_btnTestSetup, SIGNAL(clicked()), this, SLOT(performTest()));
 
   onPasswordChanged();
@@ -76,6 +76,11 @@ TtRssServiceRoot *FormEditAccount::execForCreate() {
 void FormEditAccount::execForEdit(TtRssServiceRoot *existing_root) {
   setWindowTitle(tr("Edit existing Tiny Tiny RSS account"));
   m_editableRoot = existing_root;
+
+  m_ui->m_txtUsername->lineEdit()->setText(existing_root->network()->username());
+  m_ui->m_txtPassword->lineEdit()->setText(existing_root->network()->password());
+  m_ui->m_txtUrl->lineEdit()->setText(existing_root->network()->url());
+
   exec();
 }
 
diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/services/tt-rss/ttrssserviceroot.cpp
index 383e2fb0a..dc419e6bf 100755
--- a/src/services/tt-rss/ttrssserviceroot.cpp
+++ b/src/services/tt-rss/ttrssserviceroot.cpp
@@ -19,11 +19,14 @@
 
 #include "miscellaneous/application.h"
 #include "miscellaneous/settings.h"
+#include "gui/dialogs/formmain.h"
 #include "services/tt-rss/ttrssserviceentrypoint.h"
 #include "services/tt-rss/network/ttrssnetworkfactory.h"
+#include "services/tt-rss/gui/formeditaccount.h"
 
 #include <QSqlQuery>
 #include <QSqlError>
+#include <QPointer>
 
 
 TtRssServiceRoot::TtRssServiceRoot(RootItem *parent)
@@ -51,6 +54,9 @@ QString TtRssServiceRoot::code() {
 }
 
 bool TtRssServiceRoot::editViaGui() {
+  QPointer<FormEditAccount> form_pointer = new FormEditAccount(qApp->mainForm());
+  form_pointer.data()->execForEdit(this);
+  delete form_pointer.data();
   return false;
 }
 
@@ -71,14 +77,12 @@ QVariant TtRssServiceRoot::data(int column, int role) const {
     case Qt::ToolTipRole:
       // TODO: zobrazovat pokročile informace a statistiky.
       if (column == FDS_MODEL_TITLE_INDEX) {
-        return tr("This is service account TT-RSS (TinyTiny RSS) server.");
-      }
-      else if (column == FDS_MODEL_COUNTS_INDEX) {
-        //: Tooltip for "unread" column of feed list.
-        return tr("%n unread message(s).", 0, countOfUnreadMessages());
+        return tr("Tiny Tiny RSS\n\nAccount ID: %3\nUsername: %1\nServer: %2").arg(m_network->username(),
+                                                                                   m_network->url(),
+                                                                                   QString::number(accountId()));
       }
       else {
-        return QVariant();
+        return ServiceRoot::data(column, role);
       }
 
     default:
