Add menu entries for new Find / Replace / GoTo dialogs

fernandreu · Apr 12, 2019 · 774d3b8 · 774d3b8
1 parent b06c31d
commit 774d3b8
Show file tree

Hide file tree

Showing 16 changed files with 115 additions and 5 deletions.
diff --git a/OfficeRibbonXEditor/OfficeRibbonXEditor.csproj b/OfficeRibbonXEditor/OfficeRibbonXEditor.csproj
@@ -91,15 +91,15 @@
       <HintPath>..\packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="ScintillaNET FindReplaceDialog, Version=1.4.0.17540, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ScintillaNet.SearchBox.1.0.3\lib\net45\ScintillaNET FindReplaceDialog.dll</HintPath>
-    </Reference>
     <Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
     </Reference>
     <Reference Include="ScintillaNET.WPF, Version=1.0.0.16559, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\estebano.ScintillaNET.WPF.2.6.0\lib\net40\ScintillaNET.WPF.dll</HintPath>
     </Reference>
+    <Reference Include="ScintillaNET_FindReplaceDialog, Version=1.0.3.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ScintillaNET_FindReplaceDialog.1.0.3.3\lib\net40-client\ScintillaNET_FindReplaceDialog.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
@@ -318,6 +318,32 @@
   <ItemGroup>
     <Resource Include="Resources\Images\bricks.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\find.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\find_next.png" />
+    <Resource Include="Resources\Images\find_previous.png" />
+    <Resource Include="Resources\Images\go_to.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\XToCloseButton.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\UpButton.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Highlighter.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DownButton.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Clock.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Clock.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Fody.4.0.2\build\Fody.targets" Condition="Exists('..\packages\Fody.4.0.2\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/OfficeRibbonXEditor/Resources/Clock.ico b/OfficeRibbonXEditor/Resources/Clock.ico
diff --git a/OfficeRibbonXEditor/Resources/Clock.png b/OfficeRibbonXEditor/Resources/Clock.png
diff --git a/OfficeRibbonXEditor/Resources/DownButton.png b/OfficeRibbonXEditor/Resources/DownButton.png
diff --git a/OfficeRibbonXEditor/Resources/Highlighter.png b/OfficeRibbonXEditor/Resources/Highlighter.png
diff --git a/OfficeRibbonXEditor/Resources/Images/find.png b/OfficeRibbonXEditor/Resources/Images/find.png
diff --git a/OfficeRibbonXEditor/Resources/Images/find_next.png b/OfficeRibbonXEditor/Resources/Images/find_next.png
diff --git a/OfficeRibbonXEditor/Resources/Images/find_previous.png b/OfficeRibbonXEditor/Resources/Images/find_previous.png
diff --git a/OfficeRibbonXEditor/Resources/Images/go_to.png b/OfficeRibbonXEditor/Resources/Images/go_to.png
diff --git a/OfficeRibbonXEditor/Resources/ImagesResource.Designer.cs b/OfficeRibbonXEditor/Resources/ImagesResource.Designer.cs
diff --git a/OfficeRibbonXEditor/Resources/ImagesResource.resx b/OfficeRibbonXEditor/Resources/ImagesResource.resx
@@ -136,6 +136,18 @@
   <data name="excelwkb" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>images\excelwkb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="find" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Images\find.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="find_next" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Images\find_next.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="find_previous" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Images\find_previous.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="go_to" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Images\go_to.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="insertPicture" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>images\insertpicture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

diff --git a/OfficeRibbonXEditor/Resources/UpButton.png b/OfficeRibbonXEditor/Resources/UpButton.png
diff --git a/OfficeRibbonXEditor/Resources/XToCloseButton.png b/OfficeRibbonXEditor/Resources/XToCloseButton.png
diff --git a/OfficeRibbonXEditor/Views/MainWindow.xaml b/OfficeRibbonXEditor/Views/MainWindow.xaml
@@ -114,6 +114,38 @@
                 <MenuItem Header="Exit" Click="OnExitClick"/>
             </MenuItem>
             <MenuItem Header="_Edit" IsEnabled="{Binding IsPartSelected}">
+                <MenuItem Header="Find..." InputGestureText="Ctrl+F" Command="{Binding ElementName=Window, Path=FindReplaceDialog, Converter={StaticResource MethodToCommandConverter}, ConverterParameter='ShowFind'}">
+                    <MenuItem.Icon>
+                        <Image Source="/Resources/Images/find.png"
+                               Width="{Binding Source={x:Static properties:Settings.Default}, Path=IconSize}" 
+                               Height="{Binding Source={x:Static properties:Settings.Default}, Path=IconSize}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Replace..." InputGestureText="Ctrl+H" Command="{Binding ElementName=Window, Path=FindReplaceDialog, Converter={StaticResource MethodToCommandConverter}, ConverterParameter='ShowReplace'}"/>
+                <MenuItem Header="Incremental Search..." InputGestureText="Ctrl+I" Command="{Binding ElementName=Window, Path=FindReplaceDialog, Converter={StaticResource MethodToCommandConverter}, ConverterParameter='ShowIncrementalSearch'}"/>
+                <MenuItem Header="Find Previous" InputGestureText="Shift+F3" Command="{Binding ElementName=Window, Path=FindReplaceDialog.Window, Converter={StaticResource MethodToCommandConverter}, ConverterParameter='FindPrevious'}">
+                    <MenuItem.Icon>
+                        <Image Source="/Resources/Images/find_previous.png"
+                               Width="{Binding Source={x:Static properties:Settings.Default}, Path=IconSize}" 
+                               Height="{Binding Source={x:Static properties:Settings.Default}, Path=IconSize}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Find Next" InputGestureText="F3" Command="{Binding ElementName=Window, Path=FindReplaceDialog.Window, Converter={StaticResource MethodToCommandConverter}, ConverterParameter='FindNext'}">
+                    <MenuItem.Icon>
+                        <Image Source="/Resources/Images/find_next.png"
+                               Width="{Binding Source={x:Static properties:Settings.Default}, Path=IconSize}" 
+                               Height="{Binding Source={x:Static properties:Settings.Default}, Path=IconSize}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <Separator/>
+                <MenuItem Header="Go To Line..." InputGestureText="Ctrl+G" Command="{Binding ElementName=Window, Path=GoToCommand}">
+                    <MenuItem.Icon>
+                        <Image Source="/Resources/Images/go_to.png"
+                               Width="{Binding Source={x:Static properties:Settings.Default}, Path=IconSize}" 
+                               Height="{Binding Source={x:Static properties:Settings.Default}, Path=IconSize}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <Separator/>
                 <MenuItem Header="Undo" InputGestureText="Ctrl+Z" Command="{Binding ElementName=Editor, Converter={StaticResource MethodToCommandConverter}, ConverterParameter='Undo'}">
                     <MenuItem.Icon>
                         <Image Source="/Resources/Images/undo.png"

diff --git a/OfficeRibbonXEditor/packages.config b/OfficeRibbonXEditor/packages.config
@@ -9,5 +9,5 @@
   <package id="JetBrains.Annotations" version="2018.3.0" targetFramework="net461" />
   <package id="log4net" version="1.2.10" targetFramework="net461" />
   <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net461" />
-  <package id="ScintillaNet.SearchBox" version="1.0.3" targetFramework="net461" />
+  <package id="ScintillaNET_FindReplaceDialog" version="1.0.3.3" targetFramework="net461" />
 </packages>
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -19,4 +19,4 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.3.0.*")]
+[assembly: AssemblyVersion("1.4.0.*")]