高保真-调整底部工具栏、BOTA页签、快捷工具高保真

PDF Office/CustomControl/IconAndTextTabItem.cs

@@ -35,14 +35,14 @@ namespace PDF_Office.CustomControl
            DependencyProperty.Register("NormalPathIcon", typeof(PathGeometry), typeof(IconAndTextTabItem), new PropertyMetadata(null));
 
 
-        public ImageSource SelectedIcon
+        public PathGeometry SelectedIcon
         {
-            get { return (ImageSource)GetValue(HoverIconProperty); }
+            get { return (PathGeometry)GetValue(HoverIconProperty); }
             set { SetValue(HoverIconProperty, value); }
         }
 
         public static readonly DependencyProperty HoverIconProperty =
-           DependencyProperty.Register("SelectedIcon", typeof(ImageSource), typeof(IconAndTextTabItem), new PropertyMetadata(null));
+           DependencyProperty.Register("SelectedIcon", typeof(PathGeometry), typeof(IconAndTextTabItem), new PropertyMetadata(null));
 
         public SolidColorBrush SelectedForeground
         {

PDF Office/Styles/ButtonStyle.xaml

@@ -608,4 +608,36 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+
+    <!--  Design Token Pagination.Selector style  -->
+    <Style
+        x:Key="btn.selector"
+        BasedOn="{StaticResource Btn.cta}"
+        TargetType="{x:Type Button}">
+        <Setter Property="Template" Value="{StaticResource ButtonControlTemplateWithCorner4}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{StaticResource color.icon.base.neutral.norm.lv1}" />
+        <Setter Property="BorderBrush" Value="{StaticResource color.field.border.norm}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="24" />
+        <Style.Triggers>
+            <Trigger Property="IsDefaulted" Value="true">
+                <Setter Property="Background" Value="Transparent" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+                <Setter Property="Background" Value="{StaticResource color.item-state.hov.bg}" />
+                <Setter Property="BorderBrush" Value="{StaticResource color.field.border.norm}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="true">
+                <Setter Property="Background" Value="{StaticResource color.item-state.hov.bg}" />
+                <Setter Property="BorderBrush" Value="{StaticResource color.field.border.norm}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Background" Value="{StaticResource color.field.border.dis}" />
+                <Setter Property="BorderBrush" Value="{StaticResource color.field.border.norm}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
 </ResourceDictionary>

PDF Office/Styles/ContextMenuStyle.xaml

@@ -1,24 +1,11 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  快捷工具展开收缩  -->
     <ContextMenu x:Key="ExpendToolsContextMenu" FontSize="14">
-        <ContextMenu.ItemContainerStyle>
-            <Style TargetType="MenuItem">
-                <Setter Property="Padding" Value="0,7,0,7" />
-                <Setter Property="VerticalContentAlignment" Value="Center" />
-            </Style>
-        </ContextMenu.ItemContainerStyle>
         <MenuItem
             Name="ExpendMenuItem"
+            Width="92"
             Header="展开"
-            IsEnabled="True">
-            <MenuItem.Icon>
-                <Path Data="M5.24031 1.5H0.5V14.5H15.5V4H7.24031L5.24031 1.5ZM1.5 13.5V2.5H4.75969L6.75969 5H14.5V13.5H1.5ZM4 7.5H12V6.5H4V7.5Z" Fill="Black">
-                    <Path.RenderTransform>
-                        <TranslateTransform X="3.0000" Y="0" />
-                    </Path.RenderTransform>
-                </Path>
-            </MenuItem.Icon>
-        </MenuItem>
+            IsEnabled="True" />
     </ContextMenu>
 
     <ContextMenu x:Key="CustomFontStyleFlyoutMenu" FontSize="14">
@@ -38,13 +25,16 @@
             IsEnabled="True" />
     </ContextMenu>
 
-    <!--注释 - 高亮、下划线、删除线 -右键菜单-->
+    <!--  注释 - 高亮、下划线、删除线 -右键菜单  -->
     <Style x:Key="UIElementMenuItem" TargetType="MenuItem">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="MenuItem">
-                    <Grid Height="24" Background="#FBFBFD" Width="{TemplateBinding Width}">
-                        <ContentPresenter Content="{TemplateBinding Header}"/>
+                    <Grid
+                        Width="{TemplateBinding Width}"
+                        Height="24"
+                        Background="#FBFBFD">
+                        <ContentPresenter Content="{TemplateBinding Header}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>

PDF Office/Styles/CustomListItemStyle.xaml

@@ -1,17 +1,18 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:customControl="clr-namespace:PDF_Office.CustomControl"
-                    >
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:customControl="clr-namespace:PDF_Office.CustomControl">
 
     <Style x:Key="FocusVisual">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Rectangle Margin="0"
-                                   SnapsToDevicePixels="true"
-                                   Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                   StrokeDashArray="1 2"
-                                   StrokeThickness="0" />
+                    <Rectangle
+                        Margin="0"
+                        SnapsToDevicePixels="true"
+                        Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                        StrokeDashArray="1 2"
+                        StrokeThickness="0" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -22,51 +23,37 @@
 
     <!--  set the MouseOverColor to Transparent when you do not need the effect in the unselected items  -->
     <Color x:Key="MouseOverColor">LightBlue</Color>
-    <SolidColorBrush x:Key="Item.MouseOver.Background"
-                         Color="LightBlue" />
-    <SolidColorBrush x:Key="Item.MouseOver.Border"
-                         Color="LightBlue" />
-    <SolidColorBrush x:Key="Item.SelectedInactive.Background"
-                         Color="AliceBlue" />
-    <SolidColorBrush x:Key="Item.SelectedInactive.Border"
-                         Color="AliceBlue" />
-    <SolidColorBrush x:Key="Item.SelectedActive.Background"
-                         Color="Beige" />
-    <SolidColorBrush x:Key="Item.SelectedActive.Border"
-                         Color="Beige" />
-    <Style x:Key="ListBoxItemStyle"
-               TargetType="{x:Type customControl:ListItemQuickTool}">
-        <Setter Property="SnapsToDevicePixels"
-                    Value="True" />
-        <Setter Property="FocusVisualStyle"
-                    Value="{x:Null}" />
+    <SolidColorBrush x:Key="Item.MouseOver.Background" Color="LightBlue" />
+    <SolidColorBrush x:Key="Item.MouseOver.Border" Color="LightBlue" />
+    <SolidColorBrush x:Key="Item.SelectedInactive.Background" Color="AliceBlue" />
+    <SolidColorBrush x:Key="Item.SelectedInactive.Border" Color="AliceBlue" />
+    <SolidColorBrush x:Key="Item.SelectedActive.Background" Color="Beige" />
+    <SolidColorBrush x:Key="Item.SelectedActive.Border" Color="Beige" />
+    <Style x:Key="ListBoxItemStyle" TargetType="{x:Type customControl:ListItemQuickTool}">
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
 
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type customControl:ListItemQuickTool}">
-                    <Border x:Name="Border"
-                                Margin="0,0,0,16"
-                                BorderThickness="1" 
-                                Background="Transparent"
-                                SnapsToDevicePixels="true">
-                        <Border.BorderBrush>
-                            <SolidColorBrush Color="#000000" Opacity="0.05"/>
-                        </Border.BorderBrush>
+                    <Border
+                        x:Name="Border"
+                        Margin="0,0,0,16"
+                        Background="Transparent"
+                        BorderBrush="{StaticResource color.sys.border.neutral.lv3}"
+                        BorderThickness="1"
+                        CornerRadius="{StaticResource border-radius.8}"
+                        SnapsToDevicePixels="true">
                         <ContentPresenter />
                     </Border>
                     <ControlTemplate.Triggers>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsOverModular"
