Skip to content

Commit 50b0618

Browse files
committed
Downgraded C# language to version 5.
Localised dialog. Fixed formatting issues.
1 parent 2ffaf5b commit 50b0618

File tree

8 files changed

+121
-38
lines changed

8 files changed

+121
-38
lines changed

RetailCoder.VBE/Root/RubberduckModule.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public override void Load()
6868
Bind<RubberduckCommandBar>().ToSelf().InSingletonScope();
6969
Bind<TestExplorerModel>().ToSelf().InSingletonScope();
7070
Bind<IOperatingSystem>().To<WindowsOperatingSystem>().InSingletonScope();
71-
Bind<RegisteredLibraryModelService>().To<RegisteredLibraryModelService>().InSingletonScope();
71+
Bind<RegisteredLibraryModelService>().To<RegisteredLibraryModelService>().InSingletonScope();
7272

7373
BindCodeInspectionTypes();
7474

@@ -371,7 +371,7 @@ private IEnumerable<IMenuItem> GetRubberduckMenuItems()
371371
Kernel.Get<SettingsCommandMenuItem>(),
372372
Kernel.Get<InspectionResultsCommandMenuItem>(),
373373
Kernel.Get<ShowSourceControlPanelCommandMenuItem>(),
374-
Kernel.Get<ReferenceBrowserCommandMenuItem>(),
374+
Kernel.Get<ReferenceBrowserCommandMenuItem>(),
375375
GetUnitTestingParentMenu(),
376376
GetSmartIndenterParentMenu(),
377377
GetRefactoringsParentMenu(),

RetailCoder.VBE/Rubberduck.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<NoWarn>1591</NoWarn>
3030
<PlatformTarget>AnyCPU</PlatformTarget>
3131
<UseVSHostingProcess>true</UseVSHostingProcess>
32+
<LangVersion>5</LangVersion>
3233
</PropertyGroup>
3334
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3435
<DebugType>full</DebugType>

RetailCoder.VBE/UI/ReferenceBrowser/ReferenceBrowser.xaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<TabControl Padding="5">
1212

13-
<TabItem Header="COM">
13+
<TabItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=ReferenceBrowser_COM}">
1414
<Grid>
1515
<Grid.RowDefinitions>
1616
<RowDefinition Height="Auto"/>
@@ -21,10 +21,9 @@
2121
<ColumnDefinition />
2222
</Grid.ColumnDefinitions>
2323

24-
<TextBlock Margin="5"
25-
Padding="5">
26-
Filter:
27-
</TextBlock>
24+
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=ReferenceBrowser_Filter}"
25+
Margin="5"
26+
Padding="5" />
2827
<TextBox Text="{Binding ComReferencesFilter, UpdateSourceTrigger=PropertyChanged}"
2928
HorizontalAlignment="Stretch"
3029
Margin="5"
@@ -40,7 +39,7 @@
4039
</Grid>
4140
</TabItem>
4241

43-
<TabItem Header="VBA" >
42+
<TabItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=ReferenceBrowser_VBA}" >
4443
<Grid>
4544
<Grid.RowDefinitions>
4645
<RowDefinition Height="Auto"/>
@@ -59,7 +58,7 @@
5958
Grid.Row="0"
6059
Margin="5"
6160
Padding="5">
62-
Browse...
61+
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=ReferenceBrowser_Browse}" />
6362
</Button>
6463

6564
<local:ReferenceListControl DataContext="{Binding VbaProjectReferences}"

