VCS: Simplify submit editor accept/close flow

* Replace message box with an error on the output pane.
* Separate logic for accept and close.

Change-Id: Ib9fa201a1a67ee195086f7a22bc6678a9642452a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2022-10-22 22:16:44 +03:00
committed by Orgad Shaneh
parent aa33927651
commit d63bfa4a29
11 changed files with 61 additions and 89 deletions

View File

@@ -250,7 +250,7 @@ public:
void startRebaseFromCommit(const FilePath &workingDirectory, QString commit);
void updateActions(VcsBasePluginPrivate::ActionState) override;
bool submitEditorAboutToClose() override;
bool activateCommit() override;
void discardCommit() override { cleanCommitMessageFile(); }
void diffCurrentFile();
@@ -1380,7 +1380,7 @@ IEditor *GitPluginPrivate::openSubmitEditor(const QString &fileName, const Commi
return editor;
}
bool GitPluginPrivate::submitEditorAboutToClose()
bool GitPluginPrivate::activateCommit()
{
if (!isCommitEditorOpen())
return true;