-                                               Value="True" />
+                                <Condition Property="IsOverModular" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border"
-                                        Property="Background"
-                                        Value="{StaticResource Item.MouseOver.Background}" />
-                            <Setter TargetName="Border"
-                                        Property="BorderBrush"
-                                        Value="{StaticResource Item.MouseOver.Border}" />
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource Item.MouseOver.Background}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource Item.MouseOver.Border}" />
                         </MultiTrigger>
 
                     </ControlTemplate.Triggers>
@@ -76,31 +63,30 @@
         <Style.Triggers />
     </Style>
 
-    <Style x:Key="MoreListBoxItemStyle"
-               TargetType="{x:Type customControl:ListItemQuickTool}">
-        <Setter Property="SnapsToDevicePixels"
-                    Value="True" />
+    <Style x:Key="MoreListBoxItemStyle" TargetType="{x:Type customControl:ListItemQuickTool}">
+        <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type customControl:ListItemQuickTool}">
-                    <Border x:Name="Border" CornerRadius="4" Margin="0,0,0,16" BorderThickness="1" 
-                                Background="Transparent"
-                                SnapsToDevicePixels="False">
+                    <Border
+                        x:Name="Border"
+                        Margin="0,0,0,16"
+                        Background="Transparent"
+                        BorderThickness="1"
+                        CornerRadius="4"
+                        SnapsToDevicePixels="False">
                         <Border.BorderBrush>
-                            <SolidColorBrush Color="#000000" Opacity="0.05"/>
+                            <SolidColorBrush Opacity="0.05" Color="#000000" />
                         </Border.BorderBrush>
                         <ContentPresenter />
                     </Border>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsSelected"
-                                               Value="true" />
+                                <Condition Property="IsSelected" Value="true" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="Border"
-                                            Property="Background"
-                                            Value="LightGoldenrodYellow" />
+                                <Setter TargetName="Border" Property="Background" Value="LightGoldenrodYellow" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                     </ControlTemplate.Triggers>

PDF Office/Styles/RadioButtonStyle.xaml

@@ -618,6 +618,7 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="true">
                             <Setter TargetName="fore" Property="Background" Value="{StaticResource color.item-state.sel.bg.lv2}" />
+                            <Setter Property="Foreground" Value="{StaticResource color.icon.base.neutral.sel}" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="fore" Property="Background" Value="{StaticResource color.item-state.hov.bg}" />

