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

VCS: Remove "Commit" option when closing commit editor

Browse Source 
Fixes: QTCREATORBUG-22233
Change-Id: I1270cc58a823b919475fc51ac5fc71b892b379b6
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2022-10-21 15:41:08 +03:00
committed by Orgad Shaneh
parent 2f1f80152d
commit 1593f869ed
3 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,7 +252,6 @@ public:
void updateActions(VcsBasePluginPrivate::ActionState) override; void updateActions(VcsBasePluginPrivate::ActionState) override;
bool submitEditorAboutToClose() override; bool submitEditorAboutToClose() override;
void discardCommit() override { cleanCommitMessageFile(); } void discardCommit() override { cleanCommitMessageFile(); }
bool canCommitOnFailure() const override { return false; }
void diffCurrentFile(); void diffCurrentFile();
void diffCurrentProject(); void diffCurrentProject();

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

@@ -137,7 +137,6 @@ public:
virtual QString commitDisplayName() const; virtual QString commitDisplayName() const;
void commitFromEditor(); void commitFromEditor();
virtual bool canCommitOnFailure() const { return true; }
bool submitActionTriggered() const { return m_submitActionTriggered; } bool submitActionTriggered() const { return m_submitActionTriggered; }
protected: protected:

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

@@ -478,22 +478,6 @@ void VcsBaseSubmitEditor::setDescriptionMandatory(bool v)
enum { checkDialogMinimumWidth = 500 }; enum { checkDialogMinimumWidth = 500 };
static QString withUnusedMnemonic(QString string, const QList<QAbstractButton *> &otherButtons)
{
QSet<QChar> mnemonics;
for (QAbstractButton *button : otherButtons) {
const QString text = button->text();
const int ampersandPos = text.indexOf('&');
if (ampersandPos >= 0 && ampersandPos < text.size() - 1)
mnemonics.insert(text.at(ampersandPos + 1));
}
for (int i = 0, total = string.length(); i < total; ++i) {
if (!mnemonics.contains(string.at(i)))
return string.insert(i, '&');
}
return string;
}
VcsBaseSubmitEditor::PromptSubmitResult VcsBaseSubmitEditor::promptSubmit(VcsBasePluginPrivate *plugin) VcsBaseSubmitEditor::PromptSubmitResult VcsBaseSubmitEditor::promptSubmit(VcsBasePluginPrivate *plugin)
{ {
auto submitWidget = static_cast<SubmitEditorWidget *>(this->widget()); auto submitWidget = static_cast<SubmitEditorWidget *>(this->widget());
@@ -525,28 +509,15 @@ VcsBaseSubmitEditor::PromptSubmitResult VcsBaseSubmitEditor::promptSubmit(VcsBas
errorMessage.isEmpty() ? errorMessage : ": " + errorMessage); errorMessage.isEmpty() ? errorMessage : ": " + errorMessage);
} }
mb.setText(message); mb.setText(message);
QMessageBox::StandardButtons buttons = QMessageBox::Close | QMessageBox::Cancel; mb.setStandardButtons(QMessageBox::Close | QMessageBox::Cancel);
if (canCommit || plugin->canCommitOnFailure())
buttons |= QMessageBox::Ok;
mb.setStandardButtons(buttons);
QAbstractButton *cancelButton = mb.button(QMessageBox::Cancel);
// On Windows there is no mnemonic for Close. Set it explicitly. // On Windows there is no mnemonic for Close. Set it explicitly.
mb.button(QMessageBox::Close)->setText(tr("&Close")); mb.button(QMessageBox::Close)->setText(tr("&Close"));
cancelButton->setText(tr("&Keep Editing")); mb.button(QMessageBox::Cancel)->setText(tr("&Keep Editing"));
// prompt is true when the editor is closed, and false when triggered by the submit action // prompt is true when the editor is closed, and false when triggered by the submit action
if (prompt) if (prompt)
mb.setDefaultButton(QMessageBox::Cancel); mb.setDefaultButton(QMessageBox::Cancel);
if (QAbstractButton *commitButton = mb.button(QMessageBox::Ok)) {
commitButton->setText(withUnusedMnemonic(commitName,
{cancelButton, mb.button(QMessageBox::Close)}));
}
mb.exec(); mb.exec();
QAbstractButton *chosen = mb.clickedButton(); return mb.result() == QMessageBox::Close ? SubmitDiscarded : SubmitCanceled;
if (!chosen || chosen == cancelButton)
return SubmitCanceled;
if (chosen == mb.button(QMessageBox::Close))
return SubmitDiscarded;
return SubmitConfirmed;
} }
QString VcsBaseSubmitEditor::promptForNickName() QString VcsBaseSubmitEditor::promptForNickName()