Merge branch 'master' into master

2020-07-12 00:09:38 +08:00
commit ea8c8a9795
@@ -3,13 +3,14 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Net;
-#if !netle40
+#if !NET40
 using System.Runtime;
 #endif
 using System.Security.Authentication; 
 using System.Threading;
 using System.Windows;
 using HandyControl.Data;
+using HandyControl.Themes;
 using HandyControl.Tools;
 using HandyControlDemo.Data;
 using HandyControlDemo.Tools;
@@ -25,7 +26,7 @@ namespace HandyControlDemo

        public App()
        {
-#if !netle40
+#if !NET40
            var cachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache";
            if (!Directory.Exists(cachePath))
            {
@@ -72,7 +73,7 @@ namespace HandyControlDemo
                    UpdateSkin(GlobalData.Config.Skin);
                }

-                ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo());
+                ConfigHelper.Instance.SystemVersionInfo = CommonHelper.GetSystemVersionInfo();
                ConfigHelper.Instance.SetWindowDefaultStyle();
                ConfigHelper.Instance.SetNavigationWindowDefaultStyle();

@@ -88,6 +89,7 @@ namespace HandyControlDemo

        internal void UpdateSkin(SkinType skin)
        {
+            SharedResourceDictionary.SharedDictionaries.Clear();
            var skins0 = Resources.MergedDictionaries[0];
            skins0.MergedDictionaries.Clear();
            skins0.MergedDictionaries.Add(ResourceHelper.GetSkin(skin));	
@@ -27,12 +27,13 @@
      [ "GroupBox", "GroupBoxDemoCtl", "GroupBox_16x", "" ],
      [ "Menu", "MenuDemoCtl", "ContextMenu_16x", "" ],
      [ "RichTextBox", "RichTextBoxDemoCtl", "RichTextBox_16x", "" ],
-      [ "FlowDocument", "FlowDocumentDemoCtl", "WPFFlowDocument_16x", "1" ],
+      [ "FlowDocument", "FlowDocumentDemoCtl", "WPFFlowDocument_16x", "" ],
      [ "ToolBar", "ToolBarDemoCtl", "ToolBar_16x", "" ],
      [ "Border", "BorderDemoCtl", "BorderElement_16x", "" ],
      [ "Label", "LabelDemoCtl", "Label_16x", "" ],
-      [ "Frame", "FrameDemoCtl", "frame_16xLG", "1" ],
-      [ "Window", "NativeWindowDemoCtl", "WindowsForm_16x", "1" ]
+      [ "Frame", "FrameDemoCtl", "frame_16xLG", "" ],
+      [ "Window", "NativeWindowDemoCtl", "WindowsForm_16x", "" ],
+      [ "Geometry", "GeometryDemoCtl", "Path_16x", "1" ]
    ]
  },
  {
@@ -40,6 +41,8 @@
    "selectedIndex": 0,
    "demoItemList": [
      [ "FloatingBlock", "FloatingBlockDemoCtl", "thumbs_up", "" ],
+      [ "PropertyGrid", "PropertyGridDemoCtl", "PropertyGridEditorPart_16x", "1" ],
+      [ "ImageSelector", "ImageSelectorDemoCtl", "Image_16x", "1" ],
      [ "ImageBlock", "ImageBlockDemoCtl", "ImageStack_16x", "" ],
      [ "Magnifier", "MagnifierDemoCtl", "Search_16x", "" ],
      [ "Gravatar", "GravatarDemoCtl", "User_16x", "" ],
@@ -54,8 +57,9 @@
      [ "NumericUpDown", "NumericUpDownDemoCtl", "NumericListBox_16x", "" ],
      [ "TextBox", "TextBoxDemoCtl", "TextBox_16x", "" ],
      [ "ComboBox", "ComboBoxDemoCtl", "ComboBox_16x", "" ],
+      [ "CheckComboBox", "CheckComboBoxDemoCtl", "CheckBoxList_16x", "1" ],
      [ "PasswordBox", "PasswordBoxDemoCtl", "PasswordBox_16x", "" ],
-      [ "PinBox", "PinBoxDemoCtl", "Ellipsis_16x", "1" ],
+      [ "PinBox", "PinBoxDemoCtl", "Ellipsis_16x", "" ],
      [ "DatePicker", "DatePickerDemoCtl", "DatePicker_16x", "" ],
      [ "Clock", "ClockDemoCtl", "Time_color_16x", "" ],
      [ "TimePicker", "TimePickerDemoCtl", "TimePicker_16x", "" ],
@@ -101,7 +105,7 @@
      [ "Notification", "NotificationDemoCtl", "Procedure_16x", "" ],
      [ "Dialog", "DialogDemoCtl", "Dialog_16x", "" ],
      [ "Screenshot", "ScreenshotDemoCtl", "WindowScreenshot_16x", "1" ],
-      [ "Window", "WindowDemoCtl", "WindowsForm_16x", "1" ]
+      [ "Window", "WindowDemoCtl", "WindowsForm_16x", "" ]
    ]
  },
  {
@@ -12,7 +12,7 @@ namespace HandyControlDemo.Data
        public string Title
        {
            get => _title;
-#if netle40
+#if NET40
            set => Set(nameof(Title), ref _title, value);
 #else
            set => Set(ref _title, value);
@@ -24,7 +24,7 @@ namespace HandyControlDemo.Data
        public int SelectedIndex
        {
            get => _selectedIndex;
-#if netle40
+#if NET40
            set => Set(nameof(SelectedIndex), ref _selectedIndex, value);
 #else
            set => Set(ref _selectedIndex, value);
@@ -1,6 +1,8 @@
-namespace HandyControlDemo.Data
+using GalaSoft.MvvmLight;
+
+namespace HandyControlDemo.Data
 {
-    public class DemoItemModel
+    public class DemoItemModel : ObservableObject
    {
        public string Name { get; set; }

@@ -9,5 +11,17 @@
        public string ImageName { get; set; }

        public bool IsNew { get; set; }
+
+        private bool _isVisible = true;
+
+        public bool IsVisible
+        {
+            get => _isVisible;
+#if NET40
+            set => Set(nameof(IsVisible), ref _isVisible, value);
+#else
+            set => Set(ref _isVisible, value);
+#endif
+        }
    }
 }
@@ -0,0 +1,13 @@
+using System.Windows.Media;
+
+namespace HandyControlDemo.Data
+{
+    public class GeometryItemModel
+    {
+        public Geometry Data { get; set; }
+
+        public string Key { get; set; }
+
+        public bool Line { get; set; }
+    }
+}
@@ -0,0 +1,33 @@
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+
+namespace HandyControlDemo.Data
+{
+    public class PropertyGridDemoModel
+    {
+        [Category("Category1")]
+        public string String { get; set; }
+
+        [Category("Category2")]
+        public int Integer { get; set; }
+
+        [Category("Category2")]
+        public bool Boolean { get; set; }
+
+        [Category("Category1")]
+        public Gender Enum { get; set; }
+
+        public HorizontalAlignment HorizontalAlignment { get; set; }
+
+        public VerticalAlignment VerticalAlignment { get; set; }
+
+        public ImageSource ImageSource { get; set; }
+    }
+
+    public enum Gender
+    {
+        Male,
+        Female
+    }
+}
@@ -19,6 +19,8 @@
    <Compile Include="$(MSBuildThisFileDirectory)Data\Model\CardModel.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Data\Model\ChatInfoModel.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Data\Model\AvatarModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\Model\GeometryItemModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\Model\PropertyGridDemoModel.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Data\Model\CoverViewDemoModel.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Data\Model\DemoDataModel.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Data\Model\DemoInfoModel.cs" />
@@ -44,6 +46,9 @@
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\ChatBox.xaml.cs">
      <DependentUpon>ChatBox.xaml</DependentUpon>
    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\GeometryItem.xaml.cs">
+      <DependentUpon>GeometryItem.xaml</DependentUpon>
+    </Compile>
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\IFull.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\InteractiveDialog.xaml.cs">
      <DependentUpon>InteractiveDialog.xaml</DependentUpon>
@@ -54,6 +59,9 @@
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\TextDialogWithTimer.xaml.cs">
      <DependentUpon>TextDialogWithTimer.xaml</DependentUpon>
    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\ImageSelectorDemoCtl.xaml.cs">
+      <DependentUpon>ImageSelectorDemoCtl.xaml</DependentUpon>
+    </Compile>
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\AnimationPathDemoCtl.xaml.cs">
      <DependentUpon>AnimationPathDemoCtl.xaml</DependentUpon>
    </Compile>
@@ -84,6 +92,9 @@
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\PinBoxDemoCtl.xaml.cs">
      <DependentUpon>PinBoxDemoCtl.xaml</DependentUpon>
    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\PropertyGridDemoCtl.xaml.cs">
+      <DependentUpon>PropertyGridDemoCtl.xaml</DependentUpon>
+    </Compile>
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\RangeSliderDemoCtl.xaml.cs">
      <DependentUpon>RangeSliderDemoCtl.xaml</DependentUpon>
    </Compile>
@@ -102,6 +113,9 @@
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\ChatBubbleDemoCtl.xaml.cs">
      <DependentUpon>ChatBubbleDemoCtl.xaml</DependentUpon>
    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\CheckComboBoxDemoCtl.xaml.cs">
+      <DependentUpon>CheckComboBoxDemoCtl.xaml</DependentUpon>
+    </Compile>
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\CirclePanelDemoCtl.xaml.cs">
      <DependentUpon>CirclePanelDemoCtl.xaml</DependentUpon>
    </Compile>
@@ -249,6 +263,9 @@
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\BlogsView.xaml.cs">
      <DependentUpon>BlogsView.xaml</DependentUpon>
    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\MainWindowContent.xaml.cs">
+      <DependentUpon>MainWindowContent.xaml</DependentUpon>
+    </Compile>
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Main\NoUserContent.xaml.cs">
      <DependentUpon>NoUserContent.xaml</DependentUpon>
    </Compile>
@@ -306,6 +323,9 @@
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\FrameDemoCtl.xaml.cs">
      <DependentUpon>FrameDemoCtl.xaml</DependentUpon>
    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\GeometryDemoCtl.xaml.cs">
+      <DependentUpon>GeometryDemoCtl.xaml</DependentUpon>
+    </Compile>
    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Styles\GroupBoxDemoCtl.xaml.cs">
      <DependentUpon>GroupBoxDemoCtl.xaml</DependentUpon>
    </Compile>
@@ -493,6 +513,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Basic\GeometryItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="$(MSBuildThisFileDirectory)UserControl\Basic\InteractiveDialog.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -505,6 +529,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\ImageSelectorDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\AnimationPathDemoCtl.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -545,6 +573,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\PropertyGridDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\RangeSliderDemoCtl.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -569,6 +601,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\CheckComboBoxDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\CirclePanelDemoCtl.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -765,6 +801,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Main\MainWindowContent.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="$(MSBuildThisFileDirectory)UserControl\Main\NoUserContent.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -841,6 +881,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\GeometryDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="$(MSBuildThisFileDirectory)UserControl\Styles\GroupBoxDemoCtl.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ShowAllFiles>false</ShowAllFiles>
-  </PropertyGroup>
-</Project>
@@ -1,43 +1,19 @@
-<hc:Window x:Class="HandyControlDemo.MainWindow"
-               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-               xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-               xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-               xmlns:hc="https://handyorg.github.io/handycontrol"
-               xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
-               xmlns:data="clr-namespace:HandyControlDemo.Data"
-               mc:Ignorable="d"
-               Title="HandyControlDemo"
-               ShowTitle="False"
-               Background="{DynamicResource SecondaryRegionBrush}"
-               ResizeMode="CanResizeWithGrip"
-               WindowStartupLocation="CenterScreen"
-               DataContext="{Binding Main,Source={StaticResource Locator}}"
-               hc:GlobalShortcut.Host="True"
-               hc:Dialog.Token="{x:Static data:MessageToken.MainWindow}"
-               hc:WindowAttach.IgnoreAltF4="True"
-               d:DesignHeight="800" 
-               d:DesignWidth="1400" 
-               Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
-    <hc:GlobalShortcut.KeyBindings>
-        <KeyBinding Modifiers="Control+Alt" Key="I" Command="{Binding Main.GlobalShortcutInfoCmd, Source={StaticResource Locator}}"/>
-        <KeyBinding Modifiers="Control+Alt" Key="E" Command="{Binding Main.GlobalShortcutWarningCmd, Source={StaticResource Locator}}"/>
-    </hc:GlobalShortcut.KeyBindings>
-    <hc:Window.NonClientAreaContent>
-        <userControl:NoUserContent/>
-    </hc:Window.NonClientAreaContent>
-    <Border BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}" Background="{StaticResource CloudDrawingBrush}">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="240" MinWidth="240" MaxWidth="400"/>
-                <ColumnDefinition MinWidth="200"/>
-            </Grid.ColumnDefinitions>
-            <userControl:LeftMainContent/>
-            <userControl:MainContent Grid.Column="1" d:IsHidden="true"/>
-            <GridSplitter Margin="0,26,10,26" Grid.Column="0" HorizontalAlignment="Right" Width="4" Background="Transparent"/>
-            <hc:ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsInertiaEnabled="True" IsPenetrating="True">
-                <StackPanel hc:Growl.GrowlParent="True" VerticalAlignment="Top" Margin="0,10,10,10"/>
-            </hc:ScrollViewer>
-        </Grid>
-    </Border>
-</hc:Window>
+<hc:GlowWindow x:Class="HandyControlDemo.MainWindow"
+           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+           xmlns:hc="https://handyorg.github.io/handycontrol"
+           mc:Ignorable="d"
+           Title="HandyControlDemo"
+           ShowTitle="False"
+           Style="{StaticResource WindowGlow}"
+           Background="{DynamicResource SecondaryRegionBrush}"
+           ActiveGlowColor="{DynamicResource PrimaryColor}"
+           ResizeMode="CanResizeWithGrip"
+           WindowStartupLocation="CenterScreen"
+           d:DesignHeight="800" 
+           d:DesignWidth="1400" 
+           Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
+    <ContentControl Name="ControlMain"/>
+</hc:GlowWindow>
@@ -1,22 +1,37 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Windows.Input;
 using GalaSoft.MvvmLight.Messaging;
 using HandyControl.Controls;
+using HandyControl.Tools;
 using HandyControlDemo.Data;
 using HandyControlDemo.Tools;
+using HandyControlDemo.UserControl;
+using HandyControlDemo.ViewModel;

 namespace HandyControlDemo
 {
    public partial class MainWindow
    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
+        public MainWindow() => InitializeComponent();

-        protected override void OnInitialized(EventArgs e)
+        protected override void OnContentRendered(EventArgs e)
        {
-            base.OnInitialized(e);
+            base.OnContentRendered(e);
+
+            DataContext = ViewModelLocator.Instance.Main;
+            NonClientAreaContent = new NoUserContent();
+            ControlMain.Content = new MainWindowContent();
+
+            GlobalShortcut.Init(new List<KeyBinding>
+            {
+                new KeyBinding(ViewModelLocator.Instance.Main.GlobalShortcutInfoCmd, Key.I, ModifierKeys.Control | ModifierKeys.Alt),
+                new KeyBinding(ViewModelLocator.Instance.Main.GlobalShortcutWarningCmd, Key.E, ModifierKeys.Control | ModifierKeys.Alt)
+            });
+
+            Dialog.SetToken(this, MessageToken.MainWindow);
+            WindowAttach.SetIgnoreAltF4(this, true);

            Messenger.Default.Send(true, MessageToken.FullSwitch);
            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.PracticalDemo}"), MessageToken.LoadShowContent);
@@ -266,7 +266,18 @@ namespace HandyControlDemo.Properties.Langs {
                return ResourceManager.GetString("CheckBox", resourceCulture);
            }
        }
-        
+
+        /// <summary>
+        ///   查找类似 多选组合框 的本地化字符串。
+        /// </summary>
+        public static string CheckComboBox
+        {
+            get
+            {
+                return ResourceManager.GetString("CheckComboBox", resourceCulture);
+            }
+        }
+
        /// <summary>
        ///   查找类似 圆形布局 的本地化字符串。
        /// </summary>
@@ -671,7 +682,15 @@ namespace HandyControlDemo.Properties.Langs {
                return ResourceManager.GetString("Frame", resourceCulture);
            }
        }
-        
+
+        public static string Geometry
+        {
+            get
+            {
+                return ResourceManager.GetString("Geometry", resourceCulture);
+            }
+        }
+
        /// <summary>
        ///   查找类似 Gif图片 的本地化字符串。
        /// </summary>
@@ -851,7 +870,18 @@ namespace HandyControlDemo.Properties.Langs {
                return ResourceManager.GetString("ImageBrowser", resourceCulture);
            }
        }
