Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/CustomControl/PageTurningPreview.xaml

@@ -5,25 +5,45 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:PDF_Office.CustomControl"
              mc:Ignorable="d" 
-             Height="280" Width="200">
-    <Grid Width="200" Height="280">
-        <StackPanel Orientation="Vertical" Height="280">
-        <Border  Margin="0,16,0,0" HorizontalAlignment="Center" VerticalAlignment="Top" Background="LightGray"  Height="218" Width="176">
-            <Viewbox>
-                    <Image Name="Image" Height="218" Width="176"></Image>
-            </Viewbox>
-        </Border>
-        <StackPanel Orientation="Horizontal"  Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,16,0,0">
-            <Button Name="PrePage" Width="24" Click="PrePage_Click" Height="24" HorizontalAlignment="Left" FontSize="16" Background="WhiteSmoke" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
-                <TextBlock Text="&lt;" VerticalAlignment="Center" ></TextBlock>
-            </Button>
-            <TextBox x:Name="CurrentPage" Width="48" Height="24" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="11,0,2,0" Text="1" InputMethod.IsInputMethodEnabled="False"   PreviewTextInput="CountTextBox_PreviewTextInput" KeyDown="CurrentPage_KeyDown" LostFocus="CurrentPage_LostFocus"></TextBox>
-            <TextBlock  Text="of" Margin="0,0,2,0"  HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
-                <TextBlock  x:Name="PageIndex" VerticalAlignment="Center" Block.TextAlignment="Center"  Width="23"/>
-                <Button Name="NextPage" Click="NextPage_Click" Width="24" Height="24" HorizontalAlignment="Left" FontSize="16"  Background="WhiteSmoke"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="17,0,0,0">
-                <TextBlock Text=">" VerticalAlignment="Center"></TextBlock>
-            </Button>
-        </StackPanel>
+             Height="320" Width="212">
+    <Grid Width="212" Height="320">
+        <StackPanel Orientation="Vertical" Height="320">
+            <Border  Margin="0,16,0,0" HorizontalAlignment="Center" VerticalAlignment="Top" Background="LightGray"  Height="248" Width="180">
+                <Viewbox>
+                    <Image Name="Image" Height="248" Width="180"></Image>
+                </Viewbox>
+            </Border>
+            <StackPanel Orientation="Horizontal"  Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,16,0,0" Width="155">
+                <Button Name="PrePage" Width="24" Click="PrePage_Click" Height="24" HorizontalAlignment="Left" FontSize="16" BorderBrush="{StaticResource color.field.border.norm}"  Background="{StaticResource color.field.bg.def}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" >
+                    <Path  Data="M8.11144 11.2499L10.4311 8.93029L9.37043 7.86963L5.77045 11.4696C5.47756 11.7625 5.47756 12.2374 5.77045 12.5303L9.37043 16.1302L10.4311 15.0696L8.11144 12.7499H19.5008V11.2499H8.11144Z" Fill="#616469"  Width="13.95" Height="8.28" Stretch="Fill" />
+                    <Button.Template>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border BorderThickness="1" CornerRadius="4" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+                                <ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                        </ControlTemplate>
+                    </Button.Template>
+                </Button>
+                <TextBox x:Name="CurrentPage" Width="54" Height="24" HorizontalContentAlignment="Left" VerticalContentAlignment="Center" Margin="8,0,8,0" Text="1"  InputMethod.IsInputMethodEnabled="False"   PreviewTextInput="CountTextBox_PreviewTextInput" Padding="8,0,8,0" KeyDown="CurrentPage_KeyDown" Background="{StaticResource color.field.bg.def}"  BorderBrush="{StaticResource color.field.border.norm}" LostFocus="CurrentPage_LostFocus">
+                    <TextBox.Resources>
+                        <Style TargetType="{x:Type Border}">
+                            <Setter Property="CornerRadius" Value="4"/>
+                        </Style>
+                    </TextBox.Resources>
+                </TextBox>
+                <TextBlock  Text="/" Margin="0,0,2,0" Width="5"  HorizontalAlignment="Left" VerticalAlignment="Center"></TextBlock>
+                <TextBlock  x:Name="PageIndex" VerticalAlignment="Center" Block.TextAlignment="Center"  Width="30" />
+                <Button x:Name="NextPage"  Click="NextPage_Click" Width="24" Height="24" FontSize="16"  Background="{StaticResource color.field.bg.def}"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center"   BorderBrush="{StaticResource color.field.border.norm}">
+                    <Path  Data="M11.8893 4.24992L0.5 4.24992V5.74992L11.8893 5.74992L9.56967 8.06958L10.6303 9.13024L14.2303 5.53026C14.5232 5.23737 14.5232 4.7625 14.2303 4.4696L10.6303 0.869629L9.56967 1.93029L11.8893 4.24992Z" Fill="#616469" Width="13.95" Height="8.28" Stretch="Fill"/>
+                    <Button.Template>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border BorderThickness="1" CornerRadius="4" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+                                <ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </Border>
+                        </ControlTemplate>
+                    </Button.Template>
+                </Button>
+            </StackPanel>
         </StackPanel>
     </Grid>
 </UserControl>

