FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #12. Also working on broken stringification of some strings. Bumped version.

Browse Source
This commit is contained in:
Martin Rotter 2016-06-22 19:56:32 +02:00
parent b67b24e87e
commit ebc7c57fcf
9 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/text/CHANGELOG
View File

@ -1,3 +1,9 @@
3.3.1
—————
Changed:
▪ Changed couple of icons. (bug #12)
3.3.0
—————

2
resources/text/UPDATES
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<releases>
<release version="3.0.0">
<release version="3.3.0">
<url platform="x86" os="Windows">https://github.com/martinrotter/rssguard/releases/download/3.3.0/rssguard-3.3.0-win32.zip</url>
</release>
</releases>

4
rssguard.pro
View File

@ -69,7 +69,7 @@ APP_LOW_NAME = "rssguard"
APP_LOW_H_NAME = ".rssguard"
APP_AUTHOR = "Martin Rotter"
APP_COPYRIGHT = "(C) 2011-2016 $$APP_AUTHOR"
APP_VERSION = "3.3.0"
APP_VERSION = "3.3.1"
APP_LONG_NAME = "$$APP_NAME $$APP_VERSION"
APP_EMAIL = "rotter.martinos@gmail.com"
APP_URL = "https://github.com/martinrotter/rssguard"
@ -107,7 +107,7 @@ DEFINES += APP_LOW_H_NAME=\"$$APP_LOW_H_NAME\"
DEFINES += APP_LONG_NAME=\"$$APP_LONG_NAME\"
DEFINES += APP_AUTHOR=\"$$APP_AUTHOR\"
DEFINES += APP_EMAIL=\"$$APP_EMAIL\"
DEFINES += APP_URL=\"$$APP_URL\"
DEFINES += APP_URL='"\\\"$$APP_URL\\\""'
DEFINES += APP_URL_ISSUES=\"$$APP_URL_ISSUES\"
DEFINES += APP_URL_ISSUES_NEW_GITHUB=\"$$APP_URL_ISSUES_NEW_GITHUB\"
DEFINES += APP_URL_ISSUES_NEW_BITBUCKET=\"$$APP_URL_ISSUES_NEW_BITBUCKET\"

2
src/definitions/definitions.h
View File

@ -21,7 +21,7 @@
#include <QtGlobal>
#define _STR(x) #x
#define STRFY(x) _STR(x)
#define STRFY(x) _STR(x)
#define SERVICE_CODE_STD_RSS "std-rss"
#define SERVICE_CODE_TT_RSS "tt-rss"

2
src/gui/dialogs/formabout.cpp
View File

@ -119,7 +119,7 @@ void FormAbout::loadLicenseAndInformation() {
"<li><a href=\"%2\">%2</a> ~website</li></ul>"
"You can obtain source code for %5 from its website."
"<br><br><br>Copyright (C) 2011-%3 %4</body>").arg(STRFY(APP_EMAIL),
STRFY(APP_URL),
APP_URL,
QString::number(QDateTime::currentDateTime().date().year()),
STRFY(APP_AUTHOR),
STRFY(APP_NAME)));

10
src/gui/dialogs/formmain.cpp
View File