-        
+
+        /// <summary>
+        ///   查找类似 图片选择器 的本地化字符串。
+        /// </summary>
+        public static string ImageSelector
+        {
+            get
+            {
+                return ResourceManager.GetString("ImageSelector", resourceCulture);
+            }
+        }
+
        /// <summary>
        ///   查找类似 索引 的本地化字符串。
        /// </summary>
@@ -1337,7 +1367,18 @@ namespace HandyControlDemo.Properties.Langs {
                return ResourceManager.GetString("Project", resourceCulture);
            }
        }
-        
+
+        /// <summary>
+        ///   查找类似 属性编辑器 的本地化字符串。
+        /// </summary>
+        public static string PropertyGrid
+        {
+            get
+            {
+                return ResourceManager.GetString("PropertyGrid", resourceCulture);
+            }
+        }
+
        /// <summary>
        ///   查找类似 按住说话 的本地化字符串。
        /// </summary>
@@ -750,4 +750,16 @@
  <data name="LangComment" xml:space="preserve">
    <value>Looks up a localized string similar to "{0}".</value>
  </data>
+  <data name="PropertyGrid" xml:space="preserve">
+    <value>PropertyGrid</value>
+  </data>
+  <data name="ImageSelector" xml:space="preserve">
+    <value>ImageSelector</value>
+  </data>
+  <data name="Geometry" xml:space="preserve">
+    <value>Geometry</value>
+  </data>
+  <data name="CheckComboBox" xml:space="preserve">
+    <value>CheckComboBox</value>
+  </data>
 </root>