PDF Office/Styles/TabControlStyle.xaml

@@ -146,12 +146,12 @@
                                 Data="{Binding NormalPathIcon, RelativeSource={RelativeSource Mode=TemplatedParent}}"
                                 Fill="Black"
                                 Visibility="Visible" />
-                            <Image
+                            <Path
                                 x:Name="SelectedIcon"
                                 MaxWidth="20"
                                 MaxHeight=" 20"
                                 Margin="0,0,4,0"
-                                Source="{Binding SelectedIcon, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                Data="{Binding SelectedIcon, RelativeSource={RelativeSource Mode=TemplatedParent}}"
                                 Visibility="Collapsed" />
                             <TextBlock
                                 x:Name="txt"
@@ -229,6 +229,78 @@
         </Setter>
     </Style>
 
+    <Style x:Key="BOTATab" TargetType="{x:Type cus:IconAndTextTabItem}">
+        <Setter Property="Foreground" Value="{StaticResource color.icon.base.neutral.norm.lv1}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="#FFACACAC" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="SelectedForeground" Value="{StaticResource color.icon.base.brand}" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Height" Value="40" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type cus:IconAndTextTabItem}">
+                    <Grid
+                        x:Name="templateRoot"
+                        Margin="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        SnapsToDevicePixels="True">
+                        <Border
+                            x:Name="_underline"
+                            Height="3"
+                            Margin="9,0"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Bottom"
+                            Background="{StaticResource color.sys.layout.accent}"
+                            CornerRadius="2"
+                            Visibility="Collapsed" />
+                        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                            <Path
+                                x:Name="NormalPathIcon"
+                                Width="20"
+                                Height="20"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Data="{Binding NormalPathIcon, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                Fill="{TemplateBinding Foreground}"
+                                Visibility="Visible" />
+                            <Path
+                                x:Name="SelectedIcon"
+                                Width="20"
+                                Height="20"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Data="{Binding SelectedIcon, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                Fill="{TemplateBinding SelectedForeground}"
+                                Visibility="Collapsed" />
+                            <TextBlock
+                                x:Name="txt"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Foreground="{TemplateBinding Foreground}"
+                                Text="{TemplateBinding Header}"
+                                TextTrimming="CharacterEllipsis"
+                                ToolTip="{TemplateBinding Header}"
+                                Visibility="Collapsed" />
+                        </StackPanel>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="Background" Value="{StaticResource color.item-state.sel.bg.lv2}" />
+                            <Setter TargetName="NormalPathIcon" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="SelectedIcon" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
     <!--  Design Token TabItem ControlTemplate  for Forms Property Title  -->
     <ControlTemplate x:Key="Segmented" TargetType="{x:Type TabItem}">
         <Grid x:Name="templateRoot" SnapsToDevicePixels="True">

PDF Office/Styles/ToggleButton.xaml

@@ -85,7 +85,7 @@
                         </Trigger>
                         <Trigger Property="IsChecked" Value="True">
                             <Setter TargetName="border" Property="Panel.Background" Value="{StaticResource color.item-state.sel.bg.lv2}" />
-                            <Setter Property="Foreground" Value="{StaticResource color.icon.base.neutral.norm.lv1}" />
+                            <Setter Property="Foreground" Value="{StaticResource color.icon.base.neutral.sel}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="border" Property="Panel.Background" Value="Transparent" />

PDF Office/Views/BOTA/BOTAContent.xaml

@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:convert="clr-namespace:PDF_Office.DataConvert"
+    xmlns:customcontrol="clr-namespace:PDF_Office.CustomControl"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:local="clr-namespace:PDF_Office.Views.BOTA"
@@ -73,52 +74,95 @@
             Style="{StaticResource TabControlWithUnderLineStyle}"
             TabStripPlacement="Left">
             <!--  建立一个空的标头占位  -->
-            <TabItem
+            <customcontrol:IconAndTextTabItem
                 Height="0"
-                IsSelected="True"
                 Margin="0"
-                BorderThickness="0" />
-            <TabItem
-                Name="TabItemThumbnail"
+                BorderThickness="0"
+                IsSelected="True"
+                Style="{StaticResource BOTATab}" />
+            <customcontrol:IconAndTextTabItem
+                x:Name="TabItemThumbnail"
                 Width="48"
                 Height="48"
