优化功能 beta

2021-05-19 17:31:28 +08:00
parent 105b0f981e
commit 4701ecc781
17 changed files with 407 additions and 111 deletions
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -15,6 +15,9 @@
        Background="Transparent"
        OpacityMask ="White"
        >
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0" ResizeBorderThickness="10"/>
+    </WindowChrome.WindowChrome>
    <Window.Resources>

        <!--左侧栏样式动画-->
@@ -90,7 +93,6 @@
        </Style>

        <util:MenuWidthConvert x:Key="MenuWidthConvert"/>
-        <util:VisibilityConvert x:Key="VisibilityConvert"/>

    </Window.Resources>

@@ -132,20 +134,29 @@
                    </DockPanel.Background>
                    <hc:UniformSpacingPanel Spacing="0" Grid.ColumnSpan="4" HorizontalAlignment="Right" VerticalAlignment="Center">
                        <Button Background="Transparent" 
-                    BorderThickness="0"
-                    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"
-                    />
+                                BorderThickness="0"
+                                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"
+                                Click="ConfigButtonClick"
+                                Initialized="SettingButton_Initialized"
+                                x:Name="SettingButton"
+                                >
+                            <Button.ContextMenu>
+                                <ContextMenu Width="200" x:Name="SettingMenu">
+                                    <MenuItem Header="设置" Click="ConfigApp"/>
+                                </ContextMenu>
+                            </Button.ContextMenu>
+                        </Button>
                        <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"
-                    hc:IconElement.Width="18"
-                    HorizontalAlignment="Right"
-                    Click="CloseButtonClick"
-                    />
+                                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"
+                                hc:IconElement.Width="18"
+                                HorizontalAlignment="Right"
+                                Click="CloseButtonClick"
+                                />
                    </hc:UniformSpacingPanel>

                </DockPanel>
@@ -209,7 +220,7 @@
                                     KeyDown="LostFocusOrEnterDown"
                                     Tag="{Binding}"
                                     IsVisibleChanged="MenuEditWhenVisibilityChanged"
-                                     Visibility="{Binding Path=MenuEdit, Converter={StaticResource VisibilityConvert}}"/>
+                                     Visibility="{Binding MenuEdit}"/>
                                        <StackPanel Orientation="Horizontal">
                                            <Button Background="Transparent" 
                                        BorderThickness="0"
@@ -220,7 +231,7 @@
                                            <TextBlock Text="{Binding MenuName}"
                                           VerticalAlignment="Center"
                                           IsVisibleChanged="MenuWhenVisibilityChanged"
-                                           Visibility="{Binding Path=NotMenuEdit, Converter={StaticResource VisibilityConvert}}"
+                                           Visibility="{Binding NotMenuEdit}"
                                           />
                                        </StackPanel>

@@ -267,6 +278,7 @@
                                <ContextMenu x:Key="iconDialog" Width="200">
                                    <MenuItem Header="管理员方式运行" Click="IconAdminStart" Tag="{Binding}"/>
                                    <MenuItem Header="打开文件所在位置" Click="ShowInExplore" Tag="{Binding}"/>
+                                    <MenuItem Header="资源管理器菜单" Click="MenuItem_Click" Tag="{Binding}"/>
                                    <MenuItem Header="属性" Click="PropertyConfig" Tag="{Binding}"/>
                                    <MenuItem Header="从列表移除" Click="RemoveIcon" Tag="{Binding}"/>
                                </ContextMenu>
@@ -304,7 +316,16 @@
                        </ListBox>
                    </WrapPanel>
                </hc:Card>
-                <hc:NotifyIcon Icon="/Resource/Image/Ico.png" Text="GeekDesk" Click="NotifyIcon_Click"/>
+                <hc:NotifyIcon Icon="/Resource/Image/Ico.png" Text="GeekDesk" Click="NotifyIcon_Click">
+                    <hc:NotifyIcon.ContextMenu>
+                        <ContextMenu Width="200">
+                            <MenuItem Header="打开面板" Click="ShowApp"/>
+                            <MenuItem Header="设置"  Click="ConfigApp"/>
+                            <MenuItem Header="退出" Click="ExitApp"/>
+                        </ContextMenu>
+                    </hc:NotifyIcon.ContextMenu>
+                    
+                </hc:NotifyIcon>
                <StackPanel hc:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,0"/>
            </Grid>
        </Border>