فهرست منبع

优化界面, 下班

liufei 4 سال پیش
والد
کامیت
a122181f90

+ 0 - 1
App.xaml

@@ -10,7 +10,6 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/GeekDesk;component/Resource/Dictionary/Geometry.xaml"/>
-                <ResourceDictionary Source="/GeekDesk;component/Resource/DefaultIconfont/MyIcon.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
             </ResourceDictionary.MergedDictionaries>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
Constant/Constants.cs


+ 1 - 1
Control/Other/BacklogNotificatin.xaml

@@ -9,7 +9,7 @@
         Height="450">
     <Grid>
 
-        <Image Source="/Resource/Image/CompleteLogo.png" Margin="22,22,22,361" />
+        <Image Source="/Resource/Image/BacklogImg.png" Margin="22,35,22,361" />
 
         
         <hc:Card MaxWidth="250" Height="200" BorderThickness="0" Effect="{DynamicResource EffectShadow2}" Margin="8">

+ 20 - 2
Control/UserControls/Config/AboutControl.xaml

@@ -8,10 +8,28 @@
              mc:Ignorable="d" 
              Background="AliceBlue"
              d:DesignHeight="400" d:DesignWidth="500">
+
+    <UserControl.Resources>
+        
+    </UserControl.Resources>
     <hc:SimplePanel Margin="20">
         <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Top">
-            <Image Source="/Resource/Image/Ico.png" Width="250" Height="250"/>
-            <TextBlock Text="这是个人开发的程序,所有人可任意修改和免费试用(商用请联系作者)"/>
+            <Image Source="/Resource/Image/About.png" Width="200" Height="200"/>
+            <TextBlock   TextAlignment="Center"  Text="Copyright ©  2021 GeekDesk 1.0 beta"/>
+            <WrapPanel Margin="0,10,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
+                <hc:Shield Subject=".net" Status=">=4.72" Margin="0,0,10,0" Color="#1182c3"/>
+                <hc:Shield Subject="IDE" Status="VS2019" Margin="0,0,10,0" Color="#1182c3"/>
+                <hc:Shield Subject="公众号" Status="抓几个娃"  Color="#04913B">
+                    <hc:Poptip.Instance>
+                        <hc:Poptip PlacementType="Top">
+                            <hc:Poptip.Content>
+                                <Image Source="/Resource/Image/公众号.jpg" Width="150" Height="150" />
+                            </hc:Poptip.Content>
+                        </hc:Poptip>
+                    </hc:Poptip.Instance>
+                </hc:Shield>
+            </WrapPanel>
+            <TextBlock Margin="0,20,0,0" FontSize="15" Width="200" TextAlignment="Center" Text="这是个人开发的程序,所有人可任意修改和免费使用(商用请联系作者)" TextWrapping="Wrap"/>
         </StackPanel>
     </hc:SimplePanel>
 </UserControl>

+ 12 - 1
Control/UserControls/Config/ThemeControl.xaml

@@ -24,7 +24,18 @@
                        />
             <Button Content="修改" Click="BGButton_Click"/>
         </hc:UniformSpacingPanel>
-        <hc:Divider LineStrokeDashArray="3,3" Margin="0,60,0,66" LineStroke="Black" Grid.ColumnSpan="4"/>
+
+        <hc:UniformSpacingPanel Spacing="10" Margin="19,50,11,-36.433" Grid.ColumnSpan="4">
+            <CheckBox x:Name="IconIsAdmin" Content="毛玻璃效果" IsChecked="{Binding BlurEffect}">
+                <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,60,0,66" LineStroke="Black" Grid.ColumnSpan="4"/>-->
 
         <hc:UniformSpacingPanel Spacing="10" Margin="0,80,-40,-89.5" Grid.ColumnSpan="4">
             <TextBlock Text="托盘不透明度" VerticalAlignment="Center"/>

+ 4 - 1
Control/UserControls/PannelCard/LeftCardControl.xaml

@@ -121,9 +121,12 @@
                                 <StackPanel Orientation="Horizontal">
                                     <Button Background="Transparent" 
                                             BorderThickness="0"
-                                            hc:IconElement.Geometry="{Binding MenuGeometry}" 
+                                            hc:IconElement.Geometry="{Binding MenuGeometry}"
                                             hc:IconElement.Height="18"
                                             hc:IconElement.Width="18"
+                                            IsEnabled="False"
+                                            Opacity="1"
+                                            Foreground="{Binding GeometryColor}"
                                             />
                                     <TextBlock Text="{Binding MenuName}"
                                                HorizontalAlignment="Center"

