- Bug修复：轻会员-18829，18997;轻会员流程调整

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -423,8 +423,8 @@
           <target state="new">On Subscription</target>
         </trans-unit>
         <trans-unit id="TextSubscribetimeExpired" translate="yes" xml:space="preserve">
-          <source>Trial expires</source>
-          <target state="new">Trial expires</target>
+          <source>Subscription Expired</source>
+          <target state="new">Subscription Expired</target>
         </trans-unit>
         <trans-unit id="TextSubscribetimetextOnTrial" translate="yes" xml:space="preserve">
           <source>Next subscription</source>
@@ -638,6 +638,10 @@
           <source>PDF Master!</source>
           <target state="new">PDF Master!</target>
         </trans-unit>
+        <trans-unit id="BtnTextConvert" translate="yes" xml:space="preserve">
+          <source>Convert the First 10 Pages</source>
+          <target state="new">Convert the First 10 Pages</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/MultilingualResources/PDF Office.zh-Hans.xlf

@@ -423,8 +423,8 @@
           <target state="new">On Subscription</target>
         </trans-unit>
         <trans-unit id="TextSubscribetimeExpired" translate="yes" xml:space="preserve">
-          <source>Trial expires</source>
-          <target state="new">Trial expires</target>
+          <source>Subscription Expired</source>
+          <target state="new">Subscription Expired</target>
         </trans-unit>
         <trans-unit id="TextSubscribetimetextOnTrial" translate="yes" xml:space="preserve">
           <source>Next subscription</source>
@@ -638,6 +638,10 @@
           <source>PDF Master!</source>
           <target state="new">PDF Master!</target>
         </trans-unit>
+        <trans-unit id="BtnTextConvert" translate="yes" xml:space="preserve">
+          <source>Convert the First 10 Pages</source>
+          <target state="new">Convert the First 10 Pages</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/MultilingualResources/PDF Office.zh-Hant.xlf

@@ -423,8 +423,8 @@
           <target state="new">On Subscription</target>
         </trans-unit>
         <trans-unit id="TextSubscribetimeExpired" translate="yes" xml:space="preserve">
-          <source>Trial expires</source>
-          <target state="new">Trial expires</target>
+          <source>Subscription Expired</source>
+          <target state="new">Subscription Expired</target>
         </trans-unit>
         <trans-unit id="TextSubscribetimetextOnTrial" translate="yes" xml:space="preserve">
           <source>Next subscription</source>
@@ -638,6 +638,10 @@
           <source>PDF Master!</source>
           <target state="new">PDF Master!</target>
         </trans-unit>
+        <trans-unit id="BtnTextConvert" translate="yes" xml:space="preserve">
+          <source>Convert the First 10 Pages</source>
+          <target state="new">Convert the First 10 Pages</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/Strings/Service/Service.Designer.cs

@@ -69,6 +69,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Convert the First 10 Pages 的本地化字符串。
+        /// </summary>
+        public static string BtnTextConvert {
+            get {
+                return ResourceManager.GetString("BtnTextConvert", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Save with Watermark 的本地化字符串。
         /// </summary>
@@ -1357,7 +1366,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Trial expires 的本地化字符串。
+        ///   查找类似 Subscription Expired 的本地化字符串。
         /// </summary>
         public static string TextSubscribetimeExpired {
             get {

PDF Office/Strings/Service/Service.resx

@@ -120,6 +120,9 @@
   <data name="BtnTextContinue" xml:space="preserve">
     <value>Save and Continue</value>
   </data>
+  <data name="BtnTextConvert" xml:space="preserve">
+    <value>Convert the First 10 Pages</value>
+  </data>
   <data name="BtnTextSavewithWatermark" xml:space="preserve">
     <value>Save with Watermark</value>
   </data>
@@ -361,7 +364,7 @@
     <value>Subscribe Successfully!</value>
   </data>
   <data name="TextSubscribetimeExpired" xml:space="preserve">
-    <value>Trial expires</value>
+    <value>Subscription Expired</value>
   </data>
   <data name="TextSubscribetimetextOnTrial" xml:space="preserve">
     <value>Next subscription</value>

PDF Office/ViewModels/Dialog/ChatGPTAIDialogs/DocumentaryTranslationDialogViewModel.cs

@@ -271,30 +271,32 @@ namespace PDF_Master.ViewModels.Dialog.ChatGPTAIDialogs
             {
                 return;
             }
-            bool flg = false;
+            #region 权益弹窗暂时关闭
+            //bool flg = false;
             //权益弹窗
-            if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
-            {
-                DialogParameters value = new DialogParameters();
-                value.Add(ParameterNames.Open, "AI");
-                dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
-                {
-                    if (dialogResult.Result == ButtonResult.OK)
-                    {
-                        flg = true;
-                    }
-                    else
-                    {
-                        flg = false;
-                    }
-
-
-                });
-                if (flg == false)
-                {
-                    return ;
-                }
-            }
+            //if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
+            //{
+            //    DialogParameters value = new DialogParameters();
+            //    value.Add(ParameterNames.Open, "AI");
+            //    dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
+            //    {
+            //        if (dialogResult.Result == ButtonResult.OK)
+            //        {
+            //            flg = true;
+            //        }
+            //        else
+            //        {
+            //            flg = false;
+            //        }
+
+
+            //    });
+            //    if (flg == false)
+            //    {
+            //        return ;
+            //    }
+            //} 
+            #endregion
             ProgressVisible = Visibility.Visible;
             Value = 1;
             string newfile = "";

PDF Office/ViewModels/Dialog/ChatGPTAIDialogs/SelectedTranslationDialogViewModel.cs

@@ -337,35 +337,37 @@ namespace PDF_Master.ViewModels.Dialog.ChatGPTAIDialogs
         public async void translate()
         {
 
-            bool flg = false;
             //添加付费拦截锁
             if (!ServiceHelper.IAPBeforeFunction())
             {
                 return;
             }
-            //权益弹窗
-            if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
-            {
-                DialogParameters value = new DialogParameters();
-                value.Add(ParameterNames.Open, "AI");
-                dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
-                {
-                    if (dialogResult.Result == ButtonResult.OK)
-                    {
-                        flg = true;
-                    }
-                    else
-                    {
-                        flg = false;
-                    }
-
-
-                });
-                if (flg == false)
-                {
-                    return;
-                }
-            }
+            #region 权益弹窗暂时关闭
+            //bool flg = false;
+            ////权益弹窗
+            //if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
+            //{
+            //    DialogParameters value = new DialogParameters();
+            //    value.Add(ParameterNames.Open, "AI");
+            //    dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
+            //    {
+            //        if (dialogResult.Result == ButtonResult.OK)
+            //        {
+            //            flg = true;
+            //        }
+            //        else
+            //        {
+            //            flg = false;
+            //        }
+
+
+            //    });
+            //    if (flg == false)
+            //    {
+            //        return;
+            //    }
+            //} 
+            #endregion
             ErrorVisible = Visibility.Collapsed;
             ProgressVisible = Visibility.Visible;
             Value = 1;

PDF Office/ViewModels/Dialog/ServiceDialog/SubscriptionDialogViewModel.cs

@@ -49,7 +49,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
         }
 
-        private double _RightBtnWidth = 192;
+        private double _RightBtnWidth = 394;
 
         public double RightBtnWidth
         {
@@ -275,11 +275,12 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             parameters.TryGetValue<ViewContentViewModel>(ParameterNames.ViewContentViewModel, out viewContentViewModel);
             parameters.TryGetValue<String>(ParameterNames.Open, out open);
-            if (open == "AI")
-            {
-                LeftBtnVis = Visibility.Collapsed;
-                RightBtnWidth = 280;
-            }
+            //AI目前策略不会弹出权益弹窗
+            //if (open == "AI")
+            //{
+            //    LeftBtnVis = Visibility.Collapsed;
+            //    RightBtnWidth = 280;
+            //}
             if (open == "Auto")
             {
                 BtnTextSavewithWatermark = App.ServiceLoader.GetString("BtnTextContinue");

PDF Office/ViewModels/Dialog/ToolsDialogs/MergeDialogViewModel.cs

@@ -89,6 +89,10 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
                     }
                 }
                 currentLoadedPassword = pdfViewer.Document.Password;
+                if (Settings.Default.UserDate.subscribestatus != 1)
+                {
+                    LimitationsConvertVisible = Visibility.Visible;
+                }
             }
 
             if (pdfViewer != null && pdfViewer.Document != null)
@@ -117,7 +121,8 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
         public DelegateCommand<object> PreviewCancelDownCommand { get; set; }
         public DelegateCommand MergeCommand { get; set; }
         public DelegateCommand<object> AddFilesCommand { get; set; }
-        public DelegateCommand ClearCommand { get; set; }
+        public DelegateCommand ClearCommand { get; set; }
+        public DelegateCommand UnlockMouseDownCommand { get; set; }
         public DelegateCommand<object> SetPageSizeTypeCommand { get; set; }
 
         public DelegateCommand CancelAddFileCommand { get; set; }
@@ -188,8 +193,28 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
                 SetProperty(ref currentvalue, value);
             }
         }
+       /// <summary>
+       /// 订阅按钮
+       /// </summary>
+        private string _TextUpgrade;
+        public string TextUpgrade
+        {
+            get { return _TextUpgrade; }
+            set { _TextUpgrade = value; }
+        }
+        /// <summary>
+        /// 是否显示限制字段
+        /// </summary>
+        private Visibility limitationsConvertVisible = Visibility.Hidden;
 
-
+        public Visibility LimitationsConvertVisible
+        {
+            get { return limitationsConvertVisible; }
+            set
+            {
+                SetProperty(ref limitationsConvertVisible, value);
+            }
+        }
 
         /// <summary>
         /// 是否取消添加文件
@@ -199,7 +224,8 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
 
 
         public MergeDialogViewModel(IDialogService dialogService, IEventAggregator eventAggregator)
