diff --git a/.gitignore b/.gitignore index b88e2620..3d039f0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,19 @@ -/.vs -/packages -/HandyControl/bin -/HandyControl/obj -/HandyControlDemo/bin -/HandyControlDemo/obj -/DockBoxResearch/bin -/DockBoxResearch/obj -/HandyControl.sln.DotSettings.user -Net35/HandyControlDemo_Net35/bin -Net35/HandyControlDemo_Net35/obj -Net35/HandyControl_Net35/bin -Net35/HandyControl_Net35/obj -Net40/HandyControlDemo_Net40/bin -Net40/HandyControlDemo_Net40/obj -Net40/HandyControl_Net40/bin -Net40/HandyControl_Net40/obj \ No newline at end of file +DockBoxResearch/bin +DockBoxResearch/obj +src/.vs +src/Core_30/HandyControl_Core_30/bin +src/Core_30/HandyControl_Core_30/obj +src/Core_30/HandyControlDemo_Core_30/bin +src/Core_30/HandyControlDemo_Core_30/obj +src/Net_35/HandyControl_Net_35/bin +src/Net_35/HandyControl_Net_35/obj +src/Net_35/HandyControlDemo_Net_35/bin +src/Net_35/HandyControlDemo_Net_35/obj +src/Net_40/HandyControl_Net_40/bin +src/Net_40/HandyControl_Net_40/obj +src/Net_40/HandyControlDemo_Net_40/bin +src/Net_40/HandyControlDemo_Net_40/obj +src/Net_GE45/HandyControl_Net_GE45/bin +src/Net_GE45/HandyControl_Net_GE45/obj +src/Net_GE45/HandyControlDemo_Net_GE45/bin +src/Net_GE45/HandyControlDemo_Net_GE45/obj \ No newline at end of file diff --git a/HandyControl-Core3.0.sln b/HandyControl-Core3.0.sln deleted file mode 100644 index 44947b64..00000000 --- a/HandyControl-Core3.0.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28729.10 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl-Core3.0", "HandyControl\HandyControl-Core3.0.csproj", "{0233495D-82C7-486B-9B86-68BD75A24B7A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo-Core3.0", "HandyControlDemo\HandyControlDemo-Core3.0.csproj", "{1D3A48E3-B998-4320-BB45-B94D4067E557}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0233495D-82C7-486B-9B86-68BD75A24B7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0233495D-82C7-486B-9B86-68BD75A24B7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0233495D-82C7-486B-9B86-68BD75A24B7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0233495D-82C7-486B-9B86-68BD75A24B7A}.Release|Any CPU.Build.0 = Release|Any CPU - {1D3A48E3-B998-4320-BB45-B94D4067E557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D3A48E3-B998-4320-BB45-B94D4067E557}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D3A48E3-B998-4320-BB45-B94D4067E557}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D3A48E3-B998-4320-BB45-B94D4067E557}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6C8B9B9F-B396-4C31-BA28-11BCB1ED94C5} - EndGlobalSection -EndGlobal diff --git a/HandyControl/HandyControl-Core3.0.csproj b/HandyControl/HandyControl-Core3.0.csproj deleted file mode 100644 index d5a328b8..00000000 --- a/HandyControl/HandyControl-Core3.0.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - netcoreapp3.0 - true - HandyControl - HandyControl - - - - - - - - - \ No newline at end of file diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj deleted file mode 100644 index 9d49bdd2..00000000 --- a/HandyControl/HandyControl.csproj +++ /dev/null @@ -1,844 +0,0 @@ - - - - Debug - AnyCPU - {DC966E3D-BCFF-4652-98CF-070E5494749A} - library - HandyControl - HandyControl - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.6.2 - netgt40 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.7 - netgt40 - - - true - full - false - bin\Debug\ - DEBUG;TRACE;netle45 - prompt - 4 - v4.5 - netgt40 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\HandyControl.xml - v4.6.2 - netgt40 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\HandyControl.xml - v4.7 - netgt40 - - - pdbonly - true - bin\Release\ - TRACE;netle45 - prompt - 4 - bin\Release\HandyControl.xml - v4.5 - netgt40 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - True - True - Lang.resx - - - True - True - Lang.en.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - - - - - - - - - - PublicResXFileCodeGenerator - Lang.en.Designer.cs - Designer - - - PublicResXFileCodeGenerator - Lang.Designer.cs - Designer - - - - - - - - - - - - \ No newline at end of file diff --git a/HandyControl/packages.config b/HandyControl/packages.config deleted file mode 100644 index 53cc503c..00000000 --- a/HandyControl/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/HandyControlDemo/HandyControlDemo-Core3.0.csproj b/HandyControlDemo/HandyControlDemo-Core3.0.csproj deleted file mode 100644 index ff67f4b0..00000000 --- a/HandyControlDemo/HandyControlDemo-Core3.0.csproj +++ /dev/null @@ -1,215 +0,0 @@ - - - WinExe - netcoreapp3.0 - true - HandyControlDemo - HandyControlDemo - Resources\Img\icon.ico - - - TRACE;Core - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj deleted file mode 100644 index a9b2af83..00000000 --- a/HandyControlDemo/HandyControlDemo.csproj +++ /dev/null @@ -1,928 +0,0 @@ - - - - - Debug - AnyCPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7} - WinExe - HandyControlDemo - HandyControlDemo - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.6.2 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.7 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - v4.6.2 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - v4.7 - - - Resources\Img\icon.ico - - - - ..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll - - - ..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.dll - - - ..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.Extras.dll - - - ..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.Platform.dll - - - - ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - - - - - ..\packages\MvvmLightLibs.5.4.1\lib\net45\System.Windows.Interactivity.dll - - - 4.0 - - - - - - - MSBuild:Compile - Designer - - - - - - True - True - MessageToken.tt - - - - - - - - True - True - Lang.resx - - - True - True - Lang.en.resx - - - - - - - - - Avatar.xaml - - - ChatBox.xaml - - - InteractiveDialog.xaml - - - TextDialog.xaml - - - AnimationPathDemoCtl.xaml - - - BadgeDemoCtl.xaml - - - CalendarWithClockDemoCtl.xaml - - - CarouselDemoCtl.xaml - - - ChatBubbleDemoCtl.xaml - - - CirclePanelDemoCtl.xaml - - - DialogDemoCtl.xaml - - - ProgressBarDemoCtl.xaml - - - ClockDemoCtl.xaml - - - ColorPickerDemoCtl.xaml - - - ComboBoxDemoCtl.xaml - - - CompareSliderDemoCtl.xaml - - - CoverFlowDemoCtl.xaml - - - CoverViewDemoCtl.xaml - - - DatePickerDemoCtl.xaml - - - DateTimePickerDemoCtl.xaml - - - FlipClockDemoCtl.xaml - - - GotoTopDemoCtl.xaml - - - NotifyIconDemoCtl.xaml - - - GravatarDemoCtl.xaml - - - OutlineTextDemoCtl.xaml - - - GifImageDemoCtl.xaml - - - GrowlDemoCtl.xaml - - - ImageBrowserDemoCtl.xaml - - - LoadingDemoCtl.xaml - - - NumericUpDownDemoCtl.xaml - - - PasswordBoxDemoCtl.xaml - - - PreviewSliderDemoCtl.xaml - - - ProgressButtonDemoCtl.xaml - - - RateDemoCtl.xaml - - - ScrollViewerDemoCtl.xaml - - - SearchBarDemoCtl.xaml - - - ShieldDemoCtl.xaml - - - StepBarDemoCtl.xaml - - - TagDemoCtl.xaml - - - TextBoxDemoCtl.xaml - - - TimePickerDemoCtl.xaml - - - TransferDemoCtl.xaml - - - WaterfallPanelDemoCtl.xaml - - - WindowDemoCtl.xaml - - - ContributorsView.xaml - - - NoUserContent.xaml - - - QQGroupView.xaml - - - UnderConstruction.xaml - - - BorderDemoCtl.xaml - - - BrushDemoCtl.xaml - - - ButtonDemoCtl.xaml - - - CalendarDemoCtl.xaml - - - CheckBoxDemoCtl.xaml - - - GroupBoxDemoCtl.xaml - - - LabelDemoCtl.xaml - - - ListViewDemoCtl.xaml - - - NativeComboBoxDemoCtl.xaml - - - DataGridDemoCtl.xaml - - - NativeDatePickerDemoCtl.xaml - - - ExpanderDemoCtl.xaml - - - LeftMainContent.xaml - - - MainContent.xaml - - - PaginationDemoCtl.xaml - - - TimeBarDemoCtl.xaml - - - ListBoxDemoCtl.xaml - - - MenuDemoCtl.xaml - - - NativeScrollViewerDemoCtl.xaml - - - NativeTabControlDemoCtl.xaml - - - NativePasswordBoxDemoCtl.xaml - - - NativeProgressBarDemoCtl.xaml - - - TabControlDemoCtl.xaml - - - RadioButtonDemoCtl.xaml - - - RichTextBoxDemoCtl.xaml - - - SliderDemoCtl.xaml - - - TextBlockDemoCtl.xaml - - - NativeTextBoxDemoCtl.xaml - - - ToggleButtonDemoCtl.xaml - - - ToolBarDemoCtl.xaml - - - TreeViewDemoCtl.xaml - - - - - - - - - - - - - - - - - - - - AboutWindow.xaml - - - BlurWindow.xaml - - - CommonWindow.xaml - - - CustomNonClientAreaWindow.xaml - - - GrowlDemoWindow.xaml - - - NoNonClientAreaDragableWindow.xaml - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - Code - - - - - - - - - - - - - - - - TextTemplatingFileGenerator - MessageToken.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PublicResXFileCodeGenerator - Lang.en.Designer.cs - - - PublicResXFileCodeGenerator - Lang.Designer.cs - Designer - - - - - {dc966e3d-bcff-4652-98cf-070e5494749a} - HandyControl - - - - - \ No newline at end of file diff --git a/HandyControlDemo/packages.config b/HandyControlDemo/packages.config deleted file mode 100644 index d4e90a24..00000000 --- a/HandyControlDemo/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/HandyControl_Net35.sln b/HandyControl_Net35.sln deleted file mode 100644 index ae9d066b..00000000 --- a/HandyControl_Net35.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2000 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net35", "Net35\HandyControl_Net35\HandyControl_Net35.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net35", "Net35\HandyControlDemo_Net35\HandyControlDemo_Net35.csproj", "{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release|Any CPU.Build.0 = Release|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {3B28FE22-B7B9-4058-9EF9-936C53C986CA} - EndGlobalSection -EndGlobal diff --git a/HandyControl_Net40.sln b/HandyControl_Net40.sln deleted file mode 100644 index 75ef70cb..00000000 --- a/HandyControl_Net40.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2000 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net40", "Net40\HandyControl_Net40\HandyControl_Net40.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net40", "Net40\HandyControlDemo_Net40\HandyControlDemo_Net40.csproj", "{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release|Any CPU.Build.0 = Release|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {3B28FE22-B7B9-4058-9EF9-936C53C986CA} - EndGlobalSection -EndGlobal diff --git a/Net35/HandyControlDemo_Net35/Tools/CommonHelper.cs b/Net35/HandyControlDemo_Net35/Tools/CommonHelper.cs deleted file mode 100644 index a9daea11..00000000 --- a/Net35/HandyControlDemo_Net35/Tools/CommonHelper.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Linq; -using System.Management; -using HandyControl.Data; - -namespace HandyControlDemo.Tools -{ - public class CommonHelper - { - public static SystemVersionInfo GetSystemVersionInfo() - { - var managementClass = new ManagementClass("Win32_OperatingSystem"); - var instances = managementClass.GetInstances(); - foreach (var instance in instances) - { - if (instance["Version"] is string version) - { - var nums = version.Split('.').Select(int.Parse).ToList(); - var info = new SystemVersionInfo(nums[0], nums[1], nums[2]); - return info; - } - } - return default(SystemVersionInfo); - } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/App.xaml b/Net40/HandyControlDemo_Net40/App.xaml deleted file mode 100644 index dea6f894..00000000 --- a/Net40/HandyControlDemo_Net40/App.xaml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Net40/HandyControlDemo_Net40/App.xaml.cs b/Net40/HandyControlDemo_Net40/App.xaml.cs deleted file mode 100644 index db6d4d17..00000000 --- a/Net40/HandyControlDemo_Net40/App.xaml.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Globalization; -using System.Net; -using System.Security.Authentication; -using System.Threading; -using System.Windows; -using HandyControl.Controls; -using HandyControl.Data; -using HandyControl.Tools; -using HandyControlDemo.Data; -using HandyControlDemo.Tools; - -namespace HandyControlDemo -{ - /// - /// App.xaml 的交互逻辑 - /// - public partial class App - { - protected override void OnStartup(StartupEventArgs e) - { - base.OnStartup(e); - - GlobalData.Init(); - Thread.CurrentThread.CurrentUICulture = new CultureInfo(GlobalData.Config.Lang); - - if (GlobalData.Config.Skin != SkinType.Default) - { - UpdateSkin(GlobalData.Config.Skin); - } - - BlurWindow.SystemVersionInfo = CommonHelper.GetSystemVersionInfo(); - - ServicePointManager.SecurityProtocol = (SecurityProtocolType)(SslProtocols)0x00000C00; - } - - protected override void OnExit(ExitEventArgs e) - { - base.OnExit(e); - GlobalData.Save(); - } - - internal void UpdateSkin(SkinType skin) - { - var skins0 = Resources.MergedDictionaries[0]; - skins0.MergedDictionaries.Clear(); - skins0.MergedDictionaries.Add(ResourceHelper.GetSkin(skin)); - skins0.MergedDictionaries.Add(ResourceHelper.GetSkin(typeof(App).Assembly, "Resources/Themes", skin)); - - var skins1 = Resources.MergedDictionaries[1]; - skins1.MergedDictionaries.Clear(); - skins1.MergedDictionaries.Add(new ResourceDictionary - { - Source = new Uri("pack://application:,,,/HandyControl;component/Themes/Theme.xaml") - }); - skins1.MergedDictionaries.Add(new ResourceDictionary - { - Source = new Uri("pack://application:,,,/HandyControlDemo;component/Resources/Themes/Theme.xaml") - }); - Current.MainWindow?.OnApplyTemplate(); - } - } -} diff --git a/Net40/HandyControlDemo_Net40/Data/AppConfig.cs b/Net40/HandyControlDemo_Net40/Data/AppConfig.cs deleted file mode 100644 index 0084a625..00000000 --- a/Net40/HandyControlDemo_Net40/Data/AppConfig.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using HandyControl.Data; - -namespace HandyControlDemo.Data -{ - internal class AppConfig - { - public static readonly string SavePath = $"{AppDomain.CurrentDomain.BaseDirectory}AppConfig.json"; - - public string Lang { get; set; } = "zh-cn"; - - public SkinType Skin { get; set; } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Data/Enum/DemoType.cs b/Net40/HandyControlDemo_Net40/Data/Enum/DemoType.cs deleted file mode 100644 index 09c3039c..00000000 --- a/Net40/HandyControlDemo_Net40/Data/Enum/DemoType.cs +++ /dev/null @@ -1,13 +0,0 @@ - -namespace HandyControlDemo.Data -{ - public enum DemoType - { - Type1 = 1, - Type2, - Type3, - Type4, - Type5, - Type6 - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Data/GlobalData.cs b/Net40/HandyControlDemo_Net40/Data/GlobalData.cs deleted file mode 100644 index 9c0f9f69..00000000 --- a/Net40/HandyControlDemo_Net40/Data/GlobalData.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.IO; -using Newtonsoft.Json; - -namespace HandyControlDemo.Data -{ - internal class GlobalData - { - public static void Init() - { - if (File.Exists(AppConfig.SavePath)) - { - try - { - var json = File.ReadAllText(AppConfig.SavePath); - Config = JsonConvert.DeserializeObject(json); - } - catch - { - Config = new AppConfig(); - } - } - else - { - Config = new AppConfig(); - } - } - - public static void Save() - { - var json = JsonConvert.SerializeObject(Config); - File.WriteAllText(AppConfig.SavePath, json); - } - - public static AppConfig Config { get; set; } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Data/MessageToken.cs b/Net40/HandyControlDemo_Net40/Data/MessageToken.cs deleted file mode 100644 index 44fa6c82..00000000 --- a/Net40/HandyControlDemo_Net40/Data/MessageToken.cs +++ /dev/null @@ -1,160 +0,0 @@ -namespace HandyControlDemo.Data -{ - public class MessageToken - { - public static readonly string GrowlDemoCtl = nameof(GrowlDemoCtl); - - public static readonly string LoadingDemoCtl = nameof(LoadingDemoCtl); - - public static readonly string ImageBrowserDemoCtl = nameof(ImageBrowserDemoCtl); - - public static readonly string ColorPickerDemoCtl = nameof(ColorPickerDemoCtl); - - public static readonly string CarouselDemoCtl = nameof(CarouselDemoCtl); - - public static readonly string CompareSliderDemoCtl = nameof(CompareSliderDemoCtl); - - public static readonly string TimeBarDemoCtl = nameof(TimeBarDemoCtl); - - public static readonly string PaginationDemoCtl = nameof(PaginationDemoCtl); - - public static readonly string AnimationPathDemoCtl = nameof(AnimationPathDemoCtl); - - public static readonly string StepBarDemoCtl = nameof(StepBarDemoCtl); - - public static readonly string ClockDemoCtl = nameof(ClockDemoCtl); - - public static readonly string TimePickerDemoCtl = nameof(TimePickerDemoCtl); - - public static readonly string CirclePanelDemoCtl = nameof(CirclePanelDemoCtl); - - public static readonly string NumericUpDownDemoCtl = nameof(NumericUpDownDemoCtl); - - public static readonly string WindowDemoCtl = nameof(WindowDemoCtl); - - public static readonly string ScrollViewerDemoCtl = nameof(ScrollViewerDemoCtl); - - public static readonly string PreviewSliderDemoCtl = nameof(PreviewSliderDemoCtl); - - public static readonly string ProgressBarDemoCtl = nameof(ProgressBarDemoCtl); - - public static readonly string TextBoxDemoCtl = nameof(TextBoxDemoCtl); - - public static readonly string ComboBoxDemoCtl = nameof(ComboBoxDemoCtl); - - public static readonly string PasswordBoxDemoCtl = nameof(PasswordBoxDemoCtl); - - public static readonly string DatePickerDemoCtl = nameof(DatePickerDemoCtl); - - public static readonly string DateTimePickerDemoCtl = nameof(DateTimePickerDemoCtl); - - public static readonly string CalendarWithClockDemoCtl = nameof(CalendarWithClockDemoCtl); - - public static readonly string SearchBarDemoCtl = nameof(SearchBarDemoCtl); - - public static readonly string TagDemoCtl = nameof(TagDemoCtl); - - public static readonly string GifImageDemoCtl = nameof(GifImageDemoCtl); - - public static readonly string OutlineTextDemoCtl = nameof(OutlineTextDemoCtl); - - public static readonly string FlipClockDemoCtl = nameof(FlipClockDemoCtl); - - public static readonly string QQGroupView = nameof(QQGroupView); - - public static readonly string BlurWindow = nameof(BlurWindow); - - public static readonly string NoNonClientAreaDragableWindow = nameof(NoNonClientAreaDragableWindow); - - public static readonly string RateDemoCtl = nameof(RateDemoCtl); - - public static readonly string ShieldDemoCtl = nameof(ShieldDemoCtl); - - public static readonly string WaterfallPanelDemoCtl = nameof(WaterfallPanelDemoCtl); - - public static readonly string CoverViewDemoCtl = nameof(CoverViewDemoCtl); - - public static readonly string CoverFlowDemoCtl = nameof(CoverFlowDemoCtl); - - public static readonly string ProgressButtonDemoCtl = nameof(ProgressButtonDemoCtl); - - public static readonly string TransferDemoCtl = nameof(TransferDemoCtl); - - public static readonly string ChatBubbleDemoCtl = nameof(ChatBubbleDemoCtl); - - public static readonly string GotoTopDemoCtl = nameof(GotoTopDemoCtl); - - public static readonly string BadgeDemoCtl = nameof(BadgeDemoCtl); - - public static readonly string GravatarDemoCtl = nameof(GravatarDemoCtl); - - public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl); - - public static readonly string ToggleButtonDemoCtl = nameof(ToggleButtonDemoCtl); - - public static readonly string ExpanderDemoCtl = nameof(ExpanderDemoCtl); - - public static readonly string NativeProgressBarDemoCtl = nameof(NativeProgressBarDemoCtl); - - public static readonly string TabControlDemoCtl = nameof(TabControlDemoCtl); - - public static readonly string CalendarDemoCtl = nameof(CalendarDemoCtl); - - public static readonly string NativeDatePickerDemoCtl = nameof(NativeDatePickerDemoCtl); - - public static readonly string NativeTextBoxDemoCtl = nameof(NativeTextBoxDemoCtl); - - public static readonly string TextBlockDemoCtl = nameof(TextBlockDemoCtl); - - public static readonly string NativeComboBoxDemoCtl = nameof(NativeComboBoxDemoCtl); - - public static readonly string NativePasswordBoxDemoCtl = nameof(NativePasswordBoxDemoCtl); - - public static readonly string NativeTabControlDemoCtl = nameof(NativeTabControlDemoCtl); - - public static readonly string DataGridDemoCtl = nameof(DataGridDemoCtl); - - public static readonly string CheckBoxDemoCtl = nameof(CheckBoxDemoCtl); - - public static readonly string ListBoxDemoCtl = nameof(ListBoxDemoCtl); - - public static readonly string MenuDemoCtl = nameof(MenuDemoCtl); - - public static readonly string TreeViewDemoCtl = nameof(TreeViewDemoCtl); - - public static readonly string BorderDemoCtl = nameof(BorderDemoCtl); - - public static readonly string RadioButtonDemoCtl = nameof(RadioButtonDemoCtl); - - public static readonly string NativeScrollViewerDemoCtl = nameof(NativeScrollViewerDemoCtl); - - public static readonly string BrushDemoCtl = nameof(BrushDemoCtl); - - public static readonly string SliderDemoCtl = nameof(SliderDemoCtl); - - public static readonly string GroupBoxDemoCtl = nameof(GroupBoxDemoCtl); - - public static readonly string ListViewDemoCtl = nameof(ListViewDemoCtl); - - public static readonly string RichTextBoxDemoCtl = nameof(RichTextBoxDemoCtl); - - public static readonly string ToolBarDemoCtl = nameof(ToolBarDemoCtl); - - public static readonly string LabelDemoCtl = nameof(LabelDemoCtl); - - public static readonly string CommonWindow = nameof(CommonWindow); - - public static readonly string CustomNonClientAreaWindow = nameof(CustomNonClientAreaWindow); - - public static readonly string LoadShowContent = nameof(LoadShowContent); - - public static readonly string FullSwitch = nameof(FullSwitch); - - public static readonly string ContributorsView = nameof(ContributorsView); - - public static readonly string ClearLeftSelected = nameof(ClearLeftSelected); - - public static readonly string SendChatMessage = nameof(SendChatMessage); - - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Data/MessageToken.tt b/Net40/HandyControlDemo_Net40/Data/MessageToken.tt deleted file mode 100644 index 549a85ed..00000000 --- a/Net40/HandyControlDemo_Net40/Data/MessageToken.tt +++ /dev/null @@ -1,116 +0,0 @@ -<#@ template debug="false" hostspecific="false" language="C#" #> -<#@ import namespace="System.Collections.Generic"#> -<#@ output extension=".cs" #> -<# -var controlList = new List -{ - "GrowlDemoCtl", - "LoadingDemoCtl", - "ImageBrowserDemoCtl", - "ColorPickerDemoCtl", - "CarouselDemoCtl", - "CompareSliderDemoCtl", - "TimeBarDemoCtl", - "PaginationDemoCtl", - "AnimationPathDemoCtl", - "StepBarDemoCtl", - "ClockDemoCtl", - "TimePickerDemoCtl", - "CirclePanelDemoCtl", - "NumericUpDownDemoCtl", - "WindowDemoCtl", - "ScrollViewerDemoCtl", - "PreviewSliderDemoCtl", - "ProgressBarDemoCtl", - "TextBoxDemoCtl", - "ComboBoxDemoCtl", - "PasswordBoxDemoCtl", - "DatePickerDemoCtl", - "DateTimePickerDemoCtl", - "CalendarWithClockDemoCtl", - "SearchBarDemoCtl", - "TagDemoCtl", - "GifImageDemoCtl", - "OutlineTextDemoCtl", - "FlipClockDemoCtl", - "QQGroupView", - "BlurWindow", - "NoNonClientAreaDragableWindow", - "RateDemoCtl", - "ShieldDemoCtl", - "WaterfallPanelDemoCtl", - "CoverViewDemoCtl", - "CoverFlowDemoCtl", - "ProgressButtonDemoCtl", - "TransferDemoCtl", - "ChatBubbleDemoCtl", - "GotoTopDemoCtl", - "BadgeDemoCtl", - "GravatarDemoCtl" -}; -var styleList = new List -{ - "ButtonDemoCtl", - "ToggleButtonDemoCtl", - "ExpanderDemoCtl", - "NativeProgressBarDemoCtl", - "TabControlDemoCtl", - "CalendarDemoCtl", - "NativeDatePickerDemoCtl", - "NativeTextBoxDemoCtl", - "TextBlockDemoCtl", - "NativeComboBoxDemoCtl", - "NativePasswordBoxDemoCtl", - "NativeTabControlDemoCtl", - "DataGridDemoCtl", - "CheckBoxDemoCtl", - "ListBoxDemoCtl", - "MenuDemoCtl", - "TreeViewDemoCtl", - "BorderDemoCtl", - "RadioButtonDemoCtl", - "NativeScrollViewerDemoCtl", - "BrushDemoCtl", - "SliderDemoCtl", - "GroupBoxDemoCtl", - "ListViewDemoCtl", - "RichTextBoxDemoCtl", - "ToolBarDemoCtl", - "LabelDemoCtl" -}; -var windowList = new List -{ - "CommonWindow", - "CustomNonClientAreaWindow" -}; -var messageList = new List -{ - "LoadShowContent", - "FullSwitch", - "ContributorsView", - "ClearLeftSelected", - "SendChatMessage" -}; -#> -namespace HandyControlDemo.Data -{ - public class MessageToken - { - <#foreach(var item in controlList){#> - public static readonly string <#=item#> = nameof(<#=item#>); - - <#}#> -<#foreach(var item in styleList){#> - public static readonly string <#=item#> = nameof(<#=item#>); - - <#}#> -<#foreach(var item in windowList){#> - public static readonly string <#=item#> = nameof(<#=item#>); - - <#}#> -<#foreach(var item in messageList){#> - public static readonly string <#=item#> = nameof(<#=item#>); - - <#}#> -} -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Data/Model/ChatInfoModel.cs b/Net40/HandyControlDemo_Net40/Data/Model/ChatInfoModel.cs deleted file mode 100644 index 92b4e3a1..00000000 --- a/Net40/HandyControlDemo_Net40/Data/Model/ChatInfoModel.cs +++ /dev/null @@ -1,17 +0,0 @@ -using HandyControl.Data; - -namespace HandyControlDemo.Data -{ - public struct ChatInfoModel - { - public object Message { get; set; } - - public string SenderId { get; set; } - - public ChatRoleType Role { get; set; } - - public ChatMessageType Type { get; set; } - - public object Enclosure { get; set; } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Data/Model/ContributorModel.cs b/Net40/HandyControlDemo_Net40/Data/Model/ContributorModel.cs deleted file mode 100644 index 8fe9934f..00000000 --- a/Net40/HandyControlDemo_Net40/Data/Model/ContributorModel.cs +++ /dev/null @@ -1,12 +0,0 @@ - -namespace HandyControlDemo.Data -{ - public class ContributorModel - { - public string UserName { get; set; } - - public string Link { get; set; } - - public string AvatarUri { get; set; } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Data/Model/CoverViewDemoModel.cs b/Net40/HandyControlDemo_Net40/Data/Model/CoverViewDemoModel.cs deleted file mode 100644 index 6113440b..00000000 --- a/Net40/HandyControlDemo_Net40/Data/Model/CoverViewDemoModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace HandyControlDemo.Data -{ - public class CoverViewDemoModel - { - public string ImgPath { get; set; } - - public string BackgroundToken { get; set; } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Data/Model/DemoDataModel.cs b/Net40/HandyControlDemo_Net40/Data/Model/DemoDataModel.cs deleted file mode 100644 index 9be6e383..00000000 --- a/Net40/HandyControlDemo_Net40/Data/Model/DemoDataModel.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections.Generic; - - -namespace HandyControlDemo.Data -{ - public class DemoDataModel - { - public int Index { get; set; } - - public string Name { get; set; } - - public bool IsSelected { get; set; } - - public string Remark { get; set; } - - public DemoType Type { get; set; } - - public string ImgPath { get; set; } - - public List DataList { get; set; } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Data/Model/StepBarDemoModel.cs b/Net40/HandyControlDemo_Net40/Data/Model/StepBarDemoModel.cs deleted file mode 100644 index 7cd77a20..00000000 --- a/Net40/HandyControlDemo_Net40/Data/Model/StepBarDemoModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace HandyControlDemo.Data -{ - public class StepBarDemoModel - { - public string Header { get; set; } - - public string Content { get; set; } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/HandyControlDemo_Net40.csproj b/Net40/HandyControlDemo_Net40/HandyControlDemo_Net40.csproj deleted file mode 100644 index 0484b107..00000000 --- a/Net40/HandyControlDemo_Net40/HandyControlDemo_Net40.csproj +++ /dev/null @@ -1,863 +0,0 @@ - - - - - Debug - AnyCPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7} - WinExe - HandyControlDemo - HandyControlDemo - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - v4.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - v4.0 - - - Resources\Img\icon.ico - - - - ..\..\packages\CommonServiceLocator.2.0.2\lib\net40\CommonServiceLocator.dll - - - ..\..\packages\MvvmLightLibs.5.4.1\lib\net40\GalaSoft.MvvmLight.dll - - - ..\..\packages\MvvmLightLibs.5.4.1\lib\net40\GalaSoft.MvvmLight.Extras.dll - - - - ..\..\packages\Microsoft.Windows.Shell.3.0.1.0\lib\net40\Microsoft.Windows.Shell.dll - - - ..\..\packages\Newtonsoft.Json.11.0.2\lib\net40\Newtonsoft.Json.dll - - - - - - ..\..\packages\MvvmLightLibs.5.4.1\lib\net40\System.Windows.Interactivity.dll - - - 4.0 - - - - - - - MSBuild:Compile - Designer - - - - - - True - True - MessageToken.tt - - - - - - - - True - True - Lang.resx - - - True - True - Lang.en.resx - - - - - - - - - Avatar.xaml - - - ChatBox.xaml - - - AnimationPathDemoCtl.xaml - - - BadgeDemoCtl.xaml - - - CalendarWithClockDemoCtl.xaml - - - CarouselDemoCtl.xaml - - - ChatBubbleDemoCtl.xaml - - - CirclePanelDemoCtl.xaml - - - ProgressBarDemoCtl.xaml - - - ClockDemoCtl.xaml - - - ColorPickerDemoCtl.xaml - - - ComboBoxDemoCtl.xaml - - - CompareSliderDemoCtl.xaml - - - CoverFlowDemoCtl.xaml - - - CoverViewDemoCtl.xaml - - - DatePickerDemoCtl.xaml - - - DateTimePickerDemoCtl.xaml - - - FlipClockDemoCtl.xaml - - - GotoTopDemoCtl.xaml - - - GravatarDemoCtl.xaml - - - OutlineTextDemoCtl.xaml - - - GifImageDemoCtl.xaml - - - GrowlDemoCtl.xaml - - - ImageBrowserDemoCtl.xaml - - - LoadingDemoCtl.xaml - - - NumericUpDownDemoCtl.xaml - - - PasswordBoxDemoCtl.xaml - - - PreviewSliderDemoCtl.xaml - - - ProgressButtonDemoCtl.xaml - - - RateDemoCtl.xaml - - - ScrollViewerDemoCtl.xaml - - - SearchBarDemoCtl.xaml - - - ShieldDemoCtl.xaml - - - StepBarDemoCtl.xaml - - - TagDemoCtl.xaml - - - TextBoxDemoCtl.xaml - - - TimePickerDemoCtl.xaml - - - TransferDemoCtl.xaml - - - WaterfallPanelDemoCtl.xaml - - - WindowDemoCtl.xaml - - - ContributorsView.xaml - - - NoUserContent.xaml - - - QQGroupView.xaml - - - UnderConstruction.xaml - - - BorderDemoCtl.xaml - - - BrushDemoCtl.xaml - - - ButtonDemoCtl.xaml - - - CalendarDemoCtl.xaml - - - CheckBoxDemoCtl.xaml - - - GroupBoxDemoCtl.xaml - - - LabelDemoCtl.xaml - - - ListViewDemoCtl.xaml - - - NativeComboBoxDemoCtl.xaml - - - DataGridDemoCtl.xaml - - - NativeDatePickerDemoCtl.xaml - - - ExpanderDemoCtl.xaml - - - LeftMainContent.xaml - - - MainContent.xaml - - - PaginationDemoCtl.xaml - - - TimeBarDemoCtl.xaml - - - ListBoxDemoCtl.xaml - - - MenuDemoCtl.xaml - - - NativeScrollViewerDemoCtl.xaml - - - NativeTabControlDemoCtl.xaml - - - NativePasswordBoxDemoCtl.xaml - - - NativeProgressBarDemoCtl.xaml - - - TabControlDemoCtl.xaml - - - RadioButtonDemoCtl.xaml - - - RichTextBoxDemoCtl.xaml - - - SliderDemoCtl.xaml - - - TextBlockDemoCtl.xaml - - - NativeTextBoxDemoCtl.xaml - - - ToggleButtonDemoCtl.xaml - - - ToolBarDemoCtl.xaml - - - TreeViewDemoCtl.xaml - - - - - - - - - - - - - - - AboutWindow.xaml - - - BlurWindow.xaml - - - CommonWindow.xaml - - - CustomNonClientAreaWindow.xaml - - - NoNonClientAreaDragableWindow.xaml - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - XamlIntelliSenseFileGenerator - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - Code - - - - - - - - - - - - - - - - TextTemplatingFileGenerator - MessageToken.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PublicResXFileCodeGenerator - Lang.en.Designer.cs - - - PublicResXFileCodeGenerator - Lang.Designer.cs - Designer - - - - - {dc966e3d-bcff-4652-98cf-070e5494749a} - HandyControl_Net40 - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/MainWindow.xaml b/Net40/HandyControlDemo_Net40/MainWindow.xaml deleted file mode 100644 index 99344426..00000000 --- a/Net40/HandyControlDemo_Net40/MainWindow.xaml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/MainWindow.xaml.cs b/Net40/HandyControlDemo_Net40/MainWindow.xaml.cs deleted file mode 100644 index 1287253a..00000000 --- a/Net40/HandyControlDemo_Net40/MainWindow.xaml.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace HandyControlDemo -{ - public partial class MainWindow - { - public MainWindow() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Properties/AssemblyInfo.cs b/Net40/HandyControlDemo_Net40/Properties/AssemblyInfo.cs deleted file mode 100644 index 0dff4556..00000000 --- a/Net40/HandyControlDemo_Net40/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; -using System.Windows; - -[assembly: AssemblyTitle("HandyControlDemo")] -[assembly: AssemblyDescription("HandyControlDemo")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("HandyControlDemo")] -[assembly: AssemblyCopyright("Copyright © NaBian 2018-2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] -[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] -[assembly: AssemblyVersion("1.5.3.*")] diff --git a/Net40/HandyControlDemo_Net40/Properties/Langs/Lang.Designer.cs b/Net40/HandyControlDemo_Net40/Properties/Langs/Lang.Designer.cs deleted file mode 100644 index 073911db..00000000 --- a/Net40/HandyControlDemo_Net40/Properties/Langs/Lang.Designer.cs +++ /dev/null @@ -1,1251 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace HandyControlDemo.Properties.Langs { - using System; - - - /// - /// 一个强类型的资源类，用于查找本地化的字符串等。 - /// - // 此类是由 StronglyTypedResourceBuilder - // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen - // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Lang { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Lang() { - } - - /// - /// 返回此类使用的缓存的 ResourceManager 实例。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HandyControlDemo.Properties.Langs.Lang", typeof(Lang).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// 使用此强类型资源类，为所有资源查找 - /// 重写当前线程的 CurrentUICulture 属性。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// 查找类似 关于 的本地化字符串。 - /// - public static string About { - get { - return ResourceManager.GetString("About", resourceCulture); - } - } - - /// - /// 查找类似 动画路径 的本地化字符串。 - /// - public static string AnimationPath { - get { - return ResourceManager.GetString("AnimationPath", resourceCulture); - } - } - - /// - /// 查找类似 询问 的本地化字符串。 - /// - public static string Ask { - get { - return ResourceManager.GetString("Ask", resourceCulture); - } - } - - /// - /// 查找类似 标记 的本地化字符串。 - /// - public static string Badge { - get { - return ResourceManager.GetString("Badge", resourceCulture); - } - } - - /// - /// 查找类似 填写基本信息 的本地化字符串。 - /// - public static string BasicInfo { - get { - return ResourceManager.GetString("BasicInfo", resourceCulture); - } - } - - /// - /// 查找类似 博客 的本地化字符串。 - /// - public static string Blog { - get { - return ResourceManager.GetString("Blog", resourceCulture); - } - } - - /// - /// 查找类似 边框 的本地化字符串。 - /// - public static string Border1 { - get { - return ResourceManager.GetString("Border1", resourceCulture); - } - } - - /// - /// 查找类似 画刷 的本地化字符串。 - /// - public static string Brush { - get { - return ResourceManager.GetString("Brush", resourceCulture); - } - } - - /// - /// 查找类似 按钮 的本地化字符串。 - /// - public static string Button { - get { - return ResourceManager.GetString("Button", resourceCulture); - } - } - - /// - /// 查找类似 透明按钮 的本地化字符串。 - /// - public static string ButtonOpacity { - get { - return ResourceManager.GetString("ButtonOpacity", resourceCulture); - } - } - - /// - /// 查找类似 日历 的本地化字符串。 - /// - public static string Calendar { - get { - return ResourceManager.GetString("Calendar", resourceCulture); - } - } - - /// - /// 查找类似 带时钟的日历 的本地化字符串。 - /// - public static string CalendarWithClock { - get { - return ResourceManager.GetString("CalendarWithClock", resourceCulture); - } - } - - /// - /// 查找类似 轮播 的本地化字符串。 - /// - public static string Carousel { - get { - return ResourceManager.GetString("Carousel", resourceCulture); - } - } - - /// - /// 查找类似 是否重启以更改语言？ 的本地化字符串。 - /// - public static string ChangeLangAsk { - get { - return ResourceManager.GetString("ChangeLangAsk", resourceCulture); - } - } - - /// - /// 查找类似 对话气泡 的本地化字符串。 - /// - public static string ChatBubble { - get { - return ResourceManager.GetString("ChatBubble", resourceCulture); - } - } - - /// - /// 查找类似 讨论室 的本地化字符串。 - /// - public static string Chatroom { - get { - return ResourceManager.GetString("Chatroom", resourceCulture); - } - } - - /// - /// 查找类似 复选框 的本地化字符串。 - /// - public static string CheckBox { - get { - return ResourceManager.GetString("CheckBox", resourceCulture); - } - } - - /// - /// 查找类似 圆形布局 的本地化字符串。 - /// - public static string CirclePanel { - get { - return ResourceManager.GetString("CirclePanel", resourceCulture); - } - } - - /// - /// 查找类似 清空 的本地化字符串。 - /// - public static string Clear { - get { - return ResourceManager.GetString("Clear", resourceCulture); - } - } - - /// - /// 查找类似 时钟 的本地化字符串。 - /// - public static string Clock { - get { - return ResourceManager.GetString("Clock", resourceCulture); - } - } - - /// - /// 查找类似 颜色拾取器 的本地化字符串。 - /// - public static string ColorPicker { - get { - return ResourceManager.GetString("ColorPicker", resourceCulture); - } - } - - /// - /// 查找类似 组合框 的本地化字符串。 - /// - public static string ComboBox { - get { - return ResourceManager.GetString("ComboBox", resourceCulture); - } - } - - /// - /// 查找类似 敬请期待 的本地化字符串。 - /// - public static string ComingSoon { - get { - return ResourceManager.GetString("ComingSoon", resourceCulture); - } - } - - /// - /// 查找类似 评论 的本地化字符串。 - /// - public static string Comment { - get { - return ResourceManager.GetString("Comment", resourceCulture); - } - } - - /// - /// 查找类似 一般 的本地化字符串。 - /// - public static string Common { - get { - return ResourceManager.GetString("Common", resourceCulture); - } - } - - /// - /// 查找类似 对比滑块 的本地化字符串。 - /// - public static string CompareSlider { - get { - return ResourceManager.GetString("CompareSlider", resourceCulture); - } - } - - /// - /// 查找类似 完成 的本地化字符串。 - /// - public static string Complete { - get { - return ResourceManager.GetString("Complete", resourceCulture); - } - } - - /// - /// 查找类似 这是内容 的本地化字符串。 - /// - public static string ContentDemoStr { - get { - return ResourceManager.GetString("ContentDemoStr", resourceCulture); - } - } - - /// - /// 查找类似 贡献者 的本地化字符串。 - /// - public static string Contributors { - get { - return ResourceManager.GetString("Contributors", resourceCulture); - } - } - - /// - /// 查找类似 控件 的本地化字符串。 - /// - public static string Controls { - get { - return ResourceManager.GetString("Controls", resourceCulture); - } - } - - /// - /// 查找类似 封面流 的本地化字符串。 - /// - public static string CoverFlow { - get { - return ResourceManager.GetString("CoverFlow", resourceCulture); - } - } - - /// - /// 查找类似 封面视图 的本地化字符串。 - /// - public static string CoverView { - get { - return ResourceManager.GetString("CoverView", resourceCulture); - } - } - - /// - /// 查找类似 危险 的本地化字符串。 - /// - public static string Danger { - get { - return ResourceManager.GetString("Danger", resourceCulture); - } - } - - /// - /// 查找类似 数据表格 的本地化字符串。 - /// - public static string DataGrid { - get { - return ResourceManager.GetString("DataGrid", resourceCulture); - } - } - - /// - /// 查找类似 日期选择器 的本地化字符串。 - /// - public static string DatePicker { - get { - return ResourceManager.GetString("DatePicker", resourceCulture); - } - } - - /// - /// 查找类似 日期时间选择器 的本地化字符串。 - /// - public static string DateTimePicker { - get { - return ResourceManager.GetString("DateTimePicker", resourceCulture); - } - } - - /// - /// 查找类似 默认 的本地化字符串。 - /// - public static string Default { - get { - return ResourceManager.GetString("Default", resourceCulture); - } - } - - /// - /// 查找类似 在这里拖拽 的本地化字符串。 - /// - public static string DragHere { - get { - return ResourceManager.GetString("DragHere", resourceCulture); - } - } - - /// - /// 查找类似 邮箱 的本地化字符串。 - /// - public static string Email { - get { - return ResourceManager.GetString("Email", resourceCulture); - } - } - - /// - /// 查找类似 错误 的本地化字符串。 - /// - public static string Error { - get { - return ResourceManager.GetString("Error", resourceCulture); - } - } - - /// - /// 查找类似 展开框 的本地化字符串。 - /// - public static string Expander { - get { - return ResourceManager.GetString("Expander", resourceCulture); - } - } - - /// - /// 查找类似 严重 的本地化字符串。 - /// - public static string Fatal { - get { - return ResourceManager.GetString("Fatal", resourceCulture); - } - } - - /// - /// 查找类似 翻页时钟 的本地化字符串。 - /// - public static string FlipClock { - get { - return ResourceManager.GetString("FlipClock", resourceCulture); - } - } - - /// - /// 查找类似 Gif图片 的本地化字符串。 - /// - public static string GifImage { - get { - return ResourceManager.GetString("GifImage", resourceCulture); - } - } - - /// - /// 查找类似 回到顶部 的本地化字符串。 - /// - public static string GotoTop { - get { - return ResourceManager.GetString("GotoTop", resourceCulture); - } - } - - /// - /// 查找类似 头像 的本地化字符串。 - /// - public static string Gravatar { - get { - return ResourceManager.GetString("Gravatar", resourceCulture); - } - } - - /// - /// 查找类似 分组框 的本地化字符串。 - /// - public static string GroupBox { - get { - return ResourceManager.GetString("GroupBox", resourceCulture); - } - } - - /// - /// 查找类似 组数 的本地化字符串。 - /// - public static string Groups { - get { - return ResourceManager.GetString("Groups", resourceCulture); - } - } - - /// - /// 查找类似 信息通知 的本地化字符串。 - /// - public static string Growl { - get { - return ResourceManager.GetString("Growl", resourceCulture); - } - } - - /// - /// 查找类似 检测到有新版本！是否更新？ 的本地化字符串。 - /// - public static string GrowlAsk { - get { - return ResourceManager.GetString("GrowlAsk", resourceCulture); - } - } - - /// - /// 查找类似 连接失败，请检查网络！ 的本地化字符串。 - /// - public static string GrowlError { - get { - return ResourceManager.GetString("GrowlError", resourceCulture); - } - } - - /// - /// 查找类似 程序已崩溃~~~ 的本地化字符串。 - /// - public static string GrowlFatal { - get { - return ResourceManager.GetString("GrowlFatal", resourceCulture); - } - } - - /// - /// 查找类似 今天的天气不错~~~ 的本地化字符串。 - /// - public static string GrowlInfo { - get { - return ResourceManager.GetString("GrowlInfo", resourceCulture); - } - } - - /// - /// 查找类似 文件保存成功！ 的本地化字符串。 - /// - public static string GrowlSuccess { - get { - return ResourceManager.GetString("GrowlSuccess", resourceCulture); - } - } - - /// - /// 查找类似 磁盘空间快要满了！ 的本地化字符串。 - /// - public static string GrowlWarning { - get { - return ResourceManager.GetString("GrowlWarning", resourceCulture); - } - } - - /// - /// 查找类似 忽略 的本地化字符串。 - /// - public static string Ignore { - get { - return ResourceManager.GetString("Ignore", resourceCulture); - } - } - - /// - /// 查找类似 图片浏览器 的本地化字符串。 - /// - public static string ImageBrowser { - get { - return ResourceManager.GetString("ImageBrowser", resourceCulture); - } - } - - /// - /// 查找类似 索引 的本地化字符串。 - /// - public static string Index { - get { - return ResourceManager.GetString("Index", resourceCulture); - } - } - - /// - /// 查找类似 信息 的本地化字符串。 - /// - public static string Info { - get { - return ResourceManager.GetString("Info", resourceCulture); - } - } - - /// - /// 查找类似 不是手机号码 的本地化字符串。 - /// - public static string IsNotPhone { - get { - return ResourceManager.GetString("IsNotPhone", resourceCulture); - } - } - - /// - /// 查找类似 标签 的本地化字符串。 - /// - public static string Label { - get { - return ResourceManager.GetString("Label", resourceCulture); - } - } - - /// - /// 查找类似 列表框 的本地化字符串。 - /// - public static string ListBox { - get { - return ResourceManager.GetString("ListBox", resourceCulture); - } - } - - /// - /// 查找类似 列表视图 的本地化字符串。 - /// - public static string ListView { - get { - return ResourceManager.GetString("ListView", resourceCulture); - } - } - - /// - /// 查找类似 加载条 的本地化字符串。 - /// - public static string Loading { - get { - return ResourceManager.GetString("Loading", resourceCulture); - } - } - - /// - /// 查找类似 菜单 的本地化字符串。 - /// - public static string Menu { - get { - return ResourceManager.GetString("Menu", resourceCulture); - } - } - - /// - /// 查找类似 消息框 的本地化字符串。 - /// - public static string MessageBox { - get { - return ResourceManager.GetString("MessageBox", resourceCulture); - } - } - - /// - /// 查找类似 名称 的本地化字符串。 - /// - public static string Name { - get { - return ResourceManager.GetString("Name", resourceCulture); - } - } - - /// - /// 查找类似 下一步 的本地化字符串。 - /// - public static string Next { - get { - return ResourceManager.GetString("Next", resourceCulture); - } - } - - /// - /// 查找类似 数值选择控件 的本地化字符串。 - /// - public static string NumericUpDown { - get { - return ResourceManager.GetString("NumericUpDown", resourceCulture); - } - } - - /// - /// 查找类似 点击打开背景模糊窗口 的本地化字符串。 - /// - public static string OpenBlurWindow { - get { - return ResourceManager.GetString("OpenBlurWindow", resourceCulture); - } - } - - /// - /// 查找类似 点击打开常规窗口 的本地化字符串。 - /// - public static string OpenCommonWindow { - get { - return ResourceManager.GetString("OpenCommonWindow", resourceCulture); - } - } - - /// - /// 查找类似 点击打开自定义内容窗口 的本地化字符串。 - /// - public static string OpenCustomContentWindow { - get { - return ResourceManager.GetString("OpenCustomContentWindow", resourceCulture); - } - } - - /// - /// 查找类似 点击打开自定义消息窗口 的本地化字符串。 - /// - public static string OpenCustomMessageWindow { - get { - return ResourceManager.GetString("OpenCustomMessageWindow", resourceCulture); - } - } - - /// - /// 查找类似 点击打开自定义非客户端区域窗口 的本地化字符串。 - /// - public static string OpenCustomNonClientAreaWindow { - get { - return ResourceManager.GetString("OpenCustomNonClientAreaWindow", resourceCulture); - } - } - - /// - /// 查找类似 点击打开图片浏览器 的本地化字符串。 - /// - public static string OpenImageBrowser { - get { - return ResourceManager.GetString("OpenImageBrowser", resourceCulture); - } - } - - /// - /// 查找类似 点击打开消息窗口 的本地化字符串。 - /// - public static string OpenMessageWindow { - get { - return ResourceManager.GetString("OpenMessageWindow", resourceCulture); - } - } - - /// - /// 查找类似 点击打开鼠标跟随窗口 的本地化字符串。 - /// - public static string OpenMouseFollowWindow { - get { - return ResourceManager.GetString("OpenMouseFollowWindow", resourceCulture); - } - } - - /// - /// 查找类似 打开无非客户端区域可拖拽窗口 的本地化字符串。 - /// - public static string OpenNoNonClientAreaDragableWindow { - get { - return ResourceManager.GetString("OpenNoNonClientAreaDragableWindow", resourceCulture); - } - } - - /// - /// 查找类似 轮廓文本 的本地化字符串。 - /// - public static string OutlineText { - get { - return ResourceManager.GetString("OutlineText", resourceCulture); - } - } - - /// - /// 查找类似 页码条 的本地化字符串。 - /// - public static string Pagination { - get { - return ResourceManager.GetString("Pagination", resourceCulture); - } - } - - /// - /// 查找类似 密码框 的本地化字符串。 - /// - public static string PasswordBox { - get { - return ResourceManager.GetString("PasswordBox", resourceCulture); - } - } - - /// - /// 查找类似 请输入内容 的本地化字符串。 - /// - public static string PlsEnterContent { - get { - return ResourceManager.GetString("PlsEnterContent", resourceCulture); - } - } - - /// - /// 查找类似 请输入邮箱 的本地化字符串。 - /// - public static string PlsEnterEmail { - get { - return ResourceManager.GetString("PlsEnterEmail", resourceCulture); - } - } - - /// - /// 查找类似 请输入关键字 的本地化字符串。 - /// - public static string PlsEnterKey { - get { - return ResourceManager.GetString("PlsEnterKey", resourceCulture); - } - } - - /// - /// 查找类似 上一步 的本地化字符串。 - /// - public static string Prev { - get { - return ResourceManager.GetString("Prev", resourceCulture); - } - } - - /// - /// 查找类似 预览滑块 的本地化字符串。 - /// - public static string PreviewSlider { - get { - return ResourceManager.GetString("PreviewSlider", resourceCulture); - } - } - - /// - /// 查找类似 主要 的本地化字符串。 - /// - public static string Primary { - get { - return ResourceManager.GetString("Primary", resourceCulture); - } - } - - /// - /// 查找类似 进度条 的本地化字符串。 - /// - public static string ProgressBar { - get { - return ResourceManager.GetString("ProgressBar", resourceCulture); - } - } - - /// - /// 查找类似 进度按钮 的本地化字符串。 - /// - public static string ProgressButton { - get { - return ResourceManager.GetString("ProgressButton", resourceCulture); - } - } - - /// - /// 查找类似 按住说话 的本地化字符串。 - /// - public static string PushToTalk { - get { - return ResourceManager.GetString("PushToTalk", resourceCulture); - } - } - - /// - /// 查找类似 QQ群 的本地化字符串。 - /// - public static string QQGroup { - get { - return ResourceManager.GetString("QQGroup", resourceCulture); - } - } - - /// - /// 查找类似 单选按钮 的本地化字符串。 - /// - public static string RadioButton { - get { - return ResourceManager.GetString("RadioButton", resourceCulture); - } - } - - /// - /// 查找类似 评分 的本地化字符串。 - /// - public static string Rate { - get { - return ResourceManager.GetString("Rate", resourceCulture); - } - } - - /// - /// 查找类似 注册 的本地化字符串。 - /// - public static string Register { - get { - return ResourceManager.GetString("Register", resourceCulture); - } - } - - /// - /// 查找类似 备注 的本地化字符串。 - /// - public static string Remark { - get { - return ResourceManager.GetString("Remark", resourceCulture); - } - } - - /// - /// 查找类似 回复 的本地化字符串。 - /// - public static string Reply { - get { - return ResourceManager.GetString("Reply", resourceCulture); - } - } - - /// - /// 查找类似 代码仓库 的本地化字符串。 - /// - public static string Repository { - get { - return ResourceManager.GetString("Repository", resourceCulture); - } - } - - /// - /// 查找类似 富文本框 的本地化字符串。 - /// - public static string RichTextBox { - get { - return ResourceManager.GetString("RichTextBox", resourceCulture); - } - } - - /// - /// 查找类似 在这里右击 的本地化字符串。 - /// - public static string RightClickHere { - get { - return ResourceManager.GetString("RightClickHere", resourceCulture); - } - } - - /// - /// 查找类似 滚动视图 的本地化字符串。 - /// - public static string ScrollViewer { - get { - return ResourceManager.GetString("ScrollViewer", resourceCulture); - } - } - - /// - /// 查找类似 搜索栏 的本地化字符串。 - /// - public static string SearchBar { - get { - return ResourceManager.GetString("SearchBar", resourceCulture); - } - } - - /// - /// 查找类似 秒 的本地化字符串。 - /// - public static string Second { - get { - return ResourceManager.GetString("Second", resourceCulture); - } - } - - /// - /// 查找类似 选中 的本地化字符串。 - /// - public static string Selected { - get { - return ResourceManager.GetString("Selected", resourceCulture); - } - } - - /// - /// 查找类似 徽章 的本地化字符串。 - /// - public static string Shield { - get { - return ResourceManager.GetString("Shield", resourceCulture); - } - } - - /// - /// 查找类似 显示行号 的本地化字符串。 - /// - public static string ShowRowNumber { - get { - return ResourceManager.GetString("ShowRowNumber", resourceCulture); - } - } - - /// - /// 查找类似 滑块 的本地化字符串。 - /// - public static string Slider { - get { - return ResourceManager.GetString("Slider", resourceCulture); - } - } - - /// - /// 查找类似 步骤 的本地化字符串。 - /// - public static string Step { - get { - return ResourceManager.GetString("Step", resourceCulture); - } - } - - /// - /// 查找类似 步骤条 的本地化字符串。 - /// - public static string StepBar { - get { - return ResourceManager.GetString("StepBar", resourceCulture); - } - } - - /// - /// 查找类似 样式模板 的本地化字符串。 - /// - public static string Styles { - get { - return ResourceManager.GetString("Styles", resourceCulture); - } - } - - /// - /// 查找类似 子标题 的本地化字符串。 - /// - public static string SubTitle { - get { - return ResourceManager.GetString("SubTitle", resourceCulture); - } - } - - /// - /// 查找类似 成功 的本地化字符串。 - /// - public static string Success { - get { - return ResourceManager.GetString("Success", resourceCulture); - } - } - - /// - /// 查找类似 选项卡控件 的本地化字符串。 - /// - public static string TabControl { - get { - return ResourceManager.GetString("TabControl", resourceCulture); - } - } - - /// - /// 查找类似 标签 的本地化字符串。 - /// - public static string Tag { - get { - return ResourceManager.GetString("Tag", resourceCulture); - } - } - - /// - /// 查找类似 正文 的本地化字符串。 - /// - public static string Text { - get { - return ResourceManager.GetString("Text", resourceCulture); - } - } - - /// - /// 查找类似 文本块 的本地化字符串。 - /// - public static string TextBlock { - get { - return ResourceManager.GetString("TextBlock", resourceCulture); - } - } - - /// - /// 查找类似 文本框 的本地化字符串。 - /// - public static string TextBox { - get { - return ResourceManager.GetString("TextBox", resourceCulture); - } - } - - /// - /// 查找类似 时间条 的本地化字符串。 - /// - public static string TimeBar { - get { - return ResourceManager.GetString("TimeBar", resourceCulture); - } - } - - /// - /// 查找类似 时间选择器 的本地化字符串。 - /// - public static string TimePicker { - get { - return ResourceManager.GetString("TimePicker", resourceCulture); - } - } - - /// - /// 查找类似 标题 的本地化字符串。 - /// - public static string Title { - get { - return ResourceManager.GetString("Title", resourceCulture); - } - } - - /// - /// 查找类似 这是标题 的本地化字符串。 - /// - public static string TitleDemoStr1 { - get { - return ResourceManager.GetString("TitleDemoStr1", resourceCulture); - } - } - - /// - /// 查找类似 此项必填 的本地化字符串。 - /// - public static string TitleDemoStr2 { - get { - return ResourceManager.GetString("TitleDemoStr2", resourceCulture); - } - } - - /// - /// 查找类似 标题在左侧 的本地化字符串。 - /// - public static string TitleDemoStr3 { - get { - return ResourceManager.GetString("TitleDemoStr3", resourceCulture); - } - } - - /// - /// 查找类似 切换按钮 的本地化字符串。 - /// - public static string ToggleButton { - get { - return ResourceManager.GetString("ToggleButton", resourceCulture); - } - } - - /// - /// 查找类似 工具条 的本地化字符串。 - /// - public static string ToolBar { - get { - return ResourceManager.GetString("ToolBar", resourceCulture); - } - } - - /// - /// 查找类似 穿梭框 的本地化字符串。 - /// - public static string Transfer { - get { - return ResourceManager.GetString("Transfer", resourceCulture); - } - } - - /// - /// 查找类似 树视图 的本地化字符串。 - /// - public static string TreeView { - get { - return ResourceManager.GetString("TreeView", resourceCulture); - } - } - - /// - /// 查找类似 类型 的本地化字符串。 - /// - public static string Type { - get { - return ResourceManager.GetString("Type", resourceCulture); - } - } - - /// - /// 查找类似 上传文件 的本地化字符串。 - /// - public static string UploadFile { - get { - return ResourceManager.GetString("UploadFile", resourceCulture); - } - } - - /// - /// 查找类似 上传;上传中 的本地化字符串。 - /// - public static string UploadStr { - get { - return ResourceManager.GetString("UploadStr", resourceCulture); - } - } - - /// - /// 查找类似 警告 的本地化字符串。 - /// - public static string Warning { - get { - return ResourceManager.GetString("Warning", resourceCulture); - } - } - - /// - /// 查找类似 瀑布流 的本地化字符串。 - /// - public static string WaterfallPanel { - get { - return ResourceManager.GetString("WaterfallPanel", resourceCulture); - } - } - - /// - /// 查找类似 窗口 的本地化字符串。 - /// - public static string Window { - get { - return ResourceManager.GetString("Window", resourceCulture); - } - } - } -} diff --git a/Net40/HandyControlDemo_Net40/Properties/Langs/Lang.en.Designer.cs b/Net40/HandyControlDemo_Net40/Properties/Langs/Lang.en.Designer.cs deleted file mode 100644 index e69de29b..00000000 diff --git a/Net40/HandyControlDemo_Net40/Properties/Langs/Lang.en.resx b/Net40/HandyControlDemo_Net40/Properties/Langs/Lang.en.resx deleted file mode 100644 index b2bc610b..00000000 --- a/Net40/HandyControlDemo_Net40/Properties/Langs/Lang.en.resx +++ /dev/null @@ -1,516 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Controls - - - Styles - - - Growl - - - It's a nice day today~~~ - - - File saved successfully! - - - Disk space is running out! - - - Connection failed. please check your network! - - - The program has crashed~~~ - - - A new version has been detected!Do you want to update? - - - Loading - - - ImageBrowser - - - ColorPicker - - - Carousel - - - CompareSlider - - - TimeBar - - - Expander - - - Pagination - - - Click to open image browser - - - ProgressBar - - - AnimationPath - - - Button - - - ToggleButton - - - TabControl - - - CheckBox - - - TextBlock - - - Default - - - Primary - - - Success - - - Info - - - Warning - - - Danger - - - Opacity button - - - Title - - - StepBar - - - Prev - - - Next - - - Register - - - Fill in the basic information - - - Upload file - - - Complete - - - Clock - - - Calendar - - - DatePicker - - - TimePicker - - - TextBox - - - This is the content - - - This is the title - - - This item must be filled in - - - Please enter content - - - The title is on the left - - - Text - - - Subtitle - - - PasswordBox - - - CirclePanel - - - ComboBox - - - NumericUpDown - - - DataGrid - - - Index - - - Name - - - Type - - - Remark - - - Selected - - - ListBox - - - TreeView - - - Border - - - ScrollViewer - - - Window - - - Menu - - - Right click here - - - RadioButton - - - open message window - - - open common window - - - open custom Non-client Area window - - - open mouse follow window - - - open custom content window - - - Ignore - - - Error - - - Ask - - - Fatal - - - Clear - - - Whether to restart to change the language? - - - About - - - Repository - - - Email - - - Chatroom - - - Blog - - - Brush - - - PreviewSlider - - - Contributors - - - Slider - - - It's not a phone number - - - please enter email - - - Step - - - CalendarWithClock - - - DateTimePicker - - - GroupBox - - - ListView - - - RichTextBox - - - ToolBar - - - Common - - - ShowRowNumber - - - SearchBar - - - Tag - - - GifImage - - - OutlineText - - - QQ Group - - - FlipClock - - - open blur window - - - Rate - - - Shield - - - WaterfallPanel - - - Groups - - - CoverView - - - CoverFlow - - - Please input a keyword - - - open no Non-client Area dragable window - - - Drag here - - - MessageBox - - - ProgressButton - - - Upload;Uploading - - - open custom message window - - - Transfer - - - ChatBubble - - - Push to talk - - - Sec - - - Label - - - GotoTop - - - Badge - - - Gravatar - - - ComingSoon - - - Comment - - - Reply - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Properties/Langs/Lang.resx b/Net40/HandyControlDemo_Net40/Properties/Langs/Lang.resx deleted file mode 100644 index 4bfbd4a1..00000000 --- a/Net40/HandyControlDemo_Net40/Properties/Langs/Lang.resx +++ /dev/null @@ -1,516 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 控件 - - - 样式模板 - - - 信息通知 - - - 今天的天气不错~~~ - - - 文件保存成功！ - - - 磁盘空间快要满了！ - - - 连接失败，请检查网络！ - - - 程序已崩溃~~~ - - - 检测到有新版本！是否更新？ - - - 加载条 - - - 图片浏览器 - - - 颜色拾取器 - - - 轮播 - - - 对比滑块 - - - 时间条 - - - 展开框 - - - 页码条 - - - 点击打开图片浏览器 - - - 进度条 - - - 动画路径 - - - 按钮 - - - 切换按钮 - - - 选项卡控件 - - - 复选框 - - - 文本块 - - - 默认 - - - 主要 - - - 成功 - - - 信息 - - - 警告 - - - 危险 - - - 透明按钮 - - - 标题 - - - 步骤条 - - - 上一步 - - - 下一步 - - - 注册 - - - 填写基本信息 - - - 上传文件 - - - 完成 - - - 时钟 - - - 日历 - - - 日期选择器 - - - 时间选择器 - - - 文本框 - - - 这是内容 - - - 这是标题 - - - 此项必填 - - - 请输入内容 - - - 标题在左侧 - - - 正文 - - - 子标题 - - - 密码框 - - - 圆形布局 - - - 组合框 - - - 数值选择控件 - - - 数据表格 - - - 索引 - - - 名称 - - - 类型 - - - 备注 - - - 选中 - - - 列表框 - - - 树视图 - - - 边框 - - - 滚动视图 - - - 窗口 - - - 菜单 - - - 在这里右击 - - - 单选按钮 - - - 点击打开消息窗口 - - - 点击打开常规窗口 - - - 点击打开自定义非客户端区域窗口 - - - 点击打开鼠标跟随窗口 - - - 点击打开自定义内容窗口 - - - 忽略 - - - 错误 - - - 询问 - - - 严重 - - - 清空 - - - 是否重启以更改语言？ - - - 关于 - - - 代码仓库 - - - 邮箱 - - - 讨论室 - - - 博客 - - - 画刷 - - - 预览滑块 - - - 贡献者 - - - 滑块 - - - 不是手机号码 - - - 请输入邮箱 - - - 步骤 - - - 带时钟的日历 - - - 日期时间选择器 - - - 分组框 - - - 列表视图 - - - 富文本框 - - - 工具条 - - - 一般 - - - 显示行号 - - - 搜索栏 - - - 标签 - - - Gif图片 - - - 轮廓文本 - - - QQ群 - - - 翻页时钟 - - - 点击打开背景模糊窗口 - - - 评分 - - - 徽章 - - - 瀑布流 - - - 组数 - - - 封面视图 - - - 封面流 - - - 请输入关键字 - - - 打开无非客户端区域可拖拽窗口 - - - 在这里拖拽 - - - 消息框 - - - 进度按钮 - - - 上传;上传中 - - - 点击打开自定义消息窗口 - - - 穿梭框 - - - 对话气泡 - - - 按住说话 - - - 秒 - - - 标签 - - - 回到顶部 - - - 标记 - - - 头像 - - - 敬请期待 - - - 评论 - - - 回复 - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/1.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/1.jpg deleted file mode 100644 index 99de4db2..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/1.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/2.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/2.jpg deleted file mode 100644 index 8ed37abf..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/2.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/3.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/3.jpg deleted file mode 100644 index 2ca0aa4a..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/3.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/4.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/4.jpg deleted file mode 100644 index 0c219afe..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/4.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/5.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/5.jpg deleted file mode 100644 index 1b633ff8..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/5.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Album/1.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Album/1.jpg deleted file mode 100644 index d2130c4b..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Album/1.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Album/10.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Album/10.jpg deleted file mode 100644 index 198ed9ae..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Album/10.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Album/2.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Album/2.jpg deleted file mode 100644 index aac4ecda..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Album/2.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Album/3.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Album/3.jpg deleted file mode 100644 index 535b7255..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Album/3.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Album/4.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Album/4.jpg deleted file mode 100644 index 575fa6dd..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Album/4.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Album/5.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Album/5.jpg deleted file mode 100644 index fc2960ef..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Album/5.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Album/6.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Album/6.jpg deleted file mode 100644 index 0435b4fe..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Album/6.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Album/7.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Album/7.jpg deleted file mode 100644 index bbfa016d..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Album/7.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Album/8.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Album/8.jpg deleted file mode 100644 index bea683db..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Album/8.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Album/9.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Album/9.jpg deleted file mode 100644 index 64dbad18..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Album/9.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar1.png b/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar1.png deleted file mode 100644 index 444207f7..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar1.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar2.png b/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar2.png deleted file mode 100644 index 69f3002d..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar2.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar3.png b/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar3.png deleted file mode 100644 index 8fbe9fc2..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar3.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar4.png b/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar4.png deleted file mode 100644 index aae79101..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar4.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar5.png b/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar5.png deleted file mode 100644 index 1ed49ed7..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar5.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar6.png b/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar6.png deleted file mode 100644 index d0c9f90e..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Avatar/avatar6.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Chat/chat_back1.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Chat/chat_back1.jpg deleted file mode 100644 index 929b4d63..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Chat/chat_back1.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Chat/chat_back2.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/Chat/chat_back2.jpg deleted file mode 100644 index c0938954..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Chat/chat_back2.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Flag/cn.png b/Net40/HandyControlDemo_Net40/Resources/Img/Flag/cn.png deleted file mode 100644 index 63267f70..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Flag/cn.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/Flag/en.png b/Net40/HandyControlDemo_Net40/Resources/Img/Flag/en.png deleted file mode 100644 index 18425bc6..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/Flag/en.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Animation_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Animation_16x.png deleted file mode 100644 index e4b21749..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Animation_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/BorderElement_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/BorderElement_16x.png deleted file mode 100644 index d1d7331a..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/BorderElement_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Brush_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Brush_16x.png deleted file mode 100644 index 5da71961..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Brush_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Bubble_16xLG.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Bubble_16xLG.png deleted file mode 100644 index c73fba37..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Bubble_16xLG.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ButtonClick_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ButtonClick_16x.png deleted file mode 100644 index b2e0d5cd..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ButtonClick_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Calendar_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Calendar_16x.png deleted file mode 100644 index a2dbfeaa..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Calendar_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Carousel_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Carousel_16x.png deleted file mode 100644 index 670eab97..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Carousel_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/CheckBox_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/CheckBox_16x.png deleted file mode 100644 index 06044dac..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/CheckBox_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ColorPalette_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ColorPalette_16x.png deleted file mode 100644 index 7ca52621..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ColorPalette_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ColorWheel_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ColorWheel_16x.png deleted file mode 100644 index d438bd04..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ColorWheel_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ComboBox_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ComboBox_16x.png deleted file mode 100644 index 24eb2a84..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ComboBox_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ContextMenu_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ContextMenu_16x.png deleted file mode 100644 index 18fad3e0..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ContextMenu_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DataGrid_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DataGrid_16x.png deleted file mode 100644 index 49071e13..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DataGrid_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DatePicker_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DatePicker_16x.png deleted file mode 100644 index 53418b70..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DatePicker_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DetailDataView_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DetailDataView_16x.png deleted file mode 100644 index 64f2bcd0..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DetailDataView_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DotLarge_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DotLarge_16x.png deleted file mode 100644 index c588ac01..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/DotLarge_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Expander_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Expander_16x.png deleted file mode 100644 index da4dead8..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Expander_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/FlipVertical_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/FlipVertical_16x.png deleted file mode 100644 index 07c890cd..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/FlipVertical_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Flow_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Flow_16x.png deleted file mode 100644 index 08c388d6..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Flow_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/GoToTop_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/GoToTop_16x.png deleted file mode 100644 index 2b3d22a9..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/GoToTop_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/GroupBox_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/GroupBox_16x.png deleted file mode 100644 index fe5d1ce5..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/GroupBox_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/HoverMenu_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/HoverMenu_16x.png deleted file mode 100644 index 4b2c276e..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/HoverMenu_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ImageBrowser_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ImageBrowser_16x.png deleted file mode 100644 index 5a3088ff..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ImageBrowser_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Label_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Label_16x.png deleted file mode 100644 index 0b8cfa77..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Label_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/LinearCarousel_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/LinearCarousel_16x.png deleted file mode 100644 index c52a21c2..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/LinearCarousel_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ListBox_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ListBox_16x.png deleted file mode 100644 index 4bde75e3..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ListBox_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ListView_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ListView_16x.png deleted file mode 100644 index acb4e747..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ListView_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Loading_Blue_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Loading_Blue_16x.png deleted file mode 100644 index 6f48361f..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Loading_Blue_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Message_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Message_16x.png deleted file mode 100644 index 7d06b199..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Message_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/NumericListBox_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/NumericListBox_16x.png deleted file mode 100644 index 455b6a23..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/NumericListBox_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Paginator_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Paginator_16x.png deleted file mode 100644 index 88a22536..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Paginator_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Panel_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Panel_16x.png deleted file mode 100644 index 5c87bed2..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Panel_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/PasswordBox_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/PasswordBox_16x.png deleted file mode 100644 index 8f1bc5ed..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/PasswordBox_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Path_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Path_16x.png deleted file mode 100644 index bf46dd2f..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Path_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ProgressBar_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ProgressBar_16x.png deleted file mode 100644 index d3e89853..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ProgressBar_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ProgressButton_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ProgressButton_16x.png deleted file mode 100644 index ad7026ac..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ProgressButton_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/RadioButton_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/RadioButton_16x.png deleted file mode 100644 index 6f118079..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/RadioButton_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/RichTextBox_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/RichTextBox_16x.png deleted file mode 100644 index c8770340..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/RichTextBox_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ScrollBox_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ScrollBox_16x.png deleted file mode 100644 index 0ba07632..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ScrollBox_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Search_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Search_16x.png deleted file mode 100644 index 042a1c42..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Search_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Shield_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Shield_16x.png deleted file mode 100644 index 9b30ef16..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Shield_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Slider_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Slider_16x.png deleted file mode 100644 index 268fe222..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Slider_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/SortAscending_grey_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/SortAscending_grey_16x.png deleted file mode 100644 index 150a8703..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/SortAscending_grey_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/SplitterControl_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/SplitterControl_16x.png deleted file mode 100644 index a059b084..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/SplitterControl_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Star.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Star.png deleted file mode 100644 index da69341b..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Star.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TabPage_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TabPage_16x.png deleted file mode 100644 index 2bcb7fce..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TabPage_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Tag_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Tag_16x.png deleted file mode 100644 index 08110ef5..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Tag_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TextBlock_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TextBlock_16x.png deleted file mode 100644 index 768924b9..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TextBlock_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TextBox_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TextBox_16x.png deleted file mode 100644 index 503a808b..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TextBox_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TimePicker_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TimePicker_16x.png deleted file mode 100644 index 244c6fdd..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TimePicker_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Time_color_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Time_color_16x.png deleted file mode 100644 index 42f08e1c..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Time_color_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Timeline_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Timeline_16x.png deleted file mode 100644 index 793d5011..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Timeline_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Toggle_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Toggle_16x.png deleted file mode 100644 index 70f202dc..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Toggle_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ToolBar_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ToolBar_16x.png deleted file mode 100644 index bb4d2459..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/ToolBar_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Transfer_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Transfer_16x.png deleted file mode 100644 index f7c9dac1..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/Transfer_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TreeView_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TreeView_16x.png deleted file mode 100644 index e944d293..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/TreeView_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/User_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/User_16x.png deleted file mode 100644 index 391e91e4..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/User_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/WindowsForm_16x.png b/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/WindowsForm_16x.png deleted file mode 100644 index 764adcb2..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/LeftMainContent/WindowsForm_16x.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/b1.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/b1.jpg deleted file mode 100644 index 5675b30d..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/b1.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/b2.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/b2.jpg deleted file mode 100644 index a221a30d..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/b2.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/car_chase.gif b/Net40/HandyControlDemo_Net40/Resources/Img/car_chase.gif deleted file mode 100644 index ff9290f2..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/car_chase.gif and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/icon-white.png b/Net40/HandyControlDemo_Net40/Resources/Img/icon-white.png deleted file mode 100644 index d0bb4776..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/icon-white.png and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/icon.ico b/Net40/HandyControlDemo_Net40/Resources/Img/icon.ico deleted file mode 100644 index 719edf88..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/icon.ico and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/qq-group.jpg b/Net40/HandyControlDemo_Net40/Resources/Img/qq-group.jpg deleted file mode 100644 index ad37b866..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/qq-group.jpg and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Img/under_construction.gif b/Net40/HandyControlDemo_Net40/Resources/Img/under_construction.gif deleted file mode 100644 index b5efd6d8..00000000 Binary files a/Net40/HandyControlDemo_Net40/Resources/Img/under_construction.gif and /dev/null differ diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Basic.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Basic.xaml deleted file mode 100644 index 6b2fbe74..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Basic.xaml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Brushes.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Brushes.xaml deleted file mode 100644 index 23505a2b..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Brushes.xaml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Colors/Colors.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Colors/Colors.xaml deleted file mode 100644 index d6b46dbc..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Colors/Colors.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - #262e2f - #FFF0F0F0 - #FFF5F5F5 - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Colors/ColorsDark.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Colors/ColorsDark.xaml deleted file mode 100644 index 512e444d..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Colors/ColorsDark.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - #262e2f - #FF1A1A1A - #FF1C1C1C - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Converters.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Converters.xaml deleted file mode 100644 index 82870e28..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Converters.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Geometries.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Geometries.xaml deleted file mode 100644 index a746ad39..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/Basic/Geometries.xaml +++ /dev/null @@ -1,21 +0,0 @@ - - - M512 0h1216a512 512 0 1 1 0 1024H512A512 512 0 1 1 512 0zM420.16 311.04V768h74.88V433.92h2.56l228.48 334.08h72.96V311.04h-75.52v329.6h-2.56l-225.92-329.6h-74.88z m468.48 0V768h340.48v-64h-265.6V565.76h239.36v-64h-239.36V375.04h254.72v-64h-329.6z m369.28 0l131.2 456.96h80l89.6-343.68h2.56l88.96 343.68h79.36l131.84-456.96h-84.48l-85.76 347.52h-2.56l-90.24-347.52h-77.44l-90.24 347.52h-2.56l-85.76-347.52h-84.48z - M40.493382,19.001303 C36.637875,19.06448 33.938568,21.421986 33.948524,25.271919 L34.068279,71.56765 34.066906,71.598007 34.068745,71.747833 34.18895,118.21758 C34.202225,123.35083 39.026951,129.19344 44.965271,131.2674 50.903587,133.34137 55.706783,130.86133 55.693504,125.72808 L55.589508,85.524513 93.866371,85.524513 93.950943,118.21758 C93.964218,123.35083 98.788948,129.19344 104.72726,131.2674 110.66558,133.34137 115.46878,130.86133 115.4555,125.72808 L115.33575,79.432381 115.33712,79.401993 115.33528,79.252007 115.21507,32.782413 C115.2018,27.64917 110.37708,21.806566 104.43876,19.732603 98.500435,17.658638 93.697243,20.138674 93.710518,25.271919 L93.814514,65.475487 55.537647,65.475487 55.453079,32.782413 C55.439804,27.64917 50.615082,21.806566 44.676762,19.732603 43.192181,19.214111 41.778549,18.980244 40.493382,19.001303 z M9.999999,0 L140,0 C145.52284,0 150,4.4771523 150,9.999999 L150,140 C150,145.52284 145.52284,150 140,150 L9.999999,150 C4.4771523,150 0,145.52284 0,140 L0,9.999999 C0,4.4771523 4.4771523,0 9.999999,0 z - M28.677037,-2.2499313E-22 C38.75065,24.740243 38.50705,52.437974 27.999852,77.000001 L-1.7053028E-13,65.206651 C7.3550318,48.013234 7.5255431,28.624822 0.4740567,11.306663 z - M267.287478 892.162257c0 45.149912 59.597884 71.336861 93.008818 37.925926L740.458554 549.925926c21.671958-21.671958 21.671958-54.179894 0-75.851852L360.296296 93.911817c-33.410935-33.410935-93.008818-5.417989-93.008818 38.828924v759.421516z m0 0 - M512 0C229.12 0 0 229.12 0 512c0 226.56 146.56 417.92 350.08 485.76 25.6 4.48 35.2-10.88 35.2-24.32 0-12.16-0.64-52.48-0.64-95.36-128.64 23.68-161.92-31.36-172.16-60.16-5.76-14.72-30.72-60.16-52.48-72.32-17.92-9.6-43.52-33.28-0.64-33.92 40.32-0.64 69.12 37.12 78.72 52.48 46.08 77.44 119.68 55.68 149.12 42.24 4.48-33.28 17.92-55.68 32.64-68.48-113.92-12.8-232.96-56.96-232.96-252.8 0-55.68 19.84-101.76 52.48-137.6-5.12-12.8-23.04-65.28 5.12-135.68 0 0 42.88-13.44 140.8 52.48 40.96-11.52 84.48-17.28 128-17.28 43.52 0 87.04 5.76 128 17.28 97.92-66.56 140.8-52.48 140.8-52.48 28.16 70.4 10.24 122.88 5.12 135.68 32.64 35.84 52.48 81.28 52.48 137.6 0 196.48-119.68 240-233.6 252.8 18.56 16 34.56 46.72 34.56 94.72 0 68.48-0.64 123.52-0.64 140.8 0 13.44 9.6 29.44 35.2 24.32A512.832 512.832 0 0 0 1024 512c0-282.88-229.12-512-512-512z - M449.722947 199.412211H706.021053c130.967579 0 237.136842 106.169263 237.136842 237.136842v256.298105c0 130.967579-106.169263 237.136842-237.136842 237.136842H449.722947c-130.965895 0-237.136842-106.169263-237.136842-237.136842V436.549053c0-130.967579 106.170947-237.136842 237.136842-237.136842z m-201.205894-21.557895c0-64.299789-70.085053-104.704-125.850948-72.55579s-55.764211 112.96 0 145.111579 125.850947-8.257684 125.850948-72.555789z m239.528421 234.74021c0-68.003368-74.088421-110.736842-133.037474-76.734315s-58.950737 119.467789 0 153.470315 133.039158-8.730947 133.039158-76.736zM835.368421 692.847158c0-117.596632-128.154947-191.494737-230.123789-132.695579s-101.970526 206.593684 0 265.391158S835.368421 810.443789 835.368421 692.847158z - M430.079734 481.464543c45.196365 45.596478 118.486578 45.596478 163.68499 0l360.684736-324.939627c0.547469 3.751441 1.13894 7.490601 1.13894 11.401678l0 404.753417 0 116.754121c0 42.995233-34.547841 77.838809-77.145008 77.838809L145.397996 767.272941c-42.597167 0-77.145008-34.844599-77.145008-77.838809L68.252988 494.839155 68.252988 167.926594c0-3.911076 0.593518-7.65126 1.139963-11.401678L430.079734 481.464543zM910.960992 74.226538 562.044278 387.28558c-38.470173 38.811957-62.276369 38.811957-100.770078 0L112.538611 74.408687c10.011005-4.789073 21.069875-7.673773 32.859385-7.673773l733.044372 0C890.095779 66.735937 901.065622 69.539796 910.960992 74.226538z - M260.8 645H160V0h100.8v645zM461.8 152.2h-100.8V1024h100.8V152.2z m201.2 0h-100.8V1024h100.8V152.2zM864 152h-100.8v494H864V152z - M736 224H288a64 64 0 0 0-64 64v448a64 64 0 0 0 64 64h448a64 64 0 0 0 64-64V288a64 64 0 0 0-64-64z m-416 160a64 64 0 1 1 128.032 0.032A64 64 0 0 1 320 384z m416 320a32 32 0 0 1-32 32H384a32 32 0 0 1-32-32l96-160c26.432-2.048 68.128 6.016 128 64l128-224a32 32 0 0 1 32 32v288z - M19.692308 512A25 25 0 1 1 19.692308 531.692308ZM512 303.027832C512 286.548884 524.86564 273.174666 540.717948 273.174666L598.153846 273.174666C614.006154 273.174666 626.871794 286.548884 626.871794 303.027832L626.871794 362.734167C626.871794 379.213115 614.006154 392.587333 598.153846 392.587333L540.717948 392.587333C524.86564 392.587333 512 379.213115 512 362.734167L512 303.027832 512 303.027832ZM512 482.146834 512 541.853166C512 558.332115 499.13436 571.706335 483.282052 571.706335L425.846154 571.706335C409.993846 571.706335 397.128206 558.332115 397.128206 541.853166L397.128206 482.146834C397.128206 465.667885 409.993846 452.293665 425.846154 452.293665L483.282052 452.293665C499.13436 452.293665 512 465.667885 512 482.146834L512 482.146834ZM339.692308 303.027832C339.692308 286.548884 352.557948 273.174666 368.410256 273.174666L425.846154 273.174666C441.698462 273.174666 454.564102 286.548884 454.564102 303.027832L454.564102 362.734167C454.564102 379.213115 441.698462 392.587333 425.846154 392.587333L368.410256 392.587333C352.557948 392.587333 339.692308 379.213115 339.692308 362.734167L339.692308 303.027832 339.692308 303.027832ZM167.384615 303.027832C167.384615 286.548884 180.250256 273.174666 196.102564 273.174666L253.538462 273.174666C269.390769 273.174666 282.25641 286.548884 282.25641 303.027832L282.25641 362.734167C282.25641 379.213115 269.390769 392.587333 253.538462 392.587333L196.102564 392.587333C180.250256 392.587333 167.384615 379.213115 167.384615 362.734167L167.384615 303.027832 167.384615 303.027832ZM282.25641 720.972168C282.25641 737.451116 269.390769 750.825334 253.538462 750.825334L196.102564 750.825334C180.250256 750.825334 167.384615 737.451116 167.384615 720.972168L167.384615 661.265833C167.384615 644.786885 180.250256 631.412667 196.102564 631.412667L253.538462 631.412667C269.390769 631.412667 282.25641 644.786885 282.25641 661.265833L282.25641 720.972168 282.25641 720.972168ZM310.97436 571.706335 253.538462 571.706335C237.686154 571.706335 224.820513 558.332115 224.820513 541.853166L224.820513 482.146834C224.820513 465.667885 237.686154 452.293665 253.538462 452.293665L310.97436 452.293665C326.826667 452.293665 339.692308 465.667885 339.692308 482.146834L339.692308 541.853166C339.692308 558.332115 326.826667 571.706335 310.97436 571.706335L310.97436 571.706335ZM569.435898 720.972168C569.435898 737.451116 556.570256 750.825334 540.717948 750.825334L368.410256 750.825334C352.557948 750.825334 339.692308 737.451116 339.692308 720.972168L339.692308 661.265833C339.692308 644.786885 352.557948 631.412667 368.410256 631.412667L540.717948 631.412667C556.570256 631.412667 569.435898 644.786885 569.435898 661.265833L569.435898 720.972168 569.435898 720.972168ZM569.435898 541.853166 569.435898 482.146834C569.435898 465.667885 582.301538 452.293665 598.153846 452.293665L655.589744 452.293665C671.442052 452.293665 684.307692 465.667885 684.307692 482.146834L684.307692 541.853166C684.307692 558.332115 671.442052 571.706335 655.589744 571.706335L598.153846 571.706335C582.301538 571.706335 569.435898 558.332115 569.435898 541.853166L569.435898 541.853166ZM856.615385 720.972168C856.615385 737.451116 843.749744 750.825334 827.897437 750.825334L655.589744 750.825334C639.737437 750.825334 626.871794 737.451116 626.871794 720.972168L626.871794 661.265833C626.871794 644.786885 639.737437 631.412667 655.589744 631.412667L713.02564 631.412667C728.877948 631.412667 741.74359 618.038449 741.74359 601.559501L741.74359 482.146834C741.74359 465.667885 754.609231 452.293665 770.461538 452.293665L827.897437 452.293665C843.749744 452.293665 856.615385 465.667885 856.615385 482.146834L856.615385 720.972168 856.615385 720.972168ZM856.615385 362.734167C856.615385 379.213115 843.749744 392.587333 827.897437 392.587333L713.02564 392.587333C697.173333 392.587333 684.307692 379.213115 684.307692 362.734167L684.307692 303.027832C684.307692 286.548884 697.173333 273.174666 713.02564 273.174666L827.897437 273.174666C843.749744 273.174666 856.615385 286.548884 856.615385 303.027832L856.615385 362.734167 856.615385 362.734167Z - M890.2 208.2c-91.8-91.9-242.1-91.9-334 0L544.4 220c-18.2 18.2-47.6 18.2-65.8 0l-11.8-11.8c-91.9-91.9-242.1-91.9-334 0C41 300 24.7 533.9 203.6 722.1 304 827.8 412.4 882.3 470 905.9c26.6 10.9 56.5 10.9 83 0 57.6-23.6 166-78.1 266.4-183.8 178.9-188.2 162.6-422 70.8-513.9z - M512 0C229.234472 0 0 229.226146 0 512 0 794.765528 229.234472 1024 512 1024S1024 794.765528 1024 512C1024 229.226146 794.765528 0 512 0zM228.776585 836.066862c-63.163317 0-114.371642-51.208325-114.371642-114.371642S165.613268 607.323577 228.776585 607.323577s114.371642 51.208325 114.371643 114.371643c0 63.171642-51.208325 114.371642-114.371643 114.371642z m420.555968-89.612488a391.867317 391.867317 0 0 1-1.989724 16.975089c-7.259577 30.203837-33.950179 52.898341-66.376845 52.898342-38.104455 0-68.990959-34.158309-68.99096-72.204488 0-5.877593 0.81587-11.463805 2.206179-16.775284-1.756618-131.096976-103.981789-237.867707-233.205593-246.883903l-6.343805-0.740943-1.015675-0.041626c-5.453008-0.216455-10.930992-0.732618-16.142569-2.331057a67.958634 67.958634 0 0 1-47.91987-65.078114c0-37.604943 30.245463-68.091837 67.550699-68.091837 0.299707 0 0.591089 0.041626 0.890797 0.049951l0.124878-0.049951c205.707447 2.139577 371.836878 169.484488 371.836878 375.699772 0 7.717463-0.341333 15.34335-0.824195 22.94426 0.066602 1.207154 0.19148 2.397659 0.199805 3.629789z m254.085203-63.329821c-10.856065 45.172553-25.80813 104.114992-74.310764 104.114992-56.994341 0-48.236228-66.085463-48.236228-122.996553 0-8.791415 1.223805-17.149919 3.296781-25.100488-2.639089-196.108488-169.834146-387.812943-363.137041-401.291447l-35.806699-5.827642c-42.117203-7.492683-111.715902-3.255154-111.715903-49.193626 0-56.253398 50.234276-81.861724 106.038114-81.861724 0.449561 0 0.882472 0.058276 1.332033 0.066602l0.183154-0.066602c307.724488 3.180228 526.252748 208.546341 526.252748 517.028423a538.474146 538.474146 0 0 1-1.23213 34.316488c0.108228 1.806569 0.291382 3.596488 0.308033 5.428032a542.72 542.72 0 0 1-2.972098 25.383545z - M827.904 541.184a278.592 278.592 0 0 0 0-58.368l73.728-58.368c15.872-13.056 20.224-35.584 9.728-53.504l-78.592-137.728c-9.984-17.408-31.232-25.856-51.712-18.176l-86.528 35.072c-15.872-11.52-32.512-21.248-49.664-29.184l-12.8-92.928c-3.072-20.224-20.736-35.584-41.216-35.584h-157.44c-20.736 0-38.144 14.848-41.216 35.84L378.88 221.44c-17.152 7.936-33.792 17.92-49.664 29.184L242.688 215.296c-18.688-7.168-41.216 0.768-51.2 18.176L112.64 371.2c-10.24 17.92-6.144 40.448 10.24 53.76l73.472 58.112c-1.024 9.472-1.536 19.2-1.536 29.184 0 9.728 0.512 19.456 1.536 29.184l-73.984 58.368c-15.872 13.056-19.968 35.584-9.728 53.248l78.848 137.728c9.984 17.408 32 25.856 51.456 17.92l86.528-35.072c15.872 11.52 32.512 21.248 49.664 29.184l13.056 93.696c3.328 20.48 20.48 35.328 41.216 35.328h157.44c20.48 0 38.144-15.36 41.216-35.84l13.056-93.184c17.152-7.936 33.792-17.664 49.664-29.184l86.784 35.328c4.864 1.792 9.984 2.816 15.104 2.816 14.848 0 28.672-7.936 36.096-20.992l78.592-137.728c10.24-17.664 6.4-40.192-9.984-53.76l-73.472-58.112z m-25.344 231.168l-99.584-40.448c-7.424-3.072-15.872-1.792-22.272 3.072-19.712 15.36-40.704 27.648-62.464 36.608-7.424 3.072-12.544 9.728-13.568 17.664l-14.592 104.96-155.392 2.304-15.104-107.264c-1.024-7.936-6.4-14.592-13.568-17.664-21.76-8.96-42.752-21.504-62.464-36.608-4.096-3.072-8.96-4.608-13.824-4.608-2.816 0-5.888 0.512-8.448 1.536l-96.256 41.472-80.896-137.216 84.48-66.816c6.144-4.864 9.472-12.8 8.448-20.48-1.536-12.032-2.56-24.32-2.56-36.608 0-12.288 1.024-24.576 2.56-36.608 1.024-7.936-2.048-15.616-8.448-20.48l-83.712-64 76.544-139.264 99.584 40.448c7.424 3.072 15.872 1.792 22.272-3.072 19.712-15.36 40.96-27.648 62.72-36.864 7.424-3.072 12.544-9.728 13.568-17.664l12.544-104.704 157.696-2.304 15.104 107.264c1.024 7.936 6.4 14.592 13.568 17.664 21.76 8.96 42.752 21.504 62.464 36.864 6.4 4.864 14.848 6.144 22.272 3.072l96.256-41.472 80.896 137.216-84.48 66.816c-6.144 4.864-9.472 12.544-8.448 20.48 1.536 12.032 2.56 24.32 2.56 36.608 0 12.288-1.024 24.576-2.56 36.608-1.024 7.936 2.304 15.616 8.448 20.48l83.712 63.744-77.056 139.264zM512 345.6c-91.136 0-165.12 74.752-165.12 166.4s73.984 166.4 165.12 166.4 165.12-74.752 165.12-166.4-73.984-166.4-165.12-166.4z m0 297.216c-71.168 0-129.28-58.624-129.28-130.816 0-72.192 58.112-130.816 129.28-130.816s129.28 58.624 129.28 130.816c0 72.192-57.856 130.816-129.28 130.816z - M657.486769 287.744c5.671385 0 11.264-5.671385 16.935385-5.671385l186.289231-124.140307c5.592615-5.592615 16.935385-16.935385 16.935384-28.199385V73.334154A74.673231 74.673231 0 0 0 804.233846 0H606.680615v220.002462c0 22.606769-16.935385 33.870769-39.463384 33.870769H454.262154c-22.528 0-39.463385-16.935385-39.463385-33.870769V5.671385H222.838154c-45.134769 0-79.005538 33.870769-79.005539 73.255384v56.477539c0 11.264 5.671385 22.528 16.935385 28.199384l186.289231 124.140308h16.935384C200.310154 349.735385 98.697846 507.746462 121.304615 693.878154c22.528 169.275077 169.353846 310.350769 344.221539 327.207384 237.095385 28.199385 440.32-152.339692 440.32-377.934769 0-158.011077-101.612308-299.008-248.359385-355.406769z m-146.747077 671.271385C335.793231 959.015385 189.046154 818.018462 189.046154 643.150769c0-174.867692 146.747077-310.350769 321.693538-310.350769 174.946462 0 321.693538 141.075692 321.693539 315.943385s-146.747077 310.350769-321.693539 310.350769zM670.798769 572.967385l-68.371692-11.185231a31.507692 31.507692 0 0 1-28.514462-16.777846l-28.514461-55.926154c-17.092923-27.963077-51.278769-27.963077-68.371692 0l-28.514462 55.926154a31.507692 31.507692 0 0 1-28.514462 16.777846l-68.371692 11.185231c-28.514462 5.592615-39.936 39.148308-17.092923 61.44l45.528615 39.227077c5.750154 11.185231 17.171692 22.370462 11.421539 33.555692l-11.421539 67.111384c-5.671385 27.963077 28.514462 50.333538 51.357539 33.555693l62.700308-27.963077a37.021538 37.021538 0 0 1 34.185846 0l62.700307 33.555692c28.514462 16.777846 57.028923-5.592615 51.27877-33.555692l-11.421539-67.111385c0-16.777846 5.750154-27.963077 11.421539-33.555692l51.278769-44.740923a38.596923 38.596923 0 0 0-22.843077-61.518769z - M1185.92 769.92h-1.28c0.576 0 0.96 0.64 1.536 0.704h0.384l-0.64-0.64z m0.256 0.704c-5.952 0.064-20.928 3.2-36.736 3.2-49.92 0-67.2-23.04-67.2-53.12V520.32h101.76c5.76 0 10.24-5.12 10.24-12.16v-108.8c0-5.76-5.12-10.88-10.24-10.88h-101.76V253.44c0-5.12-3.2-8.32-8.96-8.32h-138.24c-5.76 0-8.96 3.2-8.96 8.32v138.88s-69.76 17.28-74.24 17.92c-5.12 1.28-8.32 5.76-8.32 10.88v87.04c0 7.04 5.12 12.16 10.88 12.16h71.04v209.92c0 156.16 108.8 172.16 183.04 172.16 33.92 0 74.88-10.88 81.28-14.08 3.84-1.28 5.76-5.76 5.76-10.24v-96a11.328 11.328 0 0 0-9.344-11.52z m1516.544-140.8c0-115.84-46.72-131.2-96-126.08-38.4 2.56-69.12 21.76-69.12 21.76v225.28s31.36 21.76 78.08 23.04c65.92 1.92 87.04-21.76 87.04-144z m155.52-10.24c0 219.52-71.04 282.24-195.2 282.24-104.96 0-161.28-53.12-161.28-53.12s-2.56 29.44-5.76 33.28c-1.92 3.84-5.12 5.12-8.96 5.12h-94.72c-6.4 0-12.16-5.12-12.16-10.88l1.28-711.04c0-5.76 5.12-10.88 10.88-10.88h136.32c5.76 0 10.88 5.12 10.88 10.88v241.28s52.48-33.92 129.28-33.92l-0.64-1.28c76.8 0 190.08 28.8 190.08 248.32z m-558.08-231.04H2165.76c-7.04 0-10.88 5.12-10.88 12.16v348.16s-35.2 24.96-83.2 24.96-62.08-21.76-62.08-69.76V400c0-5.76-5.12-10.88-10.88-10.88h-136.96c-5.76 0-10.88 5.12-10.88 10.88v327.04c0 140.8 78.72 176 186.88 176 88.96 0 161.28-49.28 161.28-49.28s3.2 24.96 5.12 28.8c1.28 3.2 5.76 5.76 10.24 5.76h85.76c7.04 0 10.88-5.12 10.88-10.88l1.28-478.08c0-5.76-5.12-10.88-12.16-10.88z m-1516.8-0.64h-136.32c-5.76 0-10.88 5.76-10.88 12.8v469.76c0 12.8 8.32 17.28 19.2 17.28h122.88c12.8 0 16-5.76 16-17.28V398.72c0-5.76-5.12-10.88-10.88-10.88z m-67.2-216.32c-49.28 0-88.32 39.04-88.32 88.32 0 49.28 39.04 88.32 88.32 88.32 48 0 87.04-39.04 87.04-88.32 0-49.28-39.04-88.32-87.04-88.32z m1055.36-16h-135.04c-5.76 0-10.88 5.12-10.88 10.88v261.76h-211.84V166.4c0-5.76-5.12-10.88-10.88-10.88h-136.32c-5.76 0-10.88 5.12-10.88 10.88v711.04c0 5.76 5.76 10.88 10.88 10.88h136.32c5.76 0 10.88-5.12 10.88-10.88V573.44h211.84l-1.28 304c0 5.76 5.12 10.88 10.88 10.88h136.32c5.76 0 10.88-5.12 10.88-10.88V166.4c0-5.76-5.12-10.88-10.88-10.88zM563.84 470.4v367.36c0 2.56-0.64 7.04-3.84 8.32 0 0-80 56.96-211.84 56.96-159.36 0-348.16-49.92-348.16-378.88S165.12 127.36 326.4 128c139.52 0 195.84 31.36 204.8 37.12 2.56 3.2 3.84 5.76 3.84 8.96L508.16 288c0 5.76-5.76 12.8-12.8 10.88-23.04-7.04-57.6-21.12-138.88-21.12-94.08 0-195.2 26.88-195.2 238.72s96 236.8 165.12 236.8c58.88 0 80-7.04 80-7.04v-147.2H312.32c-7.04 0-12.16-5.12-12.16-10.88V470.4c0-5.76 5.12-10.88 12.16-10.88h239.36c7.04 0 12.16 5.12 12.16 10.88z - M936.194300839506 691.6934192494618c-5.891587367822223-94.26540047423211-70.69904970840491-170.8560375504593-106.04857520987652-212.09715041975304 5.891587367822223-11.783174735644446 17.674762103466666-79.53643140740742-29.457938133649378-126.66913164452346V349.981342854005c0-182.63921228610366-129.61492468116543-315.1999312984493-294.57937486380246-315.1999312984493s-294.57937615834066 132.5607190123457-294.57937615834066 315.1999312984493v2.9457943311802466c-47.132700237116055 47.132700237116055-35.349525501471604 114.885956908879-29.45793683911111 126.66913164452346-35.349525501471604 41.24111286929382-100.15698784205432 117.83174994552098-106.04857520987652 212.09715041975304 0 23.56634947128889 2.9457943311802466 58.91587497276049 14.728969066824689 76.59063707622718 14.728969066824689 20.62055643464691 55.97008193611851-2.9457943311802466 82.48222444404936-64.80746234058272 8.837381699002469 29.457938133649378 26.51214380246913 73.64484403958517 67.75325667176295 126.66913164452346-70.69904970840491 14.728969066824689-88.37381310640988 85.42801877522965-64.80746234058272 123.72333731334321 17.674762103466666 26.51214380246913 53.02428760493826 47.132700237116055 120.77754298216297 47.132700237116055 114.885956908879 0 167.9102445138173-32.40373117029136 191.4765952796444-53.02428760493826 5.891587367822223-5.891587367822223 11.783174735644446-5.891587367822223 20.620555140108642-5.891587367822223 8.837381699002469 0 14.728969066824689 2.9457943311802466 20.62055643464691 5.891587367822223 23.56634947128889 20.62055643464691 73.64484403958517 53.02428760493826 191.4765939851062 53.02428760493826 64.80746234058272 0 103.10278087869627-20.62055643464691 120.77754427670124-47.132700237116055 23.56634947128889-38.29531853811359 2.9457943311802466-106.04857520987652-64.80746234058272-123.72333731334321 41.24111286929382-55.97008193611851 58.91587497276049-100.15698784205432 67.75325667176295-126.66913164452346 29.457938133649378 61.86166930394074 67.75325667176295 85.42801877522965 82.48222444404936 64.80746234058272 5.891587367822223-17.674762103466666 11.783174735644446-53.02428760493826 8.837381699002469-76.59063707622718z m0 0 - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/SkinDark.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/SkinDark.xaml deleted file mode 100644 index 32b78055..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/SkinDark.xaml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/SkinDefault.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/SkinDefault.xaml deleted file mode 100644 index 825e8dbd..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/SkinDefault.xaml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/Style.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/Style.xaml deleted file mode 100644 index ea95bea7..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/Style.xaml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/Styles/Style.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/Styles/Style.xaml deleted file mode 100644 index 7cbb1fad..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/Styles/Style.xaml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/Styles/StyleDark.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/Styles/StyleDark.xaml deleted file mode 100644 index cd3f55cd..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/Styles/StyleDark.xaml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Resources/Themes/Theme.xaml b/Net40/HandyControlDemo_Net40/Resources/Themes/Theme.xaml deleted file mode 100644 index 93d641b3..00000000 --- a/Net40/HandyControlDemo_Net40/Resources/Themes/Theme.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Service/DataService.cs b/Net40/HandyControlDemo_Net40/Service/DataService.cs deleted file mode 100644 index 0e88b5a7..00000000 --- a/Net40/HandyControlDemo_Net40/Service/DataService.cs +++ /dev/null @@ -1,188 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Globalization; -using System.Linq; -using System.Net; -using HandyControl.Data; -using HandyControlDemo.Data; -using HandyControlDemo.Tools.Converter; -using Newtonsoft.Json; - -namespace HandyControlDemo.Service -{ - public class DataService - { - internal List GetDemoDataList() - { - var list = new List(); - for (var i = 1; i <= 20; i++) - { - var dataList = new List(); - for (int j = 0; j < 3; j++) - { - dataList.Add(new DemoDataModel - { - Index = j, - IsSelected = j % 2 == 0, - Name = $"SubName{j}", - Type = (DemoType)j - }); - } - var model = new DemoDataModel - { - Index = i, - IsSelected = i % 2 == 0, - Name = $"Name{i}", - Type = (DemoType)i, - DataList = dataList, - ImgPath = $"/HandyControlDemo;component/Resources/Img/Avatar/avatar{i % 6 + 1}.png", - Remark = new string(i.ToString()[0], 10) - }; - list.Add(model); - } - - return list; - } - - public List GetDemoDataList(int count) - { - var list = new List(); - for (var i = 1; i <= count; i++) - { - var index = i % 6 + 1; - var model = new DemoDataModel - { - Index = i, - IsSelected = i % 2 == 0, - Name = $"Name{i}", - Type = (DemoType)index, - ImgPath = $"/HandyControlDemo;component/Resources/Img/Avatar/avatar{index}.png", - Remark = new string(i.ToString()[0], 10) - }; - list.Add(model); - } - - return list; - } - - internal List GetComboBoxDemoDataList() - { - var converter = new StringRepeatConverter(); - var list = new List(); - for (var i = 1; i <= 9; i++) - { - list.Add(converter.Convert(Properties.Langs.Lang.Text, null, i, CultureInfo.CurrentCulture)?.ToString()); - } - - return list; - } - - internal List GetContributorDataList() - { - var client = new WebClient(); - client.Headers.Add("User-Agent", "request"); - var list = new List(); - try - { - var json = client.DownloadString(new Uri("https://api.github.com/repos/nabian/handycontrol/contributors")); - var objList = JsonConvert.DeserializeObject>(json); - list.AddRange(objList.Select(item => new ContributorModel - { - UserName = item.login, - AvatarUri = item.avatar_url, - Link = item.html_url - })); - } - catch - { - // ignored - } - return list; - } - - internal List GetStepBarDemoDataList() - { - return new List - { - new StepBarDemoModel - { - Header = $"{Properties.Langs.Lang.Step}1", - Content = Properties.Langs.Lang.Register - }, - new StepBarDemoModel - { - Header = $"{Properties.Langs.Lang.Step}2", - Content = Properties.Langs.Lang.BasicInfo - }, - new StepBarDemoModel - { - Header = $"{Properties.Langs.Lang.Step}3", - Content = Properties.Langs.Lang.UploadFile - }, - new StepBarDemoModel - { - Header = $"{Properties.Langs.Lang.Step}4", - Content = Properties.Langs.Lang.Complete - } - }; - } - - internal ObservableCollection GetCoverViewDemoDataList() - { - return new ObservableCollection - { - new CoverViewDemoModel - { - ImgPath = "/HandyControlDemo;component/Resources/Img/Album/1.jpg", - BackgroundToken = ResourceToken.SuccessBrush - }, - new CoverViewDemoModel - { - ImgPath = "/HandyControlDemo;component/Resources/Img/Album/2.jpg", - BackgroundToken = ResourceToken.PrimaryBrush - }, - new CoverViewDemoModel - { - ImgPath = "/HandyControlDemo;component/Resources/Img/Album/3.jpg", - BackgroundToken = ResourceToken.WarningBrush - }, - new CoverViewDemoModel - { - ImgPath = "/HandyControlDemo;component/Resources/Img/Album/4.jpg", - BackgroundToken = ResourceToken.DangerBrush - }, - new CoverViewDemoModel - { - ImgPath = "/HandyControlDemo;component/Resources/Img/Album/5.jpg", - BackgroundToken = ResourceToken.SuccessBrush - }, - new CoverViewDemoModel - { - ImgPath = "/HandyControlDemo;component/Resources/Img/Album/6.jpg", - BackgroundToken = ResourceToken.PrimaryBrush - }, - new CoverViewDemoModel - { - ImgPath = "/HandyControlDemo;component/Resources/Img/Album/7.jpg", - BackgroundToken = ResourceToken.InfoBrush - }, - new CoverViewDemoModel - { - ImgPath = "/HandyControlDemo;component/Resources/Img/Album/8.jpg", - BackgroundToken = ResourceToken.WarningBrush - }, - new CoverViewDemoModel - { - ImgPath = "/HandyControlDemo;component/Resources/Img/Album/9.jpg", - BackgroundToken = ResourceToken.PrimaryBrush - }, - new CoverViewDemoModel - { - ImgPath = "/HandyControlDemo;component/Resources/Img/Album/10.jpg", - BackgroundToken = ResourceToken.DangerBrush - } - }; - } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Tools/Converter/String2BrushConverter.cs b/Net40/HandyControlDemo_Net40/Tools/Converter/String2BrushConverter.cs deleted file mode 100644 index e837c305..00000000 --- a/Net40/HandyControlDemo_Net40/Tools/Converter/String2BrushConverter.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Globalization; -using System.Windows.Data; -using System.Windows.Media; -using HandyControl.Tools; - -namespace HandyControlDemo.Tools.Converter -{ - public class String2BrushConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - return value is string str ? ResourceHelper.GetResource(str) : default(Brush); - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Tools/Converter/StringRepeatConverter.cs b/Net40/HandyControlDemo_Net40/Tools/Converter/StringRepeatConverter.cs deleted file mode 100644 index ab297231..00000000 --- a/Net40/HandyControlDemo_Net40/Tools/Converter/StringRepeatConverter.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Globalization; -using System.Text; -using System.Windows.Data; - -namespace HandyControlDemo.Tools.Converter -{ - public class StringRepeatConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value is string strValue) - { - var builder = new StringBuilder(); - int num; - if (parameter is string numStr) - { - if (!int.TryParse(numStr, out num)) - { - return strValue; - } - } - else if(parameter is int intValue) - { - num = intValue; - } - else - { - return strValue; - } - for (var i = 0; i < num; i++) - { - builder.Append(strValue); - } - return builder.ToString(); - } - return string.Empty; - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Tools/Helper/AssemblyHelper.cs b/Net40/HandyControlDemo_Net40/Tools/Helper/AssemblyHelper.cs deleted file mode 100644 index ae55a7ee..00000000 --- a/Net40/HandyControlDemo_Net40/Tools/Helper/AssemblyHelper.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; - -namespace HandyControlDemo.Tools -{ - public class AssemblyHelper - { - private static readonly string NameSpaceStr = typeof(AssemblyHelper).Assembly.GetName().Name; - - public static object CreateInternalInstance(string className) - { - try - { - var type = Type.GetType($"{NameSpaceStr}.{className}"); - return type == null ? null : Activator.CreateInstance(type); - } - catch - { - return null; - } - } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/Tools/Helper/ExternDllHelper.cs b/Net40/HandyControlDemo_Net40/Tools/Helper/ExternDllHelper.cs deleted file mode 100644 index a5d0e53d..00000000 --- a/Net40/HandyControlDemo_Net40/Tools/Helper/ExternDllHelper.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Runtime.InteropServices; - -namespace HandyControlDemo.Tools -{ - internal class ExternDllHelper - { - private const string Winmm = "winmm.dll"; - - [DllImport(Winmm, EntryPoint = "mciSendString", CharSet = CharSet.Auto)] - public static extern int MciSendString(string lpstrCommand, string lpstrReturnString, int uReturnLength, int hwndCallback); - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/UserControl/Basic/Avatar.xaml b/Net40/HandyControlDemo_Net40/UserControl/Basic/Avatar.xaml deleted file mode 100644 index 915ee832..00000000 --- a/Net40/HandyControlDemo_Net40/UserControl/Basic/Avatar.xaml +++ /dev/null @@ -1,22 +0,0 @@ - - - diff --git a/Net40/HandyControlDemo_Net40/UserControl/Basic/Avatar.xaml.cs b/Net40/HandyControlDemo_Net40/UserControl/Basic/Avatar.xaml.cs deleted file mode 100644 index 88727b94..00000000 --- a/Net40/HandyControlDemo_Net40/UserControl/Basic/Avatar.xaml.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Diagnostics; -using System.Windows; -using System.Windows.Media.Imaging; - - -namespace HandyControlDemo.UserControl -{ - public partial class Avatar - { - public Avatar() - { - InitializeComponent(); - } - - public static readonly DependencyProperty SourceProperty = DependencyProperty.Register( - "Source", typeof(BitmapFrame), typeof(Avatar), new PropertyMetadata(default(BitmapFrame))); - - public BitmapFrame Source - { - get => (BitmapFrame) GetValue(SourceProperty); - set => SetValue(SourceProperty, value); - } - - public static readonly DependencyProperty UserNameProperty = DependencyProperty.Register( - "UserName", typeof(string), typeof(Avatar), new PropertyMetadata(default(string))); - - public string UserName - { - get => (string) GetValue(UserNameProperty); - set => SetValue(UserNameProperty, value); - } - - public static readonly DependencyProperty LinkProperty = DependencyProperty.Register( - "Link", typeof(string), typeof(Avatar), new PropertyMetadata(default(string))); - - public string Link - { - get => (string) GetValue(LinkProperty); - set => SetValue(LinkProperty, value); - } - - private void ButtonAvatar_OnClick(object sender, RoutedEventArgs e) => Process.Start(Link); - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/UserControl/Basic/ChatBox.xaml b/Net40/HandyControlDemo_Net40/UserControl/Basic/ChatBox.xaml deleted file mode 100644 index 590fb7b0..00000000 --- a/Net40/HandyControlDemo_Net40/UserControl/Basic/ChatBox.xaml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/UserControl/Basic/ChatBox.xaml.cs b/Net40/HandyControlDemo_Net40/UserControl/Basic/ChatBox.xaml.cs deleted file mode 100644 index 7b80e71c..00000000 --- a/Net40/HandyControlDemo_Net40/UserControl/Basic/ChatBox.xaml.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace HandyControlDemo.UserControl -{ - public partial class ChatBox - { - public ChatBox() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/UserControl/Controls/AnimationPathDemoCtl.xaml b/Net40/HandyControlDemo_Net40/UserControl/Controls/AnimationPathDemoCtl.xaml deleted file mode 100644 index f4381a72..00000000 --- a/Net40/HandyControlDemo_Net40/UserControl/Controls/AnimationPathDemoCtl.xaml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Net40/HandyControlDemo_Net40/UserControl/Controls/AnimationPathDemoCtl.xaml.cs b/Net40/HandyControlDemo_Net40/UserControl/Controls/AnimationPathDemoCtl.xaml.cs deleted file mode 100644 index 0b63c95e..00000000 --- a/Net40/HandyControlDemo_Net40/UserControl/Controls/AnimationPathDemoCtl.xaml.cs +++ /dev/null @@ -1,11 +0,0 @@ - -namespace HandyControlDemo.UserControl -{ - public partial class AnimationPathDemoCtl - { - public AnimationPathDemoCtl() - { - InitializeComponent(); - } - } -} diff --git a/Net40/HandyControlDemo_Net40/UserControl/Controls/BadgeDemoCtl.xaml b/Net40/HandyControlDemo_Net40/UserControl/Controls/BadgeDemoCtl.xaml deleted file mode 100644 index 14053024..00000000 --- a/Net40/HandyControlDemo_Net40/UserControl/Controls/BadgeDemoCtl.xaml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NoUserContent.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NoUserContent.xaml.cs new file mode 100644 index 00000000..8815da97 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NoUserContent.xaml.cs @@ -0,0 +1,84 @@ +using System.Diagnostics; +using System.Reflection; +using System.Windows; +using System.Windows.Controls; +using GalaSoft.MvvmLight.Messaging; +using HandyControl.Controls; +using HandyControl.Data; +using HandyControlDemo.Data; +using HandyControlDemo.Tools; +using HandyControlDemo.Window; + + +namespace HandyControlDemo.UserControl +{ + public partial class NoUserContent + { + public NoUserContent() + { + InitializeComponent(); + } + + private void ButtonLangs_OnClick(object sender, RoutedEventArgs e) + { + if (e.OriginalSource is Button button && button.Tag is string tag) + { + PopupConfig.IsOpen = false; + if (tag.Equals(GlobalData.Config.Lang)) return; + Growl.Ask(Properties.Langs.Lang.ChangeLangAsk, b => + { + if (!b) return true; + GlobalData.Config.Lang = tag; + GlobalData.Save(); + Process.Start(Process.GetCurrentProcess().MainModule.FileName); + Application.Current.Shutdown(); + return true; + }); + } + } + + private void ButtonConfig_OnClick(object sender, RoutedEventArgs e) => PopupConfig.IsOpen = true; + + private void ButtonSkins_OnClick(object sender, RoutedEventArgs e) + { + if (e.OriginalSource is Button button && button.Tag is SkinType tag) + { + PopupConfig.IsOpen = false; + if (tag.Equals(GlobalData.Config.Skin)) return; + GlobalData.Config.Skin = tag; + GlobalData.Save(); + ((App)Application.Current).UpdateSkin(tag); + } + } + + private void MenuItemLinks_OnClick(object sender, RoutedEventArgs e) + { + if (e.OriginalSource is MenuItem menuItem && menuItem.Tag is string tag) + { + Process.Start(tag); + } + } + + private void MenuItemQQGroup_OnClick(object sender, RoutedEventArgs e) + { + Messenger.Default.Send(null, MessageToken.ClearLeftSelected); + Messenger.Default.Send(true, MessageToken.FullSwitch); + Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.QQGroupView}"), MessageToken.LoadShowContent); + } + + private void MenuItemContributors_OnClick(object sender, RoutedEventArgs e) + { + Messenger.Default.Send(null, MessageToken.ClearLeftSelected); + Messenger.Default.Send(true, MessageToken.FullSwitch); + Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.ContributorsView}"), MessageToken.LoadShowContent); + } + + private void MenuAbout_OnClick(object sender, RoutedEventArgs e) + { + new AboutWindow + { + Owner = Application.Current.MainWindow + }.ShowDialog(); + } + } +} diff --git a/Net35/HandyControlDemo_Net35/UserControl/Main/QQGroupView.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/QQGroupView.xaml similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Main/QQGroupView.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Main/QQGroupView.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Main/QQGroupView.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/QQGroupView.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Main/QQGroupView.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Main/QQGroupView.xaml.cs diff --git a/HandyControlDemo/UserControl/Main/UnderConstruction.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml similarity index 100% rename from HandyControlDemo/UserControl/Main/UnderConstruction.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml diff --git a/HandyControlDemo/UserControl/Main/UnderConstruction.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Main/UnderConstruction.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/BorderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/BorderDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/BorderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/BorderDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/BrushDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/BrushDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/ButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/ButtonDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/ButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/ButtonDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml diff --git a/HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/CheckBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/CheckBoxDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/CheckBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/CheckBoxDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml diff --git a/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/ExpanderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/ExpanderDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/ExpanderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/ExpanderDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/GroupBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/GroupBoxDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/LabelDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/LabelDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml diff --git a/HandyControlDemo/UserControl/Styles/LabelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Styles/LabelDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/ListBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/ListBoxDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/ListBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/ListBoxDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/ListViewDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/ListViewDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/ListViewDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/ListViewDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/MenuDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/MenuDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml diff --git a/HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/NativeDatePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeDatePickerDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml diff --git a/HandyControlDemo/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/NativePasswordBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativePasswordBoxDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml diff --git a/HandyControlDemo/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/NativeProgressBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeProgressBarDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml diff --git a/HandyControlDemo/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/NativeScrollViewerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeScrollViewerDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml diff --git a/HandyControlDemo/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/NativeTabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeTabControlDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml diff --git a/HandyControlDemo/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/NativeTextBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeTextBoxDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml diff --git a/HandyControlDemo/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/RadioButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/RadioButtonDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/RichTextBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/RichTextBoxDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml diff --git a/HandyControlDemo/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs similarity index 100% rename from HandyControlDemo/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/SliderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/SliderDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/SliderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/SliderDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/TextBlockDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/TextBlockDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/TextBlockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/TextBlockDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/ToggleButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/ToggleButtonDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/ToolBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/ToolBarDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/ToolBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/ToolBarDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml.cs diff --git a/HandyControlDemo/UserControl/Styles/TreeViewDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml similarity index 100% rename from HandyControlDemo/UserControl/Styles/TreeViewDemoCtl.xaml rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml diff --git a/Net35/HandyControlDemo_Net35/UserControl/Styles/TreeViewDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/UserControl/Styles/TreeViewDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml.cs diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs new file mode 100644 index 00000000..aa959105 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs @@ -0,0 +1,172 @@ +using System; +using System.Collections.ObjectModel; +using System.Diagnostics; +using System.IO; +using System.Media; +using System.Windows; +using System.Windows.Input; +using System.Windows.Media.Imaging; +using GalaSoft.MvvmLight; +using GalaSoft.MvvmLight.CommandWpf; +using GalaSoft.MvvmLight.Messaging; +using HandyControl.Controls; +using HandyControl.Data; +using HandyControl.Tools; +using HandyControlDemo.Data; +using HandyControlDemo.Tools; +using Microsoft.Win32; + +namespace HandyControlDemo.ViewModel +{ + public class ChatBoxViewModel : ViewModelBase + { + private static readonly string AudioCachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache"; + + private readonly string _id = Guid.NewGuid().ToString(); + + private readonly Stopwatch _stopwatch = new Lazy(() => new Stopwatch()).Value; + + public ChatBoxViewModel() + { + Messenger.Default.Register(this, MessageToken.SendChatMessage, ReceiveMessage); + } + + private void ReceiveMessage(ChatInfoModel info) + { + if (_id.Equals(info.SenderId)) return; + info.Role = ChatRoleType.Receiver; + ChatInfos.Add(info); + } + + private string _chatString; + + public string ChatString + { + get => _chatString; + set => Set(ref _chatString, value); + } + + public ObservableCollection ChatInfos { get; set; } = new ObservableCollection(); + + public RelayCommand SendStringCmd => new Lazy>(() => + new RelayCommand(SendString)).Value; + + private void SendString(KeyEventArgs e) + { + if (e.Key == Key.Enter) + { + if (string.IsNullOrEmpty(ChatString)) return; + var info = new ChatInfoModel + { + Message = ChatString, + SenderId = _id, + Type = ChatMessageType.String, + Role = ChatRoleType.Sender + }; + ChatInfos.Add(info); + Messenger.Default.Send(info, MessageToken.SendChatMessage); + ChatString = string.Empty; + } + } + + public RelayCommand ReadMessageCmd => new Lazy>(() => + new RelayCommand(ReadMessage)).Value; + + private void ReadMessage(RoutedEventArgs e) + { + if (e.OriginalSource is FrameworkElement element && element.Tag is ChatInfoModel info) + { + if (info.Type == ChatMessageType.Image) + { + new ImageBrowser(new Uri(info.Enclosure.ToString())) + { + Owner = VisualHelper.GetActiveWindow() + }.Show(); + } + else if (info.Type == ChatMessageType.Audio) + { + var player = new SoundPlayer(info.Enclosure.ToString()); + player.PlaySync(); + } + } + } + + public RelayCommand StartRecordCmd => new Lazy(() => + new RelayCommand(StartRecord)).Value; + + private void StartRecord() + { + ExternDllHelper.MciSendString("set wave bitpersample 8", "", 0, 0); + ExternDllHelper.MciSendString("set wave samplespersec 20000", "", 0, 0); + ExternDllHelper.MciSendString("set wave channels 2", "", 0, 0); + ExternDllHelper.MciSendString("set wave format tag pcm", "", 0, 0); + ExternDllHelper.MciSendString("open new type WAVEAudio alias movie", "", 0, 0); + ExternDllHelper.MciSendString("record movie", "", 0, 0); + + _stopwatch.Reset(); + _stopwatch.Start(); + } + + public RelayCommand StopRecordCmd => new Lazy(() => + new RelayCommand(StopRecord)).Value; + + private void StopRecord() + { + if (!Directory.Exists(AudioCachePath)) + { + try + { + Directory.CreateDirectory(AudioCachePath); + } + catch (Exception e) + { + Growl.Error(e.Message); + return; + } + } + + var cachePath = $"{AudioCachePath}\\{Guid.NewGuid().ToString()}"; + ExternDllHelper.MciSendString("stop movie", "", 0, 0); + ExternDllHelper.MciSendString($"save movie {cachePath}", "", 0, 0); + ExternDllHelper.MciSendString("close movie", "", 0, 0); + + _stopwatch.Stop(); + + var info = new ChatInfoModel + { + Message = $"{_stopwatch.Elapsed.Seconds.ToString()} {Properties.Langs.Lang.Second}", + SenderId = _id, + Type = ChatMessageType.Audio, + Role = ChatRoleType.Sender, + Enclosure = cachePath + }; + ChatInfos.Add(info); + Messenger.Default.Send(info, MessageToken.SendChatMessage); + } + + public RelayCommand OpenImageCmd => new Lazy(() => + new RelayCommand(OpenImage)).Value; + + private void OpenImage() + { + var dialog = new OpenFileDialog(); + if (dialog.ShowDialog() == true) + { + var fileName = dialog.FileName; + if (File.Exists(fileName)) + { + var info = new ChatInfoModel + { + Message = BitmapFrame.Create(new Uri(fileName)), + SenderId = _id, + Type = ChatMessageType.Image, + Role = ChatRoleType.Sender, + Enclosure = fileName + }; + ChatInfos.Add(info); + Messenger.Default.Send(info, MessageToken.SendChatMessage); + } + } + } + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs new file mode 100644 index 00000000..6566c970 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs @@ -0,0 +1,30 @@ +using System; +using GalaSoft.MvvmLight; +using GalaSoft.MvvmLight.CommandWpf; +using HandyControl.Tools.Extension; + +namespace HandyControlDemo.ViewModel.Basic +{ + public class InteractiveDialogViewModel : ViewModelBase, IDialogResultable + { + public Action CloseAction { get; set; } + + private string _result; + + public string Result + { + get => _result; + set => Set(ref _result, value); + } + + private string _message; + + public string Message + { + get => _message; + set => Set(ref _message, value); + } + + public RelayCommand CloseCmd => new Lazy(() => new RelayCommand(() => CloseAction?.Invoke())).Value; + } +} diff --git a/HandyControlDemo/ViewModel/Common/ComboBoxDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Common/ComboBoxDemoViewModel.cs similarity index 100% rename from HandyControlDemo/ViewModel/Common/ComboBoxDemoViewModel.cs rename to src/Shared/HandyControlDemo_Shared/ViewModel/Common/ComboBoxDemoViewModel.cs diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs new file mode 100644 index 00000000..d12b1d55 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs @@ -0,0 +1,20 @@ +using System; +using GalaSoft.MvvmLight; +using GalaSoft.MvvmLight.CommandWpf; + +namespace HandyControlDemo.ViewModel.Controls +{ + public class BadgeDemoViewModel : ViewModelBase + { + private int _count = 1; + + public int Count + { + get => _count; + set => Set(ref _count, value); + } + + public RelayCommand CountCmd => new Lazy(() => + new RelayCommand(() => Count++)).Value; + } +} diff --git a/HandyControlDemo/ViewModel/Controls/CoverViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CoverViewModel.cs similarity index 100% rename from HandyControlDemo/ViewModel/Controls/CoverViewModel.cs rename to src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CoverViewModel.cs diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs new file mode 100644 index 00000000..02048357 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs @@ -0,0 +1,41 @@ +using System; +using System.Threading.Tasks; +using GalaSoft.MvvmLight; +using GalaSoft.MvvmLight.CommandWpf; +using HandyControl.Controls; +using HandyControl.Tools.Extension; +using HandyControlDemo.UserControl; +using HandyControlDemo.UserControl.Basic; +using HandyControlDemo.ViewModel.Basic; + +namespace HandyControlDemo.ViewModel +{ + public class DialogDemoViewModel : ViewModelBase + { + private string _dialogResult; + + public string DialogResult + { + get => _dialogResult; + set => Set(ref _dialogResult, value); + } + + public RelayCommand ShowTextCmd => new Lazy(() => + new RelayCommand(ShowText)).Value; + + private void ShowText() + { + Dialog.Show(new TextDialog()); + } + + public RelayCommand ShowInteractiveDialogCmd => new Lazy(() => + new RelayCommand(async () => await ShowInteractiveDialog())).Value; + + private async Task ShowInteractiveDialog() + { + DialogResult = await Dialog.Show() + .Initialize(vm => vm.Message = DialogResult) + .GetResultAsync(); + } + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs new file mode 100644 index 00000000..1dc4ea54 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs @@ -0,0 +1,66 @@ +using System; +using GalaSoft.MvvmLight.CommandWpf; +using HandyControl.Controls; +using HandyControl.Data; +using HandyControlDemo.Window; + +namespace HandyControlDemo.ViewModel +{ + public class GrowlDemoViewModel + { + private readonly string _token; + + public GrowlDemoViewModel() + { + + } + + public GrowlDemoViewModel(string token) + { + _token = token; + } + + public RelayCommand InfoCmd => new Lazy(() => + new RelayCommand(() => Growl.Info(Properties.Langs.Lang.GrowlInfo, _token))).Value; + + public RelayCommand SuccessCmd => new Lazy(() => + new RelayCommand(() => Growl.Success(Properties.Langs.Lang.GrowlSuccess, _token))).Value; + + public RelayCommand WarningCmd => new Lazy(() => + new RelayCommand(() => Growl.Warning(new GrowlInfo + { + Message = Properties.Langs.Lang.GrowlWarning, + CancelStr = Properties.Langs.Lang.Ignore, + ActionBeforeClose = isConfirmed => + { + Growl.Info(isConfirmed.ToString()); + return true; + }, + Token = _token + }))).Value; + + public RelayCommand ErrorCmd => new Lazy(() => + new RelayCommand(() => Growl.Error(Properties.Langs.Lang.GrowlError, _token))).Value; + + public RelayCommand AskCmd => new Lazy(() => + new RelayCommand(() => Growl.Ask(Properties.Langs.Lang.GrowlAsk, isConfirmed => + { + Growl.Info(isConfirmed.ToString()); + return true; + }, _token))).Value; + + public RelayCommand FatalCmd => new Lazy(() => + new RelayCommand(() => Growl.Fatal(new GrowlInfo + { + Message = Properties.Langs.Lang.GrowlFatal, + ShowDateTime = false, + Token = _token + }))).Value; + + public RelayCommand ClearCmd => new Lazy(() => + new RelayCommand(() => Growl.Clear())).Value; + + public RelayCommand NewWindowCmd => new Lazy(() => + new RelayCommand(() => new GrowlDemoWindow().Show())).Value; + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs new file mode 100644 index 00000000..2324a4e7 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs @@ -0,0 +1,13 @@ +using System; +using GalaSoft.MvvmLight.CommandWpf; +using HandyControl.Controls; + +namespace HandyControlDemo.ViewModel +{ + public class ImageBrowserDemoViewModel + { + public RelayCommand OpenImgCmd => new Lazy(() => + new RelayCommand(() => + new ImageBrowser(new Uri("pack://application:,,,/Resources/Img/1.jpg")).Show())).Value; + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs new file mode 100644 index 00000000..77456549 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs @@ -0,0 +1,54 @@ +using System; +using GalaSoft.MvvmLight; +using GalaSoft.MvvmLight.CommandWpf; +using HandyControl.Controls; +using HandyControlDemo.Data; + +namespace HandyControlDemo.ViewModel +{ + public class NotifyIconDemoViewModel : ViewModelBase + { + private bool _contextMenuIsShow; + + public bool ContextMenuIsShow + { + get => _contextMenuIsShow; + set + { + Set(ref _contextMenuIsShow, value); + GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow; + } + } + + private bool _contextMenuIsBlink; + + public bool ContextMenuIsBlink + { + get => _contextMenuIsBlink; + set => Set(ref _contextMenuIsBlink, value); + } + + private bool _contextContentIsShow; + + public bool ContextContentIsShow + { + get => _contextContentIsShow; + set + { + Set(ref _contextContentIsShow, value); + GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow; + } + } + + private bool _contextContentIsBlink; + + public bool ContextContentIsBlink + { + get => _contextContentIsBlink; + set => Set(ref _contextContentIsBlink, value); + } + + public RelayCommand MouseCmd => new Lazy>(() => + new RelayCommand(str=> Growl.Info(str.ToString()))).Value; + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs new file mode 100644 index 00000000..26420e20 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using GalaSoft.MvvmLight.CommandWpf; +using HandyControl.Data; +using HandyControlDemo.Data; +using HandyControlDemo.Service; + +namespace HandyControlDemo.ViewModel +{ + public class PaginationDemoViewModel : DemoViewModelBase + { + /// + /// 所有数据 + /// + private readonly List _totalDataList; + + /// + /// 页码 + /// + private int _pageIndex = 1; + + /// + /// 页码 + /// + public int PageIndex + { + get => _pageIndex; + set => Set(ref _pageIndex, value); + } + + public PaginationDemoViewModel(DataService dataService) + { + _totalDataList = dataService.GetDemoDataList(100); + DataList = _totalDataList.Take(10).ToList(); + } + + /// + /// 页码改变命令 + /// + public RelayCommand> PageUpdatedCmd => + new Lazy>>(() => + new RelayCommand>(PageUpdated)).Value; + + /// + /// 页码改变 + /// + private void PageUpdated(FunctionEventArgs info) + { + DataList = _totalDataList.Skip((info.Info - 1) * 10).Take(10).ToList(); + } + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SearchBarDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SearchBarDemoViewModel.cs new file mode 100644 index 00000000..d854c035 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SearchBarDemoViewModel.cs @@ -0,0 +1,18 @@ +using System; +using GalaSoft.MvvmLight; +using GalaSoft.MvvmLight.CommandWpf; +using HandyControl.Controls; + +namespace HandyControlDemo.ViewModel +{ + public class SearchBarDemoViewModel : ViewModelBase + { + public RelayCommand SearchCmd => new Lazy>(() => + new RelayCommand(Search)).Value; + + private void Search(string key) + { + Growl.Info(key); + } + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs new file mode 100644 index 00000000..d2bba196 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs @@ -0,0 +1,41 @@ +using System; +using System.Linq; +using System.Windows.Controls; +using GalaSoft.MvvmLight.CommandWpf; +using HandyControl.Controls; +using HandyControlDemo.Data; +using HandyControlDemo.Service; + +namespace HandyControlDemo.ViewModel +{ + public class StepBarDemoViewModel : DemoViewModelBase + { + public StepBarDemoViewModel(DataService dataService) => DataList = dataService.GetStepBarDemoDataList(); + + /// + /// 下一步 + /// + public RelayCommand NextCmd => new Lazy>(() => new RelayCommand(Next)).Value; + + /// + /// 上一步 + /// + public RelayCommand PrevCmd => new Lazy>(() => new RelayCommand(Prev)).Value; + + private void Next(Panel panel) + { + foreach (var stepBar in panel.Children.OfType()) + { + stepBar.Next(); + } + } + + private void Prev(Panel panel) + { + foreach (var stepBar in panel.Children.OfType()) + { + stepBar.Prev(); + } + } + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs new file mode 100644 index 00000000..9e694c94 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs @@ -0,0 +1,21 @@ +using System; +using System.Windows; +using GalaSoft.MvvmLight.CommandWpf; +using HandyControlDemo.Tools; + +namespace HandyControlDemo.ViewModel +{ + public class WindowDemoViewModel + { + public RelayCommand OpenWindowCmd => new Lazy>(() => new RelayCommand(OpenWindow)).Value; + + private void OpenWindow(string windowTag) + { + if (AssemblyHelper.CreateInternalInstance($"Window.{windowTag}") is System.Windows.Window window) + { + window.Owner = Application.Current.MainWindow; + window.ShowDialog(); + } + } + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase!1.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase!1.cs new file mode 100644 index 00000000..7714d2db --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase!1.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; +using GalaSoft.MvvmLight; + +namespace HandyControlDemo.ViewModel +{ + public class DemoViewModelBase : ViewModelBase + { + /// + /// 数据列表 + /// + private IList _dataList; + + /// + /// 数据列表 + /// + public IList DataList + { + get => _dataList; + set => Set(ref _dataList, value); + } + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ContributorsViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ContributorsViewModel.cs new file mode 100644 index 00000000..5045e447 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ContributorsViewModel.cs @@ -0,0 +1,17 @@ +using System.Threading.Tasks; +using HandyControlDemo.Data; +using HandyControlDemo.Service; + +namespace HandyControlDemo.ViewModel +{ + public class ContributorsViewModel : DemoViewModelBase + { + public ContributorsViewModel(DataService dataService) + { + Task.Run(() => + { + DataList = dataService.GetContributorDataList(); + }); + } + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs new file mode 100644 index 00000000..b580666f --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs @@ -0,0 +1,113 @@ +using System; +using System.Windows.Controls; +using GalaSoft.MvvmLight.CommandWpf; +using GalaSoft.MvvmLight.Messaging; +using HandyControlDemo.Data; +using HandyControlDemo.Service; +using HandyControlDemo.Tools; + +namespace HandyControlDemo.ViewModel +{ + public class MainViewModel : DemoViewModelBase + { + #region 字段 + + /// + /// 内容标题 + /// + private object _contentTitle; + + /// + /// 子内容 + /// + private object _subContent; + + /// + /// 当前选中的列表项 + /// + private ListBoxItem _listBoxItemCurrent; + + #endregion + + public MainViewModel(DataService dataService) + { + Messenger.Default.Register(this, MessageToken.LoadShowContent, obj => + { + if (SubContent is IDisposable disposable) + { + disposable.Dispose(); + } + SubContent = obj; + }); + Messenger.Default.Register(this, MessageToken.ClearLeftSelected, obj => + { + if (_listBoxItemCurrent == null) return; + _listBoxItemCurrent.IsSelected = false; + _listBoxItemCurrent = null; + }); + DataList = dataService.GetDemoDataList(); + } + + #region 属性 + + /// + /// 子内容 + /// + public object SubContent + { + get => _subContent; + set => Set(ref _subContent, value); + } + + /// + /// 内容标题 + /// + public object ContentTitle + { + get => _contentTitle; + set => Set(ref _contentTitle, value); + } + + #endregion + + #region 命令 + + /// + /// 切换例子命令 + /// + public RelayCommand SwitchDemoCmd => + new Lazy>(() => + new RelayCommand(SwitchDemo)).Value; + + #endregion + + #region 方法 + + /// + /// 切换例子 + /// + private void SwitchDemo(SelectionChangedEventArgs e) + { + if (e.AddedItems.Count == 0) return; + if (e.AddedItems[0] is ListBoxItem item) + { + if (item.Tag is string tag) + { + if (Equals(_listBoxItemCurrent, item)) return; + _listBoxItemCurrent = item; + ContentTitle = item.Content; + Messenger.Default.Send(false, MessageToken.FullSwitch); + Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{tag}"), MessageToken.LoadShowContent); + } + else + { + _listBoxItemCurrent = null; + ContentTitle = null; + SubContent = null; + } + } + } + + #endregion + } +} \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs new file mode 100644 index 00000000..e7f59c12 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs @@ -0,0 +1,76 @@ +using System; +using System.Windows; +using CommonServiceLocator; +using GalaSoft.MvvmLight.Ioc; +using HandyControlDemo.Data; +using HandyControlDemo.Service; +using HandyControlDemo.ViewModel.Basic; +using HandyControlDemo.ViewModel.Controls; + +namespace HandyControlDemo.ViewModel +{ + public class ViewModelLocator + { + public ViewModelLocator() + { + ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default); + + SimpleIoc.Default.Register(); + + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(() => new GrowlDemoViewModel(), "GrowlDemo"); + SimpleIoc.Default.Register(() => new GrowlDemoViewModel(MessageToken.GrowlDemoPanel), "GrowlDemoWithToken"); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); + } + + public static ViewModelLocator Instance => new Lazy(() => + Application.Current.TryFindResource("Locator") as ViewModelLocator).Value; + + #region Vm + + public MainViewModel Main => ServiceLocator.Current.GetInstance(); + + public GrowlDemoViewModel GrowlDemo => ServiceLocator.Current.GetInstance("GrowlDemo"); + + public GrowlDemoViewModel GrowlDemoWithToken => ServiceLocator.Current.GetInstance("GrowlDemoWithToken"); + + public ImageBrowserDemoViewModel ImageBrowserDemo => ServiceLocator.Current.GetInstance(); + + public ComboBoxDemoViewModel ComboBoxDemo => ServiceLocator.Current.GetInstance(); + + public WindowDemoViewModel WindowDemo => ServiceLocator.Current.GetInstance(); + + public ContributorsViewModel ContributorsView => ServiceLocator.Current.GetInstance(); + + public StepBarDemoViewModel StepBarDemo => ServiceLocator.Current.GetInstance(); + + public PaginationDemoViewModel PaginationDemo => ServiceLocator.Current.GetInstance(); + + public ChatBoxViewModel ChatBox => new ChatBoxViewModel(); + + public CoverViewModel CoverView => ServiceLocator.Current.GetInstance(); + + public DialogDemoViewModel DialogDemo => ServiceLocator.Current.GetInstance(); + + public SearchBarDemoViewModel SearchBarDemo => ServiceLocator.Current.GetInstance(); + + public NotifyIconDemoViewModel NotifyIconDemo => ServiceLocator.Current.GetInstance(); + + public InteractiveDialogViewModel InteractiveDialog => ServiceLocator.Current.GetInstance(); + + public BadgeDemoViewModel BadgeDemo => ServiceLocator.Current.GetInstance(); + #endregion + } +} \ No newline at end of file diff --git a/HandyControlDemo/Window/AboutWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml similarity index 100% rename from HandyControlDemo/Window/AboutWindow.xaml rename to src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml diff --git a/Net35/HandyControlDemo_Net35/Window/AboutWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/Window/AboutWindow.xaml.cs rename to src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs diff --git a/Net35/HandyControlDemo_Net35/Window/BlurWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml similarity index 100% rename from Net35/HandyControlDemo_Net35/Window/BlurWindow.xaml rename to src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml diff --git a/Net35/HandyControlDemo_Net35/Window/BlurWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/Window/BlurWindow.xaml.cs rename to src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml.cs diff --git a/Net35/HandyControlDemo_Net35/Window/CommonWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml similarity index 100% rename from Net35/HandyControlDemo_Net35/Window/CommonWindow.xaml rename to src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml diff --git a/Net35/HandyControlDemo_Net35/Window/CommonWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/Window/CommonWindow.xaml.cs rename to src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml.cs diff --git a/Net35/HandyControlDemo_Net35/Window/CustomNonClientAreaWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml similarity index 100% rename from Net35/HandyControlDemo_Net35/Window/CustomNonClientAreaWindow.xaml rename to src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml diff --git a/Net35/HandyControlDemo_Net35/Window/CustomNonClientAreaWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/Window/CustomNonClientAreaWindow.xaml.cs rename to src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml.cs diff --git a/HandyControlDemo/Window/GrowlDemoWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml similarity index 100% rename from HandyControlDemo/Window/GrowlDemoWindow.xaml rename to src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml diff --git a/HandyControlDemo/Window/GrowlDemoWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml.cs similarity index 100% rename from HandyControlDemo/Window/GrowlDemoWindow.xaml.cs rename to src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml.cs diff --git a/HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml similarity index 100% rename from HandyControlDemo/Window/NoNonClientAreaDragableWindow.xaml rename to src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml diff --git a/Net35/HandyControlDemo_Net35/Window/NoNonClientAreaDragableWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml.cs similarity index 100% rename from Net35/HandyControlDemo_Net35/Window/NoNonClientAreaDragableWindow.xaml.cs rename to src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml.cs diff --git a/Net35/HandyControl_Net35/Controls/Attach/BackgroundSwitchElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/BackgroundSwitchElement.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Attach/BackgroundSwitchElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/BackgroundSwitchElement.cs diff --git a/HandyControl/Controls/Attach/BorderElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs similarity index 100% rename from HandyControl/Controls/Attach/BorderElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs diff --git a/HandyControl/Controls/Attach/DataGridAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs similarity index 100% rename from HandyControl/Controls/Attach/DataGridAttach.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs diff --git a/Net35/HandyControl_Net35/Controls/Attach/EdgeElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Attach/EdgeElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs diff --git a/Net35/HandyControl_Net35/Controls/Attach/IconElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/IconElement.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Attach/IconElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/IconElement.cs diff --git a/Net35/HandyControl_Net35/Controls/Attach/IconSwitchElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/IconSwitchElement.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Attach/IconSwitchElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/IconSwitchElement.cs diff --git a/Net35/HandyControl_Net35/Controls/Attach/InfoElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Attach/InfoElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs diff --git a/HandyControl/Controls/Attach/LinkElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/LinkElement.cs similarity index 100% rename from HandyControl/Controls/Attach/LinkElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/LinkElement.cs diff --git a/HandyControl/Controls/Attach/PanelElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/PanelElement.cs similarity index 100% rename from HandyControl/Controls/Attach/PanelElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/PanelElement.cs diff --git a/Net35/HandyControl_Net35/Controls/Attach/PasswordBoxMonitor.cs b/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxMonitor.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Attach/PasswordBoxMonitor.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxMonitor.cs diff --git a/Net35/HandyControl_Net35/Controls/Attach/StatusSwitchElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Attach/StatusSwitchElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs diff --git a/Net35/HandyControl_Net35/Controls/Attach/TipElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Attach/TipElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs diff --git a/Net35/HandyControl_Net35/Controls/Attach/TitleElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Attach/TitleElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs diff --git a/HandyControl/Controls/Attach/VisualElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs similarity index 100% rename from HandyControl/Controls/Attach/VisualElement.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs diff --git a/HandyControl/Controls/Attach/WindowAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs similarity index 100% rename from HandyControl/Controls/Attach/WindowAttach.cs rename to src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs diff --git a/HandyControl/Controls/Base/HeaderedSelectableItem.cs b/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSelectableItem.cs similarity index 100% rename from HandyControl/Controls/Base/HeaderedSelectableItem.cs rename to src/Shared/HandyControl_Shared/Controls/Base/HeaderedSelectableItem.cs diff --git a/HandyControl/Controls/Base/IGravatarGenerator.cs b/src/Shared/HandyControl_Shared/Controls/Base/IGravatarGenerator.cs similarity index 100% rename from HandyControl/Controls/Base/IGravatarGenerator.cs rename to src/Shared/HandyControl_Shared/Controls/Base/IGravatarGenerator.cs diff --git a/Net35/HandyControl_Net35/Controls/Base/ISelectable.cs b/src/Shared/HandyControl_Shared/Controls/Base/ISelectable.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Base/ISelectable.cs rename to src/Shared/HandyControl_Shared/Controls/Base/ISelectable.cs diff --git a/Net35/HandyControl_Net35/Controls/Base/ISingleOpen.cs b/src/Shared/HandyControl_Shared/Controls/Base/ISingleOpen.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Base/ISingleOpen.cs rename to src/Shared/HandyControl_Shared/Controls/Base/ISingleOpen.cs diff --git a/Net35/HandyControl_Net35/Controls/Base/RegularItemsControl.cs b/src/Shared/HandyControl_Shared/Controls/Base/RegularItemsControl.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Base/RegularItemsControl.cs rename to src/Shared/HandyControl_Shared/Controls/Base/RegularItemsControl.cs diff --git a/HandyControl/Controls/Base/SelectableItem.cs b/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs similarity index 100% rename from HandyControl/Controls/Base/SelectableItem.cs rename to src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs diff --git a/HandyControl/Controls/Base/SimpleItemsControl.cs b/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs similarity index 100% rename from HandyControl/Controls/Base/SimpleItemsControl.cs rename to src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs diff --git a/Net35/HandyControl_Net35/Controls/Button/ContextMenuButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuButton.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Button/ContextMenuButton.cs rename to src/Shared/HandyControl_Shared/Controls/Button/ContextMenuButton.cs diff --git a/Net35/HandyControl_Net35/Controls/Button/ContextMenuToggleButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuToggleButton.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Button/ContextMenuToggleButton.cs rename to src/Shared/HandyControl_Shared/Controls/Button/ContextMenuToggleButton.cs diff --git a/HandyControl/Controls/Button/ProgressButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/ProgressButton.cs similarity index 100% rename from HandyControl/Controls/Button/ProgressButton.cs rename to src/Shared/HandyControl_Shared/Controls/Button/ProgressButton.cs diff --git a/HandyControl/Controls/Cover/CoverFlow/CoverFlow.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs similarity index 100% rename from HandyControl/Controls/Cover/CoverFlow/CoverFlow.cs rename to src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs diff --git a/Net35/HandyControl_Net35/Controls/CoverFlow/CoverFlowItem.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlowItem.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/CoverFlow/CoverFlowItem.cs rename to src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlowItem.cs diff --git a/HandyControl/Controls/Cover/CoverView/CoverView.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs similarity index 100% rename from HandyControl/Controls/Cover/CoverView/CoverView.cs rename to src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs diff --git a/HandyControl/Controls/Cover/CoverView/CoverViewContent.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs similarity index 100% rename from HandyControl/Controls/Cover/CoverView/CoverViewContent.cs rename to src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs diff --git a/Net35/HandyControl_Net35/Controls/CoverView/CoverViewItem.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewItem.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/CoverView/CoverViewItem.cs rename to src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewItem.cs diff --git a/Net35/HandyControl_Net35/Controls/Image/GifImage.cs b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Image/GifImage.cs rename to src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs diff --git a/HandyControl/Controls/Image/ImageViewer.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs similarity index 100% rename from HandyControl/Controls/Image/ImageViewer.cs rename to src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs diff --git a/Net35/HandyControl_Net35/Controls/Input/ComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Input/ComboBox.cs rename to src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs diff --git a/HandyControl/Controls/Input/DatePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs similarity index 100% rename from HandyControl/Controls/Input/DatePicker.cs rename to src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs diff --git a/HandyControl/Controls/Input/DateTimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs similarity index 100% rename from HandyControl/Controls/Input/DateTimePicker.cs rename to src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs diff --git a/Net35/HandyControl_Net35/Controls/Input/IDataInput.cs b/src/Shared/HandyControl_Shared/Controls/Input/IDataInput.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Input/IDataInput.cs rename to src/Shared/HandyControl_Shared/Controls/Input/IDataInput.cs diff --git a/Net35/HandyControl_Net35/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Input/NumericUpDown.cs rename to src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs diff --git a/HandyControl/Controls/Input/PasswordBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs similarity index 100% rename from HandyControl/Controls/Input/PasswordBox.cs rename to src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs diff --git a/HandyControl/Controls/Input/SearchBar.cs b/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs similarity index 100% rename from HandyControl/Controls/Input/SearchBar.cs rename to src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs diff --git a/Net35/HandyControl_Net35/Controls/Input/TextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Input/TextBox.cs rename to src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs diff --git a/HandyControl/Controls/Input/TimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs similarity index 100% rename from HandyControl/Controls/Input/TimePicker.cs rename to src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs diff --git a/HandyControl/Controls/Input/WatermarkTextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/WatermarkTextBox.cs similarity index 100% rename from HandyControl/Controls/Input/WatermarkTextBox.cs rename to src/Shared/HandyControl_Shared/Controls/Input/WatermarkTextBox.cs diff --git a/Net35/HandyControl_Net35/Controls/Internal/InternalCanvas.cs b/src/Shared/HandyControl_Shared/Controls/Internal/InternalCanvas.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Internal/InternalCanvas.cs rename to src/Shared/HandyControl_Shared/Controls/Internal/InternalCanvas.cs diff --git a/Net35/HandyControl_Net35/Controls/Loading/LoadingBase.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Loading/LoadingBase.cs rename to src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs diff --git a/HandyControl/Controls/Loading/LoadingCircle.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs similarity index 100% rename from HandyControl/Controls/Loading/LoadingCircle.cs rename to src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs diff --git a/HandyControl/Controls/Loading/LoadingLine.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs similarity index 100% rename from HandyControl/Controls/Loading/LoadingLine.cs rename to src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs diff --git a/HandyControl/Controls/Other/AnimationPath.cs b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs similarity index 100% rename from HandyControl/Controls/Other/AnimationPath.cs rename to src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs diff --git a/HandyControl/Controls/Other/Badge.cs b/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs similarity index 100% rename from HandyControl/Controls/Other/Badge.cs rename to src/Shared/HandyControl_Shared/Controls/Other/Badge.cs diff --git a/Net35/HandyControl_Net35/Controls/Other/Carousel.cs b/src/Shared/HandyControl_Shared/Controls/Other/Carousel.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Other/Carousel.cs rename to src/Shared/HandyControl_Shared/Controls/Other/Carousel.cs diff --git a/HandyControl/Controls/Other/ChatBubble.cs b/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs similarity index 100% rename from HandyControl/Controls/Other/ChatBubble.cs rename to src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs diff --git a/Net35/HandyControl_Net35/Controls/Other/ColorPicker.cs b/src/Shared/HandyControl_Shared/Controls/Other/ColorPicker.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Other/ColorPicker.cs rename to src/Shared/HandyControl_Shared/Controls/Other/ColorPicker.cs diff --git a/HandyControl/Controls/Other/Dialog.cs b/src/Shared/HandyControl_Shared/Controls/Other/Dialog.cs similarity index 100% rename from HandyControl/Controls/Other/Dialog.cs rename to src/Shared/HandyControl_Shared/Controls/Other/Dialog.cs diff --git a/HandyControl/Controls/Other/GotoTop.cs b/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs similarity index 100% rename from HandyControl/Controls/Other/GotoTop.cs rename to src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs diff --git a/HandyControl/Controls/Other/Gravatar.cs b/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs similarity index 100% rename from HandyControl/Controls/Other/Gravatar.cs rename to src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Growl.cs b/src/Shared/HandyControl_Shared/Controls/Other/Growl.cs new file mode 100644 index 00000000..31b3c932 --- /dev/null +++ b/src/Shared/HandyControl_Shared/Controls/Other/Growl.cs @@ -0,0 +1,601 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Threading; +using HandyControl.Data; +using HandyControl.Interactivity; +using HandyControl.Tools; +using HandyControl.Tools.Extension; + +namespace HandyControl.Controls +{ + /// + /// 消息提醒 + /// + [TemplatePart(Name = ElementPanelMore, Type = typeof(Panel))] + [TemplatePart(Name = ElementGridMain, Type = typeof(Grid))] + [TemplatePart(Name = ElementButtonClose, Type = typeof(Button))] + public class Growl : Control + { + #region Constants + + private const string ElementPanelMore = "PART_PanelMore"; + private const string ElementGridMain = "PART_GridMain"; + private const string ElementButtonClose = "PART_ButtonClose"; + + #endregion Constants + + #region Data + + private Panel _panelMore; + + private Grid _gridMain; + + private Button _buttonClose; + + private bool _showCloseButton; + + private bool _staysOpen; + + private int _waitTime = 6; + + /// + /// 计数 + /// + private int _tickCount; + + /// + /// 关闭计时器 + /// + private DispatcherTimer _timerClose; + + private static readonly Dictionary PanelDic = new Dictionary(); + + #endregion Data + + public Growl() + { + CommandBindings.Add(new CommandBinding(ControlCommands.Close, ButtonClose_OnClick)); + CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, ButtonCancel_OnClick)); + CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, ButtonOk_OnClick)); + } + + public static void Register(string token, Panel panel) + { + if (string.IsNullOrEmpty(token) || panel == null) return; + PanelDic[token] = panel; + InitGrowlPanel(panel); + } + + public static void Unregister(string token, Panel panel) + { + if (string.IsNullOrEmpty(token) || panel == null) return; + + if (PanelDic.ContainsKey(token)) + { + if (ReferenceEquals(PanelDic[token], panel)) + { + PanelDic.Remove(token); + panel.ContextMenu = null; + panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue); + } + } + } + + public static void Unregister(Panel panel) + { + if (panel == null) return; + var first = PanelDic.FirstOrDefault(item => ReferenceEquals(panel, item.Value)); + if (!string.IsNullOrEmpty(first.Key)) + { + PanelDic.Remove(first.Key); + panel.ContextMenu = null; + panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue); + } + } + + protected override void OnMouseEnter(MouseEventArgs e) + { + base.OnMouseEnter(e); + + _buttonClose.Show(_showCloseButton); + } + + protected override void OnMouseLeave(MouseEventArgs e) + { + base.OnMouseLeave(e); + + _buttonClose.Collapse(); + } + + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + + _panelMore = GetTemplateChild(ElementPanelMore) as Panel; + _gridMain = GetTemplateChild(ElementGridMain) as Grid; + _buttonClose = GetTemplateChild(ElementButtonClose) as Button; + + CheckNull(); + Update(); + } + + private void CheckNull() + { + if (_panelMore == null || _gridMain == null || _buttonClose == null) throw new Exception(); + } + + private Func ActionBeforeClose { get; set; } + + /// + /// 消息容器 + /// + public static Panel GrowlPanel { get; set; } + + internal static readonly DependencyProperty CancelStrProperty = DependencyProperty.Register( + "CancelStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string))); + + internal static readonly DependencyProperty ConfirmStrProperty = DependencyProperty.Register( + "ConfirmStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string))); + + public static readonly DependencyProperty ShowDateTimeProperty = DependencyProperty.Register( + "ShowDateTime", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.TrueBox)); + + public static readonly DependencyProperty MessageProperty = DependencyProperty.Register( + "Message", typeof(string), typeof(Growl), new PropertyMetadata(default(string))); + + public static readonly DependencyProperty TimeProperty = DependencyProperty.Register( + "Time", typeof(DateTime), typeof(Growl), new PropertyMetadata(default(DateTime))); + + public static readonly DependencyProperty IconProperty = DependencyProperty.Register( + "Icon", typeof(Geometry), typeof(Growl), new PropertyMetadata(default(Geometry))); + + public static readonly DependencyProperty IconBrushProperty = DependencyProperty.Register( + "IconBrush", typeof(Brush), typeof(Growl), new PropertyMetadata(default(Brush))); + + public static readonly DependencyProperty TypeProperty = DependencyProperty.Register( + "Type", typeof(InfoType), typeof(Growl), new PropertyMetadata(default(InfoType))); + + public static readonly DependencyProperty GrowlParentProperty = DependencyProperty.RegisterAttached( + "GrowlParent", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.FalseBox, (o, args) => + { + if ((bool)args.NewValue && o is Panel panel) + { + SetGrowlPanel(panel); + } + })); + + public static readonly DependencyProperty TokenProperty = DependencyProperty.RegisterAttached( + "Token", typeof(string), typeof(Growl), new PropertyMetadata(default(string), OnTokenChanged)); + + private static void OnTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + if (d is Panel panel) + { + if (e.NewValue == null) + { + Unregister(panel); + } + else + { + Register(e.NewValue.ToString(), panel); + } + } + } + + public static void SetToken(DependencyObject element, string value) + => element.SetValue(TokenProperty, value); + + public static string GetToken(DependencyObject element) + => (string) element.GetValue(TokenProperty); + + public static void SetGrowlParent(DependencyObject element, bool value) => element.SetValue(GrowlParentProperty, value); + + public static bool GetGrowlParent(DependencyObject element) => (bool)element.GetValue(GrowlParentProperty); + + public InfoType Type + { + get => (InfoType)GetValue(TypeProperty); + set => SetValue(TypeProperty, value); + } + + internal string CancelStr + { + get => (string)GetValue(CancelStrProperty); + set => SetValue(CancelStrProperty, value); + } + + internal string ConfirmStr + { + get => (string)GetValue(ConfirmStrProperty); + set => SetValue(ConfirmStrProperty, value); + } + + public bool ShowDateTime + { + get => (bool)GetValue(ShowDateTimeProperty); + set => SetValue(ShowDateTimeProperty, value); + } + + public string Message + { + get => (string)GetValue(MessageProperty); + set => SetValue(MessageProperty, value); + } + + public DateTime Time + { + get => (DateTime)GetValue(TimeProperty); + set => SetValue(TimeProperty, value); + } + + public Geometry Icon + { + get => (Geometry)GetValue(IconProperty); + set => SetValue(IconProperty, value); + } + + public Brush IconBrush + { + get => (Brush)GetValue(IconBrushProperty); + set => SetValue(IconBrushProperty, value); + } + + /// + /// 开始计时器 + /// + private void StartTimer() + { + _timerClose = new DispatcherTimer + { + Interval = TimeSpan.FromSeconds(1) + }; + _timerClose.Tick += delegate + { + if (IsMouseOver) + { + _tickCount = 0; + return; + } + + _tickCount++; + if (_tickCount >= _waitTime) Close(); + }; + _timerClose.Start(); + } + + /// + /// 消息容器 + /// + /// + private static void SetGrowlPanel(Panel panel) + { + GrowlPanel = panel; + InitGrowlPanel(panel); + } + + private static void InitGrowlPanel(Panel panel) + { + var menuItem = new MenuItem + { + Header = Properties.Langs.Lang.Clear + }; + menuItem.Click += (s, e) => + { + foreach (var item in panel.Children.OfType()) + { + item.Close(); + } + }; + panel.ContextMenu = new ContextMenu + { + Items = + { + menuItem + } + }; + + PanelElement.SetFluidMoveBehavior(panel, ResourceHelper.GetResource(ResourceToken.BehaviorXY400)); + } + + private void Update() + { + if (ActionBeforeClose != null) + { + _staysOpen = true; + _showCloseButton = false; + _panelMore.IsEnabled = true; + _panelMore.Show(); + } + + var transform = new TranslateTransform + { + X = MaxWidth + }; + _gridMain.RenderTransform = transform; + transform.BeginAnimation(TranslateTransform.XProperty, AnimationHelper.CreateAnimation(0)); + if (!_staysOpen) StartTimer(); + } + + /// + /// 显示信息 + /// + /// + private static void Show(GrowlInfo growlInfo) + { + Application.Current.Dispatcher.Invoke(() => + { + var ctl = new Growl + { + Message = growlInfo.Message, + Time = DateTime.Now, + Icon = ResourceHelper.GetResource(growlInfo.IconKey), + IconBrush = ResourceHelper.GetResource(growlInfo.IconBrushKey), + _showCloseButton = growlInfo.ShowCloseButton, + ActionBeforeClose = growlInfo.ActionBeforeClose, + _staysOpen = growlInfo.StaysOpen, + ShowDateTime = growlInfo.ShowDateTime, + ConfirmStr = growlInfo.ConfirmStr, + CancelStr = growlInfo.CancelStr, + Type = growlInfo.Type, + _waitTime = Math.Max(growlInfo.WaitTime, 2) + }; + if (!string.IsNullOrEmpty(growlInfo.Token)) + { + if (PanelDic.TryGetValue(growlInfo.Token, out var panel)) + { + panel?.Children.Insert(0, ctl); + } + } + else + { + GrowlPanel.Children.Insert(0, ctl); + } + }); + } + + /// + /// 成功 + /// + /// + /// + public static void Success(string message, string token = "") => Success(new GrowlInfo + { + Message = message, + Token = token + }); + + /// + /// 成功 + /// + /// + public static void Success(GrowlInfo growlInfo) + { + if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); + if (!growlInfo.IsCustom) + { + growlInfo.IconKey = ResourceToken.SuccessGeometry; + growlInfo.IconBrushKey = ResourceToken.SuccessBrush; + growlInfo.Type = InfoType.Success; + } + Show(growlInfo); + } + + /// + /// 消息 + /// + /// + /// + public static void Info(string message, string token = "") => Info(new GrowlInfo + { + Message = message, + Token = token + }); + + /// + /// 消息 + /// + /// + public static void Info(GrowlInfo growlInfo) + { + if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); + if (!growlInfo.IsCustom) + { + growlInfo.IconKey = ResourceToken.InfoGeometry; + growlInfo.IconBrushKey = ResourceToken.InfoBrush; + growlInfo.Type = InfoType.Info; + } + Show(growlInfo); + } + + /// + /// 警告 + /// + /// + /// + public static void Warning(string message, string token = "") => Warning(new GrowlInfo + { + Message = message, + Token = token + }); + + /// + /// 警告 + /// + /// + public static void Warning(GrowlInfo growlInfo) + { + if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); + if (!growlInfo.IsCustom) + { + growlInfo.IconKey = ResourceToken.WarningGeometry; + growlInfo.IconBrushKey = ResourceToken.WarningBrush; + growlInfo.Type = InfoType.Warning; + } + Show(growlInfo); + } + + /// + /// 错误 + /// + /// + /// + public static void Error(string message, string token = "") => Error(new GrowlInfo + { + Message = message, + Token = token + }); + + /// + /// 错误 + /// + /// + public static void Error(GrowlInfo growlInfo) + { + if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); + if (!growlInfo.IsCustom) + { + growlInfo.IconKey = ResourceToken.ErrorGeometry; + growlInfo.IconBrushKey = ResourceToken.DangerBrush; + growlInfo.StaysOpen = true; + growlInfo.Type = InfoType.Error; + } + Show(growlInfo); + } + + /// + /// 严重 + /// + /// + /// + public static void Fatal(string message, string token = "") => Fatal(new GrowlInfo + { + Message = message, + Token = token + }); + + /// + /// 严重 + /// + /// + public static void Fatal(GrowlInfo growlInfo) + { + if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); + if (!growlInfo.IsCustom) + { + growlInfo.IconKey = ResourceToken.FatalGeometry; + growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush; + growlInfo.StaysOpen = true; + growlInfo.ShowCloseButton = false; + growlInfo.Type = InfoType.Fatal; + if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0; + } + Show(growlInfo); + } + + /// + /// 询问 + /// + /// + /// + /// + public static void Ask(string message, Func actionBeforeClose, string token = "") => Ask(new GrowlInfo + { + Message = message, + ActionBeforeClose = actionBeforeClose, + Token = token + }); + + /// + /// 询问 + /// + /// + public static void Ask(GrowlInfo growlInfo) + { + if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo)); + if (!growlInfo.IsCustom) + { + growlInfo.IconKey = ResourceToken.AskGeometry; + growlInfo.IconBrushKey = ResourceToken.AccentBrush; + growlInfo.StaysOpen = true; + growlInfo.ShowCloseButton = false; + growlInfo.Type = InfoType.Ask; + } + Show(growlInfo); + } + + private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close(); + + /// + /// 关闭 + /// + private void Close() + { + _timerClose?.Stop(); + var transform = new TranslateTransform(); + _gridMain.RenderTransform = transform; + var animation = AnimationHelper.CreateAnimation(MaxWidth); + animation.Completed += (s, e) => + { + if (Parent is Panel panel) + { + panel.Children.Remove(this); + } + }; + transform.BeginAnimation(TranslateTransform.XProperty, animation); + } + + /// + /// 清除 + /// + /// + public static void Clear(string token = "") + { + if (!string.IsNullOrEmpty(token)) + { + if (PanelDic.TryGetValue(token, out var panel)) + { + Clear(panel); + } + } + else + { + Clear(GrowlPanel); + } + } + + /// + /// 清除 + /// + /// + private static void Clear(Panel panel) + { + panel.Children.Clear(); + if (panel.ContextMenu != null) + { + panel.ContextMenu.IsOpen = false; + panel.ContextMenu.Opacity = 1; + } + } + + private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) + { + if (ActionBeforeClose?.Invoke(false) == true) + { + Close(); + } + } + + private void ButtonOk_OnClick(object sender, RoutedEventArgs e) + { + if (ActionBeforeClose?.Invoke(true) == true) + { + Close(); + } + } + } +} \ No newline at end of file diff --git a/HandyControl/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs similarity index 100% rename from HandyControl/Controls/Other/NotifyIcon.cs rename to src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs diff --git a/Net35/HandyControl_Net35/Controls/Other/Pagination.cs b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Other/Pagination.cs rename to src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs diff --git a/Net35/HandyControl_Net35/Controls/Other/RadioGroup.cs b/src/Shared/HandyControl_Shared/Controls/Other/RadioGroup.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Other/RadioGroup.cs rename to src/Shared/HandyControl_Shared/Controls/Other/RadioGroup.cs diff --git a/HandyControl/Controls/Other/ScrollViewer.cs b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs similarity index 100% rename from HandyControl/Controls/Other/ScrollViewer.cs rename to src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs diff --git a/Net35/HandyControl_Net35/Controls/Other/Shield.cs b/src/Shared/HandyControl_Shared/Controls/Other/Shield.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Other/Shield.cs rename to src/Shared/HandyControl_Shared/Controls/Other/Shield.cs diff --git a/HandyControl/Controls/Other/TransitioningContentControl.cs b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs similarity index 100% rename from HandyControl/Controls/Other/TransitioningContentControl.cs rename to src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs diff --git a/Net35/HandyControl_Net35/Controls/Panel/CirclePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Panel/CirclePanel.cs rename to src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs diff --git a/HandyControl/Controls/Panel/SimplePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs similarity index 100% rename from HandyControl/Controls/Panel/SimplePanel.cs rename to src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs diff --git a/Net35/HandyControl_Net35/Controls/Panel/WaterfallPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/WaterfallPanel.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Panel/WaterfallPanel.cs rename to src/Shared/HandyControl_Shared/Controls/Panel/WaterfallPanel.cs diff --git a/Net35/HandyControl_Net35/Controls/Other/CircleProgressBar.cs b/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Other/CircleProgressBar.cs rename to src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs diff --git a/HandyControl/Controls/ProgressBar/WaveProgressBar.cs b/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs similarity index 100% rename from HandyControl/Controls/ProgressBar/WaveProgressBar.cs rename to src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs diff --git a/Net35/HandyControl_Net35/Controls/Rate/Rate.cs b/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Rate/Rate.cs rename to src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs diff --git a/Net35/HandyControl_Net35/Controls/Rate/RateItem.cs b/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Rate/RateItem.cs rename to src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs diff --git a/HandyControl/Controls/Slider/CompareSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider.cs similarity index 100% rename from HandyControl/Controls/Slider/CompareSlider.cs rename to src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider.cs diff --git a/Net35/HandyControl_Net35/Controls/Slider/CompareTrack.cs b/src/Shared/HandyControl_Shared/Controls/Slider/CompareTrack.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Slider/CompareTrack.cs rename to src/Shared/HandyControl_Shared/Controls/Slider/CompareTrack.cs diff --git a/Net35/HandyControl_Net35/Controls/Slider/PreviewSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Slider/PreviewSlider.cs rename to src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs diff --git a/Net35/HandyControl_Net35/Controls/StepBar/StepBar.cs b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/StepBar/StepBar.cs rename to src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs diff --git a/Net35/HandyControl_Net35/Controls/StepBar/StepBarItem.cs b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBarItem.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/StepBar/StepBarItem.cs rename to src/Shared/HandyControl_Shared/Controls/StepBar/StepBarItem.cs diff --git a/Net35/HandyControl_Net35/Controls/TabControl/TabControl.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/TabControl/TabControl.cs rename to src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs diff --git a/HandyControl/Controls/TabControl/TabItem.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs similarity index 100% rename from HandyControl/Controls/TabControl/TabItem.cs rename to src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs diff --git a/Net35/HandyControl_Net35/Controls/TabControl/TabPanel.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/TabControl/TabPanel.cs rename to src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs diff --git a/HandyControl/Controls/Text/OutlineText.cs b/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs similarity index 100% rename from HandyControl/Controls/Text/OutlineText.cs rename to src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs diff --git a/Net35/HandyControl_Net35/Controls/Text/Tag/Tag.cs b/src/Shared/HandyControl_Shared/Controls/Text/Tag/Tag.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Text/Tag/Tag.cs rename to src/Shared/HandyControl_Shared/Controls/Text/Tag/Tag.cs diff --git a/HandyControl/Controls/Text/Tag/TagPanel.cs b/src/Shared/HandyControl_Shared/Controls/Text/Tag/TagPanel.cs similarity index 100% rename from HandyControl/Controls/Text/Tag/TagPanel.cs rename to src/Shared/HandyControl_Shared/Controls/Text/Tag/TagPanel.cs diff --git a/HandyControl/Controls/Time/CalendarWithClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs similarity index 100% rename from HandyControl/Controls/Time/CalendarWithClock.cs rename to src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs diff --git a/Net35/HandyControl_Net35/Controls/Time/Clock/Clock.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/Clock.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Time/Clock/Clock.cs rename to src/Shared/HandyControl_Shared/Controls/Time/Clock/Clock.cs diff --git a/Net35/HandyControl_Net35/Controls/Time/Clock/ClockRadioButton.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockRadioButton.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Time/Clock/ClockRadioButton.cs rename to src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockRadioButton.cs diff --git a/Net35/HandyControl_Net35/Controls/Time/FlipClock/FlipClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Time/FlipClock/FlipClock.cs rename to src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs diff --git a/Net35/HandyControl_Net35/Controls/Time/FlipClock/FlipNumber.cs b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipNumber.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Time/FlipClock/FlipNumber.cs rename to src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipNumber.cs diff --git a/Net35/HandyControl_Net35/Controls/Time/TimeBar/SpeTextBlock.cs b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/SpeTextBlock.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Time/TimeBar/SpeTextBlock.cs rename to src/Shared/HandyControl_Shared/Controls/Time/TimeBar/SpeTextBlock.cs diff --git a/Net35/HandyControl_Net35/Controls/Time/TimeBar/TimeBar.cs b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Time/TimeBar/TimeBar.cs rename to src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs diff --git a/HandyControl/Controls/Transfer/Transfer.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs similarity index 100% rename from HandyControl/Controls/Transfer/Transfer.cs rename to src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs diff --git a/HandyControl/Controls/Transfer/TransferGroup.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs similarity index 100% rename from HandyControl/Controls/Transfer/TransferGroup.cs rename to src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs diff --git a/HandyControl/Controls/Transfer/TransferItem.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs similarity index 100% rename from HandyControl/Controls/Transfer/TransferItem.cs rename to src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs diff --git a/Net35/HandyControl_Net35/Controls/Window/BlurWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Window/BlurWindow.cs rename to src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs diff --git a/HandyControl/Controls/Window/ImageBrowser.cs b/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs similarity index 100% rename from HandyControl/Controls/Window/ImageBrowser.cs rename to src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs diff --git a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs new file mode 100644 index 00000000..67342fd7 --- /dev/null +++ b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs @@ -0,0 +1,436 @@ +using System; +using System.ComponentModel; +using System.Text; +using System.Windows; +using System.Windows.Input; +using System.Windows.Media; +using HandyControl.Data; +using HandyControl.Interactivity; +using HandyControl.Tools; + +namespace HandyControl.Controls +{ + /// + /// 消息框 + /// + public sealed class MessageBox : Window + { + private MessageBoxResult _messageBoxResult = MessageBoxResult.Cancel; + + private bool _showOk; + + private bool _showCancel; + + private bool _showYes; + + private bool _showNo; + + public static readonly DependencyProperty MessageProperty = DependencyProperty.Register( + "Message", typeof(string), typeof(MessageBox), new PropertyMetadata(default(string))); + + public string Message + { + get => (string) GetValue(MessageProperty); + set => SetValue(MessageProperty, value); + } + + public static readonly DependencyProperty ImageProperty = DependencyProperty.Register( + "Image", typeof(Geometry), typeof(MessageBox), new PropertyMetadata(default(Geometry))); + + public Geometry Image + { + get => (Geometry) GetValue(ImageProperty); + set => SetValue(ImageProperty, value); + } + + public static readonly DependencyProperty ImageBrushProperty = DependencyProperty.Register( + "ImageBrush", typeof(Brush), typeof(MessageBox), new PropertyMetadata(default(Brush))); + + public Brush ImageBrush + { + get => (Brush) GetValue(ImageBrushProperty); + set => SetValue(ImageBrushProperty, value); + } + + public static readonly DependencyProperty ShowImageProperty = DependencyProperty.Register( + "ShowImage", typeof(bool), typeof(MessageBox), new PropertyMetadata(ValueBoxes.FalseBox)); + + public bool ShowImage + { + get => (bool) GetValue(ShowImageProperty); + set => SetValue(ShowImageProperty, value); + } + + private MessageBox() + { + CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, (s, e) => + { + _messageBoxResult = MessageBoxResult.OK; + Close(); + }, (s, e) => e.CanExecute = _showOk)); + CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, (s, e) => + { + _messageBoxResult = MessageBoxResult.Cancel; + Close(); + }, (s, e) => e.CanExecute = _showCancel)); + CommandBindings.Add(new CommandBinding(ControlCommands.Yes, (s, e) => + { + _messageBoxResult = MessageBoxResult.Yes; + Close(); + }, (s, e) => e.CanExecute = _showYes)); + CommandBindings.Add(new CommandBinding(ControlCommands.No, (s, e) => + { + _messageBoxResult = MessageBoxResult.No; + Close(); + }, (s, e) => e.CanExecute = _showNo)); + } + + protected override void OnPreviewKeyDown(KeyEventArgs e) + { + base.OnPreviewKeyDown(e); + + if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.C) + { + var builder = new StringBuilder(); + var line = new string('-', 27); + builder.Append(line); + builder.Append(Environment.NewLine); + builder.Append(Title); + builder.Append(Environment.NewLine); + builder.Append(line); + builder.Append(Environment.NewLine); + builder.Append(Message); + builder.Append(Environment.NewLine); + builder.Append(line); + builder.Append(Environment.NewLine); + if (_showOk) + { + builder.Append(Properties.Langs.Lang.Confirm); + builder.Append(" "); + } + if (_showYes) + { + builder.Append(Properties.Langs.Lang.Yes); + builder.Append(" "); + } + if (_showNo) + { + builder.Append(Properties.Langs.Lang.No); + builder.Append(" "); + } + if (_showCancel) + { + builder.Append(Properties.Langs.Lang.Cancel); + builder.Append(" "); + } + builder.Append(Environment.NewLine); + builder.Append(line); + builder.Append(Environment.NewLine); + Clipboard.SetText(builder.ToString()); + } + } + + /// + /// 成功 + /// + /// + /// + public static MessageBoxResult Success(string messageBoxText, string caption = null) + { + MessageBox messageBox = null; + Application.Current.Dispatcher.Invoke(() => + { + messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK); + SetButtonStatus(messageBox, MessageBoxButton.OK); + messageBox.ShowImage = true; + messageBox.Image = ResourceHelper.GetResource(ResourceToken.SuccessGeometry); + messageBox.ImageBrush = ResourceHelper.GetResource(ResourceToken.SuccessBrush); + messageBox.ShowDialog(); + }); + + return messageBox._messageBoxResult; + } + + /// + /// 消息 + /// + /// + /// + public static MessageBoxResult Info(string messageBoxText, string caption = null) + { + MessageBox messageBox = null; + Application.Current.Dispatcher.Invoke(() => + { + messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK); + SetButtonStatus(messageBox, MessageBoxButton.OK); + SetImage(messageBox, MessageBoxImage.Information); + messageBox.ShowDialog(); + }); + + return messageBox._messageBoxResult; + } + + /// + /// 警告 + /// + /// + /// + public static MessageBoxResult Warning(string messageBoxText, string caption = null) + { + MessageBox messageBox = null; + Application.Current.Dispatcher.Invoke(() => + { + messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK); + SetButtonStatus(messageBox, MessageBoxButton.OK); + SetImage(messageBox, MessageBoxImage.Warning); + messageBox.ShowDialog(); + }); + + return messageBox._messageBoxResult; + } + + /// + /// 错误 + /// + /// + /// + public static MessageBoxResult Error(string messageBoxText, string caption = null) + { + MessageBox messageBox = null; + Application.Current.Dispatcher.Invoke(() => + { + messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK); + SetButtonStatus(messageBox, MessageBoxButton.OK); + SetImage(messageBox, MessageBoxImage.Error); + messageBox.ShowDialog(); + }); + + return messageBox._messageBoxResult; + } + + /// + /// 严重 + /// + /// + /// + public static MessageBoxResult Fatal(string messageBoxText, string caption = null) + { + MessageBox messageBox = null; + Application.Current.Dispatcher.Invoke(() => + { + messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK); + SetButtonStatus(messageBox, MessageBoxButton.OK); + messageBox.ShowImage = true; + messageBox.Image = ResourceHelper.GetResource(ResourceToken.FatalGeometry); + messageBox.ImageBrush = ResourceHelper.GetResource(ResourceToken.PrimaryTextBrush); + messageBox.ShowDialog(); + }); + + return messageBox._messageBoxResult; + } + + /// + /// 询问 + /// + /// + /// + public static MessageBoxResult Ask(string messageBoxText, string caption = null) + { + MessageBox messageBox = null; + Application.Current.Dispatcher.Invoke(() => + { + messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel); + SetButtonStatus(messageBox, MessageBoxButton.OKCancel); + SetImage(messageBox, MessageBoxImage.Question); + messageBox.ShowDialog(); + }); + + return messageBox._messageBoxResult; + } + + /// + /// 自定义信息展示 + /// + /// + /// + public static MessageBoxResult Show(MessageBoxInfo info) + { + MessageBox messageBox = null; + Application.Current.Dispatcher.Invoke(() => + { + messageBox = CreateMessageBox(null, info.MessageBoxText, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult); + SetButtonStatus(messageBox, info.Button); + + if (!string.IsNullOrEmpty(info.IconKey)) + { + messageBox.ShowImage = true; + messageBox.Image = ResourceHelper.GetResource(info.IconKey); + messageBox.ImageBrush = ResourceHelper.GetResource(info.IconBrushKey); + } + + messageBox.Style = info.Style; + messageBox.ShowDialog(); + }); + + return messageBox._messageBoxResult; + } + + /// + /// 信息展示 + /// + /// + /// + /// + /// + /// + /// + public static MessageBoxResult Show(string messageBoxText, string caption = null, + MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, + MessageBoxResult defaultResult = MessageBoxResult.None) => + Show(null, messageBoxText, caption, button, icon, defaultResult); + + /// + /// 信息展示 + /// + /// + /// + /// + /// + /// + /// + /// + public static MessageBoxResult Show(System.Windows.Window owner, string messageBoxText, string caption = null, MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.None) + { + MessageBox messageBox = null; + Application.Current.Dispatcher.Invoke(() => + { + messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult); + SetButtonStatus(messageBox, button); + SetImage(messageBox, icon); + messageBox.ShowDialog(); + }); + + return messageBox._messageBoxResult; + } + + private static MessageBox CreateMessageBox( + System.Windows.Window owner, + string messageBoxText, + string caption, + MessageBoxButton button, + MessageBoxImage icon, + MessageBoxResult defaultResult) + { + if (!IsValidMessageBoxButton(button)) + { + throw new InvalidEnumArgumentException(nameof(button), (int)button, typeof(MessageBoxButton)); + } + if (!IsValidMessageBoxImage(icon)) + { + throw new InvalidEnumArgumentException(nameof(icon), (int)icon, typeof(MessageBoxImage)); + } + if (!IsValidMessageBoxResult(defaultResult)) + { + throw new InvalidEnumArgumentException(nameof(defaultResult), (int)defaultResult, typeof(MessageBoxResult)); + } + + var ownerWindow = owner ?? VisualHelper.GetActiveWindow(); + var ownerIsNull = ownerWindow is null; + + return new MessageBox + { + Message = messageBoxText, + Owner = ownerWindow, + WindowStartupLocation = WindowStartupLocation.CenterScreen, + ShowTitle = true, + Title = caption ?? string.Empty, + Topmost = ownerIsNull, + _messageBoxResult = defaultResult + }; + } + + private static void SetButtonStatus(MessageBox messageBox, MessageBoxButton messageBoxButton) + { + switch (messageBoxButton) + { + case MessageBoxButton.OK: + messageBox._showOk = true; + break; + case MessageBoxButton.OKCancel: + messageBox._showOk = true; + messageBox._showCancel = true; + break; + case MessageBoxButton.YesNo: + messageBox._showYes = true; + messageBox._showNo = true; + break; + case MessageBoxButton.YesNoCancel: + messageBox._showYes = true; + messageBox._showNo = true; + messageBox._showCancel = true; + break; + } + } + + private static void SetImage(MessageBox messageBox, MessageBoxImage messageBoxImage) + { + var iconKey = string.Empty; + var iconBrushKey = string.Empty; + + switch (messageBoxImage) + { + case MessageBoxImage.Error: + iconKey = ResourceToken.ErrorGeometry; + iconBrushKey = ResourceToken.DangerBrush; + break; + case MessageBoxImage.Question: + iconKey = ResourceToken.AskGeometry; + iconBrushKey = ResourceToken.AccentBrush; + break; + case MessageBoxImage.Warning: + iconKey = ResourceToken.WarningGeometry; + iconBrushKey = ResourceToken.WarningBrush; + break; + case MessageBoxImage.Information: + iconKey = ResourceToken.InfoGeometry; + iconBrushKey = ResourceToken.InfoBrush; + break; + } + + if (string.IsNullOrEmpty(iconKey)) return; + messageBox.ShowImage = true; + messageBox.Image = ResourceHelper.GetResource(iconKey); + messageBox.ImageBrush = ResourceHelper.GetResource(iconBrushKey); + } + + private static bool IsValidMessageBoxButton(MessageBoxButton value) + { + return value == MessageBoxButton.OK + || value == MessageBoxButton.OKCancel + || value == MessageBoxButton.YesNo + || value == MessageBoxButton.YesNoCancel; + } + + private static bool IsValidMessageBoxImage(MessageBoxImage value) + { + return value == MessageBoxImage.Asterisk + || value == MessageBoxImage.Error + || value == MessageBoxImage.Exclamation + || value == MessageBoxImage.Hand + || value == MessageBoxImage.Information + || value == MessageBoxImage.None + || value == MessageBoxImage.Question + || value == MessageBoxImage.Stop + || value == MessageBoxImage.Warning; + } + + private static bool IsValidMessageBoxResult(MessageBoxResult value) + { + return value == MessageBoxResult.Cancel + || value == MessageBoxResult.No + || value == MessageBoxResult.None + || value == MessageBoxResult.OK + || value == MessageBoxResult.Yes; + } + } +} diff --git a/Net35/HandyControl_Net35/Controls/Window/PopupWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs similarity index 100% rename from Net35/HandyControl_Net35/Controls/Window/PopupWindow.cs rename to src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs diff --git a/HandyControl/Controls/Window/Window.cs b/src/Shared/HandyControl_Shared/Controls/Window/Window.cs similarity index 100% rename from HandyControl/Controls/Window/Window.cs rename to src/Shared/HandyControl_Shared/Controls/Window/Window.cs diff --git a/Net35/HandyControl_Net35/Data/Args/CancelRoutedEventArgs.cs b/src/Shared/HandyControl_Shared/Data/Args/CancelRoutedEventArgs.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Args/CancelRoutedEventArgs.cs rename to src/Shared/HandyControl_Shared/Data/Args/CancelRoutedEventArgs.cs diff --git a/Net35/HandyControl_Net35/Data/Args/FunctionEventArgs!1.cs b/src/Shared/HandyControl_Shared/Data/Args/FunctionEventArgs!1.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Args/FunctionEventArgs!1.cs rename to src/Shared/HandyControl_Shared/Data/Args/FunctionEventArgs!1.cs diff --git a/Net35/HandyControl_Net35/Data/ColorRange.cs b/src/Shared/HandyControl_Shared/Data/ColorRange.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/ColorRange.cs rename to src/Shared/HandyControl_Shared/Data/ColorRange.cs diff --git a/HandyControl/Data/Enum/BadgeStatus.cs b/src/Shared/HandyControl_Shared/Data/Enum/BadgeStatus.cs similarity index 100% rename from HandyControl/Data/Enum/BadgeStatus.cs rename to src/Shared/HandyControl_Shared/Data/Enum/BadgeStatus.cs diff --git a/HandyControl/Data/Enum/ChatMessageType.cs b/src/Shared/HandyControl_Shared/Data/Enum/ChatMessageType.cs similarity index 100% rename from HandyControl/Data/Enum/ChatMessageType.cs rename to src/Shared/HandyControl_Shared/Data/Enum/ChatMessageType.cs diff --git a/HandyControl/Data/Enum/ChatRoleType.cs b/src/Shared/HandyControl_Shared/Data/Enum/ChatRoleType.cs similarity index 100% rename from HandyControl/Data/Enum/ChatRoleType.cs rename to src/Shared/HandyControl_Shared/Data/Enum/ChatRoleType.cs diff --git a/Net35/HandyControl_Net35/Data/Enum/InfoType.cs b/src/Shared/HandyControl_Shared/Data/Enum/InfoType.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Enum/InfoType.cs rename to src/Shared/HandyControl_Shared/Data/Enum/InfoType.cs diff --git a/Net35/HandyControl_Net35/Data/Enum/IpType.cs b/src/Shared/HandyControl_Shared/Data/Enum/IpType.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Enum/IpType.cs rename to src/Shared/HandyControl_Shared/Data/Enum/IpType.cs diff --git a/Net35/HandyControl_Net35/Data/Enum/ResultType.cs b/src/Shared/HandyControl_Shared/Data/Enum/ResultType.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Enum/ResultType.cs rename to src/Shared/HandyControl_Shared/Data/Enum/ResultType.cs diff --git a/Net35/HandyControl_Net35/Data/Enum/SkinType.cs b/src/Shared/HandyControl_Shared/Data/Enum/SkinType.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Enum/SkinType.cs rename to src/Shared/HandyControl_Shared/Data/Enum/SkinType.cs diff --git a/Net35/HandyControl_Net35/Data/Enum/StepStatus.cs b/src/Shared/HandyControl_Shared/Data/Enum/StepStatus.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Enum/StepStatus.cs rename to src/Shared/HandyControl_Shared/Data/Enum/StepStatus.cs diff --git a/Net35/HandyControl_Net35/Data/Enum/TextType.cs b/src/Shared/HandyControl_Shared/Data/Enum/TextType.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Enum/TextType.cs rename to src/Shared/HandyControl_Shared/Data/Enum/TextType.cs diff --git a/Net35/HandyControl_Net35/Data/Enum/TipPlacement.cs b/src/Shared/HandyControl_Shared/Data/Enum/TipPlacement.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Enum/TipPlacement.cs rename to src/Shared/HandyControl_Shared/Data/Enum/TipPlacement.cs diff --git a/Net35/HandyControl_Net35/Data/Enum/TitleAlignment.cs b/src/Shared/HandyControl_Shared/Data/Enum/TitleAlignment.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Enum/TitleAlignment.cs rename to src/Shared/HandyControl_Shared/Data/Enum/TitleAlignment.cs diff --git a/Net35/HandyControl_Net35/Data/Gif/GPStream.cs b/src/Shared/HandyControl_Shared/Data/Gif/GPStream.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Gif/GPStream.cs rename to src/Shared/HandyControl_Shared/Data/Gif/GPStream.cs diff --git a/Net35/HandyControl_Net35/Data/Gif/GifFrameDimension.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifFrameDimension.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Gif/GifFrameDimension.cs rename to src/Shared/HandyControl_Shared/Data/Gif/GifFrameDimension.cs diff --git a/Net35/HandyControl_Net35/Data/Gif/GifImageInfo.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Gif/GifImageInfo.cs rename to src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs diff --git a/Net35/HandyControl_Net35/Data/Gif/GifPropertyItem.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItem.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Gif/GifPropertyItem.cs rename to src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItem.cs diff --git a/Net35/HandyControl_Net35/Data/Gif/GifPropertyItemInternal.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItemInternal.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Gif/GifPropertyItemInternal.cs rename to src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItemInternal.cs diff --git a/HandyControl/Data/GrowlInfo.cs b/src/Shared/HandyControl_Shared/Data/GrowlInfo.cs similarity index 100% rename from HandyControl/Data/GrowlInfo.cs rename to src/Shared/HandyControl_Shared/Data/GrowlInfo.cs diff --git a/HandyControl/Data/MessageBoxInfo.cs b/src/Shared/HandyControl_Shared/Data/MessageBoxInfo.cs similarity index 100% rename from HandyControl/Data/MessageBoxInfo.cs rename to src/Shared/HandyControl_Shared/Data/MessageBoxInfo.cs diff --git a/Net35/HandyControl_Net35/Data/Operation/OperationResult!1.cs b/src/Shared/HandyControl_Shared/Data/Operation/OperationResult!1.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Operation/OperationResult!1.cs rename to src/Shared/HandyControl_Shared/Data/Operation/OperationResult!1.cs diff --git a/Net35/HandyControl_Net35/Data/Operation/OperationResult.cs b/src/Shared/HandyControl_Shared/Data/Operation/OperationResult.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/Operation/OperationResult.cs rename to src/Shared/HandyControl_Shared/Data/Operation/OperationResult.cs diff --git a/HandyControl/Data/ResourceToken.cs b/src/Shared/HandyControl_Shared/Data/ResourceToken.cs similarity index 100% rename from HandyControl/Data/ResourceToken.cs rename to src/Shared/HandyControl_Shared/Data/ResourceToken.cs diff --git a/Net35/HandyControl_Net35/Data/SystemVersionInfo.cs b/src/Shared/HandyControl_Shared/Data/SystemVersionInfo.cs similarity index 100% rename from Net35/HandyControl_Net35/Data/SystemVersionInfo.cs rename to src/Shared/HandyControl_Shared/Data/SystemVersionInfo.cs diff --git a/HandyControl/Data/ValueBoxes.cs b/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs similarity index 100% rename from HandyControl/Data/ValueBoxes.cs rename to src/Shared/HandyControl_Shared/Data/ValueBoxes.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/BezierCurveFlattener.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/BezierCurveFlattener.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/BezierCurveFlattener.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/BezierCurveFlattener.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/CommonExtensions.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/CommonExtensions.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/ExceptionStringTable.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/ExceptionStringTable.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/ExceptionStringTable.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/ExceptionStringTable.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/GeometryHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/GeometryHelper.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/GeometryHelper.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/GeometryHelper.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/MarchLocation.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/MarchLocation.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/MarchLocation.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/MarchLocation.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/MarchStopReason.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/MarchStopReason.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/MarchStopReason.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/MarchStopReason.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/MathHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/MathHelper.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/MathHelper.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/MathHelper.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/PathFigureHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PathFigureHelper.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/PathFigureHelper.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/PathFigureHelper.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/PathGeometryHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PathGeometryHelper.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/PathGeometryHelper.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/PathGeometryHelper.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/PathSegmentData.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentData.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/PathSegmentData.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentData.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/PathSegmentHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentHelper.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/PathSegmentHelper.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentHelper.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/PolylineData.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineData.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/PolylineData.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/PolylineData.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/PolylineHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineHelper.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/PolylineHelper.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/PolylineHelper.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/RandomEngine.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/RandomEngine.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/RandomEngine.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/RandomEngine.cs diff --git a/Net35/HandyControl_Net35/Expression/Drawing/SimpleSegment.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/SimpleSegment.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Drawing/SimpleSegment.cs rename to src/Shared/HandyControl_Shared/Expression/Drawing/SimpleSegment.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/ArcGeometrySource.cs b/src/Shared/HandyControl_Shared/Expression/Media/ArcGeometrySource.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/ArcGeometrySource.cs rename to src/Shared/HandyControl_Shared/Expression/Media/ArcGeometrySource.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/DrawingPropertyChangedEventArgs.cs b/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyChangedEventArgs.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/DrawingPropertyChangedEventArgs.cs rename to src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyChangedEventArgs.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/DrawingPropertyMetadata.cs b/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadata.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/DrawingPropertyMetadata.cs rename to src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadata.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/DrawingPropertyMetadataOptions.cs b/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadataOptions.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/DrawingPropertyMetadataOptions.cs rename to src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadataOptions.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/GeometryEffect.cs b/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffect.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/GeometryEffect.cs rename to src/Shared/HandyControl_Shared/Expression/Media/GeometryEffect.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/GeometryEffectConverter.cs b/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffectConverter.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/GeometryEffectConverter.cs rename to src/Shared/HandyControl_Shared/Expression/Media/GeometryEffectConverter.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/GeometrySource!1.cs b/src/Shared/HandyControl_Shared/Expression/Media/GeometrySource!1.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/GeometrySource!1.cs rename to src/Shared/HandyControl_Shared/Expression/Media/GeometrySource!1.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/IArcGeometrySourceParameters.cs b/src/Shared/HandyControl_Shared/Expression/Media/IArcGeometrySourceParameters.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/IArcGeometrySourceParameters.cs rename to src/Shared/HandyControl_Shared/Expression/Media/IArcGeometrySourceParameters.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/IGeometrySource.cs b/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySource.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/IGeometrySource.cs rename to src/Shared/HandyControl_Shared/Expression/Media/IGeometrySource.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/IGeometrySourceExtensions.cs b/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceExtensions.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/IGeometrySourceExtensions.cs rename to src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceExtensions.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/IGeometrySourceParameters.cs b/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceParameters.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/IGeometrySourceParameters.cs rename to src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceParameters.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/IShape.cs b/src/Shared/HandyControl_Shared/Expression/Media/IShape.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/IShape.cs rename to src/Shared/HandyControl_Shared/Expression/Media/IShape.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/InvalidateGeometryReasons.cs b/src/Shared/HandyControl_Shared/Expression/Media/InvalidateGeometryReasons.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/InvalidateGeometryReasons.cs rename to src/Shared/HandyControl_Shared/Expression/Media/InvalidateGeometryReasons.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/SketchGeometryEffect.cs b/src/Shared/HandyControl_Shared/Expression/Media/SketchGeometryEffect.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/SketchGeometryEffect.cs rename to src/Shared/HandyControl_Shared/Expression/Media/SketchGeometryEffect.cs diff --git a/Net35/HandyControl_Net35/Expression/Media/UnitType.cs b/src/Shared/HandyControl_Shared/Expression/Media/UnitType.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Media/UnitType.cs rename to src/Shared/HandyControl_Shared/Expression/Media/UnitType.cs diff --git a/Net35/HandyControl_Net35/Expression/Shapes/Arc.cs b/src/Shared/HandyControl_Shared/Expression/Shapes/Arc.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Shapes/Arc.cs rename to src/Shared/HandyControl_Shared/Expression/Shapes/Arc.cs diff --git a/Net35/HandyControl_Net35/Expression/Shapes/PrimitiveShape.cs b/src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs similarity index 100% rename from Net35/HandyControl_Net35/Expression/Shapes/PrimitiveShape.cs rename to src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems new file mode 100644 index 00000000..b798a0c2 --- /dev/null +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -0,0 +1,712 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + aac11083-faca-405d-9197-5c1212d65656 + + + HandyControl_Shared + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + + + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.shproj b/src/Shared/HandyControl_Shared/HandyControl_Shared.shproj new file mode 100644 index 00000000..fb803c42 --- /dev/null +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.shproj @@ -0,0 +1,13 @@ + + + + aac11083-faca-405d-9197-5c1212d65656 + 14.0 + + + + + + + + diff --git a/HandyControl/Interactivity/AdornerContainer.cs b/src/Shared/HandyControl_Shared/Interactivity/AdornerContainer.cs similarity index 100% rename from HandyControl/Interactivity/AdornerContainer.cs rename to src/Shared/HandyControl_Shared/Interactivity/AdornerContainer.cs diff --git a/Net35/HandyControl_Net35/Interactivity/AttachableCollection!1.cs b/src/Shared/HandyControl_Shared/Interactivity/AttachableCollection!1.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/AttachableCollection!1.cs rename to src/Shared/HandyControl_Shared/Interactivity/AttachableCollection!1.cs diff --git a/Net35/HandyControl_Net35/Interactivity/Behavior!1.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior!1.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/Behavior!1.cs rename to src/Shared/HandyControl_Shared/Interactivity/Behavior!1.cs diff --git a/Net35/HandyControl_Net35/Interactivity/Behavior.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/Behavior.cs rename to src/Shared/HandyControl_Shared/Interactivity/Behavior.cs diff --git a/HandyControl/Interactivity/BehaviorCollection.cs b/src/Shared/HandyControl_Shared/Interactivity/BehaviorCollection.cs similarity index 100% rename from HandyControl/Interactivity/BehaviorCollection.cs rename to src/Shared/HandyControl_Shared/Interactivity/BehaviorCollection.cs diff --git a/HandyControl/Interactivity/ControlCommands.cs b/src/Shared/HandyControl_Shared/Interactivity/ControlCommands.cs similarity index 100% rename from HandyControl/Interactivity/ControlCommands.cs rename to src/Shared/HandyControl_Shared/Interactivity/ControlCommands.cs diff --git a/Net35/HandyControl_Net35/Interactivity/DefaultTriggerAttribute.cs b/src/Shared/HandyControl_Shared/Interactivity/DefaultTriggerAttribute.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/DefaultTriggerAttribute.cs rename to src/Shared/HandyControl_Shared/Interactivity/DefaultTriggerAttribute.cs diff --git a/HandyControl/Interactivity/EventToCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs similarity index 100% rename from HandyControl/Interactivity/EventToCommand.cs rename to src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs diff --git a/Net35/HandyControl_Net35/Interactivity/EventTrigger.cs b/src/Shared/HandyControl_Shared/Interactivity/EventTrigger.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/EventTrigger.cs rename to src/Shared/HandyControl_Shared/Interactivity/EventTrigger.cs diff --git a/Net35/HandyControl_Net35/Interactivity/EventTriggerBase!1.cs b/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase!1.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/EventTriggerBase!1.cs rename to src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase!1.cs diff --git a/Net35/HandyControl_Net35/Interactivity/EventTriggerBase.cs b/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/EventTriggerBase.cs rename to src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase.cs diff --git a/Net35/HandyControl_Net35/Interactivity/ExceptionStringTable.cs b/src/Shared/HandyControl_Shared/Interactivity/ExceptionStringTable.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/ExceptionStringTable.cs rename to src/Shared/HandyControl_Shared/Interactivity/ExceptionStringTable.cs diff --git a/HandyControl/Interactivity/ExtendedVisualStateManager.cs b/src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs similarity index 100% rename from HandyControl/Interactivity/ExtendedVisualStateManager.cs rename to src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs diff --git a/HandyControl/Interactivity/FluidMoveBehavior.cs b/src/Shared/HandyControl_Shared/Interactivity/FluidMoveBehavior.cs similarity index 100% rename from HandyControl/Interactivity/FluidMoveBehavior.cs rename to src/Shared/HandyControl_Shared/Interactivity/FluidMoveBehavior.cs diff --git a/Net35/HandyControl_Net35/Interactivity/FluidMoveBehaviorBase.cs b/src/Shared/HandyControl_Shared/Interactivity/FluidMoveBehaviorBase.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/FluidMoveBehaviorBase.cs rename to src/Shared/HandyControl_Shared/Interactivity/FluidMoveBehaviorBase.cs diff --git a/Net35/HandyControl_Net35/Interactivity/FluidMoveScope.cs b/src/Shared/HandyControl_Shared/Interactivity/FluidMoveScope.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/FluidMoveScope.cs rename to src/Shared/HandyControl_Shared/Interactivity/FluidMoveScope.cs diff --git a/Net35/HandyControl_Net35/Interactivity/IAttachedObject.cs b/src/Shared/HandyControl_Shared/Interactivity/IAttachedObject.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/IAttachedObject.cs rename to src/Shared/HandyControl_Shared/Interactivity/IAttachedObject.cs diff --git a/Net35/HandyControl_Net35/Interactivity/IEventArgsConverter.cs b/src/Shared/HandyControl_Shared/Interactivity/IEventArgsConverter.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/IEventArgsConverter.cs rename to src/Shared/HandyControl_Shared/Interactivity/IEventArgsConverter.cs diff --git a/Net35/HandyControl_Net35/Interactivity/Interaction.cs b/src/Shared/HandyControl_Shared/Interactivity/Interaction.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/Interaction.cs rename to src/Shared/HandyControl_Shared/Interactivity/Interaction.cs diff --git a/Net35/HandyControl_Net35/Interactivity/InvokeCommandAction.cs b/src/Shared/HandyControl_Shared/Interactivity/InvokeCommandAction.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/InvokeCommandAction.cs rename to src/Shared/HandyControl_Shared/Interactivity/InvokeCommandAction.cs diff --git a/Net35/HandyControl_Net35/Interactivity/MouseDragElementBehavior.cs b/src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehavior.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/MouseDragElementBehavior.cs rename to src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehavior.cs diff --git a/Net35/HandyControl_Net35/Interactivity/NameResolvedEventArgs.cs b/src/Shared/HandyControl_Shared/Interactivity/NameResolvedEventArgs.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/NameResolvedEventArgs.cs rename to src/Shared/HandyControl_Shared/Interactivity/NameResolvedEventArgs.cs diff --git a/Net35/HandyControl_Net35/Interactivity/NameResolver.cs b/src/Shared/HandyControl_Shared/Interactivity/NameResolver.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/NameResolver.cs rename to src/Shared/HandyControl_Shared/Interactivity/NameResolver.cs diff --git a/Net35/HandyControl_Net35/Interactivity/PreviewInvokeEventArgs.cs b/src/Shared/HandyControl_Shared/Interactivity/PreviewInvokeEventArgs.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/PreviewInvokeEventArgs.cs rename to src/Shared/HandyControl_Shared/Interactivity/PreviewInvokeEventArgs.cs diff --git a/HandyControl/Interactivity/PushMainWindow2TopCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/PushMainWindow2TopCommand.cs similarity index 100% rename from HandyControl/Interactivity/PushMainWindow2TopCommand.cs rename to src/Shared/HandyControl_Shared/Interactivity/PushMainWindow2TopCommand.cs diff --git a/Net35/HandyControl_Net35/Interactivity/RoutedEventTrigger.cs b/src/Shared/HandyControl_Shared/Interactivity/RoutedEventTrigger.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/RoutedEventTrigger.cs rename to src/Shared/HandyControl_Shared/Interactivity/RoutedEventTrigger.cs diff --git a/HandyControl/Interactivity/ShutdownAppCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/ShutdownAppCommand.cs similarity index 100% rename from HandyControl/Interactivity/ShutdownAppCommand.cs rename to src/Shared/HandyControl_Shared/Interactivity/ShutdownAppCommand.cs diff --git a/Net35/HandyControl_Net35/Interactivity/TagType.cs b/src/Shared/HandyControl_Shared/Interactivity/TagType.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/TagType.cs rename to src/Shared/HandyControl_Shared/Interactivity/TagType.cs diff --git a/Net35/HandyControl_Net35/Interactivity/TransitionEffect.cs b/src/Shared/HandyControl_Shared/Interactivity/TransitionEffect.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/TransitionEffect.cs rename to src/Shared/HandyControl_Shared/Interactivity/TransitionEffect.cs diff --git a/Net35/HandyControl_Net35/Interactivity/TriggerAction!1.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerAction!1.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/TriggerAction!1.cs rename to src/Shared/HandyControl_Shared/Interactivity/TriggerAction!1.cs diff --git a/Net35/HandyControl_Net35/Interactivity/TriggerAction.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/TriggerAction.cs rename to src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs diff --git a/Net35/HandyControl_Net35/Interactivity/TriggerActionCollection.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerActionCollection.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/TriggerActionCollection.cs rename to src/Shared/HandyControl_Shared/Interactivity/TriggerActionCollection.cs diff --git a/Net35/HandyControl_Net35/Interactivity/TriggerBase.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerBase.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/TriggerBase.cs rename to src/Shared/HandyControl_Shared/Interactivity/TriggerBase.cs diff --git a/Net35/HandyControl_Net35/Interactivity/TriggerCollection.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerCollection.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/TriggerCollection.cs rename to src/Shared/HandyControl_Shared/Interactivity/TriggerCollection.cs diff --git a/Net35/HandyControl_Net35/Interactivity/TypeConstraintAttribute.cs b/src/Shared/HandyControl_Shared/Interactivity/TypeConstraintAttribute.cs similarity index 100% rename from Net35/HandyControl_Net35/Interactivity/TypeConstraintAttribute.cs rename to src/Shared/HandyControl_Shared/Interactivity/TypeConstraintAttribute.cs diff --git a/HandyControl/Properties/AssemblyInfo.cs b/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs similarity index 84% rename from HandyControl/Properties/AssemblyInfo.cs rename to src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs index 221f68f3..d7ea892a 100644 --- a/HandyControl/Properties/AssemblyInfo.cs +++ b/src/Shared/HandyControl_Shared/Properties/AssemblyInfo.cs @@ -1,4 +1,5 @@ -using System.Reflection; +#if !Core +using System.Reflection; using System.Runtime.InteropServices; [assembly: AssemblyTitle("HandyControl")] @@ -10,4 +11,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.5.3.*")] +[assembly: AssemblyVersion("1.5.4")] +#endif \ No newline at end of file diff --git a/Net35/HandyControl_Net35/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs similarity index 100% rename from Net35/HandyControl_Net35/Properties/Langs/Lang.Designer.cs rename to src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs diff --git a/Net35/HandyControl_Net35/Properties/Langs/Lang.en.Designer.cs b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.Designer.cs similarity index 100% rename from Net35/HandyControl_Net35/Properties/Langs/Lang.en.Designer.cs rename to src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.Designer.cs diff --git a/HandyControl/Properties/Langs/Lang.en.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx similarity index 100% rename from HandyControl/Properties/Langs/Lang.en.resx rename to src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx diff --git a/Net35/HandyControl_Net35/Properties/Langs/Lang.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx similarity index 100% rename from Net35/HandyControl_Net35/Properties/Langs/Lang.resx rename to src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx diff --git a/Net35/HandyControl_Net35/Themes/Basic/Basic.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Basic.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/Basic/Basic.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Basic.xaml diff --git a/HandyControl/Themes/Basic/Behaviors.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Behaviors.xaml similarity index 100% rename from HandyControl/Themes/Basic/Behaviors.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Behaviors.xaml diff --git a/Net35/HandyControl_Net35/Themes/Basic/Brushes.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Brushes.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/Basic/Brushes.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Brushes.xaml diff --git a/Net35/HandyControl_Net35/Themes/Basic/Colors/Colors.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Colors/Colors.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/Basic/Colors/Colors.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Colors/Colors.xaml diff --git a/Net35/HandyControl_Net35/Themes/Basic/Colors/ColorsDark.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Colors/ColorsDark.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/Basic/Colors/ColorsDark.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Colors/ColorsDark.xaml diff --git a/Net35/HandyControl_Net35/Themes/Basic/Colors/ColorsViolet.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Colors/ColorsViolet.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/Basic/Colors/ColorsViolet.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Colors/ColorsViolet.xaml diff --git a/HandyControl/Themes/Basic/Converters.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml similarity index 100% rename from HandyControl/Themes/Basic/Converters.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml diff --git a/Net35/HandyControl_Net35/Themes/Basic/Effects.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Effects.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/Basic/Effects.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Effects.xaml diff --git a/Net35/HandyControl_Net35/Themes/Basic/Fonts.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Fonts.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/Basic/Fonts.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Fonts.xaml diff --git a/HandyControl/Themes/Basic/Geometries.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Geometries.xaml similarity index 100% rename from HandyControl/Themes/Basic/Geometries.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Geometries.xaml diff --git a/Net35/HandyControl_Net35/Themes/Basic/Paths.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Paths.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/Basic/Paths.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Paths.xaml diff --git a/HandyControl/Themes/Basic/Sizes.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Sizes.xaml similarity index 100% rename from HandyControl/Themes/Basic/Sizes.xaml rename to src/Shared/HandyControl_Shared/Themes/Basic/Sizes.xaml diff --git a/Net35/HandyControl_Net35/Themes/SkinDark.xaml b/src/Shared/HandyControl_Shared/Themes/SkinDark.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/SkinDark.xaml rename to src/Shared/HandyControl_Shared/Themes/SkinDark.xaml diff --git a/Net35/HandyControl_Net35/Themes/SkinDefault.xaml b/src/Shared/HandyControl_Shared/Themes/SkinDefault.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/SkinDefault.xaml rename to src/Shared/HandyControl_Shared/Themes/SkinDefault.xaml diff --git a/Net35/HandyControl_Net35/Themes/SkinViolet.xaml b/src/Shared/HandyControl_Shared/Themes/SkinViolet.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/SkinViolet.xaml rename to src/Shared/HandyControl_Shared/Themes/SkinViolet.xaml diff --git a/HandyControl/Themes/Styles/Badge.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Badge.xaml similarity index 100% rename from HandyControl/Themes/Styles/Badge.xaml rename to src/Shared/HandyControl_Shared/Themes/Styles/Badge.xaml diff --git a/HandyControl/Themes/Styles/Base/BadgeBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/BadgeBaseStyle.xaml similarity index 100% rename from HandyControl/Themes/Styles/Base/BadgeBaseStyle.xaml rename to src/Shared/HandyControl_Shared/Themes/Styles/Base/BadgeBaseStyle.xaml diff --git a/Net35/HandyControl_Net35/Themes/Styles/Base/BaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml similarity index 100% rename from Net35/HandyControl_Net35/Themes/Styles/Base/BaseStyle.xaml rename to src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml diff --git a/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseBaseStyle.xaml similarity index 100% rename from HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml rename to src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseBaseStyle.xaml diff --git a/HandyControl/Themes/Styles/Base/ButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml similarity index 100% rename from HandyControl/Themes/Styles/Base/ButtonBaseStyle.xaml rename to src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml diff --git a/HandyControl/Themes/Styles/Base/ChatBubbleBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ChatBubbleBaseStyle.xaml similarity index 100% rename from HandyControl/Themes/Styles/Base/ChatBubbleBaseStyle.xaml rename to src/Shared/HandyControl_Shared/Themes/Styles/Base/ChatBubbleBaseStyle.xaml diff --git a/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml similarity index 100% rename from HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml rename to src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckBoxBaseStyle.xaml diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml new file mode 100644 index 00000000..90d37234 --- /dev/null +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml @@ -0,0 +1,1040 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +