init branch

This commit is contained in:
NaBian committed 2020-01-17 23:34:00 +08:00
1 parent d459d57033
commit de5c2e7a6e
20 files changed
+97 -16

No files matched your search

@@ -460,6 +460,9 @@
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png"> <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png">
<Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link> <Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link>
</Resource> </Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png">
<Link>Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png</Link>
</Resource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx"> <EmbeddedResource Include="..\..\Shared\HandyControlDemo_Shared\Properties\Langs\Lang.en.resx">
@@ -526,6 +526,9 @@
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png"> <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png">
<Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link> <Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link>
</Resource> </Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png">
<Link>Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png</Link>
</Resource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Data\DemoInfo.json"> <Resource Include="..\..\Shared\HandyControlDemo_Shared\Data\DemoInfo.json">
@@ -589,6 +589,9 @@
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png"> <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\WPFFlowDocument_16x.png">
<Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link> <Link>Resources\Img\LeftMainContent\WPFFlowDocument_16x.png</Link>
</Resource> </Resource>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png">
<Link>Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png</Link>
</Resource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf"> <Resource Include="..\..\Shared\HandyControlDemo_Shared\Resources\fabric-icons.ttf">
@@ -45,7 +45,7 @@
[ "ButtonGroup", "ButtonGroupDemoCtl", "ButtonGroup_16x", "" ], [ "ButtonGroup", "ButtonGroupDemoCtl", "ButtonGroup_16x", "" ],
[ "ProgressButton", "ProgressButtonDemoCtl", "ProgressButton_16x", "" ], [ "ProgressButton", "ProgressButtonDemoCtl", "ProgressButton_16x", "" ],
[ "ChatBubble", "ChatBubbleDemoCtl", "Bubble_16xLG", "" ], [ "ChatBubble", "ChatBubbleDemoCtl", "Bubble_16xLG", "" ],
[ "Poptip", "PoptipDemoCtl", "PopupCursor_16x", "1" ], [ "Poptip", "PoptipDemoCtl", "PopupCursor_16x", "" ],
[ "NotifyIcon", "NotifyIconDemoCtl", "NotificationHub_16x", "" ], [ "NotifyIcon", "NotifyIconDemoCtl", "NotificationHub_16x", "" ],
[ "NumericUpDown", "NumericUpDownDemoCtl", "NumericListBox_16x", "" ], [ "NumericUpDown", "NumericUpDownDemoCtl", "NumericListBox_16x", "" ],
[ "TextBox", "TextBoxDemoCtl", "TextBox_16x", "" ], [ "TextBox", "TextBoxDemoCtl", "TextBox_16x", "" ],
@@ -96,7 +96,7 @@
[ "Sprite", "SpriteDemoCtl", "HandyControl", "" ], [ "Sprite", "SpriteDemoCtl", "HandyControl", "" ],
[ "Notification", "NotificationDemoCtl", "Procedure_16x", "" ], [ "Notification", "NotificationDemoCtl", "Procedure_16x", "" ],
[ "Dialog", "DialogDemoCtl", "Dialog_16x", "" ], [ "Dialog", "DialogDemoCtl", "Dialog_16x", "" ],
[ "Window", "WindowDemoCtl", "WindowsForm_16x", "" ] [ "Window", "WindowDemoCtl", "WindowsForm_16x", "1" ]
] ]
}, },
{ {
@@ -40,5 +40,7 @@
public static readonly string QQGroupView = nameof(QQGroupView); public static readonly string QQGroupView = nameof(QQGroupView);
public static readonly string GlowWindow = nameof(GlowWindow);
} }
} }
@@ -22,7 +22,8 @@ var messageList = new List<string>
"BlurWindow", "BlurWindow",
"CustomNonClientAreaWindow", "CustomNonClientAreaWindow",
"NoNonClientAreaDragableWindow", "NoNonClientAreaDragableWindow",
"QQGroupView" "QQGroupView",
"GlowWindow"
}; };
#> #>
namespace HandyControlDemo.Data namespace HandyControlDemo.Data
@@ -407,6 +407,9 @@
<Compile Include="$(MSBuildThisFileDirectory)Window\DialogDemoWindow.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)Window\DialogDemoWindow.xaml.cs">
<DependentUpon>DialogDemoWindow.xaml</DependentUpon> <DependentUpon>DialogDemoWindow.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)Window\GlowWindow.xaml.cs">
<DependentUpon>GlowWindow.xaml</DependentUpon>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)Window\GrowlDemoWindow.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)Window\GrowlDemoWindow.xaml.cs">
<DependentUpon>GrowlDemoWindow.xaml</DependentUpon> <DependentUpon>GrowlDemoWindow.xaml</DependentUpon>
</Compile> </Compile>
@@ -923,6 +926,10 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="$(MSBuildThisFileDirectory)Window\GlowWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="$(MSBuildThisFileDirectory)Window\GrowlDemoWindow.xaml"> <Page Include="$(MSBuildThisFileDirectory)Window\GrowlDemoWindow.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
@@ -1050,6 +1050,15 @@ namespace HandyControlDemo.Properties.Langs {
} }
} }
/// <summary>
/// 查找类似 点击打开辉光窗口 的本地化字符串。
/// </summary>
public static string OpenGlowWindow {
get {
return ResourceManager.GetString("OpenGlowWindow", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 点击打开图片浏览器 的本地化字符串。 /// 查找类似 点击打开图片浏览器 的本地化字符串。
/// </summary> /// </summary>
@@ -717,4 +717,7 @@
<data name="FlowDocumentScrollViewer" xml:space="preserve"> <data name="FlowDocumentScrollViewer" xml:space="preserve">
<value>FlowDocumentScrollViewer</value> <value>FlowDocumentScrollViewer</value>
</data> </data>
<data name="OpenGlowWindow" xml:space="preserve">
<value>Open glowWindow</value>
</data>
</root> </root>
@@ -717,4 +717,7 @@
<data name="FlowDocumentScrollViewer" xml:space="preserve"> <data name="FlowDocumentScrollViewer" xml:space="preserve">
<value>FlowDocumentScrollViewer</value> <value>FlowDocumentScrollViewer</value>
</data> </data>
<data name="OpenGlowWindow" xml:space="preserve">
<value>Open glowWindow</value>
</data>
</root> </root>
@@ -717,4 +717,7 @@
<data name="FlowDocumentScrollViewer" xml:space="preserve"> <data name="FlowDocumentScrollViewer" xml:space="preserve">
<value>FlowDocumentScrollViewer</value> <value>FlowDocumentScrollViewer</value>
</data> </data>
<data name="OpenGlowWindow" xml:space="preserve">
<value>Open glowWindow</value>
</data>
</root> </root>
@@ -717,4 +717,7 @@
<data name="FlowDocumentScrollViewer" xml:space="preserve"> <data name="FlowDocumentScrollViewer" xml:space="preserve">
<value>FlowDocumentScrollViewer</value> <value>FlowDocumentScrollViewer</value>
</data> </data>
<data name="OpenGlowWindow" xml:space="preserve">
<value>Open glowWindow</value>
</data>
</root> </root>
@@ -717,4 +717,7 @@
<data name="FlowDocumentScrollViewer" xml:space="preserve"> <data name="FlowDocumentScrollViewer" xml:space="preserve">
<value>流文档滚动视图</value> <value>流文档滚动视图</value>
</data> </data>
<data name="OpenGlowWindow" xml:space="preserve">
<value>点击打开辉光窗口</value>
</data>
</root> </root>
Binary file not shown.

After

Width:  |  Height:  |  Size: 133 B

@@ -16,6 +16,9 @@
<Button Click="ButtonCustomContent_OnClick" Content="{x:Static langs:Lang.OpenCustomContentWindow}"/> <Button Click="ButtonCustomContent_OnClick" Content="{x:Static langs:Lang.OpenCustomContentWindow}"/>
<Button Name="ButtonMouseFollow" Click="ButtonMouseFollow_OnClick" Content="{x:Static langs:Lang.OpenMouseFollowWindow}"/> <Button Name="ButtonMouseFollow" Click="ButtonMouseFollow_OnClick" Content="{x:Static langs:Lang.OpenMouseFollowWindow}"/>
<Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.NoNonClientAreaDragableWindow}" Content="{x:Static langs:Lang.OpenNoNonClientAreaDragableWindow}"/> <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.NoNonClientAreaDragableWindow}" Content="{x:Static langs:Lang.OpenNoNonClientAreaDragableWindow}"/>
<hc:Badge Text="New" Style="{StaticResource BadgeDanger}" VerticalAlignment="Center" HorizontalAlignment="Center" BadgeMargin="0,-10,-20,0">
<Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.GlowWindow}" Content="{x:Static langs:Lang.OpenGlowWindow}"/>
</hc:Badge>
</UniformGrid> </UniformGrid>
</hc:TransitioningContentControl> </hc:TransitioningContentControl>
</UserControl> </UserControl>
@@ -1,15 +1,15 @@
<hc:BlurWindow x:Class="HandyControlDemo.Window.BlurWindow" <hc:BlurWindow x:Class="HandyControlDemo.Window.BlurWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs" xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
mc:Ignorable="d" mc:Ignorable="d"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
Title="{x:Static langs:Lang.Title}" Title="{x:Static langs:Lang.Title}"
Style="{StaticResource WindowBlur}" Style="{StaticResource WindowBlur}"
Height="450" Height="450"
Width="800" Width="800"
Icon="/HandyControlDemo;component/Resources/Img/icon.ico"> Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
</hc:BlurWindow> </hc:BlurWindow>
@@ -0,0 +1,17 @@
<hc:GlowWindow x:Class="HandyControlDemo.Window.GlowWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
mc:Ignorable="d"
WindowStartupLocation="CenterScreen"
Title="{x:Static langs:Lang.Title}"
Height="450"
Width="800"
Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
<Grid>
</Grid>
</hc:GlowWindow>
@@ -0,0 +1,10 @@
namespace HandyControlDemo.Window
{
public partial class GlowWindow
{
public GlowWindow()
{
InitializeComponent();
}
}
}
@@ -0,0 +1,7 @@
namespace HandyControl.Controls
{
public class GlowWindow : System.Windows.Window
{
}
}
@@ -41,6 +41,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Controls\Slider\RangeSlider\RangeThumb.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Controls\Slider\RangeSlider\RangeThumb.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\Slider\RangeSlider\TwoWayRangeBase.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Controls\Slider\RangeSlider\TwoWayRangeBase.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\Block\RunningBlock.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Controls\Block\RunningBlock.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Controls\Window\GlowWindow.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Enum\DrawerShowMode.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\DrawerShowMode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Enum\HatchStyle.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\HatchStyle.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Enum\HitMode.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\HitMode.cs" />