From de31210f37176e7735b578be39db6fab94bef920 Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Fri, 14 May 2021 16:48:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A8=8B=E5=BA=8F=20?=
 =?UTF-8?q?=E5=A2=9E=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/Constants.cs          |  17 +++
 Constant/DefaultConstant.cs    |   6 +-
 Constant/IconStartType.cs      |  18 +++
 Control/IconInfoDialog.xaml    |  56 +++++++
 Control/IconInfoDialog.xaml.cs |  74 ++++++++++
 GeekDesk.csproj                |  12 ++
 MainWindow.xaml                | 260 ++++++++++++++++++++-------------
 MainWindow.xaml.cs             | 189 +++++++++++++++++-------
 Resource/Image/图片.png        | Bin 0 -> 6050 bytes
 Resource/Image/文件夹.png      | Bin 0 -> 2196 bytes
 Util/FileIcon.cs               |  17 ---
 Util/ImageUtil.cs              | 207 ++++++++++++++++++++++++++
 ViewModel/AppConfig.cs         |   2 +-
 ViewModel/AppData.cs           |   2 +-
 ViewModel/IconInfo.cs          |  62 ++++----
 ViewModel/MenuInfo.cs          |   2 +-
 16 files changed, 719 insertions(+), 205 deletions(-)
 create mode 100644 Constant/Constants.cs
 create mode 100644 Constant/IconStartType.cs
 create mode 100644 Control/IconInfoDialog.xaml
 create mode 100644 Control/IconInfoDialog.xaml.cs
 create mode 100644 Resource/Image/图片.png
 create mode 100644 Resource/Image/文件夹.png
 create mode 100644 Util/ImageUtil.cs

diff --git a/Constant/Constants.cs b/Constant/Constants.cs
new file mode 100644
index 0000000..4bcf294
--- /dev/null
+++ b/Constant/Constants.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GeekDesk.Constant
+{
+    public class Constants
+    {
+        //默认文件夹图标
+        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==";
+
+        //默认图片图标
+        public static string DEFAULT_IMG_IMAGE_BASE64 = "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";
+    }
+}
diff --git a/Constant/DefaultConstant.cs b/Constant/DefaultConstant.cs
index 56a286b..1804108 100644
--- a/Constant/DefaultConstant.cs
+++ b/Constant/DefaultConstant.cs
@@ -5,9 +5,9 @@ namespace GeekDesk.Constant
 {
     enum DefaultConstant
     {
-        WINDOW_WIDTH = 650, //默认窗体宽度
-        WINDOW_HEIGHT = 700, //默认窗体高度
-        MENU_CARD_WIDHT = 150, //默认菜单栏宽度
+        WINDOW_WIDTH = 666, //默认窗体宽度
+        WINDOW_HEIGHT = 500, //默认窗体高度
+        MENU_CARD_WIDHT = 165, //默认菜单栏宽度
         IMAGE_WIDTH = 60, //默认图标宽度
         IMAGE_HEIGHT = 60, //默认图标高度
     }
diff --git a/Constant/IconStartType.cs b/Constant/IconStartType.cs
new file mode 100644
index 0000000..f3398ec
--- /dev/null
+++ b/Constant/IconStartType.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+/// <summary>
+/// 图标应用启动方式
+/// </summary>
+namespace GeekDesk.Constant
+{
+    enum IconStartType
+    {
+        DEFAULT_STARTUP = 1, //默认启动方式
+        ADMIN_STARTUP = 2,  //管理员方式启动
+        SHOW_IN_EXPLORE = 3 //打开文件所在位置
+    }
+}
diff --git a/Control/IconInfoDialog.xaml b/Control/IconInfoDialog.xaml
new file mode 100644
index 0000000..8fe3093
--- /dev/null
+++ b/Control/IconInfoDialog.xaml
@@ -0,0 +1,56 @@
+<Border x:Class="GeekDesk.Control.IconInfoDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
+        CornerRadius="10"
+        Width="300"
+        Height="300"
+        Opacity="0.9">
+    <Border.Resources>
+        <Style x:Key="LeftTB" TargetType="TextBlock" BasedOn="{StaticResource TextBlockBaseStyle}">
+            <Setter Property="Width" Value="40"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="FontSize" Value="14"/>
+        </Style>
+    </Border.Resources>
+    <Border.Background>
+        <SolidColorBrush Color="AliceBlue" Opacity="0.9"/>
+    </Border.Background>
+    <hc:SimplePanel Margin="10">
+        <Grid Margin="8,20,8,20">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="93*"/>
+                <ColumnDefinition Width="38*"/>
+                <ColumnDefinition Width="126*"/>
+                <ColumnDefinition Width="7*"/>
+            </Grid.ColumnDefinitions>
+            <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
+                <TextBlock Text="名称:"  Style="{StaticResource LeftTB}"/>
+                <TextBox x:Name="IconName" Text="{Binding Name, Mode=OneWay}" Width="180" FontSize="14"/>
+            </hc:UniformSpacingPanel>
+            <hc:Divider LineStrokeDashArray="3,3" Margin="0,50,0,71" LineStroke="Black" Grid.ColumnSpan="4"/>
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,59,0,-9" Grid.ColumnSpan="4">
+                <TextBlock  Text="图标:"  Style="{StaticResource LeftTB}"/>
+                <Image x:Name="IconImg" Source="{Binding BitmapImage, Mode=OneWay}" Width="60" Height="60"/>
+                <Button Content="修改" Click="EditImage"/>
+                <Button Content="默认" Click="EditImageToDefault"/>
+            </hc:UniformSpacingPanel>
+            <hc:Divider LineStrokeDashArray="3,3" Margin="0,128,0,23" LineStroke="Black" Grid.ColumnSpan="4"/>
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,150,0,10" Grid.ColumnSpan="4">
+                <CheckBox x:Name="IconIsAdmin" Content="始终以管理员方式启动" IsChecked="{Binding AdminStartUp, Mode=OneWay}">
+                    <CheckBox.Background>
+                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                            <GradientStop Color="#FF9EA3A6"/>
+                        </LinearGradientBrush>
+                    </CheckBox.Background>
+                </CheckBox>
+            </hc:UniformSpacingPanel>
+            <hc:Divider LineStrokeDashArray="3,3" Margin="0,200,0,-27" LineStroke="Black" Grid.ColumnSpan="4"/>
+            <hc:UniformSpacingPanel Spacing="10" Margin="0,218,0,-38" Grid.ColumnSpan="4">
+                <Button Content="保存" Command="hc:ControlCommands.Close" Click="SaveProperty" Margin="208,6,-208,-10"/>
+            </hc:UniformSpacingPanel>
+        </Grid>
+        <Button Width="22" Height="22" Command="hc:ControlCommands.Close" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,4,0"/>
+    </hc:SimplePanel>
+</Border>
\ No newline at end of file
diff --git a/Control/IconInfoDialog.xaml.cs b/Control/IconInfoDialog.xaml.cs
new file mode 100644
index 0000000..862664c
--- /dev/null
+++ b/Control/IconInfoDialog.xaml.cs
@@ -0,0 +1,74 @@
+using GeekDesk.Util;
+using GeekDesk.ViewModel;
+using Microsoft.Win32;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media.Imaging;
+
+
+namespace GeekDesk.Control
+{
+    /// <summary>
+    /// TextDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class IconInfoDialog
+    {
+
+        public IconInfoDialog()
+        {
+            InitializeComponent();
+        }
+
+        public IconInfoDialog(IconInfo info)
+        {
+            this.DataContext = info;
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// 保存修改属性
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SaveProperty(object sender, RoutedEventArgs e)
+        {
+            IconInfo info = this.DataContext as IconInfo;
+            info.BitmapImage = IconImg.Source as BitmapImage;
+            info.Name = IconName.Text;
+            info.AdminStartUp = IconIsAdmin.IsChecked.Value;
+            CommonCode.SaveAppData(MainWindow.appData);
+        }
+
+        /// <summary>
+        /// 修改图标为默认
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void EditImageToDefault(object sender, RoutedEventArgs e)
+        {
+            IconInfo info = ((Button)sender).Tag as IconInfo;
+            info.BitmapImage = ImageUtil.ByteArrToImage(info.DefaultImage);
+            CommonCode.SaveAppData(MainWindow.appData);
+        }
+
+        /// <summary>
+        /// 修改图标
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void EditImage(object sender, RoutedEventArgs e)
+        {
+            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);
+            }
+        }
+    }
+}
diff --git a/GeekDesk.csproj b/GeekDesk.csproj
index 9a5f64b..2e11a81 100644
--- a/GeekDesk.csproj
+++ b/GeekDesk.csproj
@@ -71,8 +71,13 @@
     <Compile Include="Command\DelegateCommand.cs" />
     <Compile Include="Command\DelegateCommandBase.cs" />
     <Compile Include="Constant\AppConstant.cs" />
+    <Compile Include="Constant\Constants.cs" />
     <Compile Include="Constant\DefaultConstant.cs" />
+    <Compile Include="Constant\IconStartType.cs" />
     <Compile Include="Constant\SortType.cs" />
+    <Compile Include="Control\IconInfoDialog.xaml.cs">
+      <DependentUpon>IconInfoDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.cs" />
     <Compile Include="DraggAnimatedPanel\DraggAnimatedPanel.Drag.cs" />
     <Compile Include="EditTextBlock\EditableTextBlock.cs" />
@@ -82,6 +87,7 @@
     <Compile Include="Util\DragAdorner.cs" />
     <Compile Include="Util\FileIcon.cs" />
     <Compile Include="Util\HotKey.cs" />
+    <Compile Include="Util\ImageUtil.cs" />
     <Compile Include="Util\ListViewDragDropManager.cs" />
     <Compile Include="Util\MenuWidthConvert.cs" />
     <Compile Include="Util\MouseUtilities.cs" />
@@ -91,6 +97,10 @@
     <Compile Include="ViewModel\AppData.cs" />
     <Compile Include="ViewModel\IconInfo.cs" />
     <Compile Include="ViewModel\MenuInfo.cs" />
