diff --git a/Mzitu/API/API.cs b/Mzitu/API/API.cs index d96dd51..5f05ee3 100644 --- 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 index 3d356c1..fec1d1f 100644 --- a/Mzitu/MainWindow.xaml +++ b/Mzitu/MainWindow.xaml @@ -1,16 +1,31 @@  + 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"> - + @@ -20,19 +35,32 @@ + Width="120" + Height="60" + HorizontalAlignment="Left" + VerticalAlignment="Top"> + Margin="5,0,0,0" + FontSize="44" + Text="Mzitu" /> + HorizontalAlignment="Right" + VerticalAlignment="Top" + Orientation="Horizontal"> + DMSystemButtonForeground="#DDDDDD" + DMSystemButtonHoverForeground="#DDDDDD" + DMSystemButtonSize="60" /> + DMSystemButtonForeground="#DDDDDD" + DMSystemButtonHoverForeground="#DDDDDD" + DMSystemButtonSize="60" /> + DMSystemButtonForeground="#DDDDDD" + DMSystemButtonHoverForeground="#DDDDDD" + DMSystemButtonSize="60" /> diff --git a/Mzitu/Mzitu.csproj b/Mzitu/Mzitu.csproj index a0c4cb9..df5e8d8 100644 --- a/Mzitu/Mzitu.csproj +++ b/Mzitu/Mzitu.csproj @@ -33,8 +33,11 @@ 4 - - ..\packages\DMSkin.WPF.2.5.1\lib\net40\DMSkin.WPF.dll + + ..\packages\DMSkin.Core.2.5.1.1\lib\net40\DMSkin.Core.dll + + + ..\packages\DMSkin.WPF.2.5.1.1\lib\net40\DMSkin.WPF.dll diff --git a/Mzitu/packages.config b/Mzitu/packages.config index 4ea7608..7ba9eec 100644 --- a/Mzitu/packages.config +++ b/Mzitu/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file