+ 4 - 1
Control/Windows/BacklogInfoWindow.xaml

@@ -31,7 +31,10 @@
         <Grid Margin="0,0,0,8">
             <hc:SimplePanel Margin="20" HorizontalAlignment="Center">
                 <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4">
-                    <TextBlock Text="待办任务*:"  Style="{StaticResource LeftTB}"/>
+                    <WrapPanel>
+                        <TextBlock Text="待办任务:"  Style="{StaticResource LeftTB}"/>
+                        <TextBlock Text="*" Foreground="Red" />
+                    </WrapPanel>
                     <TextBox x:Name="Title" Width="290" FontSize="14" />
                 </hc:UniformSpacingPanel>
 

+ 6 - 2
Control/Windows/BacklogWindow.xaml

@@ -60,8 +60,10 @@
                                      >
                         <hc:SideMenuItem.Icon>
                             <Button Background="Transparent" 
+                                    IsEnabled="False"
+                                    Opacity="1"
                             BorderThickness="0"
-                            hc:IconElement.Geometry="{StaticResource About}" 
+                            hc:IconElement.Geometry="{StaticResource List}" 
                             hc:IconElement.Height="18"
                             hc:IconElement.Width="18"
                             HorizontalAlignment="Right"
@@ -73,8 +75,10 @@
                                      Selected="MemuClick">
                         <hc:SideMenuItem.Icon>
                             <Button Background="Transparent" 
+                                    IsEnabled="False"
+                                    Opacity="1"
                             BorderThickness="0"
-                            hc:IconElement.Geometry="{StaticResource Pannel}"
+                            hc:IconElement.Geometry="{StaticResource History}"
                             hc:IconElement.Height="18"
                             hc:IconElement.Width="18"
                             HorizontalAlignment="Right"

+ 15 - 10
Control/Windows/ConfigWindow.xaml

@@ -61,26 +61,29 @@
                                      >
                         <hc:SideMenuItem.Icon>
                             <Button Background="Transparent" 
-                            BorderThickness="0"
-                            hc:IconElement.Geometry="M671.374222 357.944889c10.467556 0 20.792889 0.711111 31.032889 1.820444-27.875556-124.017778-166.741333-216.149333-325.233778-216.149333-177.180444 0-322.332444 115.342222-322.332444 261.774222 0 84.536889 48.298667 153.941333 128.995556 207.786667L151.608889 705.735111l112.696889-53.959111c40.305778 7.623111 72.675556 15.445333 112.896 15.445333 10.126222 0 20.138667-0.483556 30.094222-1.223111-6.314667-20.565333-9.955556-42.126222-9.955556-64.483556C397.340444 467.057778 518.286222 357.944889 671.374222 357.944889zM498.062222 274.488889c24.263111 0 40.334222 15.246222 40.334222 38.428444 0 23.068444-16.071111 38.513778-40.334222 38.513778-24.149333 0-48.412444-15.473778-48.412444-38.513778C449.678222 289.735111 473.912889 274.488889 498.062222 274.488889zM272.469333 351.431111c-24.149333 0-48.554667-15.473778-48.554667-38.513778 0-23.153778 24.376889-38.428444 48.554667-38.428444 24.149333 0 40.248889 15.246222 40.248889 38.428444C312.718222 335.957333 296.647111 351.431111 272.469333 351.431111zM965.575111 597.816889c0-123.022222-128.967111-223.345778-273.806222-223.345778-153.372444 0-274.147556 100.295111-274.147556 223.345778 0 123.278222 120.803556 223.374222 274.147556 223.374222 32.085333 0 64.483556-7.736889 96.711111-15.445333l88.405333 46.222222-24.234667-76.913778C917.390222 728.689778 965.575111 667.221333 965.575111 597.816889zM602.908444 559.303111c-16.042667 0-32.256-15.246222-32.256-30.805333 0-15.331556 16.184889-30.776889 32.256-30.776889 24.376889 0 40.362667 15.445333 40.362667 30.776889C643.242667 544.056889 627.285333 559.303111 602.908444 559.303111zM780.202667 559.303111c-15.928889 0-32.028444-15.246222-32.028444-30.805333 0-15.331556 16.071111-30.776889 32.028444-30.776889 24.149333 0 40.362667 15.445333 40.362667 30.776889C820.536889 544.056889 804.352 559.303111 780.202667 559.303111z" 
-                            hc:IconElement.Height="18"
-                            hc:IconElement.Width="18"
-                            HorizontalAlignment="Right"
-                            />
+                                    IsEnabled="False"
+                                    Opacity="1"
+                                    BorderThickness="0"
+                                    hc:IconElement.Geometry="{StaticResource About}" 
+                                    hc:IconElement.Height="18"
+                                    hc:IconElement.Width="18"
+                                    HorizontalAlignment="Right"
+                                    />
                         </hc:SideMenuItem.Icon>
                     </hc:SideMenuItem>
                     <hc:SideMenuItem Header="显示设置"
                                      Tag="Theme"
                                      Selected="MemuClick">
                         <hc:SideMenuItem.Icon>
