diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj index 08084530..ad7fbab1 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj @@ -414,6 +414,9 @@ Resources\Img\Dance.png + + Resources\Img\thumbs_up.png + diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index a856d6c5..ba107c4e 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -429,6 +429,9 @@ TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\thumbs_up.png + Resources\Img\LeftMainContent\Procedure_16x.png diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj index 4170bf81..2287cbee 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -492,6 +492,9 @@ TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\thumbs_up.png + Resources\Img\LeftMainContent\Procedure_16x.png diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs index 982af49c..3ffee119 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs @@ -114,6 +114,8 @@ public static readonly string NotificationDemoCtl = nameof(NotificationDemoCtl); + public static readonly string FloatingBlockDemoCtl = nameof(FloatingBlockDemoCtl); + public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl); public static readonly string RepeatButtonDemoCtl = nameof(RepeatButtonDemoCtl); diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt index c3f93c36..2978eea6 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt @@ -59,7 +59,8 @@ var controlList = new List "RunningBlockDemoCtl", "HoneycombPanelDemoCtl", "SpriteDemoCtl", - "NotificationDemoCtl" + "NotificationDemoCtl", + "FloatingBlockDemoCtl" }; var styleList = new List { diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index fae77e78..cddc13cc 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -54,6 +54,9 @@ CardDemoCtl.xaml + + FloatingBlockDemoCtl.xaml + HoneycombPanelDemoCtl.xaml @@ -446,6 +449,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs index 65dbbbaa..71c11a57 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -555,6 +555,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 漂浮块 的本地化字符串。 + /// + public static string FloatingBlock { + get { + return ResourceManager.GetString("FloatingBlock", resourceCulture); + } + } + /// /// 查找类似 Gif图片 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index 7c939565..5114bdd6 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -660,4 +660,7 @@ Stays open + + FloatingBlock + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx index 80c45212..07d9c0ff 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx @@ -660,4 +660,7 @@ باز می ماند + + FloatingBlock + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx index d812063e..ff7f70f8 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx @@ -660,4 +660,7 @@ Reste ouvert + + FloatingBlock + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx index 5c46a76d..c3c1bec7 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -660,4 +660,7 @@ 保持打开 + + 漂浮块 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/thumbs_up.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/thumbs_up.png new file mode 100644 index 00000000..ae007799 Binary files /dev/null and b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/thumbs_up.png differ diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml new file mode 100644 index 00000000..0b28aeb2 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs new file mode 100644 index 00000000..f7cbc776 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs @@ -0,0 +1,10 @@ +namespace HandyControlDemo.UserControl +{ + public partial class FloatingBlockDemoCtl + { + public FloatingBlockDemoCtl() + { + InitializeComponent(); + } + } +} diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml index 62b91a65..e5d1313c 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml @@ -195,7 +195,12 @@ - + + + + + + diff --git a/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs new file mode 100644 index 00000000..68b7907b --- /dev/null +++ b/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs @@ -0,0 +1,7 @@ +namespace HandyControl.Controls +{ + public class FloatingBlock + { + + } +} diff --git a/src/Shared/HandyControl_Shared/Controls/Other/RunningBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Controls/Other/RunningBlock.cs rename to src/Shared/HandyControl_Shared/Controls/Block/RunningBlock.cs diff --git a/src/Shared/HandyControl_Shared/Controls/Other/ToggleBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs similarity index 100% rename from src/Shared/HandyControl_Shared/Controls/Other/ToggleBlock.cs rename to src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems index cdfdb39c..107835c7 100644 --- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -20,6 +20,7 @@ + @@ -27,12 +28,12 @@ - + - +