@@ -750,4 +750,16 @@
  <data name="LangComment" xml:space="preserve">
    <value>Looks up a localized string similar to "{0}".</value>
  </data>
+  <data name="PropertyGrid" xml:space="preserve">
+    <value>PropertyGrid</value>
+  </data>
+  <data name="ImageSelector" xml:space="preserve">
+    <value>ImageSelector</value>
+  </data>
+  <data name="Geometry" xml:space="preserve">
+    <value>Geometry</value>
+  </data>
+  <data name="CheckComboBox" xml:space="preserve">
+    <value>CheckComboBox</value>
+  </data>
 </root>
@@ -750,4 +750,16 @@
  <data name="LangComment" xml:space="preserve">
    <value>Looks up a localized string similar to "{0}".</value>
  </data>
+  <data name="PropertyGrid" xml:space="preserve">
+    <value>PropertyGrid</value>
+  </data>
+  <data name="ImageSelector" xml:space="preserve">
+    <value>ImageSelector</value>
+  </data>
+  <data name="Geometry" xml:space="preserve">
+    <value>Geometry</value>
+  </data>
+  <data name="CheckComboBox" xml:space="preserve">
+    <value>CheckComboBox</value>
+  </data>
 </root>
@@ -750,4 +750,16 @@
  <data name="LangComment" xml:space="preserve">
    <value>Looks up a localized string similar to "{0}".</value>
  </data>
