void OnConfigMergeTool(object sender, EventArgs e) { using (var mergeToolDialog = new MergeToolConfigDialog(TFSVersionControlService.Instance.MergeToolInfo)) { if (mergeToolDialog.Run(this.ParentWindow) == Command.Ok) { TFSVersionControlService.Instance.MergeToolInfo = mergeToolDialog.MergeToolInfo; TFSVersionControlService.Instance.StorePrefs(); } } }
private void AcceptMergeClicked() { var mergeToolInfo = TFSVersionControlService.Instance.MergeToolInfo; if (mergeToolInfo == null) { using (var mergeToolConfigDialog = new MergeToolConfigDialog()) { if (mergeToolConfigDialog.Run(this.Widget.ParentWindow) == Command.Ok) { TFSVersionControlService.Instance.MergeToolInfo = mergeToolConfigDialog.MergeToolInfo; TFSVersionControlService.Instance.StorePrefs(); if (TFSVersionControlService.Instance.MergeToolInfo != null) { StartMerging(); } } } } else { StartMerging(); } }
private void AcceptMergeClicked() { var mergeToolInfo = TFSVersionControlService.Instance.MergeToolInfo; if (mergeToolInfo == null) { using (var mergeToolConfigDialog = new MergeToolConfigDialog()) { if (mergeToolConfigDialog.Run(this.Widget.ParentWindow) == Command.Ok) { TFSVersionControlService.Instance.MergeToolInfo = mergeToolConfigDialog.MergeToolInfo; TFSVersionControlService.Instance.StorePrefs(); if (TFSVersionControlService.Instance.MergeToolInfo != null) StartMerging(); } } } else { StartMerging(); } }