PDF Office/ViewModels/Dialog/ToolsDialogs/CompressDialogs/CompressProgressBarDialogViewModel.cs

@@ -10,6 +10,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using PDF_Office.Helper;
+using Prism.Commands;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip;
 
 namespace PDF_Office.ViewModels.Dialog.ToolsDialogs.CompressDialogs
 {
@@ -20,7 +22,7 @@ namespace PDF_Office.ViewModels.Dialog.ToolsDialogs.CompressDialogs
         private CPDFDocument.GetPageIndexDelegate indexDelegate = null;
         private CPDFDocument tempDocument;
         private string _pageIndex = "0";
-
+        
         /// <value>
         /// 当前页
         /// </value>
@@ -47,6 +49,16 @@ namespace PDF_Office.ViewModels.Dialog.ToolsDialogs.CompressDialogs
         }
         #endregion
 
+        public DelegateCommand CloseCompressCommand { get; set; }
+
+        public CompresProgressBarDialogViewModel() {
+
+            CloseCompressCommand = new DelegateCommand(Close);
+        }
+
+        public void Close() {
+            RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+        }
         #region 逻辑函数
         private int GetIndex(int pageindex)
         {

PDF Office/Views/Dialog/ConverterDialogs/ConverterCSVDialog.xaml

@@ -10,19 +10,19 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pageeditdialogs="clr-namespace:PDF_Office.ViewModels.Dialog.PageEditDialogs"
     xmlns:prism="http://prismlibrary.com/"
-    Width="529"
-    Height="416"
+    Width="468"
+    Height="454"
     d:DataContext="{d:DesignInstance Type=converterdialogs:ConverterCSVDialogViewModel}"
-    d:DesignHeight="416"
-    d:DesignWidth="529"
+    d:DesignHeight="454"
+    d:DesignWidth="468"
     prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
     <cus:DialogContent Header="PDF转CSV">
         <cus:DialogContent.Content>
-            <Grid Grid.Row="1">
+            <Grid Grid.Row="1" >
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="212" />
+                    <ColumnDefinition Width="212"/>
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0">
@@ -85,7 +85,7 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,400,0" Command="{Binding BatchConverterCommand}">
+                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,400,0" Command="{Binding BatchConverterCommand}"  Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
@@ -96,14 +96,16 @@
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
                     Command="{Binding CancelCommand}"
-                    Content="取消" />
+                    Content="取消" 
+                     Style="{StaticResource btn.sec}"/>
                 <Button
                     Width="98"
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
                     Command="{Binding ConverterCommnad}"
-                    Content="转换" />
+                    Content="转换" 
+                     Style="{StaticResource Btn.cta}"/>
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

PDF Office/Views/Dialog/ConverterDialogs/ConverterExcelDialog.xaml

@@ -11,8 +11,8 @@
              Width="529"
              Height="482"
              d:DataContext="{d:DesignInstance Type=pageeditdialogs:ExtractDialogViewModel}"
-             d:DesignHeight="482"
-             d:DesignWidth="529"
+             d:DesignHeight="498"
+             d:DesignWidth="586"
              prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d">
@@ -24,7 +24,7 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0">
-                    <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
+                    <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" VerticalAlignment="Top"></cus:PageTurningPreview>
                 </Grid>
                 <Grid Grid.Column="1">
                     <StackPanel Orientation="Vertical" Margin="18,16,0,0">
@@ -85,7 +85,7 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,400,0" Command="{Binding BatchConverterCommand}">
+                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,400,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
@@ -96,14 +96,14 @@
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
                     Content="取消" 
-                    Command="{Binding CancelCommand}"/>
+                    Command="{Binding CancelCommand}" Style="{StaticResource btn.sec}"/>
                 <Button
                     Width="98"
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
                     Content="转换" 
-                    Command = "{Binding ConverterCommnad}"/>
+                    Command = "{Binding ConverterCommnad}" Style="{StaticResource Btn.cta}"/>
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

PDF Office/Views/Dialog/ConverterDialogs/ConverterHTMLDialog.xaml

@@ -8,11 +8,11 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:pageeditdialogs="clr-namespace:PDF_Office.ViewModels.Dialog.PageEditDialogs"
              xmlns:prism="http://prismlibrary.com/"           
-             Width="480"
-             Height="416"
+             Width="468"
+    Height="454"
              d:DataContext="{d:DesignInstance Type=pageeditdialogs:ExtractDialogViewModel}"
-             d:DesignHeight="416"
-             d:DesignWidth="480"
+             d:DesignHeight="454"
+             d:DesignWidth="468"
              prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d">
@@ -60,7 +60,7 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}">
+                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
@@ -71,14 +71,14 @@
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
                     Content="取消" 
