Skip to content

Commit dc94c8a

Browse files
authored
Add setting to disable the show change submitted dialog (#85)
1 parent 4c9993d commit dc94c8a

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/GitExtensions.GerritPlugin/FormGerritPublish.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,16 @@ public partial class FormGerritPublish : FormGerritBase
2828
private string _currentBranchRemote;
2929
private readonly GerritCapabilities _capabilities;
3030
private readonly bool _shouldTargetLocalBranch;
31+
private readonly bool _showChangeSubmittedDialog;
3132

32-
public FormGerritPublish(IGitUICommands uiCommand, GerritCapabilities capabilities, bool shouldTargetLocalBranch)
33+
public FormGerritPublish(IGitUICommands uiCommand, GerritCapabilities capabilities,
34+
bool shouldTargetLocalBranch, bool showChangeSubmittedDialog)
3335
: base(uiCommand)
3436
{
3537
_capabilities = capabilities;
3638
_shouldTargetLocalBranch = shouldTargetLocalBranch;
39+
_showChangeSubmittedDialog = showChangeSubmittedDialog;
40+
3741
InitializeComponent();
3842
Publish.Image = Images.Push.AdaptLightness();
3943
InitializeComplete();
@@ -104,7 +108,7 @@ private bool PublishChange(IWin32Window owner)
104108

105109
if (!pushCommand.ErrorOccurred)
106110
{
107-
if(GerritUtil.HadNewChange(pushCommand.CommandOutput, out var changeUri))
111+
if (_showChangeSubmittedDialog && GerritUtil.HadNewChange(pushCommand.CommandOutput, out var changeUri))
108112
{
109113
FormGerritChangeSubmitted.ShowSubmitted(owner, changeUri);
110114
}

src/GitExtensions.GerritPlugin/GerritPlugin.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public class GerritPlugin : GitPluginBase, IGitPluginForRepository
3636
private const string DefaultPublishTargetBranch = "local";
3737

3838
private readonly BoolSetting _gerritEnabled = new("Gerrit plugin enabled", true);
39+
private readonly BoolSetting _gerritShowChangeSubmittedDialog = new("Show change submitted dialog", false);
40+
3941
private readonly ChoiceSetting _predefinedGerritVersion = new(
4042
"Treat Gerrit as having version",
4143
new[] { DefaultGerritVersion, "Older then 2.15" },
@@ -307,8 +309,9 @@ private void publishMenuItem_Click(object sender, EventArgs e)
307309
? GerritCapabilities.Version2_15
308310
: GerritCapabilities.OldestVersion;
309311
var shouldTargetLocalBranch = _predefinedPublishTargetBranch.ValueOrDefault(Settings) == DefaultPublishTargetBranch;
312+
var showChangeSubmittedDialog = _gerritShowChangeSubmittedDialog.ValueOrDefault(Settings);
310313

311-
using (var form = new FormGerritPublish(_gitUiCommands, capabilities, shouldTargetLocalBranch))
314+
using (var form = new FormGerritPublish(_gitUiCommands, capabilities, shouldTargetLocalBranch, showChangeSubmittedDialog))
312315
{
313316
form.ShowDialog(_mainForm);
314317
}
@@ -479,6 +482,7 @@ public override bool Execute(GitUIEventArgs args)
479482
public override IEnumerable<ISetting> GetSettings()
480483
{
481484
yield return _gerritEnabled;
485+
yield return _gerritShowChangeSubmittedDialog;
482486
yield return _predefinedGerritVersion;
483487
yield return _hidePushButton;
484488
yield return _predefinedPublishTargetBranch;

0 commit comments

Comments
 (0)