press Enter to search, Press Escape to clear search, add icon fixes#6, add double click to open file fixes#5, replace new lines on snippet preview fixes#2

Author: unitycoder

FindInFiles/FindInFiles.csproj

@@ -32,6 +32,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>findinfiles.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -92,5 +95,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="findinfiles.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

FindInFiles/MainWindow.xaml

@@ -8,11 +8,15 @@
         mc:Ignorable="d"
         Title="FindInFiles" Height="392.388" Width="781.747">
 	<Grid>
-		<Button x:Name="btnFind" Content="Find" HorizontalAlignment="Left" Margin="242,19,0,0" VerticalAlignment="Top" Width="75" Click="btnFind_Click"/>
-		<Button x:Name="btnBrowse" Content="..." HorizontalAlignment="Left" Margin="686,17,0,0" VerticalAlignment="Top" Width="75" Click="btnBrowse_Click"/>
-		<TextBox x:Name="txtString" HorizontalAlignment="Left" Height="23" Margin="10,18,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="227"/>
-		<TextBox x:Name="txtFolder" HorizontalAlignment="Left" Height="23" Margin="356,15,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="325"/>
-		<DataGrid x:Name="gridResults" HorizontalAlignment="Left" Height="296" Margin="10,55,0,0" VerticalAlignment="Top" Width="754"/>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="29*"/>
+			<ColumnDefinition Width="100*"/>
+		</Grid.ColumnDefinitions>
+		<Button x:Name="btnFind" Content="Find" HorizontalAlignment="Left" Margin="68.255,19,0,0" VerticalAlignment="Top" Width="75" Click="btnFind_Click" Grid.Column="1"/>
+		<Button x:Name="btnBrowse" Content="..." HorizontalAlignment="Left" Margin="512.255,17,0,0" VerticalAlignment="Top" Width="75" Click="btnBrowse_Click" Grid.Column="1"/>
+		<TextBox x:Name="txtSearch" HorizontalAlignment="Left" Height="23" Margin="10,18,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="227" KeyDown="OnKeyDownSearch" Grid.ColumnSpan="2"/>
+		<TextBox x:Name="txtFolder" HorizontalAlignment="Left" Height="23" Margin="182.255,15,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="325" Grid.Column="1"/>
+		<DataGrid x:Name="gridResults" HorizontalAlignment="Left" Height="296" Margin="10,55,0,0" VerticalAlignment="Top" Width="754" Grid.ColumnSpan="2" MouseDoubleClick="gridResults_MouseDoubleClick" IsReadOnly="True"/>
 
 	</Grid>
 </Window>

FindInFiles/MainWindow.xaml.cs

@@ -1,9 +1,11 @@
 // simple Find In Files tool for searching files containting given string
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Windows;
+using System.Windows.Input;
 
 namespace FindInFiles
 {
@@ -36,9 +38,9 @@ void Start()
 
         private void btnFind_Click(object sender, RoutedEventArgs e)
         {
-            if (string.IsNullOrEmpty(txtString.Text) == false)
+            if (string.IsNullOrEmpty(txtSearch.Text) == false)
             {
-                SearchFiles(txtString.Text, txtFolder.Text);
+                SearchFiles(txtSearch.Text, txtFolder.Text);
             }
         }
 
@@ -47,10 +49,38 @@ private void btnBrowse_Click(object sender, RoutedEventArgs e)
             // TODO browse for folder
         }
 
+        // special keys for search field
+        private void OnKeyDownSearch(object sender, KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Escape:
+                    txtSearch.Text = "";
+                    break;
+                case Key.Return:
+                    SearchFiles(txtSearch.Text, txtFolder.Text);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        // open file on double click
+        private void gridResults_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (gridResults.SelectedItem == null) return;
+            var selectedRow = gridResults.SelectedItem as ResultItem;
+
+            Process myProcess = new Process();
+            myProcess.StartInfo.FileName = selectedRow.path;
+            //myProcess.StartInfo.Arguments = "-n###" ;// TODO jump to line in notepad++, but need to know linenumber..
+            myProcess.Start();
+        }
+
         void SearchFiles(string searchString, string sourceFolder)
         {
             // validate folder
-            if (Directory.Exists(sourceFolder)==false)
+            if (Directory.Exists(sourceFolder) == false)
             {
                 return;
             }
@@ -74,6 +104,13 @@ void SearchFiles(string searchString, string sourceFolder)
                     var o = new ResultItem();
                     o.path = files[i];
                     o.snippet = wholeFile.Substring(hitIndex, (previewSnippetLength + hitIndex >= wholeFile.Length) ? wholeFile.Length : previewSnippetLength);
+                    o.snippet = o.snippet.Replace('\n', '¶'); // replace end of lines
+
+                    // TODO get linenumber, or estimate?
+                    // but that would mean have to parse again??
+                    // maybe do this only if selected file.. (but that means need to read file again..)
+                    // o.lineNumber = ...
+
                     results.Add(o);
                     continue;
                 }
@@ -87,6 +124,7 @@ public class ResultItem
 {
     public string path { get; set; }
     public string snippet { get; set; }
+    //    public int lineNumber { get; set; }
 }