Merge pull request #3659 from retailcoder/ProjectRefs

Author: retailcoder

RetailCoder.VBE/AddRemoveReferences/RegisteredLibraryFinderService.cs

@@ -97,6 +97,7 @@ private Version GetVersionFromKeyName(string name)
 
         private string GetLibraryPath(RegistryKey versionSubKey, out int subKeyValue)
         {
+            subKeyValue = 0;
             var result = string.Empty;
             foreach (var subKeyName in versionSubKey.GetSubKeyNames())
             {

RetailCoder.VBE/UI/AddRemoveReferences/AddRemoveReferencesViewModel.cs

@@ -10,10 +10,10 @@ namespace Rubberduck.UI.AddRemoveReferences
 {
     public class AddRemoveReferencesViewModel : ViewModelBase
     {
-        public AddRemoveReferencesViewModel(IEnumerable<ReferenceModel> model)
+        public AddRemoveReferencesViewModel(IReadOnlyList<ReferenceModel> model)
         {
             ComLibraries = model.Where(item => item.Type == ReferenceKind.TypeLibrary);
-
+            VbaProjects = model.Where(item => item.Type == ReferenceKind.Project);
         }
 
         /// <summary>
@@ -31,7 +31,14 @@ public AddRemoveReferencesViewModel(IEnumerable<ReferenceModel> model)
         /// </summary>
         public ICommand MoveUpCommand { get; }
 
+        /// <summary>
+        /// Moves the <see cref="SelectedReference"/> down on the 'Priority' tab.
+        /// </summary>
+        public ICommand MoveDownCommand { get; }
+
         public IEnumerable<ReferenceModel> ComLibraries { get; }
+        public IEnumerable<ReferenceModel> VbaProjects { get; }
+
         public ReferenceModel SelectedLibrary { get; }
         public ReferenceModel SelectedProject { get; }
         public ReferenceModel SelectedReference { get; }

RetailCoder.VBE/UI/AddRemoveReferences/AddRemoveReferencesWindow.xaml

@@ -15,6 +15,7 @@
         <BitmapImage x:Key="VbaProjectIcon" UriSource="../../Resources/Custom/PNG/ObjectClass.png" />
         <BitmapImage x:Key="PriorityIcon" UriSource="../../Resources/edit-list-order.png" />
         <BitmapImage x:Key="MoveUpIcon" UriSource="../../Resources/arrow-090.png" />
+        <BitmapImage x:Key="MoveDownIcon" UriSource="../../Resources/arrow-270.png" />
 
         <local:ReferenceStatusImageSourceConverter x:Key="StatusToIcon" />
         <Style x:Key="DialogButtonStyle" TargetType="Button">
@@ -141,7 +142,7 @@
                                 </Grid>
                             </Border>
                             <ListView Margin="10"
-                                      ItemsSource="{Binding ComLibraries}"
+                                      ItemsSource="{Binding VbaProjects}"
                                       SelectedItem="{Binding SelectedProject}"
                                       HorizontalContentAlignment="Stretch">
                                 <ListView.ItemTemplate>
@@ -186,13 +187,19 @@
                                                 <ColumnDefinition Width="50" />
                                                 <ColumnDefinition Width="*" />
                                                 <ColumnDefinition Width="20" />
+                                                <ColumnDefinition Width="20" />
                                             </Grid.ColumnDefinitions>
                                             <TextBlock Grid.Column="0" Text="{Binding Name}" Margin="2,0" />
                                             <TextBlock Grid.Column="1" Text="{Binding Version}" Margin="2,0" />
                                             <TextBlock Grid.Column="2" Text="{Binding Description}" Margin="2,0" />
-                                            <Button Grid.Column="3" Command="{Binding DataContext.MoveUpCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:AddRemoveReferencesWindow}}}">
+                                            <Button Grid.Column="3" Margin="1"
+                                                    Command="{Binding DataContext.MoveUpCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:AddRemoveReferencesWindow}}}">
                                                 <Image Source="{StaticResource MoveUpIcon}" />
                                             </Button>
+                                            <Button Grid.Column="4" Margin="1"
+                                                    Command="{Binding DataContext.MoveDownCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:AddRemoveReferencesWindow}}}">
+                                                <Image Source="{StaticResource MoveDownIcon}" />
+                                            </Button>
                                         </Grid>
                                     </DataTemplate>
                                 </ListView.ItemTemplate>