From 8af1f2dfe43b85468bd3744084cf45b07cadadde Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 27 Nov 2020 11:24:43 +0100 Subject: [PATCH] =?UTF-8?q?Change=20to=20deployment,=20do=20not=20deploy?= =?UTF-8?q?=20via=20absolute=20path,=20makes=20DMG=20path=20structure=20ug?= =?UTF-8?q?ly.=20Refacroting,=20removed=20old=20Qt=20S-S=20syntax.=C2=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- resources/scripts/.travis-install-osx.sh | 4 ++-- .../skins/vergilius/html_enclosure_every.html | 2 +- .../skins/vergilius/html_single_message.html | 2 +- src/librssguard/gui/dialogs/formmain.cpp | 4 +++- .../gui/dialogs/formrestoredatabasesettings.cpp | 11 +++++++---- src/librssguard/gui/messagestoolbar.cpp | 4 ++-- src/librssguard/gui/messagesview.cpp | 2 +- src/librssguard/gui/systemtrayicon.cpp | 4 ++-- src/librssguard/gui/treewidget.cpp | 2 +- src/librssguard/gui/webviewer.cpp | 2 +- .../network-web/adblock/adblockdialog.cpp | 2 +- .../network-web/adblock/adblockicon.cpp | 16 ++++++++++------ .../network-web/adblock/adblockmanager.cpp | 4 ++-- .../network-web/adblock/adblocksubscription.cpp | 8 ++++---- .../network-web/adblock/adblocktreewidget.cpp | 13 +++++++------ src/librssguard/network-web/webfactory.cpp | 4 +++- .../standard/gui/formstandardcategorydetails.cpp | 12 +++++++----- 18 files changed, 57 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index d320ac293..6265b37da 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ # Other files. *.autosave *.user* -localization/*qm \ No newline at end of file +localization/*qm +*.TMP \ No newline at end of file diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh index 4e9c34f6a..09923c7bf 100755 --- a/resources/scripts/.travis-install-osx.sh +++ b/resources/scripts/.travis-install-osx.sh @@ -28,8 +28,8 @@ install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dyli install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dylib" "rssguard" otool -L "RSS Guard.app/Contents/MacOS/rssguard" - -make dmg +macdeployqt "./RSS Guard.app" -dmg +#make dmg # Rename DMG. set -- *.dmg diff --git a/resources/skins/vergilius/html_enclosure_every.html b/resources/skins/vergilius/html_enclosure_every.html index 9ab2a3c01..318788cbe 100755 --- a/resources/skins/vergilius/html_enclosure_every.html +++ b/resources/skins/vergilius/html_enclosure_every.html @@ -1 +1 @@ -%2 (%3) \ No newline at end of file +%2 %3 \ No newline at end of file diff --git a/resources/skins/vergilius/html_single_message.html b/resources/skins/vergilius/html_single_message.html index 09c5d796e..caa529243 100755 --- a/resources/skins/vergilius/html_single_message.html +++ b/resources/skins/vergilius/html_single_message.html @@ -1,5 +1,5 @@
-

%1 URL %6

