From 569b330976cbc70eb386c797e097af82a8bef4e1 Mon Sep 17 00:00:00 2001 From: liufei Date: Wed, 26 May 2021 17:19:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Constant/AppConstant.cs | 13 -- Constant/Constants.cs | 6 + Control/ConfigWindow.xaml.cs | 1 + Control/IconInfoDialog.xaml.cs | 24 ++- Control/UserControls/SettingControl.xaml | 2 +- Control/UserControls/SettingControl.xaml.cs | 26 ++- GeekDesk.csproj | 16 +- MainWindow.xaml.cs | 14 +- Util/CommonCode.cs | 8 +- Util/ImageUtil.cs | 183 ++++++++++++++++---- Util/ShellContextMenu.cs | 23 +++ packages.config | 2 + 12 files changed, 253 insertions(+), 65 deletions(-) delete mode 100644 Constant/AppConstant.cs create mode 100644 Util/ShellContextMenu.cs diff --git a/Constant/AppConstant.cs b/Constant/AppConstant.cs deleted file mode 100644 index 9d0d042..0000000 --- a/Constant/AppConstant.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace GeekDesk.Constant -{ - class AppConstant - { - private static string APP_DIR = AppDomain.CurrentDomain.BaseDirectory.Trim(); - /// - /// app数据文件路径 - /// - public static string DATA_FILE_PATH = APP_DIR + "//Data"; //app数据文件路径 - } -} diff --git a/Constant/Constants.cs b/Constant/Constants.cs index 6badcf3..3089cf7 100644 --- a/Constant/Constants.cs +++ b/Constant/Constants.cs @@ -8,6 +8,12 @@ namespace GeekDesk.Constant { public class Constants { + public static string APP_DIR = AppDomain.CurrentDomain.BaseDirectory.Trim(); + /// + /// app数据文件路径 + /// + public static string DATA_FILE_PATH = APP_DIR + "//Data"; //app数据文件路径 + //默认文件夹图标 public static string DEFAULT_DIR_IMAGE_BASE64 = "iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAASISURBVHhe7dvPi9R1HMfx/Qu6RYfqEp1CZ8Yko0MQRNEPgnQ36FJEFyPoF/0DHbx06dSlnVkF6SgEgocOYUEG0cFWpQ476yhbQfTDslJxk+k79S1IP/NSF3f2O+7jBY/TKgvz/j5nXMUZMzMzMzMzMzMzMzMzMzMzu959023dsbSw9YGlbuchyk7v3XbP0t5tt9Yvmd3MW3r//luWu623TvbahytDrtvBQa/9xvJ85776JbWbZf359s7quCcKR2cNqjeaQ/35zgv1y2vTvOqgOy4/MDdG9abzwWC+06lfapu2jf4cXTosN9SZ5W7n9folt2nZ6Ifw6niDy47JelloH6hfepuGLffa7xQPyfpZaL9Xv/zW5K307r27eEDWXfXG9GJ9BmvqqneyV0rHYzL63a3b61NYEzfodT4rHY4J8UetZq/6mF8pHo6J8SnS4JUOxqS19tTnsKatfDAm7Hh9DmvaCsdiAwx6rcfqk1iTVjoWkzfotd+uT2JNWulYTN5yr/VFfRJr0krHYoN0t7Tqs1hTVjwUG6L6OeS1+izWlJUOxYb5xb+JNGyFI7Gxfqp+YN83+h+drK/+wtbH+3u33FmnUF7hQLCpLPfaSycX2u/WSfx/pd8Am1H1yf3d6FOlTuOflX4hbGrd1vN1HgKBou6W2wQC4+0XCASnuu1dAoGxWnsEAmMMeq1DAoExRn/tKxAIBALBmgMZ7Nsx/Pbgc9B4J3udK57fa7WmQEbf1GyatnLg6eKzfDVrCuTcypH625pNx37rHyo+y1ezpkAufL9Yf1uz6dgfpz8uPstXIxDbFBOIWZhAzMIEYhYmELMwgZiFCcQsTCBmYQIxCxOIWZhAzMIEYhYmELMwgZiFrTmQ0/u3D89+8tjw/OdPXbPVr18eXlp6E6bG6le7i8/yOL8efnR4at+24czvR54Y/nl8DrjM6INjpvQFYG548ehOgcA4AoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCC4e3XVJIDBG9QmyKhAY4+Li7HmBwBirx2bPCgTGOTH3g0BgHIFAIBAI6kDOXPEFoDLbn7l0bG53+YuwyS3OPTsz2oVjs3etLs49OM65T5/c9fNHj7z044cPvwrTbvQsj57p0rP+r3NfPnP733GYmZmZmZmZmZmZmZmZmZnZf5uZ+QsdP8v10G4AYgAAAABJRU5ErkJggg=="; diff --git a/Control/ConfigWindow.xaml.cs b/Control/ConfigWindow.xaml.cs index ed502fe..f38bf96 100644 --- a/Control/ConfigWindow.xaml.cs +++ b/Control/ConfigWindow.xaml.cs @@ -46,5 +46,6 @@ namespace GeekDesk.Control { this.Close(); } + } } diff --git a/Control/IconInfoDialog.xaml.cs b/Control/IconInfoDialog.xaml.cs index 862664c..9321217 100644 --- a/Control/IconInfoDialog.xaml.cs +++ b/Control/IconInfoDialog.xaml.cs @@ -1,6 +1,7 @@ using GeekDesk.Util; using GeekDesk.ViewModel; using Microsoft.Win32; +using System; using System.Windows; using System.Windows.Controls; using System.Windows.Media.Imaging; @@ -58,17 +59,24 @@ namespace GeekDesk.Control /// private void EditImage(object sender, RoutedEventArgs e) { - OpenFileDialog ofd = new OpenFileDialog + try { - Multiselect = false, //只允许选中单个文件 - Filter = "所有文件(*.*)|*.*" - }; - if (ofd.ShowDialog() == true) + OpenFileDialog ofd = new OpenFileDialog + { + Multiselect = false, //只允许选中单个文件 + Filter = "所有文件(*.*)|*.*" + }; + if (ofd.ShowDialog() == true) + { + IconInfo info = this.DataContext as IconInfo; + info.BitmapImage = ImageUtil.GetBitmapIconByPath(ofd.FileName); + CommonCode.SaveAppData(MainWindow.appData); + } + } catch (Exception) { - IconInfo info = this.DataContext as IconInfo; - info.BitmapImage = ImageUtil.GetBitmapIconByPath(ofd.FileName); - CommonCode.SaveAppData(MainWindow.appData); + HandyControl.Controls.Growl.WarningGlobal("修改图标失败,已重置为默认图标!"); } + } } } diff --git a/Control/UserControls/SettingControl.xaml b/Control/UserControls/SettingControl.xaml index 261bddf..77d6a68 100644 --- a/Control/UserControls/SettingControl.xaml +++ b/Control/UserControls/SettingControl.xaml @@ -61,7 +61,7 @@ -