-                    Command="{Binding CancelCommand}"/>
+                    Command="{Binding CancelCommand}" Style="{StaticResource btn.sec}"/>
                 <Button
                     Width="98"
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
                     Content="转换" 
-                    Command = "{Binding ConverterCommnad}"/>
+                    Command = "{Binding ConverterCommnad}" Style="{StaticResource Btn.cta}"/>
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

PDF Office/Views/Dialog/ConverterDialogs/ConverterImgDialog.xaml

@@ -10,11 +10,11 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pageeditdialogs="clr-namespace:PDF_Office.ViewModels.Dialog.PageEditDialogs"
     xmlns:prism="http://prismlibrary.com/"
-    Width="480"
-    Height="416"
+    Width="468"
+             Height="454"
     d:DataContext="{d:DesignInstance Type=converterdialogs:ConverterImgDialogViewModel}"
-    d:DesignHeight="416"
-    d:DesignWidth="480"
+    d:DesignHeight="454"
+    d:DesignWidth="468"
     prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
@@ -88,7 +88,7 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}">
+                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}"  Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
@@ -99,14 +99,15 @@
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
                     Command="{Binding CancelCommand}"
-                    Content="取消" />
+                    Content="取消" Style="{StaticResource btn.sec}"/>
                 <Button
                     Width="98"
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
                     Command="{Binding ConverterCommnad}"
-                    Content="转换" />
+                    Content="转换" 
+                    Style="{StaticResource Btn.cta}"/>
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

PDF Office/Views/Dialog/ConverterDialogs/ConverterPPTDialog.xaml

@@ -8,11 +8,11 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:pageeditdialogs="clr-namespace:PDF_Office.ViewModels.Dialog.PageEditDialogs"
              xmlns:prism="http://prismlibrary.com/"           
-             Width="480"
-             Height="416"
+            Width="468"
+    Height="454"
              d:DataContext="{d:DesignInstance Type=pageeditdialogs:ExtractDialogViewModel}"
-             d:DesignHeight="416"
-             d:DesignWidth="480"
+             d:DesignHeight="454"
+             d:DesignWidth="468"
              prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d">
@@ -60,7 +60,7 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}">
+                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
@@ -71,14 +71,14 @@
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
                     Content="取消" 
-                    Command="{Binding CancelCommand}"/>
+                    Command="{Binding CancelCommand}" Style="{StaticResource btn.sec}"/>
                 <Button
                     Width="98"
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
                     Content="转换" 
-                    Command = "{Binding ConverterCommnad}"/>
+                    Command = "{Binding ConverterCommnad}" Style="{StaticResource Btn.cta}"/>
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

PDF Office/Views/Dialog/ConverterDialogs/ConverterProgressBarDialog.xaml

@@ -4,16 +4,46 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:prism="http://prismlibrary.com/"             
-             prism:ViewModelLocator.AutoWireViewModel="True"
-             d:DesignHeight="40"
-             d:DesignWidth="220"
+            prism:ViewModelLocator.AutoWireViewModel="True"
+             prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
+             d:DesignHeight="58"
+             d:DesignWidth="226"
+                Height="58"
+             Width="226"
              mc:Ignorable="d">