-                Header="缩略"
-                Visibility="{Binding ElementName=MenuThumbnail, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}" />
-            <TabItem
-                Name="TabItemOutLine"
+                Style="{StaticResource BOTATab}"
+                Visibility="{Binding ElementName=MenuThumbnail, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}">
+                <customcontrol:IconAndTextTabItem.NormalPathIcon>
+                    <PathGeometry Figures="M15 9V17H5L5 3L9 3V7C9 8.10457 9.89543 9 11 9H15ZM14.1716 7H11V3.82843L12.5858 5.41421L14.1716 7ZM17 8V17C17 18.1046 16.1046 19 15 19H5C3.89543 19 3 18.1046 3 17V3C3 1.89543 3.89543 1 5 1H10H10.1716C10.702 1 11.2107 1.21071 11.5858 1.58579L14 4L16.4142 6.41421C16.7893 6.78929 17 7.29799 17 7.82843V8Z" />
+                </customcontrol:IconAndTextTabItem.NormalPathIcon>
+                <customcontrol:IconAndTextTabItem.SelectedIcon>
+                    <PathGeometry Figures="M3 3C3 1.89543 3.89543 1 5 1H10.1716C10.702 1 11.2107 1.21071 11.5858 1.58579L14 4L16.4142 6.41421C16.7893 6.78929 17 7.29799 17 7.82843V17C17 18.1046 16.1046 19 15 19H5C3.89543 19 3 18.1046 3 17V3Z" />
+                </customcontrol:IconAndTextTabItem.SelectedIcon>
+            </customcontrol:IconAndTextTabItem>
+            <customcontrol:IconAndTextTabItem
+                x:Name="TabItemOutLine"
                 Width="48"
                 Height="48"
                 Header="大纲"
-                Visibility="{Binding ElementName=MenuOutLine, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}" />
-            <TabItem
-                Name="TabItemBookMark"
+                Style="{StaticResource BOTATab}"
+                Visibility="{Binding ElementName=MenuOutLine, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}">
+                <customcontrol:IconAndTextTabItem.NormalPathIcon>
+                    <PathGeometry Figures="M3 6H6V5C6 4.44772 6.44772 4 7 4H18C18.5523 4 19 4.44772 19 5V9C19 9.55228 18.5523 10 18 10H7C6.44772 10 6 9.55228 6 9V8H3V14L6 14V13C6 12.4477 6.44772 12 7 12H18C18.5523 12 19 12.4477 19 13V17C19 17.5523 18.5523 18 18 18H7C6.44772 18 6 17.5523 6 17V16H3C1.89543 16 1 15.1046 1 14V6V2H3V6ZM8 6V8H17V6H8ZM8 16V14H17V16H8Z" />
+                </customcontrol:IconAndTextTabItem.NormalPathIcon>
+                <customcontrol:IconAndTextTabItem.SelectedIcon>
+                    <PathGeometry Figures="M3 6H6V5C6 4.44772 6.44772 4 7 4H18C18.5523 4 19 4.44772 19 5V9C19 9.55228 18.5523 10 18 10H7C6.44772 10 6 9.55228 6 9V8H3V14L6 14V13C6 12.4477 6.44772 12 7 12H18C18.5523 12 19 12.4477 19 13V17C19 17.5523 18.5523 18 18 18H7C6.44772 18 6 17.5523 6 17V16H3C1.89543 16 1 15.1046 1 14V6V2H3V6Z" >
+                    </PathGeometry>
+                </customcontrol:IconAndTextTabItem.SelectedIcon>
+            </customcontrol:IconAndTextTabItem>
+            <customcontrol:IconAndTextTabItem
+                x:Name="TabItemBookMark"
                 Width="48"
                 Height="48"
                 Header="书签"
-                Visibility="{Binding ElementName=MenuBookMark, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}" />
-            <TabItem
-                Name="TabItemAnnotation"
+                Style="{StaticResource BOTATab}"
+                Visibility="{Binding ElementName=MenuBookMark, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}">
+                <customcontrol:IconAndTextTabItem.NormalPathIcon>
+                    <PathGeometry Figures="M11.3793 12.8851C10.6069 12.1494 9.3931 12.1494 8.62069 12.8851L5 16.3333V3H15V16.3333L11.3793 12.8851ZM15.3103 19.3908L10 14.3333L4.68966 19.3908C4.053 19.9971 3 19.5459 3 18.6667V3C3 1.89543 3.89543 1 5 1H15C16.1046 1 17 1.89543 17 3V18.6667C17 19.5459 15.947 19.9971 15.3103 19.3908ZM7 5H8H12H13V6V7H12H8H7V6V5Z" />
+                </customcontrol:IconAndTextTabItem.NormalPathIcon>
+                <customcontrol:IconAndTextTabItem.SelectedIcon>
+                    <PathGeometry Figures="M3 3C3 1.89543 3.89543 1 5 1H15C16.1046 1 17 1.89543 17 3V18.6667C17 19.5459 15.947 19.9971 15.3103 19.3908L10 14.3333L4.68966 19.3908C4.053 19.9971 3 19.5459 3 18.6667V3Z" />
+                </customcontrol:IconAndTextTabItem.SelectedIcon>
+            </customcontrol:IconAndTextTabItem>
+            <customcontrol:IconAndTextTabItem
+                x:Name="TabItemAnnotation"
                 Width="48"
                 Height="48"
                 Header="注释"
