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 5bd91cb0..0f84bcab 100644
--- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
+++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj
@@ -402,6 +402,9 @@
Resources\Img\LeftMainContent\GridPane_16x.png
+
+ Resources\Img\LeftMainContent\AutoComplete_16x.png
+
Resources\Img\under_construction.gif
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 73429799..aa01a0d6 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -11250,6 +11250,113 @@
+
+
+
@@ -12878,6 +12985,7 @@
+
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 246ff69d..9aaf0808 100644
--- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj
@@ -404,6 +404,9 @@
Resources\Img\LeftMainContent\GridPane_16x.png
+
+ Resources\Img\LeftMainContent\AutoComplete_16x.png
+
Resources\Img\under_construction.gif
diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
index d3d99dea..9e3731c4 100644
--- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
@@ -56,6 +56,9 @@
UserControl\Controls\AnimationPathDemoCtl.xaml
+
+ UserControl\Controls\AutoCompleteTextBoxDemoCtl.xaml
+
UserControl\Controls\BadgeDemoCtl.xaml
@@ -431,6 +434,10 @@
UserControl\Controls\AnimationPathDemoCtl.xaml.cs
AnimationPathDemoCtl.xaml
+
+ UserControl\Controls\AutoCompleteTextBoxDemoCtl.xaml.cs
+ AutoCompleteTextBoxDemoCtl.xaml
+
UserControl\Controls\BadgeDemoCtl.xaml.cs
BadgeDemoCtl.xaml
@@ -850,6 +857,9 @@
ViewModel\ComboBoxDemoViewModel.cs
+
+ ViewModel\AutoCompleteTextBoxDemoViewModel.cs
+
ViewModel\BadgeDemoViewModel.cs
diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
index a767567c..13ed6605 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
+++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json
@@ -44,7 +44,7 @@
"demoItemList": [
[ "FloatingBlock", "FloatingBlockDemoCtl", "thumbs_up", "", "Interacting" ],
[ "PropertyGrid", "PropertyGridDemoCtl", "PropertyGridEditorPart_16x", "", "DataEntry" ],
- [ "ImageSelector", "ImageSelectorDemoCtl", "Image_16x", "1", "DataEntry" ],
+ [ "ImageSelector", "ImageSelectorDemoCtl", "Image_16x", "", "DataEntry" ],
[ "ImageBlock", "ImageBlockDemoCtl", "ImageStack_16x", "", "DataDisplay" ],
[ "Magnifier", "MagnifierDemoCtl", "Search_16x", "", "Interacting" ],
[ "Gravatar", "GravatarDemoCtl", "User_16x", "", "DataDisplay" ],
@@ -57,6 +57,7 @@
[ "TextBox", "TextBoxDemoCtl", "TextBox_16x", "", "DataEntry" ],
[ "ComboBox", "ComboBoxDemoCtl", "ComboBox_16x", "", "DataEntry" ],
[ "CheckComboBox", "CheckComboBoxDemoCtl", "CheckBoxList_16x", "1", "DataEntry" ],
+ [ "AutoCompleteTextBox", "AutoCompleteTextBoxDemoCtl", "AutoComplete_16x", "1", "DataEntry" ],
[ "PasswordBox", "PasswordBoxDemoCtl", "PasswordBox_16x", "", "DataEntry" ],
[ "PinBox", "PinBoxDemoCtl", "Ellipsis_16x", "", "DataEntry" ],
[ "DatePicker", "DatePickerDemoCtl", "DatePicker_16x", "", "DataEntry" ],
diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index 70321550..d672b443 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -60,6 +60,9 @@
TextDialogWithTimer.xaml
+
+ AutoCompleteTextBoxDemoCtl.xaml
+
ElementGroupDemoCtl.xaml
@@ -408,6 +411,7 @@
+
@@ -540,6 +544,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
index 911f565e..9db8b90f 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
@@ -124,6 +124,17 @@ namespace HandyControlDemo.Properties.Langs
}
}
+ ///
+ /// Looks up a localized string similar to 自动补全文本框.
+ ///
+ public static string AutoCompleteTextBox
+ {
+ get
+ {
+ return ResourceManager.GetString("AutoCompleteTextBox", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 标记.
///
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
index f46c26b4..3ad5692c 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
@@ -798,4 +798,7 @@
ElementGroup
+
+ AutoCompleteTextBox
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
index 76e2f64d..7002d977 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
@@ -798,4 +798,7 @@
ElementGroup
+
+ AutoCompleteTextBox
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx
index 4b9f220e..68a8d7ac 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx
@@ -1,4 +1,4 @@
-
+