diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
index 9ff462f0..cbb5f867 100644
--- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
@@ -207,210 +207,6 @@
Resources\Img\icon.ico
-
- Resources\Img\LeftMainContent\Animation_16x.png
-
-
- Resources\Img\LeftMainContent\BorderElement_16x.png
-
-
- Resources\Img\LeftMainContent\Brush_16x.png
-
-
- Resources\Img\LeftMainContent\Bubble_16xLG.png
-
-
- Resources\Img\LeftMainContent\ButtonClick_16x.png
-
-
- Resources\Img\LeftMainContent\Calendar_16x.png
-
-
- Resources\Img\LeftMainContent\Carousel_16x.png
-
-
- Resources\Img\LeftMainContent\CheckBox_16x.png
-
-
- Resources\Img\LeftMainContent\CheckBoxList_16x.png
-
-
- Resources\Img\LeftMainContent\ColorPalette_16x.png
-
-
- Resources\Img\LeftMainContent\ColorWheel_16x.png
-
-
- Resources\Img\LeftMainContent\ComboBox_16x.png
-
-
- Resources\Img\LeftMainContent\ContextMenu_16x.png
-
-
- Resources\Img\LeftMainContent\DataGrid_16x.png
-
-
- Resources\Img\LeftMainContent\DatePicker_16x.png
-
-
- Resources\Img\LeftMainContent\DetailDataView_16x.png
-
-
- Resources\Img\LeftMainContent\Dialog_16x.png
-
-
- Resources\Img\LeftMainContent\DotLarge_16x.png
-
-
- Resources\Img\LeftMainContent\Expander_16x.png
-
-
- Resources\Img\LeftMainContent\FlipVertical_16x.png
-
-
- Resources\Img\LeftMainContent\Flow_16x.png
-
-
- Resources\Img\LeftMainContent\GoToTop_16x.png
-
-
- Resources\Img\LeftMainContent\GridLight_16x.png
-
-
- Resources\Img\LeftMainContent\GroupBox_16x.png
-
-
- Resources\Img\LeftMainContent\HoverMenu_16x.png
-
-
- Resources\Img\LeftMainContent\Image_16x.png
-
-
- Resources\Img\LeftMainContent\ImageBrowser_16x.png
-
-
- Resources\Img\LeftMainContent\Label_16x.png
-
-
- Resources\Img\LeftMainContent\layout-FlexLayout-16.png
-
-
- Resources\Img\LeftMainContent\LinearCarousel_16x.png
-
-
- Resources\Img\LeftMainContent\ListBox_16x.png
-
-
- Resources\Img\LeftMainContent\ListView_16x.png
-
-
- Resources\Img\LeftMainContent\Loading_Blue_16x.png
-
-
- Resources\Img\LeftMainContent\Message_16x.png
-
-
- Resources\Img\LeftMainContent\NotificationHub_16x.png
-
-
- Resources\Img\LeftMainContent\NumericListBox_16x.png
-
-
- Resources\Img\LeftMainContent\Paginator_16x.png
-
-
- Resources\Img\LeftMainContent\Panel_16x.png
-
-
- Resources\Img\LeftMainContent\PasswordBox_16x.png
-
-
- Resources\Img\LeftMainContent\Path_16x.png
-
-
- Resources\Img\LeftMainContent\ProgressBar_16x.png
-
-
- Resources\Img\LeftMainContent\ProgressButton_16x.png
-
-
- Resources\Img\LeftMainContent\RadioButton_16x.png
-
-
- Resources\Img\LeftMainContent\PropertyGridEditorPart_16x.png
-
-
- Resources\Img\LeftMainContent\RepeatButton_16x.png
-
-
- Resources\Img\LeftMainContent\RichTextBox_16x.png
-
-
- Resources\Img\LeftMainContent\ScrollBox_16x.png
-
-
- Resources\Img\LeftMainContent\Search_16x.png
-
-
- Resources\Img\LeftMainContent\Shield_16x.png
-
-
- Resources\Img\LeftMainContent\Slider_16x.png
-
-
- Resources\Img\LeftMainContent\SortAscending_grey_16x.png
-
-
- Resources\Img\LeftMainContent\SplitterControl_16x.png
-
-
- Resources\Img\LeftMainContent\Star.png
-
-
- Resources\Img\LeftMainContent\TabPage_16x.png
-
-
- Resources\Img\LeftMainContent\Tag_16x.png
-
-
- Resources\Img\LeftMainContent\TextBlock_16x.png
-
-
- Resources\Img\LeftMainContent\TextBox_16x.png
-
-
- Resources\Img\LeftMainContent\Timeline_16x.png
-
-
- Resources\Img\LeftMainContent\TimePicker_16x.png
-
-
- Resources\Img\LeftMainContent\Time_color_16x.png
-
-
- Resources\Img\LeftMainContent\Toggle_16x.png
-
-
- Resources\Img\LeftMainContent\ToolBar_16x.png
-
-
- Resources\Img\LeftMainContent\Transfer_16x.png
-
-
- Resources\Img\LeftMainContent\TreeView_16x.png
-
-
- Resources\Img\LeftMainContent\User_16x.png
-
-
- Resources\Img\LeftMainContent\WindowsForm_16x.png
-
-
- Resources\Img\LeftMainContent\GridPane_16x.png
-
-
- Resources\Img\LeftMainContent\AutoComplete_16x.png
-
Resources\Img\under_construction.gif
@@ -429,9 +225,6 @@
Resources\Img\DevOps\DevOps-TestPlans.png
-
- Resources\Img\LeftMainContent\MainMenuControl_16x.png
-
Resources\fabric-icons.ttf
@@ -444,81 +237,12 @@
Resources\Registry.txt
-
- Resources\Img\LeftMainContent\brackets_Square_16xLG.png
-
-
- Resources\Img\LeftMainContent\ButtonGroup_16x.png
-
-
- Resources\Img\LeftMainContent\VSO_Card_16x.png
-
-
- Resources\Img\LeftMainContent\ImageStack_16x.png
-
-
- Resources\Img\LeftMainContent\IncreaseHorizontalSpacing_16x.png
-
-
- Resources\Img\LeftMainContent\Dynamic_16x.png
-
-
- Resources\Img\LeftMainContent\PolygonHexagon_16x.png
-
-
- Resources\Img\LeftMainContent\HandyControl.png
-
-
- Resources\Img\LeftMainContent\Procedure_16x.png
-
Resources\Img\Dance.png
-
- Resources\Img\LeftMainContent\thumbs_up.png
-
-
- Resources\Img\LeftMainContent\SplitButton_16x.png
-
-
- Resources\Img\LeftMainContent\DataGenerator_16x.png
-
-
- Resources\Img\LeftMainContent\DottedSplitter_16x.png
-
-
- Resources\Img\LeftMainContent\PopupCursor_16x.png
-
-
- Resources\Img\LeftMainContent\TransitioningContentControl_16x.png
-
-
- Resources\Img\LeftMainContent\View_Portrait_16x.png
-
-
- Resources\Img\LeftMainContent\TransformRelative_16x.png
-
-
- Resources\Img\LeftMainContent\Effects_16x.png
-
-
- Resources\Img\LeftMainContent\Ellipsis_16x.png
-
-
- Resources\Img\LeftMainContent\WPFFlowDocument_16x.png
-
-
- Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png
-
-
- Resources\Img\LeftMainContent\frame_16xLG.png
-
Resources\Img\cloud.png
-
- Resources\Img\LeftMainContent\WindowScreenshot_16x.png
-
diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
index 5989532d..77f5d988 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -209,210 +209,6 @@
Resources\Img\icon.ico
-
- Resources\Img\LeftMainContent\Animation_16x.png
-
-
- Resources\Img\LeftMainContent\BorderElement_16x.png
-
-
- Resources\Img\LeftMainContent\Brush_16x.png
-
-
- Resources\Img\LeftMainContent\Bubble_16xLG.png
-
-
- Resources\Img\LeftMainContent\ButtonClick_16x.png
-
-
- Resources\Img\LeftMainContent\Calendar_16x.png
-
-
- Resources\Img\LeftMainContent\Carousel_16x.png
-
-
- Resources\Img\LeftMainContent\CheckBox_16x.png
-
-
- Resources\Img\LeftMainContent\CheckBoxList_16x.png
-
-
- Resources\Img\LeftMainContent\ColorPalette_16x.png
-
-
- Resources\Img\LeftMainContent\ColorWheel_16x.png
-
-
- Resources\Img\LeftMainContent\ComboBox_16x.png
-
-
- Resources\Img\LeftMainContent\ContextMenu_16x.png
-
-
- Resources\Img\LeftMainContent\DataGrid_16x.png
-
-
- Resources\Img\LeftMainContent\DatePicker_16x.png
-
-
- Resources\Img\LeftMainContent\DetailDataView_16x.png
-
-
- Resources\Img\LeftMainContent\Dialog_16x.png
-
-
- Resources\Img\LeftMainContent\DotLarge_16x.png
-
-
- Resources\Img\LeftMainContent\Expander_16x.png
-
-
- Resources\Img\LeftMainContent\FlipVertical_16x.png
-
-
- Resources\Img\LeftMainContent\Flow_16x.png
-
-
- Resources\Img\LeftMainContent\GoToTop_16x.png
-
-
- Resources\Img\LeftMainContent\GridLight_16x.png
-
-
- Resources\Img\LeftMainContent\GroupBox_16x.png
-
-
- Resources\Img\LeftMainContent\HoverMenu_16x.png
-
-
- Resources\Img\LeftMainContent\Image_16x.png
-
-
- Resources\Img\LeftMainContent\ImageBrowser_16x.png
-
-
- Resources\Img\LeftMainContent\Label_16x.png
-
-
- Resources\Img\LeftMainContent\layout-FlexLayout-16.png
-
-
- Resources\Img\LeftMainContent\LinearCarousel_16x.png
-
-
- Resources\Img\LeftMainContent\ListBox_16x.png
-
-
- Resources\Img\LeftMainContent\ListView_16x.png
-
-
- Resources\Img\LeftMainContent\Loading_Blue_16x.png
-
-
- Resources\Img\LeftMainContent\Message_16x.png
-
-
- Resources\Img\LeftMainContent\NotificationHub_16x.png
-
-
- Resources\Img\LeftMainContent\NumericListBox_16x.png
-
-
- Resources\Img\LeftMainContent\Paginator_16x.png
-
-
- Resources\Img\LeftMainContent\Panel_16x.png
-
-
- Resources\Img\LeftMainContent\PasswordBox_16x.png
-
-
- Resources\Img\LeftMainContent\Path_16x.png
-
-
- Resources\Img\LeftMainContent\ProgressBar_16x.png
-
-
- Resources\Img\LeftMainContent\ProgressButton_16x.png
-
-
- Resources\Img\LeftMainContent\RadioButton_16x.png
-
-
- Resources\Img\LeftMainContent\PropertyGridEditorPart_16x.png
-
-
- Resources\Img\LeftMainContent\RepeatButton_16x.png
-
-
- Resources\Img\LeftMainContent\RichTextBox_16x.png
-
-
- Resources\Img\LeftMainContent\ScrollBox_16x.png
-
-
- Resources\Img\LeftMainContent\Search_16x.png
-
-
- Resources\Img\LeftMainContent\Shield_16x.png
-
-
- Resources\Img\LeftMainContent\Slider_16x.png
-
-
- Resources\Img\LeftMainContent\SortAscending_grey_16x.png
-
-
- Resources\Img\LeftMainContent\SplitterControl_16x.png
-
-
- Resources\Img\LeftMainContent\Star.png
-
-
- Resources\Img\LeftMainContent\TabPage_16x.png
-
-
- Resources\Img\LeftMainContent\Tag_16x.png
-
-
- Resources\Img\LeftMainContent\TextBlock_16x.png
-
-
- Resources\Img\LeftMainContent\TextBox_16x.png
-
-
- Resources\Img\LeftMainContent\Timeline_16x.png
-
-
- Resources\Img\LeftMainContent\TimePicker_16x.png
-
-
- Resources\Img\LeftMainContent\Time_color_16x.png
-
-
- Resources\Img\LeftMainContent\Toggle_16x.png
-
-
- Resources\Img\LeftMainContent\ToolBar_16x.png
-
-
- Resources\Img\LeftMainContent\Transfer_16x.png
-
-
- Resources\Img\LeftMainContent\TreeView_16x.png
-
-
- Resources\Img\LeftMainContent\User_16x.png
-
-
- Resources\Img\LeftMainContent\WindowsForm_16x.png
-
-
- Resources\Img\LeftMainContent\GridPane_16x.png
-
-
- Resources\Img\LeftMainContent\AutoComplete_16x.png
-
Resources\Img\under_construction.gif
@@ -431,9 +227,6 @@
Resources\Img\DevOps\DevOps-TestPlans.png
-
- Resources\Img\LeftMainContent\MainMenuControl_16x.png
-
Resources\fabric-icons.ttf
@@ -446,81 +239,12 @@
Resources\Registry.txt
-
- Resources\Img\LeftMainContent\brackets_Square_16xLG.png
-
-
- Resources\Img\LeftMainContent\ButtonGroup_16x.png
-
-
- Resources\Img\LeftMainContent\VSO_Card_16x.png
-
-
- Resources\Img\LeftMainContent\ImageStack_16x.png
-
-
- Resources\Img\LeftMainContent\IncreaseHorizontalSpacing_16x.png
-
-
- Resources\Img\LeftMainContent\Dynamic_16x.png
-
-
- Resources\Img\LeftMainContent\PolygonHexagon_16x.png
-
-
- Resources\Img\LeftMainContent\HandyControl.png
-
-
- Resources\Img\LeftMainContent\Procedure_16x.png
-
Resources\Img\Dance.png
-
- Resources\Img\LeftMainContent\thumbs_up.png
-
-
- Resources\Img\LeftMainContent\SplitButton_16x.png
-
-
- Resources\Img\LeftMainContent\DataGenerator_16x.png
-
-
- Resources\Img\LeftMainContent\DottedSplitter_16x.png
-
-
- Resources\Img\LeftMainContent\PopupCursor_16x.png
-
-
- Resources\Img\LeftMainContent\TransitioningContentControl_16x.png
-
-
- Resources\Img\LeftMainContent\View_Portrait_16x.png
-
-
- Resources\Img\LeftMainContent\TransformRelative_16x.png
-
-
- Resources\Img\LeftMainContent\Effects_16x.png
-
-
- Resources\Img\LeftMainContent\Ellipsis_16x.png
-
-
- Resources\Img\LeftMainContent\WPFFlowDocument_16x.png
-
-
- Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png
-
-
- Resources\Img\LeftMainContent\frame_16xLG.png
-
Resources\Img\cloud.png
-
- Resources\Img\LeftMainContent\WindowScreenshot_16x.png
-
diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
index be1756b7..c14eec8a 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
+++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
@@ -4,37 +4,37 @@
"selectedIndex": -1,
"group": false,
"demoItemList": [
- [ "Brush", "BrushDemoCtl", "Brush_16x", "", "" ],
- [ "Button", "ButtonDemoCtl", "ButtonClick_16x", "", "" ],
- [ "RepeatButton", "RepeatButtonDemoCtl", "RepeatButton_16x", "", "" ],
- [ "ToggleButton", "ToggleButtonDemoCtl", "Toggle_16x", "", "" ],
- [ "RadioButton", "RadioButtonDemoCtl", "RadioButton_16x", "", "" ],
- [ "CheckBox", "CheckBoxDemoCtl", "CheckBox_16x", "", "" ],
- [ "ScrollViewer", "NativeScrollViewerDemoCtl", "ScrollBox_16x", "", "" ],
- [ "Slider", "SliderDemoCtl", "Slider_16x", "", "" ],
- [ "TextBlock", "TextBlockDemoCtl", "TextBlock_16x", "", "" ],
- [ "TextBox", "NativeTextBoxDemoCtl", "TextBox_16x", "", "" ],
- [ "ComboBox", "NativeComboBoxDemoCtl", "ComboBox_16x", "", "" ],
- [ "PasswordBox", "NativePasswordBoxDemoCtl", "PasswordBox_16x", "", "" ],
- [ "Expander", "ExpanderDemoCtl", "Expander_16x", "", "" ],
- [ "ProgressBar", "NativeProgressBarDemoCtl", "ProgressBar_16x", "", "" ],
- [ "Calendar", "CalendarDemoCtl", "Calendar_16x", "", "" ],
- [ "DatePicker", "NativeDatePickerDemoCtl", "DatePicker_16x", "", "" ],
- [ "TabControl", "NativeTabControlDemoCtl", "TabPage_16x", "", "" ],
- [ "DataGrid", "DataGridDemoCtl", "DataGrid_16x", "", "" ],
- [ "TreeView", "TreeViewDemoCtl", "TreeView_16x", "", "" ],
- [ "ListBox", "ListBoxDemoCtl", "ListBox_16x", "", "" ],
- [ "ListView", "ListViewDemoCtl", "ListView_16x", "", "" ],
- [ "GroupBox", "GroupBoxDemoCtl", "GroupBox_16x", "", "" ],
- [ "Menu", "MenuDemoCtl", "ContextMenu_16x", "", "" ],
- [ "RichTextBox", "RichTextBoxDemoCtl", "RichTextBox_16x", "", "" ],
- [ "FlowDocument", "FlowDocumentDemoCtl", "WPFFlowDocument_16x", "", "" ],
- [ "ToolBar", "ToolBarDemoCtl", "ToolBar_16x", "", "" ],
- [ "Border", "BorderDemoCtl", "BorderElement_16x", "", "" ],
- [ "Label", "LabelDemoCtl", "Label_16x", "", "" ],
- [ "Frame", "FrameDemoCtl", "frame_16xLG", "", "" ],
- [ "Window", "NativeWindowDemoCtl", "WindowsForm_16x", "", "" ],
- [ "Geometry", "GeometryDemoCtl", "Path_16x", "", "" ]
+ [ "Brush", "BrushDemoCtl", "Brush.Brush", "", "" ],
+ [ "Button", "ButtonDemoCtl", "Brush.ButtonClick", "", "" ],
+ [ "RepeatButton", "RepeatButtonDemoCtl", "Brush.RepeatButton", "", "" ],
+ [ "ToggleButton", "ToggleButtonDemoCtl", "Brush.Toggle", "", "" ],
+ [ "RadioButton", "RadioButtonDemoCtl", "Brush.RadioButton", "", "" ],
+ [ "CheckBox", "CheckBoxDemoCtl", "Brush.CheckBoxChecked", "", "" ],
+ [ "ScrollViewer", "NativeScrollViewerDemoCtl", "Brush.ScrollBox", "", "" ],
+ [ "Slider", "SliderDemoCtl", "Brush.Slider", "", "" ],
+ [ "TextBlock", "TextBlockDemoCtl", "Brush.TextBlock", "", "" ],
+ [ "TextBox", "NativeTextBoxDemoCtl", "Brush.TextBox", "", "" ],
+ [ "ComboBox", "NativeComboBoxDemoCtl", "Brush.ComboBox", "", "" ],
+ [ "PasswordBox", "NativePasswordBoxDemoCtl", "Brush.PasswordBox", "", "" ],
+ [ "Expander", "ExpanderDemoCtl", "Brush.Expander", "", "" ],
+ [ "ProgressBar", "NativeProgressBarDemoCtl", "Brush.ProgressBar", "", "" ],
+ [ "Calendar", "CalendarDemoCtl", "Brush.Calendar", "", "" ],
+ [ "DatePicker", "NativeDatePickerDemoCtl", "Brush.DateTimePicker", "", "" ],
+ [ "TabControl", "NativeTabControlDemoCtl", "Brush.TabPage", "", "" ],
+ [ "DataGrid", "DataGridDemoCtl", "Brush.DataGrid", "", "" ],
+ [ "TreeView", "TreeViewDemoCtl", "Brush.TreeView", "", "" ],
+ [ "ListBox", "ListBoxDemoCtl", "Brush.ListBox", "", "" ],
+ [ "ListView", "ListViewDemoCtl", "Brush.ListView", "", "" ],
+ [ "GroupBox", "GroupBoxDemoCtl", "Brush.GroupBox", "", "" ],
+ [ "Menu", "MenuDemoCtl", "Brush.ContextMenu", "", "" ],
+ [ "RichTextBox", "RichTextBoxDemoCtl", "Brush.RichTextBox", "", "" ],
+ [ "FlowDocument", "FlowDocumentDemoCtl", "Brush.WPFFlowDocument", "", "" ],
+ [ "ToolBar", "ToolBarDemoCtl", "Brush.ToolBar", "", "" ],
+ [ "Border", "BorderDemoCtl", "Brush.BorderElement", "", "" ],
+ [ "Label", "LabelDemoCtl", "Brush.Label", "", "" ],
+ [ "Frame", "FrameDemoCtl", "Brush.FrameBorder", "", "" ],
+ [ "Window", "NativeWindowDemoCtl", "Brush.WindowsForm", "", "" ],
+ [ "Geometry", "GeometryDemoCtl", "Brush.Path", "", "" ]
]
},
{
@@ -42,77 +42,77 @@
"selectedIndex": 0,
"group": true,
"demoItemList": [
- [ "FloatingBlock", "FloatingBlockDemoCtl", "thumbs_up", "", "Interacting" ],
- [ "PropertyGrid", "PropertyGridDemoCtl", "PropertyGridEditorPart_16x", "", "DataEntry" ],
- [ "ImageSelector", "ImageSelectorDemoCtl", "Image_16x", "", "DataEntry" ],
- [ "ImageBlock", "ImageBlockDemoCtl", "ImageStack_16x", "", "DataDisplay" ],
- [ "Magnifier", "MagnifierDemoCtl", "Search_16x", "", "Interacting" ],
- [ "Gravatar", "GravatarDemoCtl", "User_16x", "", "DataDisplay" ],
- [ "Badge", "BadgeDemoCtl", "DotLarge_16x", "", "DataDisplay" ],
- [ "SplitButton", "SplitButtonDemoCtl", "SplitButton_16x", "", "Button" ],
- [ "ButtonGroup", "ButtonGroupDemoCtl", "ButtonGroup_16x", "", "Button" ],
- [ "ProgressButton", "ProgressButtonDemoCtl", "ProgressButton_16x", "", "Button" ],
- [ "Poptip", "PoptipDemoCtl", "PopupCursor_16x", "", "DataDisplay" ],
- [ "NumericUpDown", "NumericUpDownDemoCtl", "NumericListBox_16x", "", "DataEntry" ],
- [ "TextBox", "TextBoxDemoCtl", "TextBox_16x", "", "DataEntry" ],
- [ "ComboBox", "ComboBoxDemoCtl", "ComboBox_16x", "", "DataEntry" ],
- [ "CheckComboBox", "CheckComboBoxDemoCtl", "CheckBoxList_16x", "", "DataEntry" ],
- [ "AutoCompleteTextBox", "AutoCompleteTextBoxDemoCtl", "AutoComplete_16x", "1", "DataEntry" ],
- [ "PasswordBox", "PasswordBoxDemoCtl", "PasswordBox_16x", "", "DataEntry" ],
- [ "PinBox", "PinBoxDemoCtl", "Ellipsis_16x", "", "DataEntry" ],
- [ "DatePicker", "DatePickerDemoCtl", "DatePicker_16x", "", "DataEntry" ],
- [ "Clock", "ClockDemoCtl", "Time_color_16x", "", "DataEntry" ],
- [ "TimePicker", "TimePickerDemoCtl", "TimePicker_16x", "", "DataEntry" ],
- [ "CalendarWithClock", "CalendarWithClockDemoCtl", "Calendar_16x", "", "DataEntry" ],
- [ "DateTimePicker", "DateTimePickerDemoCtl", "DatePicker_16x", "", "DataEntry" ],
- [ "Transfer", "TransferDemoCtl", "Transfer_16x", "", "DataEntry" ],
- [ "FlipClock", "FlipClockDemoCtl", "FlipVertical_16x", "", "DataDisplay" ],
- [ "Rate", "RateDemoCtl", "Star", "", "DataEntry" ],
- [ "Shield", "ShieldDemoCtl", "Shield_16x", "", "DataDisplay" ],
- [ "SearchBar", "SearchBarDemoCtl", "Search_16x", "", "DataEntry" ],
- [ "Tag", "TagDemoCtl", "Tag_16x", "", "DataDisplay" ],
- [ "GifImage", "GifImageDemoCtl", "Animation_16x", "", "DataDisplay" ],
- [ "OutlineText", "OutlineTextDemoCtl", "TextBlock_16x", "", "DataDisplay" ],
- [ "RunningBlock", "RunningBlockDemoCtl", "Dynamic_16x", "", "DataDisplay" ],
- [ "Card", "CardDemoCtl", "VSO_Card_16x", "", "DataDisplay" ],
- [ "ElementGroup", "ElementGroupDemoCtl", "ButtonGroup_16x", "1", "Layout" ],
- [ "Divider", "DividerDemoCtl", "DottedSplitter_16x", "", "Layout" ],
- [ "CirclePanel", "CirclePanelDemoCtl", "ColorWheel_16x", "", "Layout" ],
- [ "Grid", "GridDemoCtl", "GridPane_16x", "", "Layout" ],
- [ "FlexPanel", "FlexPanelDemoCtl", "layout-FlexLayout-16", "1", "Layout" ],
- [ "UniformSpacingPanel", "UniformSpacingPanelDemoCtl", "IncreaseHorizontalSpacing_16x", "1", "Layout" ],
- [ "RelativePanel", "RelativePanelDemoCtl", "TransformRelative_16x", "", "Layout" ],
- [ "WaterfallPanel", "WaterfallPanelDemoCtl", "Panel_16x", "", "Layout" ],
- [ "HoneycombPanel", "HoneycombPanelDemoCtl", "PolygonHexagon_16x", "", "Layout" ],
- [ "TransitioningContentControl", "TransitioningContentControlDemoCtl", "TransitioningContentControl_16x", "", "Interacting" ],
- [ "Drawer", "DrawerDemoCtl", "View_Portrait_16x", "", "Feedback" ],
- [ "CoverView", "CoverViewDemoCtl", "DetailDataView_16x", "", "DataDisplay" ],
- [ "CoverFlow", "CoverFlowDemoCtl", "LinearCarousel_16x", "", "DataDisplay" ],
- [ "ProgressBar", "ProgressBarDemoCtl", "ProgressBar_16x", "", "Feedback" ],
- [ "StepBar", "StepBarDemoCtl", "Flow_16x", "", "Navigation" ],
- [ "Growl", "GrowlDemoCtl", "Message_16x", "", "Feedback" ],
- [ "Loading", "LoadingDemoCtl", "Loading_Blue_16x", "", "Feedback" ],
- [ "ColorPicker", "ColorPickerDemoCtl", "ColorPalette_16x", "", "DataEntry" ],
- [ "Carousel", "CarouselDemoCtl", "Carousel_16x", "", "DataDisplay" ],
- [ "CompareSlider", "CompareSliderDemoCtl", "SplitterControl_16x", "", "Interacting" ],
- [ "PreviewSlider", "PreviewSliderDemoCtl", "HoverMenu_16x", "", "DataEntry" ],
- [ "RangeSlider", "RangeSliderDemoCtl", "brackets_Square_16xLG", "", "DataEntry" ],
- [ "TimeBar", "TimeBarDemoCtl", "Timeline_16x", "", "DataEntry" ],
- [ "Pagination", "PaginationDemoCtl", "Paginator_16x", "", "Navigation" ],
- [ "TabControl", "TabControlDemoCtl", "TabPage_16x", "", "DataDisplay" ],
- [ "SideMenu", "SideMenuDemoCtl", "MainMenuControl_16x", "", "Navigation" ],
- [ "Notification", "NotificationDemoCtl", "Procedure_16x", "", "Feedback" ],
- [ "Dialog", "DialogDemoCtl", "Dialog_16x", "", "Feedback" ],
- [ "Screenshot", "ScreenshotDemoCtl", "WindowScreenshot_16x", "", "" ],
- [ "GotoTop", "GotoTopDemoCtl", "GoToTop_16x", "", "" ],
- [ "ChatBubble", "ChatBubbleDemoCtl", "Bubble_16xLG", "", "" ],
- [ "Watermark", "WatermarkDemoCtl", "GridLight_16x", "1", "" ],
- [ "NotifyIcon", "NotifyIconDemoCtl", "NotificationHub_16x", "", "" ],
- [ "ImageBrowser", "ImageBrowserDemoCtl", "ImageBrowser_16x", "", "" ],
- [ "AnimationPath", "AnimationPathDemoCtl", "Path_16x", "", "" ],
- [ "ScrollViewer", "ScrollViewerDemoCtl", "ScrollBox_16x", "", "" ],
- [ "Sprite", "SpriteDemoCtl", "HandyControl", "", "" ],
- [ "Window", "WindowDemoCtl", "WindowsForm_16x", "", "" ]
+ [ "FloatingBlock", "FloatingBlockDemoCtl", "Brush.LikeFilled", "", "Interacting" ],
+ [ "PropertyGrid", "PropertyGridDemoCtl", "Brush.PropertyGridEditorPart", "", "DataEntry" ],
+ [ "ImageSelector", "ImageSelectorDemoCtl", "Brush.Image", "", "DataEntry" ],
+ [ "ImageBlock", "ImageBlockDemoCtl", "Brush.ImageStack", "", "DataDisplay" ],
+ [ "Magnifier", "MagnifierDemoCtl", "Brush.Search", "", "Interacting" ],
+ [ "Gravatar", "GravatarDemoCtl", "Brush.User", "", "DataDisplay" ],
+ [ "Badge", "BadgeDemoCtl", "Brush.CheckDot", "", "DataDisplay" ],
+ [ "SplitButton", "SplitButtonDemoCtl", "Brush.SplitButton", "", "Button" ],
+ [ "ButtonGroup", "ButtonGroupDemoCtl", "Brush.ButtonGroup", "", "Button" ],
+ [ "ProgressButton", "ProgressButtonDemoCtl", "Brush.ProgressBarStatusBar8", "", "Button" ],
+ [ "Poptip", "PoptipDemoCtl", "Brush.ToolTip", "", "DataDisplay" ],
+ [ "NumericUpDown", "NumericUpDownDemoCtl", "Brush.NumericListBox", "", "DataEntry" ],
+ [ "TextBox", "TextBoxDemoCtl", "Brush.TextBox", "", "DataEntry" ],
+ [ "ComboBox", "ComboBoxDemoCtl", "Brush.ComboBox", "", "DataEntry" ],
+ [ "CheckComboBox", "CheckComboBoxDemoCtl", "Brush.CheckBoxList", "", "DataEntry" ],
+ [ "AutoCompleteTextBox", "AutoCompleteTextBoxDemoCtl", "Brush.AutoComplete", "1", "DataEntry" ],
+ [ "PasswordBox", "PasswordBoxDemoCtl", "Brush.PasswordBox", "", "DataEntry" ],
+ [ "PinBox", "PinBoxDemoCtl", "Brush.Ellipsis", "", "DataEntry" ],
+ [ "DatePicker", "DatePickerDemoCtl", "Brush.DateTimePicker", "", "DataEntry" ],
+ [ "Clock", "ClockDemoCtl", "Brush.Time", "", "DataEntry" ],
+ [ "TimePicker", "TimePickerDemoCtl", "Brush.TimePicker", "", "DataEntry" ],
+ [ "CalendarWithClock", "CalendarWithClockDemoCtl", "Brush.Calendar", "", "DataEntry" ],
+ [ "DateTimePicker", "DateTimePickerDemoCtl", "Brush.DateTimePicker", "", "DataEntry" ],
+ [ "Transfer", "TransferDemoCtl", "Brush.SyncArrow", "", "DataEntry" ],
+ [ "FlipClock", "FlipClockDemoCtl", "Brush.FlipVertical", "", "DataDisplay" ],
+ [ "Rate", "RateDemoCtl", "Brush.HeartFilled", "", "DataEntry" ],
+ [ "Shield", "ShieldDemoCtl", "Brush.SplitKeyValuePair", "", "DataDisplay" ],
+ [ "SearchBar", "SearchBarDemoCtl", "Brush.Search", "", "DataEntry" ],
+ [ "Tag", "TagDemoCtl", "Brush.Tag", "", "DataDisplay" ],
+ [ "GifImage", "GifImageDemoCtl", "Brush.Animation", "", "DataDisplay" ],
+ [ "OutlineText", "OutlineTextDemoCtl", "Brush.TextBlock", "", "DataDisplay" ],
+ [ "RunningBlock", "RunningBlockDemoCtl", "Brush.Dynamic", "", "DataDisplay" ],
+ [ "Card", "CardDemoCtl", "Brush.ContactCard", "", "DataDisplay" ],
+ [ "ElementGroup", "ElementGroupDemoCtl", "Brush.ButtonGroup", "1", "Layout" ],
+ [ "Divider", "DividerDemoCtl", "Brush.DottedSplitter", "", "Layout" ],
+ [ "CirclePanel", "CirclePanelDemoCtl", "Brush.ColorWheel", "", "Layout" ],
+ [ "Grid", "GridDemoCtl", "Brush.GridPane", "", "Layout" ],
+ [ "FlexPanel", "FlexPanelDemoCtl", "Brush.FlowLayoutPanel", "1", "Layout" ],
+ [ "UniformSpacingPanel", "UniformSpacingPanelDemoCtl", "Brush.IncreaseHorizontalSpacing", "1", "Layout" ],
+ [ "RelativePanel", "RelativePanelDemoCtl", "Brush.TransformRelative", "", "Layout" ],
+ [ "WaterfallPanel", "WaterfallPanelDemoCtl", "Brush.Panel", "", "Layout" ],
+ [ "HoneycombPanel", "HoneycombPanelDemoCtl", "Brush.PolygonHexagon", "", "Layout" ],
+ [ "TransitioningContentControl", "TransitioningContentControlDemoCtl", "Brush.TransitioningContentControl", "", "Interacting" ],
+ [ "Drawer", "DrawerDemoCtl", "Brush.TransactedReceiveScope", "", "Feedback" ],
+ [ "CoverView", "CoverViewDemoCtl", "Brush.DetailDataView", "", "DataDisplay" ],
+ [ "CoverFlow", "CoverFlowDemoCtl", "Brush.LinearCarousel", "", "DataDisplay" ],
+ [ "ProgressBar", "ProgressBarDemoCtl", "Brush.ProgressBar", "", "Feedback" ],
+ [ "StepBar", "StepBarDemoCtl", "Brush.Flow", "", "Navigation" ],
+ [ "Growl", "GrowlDemoCtl", "Brush.Message", "", "Feedback" ],
+ [ "Loading", "LoadingDemoCtl", "Brush.Loading", "", "Feedback" ],
+ [ "ColorPicker", "ColorPickerDemoCtl", "Brush.ColorPalette", "", "DataEntry" ],
+ [ "Carousel", "CarouselDemoCtl", "Brush.Carousel", "", "DataDisplay" ],
+ [ "CompareSlider", "CompareSliderDemoCtl", "Brush.SplitterControl", "", "Interacting" ],
+ [ "PreviewSlider", "PreviewSliderDemoCtl", "Brush.HoverMenu", "", "DataEntry" ],
+ [ "RangeSlider", "RangeSliderDemoCtl", "Brush.Indexer", "", "DataEntry" ],
+ [ "TimeBar", "TimeBarDemoCtl", "Brush.Timeline", "", "DataEntry" ],
+ [ "Pagination", "PaginationDemoCtl", "Brush.Paginator", "", "Navigation" ],
+ [ "TabControl", "TabControlDemoCtl", "Brush.TabPage", "", "DataDisplay" ],
+ [ "SideMenu", "SideMenuDemoCtl", "Brush.MainMenuControl", "", "Navigation" ],
+ [ "Notification", "NotificationDemoCtl", "Brush.Procedure", "", "Feedback" ],
+ [ "Dialog", "DialogDemoCtl", "Brush.Dialog", "", "Feedback" ],
+ [ "Screenshot", "ScreenshotDemoCtl", "Brush.WindowScreenshot", "", "" ],
+ [ "GotoTop", "GotoTopDemoCtl", "Brush.GoToTop", "", "" ],
+ [ "ChatBubble", "ChatBubbleDemoCtl", "Brush.FeedbackBubble", "", "" ],
+ [ "Watermark", "WatermarkDemoCtl", "Brush.GridLight", "1", "" ],
+ [ "NotifyIcon", "NotifyIconDemoCtl", "Brush.NotificationHub", "", "" ],
+ [ "ImageBrowser", "ImageBrowserDemoCtl", "Brush.ImageBrowser", "", "" ],
+ [ "AnimationPath", "AnimationPathDemoCtl", "Brush.Path", "", "" ],
+ [ "ScrollViewer", "ScrollViewerDemoCtl", "Brush.ScrollBox", "", "" ],
+ [ "Sprite", "SpriteDemoCtl", "Brush.HandyControl", "", "" ],
+ [ "Window", "WindowDemoCtl", "Brush.WindowsForm", "", "" ]
]
},
{
@@ -120,9 +120,9 @@
"selectedIndex": 0,
"group": false,
"demoItemList": [
- [ "HatchBrushGenerator", "HatchBrushGeneratorDemoCtl", "DataGenerator_16x", "", "" ],
- [ "Morphing_Animation", "GeometryAnimationDemoCtl", "Animation_16x", "", "" ],
- [ "Effects", "EffectsDemoCtl", "Effects_16x", "", "" ]
+ [ "HatchBrushGenerator", "HatchBrushGeneratorDemoCtl", "Brush.DataGenerator", "", "" ],
+ [ "Morphing_Animation", "GeometryAnimationDemoCtl", "Brush.Animation", "", "" ],
+ [ "Effects", "EffectsDemoCtl", "Brush.Effects", "", "" ]
]
}
]
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs
index a685b132..75bf7bff 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs
@@ -13,7 +13,7 @@ public class DemoItemModel : ObservableObject
public string TargetCtlName { get; set; }
- public string ImageName { get; set; }
+ public object ImageBrush { get; set; }
public bool IsNew { get; set; }
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Animation_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Animation_16x.png
deleted file mode 100644
index 71666886..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Animation_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/AutoComplete_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/AutoComplete_16x.png
deleted file mode 100644
index 3b943f5d..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/AutoComplete_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/BorderElement_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/BorderElement_16x.png
deleted file mode 100644
index 858e0717..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/BorderElement_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Brush_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Brush_16x.png
deleted file mode 100644
index 76b75c02..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Brush_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Bubble_16xLG.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Bubble_16xLG.png
deleted file mode 100644
index b836a649..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Bubble_16xLG.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ButtonClick_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ButtonClick_16x.png
deleted file mode 100644
index 7a31e40b..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ButtonClick_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ButtonGroup_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ButtonGroup_16x.png
deleted file mode 100644
index 929589fb..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ButtonGroup_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Calendar_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Calendar_16x.png
deleted file mode 100644
index 15f1602d..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Calendar_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Carousel_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Carousel_16x.png
deleted file mode 100644
index d9dc2060..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Carousel_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/CheckBox_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/CheckBox_16x.png
deleted file mode 100644
index de584d67..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/CheckBox_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/CheckboxList_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/CheckboxList_16x.png
deleted file mode 100644
index 856bab79..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/CheckboxList_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ColorPalette_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ColorPalette_16x.png
deleted file mode 100644
index a8f6097a..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ColorPalette_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ColorWheel_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ColorWheel_16x.png
deleted file mode 100644
index bd1eb49c..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ColorWheel_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ComboBox_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ComboBox_16x.png
deleted file mode 100644
index 9c9fa6c9..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ComboBox_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ContextMenu_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ContextMenu_16x.png
deleted file mode 100644
index 33f99af5..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ContextMenu_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DataGenerator_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DataGenerator_16x.png
deleted file mode 100644
index 75e8acf7..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DataGenerator_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DataGrid_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DataGrid_16x.png
deleted file mode 100644
index 04d545bb..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DataGrid_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DatePicker_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DatePicker_16x.png
deleted file mode 100644
index d6123e08..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DatePicker_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DetailDataView_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DetailDataView_16x.png
deleted file mode 100644
index 1a8667d3..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DetailDataView_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Dialog_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Dialog_16x.png
deleted file mode 100644
index fbb99b4f..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Dialog_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DotLarge_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DotLarge_16x.png
deleted file mode 100644
index 02028445..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DotLarge_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DottedSplitter_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DottedSplitter_16x.png
deleted file mode 100644
index 4815aab7..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/DottedSplitter_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Dynamic_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Dynamic_16x.png
deleted file mode 100644
index 17cf7abb..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Dynamic_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Effects_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Effects_16x.png
deleted file mode 100644
index cf6cb47b..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Effects_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Ellipsis_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Ellipsis_16x.png
deleted file mode 100644
index f6d88509..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Ellipsis_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Expander_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Expander_16x.png
deleted file mode 100644
index f6831469..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Expander_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/FlipVertical_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/FlipVertical_16x.png
deleted file mode 100644
index f60a1cd4..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/FlipVertical_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Flow_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Flow_16x.png
deleted file mode 100644
index a7d330b0..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Flow_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GoToTop_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GoToTop_16x.png
deleted file mode 100644
index 0dedbcbd..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GoToTop_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridLight_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridLight_16x.png
deleted file mode 100644
index d9473a1a..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridLight_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridPane_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridPane_16x.png
deleted file mode 100644
index 9d773eb4..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GridPane_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GroupBox_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GroupBox_16x.png
deleted file mode 100644
index 4c9cbbb8..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/GroupBox_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/HandyControl.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/HandyControl.png
deleted file mode 100644
index 49d606eb..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/HandyControl.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/HoverMenu_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/HoverMenu_16x.png
deleted file mode 100644
index 8778e134..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/HoverMenu_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ImageBrowser_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ImageBrowser_16x.png
deleted file mode 100644
index 233c787c..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ImageBrowser_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ImageStack_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ImageStack_16x.png
deleted file mode 100644
index 52890672..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ImageStack_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Image_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Image_16x.png
deleted file mode 100644
index c08e7cda..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Image_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/IncreaseHorizontalSpacing_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/IncreaseHorizontalSpacing_16x.png
deleted file mode 100644
index 0835d981..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/IncreaseHorizontalSpacing_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Label_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Label_16x.png
deleted file mode 100644
index 8089a296..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Label_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/LinearCarousel_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/LinearCarousel_16x.png
deleted file mode 100644
index 89c09325..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/LinearCarousel_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ListBox_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ListBox_16x.png
deleted file mode 100644
index fdf8dd83..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ListBox_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ListView_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ListView_16x.png
deleted file mode 100644
index 9e8614ab..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ListView_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Loading_Blue_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Loading_Blue_16x.png
deleted file mode 100644
index 99862b40..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Loading_Blue_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/MainMenuControl_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/MainMenuControl_16x.png
deleted file mode 100644
index 1019fb71..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/MainMenuControl_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Message_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Message_16x.png
deleted file mode 100644
index 1e039024..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Message_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/NotificationHub_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/NotificationHub_16x.png
deleted file mode 100644
index 74fd87ae..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/NotificationHub_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/NumericListBox_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/NumericListBox_16x.png
deleted file mode 100644
index a03614bc..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/NumericListBox_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/OutlinedRectangleTool_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/OutlinedRectangleTool_16x.png
deleted file mode 100644
index d2a6837e..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/OutlinedRectangleTool_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Paginator_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Paginator_16x.png
deleted file mode 100644
index 52b22cfe..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Paginator_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Panel_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Panel_16x.png
deleted file mode 100644
index f70cade8..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Panel_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PasswordBox_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PasswordBox_16x.png
deleted file mode 100644
index 91bd1acf..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PasswordBox_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Path_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Path_16x.png
deleted file mode 100644
index 9b611c2f..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Path_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PolygonHexagon_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PolygonHexagon_16x.png
deleted file mode 100644
index 21a229ac..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PolygonHexagon_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PopupCursor_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PopupCursor_16x.png
deleted file mode 100644
index 66c90cba..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PopupCursor_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Procedure_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Procedure_16x.png
deleted file mode 100644
index f2e7d2f1..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Procedure_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ProgressBar_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ProgressBar_16x.png
deleted file mode 100644
index 3a789588..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ProgressBar_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ProgressButton_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ProgressButton_16x.png
deleted file mode 100644
index 0cf2490b..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ProgressButton_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PropertyGridEditorPart_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PropertyGridEditorPart_16x.png
deleted file mode 100644
index 49fd6100..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PropertyGridEditorPart_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/RadioButton_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/RadioButton_16x.png
deleted file mode 100644
index 3c07d3ab..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/RadioButton_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/RepeatButton_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/RepeatButton_16x.png
deleted file mode 100644
index 94cdd5eb..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/RepeatButton_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/RichTextBox_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/RichTextBox_16x.png
deleted file mode 100644
index 93c8e6e6..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/RichTextBox_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ScrollBox_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ScrollBox_16x.png
deleted file mode 100644
index 161e4828..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ScrollBox_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Search_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Search_16x.png
deleted file mode 100644
index 8b705d06..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Search_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Shield_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Shield_16x.png
deleted file mode 100644
index 8fa5ff93..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Shield_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Slider_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Slider_16x.png
deleted file mode 100644
index 7e3c570d..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Slider_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SortAscending_grey_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SortAscending_grey_16x.png
deleted file mode 100644
index f8044163..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SortAscending_grey_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SplitButton_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SplitButton_16x.png
deleted file mode 100644
index 5bb43174..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SplitButton_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SplitterControl_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SplitterControl_16x.png
deleted file mode 100644
index 45d577aa..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SplitterControl_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Star.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Star.png
deleted file mode 100644
index 1e1d20ea..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Star.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TabPage_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TabPage_16x.png
deleted file mode 100644
index 3969b8eb..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TabPage_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Tag_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Tag_16x.png
deleted file mode 100644
index e0af7a89..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Tag_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TextBlock_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TextBlock_16x.png
deleted file mode 100644
index cdf786d2..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TextBlock_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TextBox_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TextBox_16x.png
deleted file mode 100644
index 5c6974c5..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TextBox_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TimePicker_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TimePicker_16x.png
deleted file mode 100644
index 73aa365d..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TimePicker_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Time_color_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Time_color_16x.png
deleted file mode 100644
index 350c2831..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Time_color_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Timeline_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Timeline_16x.png
deleted file mode 100644
index aafb7aa7..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Timeline_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Toggle_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Toggle_16x.png
deleted file mode 100644
index e553d259..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Toggle_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ToolBar_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ToolBar_16x.png
deleted file mode 100644
index 56e6d4e4..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/ToolBar_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Transfer_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Transfer_16x.png
deleted file mode 100644
index 0ab98dd1..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/Transfer_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TransformRelative_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TransformRelative_16x.png
deleted file mode 100644
index 7d73d0e5..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TransformRelative_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TransitioningContentControl_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TransitioningContentControl_16x.png
deleted file mode 100644
index 8c7465e1..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TransitioningContentControl_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TreeView_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TreeView_16x.png
deleted file mode 100644
index 8e061146..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/TreeView_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/User_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/User_16x.png
deleted file mode 100644
index 8e5bd8a4..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/User_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/VSO_Card_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/VSO_Card_16x.png
deleted file mode 100644
index 034f8cf4..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/VSO_Card_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/View_Portrait_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/View_Portrait_16x.png
deleted file mode 100644
index f02919d2..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/View_Portrait_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WPFFlowDocument_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WPFFlowDocument_16x.png
deleted file mode 100644
index 7f8e5395..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WPFFlowDocument_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WindowScreenshot_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WindowScreenshot_16x.png
deleted file mode 100644
index 7b542617..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WindowScreenshot_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WindowsForm_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WindowsForm_16x.png
deleted file mode 100644
index 52004d25..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/WindowsForm_16x.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/brackets_Square_16xLG.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/brackets_Square_16xLG.png
deleted file mode 100644
index a93a4c23..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/brackets_Square_16xLG.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/frame_16xLG.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/frame_16xLG.png
deleted file mode 100644
index 7efa4c49..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/frame_16xLG.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/layout-FlexLayout-16.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/layout-FlexLayout-16.png
deleted file mode 100644
index 3b24bd18..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/layout-FlexLayout-16.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/thumbs_up.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/thumbs_up.png
deleted file mode 100644
index 9157f8b1..00000000
Binary files a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/thumbs_up.png and /dev/null differ
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
index 45119d2b..79b21c74 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Basic/Brushes.xaml
@@ -40,7 +40,6 @@
-
@@ -49,8 +48,1344 @@
-
-
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs b/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
index e4424361..d7660afd 100644
--- a/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
+++ b/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
@@ -1,15 +1,14 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
-using System.Globalization;
using System.IO;
using System.Linq;
using System.Net;
using System.Windows;
using HandyControl.Data;
+using HandyControl.Tools;
using HandyControlDemo.Data;
using HandyControlDemo.Properties.Langs;
-using HandyControlDemo.Tools.Converter;
using Newtonsoft.Json;
namespace HandyControlDemo.Service;
@@ -402,7 +401,7 @@ public class DataService
{
var name = (string) item[0];
string targetCtlName = item[1];
- string imageName = item[2];
+ string imageBrushName = item[2];
var isNew = !string.IsNullOrEmpty((string) item[3]);
var groupName = (string) item[4];
if (string.IsNullOrEmpty(groupName))
@@ -414,7 +413,7 @@ public class DataService
{
Name = name,
TargetCtlName = targetCtlName,
- ImageName = $"../../Resources/Img/LeftMainContent/{imageName}.png",
+ ImageBrush = ResourceHelper.GetResource