From 8c410a831fe0a85bb80bef76345e50bf2fdbb738 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 26 Oct 2022 13:04:05 +0200 Subject: [PATCH] bit of refactoring! --- ....github.martinrotter.rssguard.metainfo.xml | 2 +- src/librssguard/core/messagesmodel.cpp | 2 +- src/librssguard/definitions/definitions.h | 4 +- .../dialogs/formrestoredatabasesettings.cpp | 70 ++++++++++--------- src/librssguard/gui/dialogs/formupdate.cpp | 9 ++- 5 files changed, 47 insertions(+), 40 deletions(-) diff --git a/resources/desktop/io.github.martinrotter.rssguard.metainfo.xml b/resources/desktop/io.github.martinrotter.rssguard.metainfo.xml index cf4f9e423..9c6e7dca9 100644 --- a/resources/desktop/io.github.martinrotter.rssguard.metainfo.xml +++ b/resources/desktop/io.github.martinrotter.rssguard.metainfo.xml @@ -24,7 +24,7 @@ https://github.com/sponsors/martinrotter - + none diff --git a/src/librssguard/core/messagesmodel.cpp b/src/librssguard/core/messagesmodel.cpp index a3924535e..16aec5543 100644 --- a/src/librssguard/core/messagesmodel.cpp +++ b/src/librssguard/core/messagesmodel.cpp @@ -542,7 +542,7 @@ bool MessagesModel::setMessageRead(int row_index, RootItem::ReadStatus read) { if (!working_change) { // If rewriting in the model failed, then cancel all actions. - qDebug("Setting of new data to the model failed for message read change."); + qDebugNN << "Setting of new data to the model failed for message read change."; return false; } diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h index 2bfaf4fac..0651d4f8c 100644 --- a/src/librssguard/definitions/definitions.h +++ b/src/librssguard/definitions/definitions.h @@ -337,8 +337,8 @@ #define APP_LANG_PATH QSL(":/localization") #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) -#define APP_DESKTOP_SOURCE_ENTRY_FILE "io.github.martinrotter.rssguard.autostart" -#define APP_DESKTOP_ENTRY_FILE "io.github.martinrotter.rssguard.desktop" +#define APP_DESKTOP_SOURCE_ENTRY_FILE APP_REVERSE_NAME ".autostart" +#define APP_DESKTOP_ENTRY_FILE APP_REVERSE_NAME ".desktop" #define APP_DESKTOP_ENTRY_PATH QSL(":/desktop") #endif diff --git a/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp b/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp index 34155c4a4..40b0d338c 100644 --- a/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp +++ b/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp @@ -10,11 +10,12 @@ #include "QFileDialog" -FormRestoreDatabaseSettings::FormRestoreDatabaseSettings(QWidget& parent) : QDialog(&parent), - m_shouldRestart(false) { +FormRestoreDatabaseSettings::FormRestoreDatabaseSettings(QWidget& parent) : QDialog(&parent), m_shouldRestart(false) { m_ui.setupUi(this); m_btnRestart = m_ui.m_buttonBox->addButton(tr("Restart"), QDialogButtonBox::ButtonRole::ActionRole); - m_ui.m_lblResult->setStatus(WidgetWithStatus::StatusType::Warning, tr("No operation executed yet."), tr("No operation executed yet.")); + m_ui.m_lblResult->setStatus(WidgetWithStatus::StatusType::Warning, + tr("No operation executed yet."), + tr("No operation executed yet.")); GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("document-import"))); @@ -27,13 +28,15 @@ FormRestoreDatabaseSettings::FormRestoreDatabaseSettings(QWidget& parent) : QDia }); 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::StandardButton::Ok), &QPushButton::clicked, - this, &FormRestoreDatabaseSettings::performRestoration); + connect(m_ui.m_buttonBox->button(QDialogButtonBox::StandardButton::Ok), + &QPushButton::clicked, + this, + &FormRestoreDatabaseSettings::performRestoration); selectFolder(qApp->documentsFolder()); } FormRestoreDatabaseSettings::~FormRestoreDatabaseSettings() { - qDebug("Destroying FormRestoreDatabaseSettings instance."); + qDebugNN << "Destroying FormRestoreDatabaseSettings instance."; } void FormRestoreDatabaseSettings::performRestoration() { @@ -42,27 +45,30 @@ void FormRestoreDatabaseSettings::performRestoration() { try { qApp->restoreDatabaseSettings(m_ui.m_groupDatabase->isChecked(), m_ui.m_groupSettings->isChecked(), - m_ui.m_listDatabase->currentRow() >= 0 ? m_ui.m_listDatabase->currentItem()->data( - Qt::UserRole).toString() : QString(), - m_ui.m_listSettings->currentRow() >= 0 ? m_ui.m_listSettings->currentItem()->data( - Qt::UserRole).toString() : QString()); + m_ui.m_listDatabase->currentRow() >= 0 + ? m_ui.m_listDatabase->currentItem()->data(Qt::UserRole).toString() + : QString(), + m_ui.m_listSettings->currentRow() >= 0 + ? m_ui.m_listSettings->currentItem()->data(Qt::UserRole).toString() + : QString()); m_btnRestart->setEnabled(true); - m_ui.m_lblResult->setStatus(WidgetWithStatus::StatusType::Ok, tr("Restoration was initiated. Restart to proceed."), + m_ui.m_lblResult->setStatus(WidgetWithStatus::StatusType::Ok, + tr("Restoration was initiated. Restart to proceed."), tr("You need to restart application for restoration process to finish.")); } catch (const ApplicationException& ex) { - m_ui.m_lblResult->setStatus(WidgetWithStatus::StatusType::Error, ex.message(), + m_ui.m_lblResult->setStatus(WidgetWithStatus::StatusType::Error, + ex.message(), tr("Database and/or settings were not copied to restoration directory successully.")); } } void FormRestoreDatabaseSettings::checkOkButton() { m_btnRestart->setEnabled(false); - m_ui.m_buttonBox->button(QDialogButtonBox::StandardButton::Ok)->setEnabled(!m_ui.m_lblSelectFolder->label()->text().isEmpty() && - ((m_ui.m_groupDatabase->isChecked() && - m_ui.m_listDatabase->currentRow() >= 0) || - (m_ui.m_groupSettings->isChecked() && - m_ui.m_listSettings->currentRow() >= 0))); + m_ui.m_buttonBox->button(QDialogButtonBox::StandardButton::Ok) + ->setEnabled(!m_ui.m_lblSelectFolder->label()->text().isEmpty() && + ((m_ui.m_groupDatabase->isChecked() && m_ui.m_listDatabase->currentRow() >= 0) || + (m_ui.m_groupSettings->isChecked() && m_ui.m_listSettings->currentRow() >= 0))); } void FormRestoreDatabaseSettings::selectFolderWithGui() { @@ -71,11 +77,13 @@ void FormRestoreDatabaseSettings::selectFolderWithGui() { void FormRestoreDatabaseSettings::selectFolder(QString folder) { if (folder.isEmpty()) { - folder = QFileDialog::getExistingDirectory(this, tr("Select source directory"), m_ui.m_lblSelectFolder->label()->text()); + folder = + QFileDialog::getExistingDirectory(this, tr("Select source directory"), m_ui.m_lblSelectFolder->label()->text()); } if (!folder.isEmpty()) { - m_ui.m_lblSelectFolder->setStatus(WidgetWithStatus::StatusType::Ok, QDir::toNativeSeparators(folder), + m_ui.m_lblSelectFolder->setStatus(WidgetWithStatus::StatusType::Ok, + QDir::toNativeSeparators(folder), tr("Good source directory is specified.")); } else { @@ -83,20 +91,16 @@ void FormRestoreDatabaseSettings::selectFolder(QString folder) { } const QDir selected_folder(folder); - const QFileInfoList available_databases = selected_folder.entryInfoList(QStringList() << QSL("*") + BACKUP_SUFFIX_DATABASE, - QDir::Filter::Files | - QDir::Filter::NoDotAndDotDot | - QDir::Filter::Readable | - QDir::Filter::CaseSensitive | - QDir::Filter::NoSymLinks, - QDir::SortFlag::Name); - const QFileInfoList available_settings = selected_folder.entryInfoList(QStringList() << QSL("*") + BACKUP_SUFFIX_SETTINGS, - QDir::Filter::Files | - QDir::Filter::NoDotAndDotDot | - QDir::Filter::Readable | - QDir::Filter::CaseSensitive | - QDir::Filter::NoSymLinks, - QDir::SortFlag::Name); + const QFileInfoList available_databases = + selected_folder.entryInfoList(QStringList() << QSL("*") + BACKUP_SUFFIX_DATABASE, + QDir::Filter::Files | QDir::Filter::NoDotAndDotDot | QDir::Filter::Readable | + QDir::Filter::CaseSensitive | QDir::Filter::NoSymLinks, + QDir::SortFlag::Name); + const QFileInfoList available_settings = + selected_folder.entryInfoList(QStringList() << QSL("*") + BACKUP_SUFFIX_SETTINGS, + QDir::Filter::Files | QDir::Filter::NoDotAndDotDot | QDir::Filter::Readable | + QDir::Filter::CaseSensitive | QDir::Filter::NoSymLinks, + QDir::SortFlag::Name); m_ui.m_listDatabase->clear(); m_ui.m_listSettings->clear(); diff --git a/src/librssguard/gui/dialogs/formupdate.cpp b/src/librssguard/gui/dialogs/formupdate.cpp index b9ac6ad79..1bfc51321 100644 --- a/src/librssguard/gui/dialogs/formupdate.cpp +++ b/src/librssguard/gui/dialogs/formupdate.cpp @@ -127,12 +127,15 @@ void FormUpdate::saveUpdateFile(const QByteArray& file_contents) { QFile output_file(temp_directory + QDir::separator() + output_file_name); if (output_file.open(QIODevice::WriteOnly | QIODevice::Truncate)) { - qDebug("Storing update file to temporary location '%s'.", - qPrintable(QDir::toNativeSeparators(output_file.fileName()))); + qDebugNN << "Storing update file to temporary location" + << QUOTE_W_SPACE_DOT(QDir::toNativeSeparators(output_file.fileName())); + output_file.write(file_contents); output_file.flush(); output_file.close(); - qDebug("Update file contents was successfuly saved."); + + qDebugNN << "Update file contents was successfuly saved."; + m_updateFilePath = output_file.fileName(); m_readyToInstall = true; }