+  <data name="PropertyGrid" xml:space="preserve">
+    <value>PropertyGrid</value>
+  </data>
+  <data name="ImageSelector" xml:space="preserve">
+    <value>ImageSelector</value>
+  </data>
+  <data name="Geometry" xml:space="preserve">
+    <value>Geometry</value>
+  </data>
+  <data name="CheckComboBox" xml:space="preserve">
+    <value>CheckComboBox</value>
+  </data>
 </root>
@@ -0,0 +1,765 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="About" xml:space="preserve">
+    <value>Sobre</value>
+  </data>
+  <data name="AddItem" xml:space="preserve">
+    <value>Adicionar um item</value>
+  </data>
+  <data name="AnimationPath" xml:space="preserve">
+    <value>AnimationPath</value>
+  </data>
+  <data name="AppClosingTip" xml:space="preserve">
+    <value>O ícone da bandeja está aberto ira ocultar a janela em vez de fechar o programa</value>
+  </data>
+  <data name="Ask" xml:space="preserve">
+    <value>Perguntar</value>
+  </data>
+  <data name="Badge" xml:space="preserve">
+    <value>Badge</value>
+  </data>
+  <data name="BasicInfo" xml:space="preserve">
+    <value>Preencha as informações básicas</value>
+  </data>
+  <data name="BasicLayout" xml:space="preserve">
+    <value>Layout básico</value>
+  </data>
+  <data name="Blink" xml:space="preserve">
+    <value>Piscar</value>
+  </data>
+  <data name="Blog" xml:space="preserve">
+    <value>Blog</value>
+  </data>
+  <data name="Border" xml:space="preserve">
+    <value>Borda</value>
+  </data>
+  <data name="Brush" xml:space="preserve">
+    <value>Pincel</value>
+  </data>
+  <data name="Button" xml:space="preserve">
+    <value>Botão</value>
+  </data>
+  <data name="ButtonCustom" xml:space="preserve">
+    <value>Botão Personalizado</value>
+  </data>
+  <data name="ButtonGroup" xml:space="preserve">
+    <value>ButtonGroup</value>
+  </data>
+  <data name="Calendar" xml:space="preserve">
+    <value>Calendar</value>
+  </data>
+  <data name="CalendarWithClock" xml:space="preserve">
+    <value>CalendarWithClock</value>
+  </data>
+  <data name="Card" xml:space="preserve">
+    <value>Card</value>
+  </data>
+  <data name="Carousel" xml:space="preserve">
+    <value>Carousel</value>
+  </data>
+  <data name="ChangeLangAsk" xml:space="preserve">
+    <value>Reiniciar para alterar o idioma?</value>
+  </data>
+  <data name="ChatBubble" xml:space="preserve">
+    <value>ChatBubble</value>
+  </data>
+  <data name="Chatroom" xml:space="preserve">
+    <value>Sala de bate-papo</value>
+  </data>
+  <data name="CheckBox" xml:space="preserve">
+    <value>CheckBox</value>
+  </data>
+  <data name="CirclePanel" xml:space="preserve">
+    <value>CirclePanel</value>
+  </data>
+  <data name="Clear" xml:space="preserve">
+    <value>Limpar</value>
+  </data>
+  <data name="Click2Count" xml:space="preserve">
+    <value>Clique para contar</value>
+  </data>
+  <data name="Clock" xml:space="preserve">
+    <value>Clock</value>
+  </data>
+  <data name="ColorPicker" xml:space="preserve">
+    <value>ColorPicker</value>
+  </data>
+  <data name="ColumnOffset" xml:space="preserve">
+    <value>Compensação da coluna</value>
+  </data>
+  <data name="ColumnSpacing" xml:space="preserve">
+    <value>Espaçamento de coluna</value>
+  </data>
+  <data name="ComboBox" xml:space="preserve">
+    <value>ComboBox</value>
+  </data>
+  <data name="ComingSoon" xml:space="preserve">
+    <value>Em breve</value>
+  </data>
+  <data name="Comment" xml:space="preserve">
+    <value>Comentário</value>
+  </data>
+  <data name="Common" xml:space="preserve">
+    <value>Comum</value>
+  </data>
+  <data name="CompareSlider" xml:space="preserve">
+    <value>CompareSlider</value>
+  </data>
+  <data name="Complete" xml:space="preserve">
+    <value>Concluído</value>
+  </data>
+  <data name="ContentDemoStr" xml:space="preserve">
+    <value>Este é o conteúdo</value>
+  </data>
+  <data name="Contributors" xml:space="preserve">
+    <value>Colaboradores</value>
+  </data>
+  <data name="Controls" xml:space="preserve">
+    <value>Controles</value>
+  </data>
+  <data name="CoverFlow" xml:space="preserve">
+    <value>CoverFlow</value>
+  </data>
+  <data name="CoverView" xml:space="preserve">
+    <value>CoverView</value>
+  </data>
+  <data name="Danger" xml:space="preserve">
+    <value>Perigo</value>
+  </data>
+  <data name="DataGrid" xml:space="preserve">
+    <value>DataGrid</value>
+  </data>
+  <data name="DatePicker" xml:space="preserve">
+    <value>DatePicker</value>
+  </data>
+  <data name="DateTimePicker" xml:space="preserve">
+    <value>DateTimePicker</value>
+  </data>
+  <data name="Default" xml:space="preserve">
+    <value>Padrão</value>
+  </data>
+  <data name="Demo" xml:space="preserve">
+    <value>Demonstração</value>
+  </data>
+  <data name="Dialog" xml:space="preserve">
+    <value>Diálogo</value>
+  </data>
+  <data name="DialogDemo" xml:space="preserve">
+    <value>Demonstração de diálogo</value>
+  </data>
+  <data name="Divider" xml:space="preserve">
+    <value>Divisor</value>
+  </data>
+  <data name="Documentation" xml:space="preserve">
+    <value>Documentação</value>
+  </data>
+  <data name="Doc_cn" xml:space="preserve">
+    <value>Documento em chinês</value>
+  </data>
+  <data name="Doc_en" xml:space="preserve">
+    <value>Documento em inglês</value>
+  </data>
+  <data name="DragHere" xml:space="preserve">
+    <value>Arraste aqui</value>
+  </data>
+  <data name="Drawer" xml:space="preserve">
+    <value>Drawer</value>
+  </data>
+  <data name="Effects" xml:space="preserve">
+    <value>Efeitos</value>
+  </data>
+  <data name="Email" xml:space="preserve">
+    <value>Email</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Erro</value>
+  </data>
+  <data name="Exit" xml:space="preserve">
+    <value>Sair</value>
+  </data>
+  <data name="Expander" xml:space="preserve">
+    <value>Expander</value>
+  </data>
+  <data name="Fatal" xml:space="preserve">
+    <value>Fatal</value>
+  </data>
+  <data name="FlipClock" xml:space="preserve">
+    <value>FlipClock</value>
+  </data>
+  <data name="FloatingBlock" xml:space="preserve">
+    <value>FloatingBlock</value>
+  </data>
+  <data name="FlowDocument" xml:space="preserve">
+    <value>FlowDocument</value>
+  </data>
+  <data name="FlowDocumentPageViewer" xml:space="preserve">
+    <value>FlowDocumentPageViewer</value>
+  </data>
+  <data name="FlowDocumentReader" xml:space="preserve">
+    <value>FlowDocumentReader</value>
+  </data>
+  <data name="FlowDocumentScrollViewer" xml:space="preserve">
+    <value>FlowDocumentScrollViewer</value>
+  </data>
+  <data name="Frame" xml:space="preserve">
+    <value>Quadro</value>
+  </data>
+  <data name="GifImage" xml:space="preserve">
+    <value>GifImage</value>
+  </data>
+  <data name="GotoTop" xml:space="preserve">
+    <value>GotoTop</value>
+  </data>
+  <data name="Gravatar" xml:space="preserve">
+    <value>Gravatar</value>
+  </data>
+  <data name="Grid" xml:space="preserve">
+    <value>Grid</value>
+  </data>
+  <data name="GroupBox" xml:space="preserve">
+    <value>GroupBox</value>
+  </data>
+  <data name="Groups" xml:space="preserve">
+    <value>Grupos</value>
+  </data>
+  <data name="Growl" xml:space="preserve">
+    <value>Growl</value>
+  </data>
+  <data name="GrowlAsk" xml:space="preserve">
+    <value>Uma nova versão foi detectada! Deseja atualizar?</value>
+  </data>
+  <data name="GrowlDemo" xml:space="preserve">
+    <value>Growl demonstração</value>
+  </data>
+  <data name="GrowlError" xml:space="preserve">
+    <value>A conexão falhou. Verifique as configurações de rede!</value>
+  </data>
+  <data name="GrowlFatal" xml:space="preserve">
+    <value>O programa travou~~~</value>
+  </data>
+  <data name="GrowlInfo" xml:space="preserve">
+    <value>Está um ótimo dia hoje~~~</value>
+  </data>
+  <data name="GrowlSuccess" xml:space="preserve">
+    <value>Arquivo salvo com sucesso!</value>
+  </data>
+  <data name="GrowlWarning" xml:space="preserve">
+    <value>O espaço em disco está acabando!</value>
+  </data>
+  <data name="HatchBrushGenerator" xml:space="preserve">
+    <value>HatchBrushGenerator</value>
+  </data>
+  <data name="HoneycombPanel" xml:space="preserve">
+    <value>HoneycombPanel</value>
+  </data>
+  <data name="HybridLayout" xml:space="preserve">
+    <value>Layout híbrido</value>
+  </data>
+  <data name="Ignore" xml:space="preserve">
+    <value>Ignorar</value>
+  </data>
+  <data name="ImageBlock" xml:space="preserve">
+    <value>ImageBlock</value>
+  </data>
+  <data name="ImageBrowser" xml:space="preserve">
+    <value>ImageBrowser</value>
+  </data>
+  <data name="ImageSelector" xml:space="preserve">
+    <value>ImageSelector</value>
+  </data>
+  <data name="Index" xml:space="preserve">
+    <value>Índice</value>
+  </data>
+  <data name="Info" xml:space="preserve">
+    <value>Informações</value>
+  </data>
+  <data name="InteractiveDialog" xml:space="preserve">
+    <value>Diálogo interativo</value>
+  </data>
+  <data name="IsNotPhone" xml:space="preserve">
+    <value>Não é um número de telefone</value>
+  </data>
+  <data name="Label" xml:space="preserve">
+    <value>Label</value>
+  </data>
+  <data name="LangComment" xml:space="preserve">
+    <value>Pesquisa uma cadeia de caracteres localizada semelhante a "{0}".</value>
+  </data>
+  <data name="ListBox" xml:space="preserve">
+    <value>ListBox</value>
+  </data>
+  <data name="ListView" xml:space="preserve">
+    <value>ListView</value>
+  </data>
+  <data name="Loading" xml:space="preserve">
+    <value>Carregando</value>
+  </data>
+  <data name="Magnifier" xml:space="preserve">
+    <value>Magnifier</value>
+  </data>
+  <data name="Menu" xml:space="preserve">
+    <value>Menu</value>
+  </data>
+  <data name="MessageBox" xml:space="preserve">
+    <value>MessageBox</value>
+  </data>
+  <data name="Morphing Animation" xml:space="preserve">
+    <value>Animação Transformação</value>
+  </data>
+  <data name="Name" xml:space="preserve">
+    <value>Nome</value>
+  </data>
+  <data name="NewWindow" xml:space="preserve">
+    <value>Nova janela</value>
+  </data>
+  <data name="Next" xml:space="preserve">
+    <value>Avançar</value>
+  </data>
+  <data name="Notification" xml:space="preserve">
+    <value>Notificação</value>
+  </data>
+  <data name="NotifyIcon" xml:space="preserve">
+    <value>NotifyIcon</value>
+  </data>
+  <data name="NumericUpDown" xml:space="preserve">
+    <value>NumericUpDown</value>
+  </data>
+  <data name="Off" xml:space="preserve">
+    <value>Desligado</value>
+  </data>
+  <data name="Ok" xml:space="preserve">
+    <value>Ok</value>
+  </data>
+  <data name="On" xml:space="preserve">
+    <value>Ligado</value>
+  </data>
+  <data name="OpenBlurWindow" xml:space="preserve">
+    <value>abrir janela borrada</value>
+  </data>
+  <data name="OpenCommonWindow" xml:space="preserve">
+    <value>abrir janela comum</value>
+  </data>
+  <data name="OpenCustomContentWindow" xml:space="preserve">
+    <value>abrir janela de conteúdo personalizado</value>
+  </data>
+  <data name="OpenCustomMessageWindow" xml:space="preserve">
+    <value>abrir janela de mensagem personalizada</value>
+  </data>
+  <data name="OpenCustomNonClientAreaWindow" xml:space="preserve">
+    <value>abrir janela "Non-client Area" personalizada</value>
+  </data>
+  <data name="OpenGlowWindow" xml:space="preserve">
+    <value>Abrir janela com brilho</value>
+  </data>
+  <data name="OpenImageBrowser" xml:space="preserve">
+    <value>Clique para abrir o navegador de imagens</value>
+  </data>
+  <data name="OpenMessageWindow" xml:space="preserve">
+    <value>abrir janela de mensagem</value>
+  </data>
+  <data name="OpenMouseFollowWindow" xml:space="preserve">
+    <value>abra o mouse siga a janela</value>
+  </data>
+  <data name="OpenNativeCommonWindow" xml:space="preserve">
+    <value>Abra a janela comum nativa</value>
+  </data>
+  <data name="OpenNavigationWindow" xml:space="preserve">
+    <value>Abra a janela de navegação</value>
+  </data>
+  <data name="OpenNoNonClientAreaDragableWindow" xml:space="preserve">
+    <value>abrir janela arrastavél não "Non-client Area"</value>
+  </data>
+  <data name="OpenPanel" xml:space="preserve">
+    <value>Abrir Painel</value>
+  </data>
+  <data name="OpenSprite" xml:space="preserve">
+    <value>Abrir sprite</value>
+  </data>
+  <data name="OutlineText" xml:space="preserve">
+    <value>OutlineText</value>
+  </data>
+  <data name="Pagination" xml:space="preserve">
+    <value>Paginação</value>
+  </data>
+  <data name="PasswordBox" xml:space="preserve">
+    <value>PasswordBox</value>
+  </data>
+  <data name="PinBox" xml:space="preserve">
+    <value>PinBox</value>
+  </data>
+  <data name="PleaseInput" xml:space="preserve">
+    <value>Por favor insira...</value>
+  </data>
+  <data name="PleaseWait" xml:space="preserve">
+    <value>Aguarde...</value>
+  </data>
+  <data name="PlsEnterContent" xml:space="preserve">
+    <value>Por favor, insira o texto</value>
+  </data>
+  <data name="PlsEnterEmail" xml:space="preserve">
+    <value>Por favor, informe o e-mail</value>
+  </data>
+  <data name="PlsEnterKey" xml:space="preserve">
+    <value>Por favor, insira uma palavra-chave</value>
+  </data>
+  <data name="Poptip" xml:space="preserve">
+    <value>Poptip</value>
+  </data>
+  <data name="PoptipPositionStr" xml:space="preserve">
+    <value>início superior; topo; extremidade superior; início direito; direita; extremidade direita; extremidade inferior; inferior; início inferior; extremidade esquerda; esquerda; partida esquerda</value>
+  </data>
+  <data name="PracticalDemos" xml:space="preserve">
+    <value>Demonstrações práticas</value>
+  </data>
+  <data name="Prev" xml:space="preserve">
+    <value>Anterior</value>
+  </data>
+  <data name="PreviewSlider" xml:space="preserve">
+    <value>PreviewSlider</value>
+  </data>
+  <data name="Primary" xml:space="preserve">
+    <value>Primário</value>
+  </data>
+  <data name="ProgressBar" xml:space="preserve">
+    <value>ProgressBar</value>
+  </data>
+  <data name="ProgressButton" xml:space="preserve">
+    <value>ProgressButton</value>
+  </data>
+  <data name="Project" xml:space="preserve">
+    <value>Projeto</value>
+  </data>
+  <data name="PropertyGrid" xml:space="preserve">
+    <value>PropertyGrid</value>
+  </data>
+  <data name="PushToTalk" xml:space="preserve">
+    <value>Aperte para falar</value>
+  </data>
+  <data name="QQGroup" xml:space="preserve">
+    <value>Grupo QQ</value>
+  </data>
+  <data name="RadioButton" xml:space="preserve">
+    <value>RadioButton</value>
+  </data>
+  <data name="RangeSlider" xml:space="preserve">
+    <value>RangeSlider</value>
+  </data>
+  <data name="Rate" xml:space="preserve">
+    <value>Rate</value>
+  </data>
+  <data name="Recommendation" xml:space="preserve">
+    <value>Recomendação</value>
+  </data>
+  <data name="Register" xml:space="preserve">
+    <value>Registrar</value>
+  </data>
+  <data name="RelativePanel" xml:space="preserve">
+    <value>RelativePanel</value>
+  </data>
+  <data name="Remark" xml:space="preserve">
+    <value>Comentário</value>
+  </data>
+  <data name="RemoveItem" xml:space="preserve">
+    <value>Remover um item</value>
+  </data>
+  <data name="RepeatButton" xml:space="preserve">
+    <value>RepeatButton</value>
+  </data>
+  <data name="Reply" xml:space="preserve">
+    <value>Responder</value>
+  </data>
+  <data name="Repository" xml:space="preserve">
+    <value>Repositório</value>
+  </data>
+  <data name="ResponsiveLayout" xml:space="preserve">
+    <value>Layout responsivo</value>
+  </data>
+  <data name="RichTextBox" xml:space="preserve">
+    <value>RichTextBox</value>
+  </data>
+  <data name="RightClickHere" xml:space="preserve">
+    <value>Clique com o botão direito aqui</value>
+  </data>
+  <data name="RunningBlock" xml:space="preserve">
+    <value>RunningBlock</value>
+  </data>
+  <data name="Screenshot" xml:space="preserve">
+    <value>Screenshot</value>
+  </data>
+  <data name="ScrollViewer" xml:space="preserve">
+    <value>ScrollViewer</value>
+  </data>
+  <data name="SearchBar" xml:space="preserve">
+    <value>SearchBar</value>
+  </data>
+  <data name="Second" xml:space="preserve">
+    <value>Segs</value>
+  </data>
+  <data name="Selected" xml:space="preserve">
+    <value>Selecionado</value>
+  </data>
+  <data name="SendNotification" xml:space="preserve">
+    <value>Enviar notificação</value>
+  </data>
+  <data name="Shield" xml:space="preserve">
+    <value>Shield</value>
+  </data>
+  <data name="ShowInCurrentWindow" xml:space="preserve">
+    <value>Mostrar na janela atual</value>
+  </data>
+  <data name="ShowInMainWindow" xml:space="preserve">
+    <value>Mostrar na janela principal</value>
+  </data>
+  <data name="ShowRowNumber" xml:space="preserve">
+    <value>ShowRowNumber</value>
+  </data>
+  <data name="SideMenu" xml:space="preserve">
+    <value>SideMenu</value>
+  </data>
+  <data name="Slider" xml:space="preserve">
+    <value>Slider</value>
+  </data>
+  <data name="SplitButton" xml:space="preserve">
+    <value>SplitButton</value>
+  </data>
+  <data name="Sprite" xml:space="preserve">
+    <value>Sprite</value>
+  </data>
+  <data name="StartScreenshot" xml:space="preserve">
+    <value>Iniciar captura de tela</value>
+  </data>
+  <data name="StaysOpen" xml:space="preserve">
+    <value>Permanecer aberto</value>
+  </data>
+  <data name="Step" xml:space="preserve">
+    <value>Step</value>
+  </data>
+  <data name="StepBar" xml:space="preserve">
+    <value>StepBar</value>
+  </data>
+  <data name="Styles" xml:space="preserve">
+    <value>Estilos</value>
+  </data>
+  <data name="SubTitle" xml:space="preserve">
+    <value>Legenda</value>
+  </data>
+  <data name="Success" xml:space="preserve">
+    <value>Sucesso</value>
+  </data>
+  <data name="TabControl" xml:space="preserve">
+    <value>TabControl</value>
+  </data>
+  <data name="Tag" xml:space="preserve">
+    <value>Tag</value>
+  </data>
+  <data name="Text" xml:space="preserve">
+    <value>Texto</value>
+  </data>
+  <data name="TextBlock" xml:space="preserve">
+    <value>TextBlock</value>
+  </data>
+  <data name="TextBox" xml:space="preserve">
+    <value>TextBox</value>
+  </data>
+  <data name="TextDialog" xml:space="preserve">
+    <value>TextDialog</value>
+  </data>
+  <data name="TextDialogInControl" xml:space="preserve">
+    <value>TextDialog (no controle)</value>
+  </data>
+  <data name="TextDialogWithTimer" xml:space="preserve">
+    <value>TextDialog com temporizador</value>
+  </data>
+  <data name="TimeBar" xml:space="preserve">
+    <value>TimeBar</value>
+  </data>
+  <data name="TimePicker" xml:space="preserve">
+    <value>TimePicker</value>
+  </data>
+  <data name="Tip" xml:space="preserve">
+    <value>Perguntar</value>
+  </data>
+  <data name="Title" xml:space="preserve">
+    <value>Título</value>
+  </data>
+  <data name="TitleDemoStr1" xml:space="preserve">
+    <value>Este é o título</value>
+  </data>
+  <data name="TitleDemoStr2" xml:space="preserve">
+    <value>Este item deve ser preenchido</value>
+  </data>
+  <data name="TitleDemoStr3" xml:space="preserve">
+    <value>O título está à esquerda</value>
+  </data>
+  <data name="ToggleButton" xml:space="preserve">
+    <value>ToggleButton</value>
+  </data>
+  <data name="ToolBar" xml:space="preserve">
+    <value>ToolBar</value>
+  </data>
+  <data name="Tools" xml:space="preserve">
+    <value>Ferramentas</value>
+  </data>
+  <data name="Transfer" xml:space="preserve">
+    <value>Transferir</value>
+  </data>
+  <data name="TransitioningContentControl" xml:space="preserve">
+    <value>TransitioningContentControl</value>
+  </data>
+  <data name="TreeView" xml:space="preserve">
+    <value>TreeView</value>
+  </data>
+  <data name="Try2CloseApp" xml:space="preserve">
+    <value>Tentar fehcar o aplicativo?</value>
+  </data>
+  <data name="Type" xml:space="preserve">
+    <value>Tipo</value>
+  </data>
+  <data name="UploadFile" xml:space="preserve">
+    <value>Enviar arquivo</value>
+  </data>
+  <data name="UploadStr" xml:space="preserve">
+    <value>Enviar;Enviando</value>
+  </data>
+  <data name="Visibility" xml:space="preserve">
+    <value>Visibilidade</value>
+  </data>
+  <data name="Vsix" xml:space="preserve">
+    <value>Vsix</value>
+  </data>
+  <data name="Warning" xml:space="preserve">
+    <value>Aviso</value>
+  </data>
+  <data name="WaterfallPanel" xml:space="preserve">
+    <value>WaterfallPanel</value>
+  </data>
+  <data name="Website" xml:space="preserve">
+    <value>Site</value>
+  </data>
+  <data name="Window" xml:space="preserve">
+    <value>Janela</value>
+  </data>
+  <data name="Geometry" xml:space="preserve">
+    <value>Geometry</value>
+  </data>
+  <data name="CheckComboBox" xml:space="preserve">
+    <value>CheckComboBox</value>
+  </data>
+</root>
@@ -750,4 +750,16 @@
  <data name="LangComment" xml:space="preserve">
    <value>查找类似 {0} 的本地化字符串。</value>
  </data>
