tidy the codes

src/Shared/HandyControlDemo_Shared/App.xaml.cs

@@ -19,10 +19,10 @@ namespace HandyControlDemo
         [SuppressMessage("代码质量", "IDE0052:删除未读的私有成员", Justification = "<挂起>")]
         private static Mutex AppMutex;
 
-        public App()
+        protected override void OnStartup(StartupEventArgs e)
         {
             AppMutex = new Mutex(true, "HandyControlDemo", out var createdNew);
-            
+
             if (!createdNew)
             {
                 var current = Process.GetCurrentProcess();
@@ -37,29 +37,28 @@ namespace HandyControlDemo
                 }
                 Shutdown();
             }
-        }
-
-        protected override void OnStartup(StartupEventArgs e)
-        {
-            var splashScreen = new SplashScreen("Resources/Img/Cover.png");
-            splashScreen.Show(true);
-
-            base.OnStartup(e);
-
-            UpdateRegistry();
-
-            ShutdownMode = ShutdownMode.OnMainWindowClose;
-            GlobalData.Init();
-            ConfigHelper.Instance.SetLang(GlobalData.Config.Lang);
-
-            if (GlobalData.Config.Skin != SkinType.Default)
+            else
             {
-                UpdateSkin(GlobalData.Config.Skin);
+                var splashScreen = new SplashScreen("Resources/Img/Cover.png");
+                splashScreen.Show(true);
+
+                base.OnStartup(e);
+
+                UpdateRegistry();
+
+                ShutdownMode = ShutdownMode.OnMainWindowClose;
+                GlobalData.Init();
+                ConfigHelper.Instance.SetLang(GlobalData.Config.Lang);
+
+                if (GlobalData.Config.Skin != SkinType.Default)
+                {
+                    UpdateSkin(GlobalData.Config.Skin);
+                }
+
+                ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo());
+
+                ServicePointManager.SecurityProtocol = (SecurityProtocolType)(SslProtocols)0x00000C00;
             }
-
-            ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo());
-
-            ServicePointManager.SecurityProtocol = (SecurityProtocolType)(SslProtocols)0x00000C00;
         }
 
         protected override void OnExit(ExitEventArgs e)

src/Shared/HandyControlDemo_Shared/Data/GlobalData.cs

