From 0eef58f2cf16777c5b6ea485f87ee5b32d9a2bb3 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 8 Apr 2024 09:23:13 +0300 Subject: [PATCH] Crash settings must be disabled/empty when application doesn't support sending automatic crash reports to avoid user confusion. --- .../configpages/puzzlepreferencesconfigurationpage.cpp | 6 ++++-- .../configpages/tapepreferencesconfigurationpage.cpp | 6 ++++-- .../dialogs/configpages/preferencesconfigurationpage.cpp | 6 ++++-- src/libs/vmisc/dialogs/dialogaskcollectstatistic.cpp | 8 ++++++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp index 513b62226..029b7bd82 100644 --- a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp +++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp @@ -119,8 +119,9 @@ PuzzlePreferencesConfigurationPage::PuzzlePreferencesConfigurationPage(QWidget * #if !defined(CRASH_REPORTING) ui->groupBoxCrashReports->setDisabled(true); -#endif - + ui->checkBoxSendCrashReports->setChecked(false); + ui->lineEditCrashUserEmail->setText(QString()); +#else ui->checkBoxSendCrashReports->setChecked(settings->IsSendCrashReport()); connect(ui->checkBoxSendCrashReports, &QCheckBox::stateChanged, this, [this]() { m_sendCrashReportsChanged = true; }); @@ -131,6 +132,7 @@ PuzzlePreferencesConfigurationPage::PuzzlePreferencesConfigurationPage(QWidget * ui->lineEditCrashUserEmail->setText(settings->GetCrashEmail()); connect(ui->lineEditCrashUserEmail, &QLineEdit::editingFinished, this, [this]() { m_crashUserEmailChanged = true; }); +#endif } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp index 79bdaae34..fea1df19d 100644 --- a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp +++ b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp @@ -118,8 +118,9 @@ TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *pare #if !defined(CRASH_REPORTING) ui->groupBoxCrashReports->setDisabled(true); -#endif - + ui->checkBoxSendCrashReports->setChecked(false); + ui->lineEditCrashUserEmail->setText(QString()); +#else ui->checkBoxSendCrashReports->setChecked(settings->IsSendCrashReport()); connect(ui->checkBoxSendCrashReports, &QCheckBox::stateChanged, this, [this]() { m_sendCrashReportsChanged = true; }); @@ -130,6 +131,7 @@ TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *pare ui->lineEditCrashUserEmail->setText(settings->GetCrashEmail()); connect(ui->lineEditCrashUserEmail, &QLineEdit::editingFinished, this, [this]() { m_crashUserEmailChanged = true; }); +#endif } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp index 7599599b6..ae2bcb1ec 100644 --- a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp +++ b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp @@ -180,8 +180,9 @@ PreferencesConfigurationPage::PreferencesConfigurationPage(QWidget *parent) #if !defined(CRASH_REPORTING) ui->groupBoxCrashReports->setDisabled(true); -#endif - + ui->checkBoxSendCrashReports->setChecked(false); + ui->lineEditCrashUserEmail->setText(QString()); +#else ui->checkBoxSendCrashReports->setChecked(settings->IsSendCrashReport()); connect(ui->checkBoxSendCrashReports, &QCheckBox::stateChanged, this, [this]() { m_sendCrashReportsChanged = true; }); @@ -192,6 +193,7 @@ PreferencesConfigurationPage::PreferencesConfigurationPage(QWidget *parent) ui->lineEditCrashUserEmail->setText(settings->GetCrashEmail()); connect(ui->lineEditCrashUserEmail, &QLineEdit::editingFinished, this, [this]() { m_crashUserEmailChanged = true; }); +#endif } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vmisc/dialogs/dialogaskcollectstatistic.cpp b/src/libs/vmisc/dialogs/dialogaskcollectstatistic.cpp index 122c30083..0f5866ff5 100644 --- a/src/libs/vmisc/dialogs/dialogaskcollectstatistic.cpp +++ b/src/libs/vmisc/dialogs/dialogaskcollectstatistic.cpp @@ -31,7 +31,9 @@ #include #include +#if defined(CRASH_REPORTING) #include "../vabstractapplication.h" +#endif //--------------------------------------------------------------------------------------------------------------------- DialogAskCollectStatistic::DialogAskCollectStatistic(QWidget *parent) @@ -42,14 +44,16 @@ DialogAskCollectStatistic::DialogAskCollectStatistic(QWidget *parent) #if !defined(CRASH_REPORTING) ui->groupBoxCrashReports->setDisabled(true); -#endif - + ui->checkBoxSendCrashReports->setChecked(false); + ui->lineEditCrashUserEmail->setText(QString()); +#else VCommonSettings *settings = VAbstractApplication::VApp()->Settings(); QRegularExpression const rx(QStringLiteral("\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}\\b"), QRegularExpression::CaseInsensitiveOption); ui->lineEditCrashUserEmail->setValidator(new QRegularExpressionValidator(rx, this)); ui->lineEditCrashUserEmail->setText(settings->GetCrashEmail()); +#endif } //---------------------------------------------------------------------------------------------------------------------