diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2022-10-22 22:16:44 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2022-10-25 19:19:40 +0000 |
| commit | d63bfa4a2975541b51fc8173fdb06933bb9dd40d (patch) | |
| tree | 147d436e0b06e6a347058e0edfd70bb867b8da49 /src/plugins/git | |
| parent | aa339276515da0b8c40193813de00d3cebfa1a3b (diff) | |
| download | qt-creator-d63bfa4a2975541b51fc8173fdb06933bb9dd40d.tar.gz | |
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>
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index e269dc386e..1af164f247 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -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; |