+  <data name="PropertyGrid" xml:space="preserve">
+    <value>属性编辑器</value>
+  </data>
+  <data name="ImageSelector" xml:space="preserve">
+    <value>图片选择器</value>
+  </data>
+  <data name="Geometry" xml:space="preserve">
+    <value>几何形状</value>
+  </data>
+  <data name="CheckComboBox" xml:space="preserve">
+    <value>多选组合框</value>
+  </data>
 </root>
@@ -750,4 +750,16 @@
  <data name="LangComment" xml:space="preserve">
    <value>Looks up a localized string similar to "{0}".</value>
  </data>
+  <data name="PropertyGrid" xml:space="preserve">
+    <value>PropertyGrid</value>
+  </data>
+  <data name="ImageSelector" xml:space="preserve">
+    <value>ImageSelector</value>
+  </data>
+  <data name="Geometry" xml:space="preserve">
+    <value>Geometry</value>
+  </data>
+  <data name="CheckComboBox" xml:space="preserve">
+    <value>CheckComboBox</value>
+  </data>
 </root>
@@ -750,4 +750,16 @@
  <data name="LangComment" xml:space="preserve">
    <value>Looks up a localized string similar to "{0}".</value>
  </data>
+  <data name="PropertyGrid" xml:space="preserve">
+    <value>PropertyGrid</value>
+  </data>
+  <data name="ImageSelector" xml:space="preserve">
+    <value>ImageSelector</value>
+  </data>
+  <data name="Geometry" xml:space="preserve">
+    <value>Geometry</value>
+  </data>
+  <data name="CheckComboBox" xml:space="preserve">
+    <value>CheckComboBox</value>
+  </data>
 </root>
