Merge branch 'next' into next

Author: bclothier

RetailCoder.VBE/UI/FindSymbol/FindSymbolControl.xaml

@@ -21,7 +21,8 @@
             <ColumnDefinition Width="32" />
         </Grid.ColumnDefinitions>
 
-        <ComboBox IsEditable="True"
+        <ComboBox x:Name="searchComboBox"
+                  IsEditable="True"
                   ItemsSource="{Binding MatchResults}"
                   SelectedItem="{Binding SelectedItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                   IsTextSearchCaseSensitive="False"

RetailCoder.VBE/UI/FindSymbol/FindSymbolControl.xaml.cs

@@ -11,6 +11,7 @@ public partial class FindSymbolControl : UserControl
         public FindSymbolControl()
         {
             InitializeComponent();
+            Loaded += FindSymbolControl_Loaded;
         }
 
         private FindSymbolViewModel ViewModel { get { return (FindSymbolViewModel)DataContext; } }
@@ -43,5 +44,10 @@ private void UIElement_OnPreviewKeyDown(object sender, KeyEventArgs e)
                 e.Handled = true;
             }
         }
+
+        private void FindSymbolControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
+        {
+            searchComboBox.Focus();
+        }
     }
-}
+}

RetailCoder.VBE/UI/FindSymbol/FindSymbolDialog.cs

@@ -26,7 +26,7 @@ private void viewModel_Navigate(object sender, NavigateCodeEventArgs e)
         public FindSymbolDialog()
         {
             InitializeComponent();
-
+            
             Text = string.Format("Rubberduck - {0}", RubberduckUI.FindSymbolDialog_Caption);
         }
 
@@ -40,4 +40,4 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
             return base.ProcessCmdKey(ref msg, keyData);
         }
     }
-}
+}

RetailCoder.VBE/UI/FindSymbol/FindSymbolViewModel.cs

@@ -83,7 +83,6 @@ public string SearchString
             get { return _searchString; }
             set
             {
-                //Adding SelectedItem.set() will allow pasting to work?
                 SearchResult firstResult = GetSearchResultCollectionOfString(value).FirstOrDefault();
                 SelectedItem = firstResult;
 

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -2032,7 +2032,7 @@ Would you like to import them to Rubberduck?</value>
     <value>Identifier {0} cannot be renamed.</value>
   </data>
   <data name="RenameDialog_DefaultRenameError" xml:space="preserve">
-    <value>Coult not rename {0}.</value>
+    <value>Could not rename {0}.</value>
   </data>
   <data name="RenameDialog_InterfaceRenameError" xml:space="preserve">
     <value>Could not rename Interface Member {0}.</value>