Skip to content

Commit

Permalink
Downgraded C# language to version 5.
Browse files Browse the repository at this point in the history 
Localised dialog.
Fixed formatting issues.
  • Loading branch information
@rossknudsen
rossknudsen committed Jul 8, 2016
1 parent 2ffaf5b commit 50b0618
Show file tree
Hide file tree
Showing 8 changed files with 121 additions and 38 deletions.
4 changes: 2 additions & 2 deletions RetailCoder.VBE/Root/RubberduckModule.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public override void Load()
Bind<RubberduckCommandBar>().ToSelf().InSingletonScope();
Bind<TestExplorerModel>().ToSelf().InSingletonScope();
Bind<IOperatingSystem>().To<WindowsOperatingSystem>().InSingletonScope();
Bind<RegisteredLibraryModelService>().To<RegisteredLibraryModelService>().InSingletonScope();
Bind<RegisteredLibraryModelService>().To<RegisteredLibraryModelService>().InSingletonScope();

BindCodeInspectionTypes();

Expand Down Expand Up @@ -371,7 +371,7 @@ private IEnumerable<IMenuItem> GetRubberduckMenuItems()
Kernel.Get<SettingsCommandMenuItem>(),
Kernel.Get<InspectionResultsCommandMenuItem>(),
Kernel.Get<ShowSourceControlPanelCommandMenuItem>(),
Kernel.Get<ReferenceBrowserCommandMenuItem>(),
Kernel.Get<ReferenceBrowserCommandMenuItem>(),
GetUnitTestingParentMenu(),
GetSmartIndenterParentMenu(),
GetRefactoringsParentMenu(),
Expand Down
1 change: 1 addition & 0 deletions RetailCoder.VBE/Rubberduck.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<NoWarn>1591</NoWarn>
<PlatformTarget>AnyCPU</PlatformTarget>
<UseVSHostingProcess>true</UseVSHostingProcess>
<LangVersion>5</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
Expand Down
13 changes: 6 additions & 7 deletions RetailCoder.VBE/UI/ReferenceBrowser/ReferenceBrowser.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<TabControl Padding="5">

<TabItem Header="COM">
<TabItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=ReferenceBrowser_COM}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
Expand All @@ -21,10 +21,9 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>

<TextBlock Margin="5"
Padding="5">
Filter:
</TextBlock>
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=ReferenceBrowser_Filter}"
Margin="5"
Padding="5" />
<TextBox Text="{Binding ComReferencesFilter, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Stretch"
Margin="5"
Expand All @@ -40,7 +39,7 @@
</Grid>
</TabItem>

<TabItem Header="VBA" >
<TabItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=ReferenceBrowser_VBA}" >
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
Expand All @@ -59,7 +58,7 @@
Grid.Row="0"
Margin="5"
Padding="5">
Browse...
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=ReferenceBrowser_Browse}" />
</Button>

