diff --git a/resources/docs/Documentation.md b/resources/docs/Documentation.md index 180dcac8b..94efa5a13 100644 --- a/resources/docs/Documentation.md +++ b/resources/docs/Documentation.md @@ -233,4 +233,6 @@ To redirect debug output of RSS Guard to log file, do this: 2. Navigate to your RSS Guard installation folder. 3. Enter `rssguard.exe --log 'log.txt'`. RSS Guard will now start. You can of course specify arbitrary file where to store log and its location must be writable. 4. Now try to simulate your problem. -5. Attach generated `log.txt` file to your bug report. \ No newline at end of file +5. Attach generated `log.txt` file to your bug report. + +On Windows, there are some problems if you want to see debug output of a GUI program, because Windows does not support "dual" applications. You can, however, display application's debug console output with PowerShell, specifically for RSS Guard like this: `.\rssguard.exe | Out-Default`. Just run this stuff when you are in RSS Guard's folder and you should see console output directly in your PowerShell window. \ No newline at end of file diff --git a/src/librssguard/services/abstract/gui/formaccountdetails.h b/src/librssguard/services/abstract/gui/formaccountdetails.h index e0e766373..204e2e305 100644 --- a/src/librssguard/services/abstract/gui/formaccountdetails.h +++ b/src/librssguard/services/abstract/gui/formaccountdetails.h @@ -15,6 +15,9 @@ class FormAccountDetails : public QDialog { public: explicit FormAccountDetails(const QIcon& icon, QWidget* parent = nullptr); + template + T* account() const; + protected slots: // Applies changes. @@ -40,4 +43,9 @@ class FormAccountDetails : public QDialog { ServiceRoot* m_account; }; +template +inline T* FormAccountDetails::account() const { + return qobject_cast(m_account); +} + #endif // FORMACCOUNTDETAILS_H diff --git a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp index 23673b5cc..60178f4cb 100644 --- a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp +++ b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp @@ -24,7 +24,7 @@ TtRssServiceRoot* FormEditTtRssAccount::addEditAccount(TtRssServiceRoot* account } exec(); - return ttRssAccount(); + return account(); } void FormEditTtRssAccount::apply() { @@ -39,22 +39,22 @@ void FormEditTtRssAccount::apply() { editing_account = false; } - ttRssAccount()->network()->setUrl(m_details->m_ui.m_txtUrl->lineEdit()->text()); - ttRssAccount()->network()->setUsername(m_details->m_ui.m_txtUsername->lineEdit()->text()); - ttRssAccount()->network()->setPassword(m_details->m_ui.m_txtPassword->lineEdit()->text()); - ttRssAccount()->network()->setAuthIsUsed(m_details->m_ui.m_gbHttpAuthentication->isChecked()); - ttRssAccount()->network()->setAuthUsername(m_details->m_ui.m_txtHttpUsername->lineEdit()->text()); - ttRssAccount()->network()->setAuthPassword(m_details->m_ui.m_txtHttpPassword->lineEdit()->text()); - ttRssAccount()->network()->setForceServerSideUpdate(m_details->m_ui.m_checkServerSideUpdate->isChecked()); - ttRssAccount()->network()->setDownloadOnlyUnreadMessages(m_details->m_ui.m_checkDownloadOnlyUnreadMessages->isChecked()); + account()->network()->setUrl(m_details->m_ui.m_txtUrl->lineEdit()->text()); + account()->network()->setUsername(m_details->m_ui.m_txtUsername->lineEdit()->text()); + account()->network()->setPassword(m_details->m_ui.m_txtPassword->lineEdit()->text()); + account()->network()->setAuthIsUsed(m_details->m_ui.m_gbHttpAuthentication->isChecked()); + account()->network()->setAuthUsername(m_details->m_ui.m_txtHttpUsername->lineEdit()->text()); + account()->network()->setAuthPassword(m_details->m_ui.m_txtHttpPassword->lineEdit()->text()); + account()->network()->setForceServerSideUpdate(m_details->m_ui.m_checkServerSideUpdate->isChecked()); + account()->network()->setDownloadOnlyUnreadMessages(m_details->m_ui.m_checkDownloadOnlyUnreadMessages->isChecked()); - ttRssAccount()->saveAccountDataToDatabase(); + account()->saveAccountDataToDatabase(); accept(); if (editing_account) { - ttRssAccount()->network()->logout(); - ttRssAccount()->completelyRemoveAllData(); - ttRssAccount()->syncIn(); + account()->network()->logout(); + account()->completelyRemoveAllData(); + account()->syncIn(); } } @@ -72,7 +72,3 @@ void FormEditTtRssAccount::setEditableAccount(ServiceRoot* editable_account) { m_details->m_ui.m_checkServerSideUpdate->setChecked(existing_root->network()->forceServerSideUpdate()); m_details->m_ui.m_checkDownloadOnlyUnreadMessages->setChecked(existing_root->network()->downloadOnlyUnreadMessages()); } - -TtRssServiceRoot* FormEditTtRssAccount::ttRssAccount() const { - return qobject_cast(m_account); -} diff --git a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h index 1eb138baf..10efb4a8f 100644 --- a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h +++ b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h @@ -23,9 +23,6 @@ class FormEditTtRssAccount : public FormAccountDetails { protected: virtual void setEditableAccount(ServiceRoot* editable_account); - private: - TtRssServiceRoot* ttRssAccount() const; - private: TtRssAccountDetails* m_details; };