+    <Page Include="Control\IconInfoDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -139,6 +149,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Resource\DefaultIconfont\iconfont.svg" />
+    <Resource Include="Resource\Image\图片.png" />
+    <Resource Include="Resource\Image\文件夹.png" />
     <Resource Include="Resource\Image\Ico.png" />
     <Resource Include="Resource\Image\Ico.ico" />
     <Resource Include="Resource\Image\WindowLogo.png" />
diff --git a/MainWindow.xaml b/MainWindow.xaml
index f43a993..53760ee 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -10,6 +10,10 @@
         xmlns:DraggAnimatedPanel="clr-namespace:DraggAnimatedPanel" x:Name="window"
         xmlns:hc="https://handyorg.github.io/handycontrol"
         Title="MainWindow" Height="500" Width="600"
+        WindowStyle="None"
+        AllowsTransparency="True"
+        Background="Transparent"
+        OpacityMask ="White"
         >
     <Window.Resources>
 
@@ -17,11 +21,12 @@
         <Style x:Key="menuStyle" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItemBaseStyle}">
             <Setter Property="FontSize" Value="15"/>
             <Setter Property="Margin" Value="0,0,0,1"/>
-            <Setter Property="RenderTransform">
+            <Setter Property="Background">
                 <Setter.Value>
-                    <TranslateTransform/>
+                    <SolidColorBrush Opacity="0"/>
                 </Setter.Value>
             </Setter>
+
             <Style.Triggers>
                 <MultiTrigger>
                     <MultiTrigger.Conditions>
@@ -38,16 +43,16 @@
                     <MultiTrigger.ExitActions>
                         <BeginStoryboard>
                             <Storyboard Timeline.DesiredFrameRate="30">
-                                <DoubleAnimation To="20" Duration="0:0:0.001" Storyboard.TargetProperty="FontSize"/>
+                                <DoubleAnimation To="18" Duration="0:0:0.001" Storyboard.TargetProperty="FontSize"/>
                             </Storyboard>
                         </BeginStoryboard>
                     </MultiTrigger.ExitActions>
                 </MultiTrigger>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="#C3C3C3"/>
+                    <Setter Property="Background" Value="#FFE4DBDB"/>
                 </Trigger>
-                <Trigger Property="IsFocused" Value="true">
-                    <Setter Property="Background" Value="#B9B9B9"/>
+                <Trigger Property="IsSelected" Value="true">
+                    <Setter Property="Background" Value="#FFECECEC"/>
                     <Setter Property="Foreground" Value="Black"/>
                 </Trigger>
             </Style.Triggers>
@@ -90,38 +95,48 @@
     </Window.Resources>
 
 
+    <Border CornerRadius="5"  BorderThickness="0" Background="White">
+        <Border CornerRadius="5"  BorderThickness="0">
+            <!--背景图片-->
+            <Border.Background>
+                <ImageBrush ImageSource="D:\壁纸\18086.jpg" Opacity="0.9"></ImageBrush>
+            </Border.Background>
+            <Grid>
 
-    <Grid>
-        <!--背景图片-->
-        <Grid.Background>
-            <ImageBrush ImageSource="D:\壁纸\18039.jpg" Opacity="0.618"></ImageBrush>
-        </Grid.Background>
-        <!--<Grid.Background>
+                <!--<Grid.Background>
             <SolidColorBrush Color="Black" Opacity="0.5"/>
         </Grid.Background>-->
-        <Grid.RowDefinitions>
-            <RowDefinition Height="40" MouseMove="DragMove"></RowDefinition>
-            <RowDefinition Height="*"></RowDefinition>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition x:Name="leftColumn" MinWidth="80" Width="150" MaxWidth="200"></ColumnDefinition>
-            <ColumnDefinition Width="*"></ColumnDefinition>
-        </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="40" MouseMove="DragMove"></RowDefinition>
+                    <RowDefinition Height="*"></RowDefinition>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition x:Name="LeftColumn" MinWidth="80" Width="165" MaxWidth="200"></ColumnDefinition>
+                    <ColumnDefinition Width="45*"></ColumnDefinition>
+                    <ColumnDefinition Width="382*"/>
+                </Grid.ColumnDefinitions>
 
 
-        <DockPanel Grid.Row="0" Grid.Column="0" MouseMove="DragMove">
-           <Image Source="/Resource/Image/WindowLogo.png" Margin="10,0,0,0" Width="94" Height="30" HorizontalAlignment="Left"/>
-        </DockPanel>
+                <DockPanel Grid.Row="0" Grid.Column="0" MouseMove="DragMove">
+                    <DockPanel.Background>
+                        <SolidColorBrush Opacity="0.01"/>
+                    </DockPanel.Background>
+                    <Image Source="/Resource/Image/WindowLogo.png" Margin="10,0,0,0" Width="94" Height="30" HorizontalAlignment="Left"/>
+                </DockPanel>
 
-        <StackPanel Grid.Row="0" Grid.Column="1" MouseMove="DragMove" HorizontalAlignment="Right" Orientation="Horizontal">
-            <Button Background="Transparent" 
+                <DockPanel Grid.Row="0" Grid.Column="2" MouseMove="DragMove">
+                    <DockPanel.Background>
+                        <SolidColorBrush Opacity="0.01"/>
+                    </DockPanel.Background>
+                    <hc:UniformSpacingPanel Spacing="0" Grid.ColumnSpan="4" HorizontalAlignment="Right" VerticalAlignment="Center">
+                        <Button Background="Transparent" 
                     BorderThickness="0"
-                    hc:IconElement.Geometry="{StaticResource ODDataGeometry}"
+                    hc:IconElement.Geometry="M917.930667 512c0-57.6 36.181333-106.496 86.869333-125.952a505.429333 505.429333 0 0 0-55.210667-133.461333A134.826667 134.826667 0 0 1 771.413333 74.410667 507.733333 507.733333 0 0 0 637.952 19.2 135.168 135.168 0 0 1 512 106.069333 134.912 134.912 0 0 1 386.048 19.2 505.429333 505.429333 0 0 0 252.586667 74.410667c22.186667 49.749333 13.141333 109.824-27.562667 150.528a135.168 135.168 0 0 1-150.528 27.648 502.016 502.016 0 0 0-55.296 133.461333c50.688 19.626667 86.869333 68.437333 86.869333 125.952 0 57.6-36.181333 106.496-86.869333 125.952 12.117333 47.530667 30.72 92.330667 55.210667 133.461333a134.826667 134.826667 0 0 1 178.090666 178.176 507.733333 507.733333 0 0 0 133.546667 55.210667A135.168 135.168 0 0 1 512 917.930667c57.6 0 106.496 36.181333 125.952 86.869333a505.429333 505.429333 0 0 0 133.461333-55.210667 134.912 134.912 0 0 1 27.562667-150.528 135.168 135.168 0 0 1 150.528-27.648 502.016 502.016 0 0 0 55.296-133.461333A134.912 134.912 0 0 1 917.930667 512zM512 647.338667a135.338667 135.338667 0 1 1 0.085333-270.762667A135.338667 135.338667 0 0 1 512 647.338667z"
                     hc:IconElement.Height="18"
                     hc:IconElement.Width="18"
                     HorizontalAlignment="Right"
                     />
-            <Button Background="Transparent" 
+                        <Button Background="Transparent" 
                     BorderThickness="0"
                     hc:IconElement.Geometry="M828.770654 148.714771C641.293737-20.89959 354.184117-19.590868 168.245698 152.630946c-212.062907 196.418185-212.062907 522.329912 0 718.748098 185.93842 172.221815 473.048039 173.520546 660.524956 3.916176 219.435707-198.536117 219.435707-528.054322 0-726.580449z m-121.880976 569.643707c-11.708566 11.708566-30.680039 11.708566-42.388605 0L502.729054 556.586459c-0.659356-0.659356-1.728312-0.659356-2.397659 0L338.609327 718.318517c-11.708566 11.708566-30.680039 11.708566-42.388605 0l-0.039961-0.039961c-11.708566-11.708566-11.708566-30.680039 0-42.388605l161.732059-161.732058c0.659356-0.659356 0.659356-1.728312 0-2.397659L296.1408 350.008195c-11.708566-11.708566-11.708566-30.680039 0-42.388605l0.039961-0.039961c11.708566-11.708566 30.680039-11.708566 42.388605 0l161.772019 161.77202c0.659356 0.659356 1.728312 0.659356 2.397659 0L664.551024 307.539668c11.708566-11.708566 30.680039-11.708566 42.388605 0l0.039961 0.039961c11.708566 11.708566 11.708566 30.680039 0 42.388605L545.15762 511.770224c-0.659356 0.659356-0.659356 1.728312 0 2.397659L706.919649 675.939902c11.708566 11.708566 11.708566 30.680039 0 42.388605l-0.029971 0.029971z" 
                     hc:IconElement.Height="18"
@@ -129,107 +144,142 @@
                     HorizontalAlignment="Right"
                     Click="CloseButtonClick"
                     />
-        </StackPanel>
+                    </hc:UniformSpacingPanel>
 
-        <!--左侧栏-->
-        <hc:Card x:Name="leftCard" Grid.Row="1" Grid.Column="0"
+                </DockPanel>
+
+                <!--左侧栏-->
+                <hc:Card x:Name="leftCard" Grid.Row="1" Grid.Column="0"
                  BorderThickness="1" 
                  Effect="{DynamicResource EffectShadow2}" 
-                 Opacity="0.5"
                  Margin="5,0,0,5"
                  >
-            <hc:Card.ContextMenu>
-                <ContextMenu Width="200">
-                    <MenuItem Header="新建菜单" Click="CreateMenu"/>
-                </ContextMenu>
-            </hc:Card.ContextMenu>
+                    <hc:Card.Background>
+                        <SolidColorBrush Color="#FFFFFFFF" Opacity="0.5"/>
+                    </hc:Card.Background>
+                    <hc:Card.BorderBrush>
+                        <SolidColorBrush Color="#FFFFFFFF" Opacity="0"/>
+                    </hc:Card.BorderBrush>
+                    <hc:Card.ContextMenu>
+                        <ContextMenu Width="200">
+                            <MenuItem Header="新建菜单" Click="CreateMenu"/>
+                        </ContextMenu>
+                    </hc:Card.ContextMenu>
+                    <WrapPanel Orientation="Horizontal">
+                        <ListBox x:Name="menus"  
+                         ItemsSource="{Binding MenuList}"
+                         BorderThickness="0" Foreground="{x:Null}"
+                     >
 
