diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp index 9716ec781..a0189a798 100755 --- a/src/core/messagesmodel.cpp +++ b/src/core/messagesmodel.cpp @@ -81,7 +81,7 @@ void MessagesModel::loadMessages(RootItem *item) { if (!item->getParentServiceRoot()->loadMessagesForItem(item, this)) { setFilter("true != true"); qWarning("Loading of messages from item '%s' failed.", qPrintable(item->title())); - qApp->showGuiMessage(tr("Loading of messages from item '%s' failed.").arg(item->title()), + qApp->showGuiMessage(tr("Loading of messages from item '%1' failed.").arg(item->title()), tr("Loading of messages failed, maybe messages could not be downloaded."), QSystemTrayIcon::Critical, qApp->mainForm(), diff --git a/src/services/tt-rss/ttrssserviceentrypoint.cpp b/src/services/tt-rss/ttrssserviceentrypoint.cpp index 3b02f255e..02c03c88a 100755 --- a/src/services/tt-rss/ttrssserviceentrypoint.cpp +++ b/src/services/tt-rss/ttrssserviceentrypoint.cpp @@ -23,8 +23,10 @@ #include "gui/dialogs/formmain.h" #include "services/tt-rss/gui/formeditaccount.h" #include "services/tt-rss/ttrssserviceroot.h" +#include "services/tt-rss/network/ttrssnetworkfactory.h" #include +#include TtRssServiceEntryPoint::TtRssServiceEntryPoint(){ @@ -72,5 +74,23 @@ ServiceRoot *TtRssServiceEntryPoint::createNewRoot() { } QList TtRssServiceEntryPoint::initializeSubtree() { - return QList(); + // Check DB if standard account is enabled. + QSqlDatabase database = qApp->database()->connection(QSL("TtRssServiceEntryPoint"), DatabaseFactory::FromSettings); + QSqlQuery query(database); + QList roots; + + if (query.exec("SELECT id, username, password, url FROM TtRssAccounts;")) { + while (query.next()) { + TtRssServiceRoot *root = new TtRssServiceRoot(); + root->setAccountId(query.value(0).toInt()); + root->network()->setUsername(query.value(1).toString()); + root->network()->setPassword(query.value(2).toString()); + root->network()->setUrl(query.value(3).toString()); + root->updateTitle(); + root->loadFromDatabase(); + roots.append(root); + } + } + + return roots; } diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/services/tt-rss/ttrssserviceroot.cpp index be64c7dd3..383e2fb0a 100755 --- a/src/services/tt-rss/ttrssserviceroot.cpp +++ b/src/services/tt-rss/ttrssserviceroot.cpp @@ -184,7 +184,7 @@ void TtRssServiceRoot::saveToDatabase() { } void TtRssServiceRoot::loadFromDatabase() { - // Account ID is set, load connection data from DB. + // TODO: Load feeds/categories from DB. } void TtRssServiceRoot::updateTitle() { diff --git a/src/services/tt-rss/ttrssserviceroot.h b/src/services/tt-rss/ttrssserviceroot.h index b57912c79..f6b40ea7e 100755 --- a/src/services/tt-rss/ttrssserviceroot.h +++ b/src/services/tt-rss/ttrssserviceroot.h @@ -67,10 +67,9 @@ class TtRssServiceRoot : public ServiceRoot { void saveToDatabase(); void loadFromDatabase(); - - private: void updateTitle(); + private: TtRssNetworkFactory *m_network; };