-                            <!--<Button Background="Transparent" 
+                            <Button Background="Transparent" 
+                                    IsEnabled="False"
+                                    Opacity="1"
                             BorderThickness="0"
                             hc:IconElement.Geometry="{StaticResource Pannel}"
                             hc:IconElement.Height="18"
                             hc:IconElement.Width="18"
                             HorizontalAlignment="Right"
-                            />-->
-                            <TextBlock Text="&#xe614;" FontFamily="pack://application:,,,/Fonts/#IconFont" FontSize="40"/>
+                            />
                         </hc:SideMenuItem.Icon>
                     </hc:SideMenuItem>
 
@@ -89,6 +92,8 @@
                                      Selected="MemuClick">
                         <hc:SideMenuItem.Icon>
                             <Button Background="Transparent" 
+                                    IsEnabled="False"
+                                    Opacity="1"
                             BorderThickness="0"
                             hc:IconElement.Geometry="{StaticResource Motion}"
                             hc:IconElement.Height="18"
@@ -100,7 +105,7 @@
                 </hc:SideMenu>
             </hc:Card>
             <hc:ScrollViewer  Grid.Row="0" Grid.Column="1">
-                <hc:Card x:Name="RightCard" Height="600"  MouseDown="DragMove">
+                <hc:Card x:Name="RightCard" Height="450"  MouseDown="DragMove">
                 </hc:Card>
             </hc:ScrollViewer>
 

+ 1 - 0
Control/Windows/IconfontWindow.xaml.cs

