From f0ef4329f9c3c1ad7520af115ecd62be6e6aa369 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 22 Jun 2021 07:08:42 +0200 Subject: [PATCH] fixed #439 --- resources/desktop/com.github.rssguard.appdata.xml | 2 +- resources/scripts/7za | 2 +- src/librssguard/gui/dialogs/formbackupdatabasesettings.cpp | 6 ++++-- .../services/abstract/gui/formcategorydetails.cpp | 4 ++-- .../services/standard/gui/formstandardimportexport.cpp | 6 +++++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 55b54f6a5..b6581a2a4 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none diff --git a/resources/scripts/7za b/resources/scripts/7za index 9c10723bf..47f412575 160000 --- a/resources/scripts/7za +++ b/resources/scripts/7za @@ -1 +1 @@ -Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749 +Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9 diff --git a/src/librssguard/gui/dialogs/formbackupdatabasesettings.cpp b/src/librssguard/gui/dialogs/formbackupdatabasesettings.cpp index 95d83781a..2210d0d2e 100644 --- a/src/librssguard/gui/dialogs/formbackupdatabasesettings.cpp +++ b/src/librssguard/gui/dialogs/formbackupdatabasesettings.cpp @@ -3,6 +3,7 @@ #include "gui/dialogs/formbackupdatabasesettings.h" #include "exceptions/applicationexception.h" +#include "gui/guiutilities.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" @@ -15,8 +16,9 @@ FormBackupDatabaseSettings::FormBackupDatabaseSettings(QWidget* parent) : QDialog(parent), m_ui(new Ui::FormBackupDatabaseSettings) { m_ui->setupUi(this); m_ui->m_txtBackupName->lineEdit()->setPlaceholderText(tr("Common name for backup files")); - setWindowIcon(qApp->icons()->fromTheme(QSL("document-export"))); - setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint); + + GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("document-export"))); + connect(m_ui->m_checkBackupDatabase, &QCheckBox::toggled, this, &FormBackupDatabaseSettings::checkOkButton); connect(m_ui->m_checkBackupSettings, &QCheckBox::toggled, this, &FormBackupDatabaseSettings::checkOkButton); connect(m_ui->m_buttonBox->button(QDialogButtonBox::StandardButton::Ok), &QPushButton::clicked, this, &FormBackupDatabaseSettings::performBackup); diff --git a/src/librssguard/services/abstract/gui/formcategorydetails.cpp b/src/librssguard/services/abstract/gui/formcategorydetails.cpp index 65feb82ce..14ddcd1c8 100644 --- a/src/librssguard/services/abstract/gui/formcategorydetails.cpp +++ b/src/librssguard/services/abstract/gui/formcategorydetails.cpp @@ -7,6 +7,7 @@ #include "definitions/definitions.h" #include "exceptions/applicationexception.h" #include "gui/feedsview.h" +#include "gui/guiutilities.h" #include "gui/messagebox.h" #include "gui/reusable/baselineedit.h" #include "gui/systemtrayicon.h" @@ -161,8 +162,7 @@ void FormCategoryDetails::initialize() { m_ui->m_txtDescription->lineEdit()->setToolTip(tr("Set description for your category.")); // Set flags and attributes. - setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint | Qt::WindowTitleHint); - setWindowIcon(qApp->icons()->fromTheme(QSL("folder"))); + GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("folder"))); // Setup button box. m_ui->m_buttonBox->button(QDialogButtonBox::StandardButton::Ok)->setEnabled(false); diff --git a/src/librssguard/services/standard/gui/formstandardimportexport.cpp b/src/librssguard/services/standard/gui/formstandardimportexport.cpp index e16e46e70..04d1384c6 100644 --- a/src/librssguard/services/standard/gui/formstandardimportexport.cpp +++ b/src/librssguard/services/standard/gui/formstandardimportexport.cpp @@ -7,6 +7,7 @@ #include "gui/dialogs/formmain.h" #include "gui/feedmessageviewer.h" #include "gui/feedsview.h" +#include "gui/guiutilities.h" #include "gui/messagebox.h" #include "miscellaneous/application.h" #include "services/abstract/category.h" @@ -23,10 +24,13 @@ FormStandardImportExport::FormStandardImportExport(StandardServiceRoot* service_ connect(m_model, &FeedsImportExportModel::parsingStarted, this, &FormStandardImportExport::onParsingStarted); connect(m_model, &FeedsImportExportModel::parsingFinished, this, &FormStandardImportExport::onParsingFinished); connect(m_model, &FeedsImportExportModel::parsingProgress, this, &FormStandardImportExport::onParsingProgress); - setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint); + + GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("document-export"))); + m_ui->m_lblSelectFile->setStatus(WidgetWithStatus::StatusType::Error, tr("No file is selected."), tr("No file is selected.")); m_ui->m_buttonBox->button(QDialogButtonBox::StandardButton::Ok)->disconnect(); m_ui->m_lblResult->setStatus(WidgetWithStatus::StatusType::Warning, tr("No operation executed yet."), tr("No operation executed yet.")); + connect(m_ui->m_buttonBox->button(QDialogButtonBox::StandardButton::Ok), &QPushButton::clicked, this, &FormStandardImportExport::performAction); connect(m_ui->m_btnSelectFile, &QPushButton::clicked, this, &FormStandardImportExport::selectFile); connect(m_ui->m_btnCheckAllItems, &QPushButton::clicked, m_model, &FeedsImportExportModel::checkAllItems);