-                Visibility="{Binding ElementName=MenuAnnotation, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}" />
-            <TabItem
-                Name="TabItemSearch"
+                Style="{StaticResource BOTATab}"
+                Visibility="{Binding ElementName=MenuAnnotation, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}">
+                <customcontrol:IconAndTextTabItem.NormalPathIcon>
+                    <PathGeometry Figures="M3.5 1.5C2.39543 1.5 1.5 2.39543 1.5 3.5V16.5C1.5 17.6046 2.39543 18.5 3.5 18.5H16.5C17.6046 18.5 18.5 17.6046 18.5 16.5V3.5C18.5 2.39543 17.6046 1.5 16.5 1.5H3.5ZM8.06104 14H6.3584L9.04932 6.24951H10.9561L13.6523 14H11.9443L11.3696 12.1201H8.63574L8.06104 14ZM10.0537 7.79639H9.95703L9.00635 10.9062H10.999L10.0537 7.79639Z" />
+                </customcontrol:IconAndTextTabItem.NormalPathIcon>
+                <customcontrol:IconAndTextTabItem.SelectedIcon>
+                    <PathGeometry Figures="M3.5 1.5C2.39543 1.5 1.5 2.39543 1.5 3.5V16.5C1.5 17.6046 2.39543 18.5 3.5 18.5H16.5C17.6046 18.5 18.5 17.6046 18.5 16.5V3.5C18.5 2.39543 17.6046 1.5 16.5 1.5H3.5ZM8.06104 14H6.3584L9.04932 6.24951H10.9561L13.6523 14H11.9443L11.3696 12.1201H8.63574L8.06104 14ZM10.0537 7.79639H9.95703L9.00635 10.9062H10.999L10.0537 7.79639Z" />
+                </customcontrol:IconAndTextTabItem.SelectedIcon>
+            </customcontrol:IconAndTextTabItem>
+            <customcontrol:IconAndTextTabItem
+                x:Name="TabItemSearch"
                 Width="48"
                 Height="48"
                 Header="搜索"
-                Visibility="{Binding ElementName=MenuSearch, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}" />
-            <TabItem
-                Name="TabItemForm"
+                Style="{StaticResource BOTATab}"
+                Visibility="{Binding ElementName=MenuSearch, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}">
+                <customcontrol:IconAndTextTabItem.NormalPathIcon>
+                    <PathGeometry Figures="M14 8.5C14 11.5376 11.5376 14 8.5 14C5.46243 14 3 11.5376 3 8.5C3 5.46243 5.46243 3 8.5 3C11.5376 3 14 5.46243 14 8.5ZM13.0492 14.4633C11.7874 15.4274 10.2106 16 8.5 16C4.35786 16 1 12.6421 1 8.5C1 4.35786 4.35786 1 8.5 1C12.6421 1 16 4.35786 16 8.5C16 10.2105 15.4274 11.7873 14.4634 13.0491L18.4572 17.0429L17.043 18.4571L13.0492 14.4633Z" />
+                </customcontrol:IconAndTextTabItem.NormalPathIcon>
+                <customcontrol:IconAndTextTabItem.SelectedIcon>
+                    <PathGeometry Figures="M14 8.5C14 11.5376 11.5376 14 8.5 14C5.46243 14 3 11.5376 3 8.5C3 5.46243 5.46243 3 8.5 3C11.5376 3 14 5.46243 14 8.5ZM13.0492 14.4633C11.7874 15.4274 10.2106 16 8.5 16C4.35786 16 1 12.6421 1 8.5C1 4.35786 4.35786 1 8.5 1C12.6421 1 16 4.35786 16 8.5C16 10.2105 15.4274 11.7873 14.4634 13.0491L18.4572 17.0429L17.043 18.4571L13.0492 14.4633Z" />
+                </customcontrol:IconAndTextTabItem.SelectedIcon>
+            </customcontrol:IconAndTextTabItem>
+            <customcontrol:IconAndTextTabItem
+                x:Name="TabItemForm"
                 Width="48"
                 Height="48"
                 Header="域"
+                Style="{StaticResource BOTATab}"
                 Visibility="{Binding ElementName=MenuFrom, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}" />
-            <TabItem
-                Name="TabItemSign"
+            <customcontrol:IconAndTextTabItem
+                x:Name="TabItemSign"
                 Width="48"
                 Height="48"
                 Header="签名"
+                Style="{StaticResource BOTATab}"
                 Visibility="{Binding ElementName=MenuSign, Path=IsChecked, Converter={StaticResource BoolToVisibleConvert}, Mode=TwoWay}" />
             <i:Interaction.Triggers>
                 <i:EventTrigger EventName="SelectionChanged">

PDF Office/Views/HomeContent.xaml

@@ -48,7 +48,7 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <!--  左侧菜单栏  -->
-        <StackPanel>
+        <StackPanel Background="{StaticResource color.sys.layout.mg}">
             <Button
                 x:Name="BtnOpenPDF"
                 Height="40"
@@ -79,7 +79,10 @@
                     <Button.ContextMenu>
                         <ContextMenu Name="ContextCreatePDF">
                             <MenuItem Command="{Binding CreateBlackPDFCommand}" Header="New Blank Page" />