@@ -76,6 +76,7 @@ namespace GeekDesk.Control.Windows
                     {
                         if (customIcons == null)
                         {
+                            vm.Iconfonts = null;
                             LoadingOnlineIcon();
                         } else
                         {

+ 8 - 8
GeekDesk.csproj

@@ -258,10 +258,6 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="Resource\DefaultIconfont\MyIcon.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Resource\Dictionary\Geometry.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -301,15 +297,19 @@
   <ItemGroup>
     <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" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resource\Image\CompleteLogo.png" />
+    <Resource Include="Resource\Iconfont\iconfont.js" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resource\Iconfont\iconfont.js" />
+    <Resource Include="Resource\Image\About.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resource\Image\公众号.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resource\Image\BacklogImg.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 2 - 2
MainWindow.xaml

@@ -43,7 +43,7 @@
                         <Grid ClipToBounds="True">
                             <Image Source="{Binding AppConfig.BitmapImage}" Margin="-30" Opacity="{Binding AppConfig.BgOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
                                 <Image.Effect>
-                                    <BlurEffect Radius="100"/>
+                                    <BlurEffect Radius="{Binding AppConfig.BlurValue}"/>
                                 </Image.Effect>
                             </Image>
                         </Grid>
@@ -110,7 +110,7 @@
 
                 <uc:RightCardControl Grid.Row="1" Grid.Column="1"/>
                 
-                <hc:NotifyIcon Icon="/Resource/Image/Ico.png" Text="GeekDesk" Click="NotifyIcon_Click">
+                <hc:NotifyIcon Icon="/Resource/Image/About.png" Text="GeekDesk" Click="NotifyIcon_Click">
                     <hc:NotifyIcon.ContextMenu>
                         <ContextMenu Width="130">
                             <MenuItem Header="打开面板" Click="ShowApp"/>

+ 0 - 12
Resource/DefaultIconfont/MyIcon.xaml

@@ -1,12 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    >
-
-    <Style x:Key="MyIcon" TargetType="TextBlock">
-        <Setter Property="FontFamily" Value="/GeekDesk;component/Fonts/#iconfont"></Setter>
-        <Setter Property="TextAlignment" Value="Center"/>
-        <Setter Property="HorizontalAlignment" Value="Center"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="FontSize" Value="20"/>
-    </Style>
-</ResourceDictionary>

+ 6 - 25
Resource/Dictionary/Geometry.xaml

@@ -16,32 +16,13 @@
         M604.337231 269.666462a33.595077 33.595077 0 0 1-33.634462-33.595077 140.366769 140.366769 0 0 0-140.169846-140.209231 140.366769 140.366769 0 0 0-140.209231 140.209231 33.595077 33.595077 0 0 1-67.150769 0A207.596308 207.596308 0 0 1 430.532923 28.711385a207.596308 207.596308 0 0 1 207.399385 207.36 33.713231 33.713231 0 0 1-33.595077 33.595077z m-287.586462 259.150769V283.608615A114.569846 114.569846 0 0 1 431.241846 169.117538 114.609231 114.609231 0 0 1 545.693538 283.569231v46.158769a34.067692 34.067692 0 0 1 5.435077-0.393846c37.336615 0 70.380308 18.668308 90.19077 47.261538a109.764923 109.764923 0 0 1 119.414153 41.314462c7.758769-1.654154 15.675077-2.520615 23.709539-2.520616h7.207385a113.821538 113.821538 0 0 1 113.703384 113.664v131.15077a29.577846 29.577846 0 0 1 0.196923 3.820307v67.741539c0 153.521231-67.702154 250.052923-190.621538 271.753846-38.4 6.616615-74.161231 10.003692-107.52 10.003692-101.454769 0-181.011692-31.507692-245.681231-96.17723L154.249846 710.025846a122.052923 122.052923 0 0 1 0-172.347077 122.092308 122.092308 0 0 1 162.500923-8.861538z m386.520616 408.457846c89.6-15.753846 135.089231-84.873846 135.08923-205.508923v-19.337846a34.067692 34.067692 0 0 1-0.078769-2.756923v-180.657231c0-25.718154-20.873846-46.473846-46.473846-46.473846h-7.246769c-1.102769 0-2.166154 0-3.308308 0.118154v110.788923a33.634462 33.634462 0 1 1-67.268923-0.118154v-111.773539a42.023385 42.023385 0 0 0-53.169231-40.487384v115.672615a33.595077 33.595077 0 0 1-67.190154 0v-117.76c0-23.433846-19.062154-42.456615-42.496-42.456615a33.792 33.792 0 0 1-5.435077-0.472616v126.267077a33.595077 33.595077 0 1 1-67.229538 0V283.608615a47.379692 47.379692 0 0 0-94.759385 0v321.457231a33.555692 33.555692 0 0 1-57.107692 27.569231l-47.497846-47.458462a54.744615 54.744615 0 0 0-77.390769 77.351385l207.478154 207.399385c69.080615 69.001846 162.500923 90.348308 294.084923 67.347692z
     </Geometry>
 
-    <!-- Converted from svg with Ab2d.ReaderSvg. -->
-    <ControlTemplate x:Key="test">
-        <Viewbox>
-            <Canvas Width="896" Height="649">
-                <Canvas Canvas.Left="-64" Canvas.Top="-187">
-                    <Path Fill="#FFA7B8C6" StrokeThickness="1" Data="F1M910,837L173,837C146,837,123,814,123,787L123,290C123,263,146,240,173,240L910,240C938,240,960,262,960,290L960,787C960,814,938,837,910,837z"/>
-                    <Path Fill="#FF7ACAE7" StrokeThickness="1" Data="F1M273,201L119,201C96,201,78,220,78,242L78,756C78,779,96,797,119,797L873,797C896,797,914,779,914,756L914,242C914,220,896,201,873,201L273,201z"/>
-                    <Path Fill="#FFFFFFFF" StrokeThickness="1" Data="F1M722,207L569,360C566,363 561,363 559,360 556,357 556,353 559,350L712,196C715,194 719,194 722,196 725,199 725,204 722,207z M917,577L754,740C752,743 747,743 744,740 742,737 742,732 744,730L907,567C910,564 915,564 917,567 920,569 920,574 917,577z M283,383C286,380 291,380 293,383 296,386 296,391 293,393L140,547C137,550 133,550 130,547 127,544 127,539 130,537 M320,652L171,801C168,803 164,803 161,801 158,798 158,793 161,791L310,642C313,639 317,639 320,642 323,644 323,649 320,652z"/>
-                    <Path Fill="#FF3E3A39" StrokeThickness="1" Data="F1M873,811L119,811C89,811,64,786,64,756L64,242C64,212,89,187,119,187L873,187C903,187,928,212,928,242L928,756C928,786,903,811,873,811z M119,215C104,215,91,227,91,242L91,756C91,771,104,784,119,784L873,784C888,784,901,771,901,756L901,242C901,227,888,215,873,215L119,215z"/>
-                    <Path Fill="#FFFFFFFF" StrokeThickness="1" Data="F1M500,660C505,665 507,670 507,677 507,684 505,690 499,695 497,698 491,703 483,708 475,713 471,718 469,722L507,722 507,733 453,733C453,725 456,718 461,712 464,709 470,704 479,698 483,695 487,692 489,689 493,685 494,681 494,677 494,673 493,670 491,668 489,666 485,665 481,665 476,665 472,666 470,669 468,672 466,677 466,683L453,683C454,675 456,668 461,662 466,657 473,654 481,654 489,654 495,656 500,660z M554,655L554,733 541,733 541,671C536,675,530,678,523,680L523,667C527,666 530,665 535,663 538,660 542,658 544,655L554,655z M606,646C609,649 610,652 610,656 610,660 608,663 606,666 603,669 600,670 596,670 592,670 589,669 586,666 583,663 582,660 582,656 582,652 583,649 586,646 589,644 592,642 596,642 600,642 603,644 606,646z M591,651C589,652 589,654 589,656 589,658 589,660 591,661 592,663 594,663 596,663 598,663 600,663 601,661 603,660 603,658 603,656 603,654 603,652 601,651 600,649 598,649 596,649 594,649 592,649 591,651z"/>
-                    <Path Fill="#FFEEE4AA" StrokeThickness="1" Data="F1M230,416A113,113,0,1,0,456,416A113,113,0,1,0,230,416z"/>
-                    <Path Fill="#FFF2D31F" StrokeThickness="1" Data="F1M256,416A87,87,0,1,0,429,416A87,87,0,1,0,256,416z"/>
-                    <Path Fill="#FFC1E1EF" StrokeThickness="1" Data="F1M622,425C617,425 613,422 611,418 594,380 554,354 508,358 461,362 422,398 414,445 413,451 413,459 413,467 413,475 408,482 401,483 374,489 355,513 355,541 355,574 381,601 414,601L622,601C670,601 710,561 710,513 710,464 670,425 622,425z"/>
-                    <Path Fill="#FFE5F2F8" StrokeThickness="1" Data="F1M605,445C601,445 597,443 596,439 582,408 549,387 512,390 475,394 443,423 437,460 436,465 436,472 436,478 437,484 432,490 426,491 405,496 389,515 389,538 389,564 411,586 437,586L604,586C643,586 675,554 675,515 675,476 644,445 605,445z"/>
-                    <Path Fill="#FFFFFFFF" StrokeThickness="1" Data="F1M593,461C590,461 588,460 586,457 576,434 551,418 523,420 495,423 471,445 466,473 466,477 466,482 466,487 466,491 463,496 458,497 442,500 430,515 430,532 430,552 446,568 466,568L593,568C622,568 646,544 646,515 646,485 622,461 593,461z"/>
-                </Canvas>
-            </Canvas>
-        </Viewbox>
-    </ControlTemplate>
-
+    <Geometry x:Key="List">
+        M187.392 70.656q28.672 0 48.64 19.456T256 138.24v52.224q0 28.672-19.968 48.64t-48.64 19.968H133.12q-27.648 0-47.616-19.968t-19.968-48.64V138.24q0-28.672 19.968-48.128t47.616-19.456h54.272z m702.464 0q27.648 0 47.616 19.456t19.968 48.128v52.224q0 28.672-19.968 48.64t-47.616 19.968H452.608q-28.672 0-48.64-19.968T384 190.464V138.24q0-28.672 19.968-48.128t48.64-19.456h437.248zM187.392 389.12q28.672 0 48.64 19.968T256 457.728v52.224q0 27.648-19.968 47.616t-48.64 19.968H133.12q-27.648 0-47.616-19.968t-19.968-47.616v-52.224q0-28.672 19.968-48.64t47.616-19.968h54.272z m702.464 0q27.648 0 47.616 19.968t19.968 48.64v52.224q0 27.648-19.968 47.616t-47.616 19.968H452.608q-28.672 0-48.64-19.968T384 509.952v-52.224q0-28.672 19.968-48.64t48.64-19.968h437.248zM187.392 708.608q28.672 0 48.64 19.968T256 776.192v52.224q0 28.672-19.968 48.64t-48.64 19.968H133.12q-27.648 0-47.616-19.968t-19.968-48.64v-52.224q0-27.648 19.968-47.616t47.616-19.968h54.272z m702.464 0q27.648 0 47.616 19.968t19.968 47.616v52.224q0 28.672-19.968 48.64t-47.616 19.968H452.608q-28.672 0-48.64-19.968T384 828.416v-52.224q0-27.648 19.968-47.616t48.64-19.968h437.248z
+    </Geometry>
 
-    <Canvas x:Key="test2">
-        <Path Fill="#92E3C3" Data="M391.68 957.44h-66.56v-158.4128H66.56v-66.56h258.56v-174.08H66.56v-66.56h258.56V307.2h66.56l-0.0512 184.6272h240.6912V307.2h66.56l-0.0512 184.6272H957.44v307.2h-258.6112V957.44h-66.4576l-0.0512-158.4128H391.6288V957.44z m-0.0512-224.9728h240.6912v-174.08H391.6288v174.08z m565.8112-174.08h-258.6112v174.08H957.44v-174.08z"/>
-        <Path Fill="#5D7092" Data="M51.2 51.2h921.6v256H51.2z"/>
-        <Path Fill="#5D7092" Data="M921.6 0a102.4 102.4 0 0 1 102.4 102.4v819.2a102.4 102.4 0 0 1-102.4 102.4H102.4a102.4 102.4 0 0 1-102.4-102.4V102.4a102.4 102.4 0 0 1 102.4-102.4h819.2z m0 66.56H102.4a35.84 35.84 0 0 0-35.5328 30.976L66.56 102.4v819.2a35.84 35.84 0 0 0 30.976 35.5328L102.4 957.44h819.2a35.84 35.84 0 0 0 35.5328-30.976L957.44 921.6V102.4a35.84 35.84 0 0 0-30.976-35.5328L921.6 66.56z"/>
-    </Canvas>
+    <Geometry x:Key="History">
+        M512 64C262.4 64 64 262.4 64 512s198.4 448 448 448 448-198.4 448-448S761.6 64 512 64z m256 544h-256c-19.2 0-32-12.8-32-32V256c0-19.2 12.8-32 32-32s32 12.8 32 32v288h224c19.2 0 32 12.8 32 32s-12.8 32-32 32z
+    </Geometry>
 
 
 </ResourceDictionary>

BIN
Resource/Image/About.png


BIN
Resource/Image/BacklogImg.png


BIN
Resource/Image/CompleteLogo.png


BIN
Resource/Image/Ico.ico


BIN
Resource/Image/Ico.png


BIN
Resource/Image/公众号.jpg


+ 36 - 0
ViewModel/AppConfig.cs

@@ -44,7 +44,43 @@ namespace GeekDesk.ViewModel
         private string customIconUrl; //自定义图标url
         private string customIconJsonUrl;  //自定义图标json信息url
 
+        private bool blurEffect = false; //毛玻璃效果 默认否
+        private double blurValue;
+
         #region GetSet
+
+        public double BlurValue
+        {
+            get
+            {
+                return blurValue;
+            }
+            set
+            {
+                blurValue = value;
+                OnPropertyChanged("BlurValue");
+            }
+        }
+
+        public bool BlurEffect
+        {
+            get
+            {
+                return blurEffect;
+            }
+            set
+            {
+                blurEffect = value;
+                if (blurEffect)
+                {
+                    BlurValue = 100;
+                } else
+                {
+                    BlurValue = 0;
+                }
+                OnPropertyChanged("BlurEffect");
+            }
+        }
         public string CustomIconUrl
         {
             get

+ 10 - 1
ViewModel/MenuInfo.cs

@@ -1,4 +1,5 @@
-using GeekDesk.Util;
+using GeekDesk.Constant;
+using GeekDesk.Util;
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -25,6 +26,10 @@ namespace GeekDesk.ViewModel
         {
             get
             {
+                if (menuGeometry == null)
+                {
+                    return Constants.DEFAULT_MENU_GEOMETRY;
+                }
                 return menuGeometry;
             }
             set
@@ -38,6 +43,10 @@ namespace GeekDesk.ViewModel
         {
             get
             {
+                if (geometryColor == null)
+                {
+                    return Constants.DEFAULT_MENU_GEOMETRY_COLOR;
+                }
                 return geometryColor;
             }
             set

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است