@@ -12,7 +12,7 @@ namespace HandyControlDemo.Data
                 try
                 {
                     var json = File.ReadAllText(AppConfig.SavePath);
-                    Config = JsonConvert.DeserializeObject<AppConfig>(json);
+                    Config = (string.IsNullOrEmpty(json) ? new AppConfig() : JsonConvert.DeserializeObject<AppConfig>(json)) ?? new AppConfig();
                 }
                 catch
                 {

src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems

@@ -161,7 +161,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\PasswordBoxDemoCtl.xaml.cs">
       <DependentUpon>PasswordBoxDemoCtl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\PoptipDemoCtl.xaml.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\PoptipDemoCtl.xaml.cs">
+      <DependentUpon>PoptipDemoCtl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\PreviewSliderDemoCtl.xaml.cs">
       <DependentUpon>PreviewSliderDemoCtl.xaml</DependentUpon>
     </Compile>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx

@@ -681,4 +681,7 @@
   <data name="Divider" xml:space="preserve">
     <value>Divider</value>
   </data>
+  <data name="PoptipPositionStr" xml:space="preserve">
+    <value>top-start;top;top-end;right-start;right;right-end;bottom-end;bottom;bottom-start;left-end;left;left-start</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx

@@ -678,4 +678,10 @@
   <data name="Divider" xml:space="preserve">
     <value>Divider</value>
   </data>
+  <data name="Poptip" xml:space="preserve">
+    <value>Poptip</value>
+  </data>
+  <data name="PoptipPositionStr" xml:space="preserve">
+    <value>top-start;top;top-end;right-start;right;right-end;bottom-end;bottom;bottom-start;left-end;left;left-start</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx

@@ -678,4 +678,10 @@
   <data name="Divider" xml:space="preserve">
     <value>Divider</value>
   </data>
+  <data name="Poptip" xml:space="preserve">
+    <value>Poptip</value>
+  </data>
+  <data name="PoptipPositionStr" xml:space="preserve">
+    <value>top-start;top;top-end;right-start;right;right-end;bottom-end;bottom;bottom-start;left-end;left;left-start</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx

@@ -601,7 +601,7 @@
     <value>响应式布局</value>
   </data>
   <data name="Poptip" xml:space="preserve">
-    <value>Poptip</value>
+    <value>气泡提示</value>
   </data>
   <data name="Recommendation" xml:space="preserve">
     <value>群友推荐</value>
@@ -681,4 +681,7 @@
   <data name="Divider" xml:space="preserve">
     <value>分割线</value>
   </data>
+  <data name="PoptipPositionStr" xml:space="preserve">
+    <value>上左;上边;上右;右上;右边;右下;下右;下边;下左;左下;左边;左上</value>
+  </data>
 </root>

src/Shared/HandyControlDemo_Shared/UserControl/Controls/HoneycombPanelDemoCtl.xaml

@@ -23,7 +23,7 @@
                         </ItemsPanelTemplate>
                     </ListBox.ItemsPanel>
                     <ListBox.ItemTemplate>
-                        <DataTemplate DataType="data:CardModel">
+                        <DataTemplate>
                             <hc:Gravatar Style="{StaticResource GravatarCircle}" Margin="10" Source="{Binding Content}"/>
                         </DataTemplate>
                     </ListBox.ItemTemplate>

src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml

@@ -2,81 +2,48 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              Background="{DynamicResource RegionBrush}"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
-    <controls:TransitioningContentControl>
-        <UniformGrid>
-            <controls:Poptip Background="{DynamicResource PrimaryBrush}" AllowsTransparency="True" StaysOpen="False" IsOpen="{Binding IsChecked, ElementName=toggleButton1}"
-                       PlacementEx="TopLeft" PlacementTarget="{Binding ElementName=toggleButton1}">
-                <Border Background="AliceBlue">
-                    <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="White" />
-                </Border>
-            </controls:Poptip>
-            <controls:Poptip Background="{DynamicResource WarningBrush}" AllowsTransparency="True" StaysOpen="False" IsOpen="{Binding IsChecked, ElementName=toggleButton2}"
-                       PlacementEx="TopCenter" PlacementTarget="{Binding ElementName=toggleButton2}">
-                <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="White" />
-            </controls:Poptip>
-            <controls:Poptip Background="{DynamicResource DangerBrush}" AllowsTransparency="True" StaysOpen="False" IsOpen="{Binding IsChecked, ElementName=toggleButton3}"
-                       PlacementEx="TopRight" PlacementTarget="{Binding ElementName=toggleButton3}">
-                <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="White" />
-            </controls:Poptip>
-            <!--#endregion-->
-
-            <controls:Poptip Background="{DynamicResource SuccessBrush}" AllowsTransparency="True" StaysOpen="False" IsOpen="{Binding IsChecked, ElementName=toggleButton4}"
-                       PlacementEx="LeftTop" PlacementTarget="{Binding ElementName=toggleButton4}">
-                <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="White" />
-            </controls:Poptip>
-            <controls:Poptip AllowsTransparency="True" StaysOpen="False" IsOpen="{Binding IsChecked, ElementName=toggleButton5}"
-                       PlacementEx="LeftCenter" PlacementTarget="{Binding ElementName=toggleButton5}">
-                <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="White" />
-            </controls:Poptip>
-            <controls:Poptip AllowsTransparency="True" StaysOpen="False" IsOpen="{Binding IsChecked, ElementName=toggleButton6}"
-                       PlacementEx="LeftBottom" PlacementTarget="{Binding ElementName=toggleButton6}">
-                <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="White" />
-            </controls:Poptip>
-
-            <controls:Poptip AllowsTransparency="True" StaysOpen="False" IsOpen="{Binding IsChecked, ElementName=toggleButton7}"
-                       PlacementEx="RightTop" PlacementTarget="{Binding ElementName=toggleButton7}">
-                <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="White" />
-            </controls:Poptip>
-            <controls:Poptip AllowsTransparency="True" StaysOpen="False" IsOpen="{Binding IsChecked, ElementName=toggleButton8}"
-                       PlacementEx="RightCenter" PlacementTarget="{Binding ElementName=toggleButton8}">
-                <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="White" />
-            </controls:Poptip>
-            <controls:Poptip AllowsTransparency="True" StaysOpen="False" IsOpen="{Binding IsChecked, ElementName=toggleButton9}"
-                       PlacementEx="RightBottom" PlacementTarget="{Binding ElementName=toggleButton9}">
-                <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="White" />
-            </controls:Poptip>
-
-            <controls:Poptip AllowsTransparency="True" StaysOpen="False" IsOpen="{Binding IsChecked, ElementName=toggleButton10}"
-                       PlacementEx="BottomLeft" PlacementTarget="{Binding ElementName=toggleButton10}">
-                <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="White" />
-            </controls:Poptip>
-            <controls:Poptip AllowsTransparency="True" StaysOpen="False" IsOpen="{Binding IsChecked, ElementName=toggleButton11}"
-                       PlacementEx="BottomCenter" PlacementTarget="{Binding ElementName=toggleButton11}">
-                <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="White" />
-            </controls:Poptip>
-            <controls:Poptip IsOpen="{Binding IsChecked, ElementName=toggleButton12}"
-                       PlacementEx="BottomRight" PlacementTarget="{Binding ElementName=toggleButton12}"
-                       Background="White">
-                <TextBlock Text="组件提供了12个不同的方向显示Poptip" Margin="10" Foreground="Black" />
-            </controls:Poptip>
-
-            <ToggleButton x:Name="toggleButton1" Grid.Row="0" Grid.Column="1" Content="上左" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-            <ToggleButton x:Name="toggleButton2" Grid.Row="0" Grid.Column="2" Content="上中" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-            <ToggleButton x:Name="toggleButton3" Grid.Row="0" Grid.Column="3" Content="上右" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-
-            <ToggleButton x:Name="toggleButton4" Grid.Row="1" Grid.Column="0" Content="左上" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-            <ToggleButton x:Name="toggleButton5" Grid.Row="2" Grid.Column="0" Content="左中" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-            <ToggleButton x:Name="toggleButton6" Grid.Row="3" Grid.Column="0" Content="左右" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-
-            <ToggleButton x:Name="toggleButton7" Grid.Row="1" Grid.Column="4" Content="右上" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-            <ToggleButton x:Name="toggleButton8" Grid.Row="2" Grid.Column="4" Content="右中" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-            <ToggleButton x:Name="toggleButton9" Grid.Row="3" Grid.Column="4" Content="右下" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-
-            <ToggleButton x:Name="toggleButton10" Grid.Row="4" Grid.Column="1" Content="下左" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-            <ToggleButton x:Name="toggleButton11" Grid.Row="4" Grid.Column="2" Content="下中" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-            <ToggleButton x:Name="toggleButton12" Grid.Row="4" Grid.Column="3" Content="下右" Margin="5" Width="60" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
-
-        </UniformGrid>
-    </controls:TransitioningContentControl>
+             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+             xmlns:hc="https://handyorg.github.io/handycontrol"
+             xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <UserControl.Resources>
+        <Style x:Key="Button4PoptipStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="Button">
+            <Setter Property="Width" Value="{x:Static system:Double.NaN}"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="Content" Value="{Binding Tag,RelativeSource={RelativeSource Self},Converter={StaticResource Int2StringConverter},ConverterParameter={x:Static langs:Lang.PoptipPositionStr}}"/>
+        </Style>
+    </UserControl.Resources>
+    <hc:TransitioningContentControl>
+        <Grid Margin="24,32">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <UniformGrid Grid.Column="1" Columns="3">
+                <Button Margin="8,0" Tag="0" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button Margin="8,0" Tag="1" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button Margin="8,0" Tag="2" Style="{StaticResource Button4PoptipStyle}"/>
+            </UniformGrid>
+            <UniformGrid Grid.Row="1" Grid.Column="2" Rows="3">
+                <Button Margin="8,16" Tag="3" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button Margin="8,16" Tag="4" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button Margin="8,16" Tag="5" Style="{StaticResource Button4PoptipStyle}"/>
+            </UniformGrid>
+            <UniformGrid Grid.Column="1" Grid.Row="2" Columns="3">
+                <Button Margin="8,0" Tag="8" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button Margin="8,0" Tag="7" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button Margin="8,0" Tag="6" Style="{StaticResource Button4PoptipStyle}"/>
+            </UniformGrid>
+            <UniformGrid Grid.Row="1" Grid.Column="0" Rows="3">
+                <Button Margin="8,16" Tag="11" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button Margin="8,16" Tag="10" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button Margin="8,16" Tag="9" Style="{StaticResource Button4PoptipStyle}"/>
+            </UniformGrid>
+        </Grid>
+    </hc:TransitioningContentControl>
 </UserControl>

src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml.cs

@@ -1,11 +1,10 @@
-
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl
 {
-    public sealed partial class PoptipDemoCtl
+    public partial class PoptipDemoCtl
     {
         public PoptipDemoCtl()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
     }
 }

src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml

@@ -7,20 +7,20 @@
     <hc:TransitioningContentControl>
         <WrapPanel Margin="16" VerticalAlignment="Center">
             <StackPanel Margin="16" Button.Click="ButtonProgress_OnClick">
-                <hc:ProgressButton IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <hc:ProgressButton Style="{StaticResource ProgressButtonPrimary}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <hc:ProgressButton Style="{StaticResource ProgressButtonSuccess}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <hc:ProgressButton Style="{StaticResource ProgressButtonInfo}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <hc:ProgressButton Style="{StaticResource ProgressButtonWarning}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <hc:ProgressButton Style="{StaticResource ProgressButtonDanger}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <hc:ProgressButton IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <hc:ProgressButton Style="{StaticResource ProgressButtonPrimary}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <hc:ProgressButton Style="{StaticResource ProgressButtonSuccess}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <hc:ProgressButton Style="{StaticResource ProgressButtonInfo}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <hc:ProgressButton Style="{StaticResource ProgressButtonWarning}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <hc:ProgressButton Style="{StaticResource ProgressButtonDanger}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
             </StackPanel>
             <StackPanel Margin="16" Button.Click="ButtonProgress_OnClick">
-                <ToggleButton Style="{StaticResource ToggleButtonLoading}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <ToggleButton Style="{StaticResource ToggleButtonLoadingPrimary}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <ToggleButton Style="{StaticResource ToggleButtonLoadingSuccess}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <ToggleButton Style="{StaticResource ToggleButtonLoadingInfo}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <ToggleButton Style="{StaticResource ToggleButtonLoadingWarning}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <ToggleButton Style="{StaticResource ToggleButtonLoadingDanger}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StrConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <ToggleButton Style="{StaticResource ToggleButtonLoading}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <ToggleButton Style="{StaticResource ToggleButtonLoadingPrimary}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <ToggleButton Style="{StaticResource ToggleButtonLoadingSuccess}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <ToggleButton Style="{StaticResource ToggleButtonLoadingInfo}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <ToggleButton Style="{StaticResource ToggleButtonLoadingWarning}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                <ToggleButton Style="{StaticResource ToggleButtonLoadingDanger}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
             </StackPanel>
         </WrapPanel>
     </hc:TransitioningContentControl>

src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml

@@ -245,6 +245,11 @@
                                 <Image Source="../../Resources/Img/LeftMainContent/Bubble_16xLG.png"/>
                             </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
+                        <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.PoptipDemoCtl}" Content="{x:Static langs:Lang.Poptip}">
+                            <hc:EdgeElement.LeftContent>
+                                <Image Source="../../Resources/Img/LeftMainContent/PopupCursor_16x.png"/>
+                            </hc:EdgeElement.LeftContent>
+                        </ListBoxItem>
                         <ListBoxItem Tag="{x:Static data:MessageToken.NotifyIconDemoCtl}" Content="{x:Static langs:Lang.NotifyIcon}">
                             <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/NotificationHub_16x.png"/>
@@ -465,7 +470,7 @@
                                 <Image Source="../../Resources/Img/LeftMainContent/HandyControl.png"/>
                             </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
-                        <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.NotificationDemoCtl}" Content="{x:Static langs:Lang.Notification}">
+                        <ListBoxItem Tag="{x:Static data:MessageToken.NotificationDemoCtl}" Content="{x:Static langs:Lang.Notification}">
                             <hc:EdgeElement.LeftContent>
                                 <Image Source="../../Resources/Img/LeftMainContent/Procedure_16x.png"/>
                             </hc:EdgeElement.LeftContent>
@@ -480,11 +485,6 @@
                                 <Image Source="../../Resources/Img/LeftMainContent/WindowsForm_16x.png"/>
                             </hc:EdgeElement.LeftContent>
                         </ListBoxItem>
-                        <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.PoptipDemoCtl}" Content="{x:Static langs:Lang.Poptip}">
-                            <controls:EdgeElement.LeftContent>
-                                <Image Source="../../Resources/Img/LeftMainContent/WindowsForm_16x.png"/>
-                            </controls:EdgeElement.LeftContent>
-                        </ListBoxItem>
                     </ListBox>
                 </Grid>
             </TabItem>