From ebc7c57fcf2df04a3c6d34e61552bbcf1315dd27 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 22 Jun 2016 19:56:32 +0200 Subject: [PATCH] Fixed #12. Also working on broken stringification of some strings. Bumped version. --- resources/text/CHANGELOG | 6 ++++++ resources/text/UPDATES | 2 +- rssguard.pro | 4 ++-- src/definitions/definitions.h | 2 +- src/gui/dialogs/formabout.cpp | 2 +- src/gui/dialogs/formmain.cpp | 10 +++++----- src/gui/dialogs/formupdate.cpp | 2 +- src/gui/tabwidget.cpp | 2 +- .../standard/standardfeedsimportexportmodel.cpp | 2 +- 9 files changed, 19 insertions(+), 13 deletions(-) diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 3d63415e0..7cea31cea 100755 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -1,3 +1,9 @@ +3.3.1 +————— + +Changed: +▪ Changed couple of icons. (bug #12) + 3.3.0 ————— diff --git a/resources/text/UPDATES b/resources/text/UPDATES index d98930214..9981da2ca 100644 --- a/resources/text/UPDATES +++ b/resources/text/UPDATES @@ -1,6 +1,6 @@ - + https://github.com/martinrotter/rssguard/releases/download/3.3.0/rssguard-3.3.0-win32.zip diff --git a/rssguard.pro b/rssguard.pro index 86a48835e..ec99b4d6c 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -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\" diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h index 5e3199b31..04b3aa52c 100755 --- a/src/definitions/definitions.h +++ b/src/definitions/definitions.h @@ -21,7 +21,7 @@ #include #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" diff --git a/src/gui/dialogs/formabout.cpp b/src/gui/dialogs/formabout.cpp index 9d7d754e9..492ad1c45 100755 --- a/src/gui/dialogs/formabout.cpp +++ b/src/gui/dialogs/formabout.cpp @@ -119,7 +119,7 @@ void FormAbout::loadLicenseAndInformation() { "
  • %2 ~website
    • " "You can obtain source code for %5 from its website." "


    Copyright (C) 2011-%3 %4").arg(STRFY(APP_EMAIL), - STRFY(APP_URL), + APP_URL, QString::number(QDateTime::currentDateTime().date().year()), STRFY(APP_AUTHOR), STRFY(APP_NAME))); diff --git a/src/gui/dialogs/formmain.cpp b/src/gui/dialogs/formmain.cpp index b2739c18a..6c24da606 100755 --- a/src/gui/dialogs/formmain.cpp +++ b/src/gui/dialogs/formmain.cpp @@ -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"))); diff --git a/src/gui/dialogs/formupdate.cpp b/src/gui/dialogs/formupdate.cpp index e6a236692..bc5ad181a 100755 --- a/src/gui/dialogs/formupdate.cpp +++ b/src/gui/dialogs/formupdate.cpp @@ -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) { diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp index cdec639c0..232a8ed7e 100755 --- a/src/gui/tabwidget.cpp +++ b/src/gui/tabwidget.cpp @@ -193,7 +193,7 @@ void TabWidget::closeAllTabs() { int TabWidget::addNewspaperView(RootItem *root, const QList &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); diff --git a/src/services/standard/standardfeedsimportexportmodel.cpp b/src/services/standard/standardfeedsimportexportmodel.cpp index 3b0ad0259..cc3d0dca5 100755 --- a/src/services/standard/standardfeedsimportexportmodel.cpp +++ b/src/services/standard/standardfeedsimportexportmodel.cpp @@ -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"));