-            <ListBox x:Name="menus"  
-                     ItemsSource="{Binding MenuList}"
-                     SelectionChanged="MenuClick">
-                <ListBox.Resources>
-                    <ContextMenu x:Key="menuDialog" Width="200">
-                        <MenuItem Header="新建菜单" Click="CreateMenu"/>
-                        <MenuItem Header="重命名"  Click="RenameMenu" Tag="{Binding}"/>
-                        <MenuItem Header="删除" Click="DeleteMenu" Tag="{Binding}"/>
-                    </ContextMenu>
-                </ListBox.Resources>
 
-                <ListBox.ItemContainerStyle>
-                    <Style TargetType="ListBoxItem" BasedOn="{StaticResource menuStyle}">
-                        <Setter Property="ContextMenu" Value="{StaticResource menuDialog}"/>
-                    </Style>
-                </ListBox.ItemContainerStyle>
-                <ListBox.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <DraggAnimatedPanel:DraggAnimatedPanel ItemsHeight="30" ItemsWidth="{Binding ElementName=leftColumn, Path=Width, Converter={StaticResource MenuWidthConvert}}"   HorizontalAlignment="Center" VerticalAlignment="Top" SwapCommand="{Binding SwapCommand2, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"/>
-                    </ItemsPanelTemplate>
-                </ListBox.ItemsPanel>
+                            <ListBox.Resources>
+                                <ContextMenu x:Key="menuDialog" Width="200">
+                                    <MenuItem Header="新建菜单" Click="CreateMenu"/>
+                                    <MenuItem Header="重命名"  Click="RenameMenu" Tag="{Binding}"/>
+                                    <MenuItem Header="删除" Click="DeleteMenu" Tag="{Binding}"/>
+                                </ContextMenu>
+                            </ListBox.Resources>
 
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel>
-                            <TextBox Text="{Binding Path=MenuName, Mode=TwoWay}"
+                            <ListBox.ItemContainerStyle>
+                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource menuStyle}">
+                                    <Setter Property="ContextMenu" Value="{StaticResource menuDialog}"/>
+                                </Style>
+                            </ListBox.ItemContainerStyle>
+                            <ListBox.Background>
+                                <SolidColorBrush Color="AliceBlue" Opacity="0"/>
+                            </ListBox.Background>
+
+                            <ListBox.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <DraggAnimatedPanel:DraggAnimatedPanel ItemsHeight="30" ItemsWidth="{Binding ElementName=LeftColumn, Path=Width, Converter={StaticResource MenuWidthConvert}}"   HorizontalAlignment="Center" VerticalAlignment="Top" SwapCommand="{Binding SwapCommand2, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"/>
+                                </ItemsPanelTemplate>
+                            </ListBox.ItemsPanel>
+
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel MouseLeftButtonDown="MenuClick" Tag="{Binding}">
+                                        <TextBox Text="{Binding Path=MenuName, Mode=TwoWay}"
                                      HorizontalAlignment="Left"
-                                     Width="{Binding ElementName=leftColumn, Path=Width, Converter={StaticResource MenuWidthConvert}}"
+                                     Width="{Binding ElementName=LeftColumn, Path=Width, Converter={StaticResource MenuWidthConvert}}"
                                      FontSize="15"
                                      TextAlignment="Left"
-                                     BorderBrush="{x:Null}" 
-                                     BorderThickness="0" 
                                      LostFocus="LostFocusOrEnterDown"
                                      KeyDown="LostFocusOrEnterDown"
                                      Tag="{Binding}"
                                      IsVisibleChanged="MenuEditWhenVisibilityChanged"
                                      Visibility="{Binding Path=MenuEdit, Converter={StaticResource VisibilityConvert}}"/>
-                            <StackPanel Orientation="Horizontal">
-                                <Button Background="Transparent" 
+                                        <StackPanel Orientation="Horizontal">
+                                            <Button Background="Transparent" 
                                         BorderThickness="0"
-                                        hc:IconElement.Geometry="M805.677 218h100.323v540.3c0 0.072-0.972-0.3-1.696-0.3h-779.304v-561h401.869l3.867-1.982s230.651-131.583 285.375-162.778l-18.832 185.76h8.398zM246.395 562.149c0 45.515 37.029 82.543 82.543 82.543s82.543-37.029 82.543-82.543-37.029-82.543-82.543-82.543-82.543 37.028-82.543 82.543zM607.846 333.696c-25.872-10.699-59.908-16.494-95.837-16.494s-69.965 5.746-95.837 16.445c-41.257 17.061-47.416 40.353-47.416 52.353h33.591c0-5 8.343-13.687 26.661-21.263 21.579-8.924 51.832-13.945 83.001-13.945s61.421 4.971 83.001 13.896c18.317 7.576 26.661 16.312 26.661 21.312h33.591c-0.001-12-6.16-35.243-47.416-52.304zM695.078 479.606c-45.515 0-82.543 37.029-82.543 82.543s37.029 82.543 82.543 82.543c45.515 0 82.543-37.029 82.543-82.543s-37.028-82.543-82.543-82.543zM904.304 792h-784.765c-30.073 0-54.539-24.863-54.539-55.425v-517.298c0-30.561 24.466-55.277 54.539-55.277h398.429c34.254-20 284.848-162.442 292.86-167.011 5.582-3.184 10.775-4.768 15.874-4.767 7.977 0.001 14.871 3.852 19.076 10.598 2.903 4.656 4.221 10.346 4.221 17.432v143.748h54.304c30.356 0 54.697 24.716 54.697 55.277v517.298c0 30.562-24.341 55.425-54.696 55.425zM927 217.598c0-20.155-20.551-20.598-20.551-20.598h-89.449v-169.19l-0.685 4.759c-54.724 31.195-285.477 162.449-285.477 162.449l-3.969 1.982h-408.963c-11.132 0-19.906 9.466-19.906 20.598v521.497c0 11.131 8.774 19.905 19.905 19.905h7.095v-1h779.304c0.724 0 1.696 0.371 1.696 0.3v0.949c11 0 21-9.023 21-20.154v-521.497zM377.891 562.149c0 26.993-21.96 48.953-48.953 48.953-26.993 0-48.953-21.96-48.953-48.953 0-26.992 21.96-48.953 48.953-48.953 26.993 0 48.953 21.961 48.953 48.953zM411.482 562.149c0 45.515-37.029 82.543-82.543 82.543s-82.543-37.029-82.543-82.543 37.029-82.543 82.543-82.543 82.543 37.028 82.543 82.543zM279.986 562.149c0 26.993 21.96 48.953 48.953 48.953 26.992 0 48.953-21.96 48.953-48.953 0-26.992-21.96-48.953-48.953-48.953-26.993 0-48.953 21.961-48.953 48.953zM744.031 562.149c0 26.993-21.96 48.953-48.953 48.953s-48.953-21.96-48.953-48.953c0-26.992 21.96-48.953 48.953-48.953s48.953 21.961 48.953 48.953zM695.078 644.693c-45.515 0-82.543-37.029-82.543-82.543s37.029-82.543 82.543-82.543c45.515 0 82.543 37.029 82.543 82.543s-37.028 82.543-82.543 82.543zM646.126 562.149c0 26.993 21.96 48.953 48.953 48.953s48.953-21.96 48.953-48.953c0-26.992-21.96-48.953-48.953-48.953s-48.953 21.961-48.953 48.953zM595.009 364.737c-21.579-8.924-51.832-13.945-83.001-13.945s-61.421 4.971-83.001 13.896c-18.318 7.576-26.661 16.312-26.661 21.312h-33.591c0-12 6.16-35.243 47.415-52.304 25.873-10.699 59.908-16.494 95.837-16.494s69.965 5.746 95.837 16.445c41.258 17.061 47.417 40.353 47.417 52.353h-33.591c0.001-5-8.343-13.687-26.661-21.263zM125 759h-7.095c-11.131 0-19.905-8.774-19.905-19.905v-521.497c0-11.132 8.774-20.598 19.905-20.598h7.095v562zM906 759.249v-541.249h-108.721l19.036-185.65 0.685-4.54v169.19h89.449s20.551 0.443 20.551 20.598v521.497c0 11.131-10 20.154-21 20.154z" 
+                                        hc:IconElement.Geometry="M438.857143 548.571429a36.571429 36.571429 0 0 1 36.571428 36.571428v256a36.571429 36.571429 0 0 1-36.571428 36.571429H182.857143a36.571429 36.571429 0 0 1-36.571429-36.571429v-256a36.571429 36.571429 0 0 1 36.571429-36.571428h256z m402.285714 0a36.571429 36.571429 0 0 1 36.571429 36.571428v256a36.571429 36.571429 0 0 1-36.571429 36.571429h-256a36.571429 36.571429 0 0 1-36.571428-36.571429v-256a36.571429 36.571429 0 0 1 36.571428-36.571428h256z m-438.857143 73.142857H219.428571v182.857143h182.857143v-182.857143z m402.285715 0h-182.857143v182.857143h182.857143v-182.857143zM438.857143 146.285714a36.571429 36.571429 0 0 1 36.571428 36.571429v256a36.571429 36.571429 0 0 1-36.571428 36.571428H182.857143a36.571429 36.571429 0 0 1-36.571429-36.571428V182.857143a36.571429 36.571429 0 0 1 36.571429-36.571429h256z m402.285714 0a36.571429 36.571429 0 0 1 36.571429 36.571429v256a36.571429 36.571429 0 0 1-36.571429 36.571428h-256a36.571429 36.571429 0 0 1-36.571428-36.571428V182.857143a36.571429 36.571429 0 0 1 36.571428-36.571429h256zM402.285714 219.428571H219.428571v182.857143h182.857143V219.428571z m402.285715 0h-182.857143v182.857143h182.857143V219.428571z" 
                                         hc:IconElement.Height="18"
                                         hc:IconElement.Width="18"
                                         />
-                                <TextBlock Text="{Binding MenuName}"
+                                            <TextBlock Text="{Binding MenuName}"
                                            VerticalAlignment="Center"
                                            IsVisibleChanged="MenuWhenVisibilityChanged"
                                            Visibility="{Binding Path=NotMenuEdit, Converter={StaticResource VisibilityConvert}}"
                                            />
