From eaad78547cd915306ecfea380824b77f2907c3c4 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 14 Oct 2022 14:29:13 +0300 Subject: [PATCH] VCS: Remove "Prompt to submit" settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTCREATORBUG-22233 Change-Id: Ifbfd738281066af7913357ff9e2466a6c983452c Reviewed-by: André Hartmann --- src/plugins/bazaar/bazaarplugin.cpp | 2 +- src/plugins/clearcase/clearcaseplugin.cpp | 8 +----- src/plugins/clearcase/clearcasesettings.cpp | 4 --- src/plugins/clearcase/clearcasesettings.h | 1 - src/plugins/clearcase/settingspage.cpp | 2 -- src/plugins/cvs/cvsplugin.cpp | 7 ++--- src/plugins/cvs/cvssettings.cpp | 1 - src/plugins/git/gitplugin.cpp | 2 +- src/plugins/mercurial/mercurialplugin.cpp | 2 +- src/plugins/perforce/perforceplugin.cpp | 8 +----- src/plugins/perforce/perforcesettings.cpp | 6 ----- src/plugins/perforce/perforcesettings.h | 1 - src/plugins/subversion/subversionplugin.cpp | 4 +-- src/plugins/subversion/subversionsettings.cpp | 4 --- src/plugins/vcsbase/vcsbaseclientsettings.cpp | 5 ---- src/plugins/vcsbase/vcsbaseclientsettings.h | 1 - src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 27 ++++--------------- src/plugins/vcsbase/vcsbasesubmiteditor.h | 6 ++--- 18 files changed, 16 insertions(+), 75 deletions(-) diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 0867e24f994..9383aa175f1 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -802,7 +802,7 @@ bool BazaarPluginPrivate::submitEditorAboutToClose() QTC_ASSERT(editorDocument, return true); const VcsBaseSubmitEditor::PromptSubmitResult response = - commitEditor->promptSubmit(this, nullptr, !m_submitActionTriggered); + commitEditor->promptSubmit(this, !m_submitActionTriggered); m_submitActionTriggered = false; switch (response) { diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 8f316a09c51..e4aacaf86f9 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -754,9 +754,8 @@ bool ClearCasePluginPrivate::submitEditorAboutToClose() // Prompt user. Force a prompt unless submit was actually invoked (that // is, the editor was closed or shutdown). - bool prompt = m_settings.promptToCheckIn; const VcsBaseSubmitEditor::PromptSubmitResult answer = - editor->promptSubmit(this, &prompt, !m_submitActionTriggered); + editor->promptSubmit(this, !m_submitActionTriggered); m_submitActionTriggered = false; switch (answer) { case VcsBaseSubmitEditor::SubmitCanceled: @@ -767,11 +766,6 @@ bool ClearCasePluginPrivate::submitEditorAboutToClose() default: break; } - // If user changed - if (prompt != m_settings.promptToCheckIn) { - m_settings.promptToCheckIn = prompt; - m_settings.toSettings(ICore::settings()); - } const QStringList fileList = editor->checkedFiles(); bool closeEditor = true; diff --git a/src/plugins/clearcase/clearcasesettings.cpp b/src/plugins/clearcase/clearcasesettings.cpp index 78f12b2c40a..99131f575b9 100644 --- a/src/plugins/clearcase/clearcasesettings.cpp +++ b/src/plugins/clearcase/clearcasesettings.cpp @@ -20,7 +20,6 @@ const char keepFileUndoCheckoutKeyC[] = "KeepFileUnDoCheckout"; const char diffTypeKeyC[] = "DiffType"; const char diffArgsKeyC[] = "DiffArgs"; const char autoAssignActivityKeyC[] = "AutoAssignActivityName"; -const char promptToCheckInKeyC[] = "PromptToCheckIn"; const char disableIndexerKeyC[] = "DisableIndexer"; const char totalFilesKeyC[] = "TotalFiles"; const char indexOnlyVOBsC[] = "IndexOnlyVOBs"; @@ -59,7 +58,6 @@ void ClearCaseSettings::fromSettings(QSettings *settings) diffArgs = settings->value(QLatin1String(diffArgsKeyC), QLatin1String(defaultDiffArgs)).toString(); autoAssignActivityName = settings->value(QLatin1String(autoAssignActivityKeyC), true).toBool(); historyCount = settings->value(QLatin1String(historyCountKeyC), int(defaultHistoryCount)).toInt(); - promptToCheckIn = settings->value(QLatin1String(promptToCheckInKeyC), false).toBool(); disableIndexer = settings->value(QLatin1String(disableIndexerKeyC), false).toBool(); indexOnlyVOBs = settings->value(QLatin1String(indexOnlyVOBsC), QString()).toString(); extDiffAvailable = !Utils::Environment::systemEnvironment().searchInPath(QLatin1String("diff")).isEmpty(); @@ -91,7 +89,6 @@ void ClearCaseSettings::toSettings(QSettings *settings) const settings->setValue(QLatin1String(diffTypeKeyC), sDiffType); settings->setValue(QLatin1String(autoAssignActivityKeyC), autoAssignActivityName); settings->setValue(QLatin1String(historyCountKeyC), historyCount); - settings->setValue(QLatin1String(promptToCheckInKeyC), promptToCheckIn); settings->setValue(QLatin1String(disableIndexerKeyC), disableIndexer); settings->setValue(QLatin1String(indexOnlyVOBsC), indexOnlyVOBs); settings->beginGroup(QLatin1String(totalFilesKeyC)); @@ -113,7 +110,6 @@ bool ClearCaseSettings::equals(const ClearCaseSettings &s) const && diffType == s.diffType && diffArgs == s.diffArgs && autoAssignActivityName == s.autoAssignActivityName - && promptToCheckIn == s.promptToCheckIn && disableIndexer == s.disableIndexer && indexOnlyVOBs == s.indexOnlyVOBs && totalFiles == s.totalFiles; diff --git a/src/plugins/clearcase/clearcasesettings.h b/src/plugins/clearcase/clearcasesettings.h index ef584fda557..c9d444f50a1 100644 --- a/src/plugins/clearcase/clearcasesettings.h +++ b/src/plugins/clearcase/clearcasesettings.h @@ -45,7 +45,6 @@ public: bool autoCheckOut = true; bool noComment = false; bool keepFileUndoCheckout = true; - bool promptToCheckIn = false; bool disableIndexer = false; bool extDiffAvailable = false; int historyCount; diff --git a/src/plugins/clearcase/settingspage.cpp b/src/plugins/clearcase/settingspage.cpp index 6b13f4bd092..e9d5dd92a34 100644 --- a/src/plugins/clearcase/settingspage.cpp +++ b/src/plugins/clearcase/settingspage.cpp @@ -173,7 +173,6 @@ SettingsPageWidget::SettingsPageWidget() graphicalDiffRadioButton->setChecked(true); autoAssignActivityCheckBox->setChecked(s.autoAssignActivityName); historyCountSpinBox->setValue(s.historyCount); - promptCheckBox->setChecked(s.promptToCheckIn); disableIndexerCheckBox->setChecked(s.disableIndexer); diffArgsEdit->setText(s.diffArgs); indexOnlyVOBsEdit->setText(s.indexOnlyVOBs); @@ -193,7 +192,6 @@ void SettingsPageWidget::apply() rc.diffType = ExternalDiff; rc.autoAssignActivityName = autoAssignActivityCheckBox->isChecked(); rc.historyCount = historyCountSpinBox->value(); - rc.promptToCheckIn = promptCheckBox->isChecked(); rc.disableIndexer = disableIndexerCheckBox->isChecked(); rc.diffArgs = diffArgsEdit->text(); rc.indexOnlyVOBs = indexOnlyVOBsEdit->text(); diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index a004be3b6d5..cbf8b26ef72 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -726,11 +726,8 @@ bool CvsPluginPrivate::submitEditorAboutToClose() // Prompt user. Force a prompt unless submit was actually invoked (that // is, the editor was closed or shutdown). - const VcsBaseSubmitEditor::PromptSubmitResult answer = editor->promptSubmit( - this, nullptr, - !m_submitActionTriggered, - true, - &m_settings.promptOnSubmit); + const VcsBaseSubmitEditor::PromptSubmitResult answer = + editor->promptSubmit(this, !m_submitActionTriggered); m_submitActionTriggered = false; switch (answer) { case VcsBaseSubmitEditor::SubmitCanceled: diff --git a/src/plugins/cvs/cvssettings.cpp b/src/plugins/cvs/cvssettings.cpp index f87204face3..bb58247fd1c 100644 --- a/src/plugins/cvs/cvssettings.cpp +++ b/src/plugins/cvs/cvssettings.cpp @@ -96,7 +96,6 @@ CvsSettingsPage::CvsSettingsPage(CvsSettings *settings) s.timeout, s.diffOptions, }, - s.promptOnSubmit, s.describeByCommitId, } }, diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index c77ce79bcdf..b71a50694c3 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1407,7 +1407,7 @@ bool GitPluginPrivate::submitEditorAboutToClose() // Prompt user. Force a prompt unless submit was actually invoked (that // is, the editor was closed or shutdown). const VcsBaseSubmitEditor::PromptSubmitResult answer - = editor->promptSubmit(this, nullptr, !m_submitActionTriggered, false); + = editor->promptSubmit(this, !m_submitActionTriggered, false); m_submitActionTriggered = false; switch (answer) { case VcsBaseSubmitEditor::SubmitCanceled: diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index f9332fcc04c..02f7023fccd 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -663,7 +663,7 @@ bool MercurialPluginPrivate::submitEditorAboutToClose() QTC_ASSERT(editorFile, return true); const VcsBaseSubmitEditor::PromptSubmitResult response = - commitEditor->promptSubmit(this, nullptr, !m_submitActionTriggered); + commitEditor->promptSubmit(this, !m_submitActionTriggered); m_submitActionTriggered = false; switch (response) { diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 770ad3ebca5..65693295663 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -1544,19 +1544,13 @@ bool PerforcePluginPrivate::submitEditorAboutToClose() QTC_ASSERT(editorDocument, return true); // Prompt the user. Force a prompt unless submit was actually invoked (that // is, the editor was closed or shutdown). - bool wantsPrompt = m_settings.promptToSubmit.value(); const VcsBaseSubmitEditor::PromptSubmitResult answer = - perforceEditor->promptSubmit(this, &wantsPrompt, !m_submitActionTriggered); + perforceEditor->promptSubmit(this, !m_submitActionTriggered); m_submitActionTriggered = false; if (answer == VcsBaseSubmitEditor::SubmitCanceled) return false; - // Set without triggering the checking mechanism - if (wantsPrompt != m_settings.promptToSubmit.value()) { - m_settings.promptToSubmit.setValue(wantsPrompt); - m_settings.writeSettings(ICore::settings()); - } if (!DocumentManager::saveDocument(editorDocument)) return false; if (answer == VcsBaseSubmitEditor::SubmitDiscarded) { diff --git a/src/plugins/perforce/perforcesettings.cpp b/src/plugins/perforce/perforcesettings.cpp index c94e1a429c4..e18e1986f80 100644 --- a/src/plugins/perforce/perforcesettings.cpp +++ b/src/plugins/perforce/perforcesettings.cpp @@ -81,11 +81,6 @@ PerforceSettings::PerforceSettings() timeOutS.setLabelText(tr("Timeout:")); timeOutS.setSuffix(tr("s")); - registerAspect(&promptToSubmit); - promptToSubmit.setSettingsKey("PromptForSubmit"); - promptToSubmit.setDefaultValue(true); - promptToSubmit.setLabelText(tr("Prompt on submit")); - registerAspect(&autoOpen); autoOpen.setSettingsKey("PromptToOpen"); autoOpen.setDefaultValue(true); @@ -257,7 +252,6 @@ PerforceSettingsPage::PerforceSettingsPage(PerforceSettings *settings) title(PerforceSettings::tr("Miscellaneous")), Column { Row { s.logCount, s.timeOutS, st }, - s.promptToSubmit, s.autoOpen } }; diff --git a/src/plugins/perforce/perforcesettings.h b/src/plugins/perforce/perforcesettings.h index ee47603a6d8..ae5cf2edf5c 100644 --- a/src/plugins/perforce/perforcesettings.h +++ b/src/plugins/perforce/perforcesettings.h @@ -77,7 +77,6 @@ public: Utils::IntegerAspect logCount; Utils::BoolAspect customEnv; Utils::IntegerAspect timeOutS; - Utils::BoolAspect promptToSubmit; Utils::BoolAspect autoOpen; private: diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 798a7781c96..144262ca808 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -563,8 +563,8 @@ bool SubversionPluginPrivate::submitEditorAboutToClose() // Prompt user. Force a prompt unless submit was actually invoked (that // is, the editor was closed or shutdown). - const VcsBaseSubmitEditor::PromptSubmitResult answer = editor->promptSubmit( - this, nullptr, !m_submitActionTriggered, true, &m_settings.promptOnSubmit); + const VcsBaseSubmitEditor::PromptSubmitResult answer = + editor->promptSubmit(this, !m_submitActionTriggered); m_submitActionTriggered = false; switch (answer) { case VcsBaseSubmitEditor::SubmitCanceled: diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp index 4d5cc8f9380..d7036843bcd 100644 --- a/src/plugins/subversion/subversionsettings.cpp +++ b/src/plugins/subversion/subversionsettings.cpp @@ -72,9 +72,6 @@ SubversionSettings::SubversionSettings() timeout.setLabelText(tr("Timeout:")); timeout.setSuffix(tr("s")); - registerAspect(&promptOnSubmit); - promptOnSubmit.setLabelText(tr("Prompt on submit")); - QObject::connect(&useAuthentication, &BaseAspect::changed, [this] { userName.setEnabled(useAuthentication.value()); password.setEnabled(useAuthentication.value()); @@ -115,7 +112,6 @@ SubversionSettingsPage::SubversionSettingsPage(SubversionSettings *settings) title(SubversionSettings::tr("Miscellaneous")), Column { Row { s.logCount, s.timeout, st }, - s.promptOnSubmit, s.spaceIgnorantAnnotation, } }, diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp index 2c86f2f87b8..06a7074c414 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp +++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp @@ -40,11 +40,6 @@ VcsBaseSettings::VcsBaseSettings() registerAspect(&path); path.setSettingsKey("Path"); - registerAspect(&promptOnSubmit); - promptOnSubmit.setSettingsKey("PromptOnSubmit"); - promptOnSubmit.setDefaultValue(true); - promptOnSubmit.setLabelText(tr("Prompt on submit")); - registerAspect(&timeout); timeout.setSettingsKey("Timeout"); timeout.setRange(0, 3600 * 24 * 365); diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.h b/src/plugins/vcsbase/vcsbaseclientsettings.h index 6da8e2cbdac..010b2befd98 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.h +++ b/src/plugins/vcsbase/vcsbaseclientsettings.h @@ -21,7 +21,6 @@ public: Utils::StringAspect userName; Utils::StringAspect userEmail; Utils::IntegerAspect logCount; - Utils::BoolAspect promptOnSubmit; Utils::IntegerAspect timeout; // Seconds Utils::StringAspect path; diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 90613a4167f..12ff6f50b72 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -497,14 +497,9 @@ static QString withUnusedMnemonic(QString string, const QList &ot VcsBaseSubmitEditor::PromptSubmitResult VcsBaseSubmitEditor::promptSubmit(VcsBasePluginPrivate *plugin, - bool *promptSettingOld, - bool forcePrompt, - bool canCommitOnFailure, - BoolAspect *promptSetting) + bool prompt, + bool canCommitOnFailure) { - BoolAspect dummySetting; - if (!promptSetting && !promptSettingOld) - promptSetting = &dummySetting; auto submitWidget = static_cast(this->widget()); Core::EditorManager::activateEditor(this, Core::EditorManager::IgnoreNavigationHistory); @@ -514,9 +509,6 @@ VcsBaseSubmitEditor::PromptSubmitResult QString errorMessage; - const bool value = promptSettingOld ? *promptSettingOld : promptSetting->value(); - const bool prompt = forcePrompt || value; - // Pop up a message depending on whether the check succeeded and the // user wants to be prompted bool canCommit = checkSubmitMessage(&errorMessage) && submitWidget->canSubmit(&errorMessage); @@ -536,10 +528,6 @@ VcsBaseSubmitEditor::PromptSubmitResult errorMessage.isEmpty() ? errorMessage : ": " + errorMessage); } mb.setText(message); - mb.setCheckBoxText(tr("Prompt to %1").arg(commitName.toLower())); - mb.setChecked(value); - // Provide check box to turn off prompt ONLY if it was not forced - mb.setCheckBoxVisible(value && !forcePrompt); QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close | QDialogButtonBox::Cancel; if (canCommit || canCommitOnFailure) buttons |= QDialogButtonBox::Ok; @@ -548,19 +536,14 @@ VcsBaseSubmitEditor::PromptSubmitResult // On Windows there is no mnemonic for Close. Set it explicitly. mb.button(QDialogButtonBox::Close)->setText(tr("&Close")); cancelButton->setText(tr("&Keep Editing")); - // forcePrompt is true when the editor is closed, and false when triggered by the submit action - if (forcePrompt) + // prompt is true when the editor is closed, and false when triggered by the submit action + if (prompt) cancelButton->setDefault(true); if (QPushButton *commitButton = mb.button(QDialogButtonBox::Ok)) { commitButton->setText(withUnusedMnemonic(commitName, {cancelButton, mb.button(QDialogButtonBox::Close)})); } - if (mb.exec() == QDialog::Accepted) { - if (promptSettingOld) - *promptSettingOld = mb.isChecked(); - else - promptSetting->setValue(mb.isChecked()); - } + mb.exec(); QAbstractButton *chosen = mb.clickedButton(); if (!chosen || chosen == cancelButton) return SubmitCanceled; diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h index 41e1fc5265c..b79bece8364 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.h +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h @@ -55,10 +55,8 @@ public: // prompt setting. The user can uncheck it from the message box. enum PromptSubmitResult { SubmitConfirmed, SubmitCanceled, SubmitDiscarded }; PromptSubmitResult promptSubmit(VcsBasePluginPrivate *plugin, - bool *promptSettingOld, - bool forcePrompt = false, - bool canCommitOnFailure = true, - Utils::BoolAspect *promptSetting = nullptr); + bool prompt, + bool canCommitOnFailure = true); QAbstractItemView::SelectionMode fileListSelectionMode() const; void setFileListSelectionMode(QAbstractItemView::SelectionMode sm);