@@ -60,7 +60,8 @@ namespace HandyControlDemo.Properties.Langs
 			OnPropertyChanged(nameof(ChatBubble));
 			OnPropertyChanged(nameof(Chatroom));
 			OnPropertyChanged(nameof(CheckBox));
-			OnPropertyChanged(nameof(CirclePanel));
+            OnPropertyChanged(nameof(CheckComboBox));
+            OnPropertyChanged(nameof(CirclePanel));
 			OnPropertyChanged(nameof(Clear));
 			OnPropertyChanged(nameof(Click2Count));
 			OnPropertyChanged(nameof(Clock));
@@ -105,6 +106,7 @@ namespace HandyControlDemo.Properties.Langs
 			OnPropertyChanged(nameof(FlowDocumentReader));
 			OnPropertyChanged(nameof(FlowDocumentScrollViewer));
 			OnPropertyChanged(nameof(Frame));
+			OnPropertyChanged(nameof(Geometry));
 			OnPropertyChanged(nameof(GifImage));
 			OnPropertyChanged(nameof(GotoTop));
 			OnPropertyChanged(nameof(Gravatar));
@@ -125,7 +127,8 @@ namespace HandyControlDemo.Properties.Langs
 			OnPropertyChanged(nameof(Ignore));
 			OnPropertyChanged(nameof(ImageBlock));
 			OnPropertyChanged(nameof(ImageBrowser));