-                            </StackPanel>
-                            
-                        </StackPanel>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
-        </hc:Card>
-        
-        <!--分割线-->
-        <GridSplitter Opacity="0" Grid.Row="1" Grid.Column="0" Width="1"  VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
+                                        </StackPanel>
 
-        <!--右侧栏-->
-        <hc:Card AllowDrop="True" 
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </WrapPanel>
+                </hc:Card>
+
+                <!--分割线-->
+                <GridSplitter DragCompleted="LeftCardResize" Opacity="0" Grid.Row="1" Grid.Column="0" Width="1"  VerticalAlignment="Stretch" HorizontalAlignment="Right"/>
+
+                <!--右侧栏-->
+                <hc:Card AllowDrop="True" 
                  Drop="Wrap_Drop" 
-                 Opacity="0.5" 
                  x:Name="rightCard" 
                  Grid.Row="1" 
                  Grid.Column="1"  
                  BorderThickness="1" 
                  Effect="{DynamicResource EffectShadow2}" 
-                 Margin="5,0,5,5">
-            <WrapPanel Orientation="Horizontal">
-                <ListBox x:Name="icons" ItemsSource="{Binding}" 
+                 Margin="5,0,5,5" Grid.ColumnSpan="2">
+                    <hc:Card.Background>
+                        <SolidColorBrush Color="#FFFFFFFF" Opacity="0.5"/>
+                    </hc:Card.Background>
+                    <hc:Card.BorderBrush>
+                        <SolidColorBrush Color="#FFFFFFFF" Opacity="0"/>
+                    </hc:Card.BorderBrush>
+                    <WrapPanel Orientation="Horizontal">
+                        <ListBox x:Name="icons" ItemsSource="{Binding}" 
                          BorderThickness="0"
                          SelectionChanged="IconSelectionChanged"
                          >
-                    <ListBox.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <DraggAnimatedPanel:DraggAnimatedPanel ItemsHeight="115" ItemsWidth="100"  HorizontalAlignment="Center" SwapCommand="{Binding SwapCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"/>
-                        </ItemsPanelTemplate>
-                    </ListBox.ItemsPanel>
+                            <ListBox.Background>
+                                <SolidColorBrush Opacity="0"/>
+                            </ListBox.Background>
+                            <ListBox.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <DraggAnimatedPanel:DraggAnimatedPanel ItemsHeight="115" ItemsWidth="100"  HorizontalAlignment="Center" SwapCommand="{Binding SwapCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"/>
+                                </ItemsPanelTemplate>
+                            </ListBox.ItemsPanel>
 
+                            <ListBox.Resources>
+                                <ContextMenu x:Key="iconDialog" Width="200">
+                                    <MenuItem Header="管理员方式运行" Click="IconAdminStart" Tag="{Binding}"/>
+                                    <MenuItem Header="打开文件所在位置" Click="ShowInExplore" Tag="{Binding}"/>
+                                    <MenuItem Header="属性" Click="PropertyConfig" Tag="{Binding}"/>
+                                    <MenuItem Header="从列表移除" Click="RemoveIcon" Tag="{Binding}"/>
+                                </ContextMenu>
+                            </ListBox.Resources>
 
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel 
-                                        MouseLeftButtonDown="IconClick"
+                            <ListBox.ItemContainerStyle>
+                                <Style TargetType="ListBoxItem">
+                                    <Setter Property="ContextMenu" Value="{StaticResource iconDialog}"/>
+                                </Style>
+                            </ListBox.ItemContainerStyle>
+
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Tag="{Binding}"
+                                        MouseLeftButtonUp="IconClick"
                                         HorizontalAlignment="Center"
                                         Margin="5,5,5,5"
                                         hc:Poptip.HitMode="None" 
@@ -237,21 +287,27 @@
                                         hc:Poptip.Content="{Binding Content}" 
                                         hc:Poptip.Placement="BottomLeft"
                                         >
-                                <Image Style="{StaticResource imageStyle}"></Image>
-                                    <TextBlock MaxWidth="80"
+                                        <Image Style="{StaticResource imageStyle}" />
+                                        <TextBlock MaxWidth="80"
                                                MaxHeight="40"
                                                TextWrapping="Wrap" 
                                                TextTrimming="WordEllipsis"
                                                TextAlignment="Center" 
                                                VerticalAlignment="Center" 
                                                Text="{Binding Name}"/>
-                            </StackPanel>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
-            </WrapPanel>
-        </hc:Card>
-        <hc:NotifyIcon Icon="/Resource/Image/Ico.png" Text="GeekDesk" Click="NotifyIcon_Click"/>
-    </Grid>
+
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </WrapPanel>
+                </hc:Card>
+                <hc:NotifyIcon Icon="/Resource/Image/Ico.png" Text="GeekDesk" Click="NotifyIcon_Click"/>
+                <StackPanel hc:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,0"/>
+            </Grid>
+        </Border>
+    </Border>
+   
+   
 
 </Window>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index ff717ba..55a7737 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -1,11 +1,11 @@
 using DraggAnimatedPanelExample;
+using GeekDesk.Constant;
+using GeekDesk.Control;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
 using System.Windows;
 using System.Windows.Controls;
@@ -21,7 +21,7 @@ namespace GeekDesk
     public partial class MainWindow : Window
     {
 
-        private AppData appData = CommonCode.GetAppDataByFile();
+        public static AppData appData = CommonCode.GetAppDataByFile();
         private int menuSelectIndexTemp = -1;
         public MainWindow()
         {
@@ -40,9 +40,10 @@ namespace GeekDesk
             this.DataContext = appData;
             if (appData.MenuList.Count == 0)
             {
-                appData.MenuList.Add(new MenuInfo() { MenuName = "NewGouop", MenuId = System.Guid.NewGuid().ToString(), MenuEdit = (int)Visibility.Collapsed});
+                appData.MenuList.Add(new MenuInfo() { MenuName = "NewMenu", MenuId = System.Guid.NewGuid().ToString(), MenuEdit = (int)Visibility.Collapsed});
             }
             //窗体大小
+            LeftColumn.Width = new GridLength(appData.AppConfig.MenuCardWidth);
             this.Width = appData.AppConfig.WindowWidth;
             this.Height = appData.AppConfig.WindowHeight;
             //选中 菜单
@@ -64,18 +65,13 @@ namespace GeekDesk
                         {
                             int fromS = indexes[0];
                             int to = indexes[1];
-                            var elementSource = icons.Items[to];
-                            var dragged = icons.Items[fromS];
-                            if (fromS > to)
-                            {
-                                icons.Items.Remove(dragged);
-                                icons.Items.Insert(to, dragged);
-                            }
-                            else
-                            {
-                                icons.Items.Remove(dragged);
-                                icons.Items.Insert(to, dragged);
-                            }
+                            ObservableCollection<IconInfo> iconList = appData.MenuList[menus.SelectedIndex].IconList;
+                            var elementSource = iconList[to];
+                            var dragged = iconList[fromS];
+
+                            iconList.Remove(dragged);
+                            iconList.Insert(to, dragged);
+                            CommonCode.SaveAppData(appData);
                         }
                     );
                 return _swap;
@@ -96,19 +92,11 @@ namespace GeekDesk
                             ObservableCollection<MenuInfo> menuList = appData.MenuList;
                             var elementSource = menuList[to];
                             var dragged = menuList[fromS];
-                            if (fromS > to)
-                            {
-                                menuList.Remove(dragged);
-                                menuList.Insert(to, dragged);
-                            }
-                            else
-                            {
-                                menuList.Remove(dragged);
-                                menuList.Insert(to, dragged);
-                            }
+                            menuList.Remove(dragged);
+                            menuList.Insert(to, dragged);
+                            menus.SelectedIndex = to;
                             appData.MenuList = menuList;
-                            //menus.Items.Refresh();
-
+                            CommonCode.SaveAppData(appData);
                         }
                     );
                 return _swap2;
@@ -124,33 +112,27 @@ namespace GeekDesk
             foreach (object obj in dropObject)
             {
                 string path = (string)obj;
-                if (File.Exists(path))
-                {
-                    // 文件
-                    BitmapImage bi = FileIcon.GetBitmapImage(path);
-                    IconInfo iconInfo = new IconInfo();
-                    iconInfo.Path = path;
-                    iconInfo.BitmapImage = bi;
-                    iconInfo.Name = Path.GetFileNameWithoutExtension(path);
-                    appData.MenuList[menus.SelectedIndex].IconList.Add(iconInfo);
-                    CommonCode.SaveAppData(appData);
 
-                }
-                else if (Directory.Exists(path))
+                IconInfo iconInfo = new IconInfo
                 {
-                    //文件夹
-
-                }
+                    Path = path,
+                    BitmapImage = ImageUtil.GetBitmapIconByPath(path)
+                };
+                iconInfo.DefaultImage = iconInfo.ImageByteArr;
+                iconInfo.Name = Path.GetFileNameWithoutExtension(path);
+                appData.MenuList[menus.SelectedIndex].IconList.Add(iconInfo);
             }
-            icons.Items.Refresh();
+            CommonCode.SaveAppData(appData);
         }
 
-        //菜单点击事件
-        private void MenuClick(object sender, SelectionChangedEventArgs e)
+   
+        ////菜单点击事件
+        private void MenuClick(object sender, MouseButtonEventArgs e)
         {
             //设置对应菜单的图标列表
-            icons.ItemsSource = appData.MenuList[menus.SelectedIndex].IconList;
-            appData.AppConfig.SelectedMenuIndex = menus.SelectedIndex;
+            MenuInfo mi = (MenuInfo)(((StackPanel)sender).Tag);
+            icons.ItemsSource = mi.IconList;
+            appData.AppConfig.SelectedMenuIndex = menus.Items.IndexOf(mi);
             CommonCode.SaveAppData(appData);
         }
 
@@ -164,11 +146,81 @@ namespace GeekDesk
         private void IconClick(object sender, MouseButtonEventArgs e)
         {
             IconInfo icon = (IconInfo)((StackPanel)sender).Tag;
-            System.Diagnostics.Process.Start(icon.Path);
-            icon.Count++;
-            CommonCode.SaveAppData(appData);
+            if (icon.AdminStartUp)
+            {
+                StartIconApp(icon, IconStartType.ADMIN_STARTUP);
+            }
+            else
+            {
+                StartIconApp(icon, IconStartType.DEFAULT_STARTUP);
+            }
         }
 