-                            <MenuItem Command="{Binding CreateFromHtmlCommnd}" Visibility="Collapsed" Header="New From Web Page" />
+                            <MenuItem
+                                Command="{Binding CreateFromHtmlCommnd}"
+                                Header="New From Web Page"
+                                Visibility="Collapsed" />
                             <MenuItem Command="{Binding CreateFromScanner}" Header="Import From Scanner" />
                         </ContextMenu>
                     </Button.ContextMenu>

PDF Office/Views/HomePanel/HomeGuidContent.xaml

@@ -1,16 +1,18 @@
-<UserControl x:Class="PDF_Office.Views.HomePanel.HomeGuidContent"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:PDF_Office.Views.HomePanel"
-             xmlns:recentFiles="clr-namespace:PDF_Office.Views.HomePanel.RecentFiles"
-             xmlns:pDFTools="clr-namespace:PDF_Office.Views.HomePanel.PDFTools"
-             xmlns:prism="http://prismlibrary.com/"
-             prism:ViewModelLocator.AutoWireViewModel="True"
-             Background="#F8F9FB"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="PDF_Office.Views.HomePanel.HomeGuidContent"
+    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:local="clr-namespace:PDF_Office.Views.HomePanel"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pDFTools="clr-namespace:PDF_Office.Views.HomePanel.PDFTools"
+    xmlns:prism="http://prismlibrary.com/"
+    xmlns:recentFiles="clr-namespace:PDF_Office.Views.HomePanel.RecentFiles"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    prism:ViewModelLocator.AutoWireViewModel="True"
+    Background="{StaticResource color.sys.layout.anti}"
+    mc:Ignorable="d">
     <Grid>
         <ScrollViewer
             x:Name="scrollView"
@@ -21,8 +23,11 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition />
                 </Grid.RowDefinitions>
-                <pDFTools:QuickToolsContent x:Name="hometool" Margin="32,32,0,0"/>
-                <recentFiles:RecentFilesContent x:Name="Recentlist" Grid.Row="1" Margin="0,0,32,0" />
+                <pDFTools:QuickToolsContent x:Name="hometool" Margin="32,32,0,0" />
+                <recentFiles:RecentFilesContent
+                    x:Name="Recentlist"
+                    Grid.Row="1"
+                    Margin="0,0,32,0" />
             </Grid>
         </ScrollViewer>
     </Grid>

PDF Office/Views/HomePanel/PDFTools/PDFToolExpendItem.xaml

@@ -1,43 +1,52 @@
-<UserControl x:Class="PDF_Office.Views.HomePanel.PDFTools.PDFToolExpendItem"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:PDF_Office.Views.HomePanel.PDFTools"
-             xmlns:convert="clr-namespace:PDF_Office.DataConvert"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <UserControl.Resources>
-    </UserControl.Resources>
-    <Grid  Margin="1,1,1,1" Background="White">
-        <Border x:Name="BorderExtend" Height="108"  Background="White">
+<UserControl
+    x:Class="PDF_Office.Views.HomePanel.PDFTools.PDFToolExpendItem"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:convert="clr-namespace:PDF_Office.DataConvert"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:PDF_Office.Views.HomePanel.PDFTools"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <UserControl.Resources />
+    <Border
+        x:Name="BorderExtend"
+        Height="116"
+        Background="Transparent">
+        <Grid Margin="16">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="36" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <StackPanel Orientation="Horizontal">
+                <Image
+                    Width="28"
+                    Height="28"
+                    HorizontalAlignment="Center"
+                    Source="{Binding FnImg}" />
 
-            <Grid>
-                <Grid Margin="10">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="auto"></ColumnDefinition>
-                        <ColumnDefinition Width="*"></ColumnDefinition>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto"></RowDefinition>
-                        <RowDefinition Height="*"></RowDefinition>
-                    </Grid.RowDefinitions>
-                    <Image VerticalAlignment="Top" Source="{Binding FnImg}" HorizontalAlignment="Center" Width="28" Height="28" Margin="5,10,5,5" />
+                <TextBlock
+                    Name="TxbTitle"
+                    Margin="8 0 0 0"
+                    VerticalAlignment="Center"
+                    FontSize="14"
+                    FontWeight="SemiBold"
+                    Foreground="Black"
+                    Text="{Binding FnName}" />
 
-                    <TextBlock  Name="TxbTitle" Grid.Column="1" Text="{Binding FnName}" 
-                                    FontSize="14" FontWeight="SemiBold" Foreground="Black"
-                                    VerticalAlignment="Top" Margin="0,15,0,0"></TextBlock>
+            </StackPanel> 
 
-
-                    <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1"  Margin="6,0,6,0">
-                        <Grid>
-                            <TextBlock Name="ToolInfoBlock" Text="{Binding FnInfo}"
-                                       Foreground="#666666" LineHeight="16"  FontSize="12"  TextWrapping="Wrap" VerticalAlignment="Center" Margin="0,8,0,0"></TextBlock>
-                        </Grid>
-
-                    </StackPanel>
-                </Grid>
-            </Grid>
-        </Border>
-    </Grid>
+            <TextBlock
+                            Name="ToolInfoBlock"
+                Grid.Row="1"
+                Margin="0 8 0 0"
+                            VerticalAlignment="Center"
+                            FontSize="12"
+                            Foreground="#666666"
+                            LineHeight="16"
+                            Text="{Binding FnInfo}"
+                            TextWrapping="Wrap" />
+        </Grid>
+    </Border>
 </UserControl>

