FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-18 20:01:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Authors info separated.

Browse Source
This commit is contained in:
Martin Rotter 2013-07-30 19:03:21 +02:00
parent c6c19ab43f
commit 4ee5c83501
5 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -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.

9
resources/text/AUTHORS Normal file
View File

@ -0,0 +1,9 @@
<body>
Authors and contributors:
<ul>
<li>Martin Rotter &lt;<a href=\"mailto://rotter.martinos@gmail.com\">rotter.martinos@gmail.com</a>&gt; (author of RSS Guard)</li>
<li>snakebite & tiheum (authors of KFaenza/Faenza icon theme)</li>
<li>Digia Plc (author of QtSingleApplication component)</li>
<li>Artem Galichkin &lt;<a href=\"mailto://doomer3d@gmail.com\">doomer3d@gmail.com</a>&gt; (author of original QKeySequenceWidget component)</li>
</ul>
</body>

4
src/core/basenetworkaccessmanager.cpp
View File

@ -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,

19
src/gui/formabout.cpp
View File

@ -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("<body>"
"Authors and contributors:"
"<ul>"
"<li>Martin Rotter (<a href=\"mailto://rotter.martinos@gmail.com\">rotter.martinos@gmail.com</a>) (author of RSS Guard)</li>"
"<li>snakebite & tiheum (authors of KFaenza/Faenza icon theme)</li>"
"<li>Digia Plc (author of QtSingleApplication component)</li>"
"<li>Artem Galichkin (<a href=\"mailto://doomer3d@gmail.com\">doomer3d@gmail.com</a>) (author of original QKeySequenceWidget component)</li>"
"</ul>"
"</body>"));
m_ui->m_txtInfo->setText(tr("<body>RSS Guard is a (very) tiny feed reader."
"<br><br>This software is distributed under the terms of GNU General Public License, version 3."
"<br><br>Contacts:"

13
src/gui/formabout.ui
View File

@ -107,7 +107,7 @@
<locale language="English" country="UnitedStates"/>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="m_tabInfo">
<attribute name="title">
@ -169,8 +169,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>685</width>
<height>184</height>
<width>98</width>
<height>69</height>
</rect>
</property>
<property name="autoFillBackground">
@ -355,6 +355,13 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="m_lblThanks">
<property name="text">
<string>Thanks to page is available only in English language.</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="m_tabChangelog">