+        /// <summary>
+        /// 管理员方式启动
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void IconAdminStart(object sender, RoutedEventArgs e)
+        {
+            IconInfo icon = (IconInfo)((MenuItem)sender).Tag;
+            StartIconApp(icon, IconStartType.ADMIN_STARTUP);
+        }
+
+        /// <summary>
+        /// 打开文件所在位置
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ShowInExplore(object sender, RoutedEventArgs e)
+        {
+            IconInfo icon = (IconInfo)((MenuItem)sender).Tag;
+            StartIconApp(icon, IconStartType.SHOW_IN_EXPLORE);
+        }
+
+        private void StartIconApp(IconInfo icon, IconStartType type)
+        {
+            try
+            {
+
+                if (!File.Exists(icon.Path) && !Directory.Exists(icon.Path))
+                {
+                    HandyControl.Controls.Growl.WarningGlobal("程序启动失败(文件路径不存在或已删除)!");
+                    return;
+                }
+
+                Process p = new Process();
+                p.StartInfo.FileName = icon.Path;
+
+                switch (type) {
+                    case IconStartType.ADMIN_STARTUP:
+                        p.StartInfo.Arguments = "1";//启动参数
+                        p.StartInfo.Verb = "runas";
+                        p.StartInfo.CreateNoWindow = false; //设置显示窗口
+                        p.StartInfo.UseShellExecute = false;//不使用操作系统外壳程序启动进程
+                        p.StartInfo.ErrorDialog = false;
+                        this.Visibility = Visibility.Collapsed;
+                        break;// c#好像不能case穿透
+                    case IconStartType.DEFAULT_STARTUP:
+                        this.Visibility = Visibility.Collapsed;
+                        break;
+                    case IconStartType.SHOW_IN_EXPLORE:
+                        p.StartInfo.FileName = "Explorer.exe";
+                        p.StartInfo.Arguments = "/e,/select," + icon.Path;
+                        break;
+                }
+                p.Start();
+                icon.Count++;
+                CommonCode.SaveAppData(appData);
+            } catch (Exception)
+            {
+                HandyControl.Controls.Growl.WarningGlobal("程序启动失败(不支持的启动方式)!");
+            }
+            
+        }
+
+        
+
         /// <summary>
         /// data选中事件 设置不可选中
         /// </summary>
@@ -313,7 +365,7 @@ namespace GeekDesk
         /// <param name="e"></param>
         private void CreateMenu(object sender, RoutedEventArgs e)
         {
-            appData.MenuList.Add(new MenuInfo() { MenuEdit = (int)Visibility.Collapsed, MenuId = System.Guid.NewGuid().ToString(), MenuName = "NewGouop" });
+            appData.MenuList.Add(new MenuInfo() { MenuEdit = (int)Visibility.Collapsed, MenuId = System.Guid.NewGuid().ToString(), MenuName = "NewMenu" });
             menus.SelectedIndex = appData.MenuList.Count - 1;
             //appData.MenuList[appData.MenuList.Count - 1].MenuEdit = (int)Visibility.Visible;
             CommonCode.SaveAppData(appData);
@@ -345,6 +397,37 @@ namespace GeekDesk
             }
         }
 
+        /// <summary>
+        /// 弹出Icon属性修改面板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PropertyConfig(object sender, RoutedEventArgs e)
+        {
+            HandyControl.Controls.Dialog.Show(new IconInfoDialog((IconInfo)((MenuItem)sender).Tag));
+        }
+
+        /// <summary>
+        /// 从列表删除图标
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void RemoveIcon(object sender, RoutedEventArgs e)
+        {
+            appData.MenuList[menus.SelectedIndex].IconList.Remove((IconInfo)((MenuItem)sender).Tag);
+            CommonCode.SaveAppData(appData);
+        }
+
+        /// <summary>
+        /// 左侧栏宽度改变 持久化
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LeftCardResize(object sender, System.Windows.Controls.Primitives.DragCompletedEventArgs e)
+        {
+            appData.AppConfig.MenuCardWidth = LeftColumn.Width.Value;
+            CommonCode.SaveAppData(appData);
+        }
     }
 
 
