From fb6ee4e7020e265c8454752542274bf9165de637 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Wed, 28 Aug 2019 21:57:54 +0800 Subject: [PATCH] init branch --- .../HandyControlDemo_Core30.csproj | 3 +++ .../HandyControlDemo_Net_40.csproj | 3 +++ .../HandyControlDemo_Net_GE45.csproj | 3 +++ .../HandyControlDemo_Shared/Data/MessageToken.cs | 2 ++ .../HandyControlDemo_Shared/Data/MessageToken.tt | 3 ++- .../HandyControlDemo_Shared.projitems | 7 +++++++ .../Properties/Langs/Lang.Designer.cs | 9 +++++++++ .../Properties/Langs/Lang.en.resx | 3 +++ .../Properties/Langs/Lang.fa.resx | 3 +++ .../Properties/Langs/Lang.fr.resx | 3 +++ .../Properties/Langs/Lang.resx | 3 +++ .../Resources/Img/LeftMainContent/thumbs_up.png | Bin 0 -> 2317 bytes .../Controls/FloatingBlockDemoCtl.xaml | 7 +++++++ .../Controls/FloatingBlockDemoCtl.xaml.cs | 10 ++++++++++ .../UserControl/Main/LeftMainContent.xaml | 7 ++++++- .../Controls/Block/FloatingBlock.cs | 7 +++++++ .../Controls/{Other => Block}/RunningBlock.cs | 0 .../Controls/{Other => Block}/ToggleBlock.cs | 0 .../HandyControl_Shared.projitems | 5 +++-- 19 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/thumbs_up.png create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs create mode 100644 src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs rename src/Shared/HandyControl_Shared/Controls/{Other => Block}/RunningBlock.cs (100%) rename src/Shared/HandyControl_Shared/Controls/{Other => Block}/ToggleBlock.cs (100%) 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 0000000000000000000000000000000000000000..ae007799eff3196ab56c2b155f9dd8d659034b87 GIT binary patch literal 2317 zcmbVO4Nw$S96u!u6~DqlbMn>|6~w*Wy}ggU9S_7igd+|R@LS8h-MwSwZg;(1JYY-- zwM?PZ@`Do75J#sFHBHfym|@Ja%xMZ|G9=AXD#E0+K%=*CT-vBP-ORgv``+*U{=fgn z`_I0VnVvj&;FAM28qHuwiaiTFhp8jHKlsQ3jSbV&Cj~2Ec^7JE%0WA za}`CRP&5z-=mLaJ^m|a;VzHo@9@Xm+fI#FzL7@u}K_1u3VCQ7U&r1p~3XsZ3yTp9O z3InA*F8HJntsn=(1OkQ@&=QL4Fx91QAj^bsQoi5YZJcFL&dd2YL6HF#4`HQTQ4!@_ z@jld{?Yj(s&^nzV8~4=W^My>vO43r`Mlc}vM9Vpa5{G7SvY78@xTK{(<~Y?GiL&`Q zS`qy@qUh~SRA#Sa$YxU$V}W93^8zad9b3f?5!aMD(NzB?!uBx(f=bhNTtyKfx?RxkbN^20rsX+QXre;DMn~Bq^Kd z75%_4P)FRk?y%W1{i2)qf(-Ey5y$|1-KEijzJZiPX7bUe>e zW`hZ1jBX1;xPYfLX`m6(ZO|h|7iq>Zx86n5`rh+)k;zx9Kt11cAy|YBdf}ies?$(A1}~w8&Iy3p588Fy<4-TrX!_PV z?1?#K*>kUcp0{A;h>sF(UNE=2FGQC+49<7TP2Zk14e+fRku?0+2AzGxm#asc7e2Cf zP*?vbVZ^FQbFS|0xAUws?yZtRl_e#)YpP1>7cc%X`haZ$QCRWmr=9t2OJ>x+@Um4h zy@`xmcI zx1SB$njP5p?A$bA#TlhFrmXG4_Mmtx ze*4>niJ7UxR}bDIAT2Gmp4if~vkN+(Z=GfDxO|?hv2UJ0=9O1ebSC8=Id@_~-Hnqi z7niO5HO$_*$F=E;KgJHM$8gx zc3%sBG~-0-pT9=#h=8YURz_8inHZDt#p1T%N!E>qu~)u#EsV*yz4sP=@aRhY7}HOY z<}Rr97ijL#k6lwwU5dXnd0yP1#+WKi!|9<3?~N+e)*l_RUAyD(G_Mx7G)yRNx^gVC z-re=pA=8Cf8+ZNuPBZj%-iF_7rH?h7Oxav47x$eS>)c#rcN}UfZBCE>U}V%slS-Y9 z*KX-sKbsld8YVm&sDj=dwd9!g+WATX-EPcArQ7S;SC!4*b$eK4{ps)VLai?%rT?YO z)Nx>3+}8g7io~cq^n<#o$J%!{FRWT`Hi){5+mh^3 + + + + 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 @@ - + - +