-    <Grid Height="40" Width="220">
-        <StackPanel>
-            <StackPanel Orientation="Horizontal" Margin="13,5,0,10">
-                <TextBlock Text="Converte  .  .  . "></TextBlock>
-            </StackPanel>
-            <ProgressBar Minimum="0" Maximum="{Binding PageNumber}" Value="{Binding PageIndex}"  Height="4" Width="194"/>
-        </StackPanel>
+    <Grid Height="58" Width="226">
+        <Border
+                    Width="226"
+                    Height="58"
+                    Background="{StaticResource color.sys.layout.dark.bg}"
+                    BorderThickness="0"
+                    CornerRadius="{StaticResource border-radius.8}"
+                    Effect="{StaticResource shadow.neutral.m}">
+            <Grid Margin="16,13" Background="Transparent">
+
+                <StackPanel Orientation="Horizontal" >
+                    <TextBlock Text="Converte  .  .  . "></TextBlock>
+                </StackPanel>
+                <Button
+                            Width="12"
+                            Height="12"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            BorderThickness="0"
+                    Background="{StaticResource color.sys.layout.dark.bg}"
+                    Padding="0,0,1,1"
+                            Command="{Binding CloseCompressCommand}"
+                     >
+
+                    <Path Data="M6.00006 7.06066L9.46973 10.5303L10.5304 9.46967L7.06072 6L10.5304 2.53033L9.46973 1.46967L6.00006 4.93934L2.53039 1.46967L1.46973 2.53033L4.9394 6L1.46973 9.46967L2.53039 10.5303L6.00006 7.06066Z" Fill="#CED0D4"/>
+                </Button>
+                <ProgressBar Minimum="0" Maximum="{Binding PageNumber}" Value="{Binding PageIndex}" Height="4" Width="194"
+                         BorderThickness="0" 
+                            Margin="0,0,0,4" VerticalAlignment="Bottom" 
+                            Foreground="{StaticResource color.slider.track-filled.norm}"/>
+
+
+            </Grid>
+        </Border>
     </Grid>
 </UserControl>

PDF Office/Views/Dialog/ConverterDialogs/ConverterRTFDialog.xaml

@@ -8,11 +8,11 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:pageeditdialogs="clr-namespace:PDF_Office.ViewModels.Dialog.PageEditDialogs"
              xmlns:prism="http://prismlibrary.com/"           
-             Width="480"
-             Height="416"
+             Width="468"
+    Height="454"
              d:DataContext="{d:DesignInstance Type=pageeditdialogs:ExtractDialogViewModel}"
-             d:DesignHeight="416"
-             d:DesignWidth="480"
+             d:DesignHeight="454"
+             d:DesignWidth="468"
              prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d">
@@ -60,7 +60,7 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}">
+                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
@@ -71,14 +71,14 @@
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
                     Content="取消" 
-                    Command="{Binding CancelCommand}"/>
+                    Command="{Binding CancelCommand}" Style="{StaticResource btn.sec}"/>
                 <Button
                     Width="98"
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
                     Content="转换" 
-                    Command = "{Binding ConverterCommnad}"/>
+                    Command = "{Binding ConverterCommnad}" Style="{StaticResource Btn.cta}"/>
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

PDF Office/Views/Dialog/ConverterDialogs/ConverterTextDialog.xaml

@@ -8,11 +8,11 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:pageeditdialogs="clr-namespace:PDF_Office.ViewModels.Dialog.PageEditDialogs"
              xmlns:prism="http://prismlibrary.com/"           
-             Width="480"
-             Height="416"
+             Width="468"
+    Height="454"
              d:DataContext="{d:DesignInstance Type=pageeditdialogs:ExtractDialogViewModel}"
-             d:DesignHeight="416"
-             d:DesignWidth="480"
+             d:DesignHeight="454"
+             d:DesignWidth="468"
              prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d">
@@ -60,7 +60,7 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}">
+                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
@@ -71,14 +71,14 @@
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
                     Content="取消" 
-                    Command="{Binding CancelCommand}"/>
+                    Command="{Binding CancelCommand}" Style="{StaticResource btn.sec}"/>
                 <Button
                     Width="98"
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
                     Content="转换" 
