Skip to content

Commit e7a8451

Browse files
rubberduck203rubberduck203
committed
resolved merge conflicts
2 parents 6a4c1b5 + 6b801d4 commit e7a8451

26 files changed

+765
-26
lines changed

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@
222222
</Reference>
223223
<Reference Include="System" />
224224
<Reference Include="System.Core" />
225+
<Reference Include="System.Data" />
225226
<Reference Include="System.Drawing" />
226227
<Reference Include="System.Windows.Forms" />
227228
<Reference Include="System.Xaml" />
@@ -387,9 +388,16 @@
387388
<DependentUpon>CreateBranchForm.cs</DependentUpon>
388389
</Compile>
389390
<Compile Include="UI\FileBrowserDialogFactory.cs" />
391+
<Compile Include="UI\SourceControl\DeleteBranchForm.cs">
392+
<SubType>Form</SubType>
393+
</Compile>
394+
<Compile Include="UI\SourceControl\DeleteBranchForm.Designer.cs">
395+
<DependentUpon>DeleteBranchForm.cs</DependentUpon>
396+
</Compile>
390397
<Compile Include="UI\SourceControl\IBranchesView.cs" />
391398
<Compile Include="UI\SourceControl\IChangesView.cs" />
392399
<Compile Include="UI\SourceControl\ICreateBranchView.cs" />
400+
<Compile Include="UI\SourceControl\IDeleteBranchView.cs" />
393401
<Compile Include="UI\SourceControl\IMergeView.cs" />
394402
<Compile Include="UI\SourceControl\IProviderPresenter.cs" />
395403
<Compile Include="UI\SourceControl\ISettingsView.cs" />
@@ -635,6 +643,9 @@
635643
<EmbeddedResource Include="UI\SourceControl\CreateBranchForm.resx">
636644
<DependentUpon>CreateBranchForm.cs</DependentUpon>
637645
</EmbeddedResource>
646+
<EmbeddedResource Include="UI\SourceControl\DeleteBranchForm.resx">
647+
<DependentUpon>DeleteBranchForm.cs</DependentUpon>
648+
</EmbeddedResource>
638649
<EmbeddedResource Include="UI\SourceControl\MergeForm.resx">
639650
<DependentUpon>MergeForm.cs</DependentUpon>
640651
</EmbeddedResource>

‎RetailCoder.VBE/UI/CodeInspections/CodeInspectionsDockablePresenter.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,11 @@ private async Task RefreshAsync(CancellationToken token)
198198
var projectParseResult = await _inspector.Parse(VBE.ActiveVBProject, this);
199199
_results = await _inspector.FindIssuesAsync(projectParseResult, token);
200200
}
201+
catch (TaskCanceledException)
202+
{
203+
// If FindIssuesAsync is canceled, we can leave the old results or
204+
// create a new List. Let's leave the old ones for now.
205+
}
201206
catch (COMException)
202207
{
203208
// burp

‎RetailCoder.VBE/UI/RubberduckMenu.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ private void OnSourceControlClick(CommandBarButton Ctrl, ref bool CancelDefault)
143143
_sourceControlApp = new SourceControl.App(this.IDE, this.AddIn, new SourceControlConfigurationService(),
144144
new ChangesControl(), new UnSyncedCommitsControl(),
145145
new SettingsControl(), new BranchesControl(),
146-
new CreateBranchForm(), new MergeForm());
146+
new CreateBranchForm(), new DeleteBranchForm(),
147+
new MergeForm());
147148
}
148149

149150
_sourceControlApp.ShowWindow();

‎RetailCoder.VBE/UI/RubberduckUI.Designer.cs

