From d63bfa4a2975541b51fc8173fdb06933bb9dd40d Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sat, 22 Oct 2022 22:16:44 +0300 Subject: VCS: Simplify submit editor accept/close flow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Replace message box with an error on the output pane. * Separate logic for accept and close. Change-Id: Ib9fa201a1a67ee195086f7a22bc6678a9642452a Reviewed-by: Leena Miettinen Reviewed-by: André Hartmann --- src/plugins/bazaar/bazaarplugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/bazaar/bazaarplugin.cpp') diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 4f417ddc5e..33d13c631f 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -184,7 +184,7 @@ public: // String -> repository, StringList -> files void changed(const QVariant &); void updateActions(VcsBase::VcsBasePluginPrivate::ActionState) final; - bool submitEditorAboutToClose() final; + bool activateCommit() final; // File menu action slots void addCurrentFile(); @@ -784,7 +784,7 @@ void BazaarPluginPrivate::uncommit() m_client.synchronousUncommit(state.topLevel(), dialog.revision(), dialog.extraOptions()); } -bool BazaarPluginPrivate::submitEditorAboutToClose() +bool BazaarPluginPrivate::activateCommit() { auto commitEditor = qobject_cast(submitEditor()); QTC_ASSERT(commitEditor, return true); -- cgit v1.2.1