RetailCoder.VBE/UI/ReferenceBrowser/ReferenceBrowserViewModel.cs

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,10 @@ public ReferenceBrowserViewModel(VBE vbe, RegisteredLibraryModelService service,
2626

2727
_registeredComReferences = new ObservableCollection<RegisteredLibraryViewModel>();
2828
ComReferences = new CollectionViewSource {Source = _registeredComReferences}.View;
29-
//ComReferences.DeferRefresh();
30-
ComReferences.SortDescriptions.Add(
31-
new SortDescription(nameof(RegisteredLibraryViewModel.CanRemoveReference),
32-
ListSortDirection.Ascending));
33-
ComReferences.SortDescriptions.Add(
34-
new SortDescription(nameof(RegisteredLibraryViewModel.IsActiveProjectReference),
35-
ListSortDirection.Descending));
36-
ComReferences.SortDescriptions.Add(
37-
new SortDescription(nameof(RegisteredLibraryViewModel.Name),
38-
ListSortDirection.Ascending));
29+
//ComReferences.DeferRefresh(); would prefer to use this for performance but gives an error.
30+
ComReferences.SortDescriptions.Add(new SortDescription("CanRemoveReference", ListSortDirection.Ascending));
31+
ComReferences.SortDescriptions.Add(new SortDescription("IsActiveProjectReference", ListSortDirection.Descending));
32+
ComReferences.SortDescriptions.Add(new SortDescription("Name", ListSortDirection.Ascending));
3933
//ComReferences.Refresh();
4034

4135
_vbaProjectReferences = new ObservableCollection<RegisteredLibraryViewModel>();
@@ -47,9 +41,9 @@ public ReferenceBrowserViewModel(VBE vbe, RegisteredLibraryModelService service,
4741
AddVbaProjectReferenceCommand = new AddReferenceCommand(filePicker, AddVbaReference);
4842
}
4943

50-
public ICollectionView ComReferences { get; }
44+
public ICollectionView ComReferences { get; private set; }
5145

52-
public ICollectionView VbaProjectReferences { get; }
46+
public ICollectionView VbaProjectReferences { get; private set; }
5347

5448
public string ComReferencesFilter
5549
{
@@ -121,7 +115,12 @@ private void CreateViewModelForVbaProjectReference(Reference reference)
121115

122116
public void Dispose()
123117
{
124-
(AddVbaProjectReferenceCommand as IDisposable)?.Dispose();
118+
119+
var command = AddVbaProjectReferenceCommand as IDisposable;
120+
if (command != null)
121+
{
122+
command.Dispose();
123+
}
125124
AddVbaProjectReferenceCommand = null;
126125
}
127126

@@ -135,7 +134,7 @@ internal AddReferenceCommand(IOpenFileDialog filePicker, Action<string> addRefer
135134
{
136135
if (addReferenceCallback == null)
137136
{
138-
throw new ArgumentNullException(nameof(addReferenceCallback));
137+
throw new ArgumentNullException("addReferenceCallback");
139138
}
140139
_addReferenceCallback = addReferenceCallback;
141140
_filePicker = filePicker;
@@ -158,7 +157,10 @@ protected override void ExecuteImpl(object parameter)
158157

159158
public void Dispose()
160159
{
161-
_filePicker?.Dispose();
160+
if (_filePicker != null)
161+
{
162+
_filePicker.Dispose();
163+
}
162164
_addReferenceCallback = null;
163165
}
164166
}

RetailCoder.VBE/UI/ReferenceBrowser/ReferenceListControl.xaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</GridViewColumn.CellTemplate>
2828
</GridViewColumn>
2929

30-
<GridViewColumn Header="Name"
30+
<GridViewColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Name}"
3131
Width="400">
3232
<GridViewColumn.CellTemplate>
3333
<DataTemplate DataType="local:RegisteredLibraryViewModel">
@@ -46,23 +46,26 @@
4646

4747
<TextBlock Margin="0,5,0,0">
4848
<TextBlock.Text>
49-
<MultiBinding StringFormat="Name: {0}">
49+
<MultiBinding StringFormat="\{0\}: \{1\}">
50+
<Binding Path="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Name}" />
5051
<Binding Path="Name" />
5152
</MultiBinding>
5253
</TextBlock.Text>
5354
</TextBlock>
5455

5556
<TextBlock Margin="0,5,0,0">
5657
<TextBlock.Text>
57-
<MultiBinding StringFormat="Path: {0}">
58+
<MultiBinding StringFormat="\{0\}: \{1\}">
59+
<Binding Path="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Path}" />
5860
<Binding Path="FilePath" />
5961
</MultiBinding>
6062
</TextBlock.Text>
6163
</TextBlock>
6264

6365
<TextBlock Margin="0,5,0,5">
6466
<TextBlock.Text>
65-
<MultiBinding StringFormat="Guid: {0}">
67+
<MultiBinding StringFormat="\{0\}: \{1\}">
68+
<Binding Path="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Guid}" />
6669
<Binding Path="Guid" />
6770
</MultiBinding>
6871
</TextBlock.Text>

RetailCoder.VBE/UI/ReferenceBrowser/RegisteredLibraryViewModel.cs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public RegisteredLibraryViewModel(VbaReferenceModel model, VBProject activeProje
2424
}
2525
}
2626

27-
public VbaReferenceModel Model { get; }
27+
public VbaReferenceModel Model { get; private set; }
2828

2929
public string FilePath
3030
{
@@ -42,7 +42,9 @@ public bool IsActiveProjectReference
4242
set
4343
{
4444
if (value == _isActiveReference)
45+
{
4546
return;
47+
}
4648

4749
if (value)
4850
{
@@ -60,6 +62,7 @@ public bool IsActiveProjectReference
6062
else
6163
{
6264
// TODO warn the user that they cannot remove this reference.
65+
// The user shouldn't be able to remove a builtin reference anyway.
6366
}
6467
}
6568
OnPropertyChanged();
@@ -97,7 +100,6 @@ public short MajorVersion
97100

98101
private void AddReferenceToActiveProject()
99102
{
100-
//_activeProject.References.AddFromGuid(Guid.ToString("B"), MajorVersion, MinorVersion);
101103
_activeProject.References.AddFromFile(FilePath);
102104
}
103105

@@ -124,17 +126,9 @@ private bool RemoveReferenceFromActiveProject()
124126

125127
private bool GetIsActiveProjectReference()
126128
{
127-
//return GetActiveProjectReferenceByGuid(Guid) != null;
128129
return GetActiveProjectReferenceByFilePath(FilePath) != null;
129130
}
130131

131-
private Reference GetActiveProjectReferenceByGuid(Guid guid)
132-
{
133-
return _activeProject.References
134-
.OfType<Reference>()
135-
.SingleOrDefault(r => Guid.Parse(r.Guid) == guid);
136-
}
137-
138132
private Reference GetActiveProjectReferenceByFilePath(string filePath)
139133
{
140134
return _activeProject.References

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

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

RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1736,4 +1736,25 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
17361736
<data name="ReferenceBrowser_Menu" xml:space="preserve">
17371737
<value>Reference Browser</value>
17381738
</data>
1739+
<data name="Filter" xml:space="preserve">
1740+
<value>Filter</value>
1741+
</data>
1742+
<data name="Guid" xml:space="preserve">
1743+
<value>GUID</value>
1744+
</data>
1745+
<data name="Path" xml:space="preserve">
1746+
<value>Path</value>
1747+
</data>
1748+
<data name="ReferenceBrowser_Browse" xml:space="preserve">
1749+
<value>Browse...</value>
1750+
</data>
1751+
<data name="ReferenceBrowser_COM" xml:space="preserve">
1752+
<value>COM</value>
1753+
</data>
1754+
<data name="ReferenceBrowser_Filter" xml:space="preserve">
1755+
<value>Filter:</value>
1756+
</data>
1757+
<data name="ReferenceBrowser_VBA" xml:space="preserve">
1758+
<value>VBA</value>
1759+
</data>
17391760
</root>

0 commit comments

Comments
 (0)