PDF Office/Views/HomePanel/PDFTools/PDFToolItem.xaml

@@ -1,27 +1,40 @@
-<UserControl x:Class="PDF_Office.Views.HomePanel.PDFTools.PDFToolItem"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:PDF_Office.Views.HomePanel"
-             xmlns:convert="clr-namespace:PDF_Office.DataConvert"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <UserControl.Resources>
-    </UserControl.Resources>
-    <Grid  Margin="1,1,1,1" Background="White">
-        <Border x:Name="BorderConcise" Height="64" 
-                >
-            <Grid Background="Transparent">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="auto"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-                <Grid x:Name="GridToolMaskConcise" Grid.ColumnSpan="2" Background="#477EDE" Visibility="Collapsed"/>
-                <Image VerticalAlignment="Top" Source="{Binding FnImg}" HorizontalAlignment="Center" Width="28" Height="28" Margin="5,10,5,5" />
-                <TextBlock  Name="TxbTitleConcise" Grid.Column="1" Text="{Binding FnName}" FontSize="14" FontWeight="SemiBold" VerticalAlignment="Top" Margin="0,15,0,0"></TextBlock>
-            </Grid>
-        </Border>
-        
-    </Grid>
+<UserControl
+    x:Class="PDF_Office.Views.HomePanel.PDFTools.PDFToolItem"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:convert="clr-namespace:PDF_Office.DataConvert"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:PDF_Office.Views.HomePanel"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Border
+        x:Name="BorderConcise"
+        Height="64"
+        Background="Transparent"
+        CornerRadius="{StaticResource border-radius.8}">
+        <Grid Margin="16" Background="Transparent">
+            <Grid
+                x:Name="GridToolMaskConcise"
+                Grid.ColumnSpan="2"
+                Background="#477EDE"
+                Visibility="Collapsed" />
+            <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
+                <Image
+                    Width="28"
+                    Height="28"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    Source="{Binding FnImg}" />
+                <TextBlock
+                    Name="TxbTitleConcise"
+                    Margin="8,0,0,0"
+                    VerticalAlignment="Center"
+                    FontSize="14"
+                    FontWeight="SemiBold"
+                    Text="{Binding FnName}" />
+            </StackPanel>
+        </Grid>
+    </Border>
 </UserControl>

PDF Office/Views/HomePanel/PDFTools/QuickToolsContent.xaml

@@ -8,7 +8,7 @@
     xmlns:local="clr-namespace:PDF_Office.Views.HomePanel"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pDFTools="clr-namespace:PDF_Office.Views.HomePanel.PDFTools"
-    xmlns:prism="http://prismlibrary.com/"
+    xmlns:prism="http://prismlibrary.com/" xmlns:pdftools="clr-namespace:PDF_Office.ViewModels.HomePanel.PDFTools" d:DataContext="{d:DesignInstance Type=pdftools:QuickToolsContentViewModel}"
     d:DesignHeight="450"
     d:DesignWidth="800"
     prism:ViewModelLocator.AutoWireViewModel="True"
@@ -83,14 +83,20 @@
                 Visibility="Collapsed" />
             <Button
                 x:Name="BtnMore"
-                Width="28"
-                Height="28"
+                Width="32"
+                Height="32"
                 Margin="12,0,0,0"
-                Background="#FFFFFF"
-                BorderThickness="0"
                 Command="{Binding OpenMenuCommand}"
                 CommandParameter="{Binding ElementName=BtnMore}"
-                Content="..." />
+                Style="{StaticResource btn.sec}">
+                <Path
+                    Width="32"
+                    Height="32"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="M12 16C12 16.8284 11.3284 17.5 10.5 17.5C9.67157 17.5 9 16.8284 9 16C9 15.1716 9.67157 14.5 10.5 14.5C11.3284 14.5 12 15.1716 12 16ZM17.3999 16C17.3999 16.8284 16.7283 17.5 15.8999 17.5C15.0715 17.5 14.3999 16.8284 14.3999 16C14.3999 15.1716 15.0715 14.5 15.8999 14.5C16.7283 14.5 17.3999 15.1716 17.3999 16ZM21.5 17.5C22.3284 17.5 23 16.8284 23 16C23 15.1716 22.3284 14.5 21.5 14.5C20.6716 14.5 20 15.1716 20 16C20 16.8284 20.6716 17.5 21.5 17.5Z"
+                    Fill="{StaticResource color.icon.base.neutral.norm.lv1}" />
+            </Button>
 
         </StackPanel>
 

PDF Office/Views/HomePanel/PromotionContent.xaml

