improve settings panel

Jack251970 · Jack251970 · commit 3c39f77d7b01 · 2024-11-07T08:53:01.000+08:00
diff --git a/src/Flow.Launcher.Plugin.ClipboardPlus.Core/Utils/FileUtils.cs b/src/Flow.Launcher.Plugin.ClipboardPlus.Core/Utils/FileUtils.cs
@@ -105,7 +105,7 @@ public static string GetSaveJsonFile()
         return saveFileDialog.FileName;
     }
 
-    public static string GetOpenDatabaseFile()
+    public static string GetOpenJsonFile()
     {
         var openFileDialog = new OpenFileDialog
         {
diff --git a/src/Flow.Launcher.Plugin.ClipboardPlus.Panels/ViewModels/SettingsViewModel.cs b/src/Flow.Launcher.Plugin.ClipboardPlus.Panels/ViewModels/SettingsViewModel.cs
@@ -76,19 +76,19 @@ private void FormatStringInsert(object? parameter)
 
     #endregion
 
-    #region Import & Export Database
+    #region Import & Export Records
 
-    public ICommand ImportDatabaseCommand => new RelayCommand(ImportDatabase);
+    public ICommand ImportJsonRecordsCommand => new RelayCommand(ImportJsonRecords);
 
-    private void ImportDatabase(object? parameter)
+    private void ImportJsonRecords(object? parameter)
     {
-        var path = FileUtils.GetOpenDatabaseFile();
+        var path = FileUtils.GetOpenJsonFile();
         // TODO: Implement import database
     }
 
-    public ICommand ExportDatabaseCommand => new RelayCommand(ExportDatabase);
+    public ICommand ExportJsonRecordsCommand => new RelayCommand(ExportJsonRecords);
 
-    private async void ExportDatabase(object? parameter)
+    private async void ExportJsonRecords(object? parameter)
     {
         var path = FileUtils.GetSaveJsonFile();
         if (!string.IsNullOrEmpty(path))
diff --git a/src/Flow.Launcher.Plugin.ClipboardPlus.Panels/Views/SettingsPanel.xaml b/src/Flow.Launcher.Plugin.ClipboardPlus.Panels/Views/SettingsPanel.xaml
@@ -36,7 +36,6 @@
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
-            <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
@@ -185,23 +184,19 @@
             BorderBrush="{DynamicResource Color03B}"
             BorderThickness="1" />
 
-        <!--  Cache Images  -->
-        <CheckBox
-            Grid.Row="10"
-            Grid.Column="0"
-            Margin="10,5,5,5"
-            VerticalAlignment="Center"
-            Content="{DynamicResource flowlauncher_plugin_clipboardplus_cache_images}"
-            IsChecked="{Binding CacheImages, Mode=TwoWay}" />
-
-        <!--  Cache Images Button  -->
+        <!--  Cache Images & Cache Images Button  -->
         <StackPanel
             Grid.Row="10"
-            Grid.Column="1"
+            Grid.Column="0"
             Grid.ColumnSpan="2"
-            Margin="10,5,0,5"
+            Margin="10,5,5,5"
             Orientation="Horizontal">
+            <CheckBox
+                VerticalAlignment="Center"
+                Content="{DynamicResource flowlauncher_plugin_clipboardplus_cache_images}"
+                IsChecked="{Binding CacheImages, Mode=TwoWay}" />
             <Button
+                Margin="5,0,0,0"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 Command="{Binding OpenCacheImageFolderCommand}"
@@ -355,14 +350,31 @@
             BorderBrush="{DynamicResource Color03B}"
             BorderThickness="1" />
 
-        <!--  Encrypt Data  -->
-        <CheckBox
+        <!--  Encrypt Data & Import & Export Records Button  -->
+
+        <StackPanel
             Grid.Row="15"
+            Grid.Column="0"
             Grid.ColumnSpan="2"
             Margin="10,5,5,5"
-            VerticalAlignment="Center"
-            Content="{DynamicResource flowlauncher_plugin_clipboardplus_encrypt_data}"
-            IsChecked="{Binding EncryptData, Mode=TwoWay}" />
+            Orientation="Horizontal">
+            <CheckBox
+                VerticalAlignment="Center"
+                Content="{DynamicResource flowlauncher_plugin_clipboardplus_encrypt_data}"
+                IsChecked="{Binding EncryptData, Mode=TwoWay}" />
+            <Button
+                Margin="5,0,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Command="{Binding ImportJsonRecordsCommand}"
+                Content="{DynamicResource flowlauncher_plugin_clipboardplus_import_records}" />
+            <Button
+                Margin="5,0,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Command="{Binding ExportJsonRecordsCommand}"
+                Content="{DynamicResource flowlauncher_plugin_clipboardplus_export_records}" />
+        </StackPanel>
 
         <!--  Keep Text  -->
         <CheckBox
@@ -418,25 +430,5 @@
             ItemsSource="{Binding FilesKeepTimes, Mode=OneWay}"
             SelectedItem="{Binding SelectedFilesKeepTime, Mode=TwoWay}" />
 
-        <!--  Import & Export Database Button  -->
-        <StackPanel
-            Grid.Row="19"
-            Grid.Column="1"
-            Grid.ColumnSpan="2"
-            Margin="10,5,5,5"
-            Orientation="Horizontal">
-            <Button
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Command="{Binding ImportDatabaseCommand}"
-                Content="{DynamicResource flowlauncher_plugin_clipboardplus_import_database}" />
-            <Button
-                Margin="5,0,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Command="{Binding ExportDatabaseCommand}"
-                Content="{DynamicResource flowlauncher_plugin_clipboardplus_export_database}" />
-        </StackPanel>
-
     </Grid>
 </UserControl>
diff --git a/src/Flow.Launcher.Plugin.ClipboardPlus/Languages/en.xaml b/src/Flow.Launcher.Plugin.ClipboardPlus/Languages/en.xaml
@@ -84,7 +84,7 @@
     <system:String x:Key="flowlauncher_plugin_clipboardplus_default_image_copy_option">Image default:</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_default_files_copy_option">Files default:</system:String>
 
-    <system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">Cache images</system:String>
+    <system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">Cache clipboard images in folder</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_open_cache_folder">Open cache folder</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_clean_cache_folder">Clean cache folder</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_cache_format">Format:</system:String>
@@ -101,8 +101,8 @@
     <system:String x:Key="flowlauncher_plugin_clipboardplus_keep_text">Keep text:</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_keep_images">Keep images:</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_keep_files">Keep files:</system:String>
-    <system:String x:Key="flowlauncher_plugin_clipboardplus_import_database">Import database</system:String>
-    <system:String x:Key="flowlauncher_plugin_clipboardplus_export_database">Export database</system:String>
+    <system:String x:Key="flowlauncher_plugin_clipboardplus_import_records">Import records</system:String>
+    <system:String x:Key="flowlauncher_plugin_clipboardplus_export_records">Export records</system:String>
 
     <!--  Enum  -->
     <system:String x:Key="flowlauncher_plugin_clipboardplus_record_order_create_time">Create time</system:String>
diff --git a/src/Flow.Launcher.Plugin.ClipboardPlus/Languages/zh-cn.xaml b/src/Flow.Launcher.Plugin.ClipboardPlus/Languages/zh-cn.xaml
@@ -84,7 +84,7 @@
     <system:String x:Key="flowlauncher_plugin_clipboardplus_default_image_copy_option">图片默认：</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_default_files_copy_option">文件默认：</system:String>
 
-    <system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">缓存图片</system:String>
+    <system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">在文件夹中缓存剪贴板图片</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_open_cache_folder">打开缓存文件夹</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_clean_cache_folder">清理缓存文件夹</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_cache_format">格式：</system:String>
@@ -101,8 +101,8 @@
     <system:String x:Key="flowlauncher_plugin_clipboardplus_keep_text">保存文本：</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_keep_images">保存图片：</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_keep_files">保存文件：</system:String>
-    <system:String x:Key="flowlauncher_plugin_clipboardplus_import_database">导入数据库</system:String>
-    <system:String x:Key="flowlauncher_plugin_clipboardplus_export_database">导出数据库</system:String>
+    <system:String x:Key="flowlauncher_plugin_clipboardplus_import_records">导入记录</system:String>
+    <system:String x:Key="flowlauncher_plugin_clipboardplus_export_records">导出记录</system:String>
 
     <!--  Enum  -->
     <system:String x:Key="flowlauncher_plugin_clipboardplus_record_order_create_time">创建时间</system:String>
diff --git a/src/Flow.Launcher.Plugin.ClipboardPlus/Languages/zh-tw.xaml b/src/Flow.Launcher.Plugin.ClipboardPlus/Languages/zh-tw.xaml
@@ -84,7 +84,7 @@
     <system:String x:Key="flowlauncher_plugin_clipboardplus_default_image_copy_option">圖片默認：</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_default_files_copy_option">文件默認：</system:String>
 
-    <system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">緩存圖片</system:String>
+    <system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">在文件夾中緩存剪貼闆圖片</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_open_cache_folder">打開緩存文件夾</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_clean_cache_folder">清理緩存文件夾</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_cache_format">格式：</system:String>
@@ -101,8 +101,8 @@
     <system:String x:Key="flowlauncher_plugin_clipboardplus_keep_text">保存文本：</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_keep_images">保存圖片：</system:String>
     <system:String x:Key="flowlauncher_plugin_clipboardplus_keep_files">保存文件：</system:String>
-    <system:String x:Key="flowlauncher_plugin_clipboardplus_import_database">導入數據庫</system:String>
-    <system:String x:Key="flowlauncher_plugin_clipboardplus_export_database">導出數據庫</system:String>
+    <system:String x:Key="flowlauncher_plugin_clipboardplus_import_records">導入記録</system:String>
+    <system:String x:Key="flowlauncher_plugin_clipboardplus_export_records">導出記録</system:String>
 
     <!--  Enum  -->
     <system:String x:Key="flowlauncher_plugin_clipboardplus_record_order_create_time">剏建時間</system:String>

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public static string GetSaveJsonFile()`
`105`	`105`	`return saveFileDialog.FileName;`
`106`	`106`	`}`
`107`	`107`
`108`		`- public static string GetOpenDatabaseFile()`
	`108`	`+ public static string GetOpenJsonFile()`
`109`	`109`	`{`
`110`	`110`	`var openFileDialog = new OpenFileDialog`
`111`	`111`	`{`