diff --git a/resources/rssguard.qrc b/resources/rssguard.qrc index 9632c12dc..c963c38ad 100755 --- a/resources/rssguard.qrc +++ b/resources/rssguard.qrc @@ -1,125 +1,124 @@ - - text/CHANGELOG - text/COPYING_BSD - text/COPYING_MIT - text/COPYING_GNU_GPL - text/COPYING_GNU_GPL_HTML + + text/CHANGELOG + text/COPYING_MIT + text/COPYING_GNU_GPL + text/COPYING_GNU_GPL_HTML - sounds/boing.wav - sounds/rooster.wav - sounds/sheep.wav + sounds/boing.wav + sounds/rooster.wav + sounds/sheep.wav - scripts/adblock/adblock-server.js - scripts/public_suffix_list.dat - - graphics/rssguard.ico + scripts/adblock/adblock-server.js + scripts/public_suffix_list.dat - graphics/rssguard.png - graphics/rssguard_plain.png + graphics/rssguard.ico - graphics/rssguard_mono.png - graphics/rssguard_plain_mono.png + graphics/rssguard.png + graphics/rssguard_plain.png - graphics/misc/adblock.png - graphics/misc/adblock-disabled.png - graphics/misc/bazqux.png - graphics/misc/feedly.png - graphics/misc/freshrss.png - graphics/misc/gmail.png - graphics/misc/google.png - graphics/misc/image-placeholder.png - graphics/misc/inoreader.png - graphics/misc/nextcloud.png - graphics/misc/reedah.png - graphics/misc/theoldreader.png - graphics/misc/tt-rss.png - - graphics/misc/flags/cs.png - graphics/misc/flags/da.png - graphics/misc/flags/de.png - graphics/misc/flags/en.png - graphics/misc/flags/en_GB.png - graphics/misc/flags/es.png - graphics/misc/flags/fi.png - graphics/misc/flags/fr.png - graphics/misc/flags/gl.png - graphics/misc/flags/he.png - graphics/misc/flags/id.png - graphics/misc/flags/it.png - graphics/misc/flags/ja.png - graphics/misc/flags/lt.png - graphics/misc/flags/nl.png - graphics/misc/flags/pl.png - graphics/misc/flags/pt_BR.png - graphics/misc/flags/pt_PT.png - graphics/misc/flags/ru.png - graphics/misc/flags/sv.png - graphics/misc/flags/uk.png - graphics/misc/flags/zh_CN.png - graphics/misc/flags/zh_TW.png - - skins/dark/html_adblocked.html - skins/dark/html_enclosure_every.html - skins/dark/html_enclosure_image.html - skins/dark/html_single_message.html - skins/dark/html_wrapper.html - skins/dark/metadata.xml - skins/dark/theme.css - - skins/vergilius/html_adblocked.html - skins/vergilius/html_enclosure_every.html - skins/vergilius/html_enclosure_image.html - skins/vergilius/html_single_message.html - skins/vergilius/html_wrapper.html - skins/vergilius/metadata.xml - skins/vergilius/theme.css - - initial_feeds/feeds-en.opml - - desktop/com.github.rssguard.desktop - desktop/com.github.rssguard.desktop.autostart - - ../localization/rssguard_cs.qm - ../localization/rssguard_da.qm - ../localization/rssguard_de.qm - ../localization/rssguard_en.qm - ../localization/rssguard_en_GB.qm - ../localization/rssguard_es.qm - ../localization/rssguard_fi.qm - ../localization/rssguard_fr.qm - ../localization/rssguard_gl.qm - ../localization/rssguard_he.qm - ../localization/rssguard_id.qm - ../localization/rssguard_it.qm - ../localization/rssguard_ja.qm - ../localization/rssguard_lt.qm - ../localization/rssguard_nl.qm - ../localization/rssguard_pl.qm - ../localization/rssguard_pt_BR.qm - ../localization/rssguard_pt_PT.qm - ../localization/rssguard_ru.qm - ../localization/rssguard_sv.qm - ../localization/rssguard_uk.qm - ../localization/rssguard_zh_CN.qm - ../localization/rssguard_zh_TW.qm + graphics/rssguard_mono.png + graphics/rssguard_plain_mono.png - ../localization/qtbase_cs.qm - ../localization/qtbase_da.qm - ../localization/qtbase_de.qm - ../localization/qtbase_es.qm - ../localization/qtbase_fi.qm - ../localization/qtbase_fr.qm - ../localization/qtbase_it.qm - ../localization/qtbase_ja.qm - ../localization/qtbase_lt.qm - ../localization/qtbase_pl.qm - ../localization/qtbase_pt_BR.qm - ../localization/qtbase_pt_PT.qm - ../localization/qtbase_ru.qm - ../localization/qtbase_sv.qm - ../localization/qtbase_uk.qm - ../localization/qtbase_zh_CN.qm - ../localization/qtbase_zh_TW.qm - - + graphics/misc/adblock.png + graphics/misc/adblock-disabled.png + graphics/misc/bazqux.png + graphics/misc/feedly.png + graphics/misc/freshrss.png + graphics/misc/gmail.png + graphics/misc/google.png + graphics/misc/image-placeholder.png + graphics/misc/inoreader.png + graphics/misc/nextcloud.png + graphics/misc/reedah.png + graphics/misc/theoldreader.png + graphics/misc/tt-rss.png + + graphics/misc/flags/cs.png + graphics/misc/flags/da.png + graphics/misc/flags/de.png + graphics/misc/flags/en.png + graphics/misc/flags/en_GB.png + graphics/misc/flags/es.png + graphics/misc/flags/fi.png + graphics/misc/flags/fr.png + graphics/misc/flags/gl.png + graphics/misc/flags/he.png + graphics/misc/flags/id.png + graphics/misc/flags/it.png + graphics/misc/flags/ja.png + graphics/misc/flags/lt.png + graphics/misc/flags/nl.png + graphics/misc/flags/pl.png + graphics/misc/flags/pt_BR.png + graphics/misc/flags/pt_PT.png + graphics/misc/flags/ru.png + graphics/misc/flags/sv.png + graphics/misc/flags/uk.png + graphics/misc/flags/zh_CN.png + graphics/misc/flags/zh_TW.png + + skins/dark/html_adblocked.html + skins/dark/html_enclosure_every.html + skins/dark/html_enclosure_image.html + skins/dark/html_single_message.html + skins/dark/html_wrapper.html + skins/dark/metadata.xml + skins/dark/theme.css + + skins/vergilius/html_adblocked.html + skins/vergilius/html_enclosure_every.html + skins/vergilius/html_enclosure_image.html + skins/vergilius/html_single_message.html + skins/vergilius/html_wrapper.html + skins/vergilius/metadata.xml + skins/vergilius/theme.css + + initial_feeds/feeds-en.opml + + desktop/com.github.rssguard.desktop + desktop/com.github.rssguard.desktop.autostart + + ../localization/rssguard_cs.qm + ../localization/rssguard_da.qm + ../localization/rssguard_de.qm + ../localization/rssguard_en.qm + ../localization/rssguard_en_GB.qm + ../localization/rssguard_es.qm + ../localization/rssguard_fi.qm + ../localization/rssguard_fr.qm + ../localization/rssguard_gl.qm + ../localization/rssguard_he.qm + ../localization/rssguard_id.qm + ../localization/rssguard_it.qm + ../localization/rssguard_ja.qm + ../localization/rssguard_lt.qm + ../localization/rssguard_nl.qm + ../localization/rssguard_pl.qm + ../localization/rssguard_pt_BR.qm + ../localization/rssguard_pt_PT.qm + ../localization/rssguard_ru.qm + ../localization/rssguard_sv.qm + ../localization/rssguard_uk.qm + ../localization/rssguard_zh_CN.qm + ../localization/rssguard_zh_TW.qm + + ../localization/qtbase_cs.qm + ../localization/qtbase_da.qm + ../localization/qtbase_de.qm + ../localization/qtbase_es.qm + ../localization/qtbase_fi.qm + ../localization/qtbase_fr.qm + ../localization/qtbase_it.qm + ../localization/qtbase_ja.qm + ../localization/qtbase_lt.qm + ../localization/qtbase_pl.qm + ../localization/qtbase_pt_BR.qm + ../localization/qtbase_pt_PT.qm + ../localization/qtbase_ru.qm + ../localization/qtbase_sv.qm + ../localization/qtbase_uk.qm + ../localization/qtbase_zh_CN.qm + ../localization/qtbase_zh_TW.qm + + \ No newline at end of file diff --git a/resources/text/COPYING_BSD b/resources/text/COPYING_BSD deleted file mode 100644 index 076139365..000000000 --- a/resources/text/COPYING_BSD +++ /dev/null @@ -1,30 +0,0 @@ -Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -Contact: http://www.qt-project.org/legal -QtSingleApplication is part of the Qt Solutions component. - -You may use this file under the terms of the BSD license as follows: - -"Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." \ No newline at end of file diff --git a/src/librssguard/gui/dialogs/formabout.cpp b/src/librssguard/gui/dialogs/formabout.cpp index 445da145b..910f56262 100644 --- a/src/librssguard/gui/dialogs/formabout.cpp +++ b/src/librssguard/gui/dialogs/formabout.cpp @@ -63,13 +63,6 @@ void FormAbout::loadLicenseAndInformation() { m_ui.m_txtChangelog->setText(tr("Changelog not found.")); } - try { - m_ui.m_txtLicenseBsd->setText(IOFactory::readFile(APP_INFO_PATH + QL1S("/COPYING_BSD"))); - } - catch (...) { - m_ui.m_txtLicenseBsd->setText(tr("License not found.")); - } - try { m_ui.m_txtLicenseMit->setText(IOFactory::readFile(APP_INFO_PATH + QL1S("/COPYING_MIT"))); } diff --git a/src/librssguard/gui/dialogs/formabout.ui b/src/librssguard/gui/dialogs/formabout.ui index bfd5ace83..865d86497 100644 --- a/src/librssguard/gui/dialogs/formabout.ui +++ b/src/librssguard/gui/dialogs/formabout.ui @@ -92,7 +92,7 @@ - 0 + 1 @@ -160,7 +160,7 @@ p, li { white-space: pre-wrap; } 0 0 685 - 157 + 184 @@ -218,76 +218,6 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html> - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - true - - - - - - - - - 0 - 0 - 98 - 69 - - - - BSD License (applies to QtSingleApplication source code) - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - DejaVu Sans Mono - - - - - - - QFrame::NoFrame - - - Qt::ScrollBarAlwaysOff - - - QTextEdit::AutoNone - - - false - - - QTextEdit::WidgetWidth - - - true - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html> @@ -305,7 +235,7 @@ p, li { white-space: pre-wrap; } 0 0 - 98 + 83 69 @@ -512,7 +442,6 @@ p, li { white-space: pre-wrap; } m_txtPathsSettingsFile m_txtPathsDatabaseRoot m_txtPathsSkinsRoot - m_txtLicenseBsd diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp index 5b1921cd2..2e28aa6bb 100644 --- a/src/librssguard/gui/messagesview.cpp +++ b/src/librssguard/gui/messagesview.cpp @@ -71,8 +71,8 @@ QByteArray MessagesView::saveHeaderState() const { return arr; } -void MessagesView::restoreHeaderState(const QByteArray& data) { - QByteArray arr = data; +void MessagesView::restoreHeaderState(const QByteArray& dta) { + QByteArray arr = dta; QDataStream inn(&arr, QIODevice::OpenModeFlag::ReadOnly); inn.setVersion(QDataStream::Version::Qt_4_7); diff --git a/src/librssguard/gui/messagesview.h b/src/librssguard/gui/messagesview.h index bf3f17a4a..451056106 100644 --- a/src/librssguard/gui/messagesview.h +++ b/src/librssguard/gui/messagesview.h @@ -25,7 +25,7 @@ class MessagesView : public QTreeView { void reloadFontSettings(); QByteArray saveHeaderState() const; - void restoreHeaderState(const QByteArray& data); + void restoreHeaderState(const QByteArray& dta); public slots: void keyboardSearch(const QString& search);