比较表-文案补充

PDF Office/DataConvert/IAPConvert.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace PDF_Master.DataConvert
+{
+    public class IAPConvert : IValueConverter
+    {
+        //用于比较表小组文案
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if((PDF_Master.ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType)value==ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType.CreatePDF)
+            {
+                return App.ServiceLoader.GetString("Text_CreatePDF") ;
+            }
+             else  if ((PDF_Master.ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType)value == ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType.ConvertPDF)
+            {
+                return App.ServiceLoader.GetString("Text_ConvertPDF");
+            }
+            else if ((PDF_Master.ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType)value == ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType.AdvancedEditTools)
+            {
+                return App.ServiceLoader.GetString("Text_Advanced");
+            }
+            else if ((PDF_Master.ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType)value == ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType.AnnotatePDF)
+            {
+                return App.ServiceLoader.GetString("Text_Annotate");
+            }
+            else if ((PDF_Master.ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType)value == ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType.Security)
+            {
+                return App.ServiceLoader.GetString("Text_Security");
+            }
+            return "枚举错误";
+        }
+
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -290,6 +290,106 @@
           <source>Cancel account</source>
           <target state="new">Cancel account</target>
         </trans-unit>
+        <trans-unit id="Text_Add" translate="yes" xml:space="preserve">
+          <source>Add password and permission</source>
+          <target state="new">Add password and permission</target>
+        </trans-unit>
+        <trans-unit id="Text_Advanced" translate="yes" xml:space="preserve">
+          <source>Advanced Edit Tools</source>
+          <target state="new">Advanced Edit Tools</target>
+        </trans-unit>
+        <trans-unit id="Text_Annotate" translate="yes" xml:space="preserve">
+          <source>Annotate PDF</source>
+          <target state="new">Annotate PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_Basic" translate="yes" xml:space="preserve">
+          <source>Basic markup tools</source>
+          <target state="new">Basic markup tools</target>
+        </trans-unit>
+        <trans-unit id="Text_Compress" translate="yes" xml:space="preserve">
+          <source>Compress PDF</source>
+          <target state="new">Compress PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_ConvertPDF" translate="yes" xml:space="preserve">
+          <source>Convert PDF</source>
+          <target state="new">Convert PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_ConvertPDFtoMicrosoft" translate="yes" xml:space="preserve">
+          <source>Convert PDF to Microsoft Word, Excel, PPT, Text, and image</source>
+          <target state="new">Convert PDF to Microsoft Word, Excel, PPT, Text, and image</target>
+        </trans-unit>
+        <trans-unit id="Text_CreatePDF" translate="yes" xml:space="preserve">
+          <source>Create PDF</source>
+          <target state="new">Create PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_CreatePDFfrom" translate="yes" xml:space="preserve">
+          <source>Create PDF from Microsoft Word, PowerPoint, Excel, Text, and image</source>
+          <target state="new">Create PDF from Microsoft Word, PowerPoint, Excel, Text, and image</target>
+        </trans-unit>
+        <trans-unit id="Text_CreatePDFfromscanner" translate="yes" xml:space="preserve">
+          <source>Create PDF from scanner</source>
+          <target state="new">Create PDF from scanner</target>
+        </trans-unit>
+        <trans-unit id="Text_Crop" translate="yes" xml:space="preserve">
+          <source>Crop pages</source>
+          <target state="new">Crop pages</target>
+        </trans-unit>
+        <trans-unit id="Text_Fill" translate="yes" xml:space="preserve">
+          <source>Fill &amp; sign forms</source>
+          <target state="new">Fill &amp; sign forms</target>
+        </trans-unit>
+        <trans-unit id="Text_Free" translate="yes" xml:space="preserve">
+          <source>Free Use</source>
+          <target state="new">Free Use</target>
+        </trans-unit>
+        <trans-unit id="Text_Hyperlink" translate="yes" xml:space="preserve">
+          <source>Hyperlink</source>
+          <target state="new">Hyperlink</target>
+        </trans-unit>
+        <trans-unit id="Text_Log" translate="yes" xml:space="preserve">
+          <source>Log in to </source>
+          <target state="new">Log in to </target>
+        </trans-unit>
+        <trans-unit id="Text_Merge" translate="yes" xml:space="preserve">
+          <source>Merge multiple PDFs</source>
+          <target state="new">Merge multiple PDFs</target>
+        </trans-unit>
+        <trans-unit id="Text_Registered" translate="yes" xml:space="preserve">
+          <source>Registered</source>
+          <target state="new">Registered</target>
+        </trans-unit>
+        <trans-unit id="Text_Remove" translate="yes" xml:space="preserve">
+          <source>Remove password</source>
+          <target state="new">Remove password</target>
+        </trans-unit>
+        <trans-unit id="Text_Rotate" translate="yes" xml:space="preserve">
+          <source>Rotate, delete, paste, copy pages</source>
+          <target state="new">Rotate, delete, paste, copy pages</target>
+        </trans-unit>
+        <trans-unit id="Text_Save" translate="yes" xml:space="preserve">
+          <source>Save as flatten PDF</source>
+          <target state="new">Save as flatten PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_Security" translate="yes" xml:space="preserve">
+          <source>Security</source>
+          <target state="new">Security</target>
+        </trans-unit>
+        <trans-unit id="Text_Signature" translate="yes" xml:space="preserve">
+          <source>Signature</source>
+          <target state="new">Signature</target>
+        </trans-unit>
+        <trans-unit id="Text_Stamp" translate="yes" xml:space="preserve">
+          <source>Stamp</source>
+          <target state="new">Stamp</target>
+        </trans-unit>
+        <trans-unit id="Text_TurnPDF" translate="yes" xml:space="preserve">
+          <source>Turn PDF to RTF, HTML, CSV</source>
+          <target state="new">Turn PDF to RTF, HTML, CSV</target>
+        </trans-unit>
+        <trans-unit id="Text_Unregistered" translate="yes" xml:space="preserve">
+          <source>Unregistered</source>
+          <target state="new">Unregistered</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -290,6 +290,106 @@
           <source>Cancel account</source>
           <target state="new">Cancel account</target>
         </trans-unit>
+        <trans-unit id="Text_Add" translate="yes" xml:space="preserve">
+          <source>Add password and permission</source>
+          <target state="new">Add password and permission</target>
+        </trans-unit>
+        <trans-unit id="Text_Advanced" translate="yes" xml:space="preserve">
+          <source>Advanced Edit Tools</source>
+          <target state="new">Advanced Edit Tools</target>
+        </trans-unit>
+        <trans-unit id="Text_Annotate" translate="yes" xml:space="preserve">
+          <source>Annotate PDF</source>
+          <target state="new">Annotate PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_Basic" translate="yes" xml:space="preserve">
+          <source>Basic markup tools</source>
+          <target state="new">Basic markup tools</target>
+        </trans-unit>
+        <trans-unit id="Text_Compress" translate="yes" xml:space="preserve">
+          <source>Compress PDF</source>
+          <target state="new">Compress PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_ConvertPDF" translate="yes" xml:space="preserve">
+          <source>Convert PDF</source>
+          <target state="new">Convert PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_ConvertPDFtoMicrosoft" translate="yes" xml:space="preserve">
+          <source>Convert PDF to Microsoft Word, Excel, PPT, Text, and image</source>
+          <target state="new">Convert PDF to Microsoft Word, Excel, PPT, Text, and image</target>
+        </trans-unit>
+        <trans-unit id="Text_CreatePDF" translate="yes" xml:space="preserve">
+          <source>Create PDF</source>
+          <target state="new">Create PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_CreatePDFfrom" translate="yes" xml:space="preserve">
+          <source>Create PDF from Microsoft Word, PowerPoint, Excel, Text, and image</source>
+          <target state="new">Create PDF from Microsoft Word, PowerPoint, Excel, Text, and image</target>
+        </trans-unit>
+        <trans-unit id="Text_CreatePDFfromscanner" translate="yes" xml:space="preserve">
+          <source>Create PDF from scanner</source>
+          <target state="new">Create PDF from scanner</target>
+        </trans-unit>
+        <trans-unit id="Text_Crop" translate="yes" xml:space="preserve">
+          <source>Crop pages</source>
+          <target state="new">Crop pages</target>
+        </trans-unit>
+        <trans-unit id="Text_Fill" translate="yes" xml:space="preserve">
+          <source>Fill &amp; sign forms</source>
+          <target state="new">Fill &amp; sign forms</target>
+        </trans-unit>
+        <trans-unit id="Text_Free" translate="yes" xml:space="preserve">
+          <source>Free Use</source>
+          <target state="new">Free Use</target>
+        </trans-unit>
+        <trans-unit id="Text_Hyperlink" translate="yes" xml:space="preserve">
+          <source>Hyperlink</source>
+          <target state="new">Hyperlink</target>
+        </trans-unit>
+        <trans-unit id="Text_Log" translate="yes" xml:space="preserve">
+          <source>Log in to </source>
+          <target state="new">Log in to </target>
+        </trans-unit>
+        <trans-unit id="Text_Merge" translate="yes" xml:space="preserve">
+          <source>Merge multiple PDFs</source>
+          <target state="new">Merge multiple PDFs</target>
+        </trans-unit>
+        <trans-unit id="Text_Registered" translate="yes" xml:space="preserve">
+          <source>Registered</source>
+          <target state="new">Registered</target>
+        </trans-unit>
+        <trans-unit id="Text_Remove" translate="yes" xml:space="preserve">
+          <source>Remove password</source>
+          <target state="new">Remove password</target>
+        </trans-unit>
+        <trans-unit id="Text_Rotate" translate="yes" xml:space="preserve">
+          <source>Rotate, delete, paste, copy pages</source>
+          <target state="new">Rotate, delete, paste, copy pages</target>
+        </trans-unit>
+        <trans-unit id="Text_Save" translate="yes" xml:space="preserve">
+          <source>Save as flatten PDF</source>
+          <target state="new">Save as flatten PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_Security" translate="yes" xml:space="preserve">
+          <source>Security</source>
+          <target state="new">Security</target>
+        </trans-unit>
+        <trans-unit id="Text_Signature" translate="yes" xml:space="preserve">
+          <source>Signature</source>
+          <target state="new">Signature</target>
+        </trans-unit>
+        <trans-unit id="Text_Stamp" translate="yes" xml:space="preserve">
+          <source>Stamp</source>
+          <target state="new">Stamp</target>
+        </trans-unit>
+        <trans-unit id="Text_TurnPDF" translate="yes" xml:space="preserve">
+          <source>Turn PDF to RTF, HTML, CSV</source>
+          <target state="new">Turn PDF to RTF, HTML, CSV</target>
+        </trans-unit>
+        <trans-unit id="Text_Unregistered" translate="yes" xml:space="preserve">
+          <source>Unregistered</source>
+          <target state="new">Unregistered</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -290,6 +290,106 @@
           <source>Cancel account</source>
           <target state="new">Cancel account</target>
         </trans-unit>
+        <trans-unit id="Text_Add" translate="yes" xml:space="preserve">
+          <source>Add password and permission</source>
+          <target state="new">Add password and permission</target>
+        </trans-unit>
+        <trans-unit id="Text_Advanced" translate="yes" xml:space="preserve">
+          <source>Advanced Edit Tools</source>
+          <target state="new">Advanced Edit Tools</target>
+        </trans-unit>
+        <trans-unit id="Text_Annotate" translate="yes" xml:space="preserve">
+          <source>Annotate PDF</source>
+          <target state="new">Annotate PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_Basic" translate="yes" xml:space="preserve">
+          <source>Basic markup tools</source>
+          <target state="new">Basic markup tools</target>
+        </trans-unit>
+        <trans-unit id="Text_Compress" translate="yes" xml:space="preserve">
+          <source>Compress PDF</source>
+          <target state="new">Compress PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_ConvertPDF" translate="yes" xml:space="preserve">
+          <source>Convert PDF</source>
+          <target state="new">Convert PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_ConvertPDFtoMicrosoft" translate="yes" xml:space="preserve">
+          <source>Convert PDF to Microsoft Word, Excel, PPT, Text, and image</source>
+          <target state="new">Convert PDF to Microsoft Word, Excel, PPT, Text, and image</target>
+        </trans-unit>
+        <trans-unit id="Text_CreatePDF" translate="yes" xml:space="preserve">
+          <source>Create PDF</source>
+          <target state="new">Create PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_CreatePDFfrom" translate="yes" xml:space="preserve">
+          <source>Create PDF from Microsoft Word, PowerPoint, Excel, Text, and image</source>
+          <target state="new">Create PDF from Microsoft Word, PowerPoint, Excel, Text, and image</target>
+        </trans-unit>
+        <trans-unit id="Text_CreatePDFfromscanner" translate="yes" xml:space="preserve">
+          <source>Create PDF from scanner</source>
+          <target state="new">Create PDF from scanner</target>
+        </trans-unit>
+        <trans-unit id="Text_Crop" translate="yes" xml:space="preserve">
+          <source>Crop pages</source>
+          <target state="new">Crop pages</target>
+        </trans-unit>
+        <trans-unit id="Text_Fill" translate="yes" xml:space="preserve">
+          <source>Fill &amp; sign forms</source>
+          <target state="new">Fill &amp; sign forms</target>
+        </trans-unit>
+        <trans-unit id="Text_Free" translate="yes" xml:space="preserve">
+          <source>Free Use</source>
+          <target state="new">Free Use</target>
+        </trans-unit>
+        <trans-unit id="Text_Hyperlink" translate="yes" xml:space="preserve">
+          <source>Hyperlink</source>
+          <target state="new">Hyperlink</target>
+        </trans-unit>
+        <trans-unit id="Text_Log" translate="yes" xml:space="preserve">
+          <source>Log in to </source>
+          <target state="new">Log in to </target>
+        </trans-unit>
+        <trans-unit id="Text_Merge" translate="yes" xml:space="preserve">
+          <source>Merge multiple PDFs</source>
+          <target state="new">Merge multiple PDFs</target>
+        </trans-unit>
+        <trans-unit id="Text_Registered" translate="yes" xml:space="preserve">
+          <source>Registered</source>
+          <target state="new">Registered</target>
+        </trans-unit>
+        <trans-unit id="Text_Remove" translate="yes" xml:space="preserve">
+          <source>Remove password</source>
+          <target state="new">Remove password</target>
+        </trans-unit>
+        <trans-unit id="Text_Rotate" translate="yes" xml:space="preserve">
+          <source>Rotate, delete, paste, copy pages</source>
+          <target state="new">Rotate, delete, paste, copy pages</target>
+        </trans-unit>
+        <trans-unit id="Text_Save" translate="yes" xml:space="preserve">
+          <source>Save as flatten PDF</source>
+          <target state="new">Save as flatten PDF</target>
+        </trans-unit>
+        <trans-unit id="Text_Security" translate="yes" xml:space="preserve">
+          <source>Security</source>
+          <target state="new">Security</target>
+        </trans-unit>
+        <trans-unit id="Text_Signature" translate="yes" xml:space="preserve">
+          <source>Signature</source>
+          <target state="new">Signature</target>
+        </trans-unit>
+        <trans-unit id="Text_Stamp" translate="yes" xml:space="preserve">
+          <source>Stamp</source>
+          <target state="new">Stamp</target>
+        </trans-unit>
+        <trans-unit id="Text_TurnPDF" translate="yes" xml:space="preserve">
+          <source>Turn PDF to RTF, HTML, CSV</source>
+          <target state="new">Turn PDF to RTF, HTML, CSV</target>
+        </trans-unit>
+        <trans-unit id="Text_Unregistered" translate="yes" xml:space="preserve">
+          <source>Unregistered</source>
+          <target state="new">Unregistered</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/PDF Master.csproj

@@ -349,6 +349,7 @@
     <Compile Include="DataConvert\CreateTimeToDate.cs" />
     <Compile Include="DataConvert\FileFormatToIconConvert.cs" />
     <Compile Include="DataConvert\GroupHeaderConverter.cs" />
+    <Compile Include="DataConvert\IAPConvert.cs" />
     <Compile Include="DataConvert\IndexConverter .cs" />
     <Compile Include="DataConvert\IntToBooleanConvert.cs" />
     <Compile Include="DataConvert\FileToImageSourceConvert.cs" />

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

@@ -393,6 +393,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add password and permission 的本地化字符串。
+        /// </summary>
+        public static string Text_Add {
+            get {
+                return ResourceManager.GetString("Text_Add", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 E-mail Address 的本地化字符串。
         /// </summary>
@@ -402,6 +411,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Advanced Edit Tools 的本地化字符串。
+        /// </summary>
+        public static string Text_Advanced {
+            get {
+                return ResourceManager.GetString("Text_Advanced", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 and 的本地化字符串。
         /// </summary>
@@ -411,6 +429,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Annotate PDF 的本地化字符串。
+        /// </summary>
+        public static string Text_Annotate {
+            get {
+                return ResourceManager.GetString("Text_Annotate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Back to previous step 的本地化字符串。
         /// </summary>
@@ -420,6 +447,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Basic markup tools 的本地化字符串。
+        /// </summary>
+        public static string Text_Basic {
+            get {
+                return ResourceManager.GetString("Text_Basic", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Cancel 的本地化字符串。
         /// </summary>
@@ -447,6 +483,69 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Compress PDF 的本地化字符串。
+        /// </summary>
+        public static string Text_Compress {
+            get {
+                return ResourceManager.GetString("Text_Compress", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Convert PDF 的本地化字符串。
+        /// </summary>
+        public static string Text_ConvertPDF {
+            get {
+                return ResourceManager.GetString("Text_ConvertPDF", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Convert PDF to Microsoft Word, Excel, PPT, Text, and image 的本地化字符串。
+        /// </summary>
+        public static string Text_ConvertPDFtoMicrosoft {
+            get {
+                return ResourceManager.GetString("Text_ConvertPDFtoMicrosoft", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Create PDF 的本地化字符串。
+        /// </summary>
+        public static string Text_CreatePDF {
+            get {
+                return ResourceManager.GetString("Text_CreatePDF", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Create PDF from Microsoft Word, PowerPoint, Excel, Text, and image 的本地化字符串。
+        /// </summary>
+        public static string Text_CreatePDFfrom {
+            get {
+                return ResourceManager.GetString("Text_CreatePDFfrom", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Create PDF from scanner 的本地化字符串。
+        /// </summary>
+        public static string Text_CreatePDFfromscanner {
+            get {
+                return ResourceManager.GetString("Text_CreatePDFfromscanner", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Crop pages 的本地化字符串。
+        /// </summary>
+        public static string Text_Crop {
+            get {
+                return ResourceManager.GetString("Text_Crop", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Enter email account 的本地化字符串。
         /// </summary>
@@ -456,6 +555,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Fill &amp; sign forms 的本地化字符串。
+        /// </summary>
+        public static string Text_Fill {
+            get {
+                return ResourceManager.GetString("Text_Fill", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Forgot your password? 的本地化字符串。
         /// </summary>
@@ -465,6 +573,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Free Use 的本地化字符串。
+        /// </summary>
+        public static string Text_Free {
+            get {
+                return ResourceManager.GetString("Text_Free", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Getting Started 的本地化字符串。
         /// </summary>
@@ -474,6 +591,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Hyperlink 的本地化字符串。
+        /// </summary>
+        public static string Text_Hyperlink {
+            get {
+                return ResourceManager.GetString("Text_Hyperlink", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 License Agreement 的本地化字符串。
         /// </summary>
@@ -483,6 +609,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Log in to  的本地化字符串。
+        /// </summary>
+        public static string Text_Log {
+            get {
+                return ResourceManager.GetString("Text_Log", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Log In 的本地化字符串。
         /// </summary>
@@ -501,6 +636,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Merge multiple PDFs 的本地化字符串。
+        /// </summary>
+        public static string Text_Merge {
+            get {
+                return ResourceManager.GetString("Text_Merge", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 No 的本地化字符串。
         /// </summary>
@@ -564,6 +708,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Registered 的本地化字符串。
+        /// </summary>
+        public static string Text_Registered {
+            get {
+                return ResourceManager.GetString("Text_Registered", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Register successfully 的本地化字符串。
         /// </summary>
@@ -573,6 +726,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Remove password 的本地化字符串。
+        /// </summary>
+        public static string Text_Remove {
+            get {
+                return ResourceManager.GetString("Text_Remove", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 By registering, you agree to the 的本地化字符串。
         /// </summary>
@@ -591,6 +753,42 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Rotate, delete, paste, copy pages 的本地化字符串。
+        /// </summary>
+        public static string Text_Rotate {
+            get {
+                return ResourceManager.GetString("Text_Rotate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Save as flatten PDF 的本地化字符串。
+        /// </summary>
+        public static string Text_Save {
+            get {
+                return ResourceManager.GetString("Text_Save", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Security 的本地化字符串。
+        /// </summary>
+        public static string Text_Security {
+            get {
+                return ResourceManager.GetString("Text_Security", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Signature 的本地化字符串。
+        /// </summary>
+        public static string Text_Signature {
+            get {
+                return ResourceManager.GetString("Text_Signature", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Sign Up 的本地化字符串。
         /// </summary>
@@ -600,6 +798,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Stamp 的本地化字符串。
+        /// </summary>
+        public static string Text_Stamp {
+            get {
+                return ResourceManager.GetString("Text_Stamp", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 To access your files, please connect to the internet and try again. 的本地化字符串。
         /// </summary>
@@ -618,6 +825,24 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Turn PDF to RTF, HTML, CSV 的本地化字符串。
+        /// </summary>
+        public static string Text_TurnPDF {
+            get {
+                return ResourceManager.GetString("Text_TurnPDF", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Unregistered 的本地化字符串。
+        /// </summary>
+        public static string Text_Unregistered {
+            get {
+                return ResourceManager.GetString("Text_Unregistered", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Account Information 的本地化字符串。
         /// </summary>

PDF Office/Strings/Service/Service.resx

@@ -228,15 +228,27 @@
   <data name="Registertext1" xml:space="preserve">
     <value>Already have an account?</value>
   </data>
+  <data name="Text_Add" xml:space="preserve">
+    <value>Add password and permission</value>
+  </data>
   <data name="Text_admail" xml:space="preserve">
     <value>E-mail Address</value>
   </data>
+  <data name="Text_Advanced" xml:space="preserve">
+    <value>Advanced Edit Tools</value>
+  </data>
   <data name="Text_and" xml:space="preserve">
     <value>and</value>
   </data>
+  <data name="Text_Annotate" xml:space="preserve">
+    <value>Annotate PDF</value>
+  </data>
   <data name="Text_back" xml:space="preserve">
     <value>Back to previous step</value>
   </data>
+  <data name="Text_Basic" xml:space="preserve">
+    <value>Basic markup tools</value>
+  </data>
   <data name="Text_cancel" xml:space="preserve">
     <value>Cancel</value>
   </data>
@@ -246,24 +258,60 @@
   <data name="Text_chmail" xml:space="preserve">
     <value>Change Email</value>
   </data>
+  <data name="Text_Compress" xml:space="preserve">
+    <value>Compress PDF</value>
+  </data>
+  <data name="Text_ConvertPDF" xml:space="preserve">
+    <value>Convert PDF</value>
+  </data>
+  <data name="Text_ConvertPDFtoMicrosoft" xml:space="preserve">
+    <value>Convert PDF to Microsoft Word, Excel, PPT, Text, and image</value>
+  </data>
+  <data name="Text_CreatePDF" xml:space="preserve">
+    <value>Create PDF</value>
+  </data>
+  <data name="Text_CreatePDFfrom" xml:space="preserve">
+    <value>Create PDF from Microsoft Word, PowerPoint, Excel, Text, and image</value>
+  </data>
+  <data name="Text_CreatePDFfromscanner" xml:space="preserve">
+    <value>Create PDF from scanner</value>
+  </data>
+  <data name="Text_Crop" xml:space="preserve">
+    <value>Crop pages</value>
+  </data>
   <data name="Text_emailac" xml:space="preserve">
     <value>Enter email account</value>
   </data>
+  <data name="Text_Fill" xml:space="preserve">
+    <value>Fill &amp; sign forms</value>
+  </data>
   <data name="Text_forgetpass" xml:space="preserve">
     <value>Forgot your password?</value>
   </data>
+  <data name="Text_Free" xml:space="preserve">
+    <value>Free Use</value>
+  </data>
   <data name="Text_getstart" xml:space="preserve">
     <value>Getting Started</value>
   </data>
+  <data name="Text_Hyperlink" xml:space="preserve">
+    <value>Hyperlink</value>
+  </data>
   <data name="Text_licens" xml:space="preserve">
     <value>License Agreement</value>
   </data>
+  <data name="Text_Log" xml:space="preserve">
+    <value>Log in to </value>
+  </data>
   <data name="Text_Login" xml:space="preserve">
     <value>Log In</value>
   </data>
   <data name="Text_logout" xml:space="preserve">
     <value>Log Out</value>
   </data>
+  <data name="Text_Merge" xml:space="preserve">
+    <value>Merge multiple PDFs</value>
+  </data>
   <data name="Text_no" xml:space="preserve">
     <value>No</value>
   </data>
@@ -285,24 +333,51 @@
   <data name="Text_recode" xml:space="preserve">
     <value>Resend Code</value>
   </data>
+  <data name="Text_Registered" xml:space="preserve">
+    <value>Registered</value>
+  </data>
   <data name="Text_regisuccess" xml:space="preserve">
     <value>Register successfully</value>
   </data>
+  <data name="Text_Remove" xml:space="preserve">
+    <value>Remove password</value>
+  </data>
   <data name="Text_remsg" xml:space="preserve">
     <value>By registering, you agree to the</value>
   </data>
   <data name="Text_retry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="Text_Rotate" xml:space="preserve">
+    <value>Rotate, delete, paste, copy pages</value>
+  </data>
+  <data name="Text_Save" xml:space="preserve">
+    <value>Save as flatten PDF</value>
+  </data>
+  <data name="Text_Security" xml:space="preserve">
+    <value>Security</value>
+  </data>
+  <data name="Text_Signature" xml:space="preserve">
+    <value>Signature</value>
+  </data>
   <data name="Text_Signup" xml:space="preserve">
     <value>Sign Up</value>
   </data>
+  <data name="Text_Stamp" xml:space="preserve">
+    <value>Stamp</value>
+  </data>
   <data name="Text_toconnect" xml:space="preserve">
     <value>To access your files, please connect to the internet and try again.</value>
   </data>
   <data name="Text_toocode" xml:space="preserve">
     <value>Reset Password</value>
   </data>
+  <data name="Text_TurnPDF" xml:space="preserve">
+    <value>Turn PDF to RTF, HTML, CSV</value>
+  </data>
+  <data name="Text_Unregistered" xml:space="preserve">
+    <value>Unregistered</value>
+  </data>
   <data name="Text_useracc" xml:space="preserve">
     <value>Account Information</value>
   </data>

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

@@ -1,4 +1,5 @@
-using Prism.Commands;
+using PDF_Master.DataConvert;
+using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
 using Prism.Services.Dialogs;
@@ -42,12 +43,263 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 SetProperty(ref _Text_Login, value);
             }
         }
+
+        private string _Text_Log;
+        public string Text_Log
+        {
+            get { return _Text_Log; }
+            set
+            {
+                SetProperty(ref _Text_Log, value);
+            }
+        }
+        private string _Text_Free;
+        public string Text_Free
+        {
+            get { return _Text_Free; }
+            set
+            {
+                SetProperty(ref _Text_Free, value);
+            }
+        }
+        private string _Text_Unregistered;
+        public string Text_Unregistered
+        {
+            get { return _Text_Unregistered; }
+            set
+            {
+                SetProperty(ref _Text_Unregistered, value);
+            }
+        }
+        private string _Text_Registered;
+        public string Text_Registered
+        {
+            get { return _Text_Registered; }
+            set
+            {
+                SetProperty(ref _Text_Registered, value);
+            }
+        }
+        private string _Text_CreatePDF;
+        public string Text_CreatePDF
+        {
+            get { return _Text_CreatePDF; }
+            set
+            {
+                SetProperty(ref _Text_CreatePDF, value);
+            }
+        }
+        private string _Text_CreatePDFfrom;
+        public string Text_CreatePDFfrom
+        {
+            get { return _Text_CreatePDFfrom; }
+            set
+            {
+                SetProperty(ref _Text_CreatePDFfrom, value);
+            }
+        }
+        private string _Text_CreatePDFfromscanner;
+        public string Text_CreatePDFfromscanner
+        {
+            get { return _Text_CreatePDFfromscanner; }
+            set
+            {
+                SetProperty(ref _Text_CreatePDFfromscanner, value);
+            }
+        }
+        private string _Text_ConvertPDF;
+        public string Text_ConvertPDF
+        {
+            get { return _Text_ConvertPDF; }
+            set
+            {
+                SetProperty(ref _Text_ConvertPDF, value);
+            }
+        }
+        private string _Text_ConvertPDFtoMicrosoft;
+        public string Text_ConvertPDFtoMicrosoft
+        {
+            get { return _Text_ConvertPDFtoMicrosoft; }
+            set
+            {
+                SetProperty(ref _Text_ConvertPDFtoMicrosoft, value);
+            }
+        }
+        private string _Text_TurnPDF;
+        public string Text_TurnPDF
+        {
+            get { return _Text_TurnPDF; }
+            set
+            {
+                SetProperty(ref _Text_TurnPDF, value);
+            }
+        }
+        private string _Text_Save;
+        public string Text_Save
+        {
+            get { return _Text_Save; }
+            set
+            {
+                SetProperty(ref _Text_Save, value);
+            }
+        }
+        private string _Text_Advanced;
+        public string Text_Advanced
+        {
+            get { return _Text_Advanced; }
+            set
+            {
+                SetProperty(ref _Text_Advanced, value);
+            }
+        }
+        private string _Text_Compress;
+        public string Text_Compress
+        {
+            get { return _Text_Compress; }
+            set
+            {
+                SetProperty(ref _Text_Compress, value);
+            }
+        }
+        private string _Text_Merge;
+        public string Text_Merge
+        {
+            get { return _Text_Merge; }
+            set
+            {
+                SetProperty(ref _Text_Merge, value);
+            }
+        }
+        private string _Text_Fill;
+        public string Text_Fill
+        {
+            get { return _Text_Fill; }
+            set
+            {
+                SetProperty(ref _Text_Fill, value);
+            }
+        }
+        private string _Text_Crop;
+        public string Text_Crop
+        {
+            get { return _Text_Crop; }
+            set
+            {
+                SetProperty(ref _Text_Crop, value);
+            }
+        }
+        private string _Text_Rotate;
+        public string Text_Rotate
+        {
+            get { return _Text_Rotate; }
+            set
+            {
+                SetProperty(ref _Text_Rotate, value);
+            }
+        }
+        private string _Text_Annotate;
+        public string Text_Annotate
+        {
+            get { return _Text_Annotate; }
+            set
+            {
+                SetProperty(ref _Text_Annotate, value);
+            }
+        }
+        private string _Text_Basic;
+        public string Text_Basic
+        {
+            get { return _Text_Basic; }
+            set
+            {
+                SetProperty(ref _Text_Basic, value);
+            }
+        }
+        private string _Text_Hyperlink;
+        public string Text_Hyperlink
+        {
+            get { return _Text_Hyperlink; }
+            set
+            {
+                SetProperty(ref _Text_Hyperlink, value);
+            }
+        }
+        private string _Text_Stamp;
+        public string Text_Stamp
+        {
+            get { return _Text_Stamp; }
+            set
+            {
+                SetProperty(ref _Text_Stamp, value);
+            }
+        }
+        private string _Text_Signature;
+        public string Text_Signature
+        {
+            get { return _Text_Signature; }
+            set
+            {
+                SetProperty(ref _Text_Signature, value);
+            }
+        }
+        private string _Text_Security;
+        public string Text_Security
+        {
+            get { return _Text_Security; }
+            set
+            {
+                SetProperty(ref _Text_Security, value);
+            }
+        }
+        private string _Text_Add;
+        public string Text_Add
+        {
+            get { return _Text_Add; }
+            set
+            {
+                SetProperty(ref _Text_Add, value);
+            }
+        }
+        private string _Text_Remove;
+        public string Text_Remove
+        {
+            get { return _Text_Remove; }
+            set
+            {
+                SetProperty(ref _Text_Remove, value);
+            }
+        }
         private void InitString()
         {
 
             Text_Signup = App.ServiceLoader.GetString("Text_Signup");
-
             Text_Login = App.ServiceLoader.GetString("Text_Login");
+            Text_Log = App.ServiceLoader.GetString("Text_Log");
+            Text_Free = App.ServiceLoader.GetString("Text_Free");
+            Text_Unregistered = App.ServiceLoader.GetString("Text_Unregistered");
+            Text_Registered = App.ServiceLoader.GetString("Text_Registered");
+            Text_CreatePDF = App.ServiceLoader.GetString("Text_CreatePDF");
+            Text_CreatePDFfrom = App.ServiceLoader.GetString("Text_CreatePDFfrom");
+            Text_CreatePDFfromscanner = App.ServiceLoader.GetString("Text_CreatePDFfromscanner");
+            Text_ConvertPDF = App.ServiceLoader.GetString("Text_ConvertPDF");
+            Text_ConvertPDFtoMicrosoft = App.ServiceLoader.GetString("Text_ConvertPDFtoMicrosoft");
+            Text_TurnPDF = App.ServiceLoader.GetString("Text_TurnPDF");
+            Text_Save = App.ServiceLoader.GetString("Text_Save");
+            Text_Advanced = App.ServiceLoader.GetString("Text_Advanced");
+            Text_Compress = App.ServiceLoader.GetString("Text_Compress");
+            Text_Merge = App.ServiceLoader.GetString("Text_Merge");
+            Text_Fill = App.ServiceLoader.GetString("Text_Fill");
+            Text_Crop = App.ServiceLoader.GetString("Text_Crop");
+            Text_Rotate = App.ServiceLoader.GetString("Text_Rotate");
+            Text_Annotate = App.ServiceLoader.GetString("Text_Annotate");
+            Text_Basic = App.ServiceLoader.GetString("Text_Basic");
+            Text_Hyperlink = App.ServiceLoader.GetString("Text_Hyperlink");
+            Text_Stamp = App.ServiceLoader.GetString("Text_Stamp");
+            Text_Signature = App.ServiceLoader.GetString("Text_Signature");
+            Text_Security = App.ServiceLoader.GetString("Text_Security");
+            Text_Add = App.ServiceLoader.GetString("Text_Add");
+            Text_Remove = App.ServiceLoader.GetString("Text_Remove");
+
         }
 
 
@@ -115,26 +367,30 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
             
 
-            Items.Add(new User() { Use = "Create PDF from Microsoft Word, PowerPoint, Excel, Text, and image", UnRe = true, Re=true, UseType = UseType.CreatePDF });
-            Items.Add(new User() { Use = "Create PDF from scanner", UnRe = true, Re = true, UseType = UseType.CreatePDF });
-            Items.Add(new User() { Use = "Convert PDF to Microsoft Word, Excel, PPT, Text, and image", UnRe = false, Re = true, UseType = UseType.ConvertPDF });
-            Items.Add(new User() { Use = "Turn PDF to RTF, HTML, CSV", UnRe = false, Re = true, UseType = UseType.ConvertPDF });
-            Items.Add(new User() { Use = "Save as flatten PDF", UnRe = false, Re = true, UseType = UseType.ConvertPDF });
-            Items.Add(new User() { Use = "Merge multiple PDFs", UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            Items.Add(new User() { Use = "Fill & sign forms", UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            Items.Add(new User() { Use = "Crop pages", UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            Items.Add(new User() { Use = "Rotate, delete, paste, copy pages", UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            Items.Add(new User() { Use = "Basic markup tools", UnRe = true, Re = true, UseType = UseType.AnnotatePDF });
-            Items.Add(new User() { Use = "Hyperlink", UnRe = false, Re = true, UseType = UseType.AnnotatePDF });
-            Items.Add(new User() { Use = "Stamp", UnRe = false, Re = true, UseType = UseType.AnnotatePDF });
-            Items.Add(new User() { Use = "Signature", UnRe = false, Re = true, UseType = UseType.AnnotatePDF });
-            Items.Add(new User() { Use = "Add password and permission", UnRe = false, Re = true, UseType = UseType.Security });
-            Items.Add(new User() { Use = "Remove password", UnRe = false, Re = true, UseType = UseType.Security });
-
+            Items.Add(new User() { Use = Text_CreatePDFfrom, UnRe = true, Re=true, UseType = UseType.CreatePDF });
+            Items.Add(new User() { Use = Text_CreatePDFfromscanner, UnRe = true, Re = true, UseType = UseType.CreatePDF });
+            Items.Add(new User() { Use = Text_ConvertPDFtoMicrosoft, UnRe = false, Re = true, UseType = UseType.ConvertPDF });
+            Items.Add(new User() { Use = Text_TurnPDF, UnRe = false, Re = true, UseType = UseType.ConvertPDF });
+            Items.Add(new User() { Use = Text_Save, UnRe = false, Re = true, UseType = UseType.ConvertPDF });
+            Items.Add(new User() { Use = Text_Compress, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
+            Items.Add(new User() { Use = Text_Merge, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
+            Items.Add(new User() { Use = Text_Fill, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
+            Items.Add(new User() { Use = Text_Crop, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
+            Items.Add(new User() { Use = Text_Rotate, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
+            Items.Add(new User() { Use = Text_Basic, UnRe = true, Re = true, UseType = UseType.AnnotatePDF });
+            Items.Add(new User() { Use = Text_Hyperlink, UnRe = false, Re = true, UseType = UseType.AnnotatePDF });
+            Items.Add(new User() { Use = Text_Stamp, UnRe = false, Re = true, UseType = UseType.AnnotatePDF });
+            Items.Add(new User() { Use = Text_Signature, UnRe = false, Re = true, UseType = UseType.AnnotatePDF });
+            Items.Add(new User() { Use = Text_Add, UnRe = false, Re = true, UseType = UseType.Security });
+            Items.Add(new User() { Use = Text_Remove, UnRe = false, Re = true, UseType = UseType.Security });
 
+            
             CollectionView view = (CollectionView)CollectionViewSource.GetDefaultView(Items);
-            PropertyGroupDescription groupDescription = new PropertyGroupDescription("UseType");
+            IAPConvert iAPConverter = new IAPConvert();
+            PropertyGroupDescription groupDescription = new PropertyGroupDescription("UseType", iAPConverter);
             view.GroupDescriptions.Add(groupDescription);
+           
+
         }
 
 

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

@@ -94,7 +94,7 @@
                                         </ToggleButton.Style>
                                     </ToggleButton>
                                     <TextBlock
-                                        Margin="14,0,0,0"
+                                        Margin="11,0,0,0"
                                         VerticalAlignment="Center"
                                         FontFamily="Segoe UI"
                                         FontSize="14"
@@ -205,33 +205,41 @@
                     CornerRadius="4,4,0,0"
                     Effect="{StaticResource shadow.black-2-8}">
                     <Grid>
-                        <WrapPanel>
-                            <TextBlock
-                                Margin="24,36,0,0"
-                                FontFamily="Segoe UI"
-                                FontSize="26"
-                                FontWeight="SemiBold"
-                                LineHeight="28">
-                                <Run Foreground="#273C62" Text="Log in to " />
-                                <Run Foreground="#1770F4" Text="Free Use " />
-                            </TextBlock>
-                            <TextBlock
-                                Margin="277.5,42,0,0"
-                                FontFamily="Segoe UI"
-                                FontSize="14"
-                                FontWeight="SemiBold"
-                                Foreground="#616469"
-                                LineHeight="22"
-                                Text="Unregistered" />
-                            <TextBlock
-                                Margin="50.5,42,0,0"
-                                FontFamily="Segoe UI"
-                                FontSize="14"
-                                FontWeight="SemiBold"
-                                Foreground="#616469"
-                                LineHeight="22"
-                                Text="Registered" />
-                        </WrapPanel>
+
+                        <TextBlock
+                            Margin="24,36,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="26"
+                            FontWeight="SemiBold"
+                            Foreground="#273C62"
+                            LineHeight="28"
+                            Text="{Binding Text_Log}" />
+                        <TextBlock
+                            Margin="144,36,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="26"
+                            FontWeight="SemiBold"
+                            Foreground="#1770F4"
+                            LineHeight="28"
+                            Text="{Binding Text_Free}" />
+
+                        <TextBlock
+                            Margin="541.5,42,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="14"
+                            FontWeight="SemiBold"
+                            Foreground="#616469"
+                            LineHeight="22"
+                            Text="{Binding Text_Unregistered}" />
+                        <TextBlock
+                            Margin="675,42,45,0"
+                            FontFamily="Segoe UI"
+                            FontSize="14"
+                            FontWeight="SemiBold"
+                            Foreground="#616469"
+                            LineHeight="22"
+                            Text="{Binding Text_Registered}" />
+
                     </Grid>
                 </Border>
                 <Grid
@@ -240,7 +248,7 @@
                     Background="White">
                     <ListView
                         Name="lvUsers3"
-                        Margin="40,0,40,0"
+                        Margin="16,0,16,0"
                         BorderThickness="0"
                         ItemContainerStyle="{StaticResource ItemContainerStyle1}"
                         ItemsSource="{Binding Items}"
@@ -250,10 +258,10 @@
                         <ListView.View>
                             <GridView ColumnHeaderContainerStyle="{StaticResource myHeaderStyle}">
                                 <GridViewColumn
-                                    Width="515"
+                                    Width="555"
                                     DisplayMemberBinding="{Binding Use}"
                                     Header="Log in to  Free Use" />
-                                <GridViewColumn Width="120" Header="Un">
+                                <GridViewColumn Width="122" Header="Un">
                                     <GridViewColumn.CellTemplate>
                                         <DataTemplate>
                                             <Grid>
@@ -304,16 +312,6 @@
                                             <Setter.Value>
                                                 <ControlTemplate>
                                                     <Expander IsExpanded="True" Style="{StaticResource ExpanderStyle1}">
-                                                        <!--<Expander.Header>
-                                                            <TextBlock
-                                                                VerticalAlignment="Center"
-                                                                FontFamily="Segoe UI"
-                                                                FontSize="14"
-                                                                FontWeight="SemiBold"
-                                                                Foreground="#252629"
-                                                                LineHeight="22"
-                                                                Text="{Binding Name}" />
-                                                        </Expander.Header>-->
                                                         <ItemsPresenter />
                                                     </Expander>
 

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

@@ -71,7 +71,7 @@
                             BorderBrush="#F3465B"
                             BorderThickness="1"
                             Effect="{StaticResource shadow.red-0-4}"
-                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                            Visibility="{Binding ElementName=Grid_UserCodemsgVis, Path=Visibility}" />
                     </Grid>
                     <Grid Margin="9,0,0,0">
                         <TextBox
@@ -95,7 +95,7 @@
                             BorderBrush="#F3465B"
                             BorderThickness="1"
                             Effect="{StaticResource shadow.red-0-4}"
-                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                            Visibility="{Binding ElementName=Grid_UserCodemsgVis, Path=Visibility}" />
                     </Grid>
                     <Grid Margin="9,0,0,0">
                         <TextBox
@@ -119,7 +119,7 @@
                             BorderBrush="#F3465B"
                             BorderThickness="1"
                             Effect="{StaticResource shadow.red-0-4}"
-                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                            Visibility="{Binding ElementName=Grid_UserCodemsgVis, Path=Visibility}" />
                     </Grid>
                     <Grid Margin="9,0,0,0">
                         <TextBox
@@ -143,7 +143,7 @@
                             BorderBrush="#F3465B"
                             BorderThickness="1"
                             Effect="{StaticResource shadow.red-0-4}"
-                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                            Visibility="{Binding ElementName=Grid_UserCodemsgVis, Path=Visibility}" />
                     </Grid>
                     <Grid Margin="9,0,0,0">
                         <TextBox
@@ -167,7 +167,7 @@
                             BorderBrush="#F3465B"
                             BorderThickness="1"
                             Effect="{StaticResource shadow.red-0-4}"
-                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                            Visibility="{Binding ElementName=Grid_UserCodemsgVis, Path=Visibility}" />
                     </Grid>
                     <Grid Margin="9,0,0,0">
                         <TextBox
@@ -197,7 +197,7 @@
                             BorderBrush="#F3465B"
                             BorderThickness="1"
                             Effect="{StaticResource shadow.red-0-4}"
-                            Visibility="{Binding ElementName=Grid_RegisterVis, Path=Visibility}" />
+                            Visibility="{Binding ElementName=Grid_UserCodemsgVis, Path=Visibility}" />
                     </Grid>
 
                 </WrapPanel>