From 8958bddb2512d1abbfd913f7f66fcf6fac535d2c Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Mon, 13 Dec 2021 10:53:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9A=90=E8=97=8F=E6=89=98?=
 =?UTF-8?q?=E7=9B=98=E5=9B=BE=E6=A0=87=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/UserControls/Config/ThemeControl.xaml | 13 ++++++++++++-
 MainWindow.xaml                               |  4 +++-
 MainWindow.xaml.cs                            | 12 ++++++++++++
 ViewModel/AppConfig.cs                        | 15 +++++++++++++++
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/Control/UserControls/Config/ThemeControl.xaml b/Control/UserControls/Config/ThemeControl.xaml
index 65c12f2..b6f3e36 100644
--- a/Control/UserControls/Config/ThemeControl.xaml
+++ b/Control/UserControls/Config/ThemeControl.xaml
@@ -17,8 +17,9 @@
                     <TextBlock Text="背景图片" VerticalAlignment="Center"/>
                 </hc:UniformSpacingPanel>
                 <hc:UniformSpacingPanel Spacing="10" Margin="20,0,0,0" Grid.ColumnSpan="4">
-                    <TextBlock Text="图片路径:" VerticalAlignment="Center"/>
+                    <TextBlock Text="图片路径:" VerticalAlignment="Center" Margin="0,5,0,0"/>
                     <TextBlock Text="{Binding BacImgName}" Width="200" 
+                               Margin="0,5,0,0"
                            VerticalAlignment="Center"
                            hc:Poptip.HitMode="None" 
                            hc:Poptip.IsOpen="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
@@ -39,6 +40,16 @@
                     </CheckBox>
                 </hc:UniformSpacingPanel>
 
+                <hc:UniformSpacingPanel Spacing="10" Margin="20,5,0,0"  Grid.ColumnSpan="4">
+                    <CheckBox x:Name="BarIcon" Content="显示托盘图标" IsChecked="{Binding ShowBarIcon}">
+                        <CheckBox.Background>
+                            <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                                <GradientStop Color="#FF9EA3A6"/>
+                            </LinearGradientBrush>
+                        </CheckBox.Background>
+                    </CheckBox>
+                </hc:UniformSpacingPanel>
+
                 <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black" Grid.ColumnSpan="4"/>
 
                 <StackPanel>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 1511c93..affd2ab 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -119,10 +119,12 @@
 
                     <uc:RightCardControl Grid.Row="1" Grid.Column="1"/>
 
-                    <hc:NotifyIcon Icon="/Taskbar.ico" Text="GeekDesk" Click="NotifyIcon_Click">
+                    <hc:NotifyIcon Icon="/Taskbar.ico"  Click="NotifyIcon_Click" x:Name="BarIcon"
+                                   Visibility="{Binding AppConfig.ShowBarIcon, Mode=TwoWay, Converter={StaticResource Boolean2VisibilityConverter}}">
                         <hc:NotifyIcon.ContextMenu>
                             <ContextMenu Width="130">
                                 <MenuItem Header="打开面板" Click="ShowApp"/>
+                                <MenuItem Header="关闭托盘图标" Click="CloseBarIcon"/>
                                 <MenuItem Header="待办"  Click="BacklogMenuClick"/>
                                 <MenuItem Header="程序目录"  Click="OpenThisDir"/>
                                 <MenuItem Header="设置"  Click="ConfigApp"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index ff42626..aac0568 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -95,6 +95,8 @@ namespace GeekDesk
                 ShowApp();
             }
 
+            BarIcon.Text = Constants.MY_NAME;
+
             //注册热键
             RegisterHotKey(true);
             RegisterCreateToDoHotKey(true);
@@ -510,6 +512,16 @@ namespace GeekDesk
             p.Start();
             Application.Current.Shutdown();
         }
+
+        /// <summary>
+        /// 关闭托盘图标
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void CloseBarIcon(object sender, RoutedEventArgs e)
+        {
+            appData.AppConfig.ShowBarIcon = false;
+        }
     }
 
 
diff --git a/ViewModel/AppConfig.cs b/ViewModel/AppConfig.cs
index 6e4766a..fa3a435 100644
--- a/ViewModel/AppConfig.cs
+++ b/ViewModel/AppConfig.cs
@@ -68,7 +68,22 @@ namespace GeekDesk.ViewModel
 
         private bool mouseMiddleShow = false;  //鼠标中键呼出 默认不启用
 
+        private bool showBarIcon = true; //显示托盘图标  默认显示
+
         #region GetSet
+        public bool ShowBarIcon
+        {
+            get
+            {
+                return showBarIcon;
+            }
+            set
+            {
+                showBarIcon = value;
+                OnPropertyChanged("ShowBarIcon");
+            }
+        }
+
         public bool MouseMiddleShow
         {
             get