diff --git a/CMakeLists.txt b/CMakeLists.txt index 01847c924..1420b42ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,6 +257,7 @@ set(APP_MISC resources/text/COPYING_GNU_GPL resources/text/COPYING_GNU_GPL_HTML resources/text/COPYING_BSD + resources/text/AUTHORS ) # Wrap files, create moc files. diff --git a/resources/text/AUTHORS b/resources/text/AUTHORS new file mode 100644 index 000000000..85373560c --- /dev/null +++ b/resources/text/AUTHORS @@ -0,0 +1,9 @@ + +Authors and contributors: + + \ No newline at end of file diff --git a/src/core/basenetworkaccessmanager.cpp b/src/core/basenetworkaccessmanager.cpp index eed022d82..b3ee57fca 100644 --- a/src/core/basenetworkaccessmanager.cpp +++ b/src/core/basenetworkaccessmanager.cpp @@ -15,6 +15,8 @@ BaseNetworkAccessManager::~BaseNetworkAccessManager() { } void BaseNetworkAccessManager::loadSettings() { + qDebug("Settings of BaseNetworkAccessManager changed."); + QNetworkProxy new_proxy; // Load proxy values from settings. @@ -38,8 +40,6 @@ void BaseNetworkAccessManager::loadSettings() { new_proxy.setPassword(Settings::getInstance()->value(APP_CFG_PROXY, "password").toString()); setProxy(new_proxy); - - qDebug("Settings of BaseNetworkAccessManager changed."); } QNetworkReply *BaseNetworkAccessManager::createRequest(QNetworkAccessManager::Operation op, diff --git a/src/gui/formabout.cpp b/src/gui/formabout.cpp index b48da8a0a..6d78c1921 100644 --- a/src/gui/formabout.cpp +++ b/src/gui/formabout.cpp @@ -37,6 +37,15 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) } file.close(); + file.setFileName(APP_INFO_PATH + "/AUTHORS"); + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { + m_ui->m_txtThanks->setText(str.readAll()); + } + else { + m_ui->m_txtThanks->setText(tr("Authors information not found.")); + } + file.close(); + file.setFileName(APP_INFO_PATH + "/CHANGELOG"); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { m_ui->m_txtChangelog->setText(str.readAll()); @@ -61,16 +70,6 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) qVersion(), APP_NAME)); - m_ui->m_txtThanks->setText(tr("" - "Authors and contributors:" - "" - "")); - m_ui->m_txtInfo->setText(tr("RSS Guard is a (very) tiny feed reader." "

This software is distributed under the terms of GNU General Public License, version 3." "

Contacts:" diff --git a/src/gui/formabout.ui b/src/gui/formabout.ui index a4a623c8a..2626c7754 100644 --- a/src/gui/formabout.ui +++ b/src/gui/formabout.ui @@ -107,7 +107,7 @@ - 1 + 0 @@ -169,8 +169,8 @@ p, li { white-space: pre-wrap; } 0 0 - 685 - 184 + 98 + 69 @@ -355,6 +355,13 @@ p, li { white-space: pre-wrap; } + + + + Thanks to page is available only in English language. + + +