feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Remove "Prompt to submit" settings

Browse Source 
Task-number: QTCREATORBUG-22233
Change-Id: Ifbfd738281066af7913357ff9e2466a6c983452c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2022-10-14 14:29:13 +03:00
committed by Orgad Shaneh
parent a450a6707e
commit eaad78547c
18 changed files with 16 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/bazaar/bazaarplugin.cpp
View File

@@ -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) {

8
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -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;

4
src/plugins/clearcase/clearcasesettings.cpp
View File

@@ -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;

1
src/plugins/clearcase/clearcasesettings.h
View File

@@ -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;

2
src/plugins/clearcase/settingspage.cpp
View File

@@ -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();

7
src/plugins/cvs/cvsplugin.cpp
View File

@@ -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:

1
src/plugins/cvs/cvssettings.cpp
View File

@@ -96,7 +96,6 @@ CvsSettingsPage::CvsSettingsPage(CvsSettings *settings)
s.timeout,
s.diffOptions,
},
s.promptOnSubmit,
s.describeByCommitId,
}
},

2
src/plugins/git/gitplugin.cpp
View File

@@ -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:

2
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -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) {

8
src/plugins/perforce/perforceplugin.cpp
View File

@@ -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) {

6
src/plugins/perforce/perforcesettings.cpp
View File

@@ -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
}
};

1
src/plugins/perforce/perforcesettings.h
View File

@@ -77,7 +77,6 @@ public:
Utils::IntegerAspect logCount;
Utils::BoolAspect customEnv;
Utils::IntegerAspect timeOutS;
Utils::BoolAspect promptToSubmit;
Utils::BoolAspect autoOpen;
private:

4
src/plugins/subversion/subversionplugin.cpp
View File

@@ -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:

4
src/plugins/subversion/subversionsettings.cpp
View File

@@ -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,
}
},

5
src/plugins/vcsbase/vcsbaseclientsettings.cpp
View File

@@ -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);

1
src/plugins/vcsbase/vcsbaseclientsettings.h
View File

@@ -21,7 +21,6 @@ public:
Utils::StringAspect userName;
Utils::StringAspect userEmail;
Utils::IntegerAspect logCount;
Utils::BoolAspect promptOnSubmit;
Utils::IntegerAspect timeout; // Seconds
Utils::StringAspect path;

27
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -497,14 +497,9 @@ static QString withUnusedMnemonic(QString string, const QList<QPushButton *> &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<SubmitEditorWidget *>(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;

6
src/plugins/vcsbase/vcsbasesubmiteditor.h
View File

@@ -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);