@ -329,10 +329,10 @@ void FormMain::setupIcons() {
// Setup icons of this main window.
m_ui->m_actionDownloadManager->setIcon(icon_theme_factory->fromTheme(QSL("emblem-downloads")));
m_ui->m_actionSettings->setIcon(icon_theme_factory->fromTheme(QSL("emblem-system")));
m_ui->m_actionSettings->setIcon(icon_theme_factory->fromTheme(QSL("document-properties")));
m_ui->m_actionQuit->setIcon(icon_theme_factory->fromTheme(QSL("application-exit")));
m_ui->m_actionAboutGuard->setIcon(icon_theme_factory->fromTheme(QSL("help-about")));
m_ui->m_actionCheckForUpdates->setIcon(icon_theme_factory->fromTheme(QSL("applications-internet")));
m_ui->m_actionCheckForUpdates->setIcon(icon_theme_factory->fromTheme(QSL("system-upgrade")));
m_ui->m_actionCleanupDatabase->setIcon(icon_theme_factory->fromTheme(QSL("edit-clear")));
m_ui->m_actionReportBug->setIcon(icon_theme_factory->fromTheme(QSL("call-start")));
m_ui->m_actionBackupDatabaseSettings->setIcon(icon_theme_factory->fromTheme(QSL("document-export")));
@ -360,7 +360,7 @@ void FormMain::setupIcons() {
m_ui->m_actionClearAllItems->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-junk")));
m_ui->m_actionDeleteSelectedItem->setIcon(icon_theme_factory->fromTheme(QSL("list-remove")));
m_ui->m_actionDeleteSelectedMessages->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-junk")));
m_ui->m_actionEditSelectedItem->setIcon(icon_theme_factory->fromTheme(QSL("text-x-script")));
m_ui->m_actionEditSelectedItem->setIcon(icon_theme_factory->fromTheme(QSL("document-edit")));
m_ui->m_actionMarkAllItemsRead->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-read")));
m_ui->m_actionMarkSelectedItemsAsRead->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-read")));
m_ui->m_actionMarkSelectedItemsAsUnread->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-unread")));
@ -370,7 +370,7 @@ void FormMain::setupIcons() {
m_ui->m_actionOpenSelectedSourceArticlesExternally->setIcon(icon_theme_factory->fromTheme(QSL("document-open")));
m_ui->m_actionOpenSelectedMessagesInternally->setIcon(icon_theme_factory->fromTheme(QSL("document-open")));
m_ui->m_actionSendMessageViaEmail->setIcon(icon_theme_factory->fromTheme(QSL("mail-send")));
m_ui->m_actionViewSelectedItemsNewspaperMode->setIcon(icon_theme_factory->fromTheme(QSL("text-x-generic")));
m_ui->m_actionViewSelectedItemsNewspaperMode->setIcon(icon_theme_factory->fromTheme(QSL("format-justify-fill")));
m_ui->m_actionSelectNextItem->setIcon(icon_theme_factory->fromTheme(QSL("go-down")));
m_ui->m_actionSelectPreviousItem->setIcon(icon_theme_factory->fromTheme(QSL("go-up")));
m_ui->m_actionSelectNextMessage->setIcon(icon_theme_factory->fromTheme(QSL("go-down")));
@ -382,7 +382,7 @@ void FormMain::setupIcons() {
m_ui->m_actionRestoreAllRecycleBins->setIcon(icon_theme_factory->fromTheme(QSL("view-refresh")));
m_ui->m_actionEmptyAllRecycleBins->setIcon(icon_theme_factory->fromTheme(QSL("edit-clear")));
m_ui->m_actionServiceAdd->setIcon(icon_theme_factory->fromTheme(QSL("list-add")));
m_ui->m_actionServiceEdit->setIcon(icon_theme_factory->fromTheme(QSL("text-x-script")));
m_ui->m_actionServiceEdit->setIcon(icon_theme_factory->fromTheme(QSL("document-edit")));
m_ui->m_actionServiceDelete->setIcon(icon_theme_factory->fromTheme(QSL("list-remove")));
m_ui->m_actionAddFeedIntoSelectedAccount->setIcon(icon_theme_factory->fromTheme(QSL("application-rss+xml")));
m_ui->m_actionAddCategoryIntoSelectedAccount->setIcon(icon_theme_factory->fromTheme(QSL("folder")));

2
src/gui/dialogs/formupdate.cpp
View File

@ -173,7 +173,7 @@ void FormUpdate::startUpdate() {
url_file = m_updateInfo.m_urls.value(OS_ID).m_fileUrl;
}
else {
url_file = STRFY(APP_URL);
url_file = APP_URL;
}
if (m_readyToInstall) {

2
src/gui/tabwidget.cpp
View File

@ -193,7 +193,7 @@ void TabWidget::closeAllTabs() {
int TabWidget::addNewspaperView(RootItem *root, const QList<Message> &messages) {
WebBrowser *prev = new WebBrowser(this);
int index = addTab(prev, qApp->icons()->fromTheme(QSL("text-x-script")), tr("Newspaper view"), TabBar::Closable);
int index = addTab(prev, qApp->icons()->fromTheme(QSL("format-justify-fill")), tr("Newspaper view"), TabBar::Closable);
setCurrentIndex(index);
prev->loadMessages(messages, root);

2
src/services/standard/standardfeedsimportexportmodel.cpp
View File

@ -52,7 +52,7 @@ bool FeedsImportExportModel::exportToOMPL20(QByteArray &result) {
// Added OPML 2.0 metadata.
opml_document.appendChild(opml_document.createElement(QSL("opml")));
opml_document.documentElement().setAttribute(QSL("version"), QSL("version"));
opml_document.documentElement().setAttribute("xmlns:rssguard", STRFY(APP_URL));
opml_document.documentElement().setAttribute("xmlns:rssguard", APP_URL);
QDomElement elem_opml_head = opml_document.createElement(QSL("head"));