Skip to content

Commit 3c39f77

Browse files
Jack251970Jack251970
committed
improve settings panel
1 parent 80fac3a commit 3c39f77

File tree

6 files changed

+46
-54
lines changed

6 files changed

+46
-54
lines changed

‎src/Flow.Launcher.Plugin.ClipboardPlus.Core/Utils/FileUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public static string GetSaveJsonFile()
105105
return saveFileDialog.FileName;
106106
}
107107

108-
public static string GetOpenDatabaseFile()
108+
public static string GetOpenJsonFile()
109109
{
110110
var openFileDialog = new OpenFileDialog
111111
{

‎src/Flow.Launcher.Plugin.ClipboardPlus.Panels/ViewModels/SettingsViewModel.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,19 @@ private void FormatStringInsert(object? parameter)
7676

7777
#endregion
7878

79-
#region Import & Export Database
79+
#region Import & Export Records
8080

81-
public ICommand ImportDatabaseCommand => new RelayCommand(ImportDatabase);
81+
public ICommand ImportJsonRecordsCommand => new RelayCommand(ImportJsonRecords);
8282

83-
private void ImportDatabase(object? parameter)
83+
private void ImportJsonRecords(object? parameter)
8484
{
85-
var path = FileUtils.GetOpenDatabaseFile();
85+
var path = FileUtils.GetOpenJsonFile();
8686
// TODO: Implement import database
8787
}
8888

89-
public ICommand ExportDatabaseCommand => new RelayCommand(ExportDatabase);
89+
public ICommand ExportJsonRecordsCommand => new RelayCommand(ExportJsonRecords);
9090

91-
private async void ExportDatabase(object? parameter)
91+
private async void ExportJsonRecords(object? parameter)
9292
{
9393
var path = FileUtils.GetSaveJsonFile();
9494
if (!string.IsNullOrEmpty(path))

‎src/Flow.Launcher.Plugin.ClipboardPlus.Panels/Views/SettingsPanel.xaml

Lines changed: 30 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<RowDefinition Height="auto" />
3737
<RowDefinition Height="auto" />
3838
<RowDefinition Height="auto" />
39-
<RowDefinition Height="auto" />
4039
</Grid.RowDefinitions>
4140
<Grid.ColumnDefinitions>
4241
<ColumnDefinition Width="Auto" />
@@ -185,23 +184,19 @@
185184
BorderBrush="{DynamicResource Color03B}"
186185
BorderThickness="1" />
187186

188-
<!-- Cache Images -->
189-
<CheckBox
190-
Grid.Row="10"
191-
Grid.Column="0"
192-
Margin="10,5,5,5"
193-
VerticalAlignment="Center"
194-
Content="{DynamicResource flowlauncher_plugin_clipboardplus_cache_images}"
195-
IsChecked="{Binding CacheImages, Mode=TwoWay}" />
196-
197-
<!-- Cache Images Button -->
187+
<!-- Cache Images & Cache Images Button -->
198188
<StackPanel
199189
Grid.Row="10"
200-
Grid.Column="1"
190+
Grid.Column="0"
201191
Grid.ColumnSpan="2"
202-
Margin="10,5,0,5"
192+
Margin="10,5,5,5"
203193
Orientation="Horizontal">
194+
<CheckBox
195+
VerticalAlignment="Center"
196+
Content="{DynamicResource flowlauncher_plugin_clipboardplus_cache_images}"
197+
IsChecked="{Binding CacheImages, Mode=TwoWay}" />
204198
<Button
199+
Margin="5,0,0,0"
205200
HorizontalAlignment="Left"
206201
VerticalAlignment="Center"
207202
Command="{Binding OpenCacheImageFolderCommand}"
@@ -355,14 +350,31 @@
355350
BorderBrush="{DynamicResource Color03B}"
356351
BorderThickness="1" />
357352

358-
<!-- Encrypt Data -->
359-
<CheckBox
353+
<!-- Encrypt Data & Import & Export Records Button -->
354+
355+
<StackPanel
360356
Grid.Row="15"
357+
Grid.Column="0"
361358
Grid.ColumnSpan="2"
362359
Margin="10,5,5,5"
363-
VerticalAlignment="Center"
364-
Content="{DynamicResource flowlauncher_plugin_clipboardplus_encrypt_data}"
365-
IsChecked="{Binding EncryptData, Mode=TwoWay}" />
360+
Orientation="Horizontal">
361+
<CheckBox
362+
VerticalAlignment="Center"
363+
Content="{DynamicResource flowlauncher_plugin_clipboardplus_encrypt_data}"
364+
IsChecked="{Binding EncryptData, Mode=TwoWay}" />
365+
<Button
366+
Margin="5,0,0,0"
367+
HorizontalAlignment="Left"
368+
VerticalAlignment="Center"
369+
Command="{Binding ImportJsonRecordsCommand}"
370+
Content="{DynamicResource flowlauncher_plugin_clipboardplus_import_records}" />
371+
<Button
372+
Margin="5,0,0,0"
373+
HorizontalAlignment="Left"
374+
VerticalAlignment="Center"
375+
Command="{Binding ExportJsonRecordsCommand}"
376+
Content="{DynamicResource flowlauncher_plugin_clipboardplus_export_records}" />
377+
</StackPanel>
366378

367379
<!-- Keep Text -->
368380
<CheckBox
@@ -418,25 +430,5 @@
418430
ItemsSource="{Binding FilesKeepTimes, Mode=OneWay}"
419431
SelectedItem="{Binding SelectedFilesKeepTime, Mode=TwoWay}" />
420432

421-
<!-- Import & Export Database Button -->
422-
<StackPanel
423-
Grid.Row="19"
424-
Grid.Column="1"
425-
Grid.ColumnSpan="2"
426-
Margin="10,5,5,5"
427-
Orientation="Horizontal">
428-
<Button
429-
HorizontalAlignment="Left"
430-
VerticalAlignment="Center"
431-
Command="{Binding ImportDatabaseCommand}"
432-
Content="{DynamicResource flowlauncher_plugin_clipboardplus_import_database}" />
433-
<Button
434-
Margin="5,0,0,0"
435-
HorizontalAlignment="Left"
436-
VerticalAlignment="Center"
437-
Command="{Binding ExportDatabaseCommand}"
438-
Content="{DynamicResource flowlauncher_plugin_clipboardplus_export_database}" />
439-
</StackPanel>
440-
441433
</Grid>
442434
</UserControl>

‎src/Flow.Launcher.Plugin.ClipboardPlus/Languages/en.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<system:String x:Key="flowlauncher_plugin_clipboardplus_default_image_copy_option">Image default:</system:String>
8585
<system:String x:Key="flowlauncher_plugin_clipboardplus_default_files_copy_option">Files default:</system:String>
8686

87-
<system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">Cache images</system:String>
87+
<system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">Cache clipboard images in folder</system:String>
8888
<system:String x:Key="flowlauncher_plugin_clipboardplus_open_cache_folder">Open cache folder</system:String>
8989
<system:String x:Key="flowlauncher_plugin_clipboardplus_clean_cache_folder">Clean cache folder</system:String>
9090
<system:String x:Key="flowlauncher_plugin_clipboardplus_cache_format">Format:</system:String>
@@ -101,8 +101,8 @@
101101
<system:String x:Key="flowlauncher_plugin_clipboardplus_keep_text">Keep text:</system:String>
102102
<system:String x:Key="flowlauncher_plugin_clipboardplus_keep_images">Keep images:</system:String>
103103
<system:String x:Key="flowlauncher_plugin_clipboardplus_keep_files">Keep files:</system:String>
104-
<system:String x:Key="flowlauncher_plugin_clipboardplus_import_database">Import database</system:String>
105-
<system:String x:Key="flowlauncher_plugin_clipboardplus_export_database">Export database</system:String>
104+
<system:String x:Key="flowlauncher_plugin_clipboardplus_import_records">Import records</system:String>
105+
<system:String x:Key="flowlauncher_plugin_clipboardplus_export_records">Export records</system:String>
106106

107107
<!-- Enum -->
108108
<system:String x:Key="flowlauncher_plugin_clipboardplus_record_order_create_time">Create time</system:String>

‎src/Flow.Launcher.Plugin.ClipboardPlus/Languages/zh-cn.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<system:String x:Key="flowlauncher_plugin_clipboardplus_default_image_copy_option">图片默认：</system:String>
8585
<system:String x:Key="flowlauncher_plugin_clipboardplus_default_files_copy_option">文件默认：</system:String>
8686

87-
<system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">缓存图片</system:String>
87+
<system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">在文件夹中缓存剪贴板图片</system:String>
8888
<system:String x:Key="flowlauncher_plugin_clipboardplus_open_cache_folder">打开缓存文件夹</system:String>
8989
<system:String x:Key="flowlauncher_plugin_clipboardplus_clean_cache_folder">清理缓存文件夹</system:String>
9090
<system:String x:Key="flowlauncher_plugin_clipboardplus_cache_format">格式：</system:String>
@@ -101,8 +101,8 @@
101101
<system:String x:Key="flowlauncher_plugin_clipboardplus_keep_text">保存文本：</system:String>
102102
<system:String x:Key="flowlauncher_plugin_clipboardplus_keep_images">保存图片：</system:String>
103103
<system:String x:Key="flowlauncher_plugin_clipboardplus_keep_files">保存文件：</system:String>
104-
<system:String x:Key="flowlauncher_plugin_clipboardplus_import_database">导入数据库</system:String>
105-
<system:String x:Key="flowlauncher_plugin_clipboardplus_export_database">导出数据库</system:String>
104+
<system:String x:Key="flowlauncher_plugin_clipboardplus_import_records">导入记录</system:String>
105+
<system:String x:Key="flowlauncher_plugin_clipboardplus_export_records">导出记录</system:String>
106106

107107
<!-- Enum -->
108108
<system:String x:Key="flowlauncher_plugin_clipboardplus_record_order_create_time">创建时间</system:String>

‎src/Flow.Launcher.Plugin.ClipboardPlus/Languages/zh-tw.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<system:String x:Key="flowlauncher_plugin_clipboardplus_default_image_copy_option">圖片默認：</system:String>
8585
<system:String x:Key="flowlauncher_plugin_clipboardplus_default_files_copy_option">文件默認：</system:String>
8686

87-
<system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">緩存圖片</system:String>
87+
<system:String x:Key="flowlauncher_plugin_clipboardplus_cache_images">在文件夾中緩存剪貼闆圖片</system:String>
8888
<system:String x:Key="flowlauncher_plugin_clipboardplus_open_cache_folder">打開緩存文件夾</system:String>
8989
<system:String x:Key="flowlauncher_plugin_clipboardplus_clean_cache_folder">清理緩存文件夾</system:String>
9090
<system:String x:Key="flowlauncher_plugin_clipboardplus_cache_format">格式：</system:String>
@@ -101,8 +101,8 @@
101101
<system:String x:Key="flowlauncher_plugin_clipboardplus_keep_text">保存文本：</system:String>
102102
<system:String x:Key="flowlauncher_plugin_clipboardplus_keep_images">保存圖片：</system:String>
103103
<system:String x:Key="flowlauncher_plugin_clipboardplus_keep_files">保存文件：</system:String>
104-
<system:String x:Key="flowlauncher_plugin_clipboardplus_import_database">導入數據庫</system:String>
105-
<system:String x:Key="flowlauncher_plugin_clipboardplus_export_database">導出數據庫</system:String>
104+
<system:String x:Key="flowlauncher_plugin_clipboardplus_import_records">導入記録</system:String>
105+
<system:String x:Key="flowlauncher_plugin_clipboardplus_export_records">導出記録</system:String>
106106

107107
<!-- Enum -->
108108
<system:String x:Key="flowlauncher_plugin_clipboardplus_record_order_create_time">剏建時間</system:String>

0 commit comments

Comments
 (0)