Merge pull request #5 from 63BeetleSmurf/development

Merge changes for version 1.7.0
63BeetleSmurf · May 5, 2023 · f560c48 · f560c48
2 parents b579374 + 754c472
commit f560c48
Show file tree

Hide file tree

Showing 8 changed files with 296 additions and 18 deletions.
diff --git a/Pinny Notes Setup/Pinny Notes Setup.vdproj b/Pinny Notes Setup/Pinny Notes Setup.vdproj
@@ -209,15 +209,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Pinny Notes"
-        "ProductCode" = "8:{9D8E27FC-5AD4-42CA-B282-55D265C0FF8F}"
-        "PackageCode" = "8:{605FC7DA-1F23-4ADC-AC3C-38644FD4A34D}"
+        "ProductCode" = "8:{034D3F76-17B8-419C-8E61-6763A0814EF7}"
+        "PackageCode" = "8:{985A5D37-2C06-4D9E-B3E3-680ECF9B7C12}"
         "UpgradeCode" = "8:{00EE94A1-B733-4C39-90EF-4F9348EFD074}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.6.0"
+        "ProductVersion" = "8:1.7.0"
         "Manufacturer" = "8:63BeetleSmurf"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://github.com/63BeetleSmurf/pinny_notes/issues"
@@ -759,7 +759,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_986FCBA950114798AC8BD4B2D210DD8A"
             {
-            "SourcePath" = "8:..\\Pinny Notes\\obj\\Debug\\net6.0-windows\\apphost.exe"
+            "SourcePath" = "8:..\\Pinny Notes\\obj\\Release\\net6.0-windows\\apphost.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_7785C5DEE194483AA2B024842491A9A3"

diff --git a/Pinny Notes/App.config b/Pinny Notes/App.config
@@ -40,6 +40,15 @@
             <setting name="TrimPastedText" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="KeepNewLineAtEndVisible" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="AutoIndent" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="MiddleClickPaste" serializeAs="String">
+                <value>True</value>
+            </setting>
         </Pinny_Notes.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/Pinny Notes/MainWindow.xaml b/Pinny Notes/MainWindow.xaml
@@ -33,7 +33,7 @@
             <RowDefinition Height="40"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <Grid Name="TitleBarGrid" Grid.Column="0" Grid.Row="0">
+        <Grid Name="TitleBarGrid" Grid.Column="0" Grid.Row="0" MouseDown="TitleBar_MouseDown">
             <Button Name="NewButton" Background="Transparent" Width="20" Height="20" HorizontalAlignment="Left" Margin="10,0,0,0" Click="NewButton_Click" ToolTip="New Note" Padding="0,0,0,0" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Focusable="False">
                 <Image Source="/Images/plus-solid.png"/>
             </Button>
@@ -70,10 +70,15 @@
                         <MenuItem Header="Copy &amp; Paste">
                             <MenuItem Name="TrimCopiedTextMenuItem" Header="Trim Copied Text" IsCheckable="True" Click="TrimCopiedTextMenuItem_Click"/>
                             <MenuItem Name="TrimPastedTextMenuItem" Header="Trim Pasted Text" IsCheckable="True" Click="TrimPastedTextMenuItem_Click"/>
+                            <MenuItem Name="MiddleClickPasteMenuItem" Header="Middle Click Paste" IsCheckable="True" Click="MiddleClickPasteMenuItem_Click"/>
                             <MenuItem Name="AutoCopyMenuItem" Header="Auto Copy" IsCheckable="True" Click="AutoCopyMenuItem_Click"/>
                         </MenuItem>
                         <MenuItem Name="SpellCheckMenuItem" Header="Spell Checker" IsCheckable="True" Click="SpellCheckMenuItem_Click"/>
-                        <MenuItem Name="NewLineMenuItem" Header="New Line At End" IsCheckable="True" Click="NewLineMenuItem_Click"/>
+                        <MenuItem Header="New Line At End">
+                            <MenuItem Name="NewLineEnabledMenuItem" Header="Enabled" IsCheckable="True" Click="NewLineEnabledMenuItem_Click"/>
+                            <MenuItem Name="NewLineKeepVisibleMenuItem" Header="Keep Visible" IsCheckable="True" Click="NewLineKeepVisibleMenuItem_Click"/>
+                        </MenuItem>
+                        <MenuItem Name="AutoIndentMenuItem" Header="Auto Indent" IsCheckable="True" Click="AutoIndentMenuItem_Click"/>
                         <MenuItem Name="CheckForUpdatesMenuItem" Header="Check For Updates" IsCheckable="True" Click="CheckForUpdatesMenuItem_Click"/>
                     </MenuItem>
                 </ContextMenu>
@@ -87,11 +92,14 @@
                 Background="Transparent"
                 ContextMenuOpening="NoteTextBox_ContextMenuOpening"
                 FontSize="16"
+                MouseDoubleClick="NoteTextBox_MouseDoubleClick"
                 Name="NoteTextBox"
                 Padding="5,5,5,5"
                 PreviewDragOver="NoteTextBox_DragOver"
                 PreviewDrop="NoteTextBox_Drop"
+                PreviewKeyDown="NoteTextBox_PreviewKeyDown"
                 PreviewMouseDown="NoteTextBox_MouseDown"
+                PreviewMouseUp="NoteTextBox_MouseUp"
                 SelectionChanged="NoteTextBox_SelectionChanged"
                 TextChanged="NoteTextBox_TextChanged"
                 TextWrapping="Wrap"