-        {
+        {
+            IntString();
             this.eventAggregator = eventAggregator;
             dialogs = dialogService;
             MergeObjectlist = new ObservableCollection<MergeObject>();
@@ -209,13 +235,25 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
             MergeCommand = new DelegateCommand(Merge);
             ClearCommand = new DelegateCommand(Clear);
             SetPageSizeTypeCommand = new DelegateCommand<object>(SetPageSizeType);
-            CancelAddFileCommand = new DelegateCommand(CancelAddFileOpention);
+            CancelAddFileCommand = new DelegateCommand(CancelAddFileOpention);
+            UnlockMouseDownCommand = new DelegateCommand(UnlockMouseDown);
+        }
+        /// <summary>
+        /// 多语
+        /// </summary>
+        private void IntString()
+        {
+            TextUpgrade = App.ServiceLoader.GetString("TextUpgrade");
         }
-
 
         #endregion
 
         #region 私有方法
+
+        private void UnlockMouseDown()
+        {
+            ConverterHelper.convertUnlock();
+        }
         private void CancelAddFileOpention()
         {
             CancelAddFiles = true;
@@ -331,8 +369,12 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
 
             bool result = true;
             CPDFDocument SaveDoc = CPDFDocument.CreateDocument();
-
-            for (int i = 0; i < MergeObjectlist.Count; i++)
+            int sum = MergeObjectlist.Count;
+            if (Settings.Default.UserDate.subscribestatus != 1)
+            {
+                sum = 2;
+            }
+            for (int i = 0; i < sum; i++)
             {
                 List<int> listnum = new List<int>();
                 if (MergeObjectlist[i].SetPageRange == null || MergeObjectlist[i].SetPageRange.Count == 0)
@@ -352,7 +394,7 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
                 }
             }
 
-            for (int i = 0; i < MergeObjectlist.Count; i++)
+            for (int i = 0; i < sum; i++)
             {
                 if (MergeObjectlist[i].SetPageRange == null)
                 {

PDF Office/ViewModels/HomePanel/ChatGPTAI/ChatGPTAIErrorCorrectionContentViewModel.cs

@@ -265,35 +265,38 @@ namespace PDF_Master.ViewModels.HomePanel.ChatGPTAI
         {
             DataTrackingHelper.SetSendInformation(DataTrackingHelper.EventType.Purchase_AI, DataTrackingHelper.EntryPathKeyType.Home_Tools);
             DataTrackingHelper.AddFirstAndSecondaryPath(DataTrackingHelper.FirstPath.Home, DataTrackingHelper.SecondaryPath.AICorrect);
-            bool flg = false;
+            
             //添加付费拦截锁
             if (!ServiceHelper.IAPBeforeFunction())
             {
                 return;
             }
-            //权益弹窗
-            if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
-            {
-                DialogParameters value = new DialogParameters();
-                value.Add(ParameterNames.Open, "AI");
-                dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
-                {
-                    if (dialogResult.Result == ButtonResult.OK)
-                    {
-                        flg = true;
-                    }
-                    else
-                    {
-                        flg = false;
-                    }
-
-
-                });
-                if (flg == false)
-                {
-                    return;
-                }
-            }
+            #region 暂时关闭权益弹窗
+            //bool flg = false;
+            ////权益弹窗
+            //if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
+            //{
+            //    DialogParameters value = new DialogParameters();
+            //    value.Add(ParameterNames.Open, "AI");
+            //    dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
+            //    {
+            //        if (dialogResult.Result == ButtonResult.OK)
+            //        {
+            //            flg = true;
+            //        }
+            //        else
+            //        {
+            //            flg = false;
+            //        }
+
+
+            //    });
+            //    if (flg == false)
+            //    {
+            //        return;
+            //    }
+            //} 
+            #endregion
             ErrorVisible = Visibility.Collapsed;
             await Task.Run(async delegate
             {

PDF Office/ViewModels/HomePanel/ChatGPTAI/ChatGPTAIRewritingContentViewModel.cs

@@ -268,35 +268,38 @@ namespace PDF_Master.ViewModels.HomePanel.ChatGPTAI
         {
             DataTrackingHelper.SetSendInformation(DataTrackingHelper.EventType.Purchase_AI, DataTrackingHelper.EntryPathKeyType.Home_Tools);
             DataTrackingHelper.AddFirstAndSecondaryPath(DataTrackingHelper.FirstPath.Home, DataTrackingHelper.SecondaryPath.AIRewrite);
-            bool flg = false;
+            
             //添加付费拦截锁
             if (!ServiceHelper.IAPBeforeFunction())
             {
                 return;
             }
-            //权益弹窗
-            if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
-            {
-                DialogParameters value = new DialogParameters();
-                value.Add(ParameterNames.Open, "AI");
-                dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
-                {
-                    if (dialogResult.Result == ButtonResult.OK)
-                    {
-                        flg = true;
-                    }
-                    else
-                    {
-                        flg = false;
-                    }
-
-
-                });
-                if (flg == false)
-                {
-                    return;
-                }
-            }
+            #region 暂时关闭权益弹窗
+            //bool flg = false;
+            ////权益弹窗
+            //if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
+            //{
+            //    DialogParameters value = new DialogParameters();
+            //    value.Add(ParameterNames.Open, "AI");
+            //    dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
+            //    {
+            //        if (dialogResult.Result == ButtonResult.OK)
+            //        {
+            //            flg = true;
+            //        }
+            //        else
+            //        {
+            //            flg = false;
+            //        }
+
+
+            //    });
+            //    if (flg == false)
+            //    {
+            //        return;
+            //    }
+            //} 
+            #endregion
             ErrorVisible = Visibility.Collapsed;
             await Task.Run(async delegate
             {

PDF Office/ViewModels/HomePanel/ChatGPTAI/ChatGPTAITranslationContentViewModel.cs

@@ -241,35 +241,38 @@ namespace PDF_Master.ViewModels.HomePanel.ChatGPTAI
         {
             DataTrackingHelper.SetSendInformation(DataTrackingHelper.EventType.Purchase_AI, DataTrackingHelper.EntryPathKeyType.Home_Tools);
             DataTrackingHelper.AddFirstAndSecondaryPath(DataTrackingHelper.FirstPath.Home, DataTrackingHelper.SecondaryPath.AITranslate);
-            bool flg = false;
+            
             //添加付费拦截锁
             if (!ServiceHelper.IAPBeforeFunction())
             {
                 return;
             }
-            //权益弹窗
-            if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
-            {
-                DialogParameters value = new DialogParameters();
-                value.Add(ParameterNames.Open, "AI");
-                dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
-                {
-                    if (dialogResult.Result == ButtonResult.OK)
-                    {
-                        flg = true;
-                    }
-                    else
-                    {
-                        flg = false;
-                    }
-
-
-                });
-                if (flg == false)
-                {
-                    return;
-                }
-            }
+            #region 暂时关闭权益弹窗
+            //bool flg = false;
+            ////权益弹窗
+            //if (!App.IsLogin || Settings.Default.UserDate.subscribestatus != 1)
+            //{
+            //    DialogParameters value = new DialogParameters();
+            //    value.Add(ParameterNames.Open, "AI");
+            //    dialogs.ShowDialog(DialogNames.SubscriptionDialog, value, dialogResult =>
+            //    {
+            //        if (dialogResult.Result == ButtonResult.OK)
+            //        {
+            //            flg = true;
+            //        }
+            //        else
+            //        {
+            //            flg = false;
+            //        }
+
+
+            //    });
+            //    if (flg == false)
+            //    {
+            //        return;
+            //    }
+            //} 
+            #endregion
             string word = Properties.Resources.wordex;
             string pdf = Properties.Resources.pdf;
             string allfiles = pdf + word;

PDF Office/ViewModels/PageEdit/PageEditContentViewModel.cs

@@ -1869,6 +1869,12 @@ namespace PDF_Master.ViewModels.PageEdit
         /// </summary>
         public async void print(List<int> SelectedPages)
         {
+
+            //保存并继续，使用了高级功能则弹窗权益弹窗
+            if (!viewContentViewModel.saveFile(true))
+            {
+                return;
+            }
             await App.Current.Dispatcher.InvokeAsync(() =>
                   {
                       PDFViewer.GoToPage(listSelecedIndex);

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -1721,7 +1721,7 @@ namespace PDF_Master.ViewModels
             {
                 DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.Tbr, "Tbr_Btn", "Btn_Tbr_Share");
                 //分享前自动保存
-                if (!await SaveBeforeOption())
+                if (!await SaveBeforeOption(true))
                 {
                     IsPopupInProgress = false;
                     return;
@@ -3323,12 +3323,15 @@ namespace PDF_Master.ViewModels
         /// <summary>
         /// 转档、压缩、合并、分享前自动保存
         /// </summary>
-        public async Task<bool> SaveBeforeOption()
+        public async Task<bool> SaveBeforeOption(bool IsnohaveIAP=false)
         {
-            //添加付费拦截锁
-            if (!ServiceHelper.IAPBeforeFunction())
-            {
-                return false;
+            if(IsnohaveIAP==false)
+            {            //添加付费拦截锁
+                if (!ServiceHelper.IAPBeforeFunction())
+                {
+                    return false;
+                }
+
             }
             bool result = true;
             //因配合权益弹窗弹出，暂时移除可保存条件判断

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

@@ -20,38 +20,40 @@
     mc:Ignorable="d">
     <cus:DialogContent Header="{Binding T_Title}">
         <cus:DialogContent.Content>
-            <Grid Grid.Row="1" >
+            <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="244"/>
+                    <ColumnDefinition Width="244" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
-                <Grid Grid.Column="0" VerticalAlignment="Top" Margin="0,0,0,0">
+                <Grid
+                    Grid.Column="0"
+                    Margin="0,0,0,0"
+                    VerticalAlignment="Top">
                     <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
                     <StackPanel Margin="0,2,0,0">
                         <TextBlock
-                                Height="20"
-                                Style="{StaticResource PropertyHeaderLv2}"
-                                HorizontalAlignment="Left"
-                                Text="{Binding T_Settings}" />
+                            Height="20"
+                            HorizontalAlignment="Left"
+                            Style="{StaticResource PropertyHeaderLv2}"
+                            Text="{Binding T_Settings}" />
                         <StackPanel Margin="0,10,0,0">
                             <RadioButton
-                                IsChecked="True"
                                 Name="ForEachPageRadioBtn"
                                 Padding="8,0,0,0"
-                                Style="{StaticResource RadioButtonStyleText}"
                                 Command="{Binding RadioButtonCommand}"
-                                CommandParameter="{Binding ElementName=ForEachPageRadioBtn, Path=Name}">
+                                CommandParameter="{Binding ElementName=ForEachPageRadioBtn, Path=Name}"
+                                IsChecked="True"
+                                Style="{StaticResource RadioButtonStyleText}">
                                 <TextBlock Text="{Binding T_EachForm}" />
                             </RadioButton>
                             <RadioButton
-                                
                                 Name="OnlyTableRadioBtn"
                                 Margin="0,8,0,0"
-                                Style="{StaticResource RadioButtonStyleText}"
                                 Command="{Binding RadioButtonCommand}"
-                                CommandParameter="{Binding ElementName=OnlyTableRadioBtn, Path=Name}">
+                                CommandParameter="{Binding ElementName=OnlyTableRadioBtn, Path=Name}"
+                                Style="{StaticResource RadioButtonStyleText}">
                                 <TextBlock Text="{Binding T_ADocument}" />
                             </RadioButton>
                         </StackPanel>
@@ -68,8 +70,8 @@
                                 Margin="0,10,0,0"
                                 HorizontalAlignment="Left"
                                 IsCurrentPage="True"
-                                MaxPageRange="{Binding MaxPageRange}"
                                 Loaded="PageRangeComboBox_Loaded"
+                                MaxPageRange="{Binding MaxPageRange}"
                                 SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}"
                                 Text="{Binding PageRangeText, Mode=TwoWay}">
                                 <i:Interaction.Triggers>
@@ -79,37 +81,52 @@
                                     <i:EventTrigger EventName="TextChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                     </i:EventTrigger>
-                                    <i:KeyTrigger FiredOn="KeyDown" Key="Return">
-                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                    <i:KeyTrigger Key="Return" FiredOn="KeyDown">
+                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" />
                                     </i:KeyTrigger>
                                 </i:Interaction.Triggers>
                             </cus:WritableComboBox>
                         </StackPanel>
                     </StackPanel>
                 </Grid>
-                <StackPanel Orientation="Horizontal" Width="245" Panel.ZIndex="2" Grid.ColumnSpan="2" Height="20" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,8" Visibility="{Binding LimitationsConvertVisible}">
-                    <Grid Width="16" Height="16" >
-                        <Ellipse Width="13" Height="13"  Fill="white" Stroke="#CED0D4"/>
-                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C"/>
+                <StackPanel
+                    Grid.ColumnSpan="2"
+                    Height="20"
+                    Margin="0,0,16,8"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"
+                    Panel.ZIndex="2"
+                    Orientation="Horizontal"
+                    Visibility="{Binding LimitationsConvertVisible}">
+                    <Grid Width="16" Height="16">
+                        <Ellipse
+                            Width="13"
+                            Height="13"
+                            Fill="white"
+                            Stroke="#CED0D4" />
+                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C" />
                     </Grid>
-                    <TextBlock
-                             Margin="4,0,0,0"
-                    FontFamily="Segoe UI"
-                    FontSize="12"
-                    Foreground="#94989C"
-                    Text="First 10 pages for free conversion."
+                    <TextBlock
+                        Height="20"
+                        Margin="4,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="#252629"
+                        Text="First 10 pages for free conversion." />
+                    <TextBlock
+                        Margin="8,0,0,0"
                         Height="20"
-                        />
-                    <TextBlock  FontFamily="Segoe UI"
-                    FontSize="12"  Height="20"  Foreground="{StaticResource color.light.blue.5}">
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="{StaticResource color.light.blue.5}">
                         <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="MouseDown">
-                                        <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
-                                        </i:EventTrigger>
+                            <i:EventTrigger EventName="MouseDown">
+                                <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
+                            </i:EventTrigger>
                         </i:Interaction.Triggers>
-                        <Underline >
-                           <TextBlock Text="{Binding TextUpgrade}"/>
-                        </Underline>
+                        <Underline>
+                            <TextBlock Text="{Binding TextUpgrade}" />
+                        </Underline>
                     </TextBlock>
                 </StackPanel>
             </Grid>
@@ -127,7 +144,7 @@
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
                     Command="{Binding CancelCommand}"
-                    Content="{Binding T_No}" 
+                    Content="{Binding T_No}"
                     Style="{StaticResource btn.sec}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="PreviewMouseDown">
@@ -141,8 +158,8 @@
                     Margin="124,0"
                     HorizontalAlignment="Right"
                     Command="{Binding ConverterCommnad}"
-                    Content="{Binding T_YES}" 
-                     Style="{StaticResource Btn.cta}"/>
+                    Content="{Binding T_YES}"
+                    Style="{StaticResource Btn.cta}" />
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

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

@@ -1,76 +1,141 @@
-<UserControl x:Class="PDF_Master.Views.Dialog.ConverterDialogs.ConverterExcelDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:cus="clr-namespace:PDF_Master.CustomControl"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-             xmlns:local="clr-namespace:PDF_Master.Views.Dialog.PageEditDialogs"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
-             xmlns:prism="http://prismlibrary.com/"           
-             Width="586"
-             Height="522"
-             d:DataContext="{d:DesignInstance Type=pageeditdialogs:ExtractDialogViewModel}"
-             d:DesignHeight="522"
-             d:DesignWidth="586"
-             prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
-             prism:ViewModelLocator.AutoWireViewModel="True"
-             mc:Ignorable="d">
+<UserControl
+    x:Class="PDF_Master.Views.Dialog.ConverterDialogs.ConverterExcelDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cus="clr-namespace:PDF_Master.CustomControl"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+    xmlns:local="clr-namespace:PDF_Master.Views.Dialog.PageEditDialogs"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
+    xmlns:prism="http://prismlibrary.com/"
+    Width="586"
+    Height="522"
+    d:DataContext="{d:DesignInstance Type=pageeditdialogs:ExtractDialogViewModel}"
+    d:DesignHeight="522"
+    d:DesignWidth="586"
+    prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
+    prism:ViewModelLocator.AutoWireViewModel="True"
+    mc:Ignorable="d">
     <cus:DialogContent Header="{Binding T_Title}">
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="244"/>
-                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="244" />
+                    <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0">
-                    <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" VerticalAlignment="Top"></cus:PageTurningPreview>
+                    <cus:PageTurningPreview
+                        x:Name="ConverterPreview"
+                        VerticalAlignment="Top"
+                        Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical" Margin="0,2,0,0">
+                    <StackPanel Margin="0,2,0,0" Orientation="Vertical">
                         <StackPanel Orientation="Vertical">
-                            <TextBlock Text="{Binding T_Settings}" Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
-                            <StackPanel Orientation="Vertical" Margin="0,10,0,0">
-                                <RadioButton Name="AnyContentRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=AnyContentRadioBtn,Path=Name}" IsChecked="True"
-                                Style="{StaticResource RadioButtonStyleText}">
-                                    <TextBlock Text="{Binding T_AllContents}"/>
+                            <TextBlock
+                                Height="20"
+                                Style="{StaticResource PropertyHeaderLv2}"
+                                Text="{Binding T_Settings}" />
+                            <StackPanel Margin="0,10,0,0" Orientation="Vertical">
+                                <RadioButton
+                                    Name="AnyContentRadioBtn"
+                                    Command="{Binding RadioButtonCommand}"
+                                    CommandParameter="{Binding ElementName=AnyContentRadioBtn, Path=Name}"
+                                    IsChecked="True"
+                                    Style="{StaticResource RadioButtonStyleText}">
+                                    <TextBlock Text="{Binding T_AllContents}" />
                                 </RadioButton>
-                                <ComboBox Margin="0,8,0,0" Width="326" Height="32" HorizontalAlignment="Left" IsEnabled="{Binding ElementName=AnyContentRadioBtn,Path=IsChecked}"  SelectedIndex="{Binding AnyContentSelectIndex}" >
-                                    <ComboBoxItem Content="{Binding T_EachPageAllContents}"/>
-                                    <ComboBoxItem Content="{Binding T_FileAllContents}"/>
+                                <ComboBox
+                                    Width="326"
+                                    Height="32"
+                                    Margin="0,8,0,0"
+                                    HorizontalAlignment="Left"
+                                    IsEnabled="{Binding ElementName=AnyContentRadioBtn, Path=IsChecked}"
+                                    SelectedIndex="{Binding AnyContentSelectIndex}">
+                                    <ComboBoxItem Content="{Binding T_EachPageAllContents}" />
+                                    <ComboBoxItem Content="{Binding T_FileAllContents}" />
                                 </ComboBox>
-                                <RadioButton Margin="0,8,0,0" Name="OnlyTableRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=OnlyTableRadioBtn,Path=Name}" Padding="8,0,0,0"
-                                Style="{StaticResource RadioButtonStyleText}">
-                                    <TextBlock Text="{Binding T_OnlyTables}"/>
+                                <RadioButton
+                                    Name="OnlyTableRadioBtn"
+                                    Margin="0,8,0,0"
+                                    Padding="8,0,0,0"
+                                    Command="{Binding RadioButtonCommand}"
+                                    CommandParameter="{Binding ElementName=OnlyTableRadioBtn, Path=Name}"
+                                    Style="{StaticResource RadioButtonStyleText}">
+                                    <TextBlock Text="{Binding T_OnlyTables}" />
                                 </RadioButton>
-                                <ComboBox Name="OnlyTableComboBox"  Margin="0,8,0,0" Width="326" Height="32" HorizontalAlignment="Left" IsEnabled="{Binding ElementName=OnlyTableRadioBtn,Path=IsChecked}"  SelectedIndex="{Binding OnlyTableSelectIndex}">
-                                    <ComboBoxItem Content="{Binding T_EachTableOnlyTables}"/>
-                                    <ComboBoxItem Content="{Binding T_EachPageOnlyTables}"/>
-                                    <ComboBoxItem Content="{Binding T_FileOnlyTables}"/>
+                                <ComboBox
+                                    Name="OnlyTableComboBox"
+                                    Width="326"
+                                    Height="32"
+                                    Margin="0,8,0,0"
+                                    HorizontalAlignment="Left"
+                                    IsEnabled="{Binding ElementName=OnlyTableRadioBtn, Path=IsChecked}"
+                                    SelectedIndex="{Binding OnlyTableSelectIndex}">
+                                    <ComboBoxItem Content="{Binding T_EachTableOnlyTables}" />
+                                    <ComboBoxItem Content="{Binding T_EachPageOnlyTables}" />
+                                    <ComboBoxItem Content="{Binding T_FileOnlyTables}" />
                                 </ComboBox>
-                                <RadioButton Margin="0,8,0,0" Name="OnlyTextRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=OnlyTextRadioBtn,Path=Name}" Padding="8,0,0,0"
-                                Style="{StaticResource RadioButtonStyleText}">
-                                    <TextBlock Text="{Binding T_OnlyText}"></TextBlock>
+                                <RadioButton
+                                    Name="OnlyTextRadioBtn"
+                                    Margin="0,8,0,0"
+                                    Padding="8,0,0,0"
+                                    Command="{Binding RadioButtonCommand}"
+                                    CommandParameter="{Binding ElementName=OnlyTextRadioBtn, Path=Name}"
+                                    Style="{StaticResource RadioButtonStyleText}">
+                                    <TextBlock Text="{Binding T_OnlyText}" />
                                 </RadioButton>
                             </StackPanel>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical"  Margin="0,18,0,0">
-                            <StackPanel Orientation="Vertical" Visibility="Visible" IsEnabled="{Binding OCRIsEnable}">
-                                <TextBlock Text="Text Recognition Settings:" HorizontalAlignment="Left"  Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
-                                <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0" >
-                                    <TextBlock Text="Recognize text if needed"/>
+                        <StackPanel Margin="0,18,0,0" Orientation="Vertical">
+                            <StackPanel
+                                IsEnabled="{Binding OCRIsEnable}"
+                                Orientation="Vertical"
+                                Visibility="Visible">
+                                <TextBlock
+                                    Height="20"
+                                    HorizontalAlignment="Left"
+                                    Style="{StaticResource PropertyHeaderLv2}"
+                                    Text="Text Recognition Settings:" />
+                                <CheckBox
+                                    Name="OCRCheckBox"
+                                    Margin="0,10,0,0"
+                                    Padding="8,0,0,0"
+                                    IsChecked="{Binding OCRCheckBoxIsCheckBox}">
+                                    <TextBlock Text="Recognize text if needed" />
                                 </CheckBox>
-                                <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,0" Width="326" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
-                                    <ComboBoxItem Content="Chinese Simplified"/>
-                                    <ComboBoxItem Content="Chinese Traditional"/>
-                                    <ComboBoxItem Content="English"/>
-                                    <ComboBoxItem Content="Japanese"/>
-                                    <ComboBoxItem Content="Korean"/>
+                                <ComboBox
+                                    Width="326"
+                                    Height="32"
+                                    Margin="0,8,0,0"
+                                    HorizontalAlignment="Left"
+                                    IsEnabled="{Binding ElementName=OCRCheckBox, Path=IsChecked}"
+                                    SelectedIndex="{Binding LanguageSelectedIndex}">
+                                    <ComboBoxItem Content="Chinese Simplified" />
+                                    <ComboBoxItem Content="Chinese Traditional" />
+                                    <ComboBoxItem Content="English" />
+                                    <ComboBoxItem Content="Japanese" />
+                                    <ComboBoxItem Content="Korean" />
                                 </ComboBox>
                             </StackPanel>
-                            <StackPanel Orientation="Vertical" Margin="0,18,0,0">
-                                <TextBlock Text="{Binding T_PageRange}" Height="20"  HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}"/>
-                                <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="326" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
+                            <StackPanel Margin="0,18,0,0" Orientation="Vertical">
+                                <TextBlock
+                                    Height="20"
+                                    HorizontalAlignment="Left"
+                                    Style="{StaticResource PropertyHeaderLv2}"
+                                    Text="{Binding T_PageRange}" />
+                                <cus:WritableComboBox
+                                    x:Name="PageRangeComboBox"
+                                    Width="326"
+                                    Height="32"
+                                    Margin="0,10,0,0"
+                                    HorizontalAlignment="Left"
+                                    IsCurrentPage="True"
+                                    Loaded="PageRangeComboBox_Loaded"
+                                    MaxPageRange="{Binding MaxPageRange}"
+                                    SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}"
+                                    Text="{Binding PageRangeText, Mode=TwoWay}">
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="SelectionChanged">
                                             <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -78,8 +143,8 @@
                                         <i:EventTrigger EventName="TextChanged">
                                             <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                         </i:EventTrigger>
-                                        <i:KeyTrigger FiredOn="KeyDown" Key="Return">
-                                            <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                        <i:KeyTrigger Key="Return" FiredOn="KeyDown">
+                                            <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" />
                                         </i:KeyTrigger>
                                     </i:Interaction.Triggers>
                                 </cus:WritableComboBox>
@@ -87,47 +152,63 @@
                         </StackPanel>
                     </StackPanel>
                 </Grid>
-                <StackPanel Orientation="Horizontal" Width="245" Panel.ZIndex="2" Grid.ColumnSpan="2"  Height="20" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,8" Visibility="{Binding LimitationsConvertVisible}">
-                    <Grid Width="16" Height="16" >
-                        <Ellipse Width="13" Height="13"  Fill="white" Stroke="#CED0D4"/>
-                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C"/>
+                <StackPanel
+                    Grid.ColumnSpan="2"
+                    Height="20"
+                    Margin="0,0,16,8"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"
+                    Panel.ZIndex="2"
+                    Orientation="Horizontal"
+                    Visibility="{Binding LimitationsConvertVisible}">
+                    <Grid Width="16" Height="16">
+                        <Ellipse
+                            Width="13"
+                            Height="13"
+                            Fill="white"
+                            Stroke="#CED0D4" />
+                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C" />
                     </Grid>
-                    <TextBlock
-                             Margin="4,0,0,0"
-                    FontFamily="Segoe UI"
-                    FontSize="12"
-                    Foreground="#94989C"
-                    Text="First 10 pages for free conversion."
+                    <TextBlock
+                        Height="20"
+                        Margin="4,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="#252629"
+                        Text="First 10 pages for free conversion." />
+                    <TextBlock
                         Height="20"
-                        />
-                    <TextBlock  FontFamily="Segoe UI"
-                    FontSize="12"  Height="20"    Foreground="{StaticResource color.light.blue.5}">
+                        Margin="8,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="{StaticResource color.light.blue.5}">
                         <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="MouseDown">
-                                        <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
-                                        </i:EventTrigger>
+                            <i:EventTrigger EventName="MouseDown">
+                                <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
+                            </i:EventTrigger>
                         </i:Interaction.Triggers>
-                        <Underline >
-                           <TextBlock Text="{Binding TextUpgrade}"/>
-                        </Underline>
+                        <Underline>
+                            <TextBlock Text="{Binding TextUpgrade}" />
+                        </Underline>
                     </TextBlock>
                 </StackPanel>
             </Grid>
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,400,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
-                    <Border>
-                        <TextBlock Text="批量处理" ></TextBlock>
-                    </Border>
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,400,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
+                    <Border>
+                        <TextBlock Text="批量处理" ></TextBlock>
+                    </Border>
                 </Button>-->
                 <Button
                     Width="98"
                     Height="32"
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
-                    Content="{Binding T_No}" 
-                    Command="{Binding CancelCommand}" Style="{StaticResource btn.sec}">
+                    Command="{Binding CancelCommand}"
+                    Content="{Binding T_No}"
+                    Style="{StaticResource btn.sec}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="PreviewMouseDown">
                             <i:InvokeCommandAction Command="{Binding PreviewCancelDownCommand}" CommandParameter="{Binding ElementName=PageRangeComboBox}" />
@@ -139,8 +220,9 @@
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
-                    Content="{Binding T_YES}" 
-                    Command = "{Binding ConverterCommnad}" Style="{StaticResource Btn.cta}"/>
+                    Command="{Binding ConverterCommnad}"
+                    Content="{Binding T_YES}"
+                    Style="{StaticResource Btn.cta}" />
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

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

@@ -1,49 +1,79 @@
-<UserControl x:Class="PDF_Master.Views.Dialog.ConverterDialogs.ConverterHTMLDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:cus="clr-namespace:PDF_Master.CustomControl"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-             xmlns:local="clr-namespace:PDF_Master.Views.Dialog.PageEditDialogs"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
-             xmlns:prism="http://prismlibrary.com/" xmlns:converterdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.ConverterDialogs"
-             Width="468"
-             Height="478"
-             d:DataContext="{d:DesignInstance Type=converterdialogs:ConverterHTMLDialogViewModel}"
-             d:DesignHeight="478"
-             d:DesignWidth="468"
-             prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
-             prism:ViewModelLocator.AutoWireViewModel="True"
-             mc:Ignorable="d">
+<UserControl
+    x:Class="PDF_Master.Views.Dialog.ConverterDialogs.ConverterHTMLDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converterdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.ConverterDialogs"
+    xmlns:cus="clr-namespace:PDF_Master.CustomControl"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+    xmlns:local="clr-namespace:PDF_Master.Views.Dialog.PageEditDialogs"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
+    xmlns:prism="http://prismlibrary.com/"
+    Width="468"
+    Height="478"
+    d:DataContext="{d:DesignInstance Type=converterdialogs:ConverterHTMLDialogViewModel}"
+    d:DesignHeight="478"
+    d:DesignWidth="468"
+    prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
+    prism:ViewModelLocator.AutoWireViewModel="True"
+    mc:Ignorable="d">
     <cus:DialogContent Header="{Binding T_Title}">
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="244"/>
-                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="244" />
+                    <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
-                    <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
+                    <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical"  Margin="0,2,0,0">
+                    <StackPanel Margin="0,2,0,0" Orientation="Vertical">
                         <StackPanel Orientation="Vertical" Visibility="Visible">
-                            <TextBlock Text="HTML Recognition Settings" HorizontalAlignment="Left"  Height="20"  Style="{StaticResource PropertyHeaderLv2}"/>
-                            <CheckBox Name="OCRCheckBox"  Margin="0,8,0,0" Padding="8,0,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}">
-                                <TextBlock Text="Recognize text if needed"/>
+                            <TextBlock
+                                Height="20"
+                                HorizontalAlignment="Left"
+                                Style="{StaticResource PropertyHeaderLv2}"
+                                Text="HTML Recognition Settings" />
+                            <CheckBox
+                                Name="OCRCheckBox"
+                                Margin="0,8,0,0"
+                                Padding="8,0,0,0"
+                                IsChecked="{Binding OCRCheckBoxIsCheckBox}">
+                                <TextBlock Text="Recognize text if needed" />
                             </CheckBox>
-                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,8" Width="208" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}" >
-                                <ComboBoxItem Content="Chinese Simplified"/>
-                                <ComboBoxItem Content="Chinese Traditional"/>
-                                <ComboBoxItem Content="English"/>
-                                <ComboBoxItem Content="Japanese"/>
-                                <ComboBoxItem Content="Korean"/>
+                            <ComboBox
+                                Width="208"
+                                Height="32"
+                                Margin="0,8,0,8"
+                                HorizontalAlignment="Left"
+                                IsEnabled="{Binding ElementName=OCRCheckBox, Path=IsChecked}"
+                                SelectedIndex="{Binding LanguageSelectedIndex}">
+                                <ComboBoxItem Content="Chinese Simplified" />
+                                <ComboBoxItem Content="Chinese Traditional" />
+                                <ComboBoxItem Content="English" />
+                                <ComboBoxItem Content="Japanese" />
+                                <ComboBoxItem Content="Korean" />
                             </ComboBox>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical" Margin="0,0,0,0" >
-                            <TextBlock Text="{Binding T_PageRange}" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
-                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="208" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" Loaded="PageRangeComboBox_Loaded">
+                        <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                            <TextBlock
+                                Height="20"
+                                HorizontalAlignment="Left"
+                                Style="{StaticResource PropertyHeaderLv2}"
+                                Text="{Binding T_PageRange}" />
+                            <cus:WritableComboBox
+                                x:Name="PageRangeComboBox"
+                                Width="208"
+                                Height="32"
+                                Margin="0,10,0,0"
+                                HorizontalAlignment="Left"
+                                IsCurrentPage="True"
+                                Loaded="PageRangeComboBox_Loaded"
+                                MaxPageRange="{Binding MaxPageRange}"
+                                SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}"
+                                Text="{Binding PageRangeText, Mode=TwoWay}">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -51,55 +81,71 @@
                                     <i:EventTrigger EventName="TextChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                     </i:EventTrigger>
-                                    <i:KeyTrigger FiredOn="KeyDown" Key="Return">
-                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                    <i:KeyTrigger Key="Return" FiredOn="KeyDown">
+                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" />
                                     </i:KeyTrigger>
                                 </i:Interaction.Triggers>
                             </cus:WritableComboBox>
                         </StackPanel>
                     </StackPanel>
                 </Grid>
-                <StackPanel Orientation="Horizontal" Width="245" Panel.ZIndex="2" Grid.ColumnSpan="2" Height="20" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,8" Visibility="{Binding LimitationsConvertVisible}">
-                    <Grid Width="16" Height="16" >
-                        <Ellipse Width="13" Height="13"  Fill="white" Stroke="#CED0D4"/>
-                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C"/>
+                <StackPanel
+                    Grid.ColumnSpan="2"
+                    Height="20"
+                    Margin="0,0,16,8"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"
+                    Panel.ZIndex="2"
+                    Orientation="Horizontal"
+                    Visibility="{Binding LimitationsConvertVisible}">
+                    <Grid Width="16" Height="16">
+                        <Ellipse
+                            Width="13"
+                            Height="13"
+                            Fill="white"
+                            Stroke="#CED0D4" />
+                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C" />
                     </Grid>
-                    <TextBlock
-                             Margin="4,0,0,0"
-                    FontFamily="Segoe UI"
-                    FontSize="12"
-                    Foreground="#94989C"
-                    Text="First 10 pages for free conversion."
+                    <TextBlock
+                        Height="20"
+                        Margin="4,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="#252629"
+                        Text="First 10 pages for free conversion." />
+                    <TextBlock
                         Height="20"
-                        />
-                    <TextBlock  FontFamily="Segoe UI"
-                    FontSize="12"  Height="20"    Foreground="{StaticResource color.light.blue.5}">
+                        Margin="8,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="{StaticResource color.light.blue.5}">
                         <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="MouseDown">
-                                        <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
-                                        </i:EventTrigger>
+                            <i:EventTrigger EventName="MouseDown">
+                                <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
+                            </i:EventTrigger>
                         </i:Interaction.Triggers>
-                        <Underline >
-                         <TextBlock Text="{Binding TextUpgrade}"/>
-                        </Underline>
+                        <Underline>
+                            <TextBlock Text="{Binding TextUpgrade}" />
+                        </Underline>
                     </TextBlock>
                 </StackPanel>
             </Grid>
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
-                    <Border>
-                        <TextBlock Text="批量处理" ></TextBlock>
-                    </Border>
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
+                    <Border>
+                        <TextBlock Text="批量处理" ></TextBlock>
+                    </Border>
                 </Button>-->
                 <Button
                     Width="98"
                     Height="32"
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
-                    Content="{Binding T_No}" 
-                    Command="{Binding CancelCommand}" Style="{StaticResource btn.sec}">
+                    Command="{Binding CancelCommand}"
+                    Content="{Binding T_No}"
+                    Style="{StaticResource btn.sec}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="PreviewMouseDown">
                             <i:InvokeCommandAction Command="{Binding PreviewCancelDownCommand}" CommandParameter="{Binding ElementName=PageRangeComboBox}" />
@@ -111,8 +157,9 @@
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
-                    Content="{Binding T_YES}" 
-                    Command = "{Binding ConverterCommnad}" Style="{StaticResource Btn.cta}"/>
+                    Command="{Binding ConverterCommnad}"
+                    Content="{Binding T_YES}"
+                    Style="{StaticResource Btn.cta}" />
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

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

@@ -11,7 +11,7 @@
     xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
     xmlns:prism="http://prismlibrary.com/"
     Width="468"
-             Height="478"
+    Height="478"
     d:DataContext="{d:DesignInstance Type=converterdialogs:ConverterImgDialogViewModel}"
     d:DesignHeight="478"
     d:DesignWidth="468"
@@ -26,15 +26,18 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
-                    <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" PageIsForm="False"/>
+                    <cus:PageTurningPreview
+                        x:Name="ConverterPreview"
+                        Loaded="ConverterPreview_Loaded"
+                        PageIsForm="False" />
                 </Grid>
                 <Grid Grid.Column="1">
                     <StackPanel Margin="0,2,0,0">
                         <StackPanel>
                             <TextBlock
-                                Style="{StaticResource PropertyHeaderLv2}"
                                 Height="20"
                                 HorizontalAlignment="Left"
+                                Style="{StaticResource PropertyHeaderLv2}"
                                 Text="{Binding T_Format}" />
                             <ComboBox
                                 Name="ImageTypeComboBox"
@@ -43,8 +46,7 @@
                                 Margin="0,10,0,0"
                                 HorizontalAlignment="Left"
                                 ItemsSource="{Binding ImageTypeFamily}"
-                                SelectedIndex="{Binding ImageTypeSelectedIndex, Mode=TwoWay}"
-                                />
+                                SelectedIndex="{Binding ImageTypeSelectedIndex, Mode=TwoWay}" />
                             <ComboBox
                                 Name="ImageDPIComboBox"
                                 Width="208"
@@ -52,14 +54,13 @@
                                 Margin="0,8,0,0"
                                 HorizontalAlignment="Left"
                                 ItemsSource="{Binding ImageDPIFamily}"
-                                SelectedIndex="{Binding ImageDPISelectedIndex, Mode=TwoWay}"
-                                />
+                                SelectedIndex="{Binding ImageDPISelectedIndex, Mode=TwoWay}" />
                         </StackPanel>
                         <StackPanel Margin="0,18,0,0">
                             <TextBlock
-                                Style="{StaticResource PropertyHeaderLv2}"
                                 Height="20"
                                 HorizontalAlignment="Left"
+                                Style="{StaticResource PropertyHeaderLv2}"
                                 Text="{Binding T_PageRange}" />
                             <cus:WritableComboBox
                                 x:Name="PageRangeComboBox"
@@ -68,10 +69,10 @@
                                 Margin="0,10,0,0"
                                 HorizontalAlignment="Left"
                                 IsCurrentPage="True"
-                                MaxPageRange="{Binding MaxPageRange}"
                                 Loaded="PageRangeComboBox_Loaded"
+                                MaxPageRange="{Binding MaxPageRange}"
                                 SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}"
-                                Text="{Binding PageRangeText, Mode=TwoWay}" >
+                                Text="{Binding PageRangeText, Mode=TwoWay}">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -79,47 +80,62 @@
                                     <i:EventTrigger EventName="TextChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                     </i:EventTrigger>
-                                    <i:KeyTrigger FiredOn="KeyDown" Key="Return">
-                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                    <i:KeyTrigger Key="Return" FiredOn="KeyDown">
+                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" />
                                     </i:KeyTrigger>
                                 </i:Interaction.Triggers>
                             </cus:WritableComboBox>
                         </StackPanel>
                     </StackPanel>
                 </Grid>
-                <StackPanel Orientation="Horizontal" Width="245" Panel.ZIndex="2" Grid.ColumnSpan="2" Height="20" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,8" Visibility="{Binding LimitationsConvertVisible}">
-                    <Grid Width="16" Height="16" >
-                        <Ellipse Width="13" Height="13"  Fill="white" Stroke="#CED0D4"/>
-                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C"/>
+                <StackPanel
+                    Grid.ColumnSpan="2"
+                    Height="20"
+                    Margin="0,0,16,8"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"
+                    Panel.ZIndex="2"
+                    Orientation="Horizontal"
+                    Visibility="{Binding LimitationsConvertVisible}">
+                    <Grid Width="16" Height="16">
+                        <Ellipse
+                            Width="13"
+                            Height="13"
+                            Fill="white"
+                            Stroke="#CED0D4" />
+                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C" />
                     </Grid>
-                    <TextBlock
-                             Margin="4,0,0,0"
-                    FontFamily="Segoe UI"
-                    FontSize="12"
-                    Foreground="#94989C"
-                    Text="First 10 pages for free conversion."
+                    <TextBlock
+                        Height="20"
+                        Margin="4,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="#252629"
+                        Text="First 10 pages for free conversion." />
+                    <TextBlock
                         Height="20"
-                        />
-                    <TextBlock  FontFamily="Segoe UI"
-                    FontSize="12"  Height="20"    Foreground="{StaticResource color.light.blue.5}">
+                        Margin="8,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="{StaticResource color.light.blue.5}">
                         <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="MouseDown">
-                                        <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
-                                        </i:EventTrigger>
+                            <i:EventTrigger EventName="MouseDown">
+                                <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
+                            </i:EventTrigger>
                         </i:Interaction.Triggers>
-                        <Underline >
-                          <TextBlock Text="{Binding TextUpgrade}"/>
-                        </Underline>
+                        <Underline>
+                            <TextBlock Text="{Binding TextUpgrade}" />
+                        </Underline>
                     </TextBlock>
                 </StackPanel>
             </Grid>
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}"  Style="{StaticResource btn.sec}">
-                    <Border>
-                        <TextBlock Text="批量处理" ></TextBlock>
-                    </Border>
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}"  Style="{StaticResource btn.sec}">
+                    <Border>
+                        <TextBlock Text="批量处理" ></TextBlock>
+                    </Border>
                 </Button>-->
                 <Button
                     Width="98"
@@ -127,7 +143,8 @@
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
                     Command="{Binding CancelCommand}"
-                    Content="{Binding T_No}" Style="{StaticResource btn.sec}">
+                    Content="{Binding T_No}"
+                    Style="{StaticResource btn.sec}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="PreviewMouseDown">
                             <i:InvokeCommandAction Command="{Binding PreviewCancelDownCommand}" CommandParameter="{Binding ElementName=PageRangeComboBox}" />
@@ -140,8 +157,8 @@
                     Margin="124,0"
                     HorizontalAlignment="Right"
                     Command="{Binding ConverterCommnad}"
-                    Content="{Binding T_YES}" 
-                    Style="{StaticResource Btn.cta}"/>
+                    Content="{Binding T_YES}"
+                    Style="{StaticResource Btn.cta}" />
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

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

@@ -1,49 +1,79 @@
-<UserControl x:Class="PDF_Master.Views.Dialog.ConverterDialogs.ConverterPPTDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:cus="clr-namespace:PDF_Master.CustomControl"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-             xmlns:local="clr-namespace:PDF_Master.Views.Dialog.PageEditDialogs"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
-             xmlns:prism="http://prismlibrary.com/" xmlns:converterdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.ConverterDialogs"
-             Width="468"
-             Height="478"
-             d:DataContext="{d:DesignInstance Type=converterdialogs:ConverterPPTDialogViewModel}"
-             d:DesignHeight="478"
-             d:DesignWidth="468"
-             prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
-             prism:ViewModelLocator.AutoWireViewModel="True"
-             mc:Ignorable="d">
+<UserControl
+    x:Class="PDF_Master.Views.Dialog.ConverterDialogs.ConverterPPTDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converterdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.ConverterDialogs"
+    xmlns:cus="clr-namespace:PDF_Master.CustomControl"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+    xmlns:local="clr-namespace:PDF_Master.Views.Dialog.PageEditDialogs"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
+    xmlns:prism="http://prismlibrary.com/"
+    Width="468"
+    Height="478"
+    d:DataContext="{d:DesignInstance Type=converterdialogs:ConverterPPTDialogViewModel}"
+    d:DesignHeight="478"
+    d:DesignWidth="468"
+    prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
+    prism:ViewModelLocator.AutoWireViewModel="True"
+    mc:Ignorable="d">
     <cus:DialogContent Header="{Binding T_Title}">
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="244"/>
-                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="244" />
+                    <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
-                    <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
+                    <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical"  Margin="0,2,0,0">
+                    <StackPanel Margin="0,2,0,0" Orientation="Vertical">
                         <StackPanel Orientation="Vertical" Visibility="Visible">
-                            <TextBlock Text="PPT Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
-                            <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0">
-                                <TextBlock Text="Recognize text if needed"/>
+                            <TextBlock
+                                Height="20"
+                                HorizontalAlignment="Left"
+                                Style="{StaticResource PropertyHeaderLv2}"
+                                Text="PPT Recognition Settings" />
+                            <CheckBox
+                                Name="OCRCheckBox"
+                                Margin="0,10,0,0"
+                                Padding="8,0,0,0"
+                                IsChecked="{Binding OCRCheckBoxIsCheckBox}">
+                                <TextBlock Text="Recognize text if needed" />
                             </CheckBox>
-                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,8" Width="208" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
-                                <ComboBoxItem Content="Chinese Simplified"/>
-                                <ComboBoxItem Content="Chinese Traditional"/>
-                                <ComboBoxItem Content="English"/>
-                                <ComboBoxItem Content="Japanese"/>
-                                <ComboBoxItem Content="Korean"/>
+                            <ComboBox
+                                Width="208"
+                                Height="32"
+                                Margin="0,8,0,8"
+                                HorizontalAlignment="Left"
+                                IsEnabled="{Binding ElementName=OCRCheckBox, Path=IsChecked}"
+                                SelectedIndex="{Binding LanguageSelectedIndex}">
+                                <ComboBoxItem Content="Chinese Simplified" />
+                                <ComboBoxItem Content="Chinese Traditional" />
+                                <ComboBoxItem Content="English" />
+                                <ComboBoxItem Content="Japanese" />
+                                <ComboBoxItem Content="Korean" />
                             </ComboBox>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical" Margin="0,0,0,0">
-                            <TextBlock Text="{Binding T_PageRange}" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
-                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="208" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
+                        <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                            <TextBlock
+                                Height="20"
+                                HorizontalAlignment="Left"
+                                Style="{StaticResource PropertyHeaderLv2}"
+                                Text="{Binding T_PageRange}" />
+                            <cus:WritableComboBox
+                                x:Name="PageRangeComboBox"
+                                Width="208"
+                                Height="32"
+                                Margin="0,10,0,0"
+                                HorizontalAlignment="Left"
+                                IsCurrentPage="True"
+                                Loaded="PageRangeComboBox_Loaded"
+                                MaxPageRange="{Binding MaxPageRange}"
+                                SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}"
+                                Text="{Binding PageRangeText, Mode=TwoWay}">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -51,55 +81,71 @@
                                     <i:EventTrigger EventName="TextChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                     </i:EventTrigger>
-                                    <i:KeyTrigger FiredOn="KeyDown" Key="Return">
-                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                    <i:KeyTrigger Key="Return" FiredOn="KeyDown">
+                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" />
                                     </i:KeyTrigger>
                                 </i:Interaction.Triggers>
                             </cus:WritableComboBox>
                         </StackPanel>
                     </StackPanel>
                 </Grid>
-                <StackPanel Orientation="Horizontal" Width="245" Panel.ZIndex="2" Grid.ColumnSpan="2" Height="20" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,8" Visibility="{Binding LimitationsConvertVisible}">
-                    <Grid Width="16" Height="16" >
-                        <Ellipse Width="13" Height="13"  Fill="white" Stroke="#CED0D4"/>
-                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C"/>
+                <StackPanel
+                    Grid.ColumnSpan="2"
+                    Height="20"
+                    Margin="0,0,16,8"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"
+                    Panel.ZIndex="2"
+                    Orientation="Horizontal"
+                    Visibility="{Binding LimitationsConvertVisible}">
+                    <Grid Width="16" Height="16">
+                        <Ellipse
+                            Width="13"
+                            Height="13"
+                            Fill="white"
+                            Stroke="#CED0D4" />
+                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C" />
                     </Grid>
-                    <TextBlock
-                             Margin="4,0,0,0"
-                    FontFamily="Segoe UI"
-                    FontSize="12"
-                    Foreground="#94989C"
-                    Text="First 10 pages for free conversion."
+                    <TextBlock
+                        Height="20"
+                        Margin="4,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="#252629"
+                        Text="First 10 pages for free conversion." />
+                    <TextBlock
                         Height="20"
-                        />
-                    <TextBlock  FontFamily="Segoe UI"
-                    FontSize="12"  Height="20"  Foreground="{StaticResource color.light.blue.5}">
+                        Margin="8,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="{StaticResource color.light.blue.5}">
                         <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="MouseDown">
-                                        <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
-                                        </i:EventTrigger>
+                            <i:EventTrigger EventName="MouseDown">
+                                <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
+                            </i:EventTrigger>
                         </i:Interaction.Triggers>
-                        <Underline >
-                           <TextBlock Text="{Binding TextUpgrade}"/>
-                        </Underline>
+                        <Underline>
+                            <TextBlock Text="{Binding TextUpgrade}" />
+                        </Underline>
                     </TextBlock>
-                </StackPanel>
+                </StackPanel>            
             </Grid>
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
-                    <Border>
-                        <TextBlock Text="批量处理" ></TextBlock>
-                    </Border>
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
+                    <Border>
+                        <TextBlock Text="批量处理" ></TextBlock>
+                    </Border>
                 </Button>-->
                 <Button
                     Width="98"
                     Height="32"
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
-                    Content="{Binding T_No}" 
-                    Command="{Binding CancelCommand}" Style="{StaticResource btn.sec}">
+                    Command="{Binding CancelCommand}"
+                    Content="{Binding T_No}"
+                    Style="{StaticResource btn.sec}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="PreviewMouseDown">
                             <i:InvokeCommandAction Command="{Binding PreviewCancelDownCommand}" CommandParameter="{Binding ElementName=PageRangeComboBox}" />
@@ -111,8 +157,9 @@
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
-                    Content="{Binding T_YES}" 
-                    Command = "{Binding ConverterCommnad}" Style="{StaticResource Btn.cta}"/>
+                    Command="{Binding ConverterCommnad}"
+                    Content="{Binding T_YES}"
+                    Style="{StaticResource Btn.cta}" />
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

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

@@ -59,32 +59,46 @@
                         </StackPanel>
                     </StackPanel>
                 </Grid>
-                <StackPanel Orientation="Horizontal" Width="245" Panel.ZIndex="2" Grid.ColumnSpan="2" Height="20" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,8" Visibility="{Binding LimitationsConvertVisible}">
-                    <Grid Width="16" Height="16" >
-                        <Ellipse Width="13" Height="13"  Fill="white" Stroke="#CED0D4"/>
-                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C"/>
+                <StackPanel
+                    Grid.ColumnSpan="2"
+                    Height="20"
+                    Margin="0,0,16,8"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"
+                    Panel.ZIndex="2"
+                    Orientation="Horizontal"
+                    Visibility="{Binding LimitationsConvertVisible}">
+                    <Grid Width="16" Height="16">
+                        <Ellipse
+                            Width="13"
+                            Height="13"
+                            Fill="white"
+                            Stroke="#CED0D4" />
+                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C" />
                     </Grid>
-                    <TextBlock
-                             Margin="4,0,0,0"
-                    FontFamily="Segoe UI"
-                    FontSize="12"
-                    Foreground="#94989C"
-                    Text="First 10 pages for free conversion."
+                    <TextBlock
+                        Height="20"
+                        Margin="4,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="#252629"
+                        Text="First 10 pages for free conversion." />
+                    <TextBlock
+                        Margin="8,0,0,0"
                         Height="20"
-                        />
-                    <TextBlock  FontFamily="Segoe UI"
-                    FontSize="12"  Height="20"  Foreground="{StaticResource color.light.blue.5}">
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="{StaticResource color.light.blue.5}">
                         <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="MouseDown">
-                                        <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
-                                        </i:EventTrigger>
+                            <i:EventTrigger EventName="MouseDown">
+                                <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
+                            </i:EventTrigger>
                         </i:Interaction.Triggers>
-                        <Underline >
-                         <TextBlock Text="{Binding TextUpgrade}"/>
-                        </Underline>
+                        <Underline>
+                            <TextBlock Text="{Binding TextUpgrade}" />
+                        </Underline>
                     </TextBlock>
-                </StackPanel>
-            </Grid>
+                </StackPanel>            </Grid>
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>

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

@@ -1,49 +1,79 @@
-<UserControl x:Class="PDF_Master.Views.Dialog.ConverterDialogs.ConverterTextDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:cus="clr-namespace:PDF_Master.CustomControl"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-             xmlns:local="clr-namespace:PDF_Master.Views.Dialog.PageEditDialogs"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
-             xmlns:prism="http://prismlibrary.com/" xmlns:converterdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.ConverterDialogs"
-             Width="468"
-             Height="478"
-             d:DataContext="{d:DesignInstance Type=converterdialogs:ConverterTextDialogViewModel}"
-             d:DesignHeight="478"
-             d:DesignWidth="468"
-             prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
-             prism:ViewModelLocator.AutoWireViewModel="True"
-             mc:Ignorable="d">
+<UserControl
+    x:Class="PDF_Master.Views.Dialog.ConverterDialogs.ConverterTextDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converterdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.ConverterDialogs"
+    xmlns:cus="clr-namespace:PDF_Master.CustomControl"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+    xmlns:local="clr-namespace:PDF_Master.Views.Dialog.PageEditDialogs"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
+    xmlns:prism="http://prismlibrary.com/"
+    Width="468"
+    Height="478"
+    d:DataContext="{d:DesignInstance Type=converterdialogs:ConverterTextDialogViewModel}"
+    d:DesignHeight="478"
+    d:DesignWidth="468"
+    prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
+    prism:ViewModelLocator.AutoWireViewModel="True"
+    mc:Ignorable="d">
     <cus:DialogContent Header="{Binding T_Title}">
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="244"/>
-                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="244" />
+                    <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
-                    <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"></cus:PageTurningPreview>
+                    <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical"  Margin="0,2,0,0">
+                    <StackPanel Margin="0,2,0,0" Orientation="Vertical">
                         <StackPanel Orientation="Vertical" Visibility="Visible">
-                            <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
-                            <CheckBox Name="OCRCheckBox"  Margin="0,10,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0" >
-                                <TextBlock Text="Recognize text if needed"/>
+                            <TextBlock
+                                Height="20"
+                                HorizontalAlignment="Left"
+                                Style="{StaticResource PropertyHeaderLv2}"
+                                Text="Text Recognition Settings" />
+                            <CheckBox
+                                Name="OCRCheckBox"
+                                Margin="0,10,0,0"
+                                Padding="8,0,0,0"
+                                IsChecked="{Binding OCRCheckBoxIsCheckBox}">
+                                <TextBlock Text="Recognize text if needed" />
                             </CheckBox>
-                            <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}" Margin="0,8,0,8" Width="208" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
-                                <ComboBoxItem Content="Chinese Simplified"/>
-                                <ComboBoxItem Content="Chinese Traditional"/>
-                                <ComboBoxItem Content="English"/>
-                                <ComboBoxItem Content="Japanese"/>
-                                <ComboBoxItem Content="Korean"/>
+                            <ComboBox
+                                Width="208"
+                                Height="32"
+                                Margin="0,8,0,8"
+                                HorizontalAlignment="Left"
+                                IsEnabled="{Binding ElementName=OCRCheckBox, Path=IsChecked}"
+                                SelectedIndex="{Binding LanguageSelectedIndex}">
+                                <ComboBoxItem Content="Chinese Simplified" />
+                                <ComboBoxItem Content="Chinese Traditional" />
+                                <ComboBoxItem Content="English" />
+                                <ComboBoxItem Content="Japanese" />
+                                <ComboBoxItem Content="Korean" />
                             </ComboBox>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical" Margin="0,0,0,0">
-                            <TextBlock Text="{Binding T_PageRange}" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
-                            <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,10,0,0" Width="208" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}" Loaded="PageRangeComboBox_Loaded">
+                        <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                            <TextBlock
+                                Height="20"
+                                HorizontalAlignment="Left"
+                                Style="{StaticResource PropertyHeaderLv2}"
+                                Text="{Binding T_PageRange}" />
+                            <cus:WritableComboBox
+                                x:Name="PageRangeComboBox"
+                                Width="208"
+                                Height="32"
+                                Margin="0,10,0,0"
+                                HorizontalAlignment="Left"
+                                IsCurrentPage="True"
+                                Loaded="PageRangeComboBox_Loaded"
+                                MaxPageRange="{Binding MaxPageRange}"
+                                SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}"
+                                Text="{Binding PageRangeText, Mode=TwoWay}">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="SelectionChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -51,55 +81,71 @@
                                     <i:EventTrigger EventName="TextChanged">
                                         <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                     </i:EventTrigger>
-                                    <i:KeyTrigger FiredOn="KeyDown" Key="Return">
-                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                    <i:KeyTrigger Key="Return" FiredOn="KeyDown">
+                                        <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" />
                                     </i:KeyTrigger>
                                 </i:Interaction.Triggers>
                             </cus:WritableComboBox>
                         </StackPanel>
                     </StackPanel>
                 </Grid>
-                <StackPanel Orientation="Horizontal" Width="245" Panel.ZIndex="2" Grid.ColumnSpan="2" Height="20" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,8" Visibility="{Binding LimitationsConvertVisible}">
-                    <Grid Width="16" Height="16" >
-                        <Ellipse Width="13" Height="13"  Fill="white" Stroke="#CED0D4"/>
-                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C"/>
+                <StackPanel
+                    Grid.ColumnSpan="2"
+                    Height="20"
+                    Margin="0,0,16,8"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"
+                    Panel.ZIndex="2"
+                    Orientation="Horizontal"
+                    Visibility="{Binding LimitationsConvertVisible}">
+                    <Grid Width="16" Height="16">
+                        <Ellipse
+                            Width="13"
+                            Height="13"
+                            Fill="white"
+                            Stroke="#CED0D4" />
+                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C" />
                     </Grid>
-                    <TextBlock
-                             Margin="4,0,0,0"
-                    FontFamily="Segoe UI"
-                    FontSize="12"
-                    Foreground="#94989C"
-                    Text="First 10 pages for free conversion."
+                    <TextBlock
+                        Height="20"
+                        Margin="4,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="#252629"
+                        Text="First 10 pages for free conversion." />
+                    <TextBlock
                         Height="20"
-                        />
-                    <TextBlock  FontFamily="Segoe UI"
-                    FontSize="12"  Height="20"  Foreground="{StaticResource color.light.blue.5}">
+                        Margin="8,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="{StaticResource color.light.blue.5}">
                         <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="MouseDown">
-                                        <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
-                                        </i:EventTrigger>
+                            <i:EventTrigger EventName="MouseDown">
+                                <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
+                            </i:EventTrigger>
                         </i:Interaction.Triggers>
-                        <Underline >
-                           <TextBlock Text="{Binding TextUpgrade}"/>
-                        </Underline>
+                        <Underline>
+                            <TextBlock Text="{Binding TextUpgrade}" />
+                        </Underline>
                     </TextBlock>
-                </StackPanel>
+                </StackPanel>            
             </Grid>
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
-                    <Border>
-                        <TextBlock Text="批量处理" ></TextBlock>
-                    </Border>
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
+                    <Border>
+                        <TextBlock Text="批量处理" ></TextBlock>
+                    </Border>
                 </Button>-->
                 <Button
                     Width="98"
                     Height="32"
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
-                    Content="{Binding T_No}" 
-                    Command="{Binding CancelCommand}" Style="{StaticResource btn.sec}">
+                    Command="{Binding CancelCommand}"
+                    Content="{Binding T_No}"
+                    Style="{StaticResource btn.sec}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="PreviewMouseDown">
                             <i:InvokeCommandAction Command="{Binding PreviewCancelDownCommand}" CommandParameter="{Binding ElementName=PageRangeComboBox}" />
@@ -111,8 +157,9 @@
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
-                    Content="{Binding T_YES}" 
-                    Command = "{Binding ConverterCommnad}" Style="{StaticResource Btn.cta}"/>
+                    Command="{Binding ConverterCommnad}"
+                    Content="{Binding T_YES}"
+                    Style="{StaticResource Btn.cta}" />
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

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

@@ -1,63 +1,107 @@
-<UserControl x:Class="PDF_Master.Views.Dialog.ConverterDialogs.ConverterWordDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:cus="clr-namespace:PDF_Master.CustomControl"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-             xmlns:local="clr-namespace:PDF_Master.Views.Dialog.PageEditDialogs"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
-             xmlns:prism="http://prismlibrary.com/" xmlns:converterdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.ConverterDialogs"
-             Width="468"
-             Height="478"
-             d:DataContext="{d:DesignInstance Type=converterdialogs:ConverterWordDialogViewModel}"
-             d:DesignHeight="478"
-             d:DesignWidth="468"
-             prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
-             prism:ViewModelLocator.AutoWireViewModel="True"
-             mc:Ignorable="d">
+<UserControl
+    x:Class="PDF_Master.Views.Dialog.ConverterDialogs.ConverterWordDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converterdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.ConverterDialogs"
+    xmlns:cus="clr-namespace:PDF_Master.CustomControl"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+    xmlns:local="clr-namespace:PDF_Master.Views.Dialog.PageEditDialogs"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pageeditdialogs="clr-namespace:PDF_Master.ViewModels.Dialog.PageEditDialogs"
+    xmlns:prism="http://prismlibrary.com/"
+    Width="468"
+    Height="478"
+    d:DataContext="{d:DesignInstance Type=converterdialogs:ConverterWordDialogViewModel}"
+    d:DesignHeight="478"
+    d:DesignWidth="468"
+    prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
+    prism:ViewModelLocator.AutoWireViewModel="True"
+    mc:Ignorable="d">
     <cus:DialogContent Header="{Binding T_Title}">
         <cus:DialogContent.Content>
             <Grid Grid.Row="1">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="244"/>
-                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="244" />
+                    <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" VerticalAlignment="Top">
-                    <cus:PageTurningPreview  x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded"/>
+                    <cus:PageTurningPreview x:Name="ConverterPreview" Loaded="ConverterPreview_Loaded" />
                 </Grid>
                 <Grid Grid.Column="1">
-                    <StackPanel Orientation="Vertical" Margin="0,2,0,0">
+                    <StackPanel Margin="0,2,0,0" Orientation="Vertical">
                         <StackPanel Orientation="Vertical" Visibility="Visible">
-                            <TextBlock Text="Layout Settings"  Style="{StaticResource PropertyHeaderLv2}" Height="20" HorizontalAlignment="Left"/>
-                            <StackPanel Orientation="Vertical" Margin="0,8,0,0">
-                                <RadioButton Name="FlowingTextRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=FlowingTextRadioBtn,Path=Name}"   Style="{StaticResource RadioButtonStyleText}"
-                                Padding="8,0,0,0">
-                                    <TextBlock Text="Retain Flowing Text"/>
+                            <TextBlock
+                                Height="20"
+                                HorizontalAlignment="Left"
+                                Style="{StaticResource PropertyHeaderLv2}"
+                                Text="Layout Settings" />
+                            <StackPanel Margin="0,8,0,0" Orientation="Vertical">
+                                <RadioButton
+                                    Name="FlowingTextRadioBtn"
+                                    Padding="8,0,0,0"
+                                    Command="{Binding RadioButtonCommand}"
+                                    CommandParameter="{Binding ElementName=FlowingTextRadioBtn, Path=Name}"
+                                    Style="{StaticResource RadioButtonStyleText}">
+                                    <TextBlock Text="Retain Flowing Text" />
                                 </RadioButton>
-                                <RadioButton  Margin="0,8,0,0" Name="PageLayoutRadioBtn" Command="{Binding RadioButtonCommand}" CommandParameter="{Binding ElementName=PageLayoutRadioBtn,Path=Name}" IsChecked="True"  Style="{StaticResource RadioButtonStyleText}"
-                                Padding="8,0,0,0">
-                                    <TextBlock Text="Retain Page Layout"/>
+                                <RadioButton
+                                    Name="PageLayoutRadioBtn"
+                                    Margin="0,8,0,0"
+                                    Padding="8,0,0,0"
+                                    Command="{Binding RadioButtonCommand}"
+                                    CommandParameter="{Binding ElementName=PageLayoutRadioBtn, Path=Name}"
+                                    IsChecked="True"
+                                    Style="{StaticResource RadioButtonStyleText}">
+                                    <TextBlock Text="Retain Page Layout" />
                                 </RadioButton>
                             </StackPanel>
                         </StackPanel>
-                        <StackPanel Orientation="Vertical"  Margin="0,16,0,0">
+                        <StackPanel Margin="0,16,0,0" Orientation="Vertical">
                             <StackPanel Orientation="Vertical" Visibility="Visible">
-                                <TextBlock Text="Text Recognition Settings" HorizontalAlignment="Left"  Style="{StaticResource PropertyHeaderLv2}" Height="20"/>
-                                <CheckBox Name="OCRCheckBox"  Margin="0,8,0,0" IsChecked="{Binding OCRCheckBoxIsCheckBox}" Padding="8,0,0,0">
+                                <TextBlock
+                                    Height="20"
+                                    HorizontalAlignment="Left"
+                                    Style="{StaticResource PropertyHeaderLv2}"
+                                    Text="Text Recognition Settings" />
+                                <CheckBox
+                                    Name="OCRCheckBox"
+                                    Margin="0,8,0,0"
+                                    Padding="8,0,0,0"
+                                    IsChecked="{Binding OCRCheckBoxIsCheckBox}">
                                     <TextBlock Text="Recognize text if needed" />
                                 </CheckBox>
-                                <ComboBox IsEnabled="{Binding ElementName=OCRCheckBox,Path=IsChecked}"  Margin="0,8,0,8" Width="208" Height="32" HorizontalAlignment="Left" SelectedIndex="{Binding LanguageSelectedIndex}">
-                                    <ComboBoxItem Content="Chinese Simplified"/>
-                                    <ComboBoxItem Content="Chinese Traditional"/>
-                                    <ComboBoxItem Content="English"/>
-                                    <ComboBoxItem Content="Japanese"/>
-                                    <ComboBoxItem Content="Korean"/>
+                                <ComboBox
+                                    Width="208"
+                                    Height="32"
+                                    Margin="0,8,0,8"
+                                    HorizontalAlignment="Left"
+                                    IsEnabled="{Binding ElementName=OCRCheckBox, Path=IsChecked}"
+                                    SelectedIndex="{Binding LanguageSelectedIndex}">
+                                    <ComboBoxItem Content="Chinese Simplified" />
+                                    <ComboBoxItem Content="Chinese Traditional" />
+                                    <ComboBoxItem Content="English" />
+                                    <ComboBoxItem Content="Japanese" />
+                                    <ComboBoxItem Content="Korean" />
                                 </ComboBox>
                             </StackPanel>
-                            <StackPanel Orientation="Vertical" Margin="0,0,0,0">
-                                <TextBlock Text="{Binding T_PageRange}" Height="20"  Style="{StaticResource PropertyHeaderLv2}" HorizontalAlignment="Left"/>
-                                <cus:WritableComboBox x:Name="PageRangeComboBox" Margin="0,8,0,0" Width="208" Height="32" HorizontalAlignment="Left" IsCurrentPage="True" Text="{Binding PageRangeText, Mode=TwoWay}" MaxPageRange="{Binding MaxPageRange}"  SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}" Loaded="PageRangeComboBox_Loaded">
+                            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                                <TextBlock
+                                    Height="20"
+                                    HorizontalAlignment="Left"
+                                    Style="{StaticResource PropertyHeaderLv2}"
+                                    Text="{Binding T_PageRange}" />
+                                <cus:WritableComboBox
+                                    x:Name="PageRangeComboBox"
+                                    Width="208"
+                                    Height="32"
+                                    Margin="0,8,0,0"
+                                    HorizontalAlignment="Left"
+                                    IsCurrentPage="True"
+                                    Loaded="PageRangeComboBox_Loaded"
+                                    MaxPageRange="{Binding MaxPageRange}"
+                                    SelectedIndex="{Binding PageRangeSelectIndex, Mode=TwoWay}"
+                                    Text="{Binding PageRangeText, Mode=TwoWay}">
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="SelectionChanged">
                                             <i:InvokeCommandAction Command="{Binding CmbPageSelectionChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
@@ -65,8 +109,8 @@
                                         <i:EventTrigger EventName="TextChanged">
                                             <i:InvokeCommandAction Command="{Binding CmbPageTextChanged}" CommandParameter="{Binding ElementName=ConverterPreview}" />
                                         </i:EventTrigger>
-                                        <i:KeyTrigger FiredOn="KeyDown" Key="Return">
-                                            <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" ></i:InvokeCommandAction>
+                                        <i:KeyTrigger Key="Return" FiredOn="KeyDown">
+                                            <i:InvokeCommandAction Command="{Binding SetCustomPageRangeCommand}" />
                                         </i:KeyTrigger>
                                     </i:Interaction.Triggers>
                                 </cus:WritableComboBox>
@@ -74,47 +118,63 @@
                         </StackPanel>
                     </StackPanel>
                 </Grid>
-                <StackPanel Orientation="Horizontal" Width="245" Panel.ZIndex="2" Grid.ColumnSpan="2" Height="20" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,8" Visibility="{Binding LimitationsConvertVisible}">
-                    <Grid Width="16" Height="16" >
-                        <Ellipse Width="13" Height="13"  Fill="white" Stroke="#CED0D4"/>
-                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C"/>
+                <StackPanel
+                    Grid.ColumnSpan="2"
+                    Height="20"
+                    Margin="0,0,16,8"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"
+                    Panel.ZIndex="2"
+                    Orientation="Horizontal"
+                    Visibility="{Binding LimitationsConvertVisible}">
+                    <Grid Width="16" Height="16">
+                        <Ellipse
+                            Width="13"
+                            Height="13"
+                            Fill="white"
+                            Stroke="#CED0D4" />
+                        <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C" />
                     </Grid>
-                    <TextBlock
-                             Margin="4,0,0,0"
-                    FontFamily="Segoe UI"
-                    FontSize="12"
-                    Foreground="#94989C"
-                    Text="First 10 pages for free conversion."
+                    <TextBlock
+                        Height="20"
+                        Margin="4,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="#252629"
+                        Text="First 10 pages for free conversion." />
+                    <TextBlock
                         Height="20"
-                        />
-                    <TextBlock  FontFamily="Segoe UI"
-                    FontSize="12"  Height="20"  Foreground="{StaticResource color.light.blue.5}">
+                        Margin="8,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="{StaticResource color.light.blue.5}">
                         <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="MouseDown">
-                                        <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
-                                        </i:EventTrigger>
+                            <i:EventTrigger EventName="MouseDown">
+                                <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
+                            </i:EventTrigger>
                         </i:Interaction.Triggers>
-                        <Underline >
-                          <TextBlock Text="{Binding TextUpgrade}"/>
-                        </Underline>
+                        <Underline>
+                            <TextBlock Text="{Binding TextUpgrade}" />
+                        </Underline>
                     </TextBlock>
-                </StackPanel>
+                </StackPanel>            
             </Grid>
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
             <Grid>
-                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
-                    <Border>
-                        <TextBlock Text="批量处理" ></TextBlock>
-                    </Border>
+                <!--<Button Background="WhiteSmoke" Width="98" Height="32" Margin="0,0,350,0" Command="{Binding BatchConverterCommand}" Style="{StaticResource btn.sec}">
+                    <Border>
+                        <TextBlock Text="批量处理" ></TextBlock>
+                    </Border>
                 </Button>-->
                 <Button
                     Width="98"
                     Height="32"
                     Margin="0,0,16,0"
                     HorizontalAlignment="Right"
-                    Content="{Binding T_No}" 
-                    Command="{Binding CancelCommand}" Style="{StaticResource btn.sec}">
+                    Command="{Binding CancelCommand}"
+                    Content="{Binding T_No}"
+                    Style="{StaticResource btn.sec}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="PreviewMouseDown">
                             <i:InvokeCommandAction Command="{Binding PreviewCancelDownCommand}" CommandParameter="{Binding ElementName=PageRangeComboBox}" />
@@ -126,8 +186,9 @@
                     Height="32"
                     Margin="124,0"
                     HorizontalAlignment="Right"
-                    Content="{Binding T_YES}" 
-                    Command = "{Binding ConverterCommnad}" Style="{StaticResource Btn.cta}"/>
+                    Command="{Binding ConverterCommnad}"
+                    Content="{Binding T_YES}"
+                    Style="{StaticResource Btn.cta}" />
             </Grid>
         </cus:DialogContent.BottmBar>
     </cus:DialogContent>

PDF Office/Views/Dialog/ServiceDialog/LoginDialog.xaml

@@ -190,6 +190,7 @@
                 Background="Transparent"
                 FontFamily="Segoe UI"
                 FontSize="12"
+                Visibility="Collapsed"
                 FontWeight="SemiBold"
                 Foreground="#3F8FF6" >
                    <Hyperlink Command="{Binding LinkstoreCommand}">

PDF Office/Views/Dialog/ServiceDialog/RegisterDialog.xaml

@@ -191,9 +191,10 @@
                 FontFamily="Segoe UI"
                 FontSize="12"
                 FontWeight="SemiBold"
-                Foreground="#3F8FF6" >
-                   <Hyperlink Command="{Binding LinkstoreCommand}">
-                         <Hyperlink.Style>
+                Foreground="#3F8FF6"
+                Visibility="Collapsed">
+                <Hyperlink Command="{Binding LinkstoreCommand}">
+                    <Hyperlink.Style>
                         <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
                             <Setter Property="FocusVisualStyle" Value="{x:Null}" />
                             <Setter Property="TextBlock.TextDecorations" Value="{x:Null}" />
@@ -204,8 +205,8 @@
                             </Style.Triggers>
                         </Style>
                     </Hyperlink.Style>
-                        <TextBlock Text="{Binding TextSubscribeNow}" />
-                    </Hyperlink>
+                    <TextBlock Text="{Binding TextSubscribeNow}" />
+                </Hyperlink>
             </TextBlock>
         </Grid>
         <Grid Grid.Column="1">

PDF Office/Views/Dialog/ServiceDialog/SubscriptionDialog.xaml

@@ -6,8 +6,8 @@
     xmlns:local="clr-namespace:PDF_Master.Views.Dialog.ServiceDialog"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
-    Width="448"
-    Height="430"
+    Width="450"
+    Height="394"
     prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
@@ -29,34 +29,34 @@
                 Fill="Black" />
         </Button>
         <TextBlock
-            Margin="120,40,0,0"
-            HorizontalAlignment="Left"
+            Margin="0,40,0,0"
+            HorizontalAlignment="Center"
             VerticalAlignment="Top"
             FontFamily="Segoe UI"
             FontSize="20"
             FontWeight="SemiBold"
             LineHeight="28"
             Text="{Binding TextSubscriptionBenefit}" />
-        <StackPanel
+        <StackPanel>
+            <StackPanel
             Width="384"
-            Height="238"
             Margin="24,96,0,0"
             HorizontalAlignment="Left"
             VerticalAlignment="Top">
-            <StackPanel Width="384" Orientation="Horizontal">
-                <Image
+                <StackPanel Width="384" Orientation="Horizontal">
+                    <Image
                     Width="36"
                     Height="36"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     Source="pack://application:,,,/PDF Master;component/Resources/Service/NoWatermark.png" />
-                <StackPanel Width="340" Margin="8,0,0,0">
-                    <TextBlock
+                    <StackPanel Width="340" Margin="8,0,0,0">
+                        <TextBlock
                         FontFamily="Segoe UI"
                         FontSize="14"
                         FontWeight="SemiBold"
                         Text="{Binding TextSavewithout}" />
-                    <TextBlock
+                        <TextBlock
                         Margin="0,4,0,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
@@ -66,25 +66,25 @@
                         LineHeight="20"
                         Text="{Binding TextWhenyou}"
                         TextWrapping="Wrap" />
+                    </StackPanel>
                 </StackPanel>
-            </StackPanel>
-            <StackPanel
+                <StackPanel
                 Width="384"
                 Margin="0,20,0,0"
                 Orientation="Horizontal">
-                <Image
+                    <Image
                     Width="36"
                     Height="36"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     Source="pack://application:,,,/PDF Master;component/Resources/Service/Noconvert.png" />
-                <StackPanel Width="340" Margin="8,0,0,0">
-                    <TextBlock
+                    <StackPanel Width="340" Margin="8,0,0,0">
+                        <TextBlock
                         FontFamily="Segoe UI"
                         FontSize="14"
                         FontWeight="SemiBold"
                         Text="{Binding TextConvertPDF}" />
-                    <TextBlock
+                        <TextBlock
                         Margin="0,4,0,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
@@ -94,9 +94,9 @@
                         LineHeight="20"
                         Text="{Binding TextConvertPDFto}"
                         TextWrapping="Wrap" />
+                    </StackPanel>
                 </StackPanel>
-            </StackPanel>
-            <StackPanel
+                <!--<StackPanel
                 Width="384"
                 Margin="0,20,0,0"
                 Orientation="Horizontal">
@@ -123,50 +123,14 @@
                         Text="{Binding TextSupportAI}"
                         TextWrapping="Wrap" />
                 </StackPanel>
+            </StackPanel>-->
             </StackPanel>
-        </StackPanel>
-        <WrapPanel
-            Height="40"
-            Margin="0,366,0,0"
+            <StackPanel
+            Margin="0,32,0,0"
             HorizontalAlignment="Center"
             VerticalAlignment="Top">
-            <Button
-                Width="192"
-                Height="40"
-                Visibility="{Binding LeftBtnVis}"
-                Command="{Binding WarermarkSavingCommand}"
-                Content="{Binding BtnTextSavewithWatermark}"
-                FontFamily="Segoe UI"
-                FontSize="16">
-                <Button.Style>
-                    <Style TargetType="Button">
-                        <Setter Property="Template" Value="{StaticResource ButtonControlTemplateWithCorner20}" />
-                        <Setter Property="Background" Value="{StaticResource color.btn.sec.bg.norm}" />
-                        <Setter Property="Foreground" Value="{StaticResource color.btn.sec.text.def}" />
-                        <Setter Property="BorderBrush" Value="{StaticResource color.btn.sec.border-color}" />
-                        <Setter Property="BorderThickness" Value="{StaticResource border-width.1}" />
-                        <Style.Triggers>
-                            <Trigger Property="IsDefaulted" Value="true">
-                                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                            </Trigger>
-                            <Trigger Property="IsMouseOver" Value="true">
-                                <Setter Property="Background" Value="{StaticResource color.btn.sec.bg.hov}" />
-                                <Setter Property="BorderBrush" Value="{StaticResource color.btn.sec.border-color}" />
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="true">
-                                <Setter Property="Background" Value="{StaticResource color.btn.sec.bg.act}" />
-                                <Setter Property="BorderBrush" Value="{StaticResource color.btn.sec.border-color}" />
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="false">
-                                <Setter Property="Background" Value="{StaticResource color.btn.sec.bg.dis}" />
-                                <Setter Property="Foreground" Value="{StaticResource color.btn.sec.text.dis}" />
-                            </Trigger>
-                        </Style.Triggers>
-                    </Style>
-                </Button.Style>
-            </Button>
-            <Grid>
-                <Border
+                <Grid>
+                    <Border
                     Width="67"
                     Height="20"
                     Margin="0,-10,5,0"
@@ -176,7 +140,7 @@
                     Background="#FFE297"
                     CornerRadius="10,10,10,0"
                     Visibility="{Binding Vishalfprice}">
-                    <TextBlock
+                        <TextBlock
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         FontFamily="SF Pro Text"
@@ -184,19 +148,53 @@
                         FontWeight="SemiBold"
                         Foreground="#D2621C"
                         Text="{Binding Textoff}" />
-                </Border>
-                <Button
+                    </Border>
+                    <Button
                     Width="{Binding RightBtnWidth}"
                     Height="40"
-                    Margin="16,0,0,0"
                     Command="{Binding LinkstoreCommand}"
                     Content="{Binding BtnTextSubscribe}"
                     FontFamily="Segoe UI"
                     FontSize="16"
                     Style="{StaticResource btn.upgrade}" />
-            </Grid>
-
-
-        </WrapPanel>
+                </Grid>
+                <Button
+                Width="394"
+                Margin="0,16,0,0"
+                Height="40"
+                Visibility="{Binding LeftBtnVis}"
+                Command="{Binding WarermarkSavingCommand}"
+                Content="{Binding BtnTextSavewithWatermark}"
+                FontFamily="Segoe UI"
+                FontSize="16">
+                    <Button.Style>
+                        <Style TargetType="Button">
+                            <Setter Property="Template" Value="{StaticResource ButtonControlTemplateWithCorner20}" />
+                            <Setter Property="Background" Value="{StaticResource color.btn.sec.bg.norm}" />
+                            <Setter Property="Foreground" Value="{StaticResource color.btn.sec.text.def}" />
+                            <Setter Property="BorderBrush" Value="{StaticResource color.btn.sec.border-color}" />
+                            <Setter Property="BorderThickness" Value="{StaticResource border-width.1}" />
+                            <Style.Triggers>
+                                <Trigger Property="IsDefaulted" Value="true">
+                                    <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                                </Trigger>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter Property="Background" Value="{StaticResource color.btn.sec.bg.hov}" />
+                                    <Setter Property="BorderBrush" Value="{StaticResource color.btn.sec.border-color}" />
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="true">
+                                    <Setter Property="Background" Value="{StaticResource color.btn.sec.bg.act}" />
+                                    <Setter Property="BorderBrush" Value="{StaticResource color.btn.sec.border-color}" />
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="false">
+                                    <Setter Property="Background" Value="{StaticResource color.btn.sec.bg.dis}" />
+                                    <Setter Property="Foreground" Value="{StaticResource color.btn.sec.text.dis}" />
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Button.Style>
+                </Button>
+            </StackPanel>
+        </StackPanel>
     </Grid>
 </UserControl>

PDF Office/Views/Dialog/ServiceDialog/UserDialog.xaml

@@ -148,7 +148,7 @@
                             FontSize="12"
                             Text="{Binding TextAutorenewal}" />
                     </Border>
-                    <StackPanel Width="93" Margin="47,0,0,0">
+                    <StackPanel Width="121" Margin="47,0,0,0">
                         <TextBlock
                             FontFamily="Segoe UI"
                             FontSize="12"

PDF Office/Views/Dialog/ToolsDialogs/MergeDialog.xaml

@@ -602,6 +602,48 @@
                     MouseDownBorderBrush="{StaticResource color.item-state.sel.border.lv3}"
                     MouseOverBackground="{StaticResource color.item-state.hov.bg}" />
             </Border>
+            <StackPanel
+                Grid.ColumnSpan="2"
+                Width="245"
+                Height="20"
+                Margin="16,0,0,6"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Bottom"
+                Panel.ZIndex="2"
+                Orientation="Horizontal"
+                Visibility="{Binding LimitationsConvertVisible}">
+                <Grid Width="16" Height="16">
+                    <Ellipse
+                        Width="13"
+                        Height="13"
+                        Fill="white"
+                        Stroke="#CED0D4" />
+                    <Path Data="M7.4701 8.91H8.5001L8.7601 5.49L8.8101 4H7.1601L7.2101 5.49L7.4701 8.91ZM7.9901 11.58C8.4901 11.58 8.8701 11.21 8.8701 10.69C8.8701 10.17 8.4901 9.81 7.9901 9.81C7.4801 9.81 7.1001 10.17 7.1001 10.69C7.1001 11.21 7.4701 11.58 7.9901 11.58Z" Fill="#94989C" />
+                </Grid>
+                <TextBlock
+                    Height="20"
+                    Margin="4,0,0,0"
+                    FontFamily="Segoe UI"
+                    FontSize="12"
+                    Foreground="#252629"
+                    Text="Merge 2 files for free" />
+                <TextBlock
+                    Height="20"
+                    Margin="8,0,0,0"
+                    FontFamily="Segoe UI"
+                    FontSize="12"
+                    Foreground="{StaticResource color.light.blue.5}">
+                    <i:Interaction.Triggers>
+                        <i:EventTrigger EventName="MouseDown">
+                            <i:InvokeCommandAction Command="{Binding UnlockMouseDownCommand}" />
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>
+                    <Underline>
+                        <TextBlock Text="{Binding TextUpgrade}" />
+                    </Underline>
+                </TextBlock>
+            </StackPanel>
+
         </StackPanel>
         <Border
             Grid.RowSpan="7"