Lines changed: 37 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RetailCoder.VBE/UI/RubberduckUI.fr.resx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,4 +1076,19 @@ Attention: les valeurs personnalisées seront perdues.</value>
10761076
<data name="ToDoPriority_Medium" xml:space="preserve">
10771077
<value>z Medium</value>
10781078
</data>
1079+
<data name="SourceControl_SuccessfulMerge" xml:space="preserve">
1080+
<value>z Successfully Merged {0} into {1}</value>
1081+
</data>
1082+
<data name="SourceControl_DeleteBranchCaption" xml:space="preserve">
1083+
<value>z Rubberduck - Delete Branch</value>
1084+
</data>
1085+
<data name="SourceControl_CreateNewBranchCaption" xml:space="preserve">
1086+
<value>z Rubberduck - Create Branch</value>
1087+
</data>
1088+
<data name="SourceControl_DeleteBranchInstructionsLabel" xml:space="preserve">
1089+
<value>z Please specify branch name.</value>
1090+
</data>
1091+
<data name="SourceControl_DeleteBranchTitleLable" xml:space="preserve">
1092+
<value>z Delete branch</value>
1093+
</data>
10791094
</root>

‎RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,4 +1080,16 @@ Are you sure you want to proceed with this rename?</value>
10801080
<data name="ToDoPriority_Medium" xml:space="preserve">
10811081
<value>Medium</value>
10821082
</data>
1083+
<data name="SourceControl_SuccessfulMerge" xml:space="preserve">
1084+
<value>Successfully Merged {0} into {1}</value>
1085+
</data>
1086+
<data name="SourceControl_DeleteBranchCaption" xml:space="preserve">
1087+
<value>Rubberduck - Delete Branch</value>
1088+
</data>
1089+
<data name="SourceControl_DeleteBranchInstructionsLabel" xml:space="preserve">
1090+
<value>Please specify branch name.</value>
1091+
</data>
1092+
<data name="SourceControl_DeleteBranchTitleLable" xml:space="preserve">
1093+
<value>Delete branch</value>
1094+
</data>
10831095
</root>

‎RetailCoder.VBE/UI/RubberduckUI.sv.resx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,4 +1067,16 @@ Are you sure you want to proceed with this rename?</value>
10671067
<data name="ToDoPriority_Medium" xml:space="preserve">
10681068
<value>z Medium</value>
10691069
</data>
1070+
<data name="SourceControl_SuccessfulMerge" xml:space="preserve">
1071+
<value>z Successfully Merged {0} into {1}</value>
1072+
</data>
1073+
<data name="SourceControl_DeleteBranchCaption" xml:space="preserve">
1074+
<value>z Rubberduck - Delete Branch</value>
1075+
</data>
1076+
<data name="SourceControl_DeleteBranchInstructionsLabel" xml:space="preserve">
1077+
<value>z Please specify branch name.</value>
1078+
</data>
1079+
<data name="SourceControl_DeleteBranchTitleLable" xml:space="preserve">
1080+
<value>z Delete branch</value>
1081+
</data>
10701082
</root>

‎RetailCoder.VBE/UI/SourceControl/App.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ internal App(
1717
ISettingsView settingsView,
1818
IBranchesView branchesView,
1919
ICreateBranchView createBranchView,
20+
IDeleteBranchView deleteBranchView,
2021
IMergeView mergeView
2122
)
2223
{
2324
_sourceControlView = new SourceControlPanel(branchesView, changesView, unsyncedCommitsView, settingsView);
2425
var changesPresenter = new ChangesPresenter(changesView);
25-
var branchesPresenter = new BranchesPresenter(branchesView, createBranchView, mergeView);
26+
var branchesPresenter = new BranchesPresenter(branchesView, createBranchView, deleteBranchView, mergeView);
2627
var settingsPresenter = new SettingsPresenter(settingsView, configService, new DialogFactory());
2728

2829
_sourceControlPresenter =

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

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

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,12 @@ public void OnCreateBranch(object sender, EventArgs e)
8585
RaiseGenericEvent(CreateBranch, e);
8686
}
8787

88+
public event EventHandler<EventArgs> DeleteBranch;
89+
public void OnDeleteBranch(object sender, EventArgs e)
90+
{
91+
RaiseGenericEvent(DeleteBranch, e);
92+
}
93+
8894
private void RaiseGenericEvent(EventHandler<EventArgs> handler, EventArgs e)
8995
{
9096
if (handler != null)

0 commit comments

Comments
 (0)