-                    Command = "{Binding ConverterCommnad}"/>
+                    Command = "{Binding ConverterCommnad}" Style="{StaticResource Btn.cta}"/>
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

PDF Office/Views/Dialog/ConverterDialogs/ConverterWordDialog.xaml

@@ -8,11 +8,11 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:pageeditdialogs="clr-namespace:PDF_Office.ViewModels.Dialog.PageEditDialogs"
              xmlns:prism="http://prismlibrary.com/"           
-             Width="480"
-             Height="416"
+             Width="468"
+             Height="454"
              d:DataContext="{d:DesignInstance Type=pageeditdialogs:ExtractDialogViewModel}"
-             d:DesignHeight="416"
-             d:DesignWidth="480"
+             d:DesignHeight="454"
+             d:DesignWidth="468"
              prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d">
@@ -73,7 +73,7 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}">
+                <Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>
@@ -84,14 +84,14 @@
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
                     Content="取消" 
-                    Command="{Binding CancelCommand}"/>
+                    Command="{Binding CancelCommand}" Style="{StaticResource btn.sec}"/>
                 <Button
                     Width="98"
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
                     Content="转换" 
-                    Command = "{Binding ConverterCommnad}"/>
+                    Command = "{Binding ConverterCommnad}" Style="{StaticResource Btn.cta}"/>
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

PDF Office/Views/Dialog/ToolsDialogs/CompressDialogs/CompressDialog.xaml

@@ -12,20 +12,20 @@
              mc:Ignorable="d">
     <cus:DialogContent Header="Compress">
         <cus:DialogContent.Content>
-            <Grid Grid.Row="1" Width="436">
+            <Grid Grid.Row="1" Width="436" Height="112">
                 <StackPanel>
-                    <RadioButton   Margin="0,10,0,8"  Command="{Binding LargeQualityCommand}" >
-                        <TextBlock Text="Large Fill Size"></TextBlock>
+                    <RadioButton   Margin="0,0,0,16"  Command="{Binding LargeQualityCommand}">
+                        <TextBlock Text="Large Fill Size" ></TextBlock>
                     </RadioButton>
 
-                    <RadioButton  Margin="0,0,0,8"  Command="{Binding StandardQualityCommand}">
-                        <TextBlock Text="Standard File Size"></TextBlock>
+                    <RadioButton  Margin="0,0,0,16"  Command="{Binding StandardQualityCommand}">
+                        <TextBlock Text="Standard File Size" ></TextBlock>
                     </RadioButton>
-                    <RadioButton  Margin="0,0,0,8"  Command="{Binding LittleQualityCommand}" IsChecked="True">
-                        <TextBlock Text="Small File Size"></TextBlock>
+                    <RadioButton  Margin="0,0,0,16"  Command="{Binding LittleQualityCommand}"  IsChecked="True" >
+                        <TextBlock Text="Small File Size" ></TextBlock>
                     </RadioButton>
-                    <RadioButton  Margin="0,0,0,0"  Command="{Binding MicroQualityCommand}">
-                        <TextBlock Text="Minimum File Size"></TextBlock>
+                    <RadioButton  Margin="0,0,0,0"  Command="{Binding MicroQualityCommand}" >
+                        <TextBlock Text="Minimum File Size" ></TextBlock>
                     </RadioButton>
                 </StackPanel>
             </Grid>
@@ -33,22 +33,16 @@
         <cus:DialogContent.BottmBar>
         <Grid Grid.Row="2" Width="468"  VerticalAlignment="Center">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                <Button Background="WhiteSmoke" Width="100" Height="25" Margin="10,0,0,0" Command="{Binding BatchCompressCommand}">
-                    <Border>
-                        <TextBlock Text="批量处理" ></TextBlock>
-                    </Border>
+                    <Button Width="80" Height="32" Margin="16,0,0,0" Command="{Binding BatchCompressCommand}"  Style="{StaticResource btn.sec}" Content="Batch">
+                   
                 </Button>
             </StackPanel>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                <Button Background="WhiteSmoke" Width="100" Height="25" Margin="0,0,10,0" Command="{Binding CompressCommand}">