-			OnPropertyChanged(nameof(Index));
+            OnPropertyChanged(nameof(ImageSelector));
+            OnPropertyChanged(nameof(Index));
 			OnPropertyChanged(nameof(Info));
 			OnPropertyChanged(nameof(InteractiveDialog));
 			OnPropertyChanged(nameof(IsNotPhone));
@@ -179,7 +182,8 @@ namespace HandyControlDemo.Properties.Langs
 			OnPropertyChanged(nameof(ProgressBar));
 			OnPropertyChanged(nameof(ProgressButton));
 			OnPropertyChanged(nameof(Project));
-			OnPropertyChanged(nameof(PushToTalk));
+            OnPropertyChanged(nameof(PropertyGrid));
+            OnPropertyChanged(nameof(PushToTalk));
 			OnPropertyChanged(nameof(QQGroup));
 			OnPropertyChanged(nameof(RadioButton));
 			OnPropertyChanged(nameof(RangeSlider));
@@ -365,6 +369,11 @@ namespace HandyControlDemo.Properties.Langs
        /// </summary>
 		public string CheckBox => Lang.CheckBox;

+        /// <summary>
+        ///   查找类似 多选组合框 的本地化字符串。
+        /// </summary>
+        public string CheckComboBox => Lang.CheckComboBox;
+
        /// <summary>
        ///   查找类似 圆形布局 的本地化字符串。
        /// </summary>
