One.Toolbox

优化NotePad重命名的逻辑:

Author: panwenbo

One.Toolbox/Helpers/PathHelper.cs

@@ -1,6 +1,4 @@
-using One.Toolbox.Views.Stick;
-
-using System.IO;
+using System.IO;
 
 namespace One.Toolbox.Helpers
 {

One.Toolbox/ViewModels/MainWindow/MainWindowVM.cs

@@ -83,7 +83,7 @@ public MainWindowVM()
                 //TargetPageType = typeof(Views.NotePad.NotePadPage),
                 Content = new Views.Stick.StickPage(),
             },
-            new MainMenuItemVM()
+            new()
             {
                 Header = "EveryImage",
                 Icon = ResourceHelper.Dic["ImageArea"],
@@ -105,7 +105,7 @@ public MainWindowVM()
             //    Content = new Views.TestPage(),
             //},
         //倒叙
-        new MainMenuItemVM()
+        new()
             {
                 Header = "Setting",
                 Icon = ResourceHelper.Dic["SettingsRound"],

One.Toolbox/ViewModels/NotePad/EditFileInfoVM.cs

@@ -7,8 +7,10 @@
 using One.Toolbox.Helpers;
 
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.IO;
 using System.Text;
+using System.Windows.Controls;
 
 namespace One.Toolbox.ViewModels.NotePad;
 
@@ -80,6 +82,8 @@ public EditFileInfoVM(string filePath)
         HighlightingDefinitionOC = HighlightingManager.Instance.HighlightingDefinitions;
     }
 
+    #region RelayCommand
+
     [RelayCommand]
     private void OpenFile()
     {
@@ -90,6 +94,12 @@ private void OpenFile()
         }
     }
 
+    [RelayCommand]
+    private void OpenFilePath()
+    {
+        Process.Start("explorer.exe", PathHelper.dataPath);
+    }
+
     [RelayCommand]
     private void SaveFile()
     {
@@ -112,6 +122,28 @@ private void OnSelectedHighlightingChanged(object obj)
             return;
     }
 
+    [RelayCommand]
+    private void RenameFile(object obj)
+    {
+        var parent = obj as Grid;
+        var txb = parent.FindName("txb1") as TextBox;
+        if (txb != null)
+        {
+            IsEditFileName = true;
+            txb.LostFocus += Txb_LostFocus;
+            var res = txb.Focus();
+
+            //txb.SelectAll();
+        }
+    }
+
+    private void Txb_LostFocus(object sender, RoutedEventArgs e)
+    {
+        IsEditFileName = false;
+    }
+
+    #endregion RelayCommand
+
     partial void OnFileNameChanged(string? oldValue, string newValue)
     {
         if (oldValue == null)

One.Toolbox/ViewModels/NotePad/NotePadPageVM.cs

@@ -9,7 +9,6 @@
 using One.Toolbox.ViewModels.Setting;
 
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.IO;
 
 namespace One.Toolbox.ViewModels.NotePad;
@@ -101,27 +100,6 @@ private void DeleteFile()
         }
     }
 
-    [RelayCommand]
-    private void RenameFile()
-    {
-        if (SelectedEditFileInfo != null)
-        {
-            //var newFileName = "";
-            //SelectedEditFileInfo.RenameFile(newFileName);
-
-            SelectedEditFileInfo.IsEditFileName = true;
-        }
-    }
-
-    [RelayCommand]
-    private void OpenFilePath()
-    {
-        if (SelectedEditFileInfo != null)
-        {
-            Process.Start("explorer.exe", PathHelper.dataPath);
-        }
-    }
-
     #endregion Command
 
     #region Setting

One.Toolbox/Views/MainWindow.xaml

@@ -65,7 +65,7 @@
                     </ItemsPanelTemplate>
                 </ListBox.ItemsPanel>
                 <ListBox.ItemTemplate>
-                    <DataTemplate DataType="viewmodels:MainMenuItemViewModel">
+                    <DataTemplate DataType="viewmodels:MainMenuItemVM">
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition />
@@ -80,15 +80,15 @@
                     </DataTemplate>
                 </ListBox.ItemTemplate>
                 <d:ListBox.ItemsSource>
-                    <x:Array Type="{x:Type vms:MainMenuItemViewModel}">
-                        <vms:MainMenuItemViewModel Header="1" Icon="{StaticResource HomeRound}" />
-                        <vms:MainMenuItemViewModel Icon="{StaticResource TextFieldsRound}" />
-                        <vms:MainMenuItemViewModel Header="2" Icon="{StaticResource SerialPort24Filled}" />
-                        <vms:MainMenuItemViewModel Icon="{StaticResource Network}" />
-                        <vms:MainMenuItemViewModel Icon="{StaticResource EditNoteFilled}" />
+                    <x:Array Type="{x:Type vms:MainMenuItemVM}">
+                        <vms:MainMenuItemVM Header="1" Icon="{StaticResource HomeRound}" />
+                        <vms:MainMenuItemVM Icon="{StaticResource TextFieldsRound}" />
+                        <vms:MainMenuItemVM Header="2" Icon="{StaticResource SerialPort24Filled}" />
+                        <vms:MainMenuItemVM Icon="{StaticResource Network}" />
+                        <vms:MainMenuItemVM Icon="{StaticResource EditNoteFilled}" />
 
-                        <vms:MainMenuItemViewModel Dock="Bottom" Icon="{StaticResource SettingsRound}" />
-                        <vms:MainMenuItemViewModel Dock="Bottom" Icon="{StaticResource CloudSyncFilled}" />
+                        <vms:MainMenuItemVM Dock="Bottom" Icon="{StaticResource SettingsRound}" />
+                        <vms:MainMenuItemVM Dock="Bottom" Icon="{StaticResource CloudSyncFilled}" />
                     </x:Array>
                 </d:ListBox.ItemsSource>
             </ListBox>