<local:ReferenceListControl DataContext="{Binding VbaProjectReferences}"
Expand Down
32 changes: 17 additions & 15 deletions RetailCoder.VBE/UI/ReferenceBrowser/ReferenceBrowserViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,10 @@ public ReferenceBrowserViewModel(VBE vbe, RegisteredLibraryModelService service,

_registeredComReferences = new ObservableCollection<RegisteredLibraryViewModel>();
ComReferences = new CollectionViewSource {Source = _registeredComReferences}.View;
//ComReferences.DeferRefresh();
ComReferences.SortDescriptions.Add(
new SortDescription(nameof(RegisteredLibraryViewModel.CanRemoveReference),
ListSortDirection.Ascending));
ComReferences.SortDescriptions.Add(
new SortDescription(nameof(RegisteredLibraryViewModel.IsActiveProjectReference),
ListSortDirection.Descending));
ComReferences.SortDescriptions.Add(
new SortDescription(nameof(RegisteredLibraryViewModel.Name),
ListSortDirection.Ascending));
//ComReferences.DeferRefresh(); would prefer to use this for performance but gives an error.
ComReferences.SortDescriptions.Add(new SortDescription("CanRemoveReference", ListSortDirection.Ascending));
ComReferences.SortDescriptions.Add(new SortDescription("IsActiveProjectReference", ListSortDirection.Descending));
ComReferences.SortDescriptions.Add(new SortDescription("Name", ListSortDirection.Ascending));
//ComReferences.Refresh();

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

public ICollectionView ComReferences { get; }
public ICollectionView ComReferences { get; private set; }

public ICollectionView VbaProjectReferences { get; }
public ICollectionView VbaProjectReferences { get; private set; }

public string ComReferencesFilter
{
Expand Down Expand Up @@ -121,7 +115,12 @@ private void CreateViewModelForVbaProjectReference(Reference reference)

public void Dispose()
{
(AddVbaProjectReferenceCommand as IDisposable)?.Dispose();

var command = AddVbaProjectReferenceCommand as IDisposable;
if (command != null)
{
command.Dispose();
}
AddVbaProjectReferenceCommand = null;
}

Expand All @@ -135,7 +134,7 @@ internal AddReferenceCommand(IOpenFileDialog filePicker, Action<string> addRefer
{
if (addReferenceCallback == null)
{
throw new ArgumentNullException(nameof(addReferenceCallback));
throw new ArgumentNullException("addReferenceCallback");
}
_addReferenceCallback = addReferenceCallback;
_filePicker = filePicker;
Expand All @@ -158,7 +157,10 @@ protected override void ExecuteImpl(object parameter)

public void Dispose()
{
_filePicker?.Dispose();
if (_filePicker != null)
{
_filePicker.Dispose();
}
_addReferenceCallback = null;
}
}
Expand Down
11 changes: 7 additions & 4 deletions RetailCoder.VBE/UI/ReferenceBrowser/ReferenceListControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</GridViewColumn.CellTemplate>
</GridViewColumn>

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

<TextBlock Margin="0,5,0,0">
<TextBlock.Text>
<MultiBinding StringFormat="Name: {0}">
<MultiBinding StringFormat="\{0\}: \{1\}">
<Binding Path="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Name}" />
<Binding Path="Name" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>

<TextBlock Margin="0,5,0,0">
<TextBlock.Text>
<MultiBinding StringFormat="Path: {0}">
<MultiBinding StringFormat="\{0\}: \{1\}">
<Binding Path="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Path}" />
<Binding Path="FilePath" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>

<TextBlock Margin="0,5,0,5">
<TextBlock.Text>
<MultiBinding StringFormat="Guid: {0}">
<MultiBinding StringFormat="\{0\}: \{1\}">
<Binding Path="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Guid}" />
<Binding Path="Guid" />
</MultiBinding>
</TextBlock.Text>
Expand Down
14 changes: 4 additions & 10 deletions RetailCoder.VBE/UI/ReferenceBrowser/RegisteredLibraryViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public RegisteredLibraryViewModel(VbaReferenceModel model, VBProject activeProje
}
}

public VbaReferenceModel Model { get; }
public VbaReferenceModel Model { get; private set; }

public string FilePath
{
Expand All @@ -42,7 +42,9 @@ public bool IsActiveProjectReference
set
{
if (value == _isActiveReference)
{
return;
}

if (value)
{
Expand All @@ -60,6 +62,7 @@ public bool IsActiveProjectReference
else
{
// TODO warn the user that they cannot remove this reference.
// The user shouldn't be able to remove a builtin reference anyway.
}
}
OnPropertyChanged();
Expand Down Expand Up @@ -97,7 +100,6 @@ public short MajorVersion

private void AddReferenceToActiveProject()
{
//_activeProject.References.AddFromGuid(Guid.ToString("B"), MajorVersion, MinorVersion);
_activeProject.References.AddFromFile(FilePath);
}

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

private bool GetIsActiveProjectReference()
{
//return GetActiveProjectReferenceByGuid(Guid) != null;
return GetActiveProjectReferenceByFilePath(FilePath) != null;
}

private Reference GetActiveProjectReferenceByGuid(Guid guid)
{
return _activeProject.References
.OfType<Reference>()
.SingleOrDefault(r => Guid.Parse(r.Guid) == guid);
}

private Reference GetActiveProjectReferenceByFilePath(string filePath)
{
return _activeProject.References
Expand Down
63 changes: 63 additions & 0 deletions RetailCoder.VBE/UI/RubberduckUI.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions RetailCoder.VBE/UI/RubberduckUI.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1736,4 +1736,25 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
<data name="ReferenceBrowser_Menu" xml:space="preserve">
<value>Reference Browser</value>
</data>
<data name="Filter" xml:space="preserve">
<value>Filter</value>
</data>
<data name="Guid" xml:space="preserve">
<value>GUID</value>
</data>
<data name="Path" xml:space="preserve">
<value>Path</value>
</data>
<data name="ReferenceBrowser_Browse" xml:space="preserve">
<value>Browse...</value>
</data>
<data name="ReferenceBrowser_COM" xml:space="preserve">
<value>COM</value>
</data>
<data name="ReferenceBrowser_Filter" xml:space="preserve">
<value>Filter:</value>
</data>
<data name="ReferenceBrowser_VBA" xml:space="preserve">
<value>VBA</value>
</data>
</root>

0 comments on commit 50b0618

Please sign in to comment.