Commit 97ed6f92 by liulongfei

1. 界面样式制作

2. 箭头控件开发
parent 44bd187a
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("VIZ.ElectricRabbit.Common")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("VIZ.ElectricRabbit.Common")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//将 ComVisible 设置为 false 将使此程序集中的类型
//对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型,
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
//若要开始生成可本地化的应用程序,请设置
//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
//例如,如果您在源文件中使用的是美国英语,
//使用的是美国英语,请将 <UICulture> 设置为 en-US。 然后取消
//对以下 NeutralResourceLanguage 特性的注释。 更新
//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
[assembly:ThemeInfo(
ResourceDictionaryLocation.None, //主题特定资源词典所处位置
//(未在页面中找到资源时使用,
//或应用程序资源字典中找到时使用)
ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
//(未在页面中找到资源时使用,
//、应用程序或任何主题专用资源字典中找到时使用)
)]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本: 4.0.30319.42000
//
// 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,则所做更改将丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace VIZ.ElectricRabbit.Common.Properties {
/// <summary>
/// 强类型资源类,用于查找本地化字符串等。
/// </summary>
// 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen
// (以 /str 作为命令选项),或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if ((resourceMan == null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VIZ.ElectricRabbit.Common.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// 重写当前线程的 CurrentUICulture 属性,对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
}
}
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace VIZ.ElectricRabbit.Common.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
}
}
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>
\ No newline at end of file
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:VIZ.ElectricRabbit.Common">
</ResourceDictionary>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{B8F27D49-E5BB-408C-871E-DF023A7B2911}</ProjectGuid>
<OutputType>library</OutputType>
<RootNamespace>VIZ.ElectricRabbit.Common</RootNamespace>
<AssemblyName>VIZ.ElectricRabbit.Common</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<Page Include="Themes\Generic.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="ArrowShape\ArrowShape.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\VIZ.Framework\VIZ.Framework.Common\VIZ.Framework.Common.csproj">
<Project>{92834c05-703e-4f05-9224-f36220939d8f}</Project>
<Name>VIZ.Framework.Common</Name>
</ProjectReference>
<ProjectReference Include="..\..\VIZ.Framework\VIZ.Framework.Core\VIZ.Framework.Core.csproj">
<Project>{75b39591-4bc3-4b09-bd7d-ec9f67efa96e}</Project>
<Name>VIZ.Framework.Core</Name>
</ProjectReference>
<ProjectReference Include="..\VIZ.ElectricRabbit.Core\VIZ.ElectricRabbit.Core.csproj">
<Project>{26f6da5c-d90f-441d-95bc-3d4cd6497214}</Project>
<Name>VIZ.ElectricRabbit.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.14" targetFramework="net48" />
</packages>
\ No newline at end of file
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="CheckBox_Setting" TargetType="CheckBox">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Height" Value="20"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="CheckBox">
<Grid SnapsToDevicePixels="True">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="20"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Border x:Name="border" Height="20" CornerRadius="2" BorderThickness="1" BorderBrush="White" Background="Transparent"
VerticalAlignment="Center">
<Image x:Name="img" Width="14" Height="14" VerticalAlignment="Center" HorizontalAlignment="Center"
Source="/VIZ.ElectricRabbit.Module.Resource;component/Icons/right_16x16.png" Visibility="Hidden"></Image>
</Border>
<ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="1"></ContentPresenter>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="border" Property="BorderBrush" Value="#ffffc000"></Setter>
<Setter TargetName="border" Property="Background" Value="#ffffc000"></Setter>
<Setter TargetName="img" Property="Visibility" Value="Visible"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="CheckBox_Expand" TargetType="CheckBox">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="CheckBox">
<Grid Background="Transparent">
<Image x:Name="img" Width="24" Height="24" RenderTransformOrigin="0.5,0.5"
Source="/VIZ.ElectricRabbit.Module.Resource;component/Icons/expand_right_24x24.png">
<Image.RenderTransform>
<RotateTransform Angle="-180"></RotateTransform>
</Image.RenderTransform>
</Image>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="img" Property="RenderTransform">
<Setter.Value>
<RotateTransform Angle="0"></RotateTransform>
</Setter.Value>
</Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common">
<Style x:Key="ColorPickButton_Setting" TargetType="fcommon:ColorPickButton">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="fcommon:ColorPickButton">
<Border x:Name="bd" Background="Transparent">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"></ContentPresenter>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="bd" Property="Background" Value="#22FFFFFF"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">
<Setter Property="OverridesDefaultStyle" Value="true"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Focusable" Value="false"/>
<Setter Property="IsTabStop" Value="false"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type RepeatButton}">
<Border Background="Transparent">
<Rectangle Fill="{TemplateBinding Background}" Height="3" Width="{TemplateBinding Width}"/>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<ControlTemplate x:Key="Slider_Setting_ThumbHorizontal" TargetType="{x:Type Thumb}">
<Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center" Background="Transparent">
<Ellipse Width="20" Height="20" Fill="#ffffc000"></Ellipse>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Opacity" Value="1"></Setter>
</Trigger>
<Trigger Property="IsDragging" Value="true">
<Setter Property="Opacity" Value="1"></Setter>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Opacity" Value="0.35"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
<ControlTemplate x:Key="Slider_Setting_Horizontal" TargetType="{x:Type Slider}">
<Grid SnapsToDevicePixels="True" Background="Transparent">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}"/>
</Grid.RowDefinitions>
<Track x:Name="PART_Track">
<Track.DecreaseRepeatButton>
<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource RepeatButtonTransparent}" Background="#ffffc000"/>
</Track.DecreaseRepeatButton>
<Track.IncreaseRepeatButton>
<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource RepeatButtonTransparent}" Background="#aaffffff"/>
</Track.IncreaseRepeatButton>
<Track.Thumb>
<Thumb x:Name="Thumb" Focusable="False" Height="20" OverridesDefaultStyle="True" Template="{StaticResource Slider_Setting_ThumbHorizontal}"
VerticalAlignment="Center" Width="20"/>
</Track.Thumb>
</Track>
</Grid>
</ControlTemplate>
<Style x:Key="Slider_Setting" TargetType="{x:Type Slider}">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Template" Value="{StaticResource Slider_Setting_Horizontal}"></Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:VIZ.ElectricRabbit.Module.Resource">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
</ResourceDictionary>
......@@ -89,10 +89,26 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Page Include="Style\CheckBox\CheckBox_Setting.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Style\ColorPickButton\ColorPickButton_Setting.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Style\Slider\Slider_Setting.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\Generic.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Toolkit\NumericUpDown\NumericUpDown.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
......@@ -157,5 +173,18 @@
<Name>VIZ.ElectricRabbit.Storage</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Style\Button\" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\right_16x16.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\triangle_down_16x16.png" />
<Resource Include="Icons\triangle_up_16x16.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Icons\expand_right_24x24.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
......@@ -4,9 +4,85 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:VIZ.ElectricRabbit.Module"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:common="clr-namespace:VIZ.ElectricRabbit.Common;assembly=VIZ.ElectricRabbit.Common"
d:DataContext="{d:DesignInstance Type=local:MainViewModel}" Background="Transparent"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
d:DesignHeight="1080" d:DesignWidth="1920">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/Button/Button_WindowTop.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.ElectricRabbit.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
<fcore:Bool2VisibilityConverter x:Key="Bool2VisibilityConverter" TrueVisibility="Visible" FalseVisibility="Collapsed"></fcore:Bool2VisibilityConverter>
</ResourceDictionary>
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="30"></RowDefinition>
</Grid.RowDefinitions>
<!-- 顶部 -->
<Grid Background="#ff12202d">
<TextBlock Text="电兔子" FontSize="12" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
<StackPanel Orientation="Horizontal" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Top">
<Button Command="{Binding Path=SettingCommand}" ToolTip="系统设置"
Style="{StaticResource Button_Setting}" Height="30"></Button>
<Button Command="{Binding Path=MinCommand}" ToolTip="最小化"
Style="{StaticResource Button_Min}" Height="30"></Button>
<Button Command="{Binding Path=CloseCommand}" ToolTip="关闭"
Style="{StaticResource Button_Close}" Height="30"></Button>
</StackPanel>
</Grid>
<!-- 主体 -->
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition Height="160"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
</Grid.ColumnDefinitions>
<!-- 提示区域 -->
<fcommon:FlashingBorder IsFlashingEnabled="True" FlashingInterval="0:0:0.5">
<common:ArrowShape ArrowMaxHeight="120" ArrowMaxWidth="120" ArrowMinHeigh="60" ArrowMinWidth="60"
RectangleMaxHeigh="40" RectangleMaxWidth="1200" RectangleMinHeigh="5" RectangleMinWidth="20"
SafeRectangleWidth="400" RectangleHeightProportion="0.4"
DifferenceSafeValue="20" DifferenceMaxValue="100"
DifferenceValue="{Binding ElementName=slider,Path=Value,Mode=OneWay}"
LeftBrush="#066FA5" RightBrush="#F70044" SafeBrush="#11CD86"></common:ArrowShape>
</fcommon:FlashingBorder>
<Slider VerticalAlignment="Center" Width="200" Minimum="-100" Maximum="100"
x:Name="slider" Value="0" Grid.ColumnSpan="2" HorizontalAlignment="Right"></Slider>
<!-- 主视频区域 -->
<fcommon:VideoControl Grid.Row="1" Margin="10,0,44,0"></fcommon:VideoControl>
<CheckBox x:Name="cbShowSettingView" Grid.Row="1" Style="{StaticResource CheckBox_Expand}"
HorizontalAlignment="Right" VerticalAlignment="Stretch" Margin="0,0,10,0"
IsChecked="{Binding Path=IsShowSettingView,Mode=TwoWay}"></CheckBox>
<!-- 设置区域 -->
<local:SettingView Grid.Row="1" Grid.Column="1" Width="400"
Visibility="{Binding ElementName=cbShowSettingView,Path=IsChecked,Converter={StaticResource Bool2VisibilityConverter}}"></local:SettingView>
</Grid>
<!-- 底部 -->
<Border Grid.Row="2" Background="#ff12202d">
<Grid Margin="20,0,20,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="3" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right">
<fcommon:TimeDisplayControl FontSize="12" Foreground="#AAFFFFFF"></fcommon:TimeDisplayControl>
</StackPanel>
</Grid>
</Border>
</Grid>
</UserControl>
......@@ -12,6 +12,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core;
namespace VIZ.ElectricRabbit.Module
{
......@@ -23,6 +24,8 @@ namespace VIZ.ElectricRabbit.Module
public MainView()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, new MainViewModel());
}
}
}
......@@ -3,6 +3,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Shapes;
using VIZ.Framework.Common;
using VIZ.Framework.Core;
namespace VIZ.ElectricRabbit.Module
......@@ -12,5 +15,102 @@ namespace VIZ.ElectricRabbit.Module
/// </summary>
public class MainViewModel : ViewModelBase
{
public MainViewModel()
{
// 初始化命令
this.InitCommand();
}
/// <summary>
/// 初始化命令
/// </summary>
private void InitCommand()
{
this.SettingCommand = new VCommand(this.Setting);
this.MinCommand = new VCommand(this.Min);
this.CloseCommand = new VCommand(this.Close);
}
// ================================================================================
// Property
// ================================================================================
#region IsShowSettingView -- 是否显示设置视图
private bool isShowSettingView = true;
/// <summary>
/// 是否显示设置视图
/// </summary>
public bool IsShowSettingView
{
get { return isShowSettingView; }
set { isShowSettingView = value; this.RaisePropertyChanged(nameof(IsShowSettingView)); }
}
#endregion
// ================================================================================
// Command
// ================================================================================
#region CloseCommand -- 关闭命令
/// <summary>
/// 关闭命令
/// </summary>
public VCommand CloseCommand { get; set; }
/// <summary>
/// 关闭
/// </summary>
private void Close()
{
MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "确定退出?", MessageBoxExButtons.YES_CANCEL, this.GetWindow());
if (result != MessageBoxExResult.YES)
return;
this.GetWindow().Close();
}
#endregion
#region MinCommand -- 最小化窗口命令
/// <summary>
/// 最小化窗口命令
/// </summary>
public VCommand MinCommand { get; set; }
/// <summary>
/// 最小化
/// </summary>
private void Min()
{
this.GetWindow().WindowState = WindowState.Minimized;
}
#endregion
#region SettingCommand -- 设置命令
/// <summary>
/// 设置命令
/// </summary>
public VCommand SettingCommand { get; set; }
/// <summary>
/// 设置
/// </summary>
private void Setting()
{
//SystemSettingView view = new SystemSettingView();
//NoneWindow window = new NoneWindow(1200, 1000, view);
//window.Owner = this.GetWindow();
//window.ShowDialog();
}
#endregion
}
}
<UserControl x:Class="VIZ.ElectricRabbit.Module.SettingView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:local="clr-namespace:VIZ.ElectricRabbit.Module"
mc:Ignorable="d" d:Background="#ff12202d"
d:DesignHeight="1080" d:DesignWidth="400">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Path/ArrowPathResource.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/Button/Button_Normal.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.ElectricRabbit.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.ElectricRabbit.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.ElectricRabbit.Module.Resource;component/Style/ColorPickButton/ColorPickButton_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.ElectricRabbit.Module.Resource;component/Toolkit/NumericUpDown/NumericUpDown.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
<fcore:Color2SolidColorBrushConverter x:Key="Color2SolidColorBrushConverter"></fcore:Color2SolidColorBrushConverter>
</ResourceDictionary>
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="180"></RowDefinition>
<RowDefinition Height="240"></RowDefinition>
<RowDefinition Height="180"></RowDefinition>
</Grid.RowDefinitions>
<!-- 安全距离设置 -->
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="140"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
</Grid.RowDefinitions>
<!-- 标题 -->
<Grid Grid.ColumnSpan="2">
<TextBlock Text="安全范围" Foreground="White" VerticalAlignment="Center" FontSize="18" FontWeight="Bold"
Margin="10,0,10,0"></TextBlock>
<Rectangle Grid.Row="0" Height="1" VerticalAlignment="Bottom" Fill="#ff3d4758"></Rectangle>
</Grid>
<!-- 安全范围 -->
<TextBlock Text="安全范围(像素)" Foreground="#AAFFFFFF" VerticalAlignment="Center" FontSize="14"
Margin="10,0,10,0" Grid.Row="1"></TextBlock>
<toolkit:IntegerUpDown Grid.Row="1" Grid.Column="1" Height="30" Margin="10,0,10,0"></toolkit:IntegerUpDown>
<!-- 安全轴 -->
<TextBlock Text="安全轴位置" Foreground="#AAFFFFFF" VerticalAlignment="Center" FontSize="14" Grid.Row="2"
Margin="10,0,10,0"></TextBlock>
<Grid Grid.Row="2" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Slider VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}"></Slider>
<toolkit:IntegerUpDown Grid.Column="1" Height="30" Margin="0,0,10,0"></toolkit:IntegerUpDown>
</Grid>
</Grid>
<Rectangle Grid.Row="0" Height="1" VerticalAlignment="Bottom" Fill="#ff3d4758"></Rectangle>
<!-- 样式设置 -->
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="140"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
</Grid.RowDefinitions>
<!-- 标题 -->
<Grid Grid.ColumnSpan="2">
<TextBlock Text="风格" Foreground="White" VerticalAlignment="Center" FontSize="18" FontWeight="Bold"
Margin="10,0,10,0"></TextBlock>
<Rectangle Grid.Row="0" Height="1" VerticalAlignment="Bottom" Fill="#ff3d4758"></Rectangle>
</Grid>
<!-- 安全范围 -->
<TextBlock Text="是否启用闪烁" Foreground="#AAFFFFFF" VerticalAlignment="Center" FontSize="14"
Margin="10,0,10,0" Grid.Row="1"></TextBlock>
<CheckBox Grid.Row="1" Grid.Column="1" Style="{StaticResource CheckBox_Setting}" Margin="10,0,10,0"></CheckBox>
<!-- 闪烁间隔 -->
<TextBlock Text="闪烁间隔(秒)" Foreground="#AAFFFFFF" VerticalAlignment="Center" FontSize="14" Grid.Row="2"
Margin="10,0,10,0"></TextBlock>
<toolkit:IntegerUpDown Grid.Row="2" Grid.Column="1" Height="30" Margin="10,0,10,0"></toolkit:IntegerUpDown>
<!-- 配色 -->
<TextBlock Text="配色" Foreground="#AAFFFFFF" VerticalAlignment="Center" FontSize="14" Grid.Row="3"
Margin="10,0,10,0"></TextBlock>
<Grid Grid.Row="3" Grid.Column="1" Margin="10,0,10,0" Height="30">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<fcommon:ColorPickButton Style="{StaticResource ColorPickButton_Setting}">
<Path Data="{StaticResource ResourceKey=ARROW_RESOURCE_LEFT}"
Fill="{Binding Path=Color,RelativeSource={RelativeSource AncestorLevel=1,Mode=FindAncestor,AncestorType=fcommon:ColorPickButton},Converter={StaticResource Color2SolidColorBrushConverter}}"
Stretch="Fill" Width="40" Height="20"></Path>
</fcommon:ColorPickButton>
<fcommon:ColorPickButton Grid.Column="1" Style="{StaticResource ColorPickButton_Setting}">
<Rectangle Width="40" Height="20"
Fill="{Binding Path=Color,RelativeSource={RelativeSource AncestorLevel=1,Mode=FindAncestor,AncestorType=fcommon:ColorPickButton},Converter={StaticResource Color2SolidColorBrushConverter}}" ></Rectangle>
</fcommon:ColorPickButton>
<fcommon:ColorPickButton Grid.Column="2" Style="{StaticResource ColorPickButton_Setting}">
<Path Data="{StaticResource ResourceKey=ARROW_RESOURCE_RIGHT}"
Stretch="Fill" Width="40" Height="20"
Fill="{Binding Path=Color,RelativeSource={RelativeSource AncestorLevel=1,Mode=FindAncestor,AncestorType=fcommon:ColorPickButton},Converter={StaticResource Color2SolidColorBrushConverter}}" ></Path>
</fcommon:ColorPickButton>
</Grid>
</Grid>
<Rectangle Grid.Row="1" Height="1" VerticalAlignment="Bottom" Fill="#ff3d4758"></Rectangle>
<!-- 算法参数 -->
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="140"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
</Grid.RowDefinitions>
<!-- 标题 -->
<Grid Grid.ColumnSpan="2">
<TextBlock Text="算法设置" Foreground="White" VerticalAlignment="Center" FontSize="18" FontWeight="Bold"
Margin="10,0,10,0"></TextBlock>
<Rectangle Grid.Row="0" Height="1" VerticalAlignment="Bottom" Fill="#ff3d4758"></Rectangle>
</Grid>
</Grid>
</Grid>
</UserControl>
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core;
namespace VIZ.ElectricRabbit.Module
{
/// <summary>
/// SettingView.xaml 的交互逻辑
/// </summary>
public partial class SettingView : UserControl
{
public SettingView()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, new SettingViewModel());
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
namespace VIZ.ElectricRabbit.Module
{
/// <summary>
/// 设置视图模型
/// </summary>
public class SettingViewModel : ViewModelBase
{
}
}
......@@ -93,6 +93,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="SettingView\View\SettingView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\Generic.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
......@@ -116,6 +120,10 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Compile Include="SettingView\ViewModel\SettingViewModel.cs" />
<Compile Include="SettingView\View\SettingView.xaml.cs">
<DependentUpon>SettingView.xaml</DependentUpon>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
......@@ -156,6 +164,10 @@
<Project>{06b80c09-343d-4bb2-aeb1-61cfbfbf5cad}</Project>
<Name>VIZ.Framework.Storage</Name>
</ProjectReference>
<ProjectReference Include="..\VIZ.ElectricRabbit.Common\VIZ.ElectricRabbit.Common.csproj">
<Project>{b8f27d49-e5bb-408c-871e-df023a7b2911}</Project>
<Name>VIZ.ElectricRabbit.Common</Name>
</ProjectReference>
<ProjectReference Include="..\VIZ.ElectricRabbit.Connection\VIZ.ElectricRabbit.Connection.csproj">
<Project>{688b4eea-9cb8-488a-b84f-4522dcc4515d}</Project>
<Name>VIZ.ElectricRabbit.Connection</Name>
......@@ -177,5 +189,6 @@
<Name>VIZ.ElectricRabbit.Storage</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
......@@ -57,6 +57,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.ElectricRabbit.Module.R
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.ElectricRabbit", "VIZ.ElectricRabbit\VIZ.ElectricRabbit.csproj", "{D698F0A0-D1A6-404F-9083-1F50C6C76565}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.ElectricRabbit.Common", "VIZ.ElectricRabbit.Common\VIZ.ElectricRabbit.Common.csproj", "{B8F27D49-E5BB-408C-871E-DF023A7B2911}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -193,6 +195,14 @@ Global
{D698F0A0-D1A6-404F-9083-1F50C6C76565}.Release|Any CPU.Build.0 = Release|Any CPU
{D698F0A0-D1A6-404F-9083-1F50C6C76565}.Release|x64.ActiveCfg = Release|Any CPU
{D698F0A0-D1A6-404F-9083-1F50C6C76565}.Release|x64.Build.0 = Release|Any CPU
{B8F27D49-E5BB-408C-871E-DF023A7B2911}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B8F27D49-E5BB-408C-871E-DF023A7B2911}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B8F27D49-E5BB-408C-871E-DF023A7B2911}.Debug|x64.ActiveCfg = Debug|x64
{B8F27D49-E5BB-408C-871E-DF023A7B2911}.Debug|x64.Build.0 = Debug|x64
{B8F27D49-E5BB-408C-871E-DF023A7B2911}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B8F27D49-E5BB-408C-871E-DF023A7B2911}.Release|Any CPU.Build.0 = Release|Any CPU
{B8F27D49-E5BB-408C-871E-DF023A7B2911}.Release|x64.ActiveCfg = Release|Any CPU
{B8F27D49-E5BB-408C-871E-DF023A7B2911}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -214,6 +224,7 @@ Global
{15765169-33F9-441E-9939-EB6D8F9E6DFC} = {1C2CC887-C2BE-483E-AEE1-F782AE705FC8}
{013482B6-E206-47FD-B4E8-FC4BC8421127} = {1C2CC887-C2BE-483E-AEE1-F782AE705FC8}
{D698F0A0-D1A6-404F-9083-1F50C6C76565} = {39CB9ADA-6A39-493A-AD9E-6A4A69FC40A5}
{B8F27D49-E5BB-408C-871E-DF023A7B2911} = {ACA2E4FB-DB13-4747-88A2-7528CD514DC5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6A448B72-D273-4DBC-A74A-C49C9CE8DF1C}
......
......@@ -4,10 +4,12 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:VIZ.ElectricRabbit"
mc:Ignorable="d"
Icon="icon.ico" WindowStartupLocation="CenterScreen"
mc:Ignorable="d" Background="#ff172532"
WindowStartupLocation="CenterScreen" WindowState="Maximized" WindowStyle="None"
xmlns:module="clr-namespace:VIZ.ElectricRabbit.Module;assembly=VIZ.ElectricRabbit.Module"
Icon="icon.ico"
Title="电兔子" Height="450" Width="800">
<Grid>
<module:MainView></module:MainView>
</Grid>
</Window>
......@@ -170,6 +170,10 @@
<Project>{06b80c09-343d-4bb2-aeb1-61cfbfbf5cad}</Project>
<Name>VIZ.Framework.Storage</Name>
</ProjectReference>
<ProjectReference Include="..\VIZ.ElectricRabbit.Common\VIZ.ElectricRabbit.Common.csproj">
<Project>{b8f27d49-e5bb-408c-871e-df023a7b2911}</Project>
<Name>VIZ.ElectricRabbit.Common</Name>
</ProjectReference>
<ProjectReference Include="..\VIZ.ElectricRabbit.Connection\VIZ.ElectricRabbit.Connection.csproj">
<Project>{688b4eea-9cb8-488a-b84f-4522dcc4515d}</Project>
<Name>VIZ.ElectricRabbit.Connection</Name>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment