更新dmskin 2511

944095635 · Nov 28, 2018 · 08df02e · 08df02e
1 parent fd2a406
commit 08df02e
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 23 deletions.
diff --git a/Mzitu/API/API.cs b/Mzitu/API/API.cs
@@ -1,16 +1,12 @@
-using DMSkin.WPF.API;
+using DMSkin.Core.Common;
 using Mzitu.Model;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.IO.Compression;
-using System.Linq;
 using System.Net;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using System.Windows;
 
 namespace Mzitu
 {

diff --git a/Mzitu/MainWindow.xaml b/Mzitu/MainWindow.xaml
@@ -1,16 +1,31 @@
 <DMSkin:DMSkinSimpleWindow
-    x:Class="Mzitu.MainWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:DMSkin="clr-namespace:DMSkin.WPF;assembly=DMSkin.WPF"
-    xmlns:controls="clr-namespace:DMSkin.WPF.Controls;assembly=DMSkin.WPF" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Mzitu" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Title="MainWindow" Width="1300" Height="990" MinWidth="810"
-    MinHeight="268" Background="White" DMWindowShadowColor="#FFC8C8C8" DMWindowShadowSize="10"
-    Foreground="White" ResizeMode="CanResizeWithGrip" WindowStartupLocation="CenterScreen" mc:Ignorable="d">
+    x:Class="Mzitu.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:DMSkin="clr-namespace:DMSkin.WPF;assembly=DMSkin.WPF"
+    xmlns:controls="clr-namespace:DMSkin.WPF.Controls;assembly=DMSkin.WPF"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Mzitu"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="MainWindow"
+    Width="1300"
+    Height="990"
+    MinWidth="810"
+    MinHeight="268"
+    Background="White"
+    DMWindowShadowColor="#FFC8C8C8"
+    DMWindowShadowSize="10"
+    Foreground="White"
+    ResizeMode="CanResizeWithGrip"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
     <Grid Background="White">
         <Border
-            Height="60" HorizontalAlignment="Stretch" VerticalAlignment="Top"
+            Height="60"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Top"
             Background="{StaticResource AppColor}" />
-        <TabControl
-            x:Name="MainTab"
-            Style="{DynamicResource TabControlStyle}">
+        <TabControl x:Name="MainTab" Style="{DynamicResource TabControlStyle}">
             <TabItem Header="首页" IsTabStop="False">
                 <local:HomePage />
             </TabItem>
@@ -20,19 +35,32 @@
             <TabItem Header="清纯妹子" IsTabStop="False" />
         </TabControl>
         <Border
-            Width="120" Height="60" HorizontalAlignment="Left" VerticalAlignment="Top">
+            Width="120"
+            Height="60"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top">
             <TextBlock
-                Margin="5,0,0,0" FontSize="44" Text="Mzitu" />
+                Margin="5,0,0,0"
+                FontSize="44"
+                Text="Mzitu" />
         </Border>
         <WrapPanel
             Height="{Binding DMSystemButtonSize}"
-            HorizontalAlignment="Right" VerticalAlignment="Top" Orientation="Horizontal">
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Orientation="Horizontal">
             <controls:DMSystemMinButton
-                DMSystemButtonForeground="#383838" DMSystemButtonHoverForeground="#383838" DMSystemButtonSize="50" />
+                DMSystemButtonForeground="#DDDDDD"
+                DMSystemButtonHoverForeground="#DDDDDD"
+                DMSystemButtonSize="60" />
             <controls:DMSystemMaxButton
-                DMSystemButtonForeground="#383838" DMSystemButtonHoverForeground="#FFFFFF" DMSystemButtonSize="50" />
+                DMSystemButtonForeground="#DDDDDD"
+                DMSystemButtonHoverForeground="#DDDDDD"
+                DMSystemButtonSize="60" />
             <controls:DMSystemCloseButton
-                DMSystemButtonForeground="#383838" DMSystemButtonHoverForeground="#FFFFFF" DMSystemButtonSize="50" />
+                DMSystemButtonForeground="#DDDDDD"
+                DMSystemButtonHoverForeground="#DDDDDD"
+                DMSystemButtonSize="60" />
         </WrapPanel>
         <ResizeGrip HorizontalAlignment="Right" VerticalAlignment="Bottom" />
     </Grid>

diff --git a/Mzitu/Mzitu.csproj b/Mzitu/Mzitu.csproj
@@ -33,8 +33,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DMSkin.WPF, Version=2.5.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DMSkin.WPF.2.5.1\lib\net40\DMSkin.WPF.dll</HintPath>
+    <Reference Include="DMSkin.Core, Version=2.5.1.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DMSkin.Core.2.5.1.1\lib\net40\DMSkin.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="DMSkin.WPF, Version=2.5.1.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DMSkin.WPF.2.5.1.1\lib\net40\DMSkin.WPF.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

diff --git a/Mzitu/packages.config b/Mzitu/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DMSkin.WPF" version="2.5.1" targetFramework="net40" />
+  <package id="DMSkin.Core" version="2.5.1.1" targetFramework="net40" />
+  <package id="DMSkin.WPF" version="2.5.1.1" targetFramework="net40" />
 </packages>