@@ -1,59 +1,100 @@
-<UserControl x:Class="PDF_Office.Views.HomePanel.PromotionContent"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:PDF_Office.Views.HomePanel"
-             mc:Ignorable="d" SizeChanged="UserControl_SizeChanged"
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="PDF_Office.Views.HomePanel.PromotionContent"
+    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:local="clr-namespace:PDF_Office.Views.HomePanel"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    SizeChanged="UserControl_SizeChanged"
+    mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../../Styles/ListViewStyle.xaml"/>
-                <ResourceDictionary Source="../../Styles/ExpanderStyle.xaml"/>
+                <ResourceDictionary Source="../../Styles/ListViewStyle.xaml" />
+                <ResourceDictionary Source="../../Styles/ExpanderStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <DataTemplate x:Key="PromotionDataTemplate">
-                <StackPanel Background="White" Orientation="Horizontal" Cursor="Hand" Margin="0,10,0,10">
-                    <Image Width="16" Height="16" Source="{Binding ImagePath}" Margin="0,0,10,0"/>
-                    <TextBlock Text="{Binding Content}" FontSize="14" Foreground="#6B6F7D"/>
+                <StackPanel
+                    Margin="0,10,0,10"
+                    Background="White"
+                    Cursor="Hand"
+                    Orientation="Horizontal">
+                    <Image
+                        Width="16"
+                        Height="16"
+                        Margin="0,0,10,0"
+                        Source="{Binding ImagePath}" />
+                    <TextBlock
+                        FontSize="14"
+                        Foreground="#6B6F7D"
+                        Text="{Binding Content}" />
                 </StackPanel>
             </DataTemplate>
         </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer VerticalScrollBarVisibility="Auto">
-        <StackPanel>
-            <Expander x:Name="PDFProSeriesExpander" Margin="20,20,0,0" Style="{StaticResource PromotionExpanderStyle}">
+        <StackPanel Background="{StaticResource color.sys.layout.mg}">
+            <Expander
+                x:Name="PDFProSeriesExpander"
+                Margin="20,20,0,0"
+                Style="{StaticResource PromotionExpanderStyle}">
                 <Expander.Header>
                     <Grid Name="GridHeader" HorizontalAlignment="Center">
-                        <TextBlock Text="PDF Pro Series" Foreground="#8F96A7" FontSize="12"/>
+                        <TextBlock
+                            FontSize="12"
+                            Foreground="#8F96A7"
+                            Text="PDF Pro Series" />
                     </Grid>
                 </Expander.Header>
-                <Border  CornerRadius="4" >
+                <Border CornerRadius="4">
                     <Grid Name="GroupPDFProSeries">
-                        <ListView x:Name="PDFProListview" MinWidth="0" BorderThickness="0" HorizontalAlignment="Stretch" ItemTemplate="{StaticResource PromotionDataTemplate}" ItemContainerStyle="{StaticResource EmptyListViewItem}">
-
-                        </ListView>
+                        <ListView
+                            x:Name="PDFProListview"
+                            MinWidth="0"
+                            HorizontalAlignment="Stretch"
+                            BorderThickness="0"
+                            ItemContainerStyle="{StaticResource EmptyListViewItem}"
+                            ItemTemplate="{StaticResource PromotionDataTemplate}" />
                     </Grid>
                 </Border>
 
             </Expander>
 
-            <Expander x:Name="OthersExpander" Margin="20,20,0,0"  Style="{StaticResource PromotionExpanderStyle}">
+            <Expander
+                x:Name="OthersExpander"
+                Margin="20,20,0,0"
+                Style="{StaticResource PromotionExpanderStyle}">
                 <Expander.Header>
                     <Grid Name="GridHeaderOthers" HorizontalAlignment="Center">
-                        <TextBlock Text="Others" Foreground="#8F96A7" FontSize="12"/>
+                        <TextBlock
+                            FontSize="12"
+                            Foreground="#8F96A7"
+                            Text="Others" />
                     </Grid>
                 </Expander.Header>
-                <Border  CornerRadius="4">
-                    <Grid Name="GridGroupOthers" >
-                        <ListView x:Name="OthersListview"  MinWidth="0" BorderThickness="0" HorizontalAlignment="Stretch" ItemTemplate="{StaticResource PromotionDataTemplate}" ItemContainerStyle="{StaticResource EmptyListViewItem}">
-
-                        </ListView>
+                <Border CornerRadius="4">
+                    <Grid Name="GridGroupOthers">
+                        <ListView
+                            x:Name="OthersListview"
+                            MinWidth="0"
+                            HorizontalAlignment="Stretch"
+                            BorderThickness="0"
+                            ItemContainerStyle="{StaticResource EmptyListViewItem}"
+                            ItemTemplate="{StaticResource PromotionDataTemplate}" />
                     </Grid>
                 </Border>
 
             </Expander>
-            <Rectangle x:Name="promtionRect" Fill="#EBEBEB" Margin="0,8,0,0" Width="216" Height="216" RadiusX="8" RadiusY="8"/>
+            <Rectangle
+                x:Name="promtionRect"
+                Width="216"
+                Height="216"
+                Margin="0,8,0,0"
+                Fill="#EBEBEB"
+                RadiusX="8"
+                RadiusY="8" />
         </StackPanel>
     </ScrollViewer>
 </UserControl>