@@ -590,10 +599,15 @@ namespace HandyControlDemo.Properties.Langs
        /// </summary>
 		public string Frame => Lang.Frame;

+        /// <summary>
+        ///   查找类似 几何形状 的本地化字符串。
+        /// </summary>
+        public string Geometry => Lang.Geometry;
+
        /// <summary>
        ///   查找类似 Gif图片 的本地化字符串。
        /// </summary>
-		public string GifImage => Lang.GifImage;
+        public string GifImage => Lang.GifImage;

        /// <summary>
        ///   查找类似 回到顶部 的本地化字符串。
@@ -690,6 +704,11 @@ namespace HandyControlDemo.Properties.Langs
        /// </summary>
 		public string ImageBrowser => Lang.ImageBrowser;

+        /// <summary>
+        ///   查找类似 图片选择器 的本地化字符串。
+        /// </summary>
+        public string ImageSelector => Lang.ImageSelector;
+
        /// <summary>
        ///   查找类似 索引 的本地化字符串。
        /// </summary>
@@ -960,6 +979,11 @@ namespace HandyControlDemo.Properties.Langs
        /// </summary>
 		public string Project => Lang.Project;

+        /// <summary>
+        ///   查找类似 属性编辑器 的本地化字符串。
+        /// </summary>
+        public string PropertyGrid => Lang.PropertyGrid;
+
        /// <summary>
        ///   查找类似 按住说话 的本地化字符串。
        /// </summary>
@@ -1429,6 +1453,11 @@ namespace HandyControlDemo.Properties.Langs
        /// </summary>
 		public static string CheckBox = nameof(CheckBox);

+        /// <summary>
+        ///   查找类似 多选组合框 的本地化字符串。
+        /// </summary>
+        public static string CheckComboBox = nameof(CheckComboBox);
+
        /// <summary>
        ///   查找类似 圆形布局 的本地化字符串。
        /// </summary>
@@ -1654,6 +1683,11 @@ namespace HandyControlDemo.Properties.Langs
        /// </summary>
 		public static string Frame = nameof(Frame);

+        /// <summary>
+        ///   查找类似 几何形状 的本地化字符串。
+        /// </summary>
+        public static string Geometry = nameof(Geometry);
+
        /// <summary>
        ///   查找类似 Gif图片 的本地化字符串。
        /// </summary>
@@ -1754,6 +1788,11 @@ namespace HandyControlDemo.Properties.Langs
        /// </summary>
 		public static string ImageBrowser = nameof(ImageBrowser);

+        /// <summary>
+        ///   查找类似 图片选择器 的本地化字符串。
+        /// </summary>
+        public static string ImageSelector = nameof(ImageSelector);
+
        /// <summary>
        ///   查找类似 索引 的本地化字符串。
        /// </summary>
@@ -2024,6 +2063,11 @@ namespace HandyControlDemo.Properties.Langs
        /// </summary>
 		public static string Project = nameof(Project);

+        /// <summary>
+        ///   查找类似 属性编辑器 的本地化字符串。
+        /// </summary>
+        public static string PropertyGrid = nameof(PropertyGrid);
+
        /// <summary>
        ///   查找类似 按住说话 的本地化字符串。
        /// </summary>
@@ -8,9 +8,12 @@ namespace HandyControlDemo.Resources
 {
    public class DemoTheme : Theme
    {
-        public override Uri ThemeUri => new Uri("pack://application:,,,/HandyControlDemo;component/Resources/Themes/Theme.xaml");
-
        public override ResourceDictionary GetSkin(SkinType skinType) =>
            ResourceHelper.GetSkin(typeof(App).Assembly, "Resources/Themes", skinType);
+
+        public override ResourceDictionary GetTheme() => new ResourceDictionary
+        {
+            Source = new Uri("pack://application:,,,/HandyControlDemo;component/Resources/Themes/Theme.xaml")
+        };
    }
 }