Skip to content

Commit e31d166

Browse files
committed
Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into next
2 parents 57f3304 + bf74639 commit e31d166

23 files changed

+2145
-1968
lines changed

RetailCoder.VBE/UI/CodeInspections/CodeInspectionsDockablePresenter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ private string FormatResultForClipboard(ICodeInspectionResult result)
115115
"{0}: {1} - {2}.{3}, line {4}",
116116
result.Severity,
117117
result.Name,
118-
module.Project.Name,
119-
module.Component.Name,
118+
module.ProjectName,
119+
module.ComponentName,
120120
result.QualifiedSelection.Selection.StartLine);
121121
}
122122

RetailCoder.VBE/UI/SourceControl/BranchesControl.Designer.cs

Lines changed: 41 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ private void OnSelectedBranchChanged(object sender, EventArgs e)
7474
}
7575
catch (SourceControlException ex)
7676
{
77-
//todo: find a better way of displaying these errors
78-
//todo: remove messagebox
79-
MessageBox.Show(ex.InnerException.Message, ex.Message, MessageBoxButtons.OK, MessageBoxIcon.Error);
80-
8177
RaiseActionFailedEvent(ex);
8278
}
8379

@@ -129,6 +125,7 @@ private IEnumerable<IBranch> RemoteBranches()
129125
private void OnShowDeleteBranchView(object sender, EventArgs e)
130126
{
131127
if (_view.Local == null) { return; }
128+
132129
_deleteView.Branches = _view.Local;
133130
_deleteView.Show();
134131
}

RetailCoder.VBE/UI/SourceControl/ISourceControlView.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ public interface ISourceControlView : IDockableUserControl
77
event EventHandler<EventArgs> RefreshData;
88
event EventHandler<EventArgs> OpenWorkingDirectory;
99
event EventHandler<EventArgs> InitializeNewRepository;
10+
event EventHandler<EventArgs> DismissMessage;
1011

1112
string Status { get; set; }
13+
string FailedActionMessage { get; set; }
14+
bool FailedActionMessageVisible { get; set; }
1215
}
1316
}

0 commit comments

Comments
 (0)