-                    <Border>
-                        <TextBlock Text="压缩"></TextBlock>
-                    </Border>
+                    <Button  Width="80" Height="32" Margin="0,0,16,0" Command="{Binding CompressCommand}" Style="{StaticResource Btn.cta}" Content="Compress" >
+                   
                 </Button>
-                <Button Background="WhiteSmoke" Width="100" Height="25" Margin="0,0,10,0" Command="{Binding ConfirmCompressCommand}">
-                    <Border>
-                        <TextBlock Text="取消" ></TextBlock>
-                    </Border>
+                    <Button  Width="80" Height="32" Margin="0,0,16,0" Command="{Binding ConfirmCompressCommand}"  Style="{StaticResource btn.sec}" Content="取消">
+                   
                 </Button>
             </StackPanel>
         </Grid>

PDF Office/Views/Dialog/ToolsDialogs/CompressDialogs/CompressProgressBarDialog.xaml

@@ -5,21 +5,52 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:prism="http://prismlibrary.com/"             
              prism:ViewModelLocator.AutoWireViewModel="True"
-             d:DesignHeight="40"
-             d:DesignWidth="220"
-             mc:Ignorable="d">
-    <Grid Height="40" Width="220">
-        <StackPanel>
-            <StackPanel Orientation="Horizontal" Margin="13,5,0,10">
-                <TextBlock Text="Compress  "></TextBlock>
-                <TextBlock Text="("></TextBlock>
-                <TextBlock Text="{Binding PageIndex}"></TextBlock>
-                <TextBlock Text="/"></TextBlock>
-                <TextBlock Text="{Binding PageNumber}"></TextBlock>
-                <TextBlock Text=")"></TextBlock>
+             prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
+             d:DesignHeight="58"
+             d:DesignWidth="226"
+                Height="58"
+             Width="226"
+             mc:Ignorable="d"
+             >
+
+    <Grid Height="58" Width="226">
+        <Border
+                    Width="226"
+                    Height="58"
+                    Background="{StaticResource color.sys.layout.dark.bg}"
+                    BorderThickness="0"
+                    CornerRadius="{StaticResource border-radius.8}"
+                    Effect="{StaticResource shadow.neutral.m}">
+    <Grid Margin="16,13" Background="Transparent">
+
+        <StackPanel Orientation="Horizontal">
+            <TextBlock Foreground="{StaticResource color.sys.text.anti.norm}" Text="Compress  "></TextBlock>
+            <TextBlock Text="("></TextBlock>
+            <TextBlock Text="{Binding PageIndex}"></TextBlock>
+            <TextBlock Text="/"></TextBlock>
+            <TextBlock Text="{Binding PageNumber}"></TextBlock>
+            <TextBlock Text=")"></TextBlock>
 
-            </StackPanel>
-            <ProgressBar Minimum="0" Maximum="{Binding PageNumber}" Value="{Binding PageIndex}"  Height="4" Width="194"/>
         </StackPanel>
+                <Button
+                            Width="12"
+                            Height="12"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            BorderThickness="0"
+                    Background="{StaticResource color.sys.layout.dark.bg}"
+                    Padding="0,0,1,1"
+                            Command="{Binding CloseCompressCommand}"
+                     >
+
+                    <Path Data="M6.00006 7.06066L9.46973 10.5303L10.5304 9.46967L7.06072 6L10.5304 2.53033L9.46973 1.46967L6.00006 4.93934L2.53039 1.46967L1.46973 2.53033L4.9394 6L1.46973 9.46967L2.53039 10.5303L6.00006 7.06066Z" Fill="#CED0D4"/>
+                </Button>
+                <ProgressBar Minimum="0" Maximum="{Binding PageNumber}" Value="{Binding PageIndex}"  Height="4" Width="194"
+                         BorderThickness="0" 
+                            Margin="0,0,0,4" VerticalAlignment="Bottom"
+                            Foreground="{StaticResource color.slider.track-filled.norm}"/>
+
+    </Grid>
+    </Border>
     </Grid>
 </UserControl>

PDF Office/Views/Dialog/ToolsDialogs/CompressDialogs/CompressProgressBarDialog.xaml.cs

@@ -10,6 +10,8 @@ namespace PDF_Office.Views.Dialog.ToolsDialogs.CompressDialogs
         public CompressProgressBarDialog()
         {
             InitializeComponent();
-        }
+        }
+
+       
     }
 }