diff --git a/Resource/Image/图片.png b/Resource/Image/图片.png
new file mode 100644
index 0000000000000000000000000000000000000000..35d091cb421a12f459294524368f6b50d90127e3
GIT binary patch
literal 6050
zcmV;T7hULyP)<h;3K|Lk000e1NJLTq009O70077c1^@s63ZPF+000+hNkl<ZcwX(D
z32Yt5dB^`tkrYKyq(~j4#6t&lQk1OQSK_u#t=3IY$2HOeb%8cW;<`-&Bt6jdNYb<j
ziXshKv}tYhN)favkh+QO*ou5Lc5KVKDN;N{k>VjzyeU#5Me*F?)3azvB;VWj-t6qm
z+y4Lp1!(u1Z+_qE&u?dEzH#88{n9_bTrxGC{;@O%54u1lfK320J>1GmNPq+aCEx;Z
z+5yzNu6q<SGcUdHJC9b!a><Ey!Q;=ocE9V)e8B}i5z7$&odih08UnAw#W$b-?L#jw
z<ne;S@Yu6Q{tj?HZ_QBYC<%~2d;}bPdu-VK>??opbE9|PI7b*h_Ux-=i{O42zytC1
z!mCMu1gs<A;@nJH`metDnTKm{_x%oGcwZEL1Yo;$1Ej+wKmv&p=meZcpMUC+np+0$
z5QfK|dF3b^+?S|z-bVr?U@d`q=X%BiKlsAW49N&)h2i7RzWR?Y+^4M_79A%65=fT7
ze?R}!p<kO7hL1n<%12xWuO(}h_mcn#*iFC%e))x`4t?)t#_-s)M-Btd&)YpDdQSo*
zkTd}Y$DjYqp?jUj|LI8OOqw%0>5#Nx8Xy4@u$sV(gP(SO@tGrEavbODR*!_vlK=@Q
zBj5sm<2?54D?bGAQDs(Xhy+N$b^^yl7%l?XVEahuKM9b4G6Ewa46@6DjRZ)51ZD|P
z82B)d013<?Kw;oRK>{Q|Vc;`B0wfTd05gWzjCchJgpL4(A#@?<fJq=W0SZHGM!bRq
zLPvnY5W0|az$6fx0EHnoBVIuQp(8+H2wliIU=oN;fWi=)5w9SD&=H_8gf8S9FbTva
zKw*f@h*yw6=m=04LKkulm;_=IpfJQ{#4AW3bOb02p$j<&Oaie9P#9t};uRziIsz1i
z(1n}>o{vD9<DwvA68V{v7@JPRmB~zuPAv*8EDA$tLm%#e@5;N1{rN*EUpk6{%t_>B
zOwIu^K9hzk6B!ts$i%V1e4HK5Meq3HP=KQ_gd)rwq!8G>d>DI|4`a{rVXVlUNC-;Z
z)n%x;ntM|uT1T@JvSGtb6b2ijL?4qPP?38LhgSFDV8NB7?A(6yl<VMdcOedUug1`1
zhBCXR7@{zk5()aDoPfM0JW|+)hgJ?Kw|&cC|9B=2_e2CDl^TU1m7>Y9%o2EbRX;wp
zp-meRdA<1e)-rV8NR2rN3WK&shaKr6@c7y;e4^yCuI^_08JSAQx0=`E>~Nm;zEyWf
zVNgw!_5vmF)r#}jk~0#h5C73tiX%OCzgkcj0)2$oxk>`x-hT#}X)`KKCT#2Pn>XO-
zKtaOy2Yn-jA?OIOe<cLIURjUz+1HiWQf1^z=PJ;4eTgb_TJ2C6wBlxGeh~Ovc?<4e
zG3bZsq-+jMWa3Y2w_(`A&zTg4q(aY|gC_7q@nt+w+!eGN3-*6{C=cIg++?hO3pqw%
zur6eD_!faxi^uU7I~tIiK4mnN@3fa%x6XmWVDuwJ=b{n#^|B6pw5Z2;NU{j(%XQnV
zS|LecF#fTkgYyw6T{3nvTQKD-M64*i*j0q@UMh}tnKA!PVK62XbR-@EpIqOLpIzM-
z&n<yoD|;&>Yp`YG6@?+t$Az6IO5h)M*PtN59g>Omne2Vfb*{m4ookadqvd`IgBHx}
zL?waEIivXViUyS?wb*JJS$Z>Tu%S^HY={zlyo10m6!qZAvJNY${9g4Ablu1@-ggRv
z@gbsvcN6%dtrs8_m~3qS*<ON|x(khWox)&zi0I(m1pe#bDQlrf1*pGl*kZc>E``DL
z5YfLo2uQKkZ|$zOmWtGC_+oXX>Hg197)%cl{kwyJRArL&3$`{XF#B64_ZaTJOJOiP
zLUivg0#e!ei<_IR=JM&&yG<`mKh2E6>PIYm&L1l5!*8x@w|d}zSW|(HF{8I*Pf-}G
ze#Croes~a=7?1o(PY1G>0ogggqTml;d2DSrex;<-r-AD+`<1$FxG=I*PiKkr;)24E
z2)C5HXY?A-*9G)-1LI?JhqyQkDA@q4DGPM?A6_|tr#H3+>O-=ff4*ub`X@4zHRI>~
zlgt?W#A}P~?n^-H1z>9KX-sp5uzUruZZohfn1ZL3x!3T=+Zt^lJFlNlp4f{S*D-et
z4kjoJ=7vX)XN@&LZ=4mC(=&kWyMa9YH4WD;xq)x&tkuKDhhC(b)6-{m`CwV4NteQ)
z5~p>x8qNa!-HE%s^MH17Sh8pu|GKX#ai0Uevt=|Je^R?WU@u~JKhBIHCZiO+;KZB2
z_>JTTci+Q+WDpwLH+P*wQP#M|9@TaATJI|STWhfMG#*AnVekMc^)7ku4R7-aUPdmj
z6OuV-Y`;-<36B=_YV1*6SATVWGpdJk)fx1`k_+5m#^3{3qfJ&F1x6HaKq_7jY}l%8
z*m7d^?{8_+)}N}5q-yl%s&=X}=c65GjKbg}UgJ#HR{;Y))kxg78(67l*I-Wi)Xn`8
z8ELL@h@&}V$!i4Qg2G_cla-9Km)n7h^~qR>es69*u<M|I_V2PR8G~dFHnqQQ+=Qy3
zU_SH4$>};XhB%2?dHMAbpymWHIpMGS<rTo1Qh)n+-@4Rekh%=EwBv*M_}iw9cDU<c
zl)_*~sFL$C+0T+*dtb5?xaVGNUnxFY-hu}VJb`LHTvCHUYBAW*Tu>Nnh*NSt%Bseu
zy5wxcb9Y%eP^RbPrLD_G@RjZ7<MA$#Yv1Z$foCqR52Wt|I~`%hkRUlLZX3G})Etj&
zhSJrtmH>Mm02ZZd>G4w=+VJqIel2|^+R2~QZbS2^!JDS$49vMkVMsLEHr$uUa%UCe
z+PEE9t7j39e4+UA_C}N}nP=mdim@bV<6m0V;f=nPNm|i;yGvovja*xQJ)OXXbK1JQ
zqobT$VE6sn`rec?imw@1PX2oxYw`WdYqW7t*wIyH3<_x)V`_Q|IC~6`uMt7Dt-F9#
z`u<ZqxMC2$Tiz1XXy^3XIFf^}*6CaHrE=g7Fic@kNz@cu?M*;?z~#^KR{}fsX(jSR
z@nt+w+@-b8`8vBXorX`IGQF;2R7@0xz@H-34oH?D*@9#ZLARX;fxLXJUIhK6qTyN&
zzE*E%rZ5{Q2Sdylv_7^PI=fH{^cZqV)7o{wM*T;!6=sd&)9c$%k$X)8@DI8;+`Ss#
zY1gyB%jbbn7<>k-*Zh@!pw^(nSfm`>-VX&*D>7@*44y2zq~%kl6n1^Fs}MiwU!gbN
z{`Gc+8H0at^;;HE5OFZ6ZP^K|4(^0!d9`?Cb)PRQBuA#wAz8xVo<hjHLaH<e7^E<y
zN;Kv5L0%(FYXz%;ir^>WWN*cx!rq%_UZy+A?aCaS$i%6kJRI&Wgq$puf{ntE5<xZL
z^JFxTvJ!Hs8T$m5rB6W$%I?U!dh_S%#okthN^uqWb73UM?9%UQ9_RsP3~E3IYsG}m
zlhFuh+&>X-Af$$*oQGMEF^T-l2^3^bVr+U51}8FbWg-KElbJVvhO0UK6b9QPE?cRk
zDwB%(jefBRp!}O(LkWpp3WN25zH||2v!E`)fro&_Mjy*&{iC3201nW{j6oI6AneEi
zF_JCZFmnUZ9Y_NHIuS&8Ebg<H!eDXq(9r_4T5>8=VKK0|(q`IW@}0t9ZM3JSBiX{(
zs2xMd$_Dm-*bZOmWe+n3TOWeUZNS9_yS$fTu~Iaa&2$132Gb)nuYWT$k!&HzZPkf@
zlf!UJEh&ha$oNv`9=DqrgN?!LY6qHqECufu6FDina=%~JX;&SAE((J>nEEW8ISPy_
zK21u8_l^S`_$eSWC6^KFAgHMim%^Zlw7PCg-4o$;gqkZmd3B4|-9g|oGX~q9i0b3O
z)ho7n{eizlCBUW~_WB<R&z(*RgH3_%?*`=X7@M0MO0(}nHjf|-zEc>iigMj)V6e|B
zm*;g>PODnB-2QQ-?g%=VG1wB^p#k9BNn5;)?k7K6njXhX6b92nbj!c<)j(hH6_AzS
zT3!HD9#CS6MtmUPg2LbfR`n*Y4FhN2Q*Sp&i?TdgmPxajNT8h=gNb3e+o$F_pzD$i
zo_hCDzD&p$3N{l7P#8>%${jw*CaE*;0<sJ`mD<W8VB0;ZG@?`*OB*u=)59s-s%3k1
zs<n*F$Zktbr(&lXKA*?aN@4Jsa8l-_Y@1{YI*+kW%HcR~-o6J|u{zG1c)9-sTndB#
zkdx@4vlVDLpM(L!Z(UOcly5iO$xyo2!i>S>xJ$M$s`r>RtvIrmMoy|?Gm3x%T%<4<
z6_VSW>Aegz)|l#@I=^<^3*>SYq&lF<TXJ0rL-G{;vLLG*Wwm3fx3W!uoIAm05COND
z8G}LLm~|zUmOsbho0kvlJQ(XL{<}^B4w@(oI)QubOI{)5RU#}+c3aA>OEyyoP#8>!
z#H=4O*(j5aVQS?Sz?#x9jo9e1I=}^H45o!hK2OSL$}qK+g}}DmVH&aFV|5xS3?_w0
z7BroH2aum(YUvq~Rgm(N%>)7z1{0z%>qDw9Xo?0~G6u;U*bE@xoM*;hKp19SNc9Cx
z(O4Ii0-GvKibi;Saa{_7G0_jpf~JLlFUbb>@d!IZp2r4e42DGFX4$qdENF_xd*=Zl
zufUXugx3!T^%MpZ!XKsuP0@IlmILcHnGlh%`#@nZ;t2@bf~JL_%bp3@JHZw-fjVXk
zL5CoW3!0)a-}@ktofC9a!rp%^g(2uiAdCx|qA}mN9aviybW}p#ze`~V^a%*-f~IKD
zrJ|Emc47;Xz&U0NLE;bdf~JMIFIoibe+ZD8kZb`FaB3(F0inOyZI~A{MdQBp9$-~b
zkdX;{-xP+xo`CKSps6;n?v3u4Ct?R19>=L>#t>8ps*VC9SA*)^?0&PBL|!M@0wUm2
z7y=>BY#}!G9s7X%m9ekm70L;?z*%Mt%CUMd$ZR1tB>7}1pDx*gAW%hN(2bqhf;Zya
zROOA6KUYy0{NWnKDzgRe$oV?qot4@v&oE<93pBblW()Dr=Ica!ycAvSz&TA}Pz2MH
z8D<NfFwI`X*NOOeDZ1K)OJPvNGPW6J3$Yo^cLiT3662QKU8k5aBnQyj-P2RR*<--<
z5pUP?st*Y8bs~tT;UtAY2ln=6puI^)PpQ`jUnhcyDTTpz>SLpkY+-8B_pVa51HMjZ
z4Xp#5Ff(K5?*{sNfE(8%XDm!k0<!CF=`ui$PR}i{r_^{;9ngJAYhY8ZGrmq}4XJCC
zFx(i6oWL~D15Av^1|cG`Y7HP8ZcII>WM~jLcOv#!ctvyqe4Wtygg7{EM#j+F3A8l>
z<74py5P^^)q9z_zQg<2{?2CU)ykjl_zE0?TDvkv!43Z^WY6f~blOMDkiYfw;xj1=S
zDlCNkoCp;RZ@0nM3DrcS*$Yq@L=@yVs>)Azl5&bTtX``V;@rMuqOs-#AcbDp)DYn7
zgc^=sthjhDn2bT@5bDnW*M_~g8UHnf#lZS4!IcMVt^>L_;TV75V%$-&7bsYz+$;^=
zO~5&-Ul?SuPkojDr!M8>0vophx%qnI&Q}Qkc#Gg~uJq47Ex%8|)hrCI8xe)UUOgd@
zPn;qSg(Z6Wlh3O)Cli}Q)#IVvy+}OwJP1gICpJF`ysI~3xL6NdZufIQ^V=?74{X@#
zf4}Fefxa&P`w4Ro8@2$&8^TP$|FJuGN1rgrqNRqj{ts%Q9^~CrvWKi}e|!+Z6X9d?
zmq1P)u=_rL`|!)U)cCx5B~t5C=GSCZ?Cou35m2x)vVbqhtjN_R4C6N<3w_3}`-R+_
zU4bo=k`e%w?dlLveN3fA+KNWNwn@mDX`rJ8=x7Dx?_OG2IZzhN0lzNrww{dP!Z|f-
z6}$lTa!tvGh(M@l)6>Aw*Hl=d4X*@jnuL^BOIgvINJa3x0zd>pe(G$F^ArDtp{E15
zVBq-)a<a0_J*+599JvHt<`vlV60l_wvh4zJ>0<J1)@=q#Hzse#s|DBfSs1R5MqVMj
z?0xX+wCd|*zs1^hz_L8=mSu64EaR5#)NH{JFntp8VgqowO&uF4r7z3E^|ZJA%@`W0
zBD*AQXtL)*CMXM5M|N;7N}ubsq=T|kQmQer1xvu>Nl5u+C>!WhH+d%S|A=a<^VoBJ
z6b9Q%naQ4uB}*f96lB}C{Pa3;q#<<d0)UB=kVjt!WD%cVEj=B$&tGwHfj9lj7+Cn!
zuSbJ+ZxJwU67s}bdKS0IC-?my_U}1xoFDrm47O(r{voGjl>|(hgw(yoe%W&1o_kf&
z{J@qApM-(gf<FPH)wu*rn1pO?jI2}8-DDT>mYqKI>inPjjDgvL4}qe|1qsMzx!v~%
z2T0Z^w44vFe_72dU)2;g$H5!wg@M_E!VuAvCjwh{Maul?Zc<=K7Vib!D)$4+S19ws
zbyW)kvjt_rp`kbk=>5hYacrPBQd7i~w)a6GJ4cl_udB@%m@TLZ4DG~AK=E(QsNKs(
zsOsbKdg$-<X^VgZ4=E~6<h-U%7?>^i8+clePQbT`xVyTQQiP}9F*6!clxWvM1-`io
zg`w&_V8o|VZ3>1;6CofVlaMkQ=~t7b{l|aomvuFEr6|$n9ZA`89K5O~V~`T*@*S6r
z1cD?Wv-2`b??;=N0p5Mp56kLp%7!c1c$HvtU00DXn6|AtK_I-%asqPj(4Gf?#aU_x
zBAez;zNOZt-`0}*jQL9P8G}GO^9~?&3D`&=XacIYDBC=Dmgr|(2S<_@hRznCr7`Ho
zf&G&}gn*nsAz6dW(kI(w;gT$1vbAMq0Xz3cHUq}fTouB=Nym7Q^I9DQHdO#crHS_>
zyCa+H0XYi5_9lghw(pK}6z-3b%NRK67$<OEu7!YP3l)13TMalg0JL66tuJg+#!$)`
zdTcImI5}b9q@zdFyi7X*nSc~=SQ^LYOF2iitx3D9zIW(2K;;1-&)eZk$q54|9es}{
zJ4lj%ROQ;S7m#=DXie7NNSVG=KABt=KgsIQw6xez9lV@)#=uF(*noLO@C2m7a^*h2
zndd)*oQT%j1<08vVQ8KYUUFVaTo}&2=ii~UVF(h(sE>e%gOo&*nu)U3LH;f~Bjvo4
zu(fUXcsW-kL1B<nbVL}~NPq<FA|Ri0WxgTGA~4r=ewbLs(B8z->2^I1^p*rZAP{52
znd`a<3Iksw_?VG^-2}?F18d3_8pDh6XAFFeu=|0a_aq<$WUgh`y^%9i=C&8&7Y4pY
z@WCR1)F80%D@6jrz}JY>cqlju5)cCOe5G(4_xboT2EIn{VIqOlA|Qorr0UZho6ejc
z#3u}VjYzGBf}<e;Ay8TltlM-O3pY+-;A;dQBoatH0<tPpvW8nHzPtFo_l#lm8gS;_
z)PuqikpKw*w{6dMfdBO_3|;M!J?d;EKmw^rU~?r<Sd93Dq2X+JHk+ho*f}Z^h)zJ3
zOUv4ZjK$A+%NV3W?uj>n$qAw*0TM`M0#a$aeB1wc69%bjbM9m+<KWmxfCO$4*t+X2
zZ^9r|ZKS#l8wrp=>JwN~TI)?1s*eFzhf*I1M@RxB0C*AxDP|$_3v47n0^uM~RN^6H
zkP_OBHQ@llQIY@&z$q#{7yDI$m7w{kkU*#iI7KBMgh5XCl~aD%NPq-FK_Ip;NLg(;
zX^M>mNFX!>VhcmZ#mK2VY$QMe;UQ2M>s6xWI52!AJU}>75+DJfsHA4$$wxWZ^XTiu
zL;@rbHUd$FVW0=7uL>Iyj+X>Tpr|-X#?Vv?baxOE36Mb82o#l6FZ?QT>TO_bG;ByX
zUJ?jB0e3-R;QT`99}WTtF9El(`0V@{!|)(bb0WNCIC2sQF@c4Jp|cfeIUiy)96AYv
zm%zfpP<slv(jQ(j961SunLtrV)%>p#ZyyOW7LJ_+!cE{dVQ^<jL?#}caFgNaNg%`o
c3QMZ~AKWdwuo?o;{Qv*}07*qoM6N<$f|yu9#{d8T

literal 0
HcmV?d00001

diff --git a/Resource/Image/文件夹.png b/Resource/Image/文件夹.png
new file mode 100644
index 0000000000000000000000000000000000000000..58993ae045cade7285c25f2ed5df686e81f30faf
GIT binary patch
literal 2196
zcmeHJ`#aMM82_4Y`Hs?eqlHr6&2ScRSkl;88yj0L2{DPM(@n7@bkJ;Ot6XwvEy`uN
zM7Kwhgv!%MtCVHYQ!bsZNU<nMp>o#War)tXKcDA)p3g7u`+lDH%?j}MUTA1x2mruB
z4x1UM!}ebR&DZ4`?xj)yfWkRUMsRZE2Zdi|!A`UEvadOv=Vhi9Y?4cq&1Poaqz@mv
znaMDUTf;Y0kZ+J?`oJ!)HoxriIE)*M>yA0ydIX32kruo<VOOHt_Om#*iu8k(<S3=<
zu1D<?-_+B_qR*n2qEj`R(b<1{enc)4KiVop0LfVp#nZuC5I)qSCmDt5aH)Zgy8@E^
z;J5jld$~ab5N1~G-gee14S9bpZv7!ZnrZ5%-Vee=OIQCan46E-PVu&^i^y7P|Nb5J
zb$7hFGjE^ZE^i`_zivaLuu%WH^*%p_v3T;;$b-pAAN(P2H7{XrlV*Hd+5Gy09IWy~
zAMLwmYR?Yx(N-}?xzZf#<9#PGdsotdjOn;Cdd??$PJ!s=vy62g&lR;Vl~jX8W+N%B
zYU3gPeP^wSn$}3vYG2T(Thgg3&41zsKbHEHxO-5~V})7qrP)qet@*OlgsidQejM5!
za-J*sSOhDb>Ys&EHOUsJTT`J1UNeuE4f!^LIM95>NQzbA&B6~)-Zag77GY`Dhxf;S
z{dD_NMT#JbKelhob=7NW7q9%>nu%0&Wr0m#VRG#_C3`Ay4|cIV8+&|KVBjrY+1u|t
znqKKyqCARQA?GNX%D)HN#pZ5l*kHC|#C^H?>9C+f?s%_>ooZxk;wf@!8NI;6C2flN
z61u4yN3xX;R@T%-^9RR-7u#@i#59C*V9~8N1J4^~hACkgE)FJinSy$F>y#jgKRBeg
zc-sP!*Sf;1e)a}czbvb*=}nK7QEy7t_Jmq4s~+BC{Urh>dOIRqVMTL@*v{MTeytRl
z7NEp7P6zT^!ZaI5ki5*{5-;ASP$X9++l#9UVk)^=8TP8W7yRw_N~}F)@&EW2n}VnN
zj=|dOk=FM5Ia(e<N{g>jfYQG41ibk>OS2!^^&TK8s;4SCgPx-aHW*DA78`<l42V%3
zK1gRxwQ=4l57|VB@0BS?$gRnx<{}>$gZs14!Ke8w8Fq>9)kL%^0_t|~>^ymbemNOn
ztPgj*)o=ah+&!hP%IZ8>3`p~DM7A~fAPq=GWrtg=vi|ujWszj=RO^|?mAg)iwM4S5
z***Qai5<s{#9i$MsKdy<ZF9Jizml#FMFgR*jMXLahGsItl{xw_cO@!lz<@VV9lBXb
zD?mQKT>kkbL5KvHqL!ro==T>*3p+*$?2h)e0ZbGWsCwE<A)_F<d9=eyf*wfP7Nb>|
z>w)(dxGY(G43L`Exg>Vx0MZ@l#o0&L0OLrng?p42z;O0_$YSZH$KvIlBI}$}RPpvS
z0ZW$=8t--%Vdye-K*B~08ewC?w-2kKD%@c2i<AMsrkc7TyAzIrzMa*s+?{<7SQ;`U
zIb$PJ`-csDkIjzU{<h89eYT_O@P+ZxOuLZU&6AAz_;Qa|ZAB!b+^(Pd=eVJVv6P)?
zVlD+d#xHy2pa;fboXULxM*cI~W*>mDg}LAl6FNLJb$<*?hnHaVALz_|U38@xgjFn6
znzJ6bac`OSx9oRI{zqFP_mUsFyIUNbPEUkZTgg_xwSd}Y)95BB4%U$XY4lNkkjhMB
z^@}}(z*&7p@^amod;x%g@T;Z7d8_l@!Po5D!^q7WZCyC{%Uo0(RsCc(Nwsy{VG2rs
zWq4U{(BCxeotdZ6-V2)67|~Kv1rP7|kYkQ}b(8cn%FkE_goPA^bv-#Cm|kdSTcVsc
zvkBq%C&e>h8l2YJfJPukeN+!V4WTZA5GWQvy@x(7l;<ry$Apkfc9+W68(?(D4dg?5
tAcj<2_#Q&oZhIA2oq)hHAzMmX01dG$ZZPxpb=|iCa9IA#OCDRL{{i4neDMGP

literal 0
HcmV?d00001

diff --git a/Util/FileIcon.cs b/Util/FileIcon.cs
index 2e20f3b..2816f5c 100644
--- a/Util/FileIcon.cs
+++ b/Util/FileIcon.cs
@@ -19,23 +19,6 @@ namespace GeekDesk.Util
 
         public static BitmapImage GetBitmapImage(string filePath)
         {
-            //Icon ico;
-            //BitmapImage bmpImage = null;
-            //MemoryStream strm;
-            //using (ico = GetIcon(filePath))
-            //{
-            //    Bitmap bmp = ico.ToBitmap();
-            //    using (strm = new MemoryStream())
-            //    {
-            //        bmp.Save(strm, System.Drawing.Imaging.ImageFormat.Png);
-            //        bmpImage = new BitmapImage();
-            //        bmpImage.BeginInit();
-            //        strm.Seek(0, SeekOrigin.Begin);
-            //        bmpImage.StreamSource = strm;
-            //        bmpImage.EndInit();
-            //    }
-            //}
-            //return bmpImage;
             Icon ico = GetIcon(filePath);
             Bitmap bmp = ico.ToBitmap();
             MemoryStream strm = new MemoryStream();
diff --git a/Util/ImageUtil.cs b/Util/ImageUtil.cs
new file mode 100644
index 0000000..58e7410
--- /dev/null
+++ b/Util/ImageUtil.cs
@@ -0,0 +1,207 @@
+using GeekDesk.Constant;
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Windows.Media.Imaging;
+
+namespace GeekDesk.Util
+{
+    class ImageUtil
+    {
+
+        /// <summary>
+        /// 图片数组转 BitmapImage
+        /// </summary>
+        /// <param name="array"></param>
+        /// <returns></returns>
+        public static BitmapImage ByteArrToImage(byte[] array)
+        {
+            using (var ms = new System.IO.MemoryStream(array))
+            {
+                var image = new BitmapImage();
+                image.BeginInit();
+                image.CacheOption = BitmapCacheOption.OnLoad; // here
+                image.StreamSource = ms;
+                image.EndInit();
+                return image;
+            }
+        }
+
+        /// <summary>
+        /// BitmapImage 转数组
+        /// </summary>
+        /// <param name="bi"></param>
+        /// <returns></returns>
+        public static byte[] BitmapImageToByte(BitmapImage bi)
+        {
+            using (MemoryStream memStream = new MemoryStream())
+            {
+                PngBitmapEncoder encoder = new PngBitmapEncoder();
+                encoder.Frames.Add(BitmapFrame.Create(bi));
+                encoder.Save(memStream);
+                return memStream.GetBuffer();
+            }
+        }
+
+        /// <summary>
+        /// 图片base64 转 BitmapImage
+        /// </summary>
+        /// <param name="base64"></param>
+        /// <returns></returns>
+        public static BitmapImage Base64ToBitmapImage(string base64)
+        {
+            byte[] byteBuffer = Convert.FromBase64String(base64);
+            return ByteArrToImage(byteBuffer);
+        }
+
+        /// <summary>
+        /// 获取文件 icon
+        /// </summary>
+        /// <param name="filePath">文件路径</param>
+        /// <returns></returns>
+        public static BitmapImage GetBitmapIconByPath(string filePath)
+        {
+            if (File.Exists(filePath))
+            {
+                if (IsImage(filePath)) {
+                    //图片
+                    return GetThumbnail(filePath, 256, 256);
+                } else
+                { //其它文件
+                    return FileIcon.GetBitmapImage(filePath);
+                }
+            } else if(Directory.Exists(filePath)) {
+                //文件夹
+                return ImageUtil.Base64ToBitmapImage(Constants.DEFAULT_DIR_IMAGE_BASE64);
+            }
+            return null;
+        }
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="lcFilename">需要改变大小的图片位置</param>
+        /// <param name="lnWidth">缩略图的宽度</param>
+        /// <param name="lnHeight">缩略图的高度</param>
+        /// <returns></returns>
+        public static BitmapImage GetThumbnail(string lcFilename, int lnWidth, int lnHeight)
+        {
+            Bitmap bmpOut = null;
+            try
+            {
+                Bitmap loBMP = new Bitmap(lcFilename);
+                ImageFormat loFormat = loBMP.RawFormat;
+
+                decimal lnRatio;
+                int lnNewWidth = 0;
+                int lnNewHeight = 0;
+
+                //如果图像小于缩略图直接返回原图，因为upfront
+                if (loBMP.Width < lnWidth && loBMP.Height < lnHeight)
+                    return BitmapToBitmapImage(bmpOut);
+                if (loBMP.Width > loBMP.Height)
+                {
+                    lnRatio = (decimal)lnWidth / loBMP.Width;
+                    lnNewWidth = lnWidth;
+                    decimal lnTemp = loBMP.Height * lnRatio;
+                    lnNewHeight = (int)lnTemp;
+                }
+                else
+                {
+                    lnRatio = (decimal)lnHeight / loBMP.Height;
+                    lnNewHeight = lnHeight;
+                    decimal lnTemp = loBMP.Width * lnRatio;
+                    lnNewWidth = (int)lnTemp;
+                }
+                bmpOut = new Bitmap(lnNewWidth, lnNewHeight);
+                Graphics g = Graphics.FromImage(bmpOut);
+                g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
+                g.FillRectangle(Brushes.White, 0, 0, lnNewWidth, lnNewHeight);
+                g.DrawImage(loBMP, 0, 0, lnNewWidth, lnNewHeight);
+                loBMP.Dispose();
+            }
+            catch
+            {
+                return Base64ToBitmapImage(Constants.DEFAULT_IMG_IMAGE_BASE64);
+            }
+            return BitmapToBitmapImage(bmpOut);
+        }
+
+
+        /// <summary>
+        /// Bitmap to BitmapImage
+        /// </summary>
+        /// <param name="bitmap"></param>
+        /// <returns></returns>
+        private static BitmapImage BitmapToBitmapImage(Bitmap bitmap)
+        {
+            BitmapImage bitmapImage = new BitmapImage();
+            using (MemoryStream ms = new MemoryStream())
+            {
+                bitmap.Save(ms, bitmap.RawFormat);
+                bitmapImage.BeginInit();
+                bitmapImage.StreamSource = ms;
+                bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
+                bitmapImage.EndInit();
+                bitmapImage.Freeze();
+            }
+            return bitmapImage;
+        }
+
+        /// <summary>
+        /// 图片文件转base64
+        /// </summary>
+        /// <param name="Imagefilename"></param>
+        /// <returns></returns>
+        public static string FileImageToBase64(string Imagefilename, ImageFormat format)
+        {
+            try
+            {
+                Bitmap bmp = new Bitmap(Imagefilename);
+
+                MemoryStream ms = new MemoryStream();
+                bmp.Save(ms, format);
+                byte[] arr = new byte[ms.Length];
+                ms.Position = 0;
+                ms.Read(arr, 0, (int)ms.Length);
+                ms.Close();
+                return Convert.ToBase64String(arr);
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 判断文件是否为图片
+        /// </summary>
+        /// <param name="path">文件路径</param>
+        /// <returns></returns>
+        public static bool IsImage(string path)
+        {
+            try
+            {
+                string strExt = Path.GetExtension(path).Substring(1);
+                string suffixs = "bmp,jpg,png,tif,gif,pcx,tga,exif,fpx,svg,psd,cdr,pcd,dxf,ufo,eps,ai,raw,WMF,webp,avif";
+                string[] suffixArr = suffixs.Split(',');
+                foreach (string suffix in suffixArr)
+                {
+                    if (suffix.Equals(strExt, StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+
+
+    }
+}
diff --git a/ViewModel/AppConfig.cs b/ViewModel/AppConfig.cs
index da63785..4571668 100644
--- a/ViewModel/AppConfig.cs
+++ b/ViewModel/AppConfig.cs
@@ -7,7 +7,7 @@ namespace GeekDesk.ViewModel
 {
 
     [Serializable]
-    public class AppConfig : System.ComponentModel.INotifyPropertyChanged
+    public class AppConfig : INotifyPropertyChanged
     {
         private int menuSortType = (int)SortType.CUSTOM; //菜单排序类型
         private int iconSortType = (int)SortType.CUSTOM; //图表排序类型
diff --git a/ViewModel/AppData.cs b/ViewModel/AppData.cs
index 3f76f1a..473e9c9 100644
--- a/ViewModel/AppData.cs
+++ b/ViewModel/AppData.cs
@@ -6,7 +6,7 @@ using System.ComponentModel;
 namespace GeekDesk.ViewModel
 {
     [Serializable]
-    class AppData : INotifyPropertyChanged
+    public class AppData : INotifyPropertyChanged
     {
         private ObservableCollection<MenuInfo> menuList = new ObservableCollection<MenuInfo>();
         private AppConfig appConfig = new AppConfig();
diff --git a/ViewModel/IconInfo.cs b/ViewModel/IconInfo.cs
index aad1c06..51b7cc0 100644
--- a/ViewModel/IconInfo.cs
+++ b/ViewModel/IconInfo.cs
@@ -1,4 +1,5 @@
 using GeekDesk.Constant;
+using GeekDesk.Util;
 using System;
 using System.ComponentModel;
 using System.IO;
@@ -16,8 +17,38 @@ namespace GeekDesk.ViewModel
         private BitmapImage bitmapImage; //位图
         private byte[] imageByteArr; //图片 base64
         private string content; //显示信息
-        private int imageWidth = (int)DefaultConstant.IMAGE_WIDTH;
-        private int imageHeight = (int)DefaultConstant.IMAGE_HEIGHT;
+        private int imageWidth = (int)DefaultConstant.IMAGE_WIDTH; //图片宽度
+        private int imageHeight = (int)DefaultConstant.IMAGE_HEIGHT; //图片高度
+        private bool adminStartUp = false; //始终管理员方式启动  默认否
+        private byte[] defaultImage;
+
+
+
+        public byte[] DefaultImage
+        {
+            get
+            {
+                return defaultImage;
+            }
+            set
+            {
+                defaultImage = value;
+                OnPropertyChanged("DefaultImage");
+            }
+        }
+
+        public bool AdminStartUp
+        {
+            get
+            {
+                return adminStartUp;
+            }
+            set
+            {
+                adminStartUp = value;
+                OnPropertyChanged("AdminStartUp");
+            }
+        }
 
         public int Count
         {
@@ -66,12 +97,12 @@ namespace GeekDesk.ViewModel
             get
             {
 
-                return ToImage(ImageByteArr);
+                return ImageUtil.ByteArrToImage(ImageByteArr);
             }
             set
             {
                 bitmapImage = value;
-                ImageByteArr = getJPGFromImageControl(bitmapImage);
+                ImageByteArr = ImageUtil.BitmapImageToByte(bitmapImage);
                 OnPropertyChanged("BitmapImage");
             }
         }
@@ -140,29 +171,6 @@ namespace GeekDesk.ViewModel
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        public BitmapImage ToImage(byte[] array)
-        {
-            using (var ms = new System.IO.MemoryStream(array))
-            {
-                var image = new BitmapImage();
-                image.BeginInit();
-                image.CacheOption = BitmapCacheOption.OnLoad; // here
-                image.StreamSource = ms;
-                image.EndInit();
-                return image;
-            }
-        }
-
-        public byte[] getJPGFromImageControl(BitmapImage bi)
-        {
-            using (MemoryStream memStream = new MemoryStream())
-            {
-                PngBitmapEncoder encoder = new PngBitmapEncoder();
-                encoder.Frames.Add(BitmapFrame.Create(bi));
-                encoder.Save(memStream);
-                return memStream.GetBuffer();
-            }
-        }
 
     }
 }
\ No newline at end of file
diff --git a/ViewModel/MenuInfo.cs b/ViewModel/MenuInfo.cs
index ad3acf4..80adbcc 100644
--- a/ViewModel/MenuInfo.cs
+++ b/ViewModel/MenuInfo.cs
@@ -11,7 +11,7 @@ namespace GeekDesk.ViewModel
 {
 
     [Serializable]
-    class MenuInfo : INotifyPropertyChanged
+    public class MenuInfo : INotifyPropertyChanged
     {