+
%1 URL %6
%2, %5 diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp index 68b9fa05a..22ffd26fe 100755 --- a/src/librssguard/gui/dialogs/formmain.cpp +++ b/src/librssguard/gui/dialogs/formmain.cpp @@ -805,7 +805,9 @@ void FormMain::changeEvent(QEvent* event) { SystemTrayIcon::isSystemTrayActivated() && qApp->settings()->value(GROUP(GUI), SETTING(GUI::HideMainWindowWhenMinimized)).toBool()) { event->ignore(); - QTimer::singleShot(CHANGE_EVENT_DELAY, this, SLOT(switchVisibility())); + QTimer::singleShot(CHANGE_EVENT_DELAY, this, [this]() { + switchVisibility(); + }); } break; diff --git a/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp b/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp index ac56e3ae2..621a22477 100644 --- a/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp +++ b/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp @@ -20,10 +20,13 @@ FormRestoreDatabaseSettings::FormRestoreDatabaseSettings(QWidget& parent) : QDia m_shouldRestart = true; close(); }); - connect(m_ui.m_btnSelectFolder, SIGNAL(clicked()), this, SLOT(selectFolder())); - connect(m_ui.m_groupDatabase, SIGNAL(toggled(bool)), this, SLOT(checkOkButton())); - connect(m_ui.m_groupSettings, SIGNAL(toggled(bool)), this, SLOT(checkOkButton())); - connect(m_ui.m_buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(performRestoration())); + connect(m_ui.m_btnSelectFolder, &QPushButton::clicked, this, [this]() { + selectFolder(); + }); + connect(m_ui.m_groupDatabase, &QGroupBox::toggled, this, &FormRestoreDatabaseSettings::checkOkButton); + connect(m_ui.m_groupSettings, &QGroupBox::toggled, this, &FormRestoreDatabaseSettings::checkOkButton); + connect(m_ui.m_buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, + this, &FormRestoreDatabaseSettings::performRestoration); selectFolder(qApp->documentsFolder()); } diff --git a/src/librssguard/gui/messagestoolbar.cpp b/src/librssguard/gui/messagestoolbar.cpp index 5d3bb7053..31ddd5efc 100644 --- a/src/librssguard/gui/messagestoolbar.cpp +++ b/src/librssguard/gui/messagestoolbar.cpp @@ -133,8 +133,8 @@ void MessagesToolBar::initializeHighlighter() { m_actionMessageHighlighter->setIcon(m_btnMessageHighlighter->icon()); m_actionMessageHighlighter->setProperty("type", HIGHLIGHTER_ACTION_NAME); m_actionMessageHighlighter->setProperty("name", tr("Message highlighter")); - connect(m_menuMessageHighlighter, SIGNAL(triggered(QAction*)), - this, SLOT(handleMessageHighlighterChange(QAction*))); + + connect(m_menuMessageHighlighter, &QMenu::triggered, this, &MessagesToolBar::handleMessageHighlighterChange); } QStringList MessagesToolBar::defaultActions() const { diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp index 87436f4d6..7dc3a3ebc 100644 --- a/src/librssguard/gui/messagesview.cpp +++ b/src/librssguard/gui/messagesview.cpp @@ -390,7 +390,7 @@ void MessagesView::openSelectedSourceMessagesExternally() { // Finally, mark opened messages as read. if (!selectionModel()->selectedRows().isEmpty()) { - QTimer::singleShot(0, this, SLOT(markSelectedMessagesRead())); + QTimer::singleShot(0, this, &MessagesView::markSelectedMessagesRead); } QTimer::singleShot(1000, this, []() { diff --git a/src/librssguard/gui/systemtrayicon.cpp b/src/librssguard/gui/systemtrayicon.cpp index 5e26de222..9f36a9a6d 100644 --- a/src/librssguard/gui/systemtrayicon.cpp +++ b/src/librssguard/gui/systemtrayicon.cpp @@ -16,7 +16,7 @@ TrayIconMenu::TrayIconMenu(const QString& title, QWidget* parent) : QMenu(title, bool TrayIconMenu::event(QEvent* event) { if (event->type() == QEvent::Show && Application::activeModalWidget() != nullptr) { - QTimer::singleShot(0, this, SLOT(hide())); + QTimer::singleShot(0, this, &TrayIconMenu::hide); qApp->showGuiMessage(QSL(APP_LONG_NAME), tr("Close opened modal dialogs first."), QSystemTrayIcon::Warning, qApp->mainFormWidget(), true); @@ -93,7 +93,7 @@ void SystemTrayIcon::show() { #else // Delay avoids race conditions and tray icon is properly displayed. qDebugNN << LOGSEC_GUI << "Showing tray icon with 1000 ms delay."; - QTimer::singleShot(1000, this, SLOT(showPrivate())); + QTimer::singleShot(1000, this, &SystemTrayIcon::showPrivate); #endif } diff --git a/src/librssguard/gui/treewidget.cpp b/src/librssguard/gui/treewidget.cpp index 507e0f2dd..d65587e32 100644 --- a/src/librssguard/gui/treewidget.cpp +++ b/src/librssguard/gui/treewidget.cpp @@ -23,7 +23,7 @@ TreeWidget::TreeWidget(QWidget* parent) : QTreeWidget(parent), m_refreshAllItemsNeeded(true), m_showMode(ItemShowMode::ItemsCollapsed) { - connect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(sheduleRefresh())); + connect(this, &TreeWidget::itemChanged, this, &TreeWidget::sheduleRefresh); } void TreeWidget::clear() { diff --git a/src/librssguard/gui/webviewer.cpp b/src/librssguard/gui/webviewer.cpp index 92828158a..06d652bdf 100644 --- a/src/librssguard/gui/webviewer.cpp +++ b/src/librssguard/gui/webviewer.cpp @@ -110,7 +110,7 @@ void WebViewer::loadMessages(const QList& messages, RootItem* root) { enc_url = QUrl::fromPercentEncoding(enc_url.toUtf8()); enclosures += skin.m_enclosureMarkup.arg(enc_url, - tr("Attachment"), enclosure.m_mimeType); + QSL("📎"), enclosure.m_mimeType); if (enclosure.m_mimeType.startsWith(QSL("image/"))) { // Add thumbnail image. diff --git a/src/librssguard/network-web/adblock/adblockdialog.cpp b/src/librssguard/network-web/adblock/adblockdialog.cpp index 845cc0d1c..a7effbb43 100644 --- a/src/librssguard/network-web/adblock/adblockdialog.cpp +++ b/src/librssguard/network-web/adblock/adblockdialog.cpp @@ -160,5 +160,5 @@ void AdBlockDialog::load() { } m_loaded = true; - QTimer::singleShot(50, this, SLOT(loadSubscriptions())); + QTimer::singleShot(50, this, &AdBlockDialog::loadSubscriptions); } diff --git a/src/librssguard/network-web/adblock/adblockicon.cpp b/src/librssguard/network-web/adblock/adblockicon.cpp index 6904b83f7..937a40a66 100644 --- a/src/librssguard/network-web/adblock/adblockicon.cpp +++ b/src/librssguard/network-web/adblock/adblockicon.cpp @@ -38,8 +38,11 @@ AdBlockIcon::AdBlockIcon(AdBlockManager* parent) setText(QSL("AdBlock")); setMenu(new QMenu()); setIcon(m_enabled ? qApp->icons()->miscIcon(ADBLOCK_ICON_ACTIVE) : qApp->icons()->miscIcon(ADBLOCK_ICON_DISABLED)); - connect(m_manager, SIGNAL(enabledChanged(bool)), this, SLOT(setEnabled(bool))); - connect(menu(), SIGNAL(aboutToShow()), this, SLOT(createMenu())); + + connect(m_manager, &AdBlockManager::enabledChanged, this, &AdBlockIcon::setEnabled); + connect(menu(), &QMenu::aboutToShow, this, [this]() { + createMenu(); + }); connect(this, &QAction::triggered, m_manager, &AdBlockManager::showDialog); } @@ -64,6 +67,7 @@ void AdBlockIcon::popupBlocked(const QString& ruleString, const QUrl& url) { } QPair pair; + pair.first = new AdBlockRule(filter, subscription); pair.second = url; m_blockedPopups.append(pair); @@ -96,7 +100,7 @@ void AdBlockIcon::createMenu(QMenu* menu) { WebPage* page = qApp->mainForm()->tabWidget()->currentWidget()->webBrowser()->viewer()->page(); const QUrl pageUrl = page->url(); - menu->addAction(tr("Show AdBlock &settings"), m_manager, SLOT(showDialog())); + menu->addAction(tr("Show AdBlock &settings"), m_manager, &AdBlockManager::showDialog); menu->addSeparator(); if (!pageUrl.host().isEmpty() && m_enabled && m_manager->canRunOnScheme(pageUrl.scheme())) { @@ -108,12 +112,12 @@ void AdBlockIcon::createMenu(QMenu* menu) { act->setCheckable(true); act->setChecked(customList->containsFilter(hostFilter)); act->setData(hostFilter); - connect(act, SIGNAL(triggered()), this, SLOT(toggleCustomFilter())); + connect(act, &QAction::triggered, this, &AdBlockIcon::toggleCustomFilter); act = menu->addAction(tr("Disable only on this page")); act->setCheckable(true); act->setChecked(customList->containsFilter(pageFilter)); act->setData(pageFilter); - connect(act, SIGNAL(triggered()), this, SLOT(toggleCustomFilter())); + connect(act, &QAction::triggered, this, &AdBlockIcon::toggleCustomFilter); menu->addSeparator(); } } @@ -164,7 +168,7 @@ void AdBlockIcon::animateIcon() { void AdBlockIcon::stopAnimation() { m_timerTicks = 0; m_flashTimer->stop(); - disconnect(m_flashTimer, SIGNAL(timeout()), this, SLOT(animateIcon())); + disconnect(m_flashTimer, &QTimer::timeout, this, &AdBlockIcon::animateIcon); setEnabled(m_enabled); } diff --git a/src/librssguard/network-web/adblock/adblockmanager.cpp b/src/librssguard/network-web/adblock/adblockmanager.cpp index d13491801..7786ac477 100644 --- a/src/librssguard/network-web/adblock/adblockmanager.cpp +++ b/src/librssguard/network-web/adblock/adblockmanager.cpp @@ -285,11 +285,11 @@ void AdBlockManager::load() { // Load all subscriptions. for (AdBlockSubscription* subscription : m_subscriptions) { subscription->loadSubscription(m_disabledRules); - connect(subscription, SIGNAL(subscriptionChanged()), this, SLOT(updateMatcher())); + connect(subscription, &AdBlockSubscription::subscriptionChanged, this, &AdBlockManager::updateMatcher); } if (lastUpdate.addDays(ADBLOCK_UPDATE_DAYS_INTERVAL) < QDateTime::currentDateTime()) { - QTimer::singleShot(1000 * 60, this, SLOT(updateAllSubscriptions())); + QTimer::singleShot(1000 * 60, this, &AdBlockManager::updateAllSubscriptions); } m_matcher->update(); diff --git a/src/librssguard/network-web/adblock/adblocksubscription.cpp b/src/librssguard/network-web/adblock/adblocksubscription.cpp index b29c0e0d8..0911858ad 100644 --- a/src/librssguard/network-web/adblock/adblocksubscription.cpp +++ b/src/librssguard/network-web/adblock/adblocksubscription.cpp @@ -89,7 +89,7 @@ void AdBlockSubscription::loadSubscription(const QStringList& disabledRules) { QFile file(m_filePath); if (!file.exists()) { - QTimer::singleShot(0, this, SLOT(updateSubscription())); + QTimer::singleShot(0, this, &AdBlockSubscription::updateSubscription); return; } @@ -98,7 +98,7 @@ void AdBlockSubscription::loadSubscription(const QStringList& disabledRules) { << "Unable to open adblock file" << QUOTE_W_SPACE(m_filePath) << "for reading."; - QTimer::singleShot(0, this, SLOT(updateSubscription())); + QTimer::singleShot(0, this, &AdBlockSubscription::updateSubscription); return; } @@ -115,7 +115,7 @@ void AdBlockSubscription::loadSubscription(const QStringList& disabledRules) { qWarningNN << LOGSEC_ADBLOCK << "Invalid format of AdBlock file" << QUOTE_W_SPACE_DOT(m_filePath); - QTimer::singleShot(0, this, SLOT(updateSubscription())); + QTimer::singleShot(0, this, &AdBlockSubscription::updateSubscription); return; } @@ -133,7 +133,7 @@ void AdBlockSubscription::loadSubscription(const QStringList& disabledRules) { // Initial update. if (m_rules.isEmpty() && !m_updated) { - QTimer::singleShot(0, this, SLOT(updateSubscription())); + QTimer::singleShot(0, this, &AdBlockSubscription::updateSubscription); } } diff --git a/src/librssguard/network-web/adblock/adblocktreewidget.cpp b/src/librssguard/network-web/adblock/adblocktreewidget.cpp index 46882d3a9..f0aa50bd0 100644 --- a/src/librssguard/network-web/adblock/adblocktreewidget.cpp +++ b/src/librssguard/network-web/adblock/adblocktreewidget.cpp @@ -35,10 +35,11 @@ AdBlockTreeWidget::AdBlockTreeWidget(AdBlockSubscription* subscription, QWidget* setAlternatingRowColors(true); setLayoutDirection(Qt::LeftToRight); setIndentation(5); - connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint))); - connect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(itemChanged(QTreeWidgetItem*))); - connect(m_subscription, SIGNAL(subscriptionUpdated()), this, SLOT(subscriptionUpdated())); - connect(m_subscription, SIGNAL(subscriptionError(QString)), this, SLOT(subscriptionError(QString))); + + connect(this, &AdBlockTreeWidget::customContextMenuRequested, this, &AdBlockTreeWidget::contextMenuRequested); + connect(this, &AdBlockTreeWidget::itemChanged, this, &AdBlockTreeWidget::itemChanged); + connect(m_subscription, &AdBlockSubscription::subscriptionUpdated, this, &AdBlockTreeWidget::subscriptionUpdated); + connect(m_subscription, &AdBlockSubscription::subscriptionError, this, &AdBlockTreeWidget::subscriptionError); } AdBlockSubscription* AdBlockTreeWidget::subscription() const { @@ -76,9 +77,9 @@ void AdBlockTreeWidget::contextMenuRequested(const QPoint& pos) { QMenu menu; - menu.addAction(tr("Add rule"), this, SLOT(addRule())); + menu.addAction(tr("Add rule"), this, &AdBlockTreeWidget::addRule); menu.addSeparator(); - QAction* deleteAction = menu.addAction(tr("Remove rule"), this, SLOT(removeRule())); + QAction* deleteAction = menu.addAction(tr("Remove rule"), this, &AdBlockTreeWidget::removeRule); if (item->parent() == nullptr) { deleteAction->setDisabled(true); diff --git a/src/librssguard/network-web/webfactory.cpp b/src/librssguard/network-web/webfactory.cpp index 8c5f0f5b9..ba8853e8f 100644 --- a/src/librssguard/network-web/webfactory.cpp +++ b/src/librssguard/network-web/webfactory.cpp @@ -192,7 +192,9 @@ QAction* WebFactory::engineSettingsAction() { m_engineSettings = new QAction(qApp->icons()->fromTheme(QSL("applications-internet")), tr("Web engine settings"), this); m_engineSettings->setMenu(new QMenu()); createMenu(m_engineSettings->menu()); - connect(m_engineSettings->menu(), SIGNAL(aboutToShow()), this, SLOT(createMenu())); + connect(m_engineSettings->menu(), &QMenu::aboutToShow, this, [this]() { + createMenu(); + }); } return m_engineSettings; diff --git a/src/librssguard/services/standard/gui/formstandardcategorydetails.cpp b/src/librssguard/services/standard/gui/formstandardcategorydetails.cpp index 152800726..f971a1602 100644 --- a/src/librssguard/services/standard/gui/formstandardcategorydetails.cpp +++ b/src/librssguard/services/standard/gui/formstandardcategorydetails.cpp @@ -39,13 +39,15 @@ FormStandardCategoryDetails::~FormStandardCategoryDetails() { void FormStandardCategoryDetails::createConnections() { // General connections. - connect(m_ui->m_buttonBox, SIGNAL(accepted()), this, SLOT(apply())); - connect(m_ui->m_txtTitle->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onTitleChanged(QString))); - connect(m_ui->m_txtDescription->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onDescriptionChanged(QString))); + connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &FormStandardCategoryDetails::apply); + connect(m_ui->m_txtTitle->lineEdit(), &BaseLineEdit::textChanged, + this, &FormStandardCategoryDetails::onTitleChanged); + connect(m_ui->m_txtDescription->lineEdit(), &BaseLineEdit::textChanged, + this, &FormStandardCategoryDetails::onDescriptionChanged); // Icon connections. - connect(m_actionLoadIconFromFile, SIGNAL(triggered()), this, SLOT(onLoadIconFromFile())); - connect(m_actionUseDefaultIcon, SIGNAL(triggered()), this, SLOT(onUseDefaultIcon())); + connect(m_actionLoadIconFromFile, &QAction::triggered, this, &FormStandardCategoryDetails::onLoadIconFromFile); + connect(m_actionUseDefaultIcon, &QAction::triggered, this, &FormStandardCategoryDetails::onUseDefaultIcon); } void FormStandardCategoryDetails::setEditableCategory(StandardCategory* editable_category) {