比较表-逻辑和高保真

PDF Office/App.xaml.cs.rej

@@ -0,0 +1,12 @@
+diff a/PDF Office/App.xaml.cs b/PDF Office/App.xaml.cs	(rejected hunks)
+@@ -194,10 +194,6 @@
+                 Settings.Default.UserDate = new PDFSettings.UserDate();
+             }
+ 
+-            if(Settings.Default.AppProperties==null)
+-            {
+-                Settings.Default.AppProperties = new PDFSettings.APPSettingProperties();
+-            }
+ 
+             if (Settings.Default.RecentOpenFiles == null)
+             {

PDF Office/PDF Master.csproj

@@ -2265,6 +2265,8 @@
     </Content>
     <Resource Include="Resources\PromotionIcon\black_pdfreaderpro_home_en.png" />
     <Resource Include="Resources\PromotionIcon\Mac.png" />
+    <Resource Include="Resources\Service\IAPBottom.png" />
+    <Resource Include="Resources\Service\IAPTop.png" />
     <Content Include="Resources\Service\Login.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

PDF Office/PDF Master.csproj.user

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ShowAllFiles</ProjectView>
+  </PropertyGroup>
+</Project>

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

@@ -3,6 +3,10 @@ using Prism.Mvvm;
 using Prism.Regions;
 using Prism.Services.Dialogs;
 using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
 
 namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 {
@@ -15,7 +19,39 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         public event Action<IDialogResult> RequestClose;
 
+        #region 文案
 
+        private string _Text_Signup = "";
+
+        public string Text_Signup
+        {
+            get { return _Text_Signup; }
+            set
+            {
+                SetProperty(ref _Text_Signup, value);
+            }
+        }
+
+        private string _Text_Login = "";
+
+        public string Text_Login
+        {
+            get { return _Text_Login; }
+            set
+            {
+                SetProperty(ref _Text_Login, value);
+            }
+        }
+        private void InitString()
+        {
+
+            Text_Signup = App.ServiceLoader.GetString("Text_Signup");
+
+            Text_Login = App.ServiceLoader.GetString("Text_Login");
+        }
+
+
+        #endregion
 
         private string _IAPRegionName;
         public string IAPRegionName
@@ -24,6 +60,14 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             set { _IAPRegionName = value; }
         }
 
+        private List<User> _Items= new List<User>();
+        public List<User> Items
+        {
+            get { return _Items; }
+            set { _Items = value; }
+        }
+
+
         public bool CanCloseDialog()
         {
             return true;
@@ -38,21 +82,64 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             
         }
+        public enum UseType { CreatePDF, ConvertPDF , AdvancedEditTools, AnnotatePDF, Security};
+
+        public class User
+        {
+          
+            public string Use { get; set; }
+
+            public bool Re { get; set; }
+
+            public bool UnRe { get; set; }
+
+
+    
+            public UseType UseType { get; set; }
+        }
 
         public DelegateCommand GoLoginCommand { get; set; }
         public DelegateCommand GoRegisterCommand { get; set; }
 
 
 
-        IAPCompareDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
+       public IAPCompareDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
            
             IAPRegionName = Guid.NewGuid().ToString();
             GoLoginCommand = new DelegateCommand(GoLogin);
             GoRegisterCommand = new DelegateCommand(GoRegisterd);
+            InitString();
+
+            
+
+            
+
+            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 });
+
+
+            CollectionView view = (CollectionView)CollectionViewSource.GetDefaultView(Items);
+            PropertyGroupDescription groupDescription = new PropertyGroupDescription("UseType");
+            view.GroupDescriptions.Add(groupDescription);
         }
 
 
+
+
         private void GoRegisterd()
         {
 

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

@@ -30,6 +30,13 @@ namespace PDF_Master.Views.Dialog.ServiceDialog
             var regionManager = containerProvider.Resolve<IRegionManager>();
             RegionManager.SetRegionManager(this, regionManager);
             RegionManager.UpdateRegions();
+            
+          
         }
+
+
+   
+
+
     }
 }

PDFSettings/PDFSettings.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
 </Project>