Inicio Explorar Axuda
Rexistro Iniciar sesión
Windows
/
PDFOffice_Windows_exe
2
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

综合-大纲，图章，前面文案，合并高保真调整

zhuyi %!s(int64=2) %!d(string=hai) anos
pai
cd34d5e263
achega
caede0fa84
Modificáronse 16 ficheiros con 506 adicións e 64 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 3 3
      PDF Office/MultilingualResources/PDF Office.en.xlf
  2. 3 3
      PDF Office/MultilingualResources/PDF Office.zh-Hans.xlf
  3. 3 3
      PDF Office/MultilingualResources/PDF Office.zh-Hant.xlf
  4. 3 3
      PDF Office/PDF Office.csproj
  5. 389 0
      PDF Office/Strings/MainPage/MainPage.Designer.cs
  6. 0 0
      PDF Office/ViewModels/Dialog/SignatureCreateDialogViewModel.cs
  7. 14 17
      PDF Office/Views/BOTA/OutLineControl.xaml
  8. 14 1
      PDF Office/Views/BOTA/OutLineControl.xaml.cs
  9. 17 15
      PDF Office/Views/PropertyPanel/AnnotPanel/SignatureCreateDialog.xaml
  10. 21 0
      PDF Office/Views/PropertyPanel/AnnotPanel/SignatureCreateDialog.xaml.cs
  11. 19 16
      PDF Office/Views/Dialog/ToolsDialogs/MergeDialog.xaml
  12. 5 0
      PDF Office/Views/Dialog/ToolsDialogs/MergeDialog.xaml.cs
  13. 2 1
      PDF Office/Views/PropertyPanel/AnnotPanel/SignatureAnnotProperty.xaml
  14. 6 1
      PDF Office/Views/PropertyPanel/AnnotPanel/SignatureAnnotProperty.xaml.cs
  15. 2 1
      PDF Office/Views/PropertyPanel/AnnotPanel/StampAnnotProperty.xaml
  16. 5 0
      PDF Office/Views/PropertyPanel/AnnotPanel/StampAnnotProperty.xaml.cs

+ 3 - 3
PDF Office/MultilingualResources/PDF Office.en.xlf
Ver ficheiro 

@@ -51,7 +51,7 @@
 
       <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.1.12.0" tool-company="Microsoft" />
 
       <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.1.12.0" tool-company="Microsoft" />
 
     </header>
 
     </header>
 
     <body>
 
     <body>
 
-      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx"></group>
 
+      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx" />
 
     </body>
 
     </body>
 
   </file>
 
   </file>
 
   <file datatype="xml" source-language="en-US" target-language="en" original="PDF OFFICE/STRINGS/MAINPAGE/MAINPAGE.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
 
   <file datatype="xml" source-language="en-US" target-language="en" original="PDF OFFICE/STRINGS/MAINPAGE/MAINPAGE.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
 
@@ -230,8 +230,8 @@ Drag files to reorder as you need.</target>
 
           <target state="new">All pages</target>
 
           <target state="new">All pages</target>
 
         </trans-unit>
 
         </trans-unit>
 
         <trans-unit id="WritableComboBox_CustomRange" translate="yes" xml:space="preserve">
 
         <trans-unit id="WritableComboBox_CustomRange" translate="yes" xml:space="preserve">
 
-          <source>eg, 1,3-5,10</source>
 
-          <target state="new">eg, 1,3-5,10</target>
 
+          <source>Custom Range</source>
 
+          <target state="new">Custom Range</target>
 
         </trans-unit>
 
         </trans-unit>
 
         <trans-unit id="WritableComboBox_EvenPage" translate="yes" xml:space="preserve">
 
         <trans-unit id="WritableComboBox_EvenPage" translate="yes" xml:space="preserve">
 
           <source>Even Pages</source>
 
           <source>Even Pages</source>

+ 3 - 3
PDF Office/MultilingualResources/PDF Office.zh-Hans.xlf
Ver ficheiro 

@@ -51,7 +51,7 @@
 
       <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.1.12.0" tool-company="Microsoft" />
 
       <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.1.12.0" tool-company="Microsoft" />
 
     </header>
 
     </header>
 
     <body>
 
     <body>
 
-      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx"></group>
 
+      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx" />
 
     </body>
 
     </body>
 
   </file>
 
   </file>
 
   <file datatype="xml" source-language="en-US" target-language="zh-Hans" original="PDF OFFICE/STRINGS/MAINPAGE/MAINPAGE.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
 
   <file datatype="xml" source-language="en-US" target-language="zh-Hans" original="PDF OFFICE/STRINGS/MAINPAGE/MAINPAGE.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
 
@@ -230,8 +230,8 @@ Drag files to reorder as you need.</target>
 
           <target state="new">All pages</target>
 
           <target state="new">All pages</target>
 
         </trans-unit>
 
         </trans-unit>
 
         <trans-unit id="WritableComboBox_CustomRange" translate="yes" xml:space="preserve">
 
         <trans-unit id="WritableComboBox_CustomRange" translate="yes" xml:space="preserve">
 
-          <source>eg, 1,3-5,10</source>
 
-          <target state="new">eg, 1,3-5,10</target>
 
+          <source>Custom Range</source>
 
+          <target state="new">Custom Range</target>
 
         </trans-unit>
 
         </trans-unit>
 
         <trans-unit id="WritableComboBox_EvenPage" translate="yes" xml:space="preserve">
 
         <trans-unit id="WritableComboBox_EvenPage" translate="yes" xml:space="preserve">
 
           <source>Even Pages</source>
 
           <source>Even Pages</source>

+ 3 - 3
PDF Office/MultilingualResources/PDF Office.zh-Hant.xlf
Ver ficheiro 

@@ -51,7 +51,7 @@
 
       <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.1.12.0" tool-company="Microsoft" />
 
       <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.1.12.0" tool-company="Microsoft" />
 
     </header>
 
     </header>
 
     <body>
 
     <body>
 
-      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx"></group>
 
+      <group id="PDF OFFICE/STRINGS/HOMEPAGE/HOMEPAGE.RESX" datatype="resx" />
 
     </body>
 
     </body>
 
   </file>
 
   </file>
 
   <file datatype="xml" source-language="en-US" target-language="zh-Hant" original="PDF OFFICE/STRINGS/MAINPAGE/MAINPAGE.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
 
   <file datatype="xml" source-language="en-US" target-language="zh-Hant" original="PDF OFFICE/STRINGS/MAINPAGE/MAINPAGE.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
 
@@ -230,8 +230,8 @@ Drag files to reorder as you need.</target>
 
           <target state="new">All pages</target>
 
           <target state="new">All pages</target>
 
         </trans-unit>
 
         </trans-unit>
 
         <trans-unit id="WritableComboBox_CustomRange" translate="yes" xml:space="preserve">
 
         <trans-unit id="WritableComboBox_CustomRange" translate="yes" xml:space="preserve">
 
-          <source>eg, 1,3-5,10</source>
 
-          <target state="new">eg, 1,3-5,10</target>
 
+          <source>Custom Range</source>
 
+          <target state="new">Custom Range</target>
 
         </trans-unit>
 
         </trans-unit>
 
         <trans-unit id="WritableComboBox_EvenPage" translate="yes" xml:space="preserve">
 
         <trans-unit id="WritableComboBox_EvenPage" translate="yes" xml:space="preserve">
 
           <source>Even Pages</source>
 
           <source>Even Pages</source>

+ 3 - 3
PDF Office/PDF Office.csproj
Ver ficheiro 

@@ -538,7 +538,7 @@
 
     <Compile Include="ViewModels\HomePanel\PDFTools\PDFToolsContentViewModel.cs" />

     <Compile Include="ViewModels\HomePanel\PDFTools\PDFToolsContentViewModel.cs" />

     <Compile Include="ViewModels\HomePanel\PDFTools\QuickToolsContentViewModel.cs" />

     <Compile Include="ViewModels\HomePanel\PDFTools\QuickToolsContentViewModel.cs" />

     <Compile Include="ViewModels\PropertyPanel\AnnotPanel\SignatureAnnotPropertyViewModel.cs" />

     <Compile Include="ViewModels\PropertyPanel\AnnotPanel\SignatureAnnotPropertyViewModel.cs" />

-    <Compile Include="ViewModels\PropertyPanel\AnnotPanel\SignatureCreateDialogViewModel.cs" />

+    <Compile Include="ViewModels\Dialog\SignatureCreateDialogViewModel.cs" />

     <Compile Include="ViewModels\PropertyPanel\AnnotPanel\SnapshotEditMenuViewModel.cs" />

     <Compile Include="ViewModels\PropertyPanel\AnnotPanel\SnapshotEditMenuViewModel.cs" />

     <Compile Include="ViewModels\PropertyPanel\AnnotPanel\StickyNotePropertyViewModel.cs" />

     <Compile Include="ViewModels\PropertyPanel\AnnotPanel\StickyNotePropertyViewModel.cs" />

     <Compile Include="ViewModels\PropertyPanel\PDFEdit\ImageEditPropertyViewModel.cs" />

     <Compile Include="ViewModels\PropertyPanel\PDFEdit\ImageEditPropertyViewModel.cs" />

@@ -1082,7 +1082,7 @@
 
     <Compile Include="Views\PropertyPanel\AnnotPanel\SignatureAnnotProperty.xaml.cs">

     <Compile Include="Views\PropertyPanel\AnnotPanel\SignatureAnnotProperty.xaml.cs">

       <DependentUpon>SignatureAnnotProperty.xaml</DependentUpon>

       <DependentUpon>SignatureAnnotProperty.xaml</DependentUpon>

     </Compile>

     </Compile>

-    <Compile Include="Views\PropertyPanel\AnnotPanel\SignatureCreateDialog.xaml.cs">

+    <Compile Include="Views\Dialog\SignatureCreateDialog.xaml.cs">

       <DependentUpon>SignatureCreateDialog.xaml</DependentUpon>

       <DependentUpon>SignatureCreateDialog.xaml</DependentUpon>

     </Compile>

     </Compile>

     <Compile Include="Views\PropertyPanel\AnnotPanel\SnapshotEditMenu.xaml.cs">

     <Compile Include="Views\PropertyPanel\AnnotPanel\SnapshotEditMenu.xaml.cs">

@@ -1867,7 +1867,7 @@
 
       <SubType>Designer</SubType>

       <SubType>Designer</SubType>

       <Generator>MSBuild:Compile</Generator>

       <Generator>MSBuild:Compile</Generator>

     </Page>

     </Page>

-    <Page Include="Views\PropertyPanel\AnnotPanel\SignatureCreateDialog.xaml">

+    <Page Include="Views\Dialog\SignatureCreateDialog.xaml">

       <SubType>Designer</SubType>

       <SubType>Designer</SubType>

       <Generator>MSBuild:Compile</Generator>

       <Generator>MSBuild:Compile</Generator>

     </Page>

     </Page>

+ 389 - 0
PDF Office/Strings/MainPage/MainPage.Designer.cs
Ver ficheiro 

@@ -59,5 +59,394 @@ namespace PDF_Office.Strings.MainPage {
 
                 resourceCulture = value;
 
                 resourceCulture = value;
 
             }
 
             }
 
         }
 
         }
 
+        
+        /// <summary>
 
+        ///   查找类似 Add Files 的本地化字符串。
 
+        /// </summary>
 
+        public static string Merge_AddFiles {
 
+            get {
 
+                return ResourceManager.GetString("Merge_AddFiles", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Add an Open File 的本地化字符串。
 
+        /// </summary>
 
+        public static string Merge_AddOpenFile {
 
+            get {
 
+                return ResourceManager.GetString("Merge_AddOpenFile", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Selected files
 
+        ///Drop files here or Click “Add Files” at bottom right button. 
+        ///Drag files to reorder as you need. 的本地化字符串。
 
+        /// </summary>
 
+        public static string Merge_Hint {
 
+            get {
 
+                return ResourceManager.GetString("Merge_Hint", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Pages 的本地化字符串。
 
+        /// </summary>
 
+        public static string Merge_ItemPages {
 
+            get {
 
+                return ResourceManager.GetString("Merge_ItemPages", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Cancel 的本地化字符串。
 
+        /// </summary>
 
+        public static string Merge_No {
 
+            get {
 
+                return ResourceManager.GetString("Merge_No", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 File Name 的本地化字符串。
 
+        /// </summary>
 
+        public static string Merge_TitleFileName {
 
+            get {
 
+                return ResourceManager.GetString("Merge_TitleFileName", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Page Range 的本地化字符串。
 
+        /// </summary>
 
+        public static string Merge_TitlePageRange {
 
+            get {
 
+                return ResourceManager.GetString("Merge_TitlePageRange", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Size 的本地化字符串。
 
+        /// </summary>
 
+        public static string Merge_TitleSize {
 
+            get {
 
+                return ResourceManager.GetString("Merge_TitleSize", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Merge 的本地化字符串。
 
+        /// </summary>
 
+        public static string Merge_Yes {
 
+            get {
 
+                return ResourceManager.GetString("Merge_Yes", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Add Item 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_Add {
 
+            get {
 
+                return ResourceManager.GetString("Outline_Add", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Add To Higher Level 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_AddLevel {
 
+            get {
 
+                return ResourceManager.GetString("Outline_AddLevel", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Add Sub-Item 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_AddSub {
 
+            get {
 
+                return ResourceManager.GetString("Outline_AddSub", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Change Destination 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_Change {
 
+            get {
 
+                return ResourceManager.GetString("Outline_Change", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Collapse All 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_Collapse {
 
+            get {
 
+                return ResourceManager.GetString("Outline_Collapse", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Delete 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_Delete {
 
+            get {
 
+                return ResourceManager.GetString("Outline_Delete", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Are you sure you want to set the destination as the current location? 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_DialogContent {
 
+            get {
 
+                return ResourceManager.GetString("Outline_DialogContent", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 No 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_DialogNO {
 
+            get {
 
+                return ResourceManager.GetString("Outline_DialogNO", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Yes 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_DialogYes {
 
+            get {
 
+                return ResourceManager.GetString("Outline_DialogYes", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Demote 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_Down {
 
+            get {
 
+                return ResourceManager.GetString("Outline_Down", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Expand All 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_Expand {
 
+            get {
 
+                return ResourceManager.GetString("Outline_Expand", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Remove All Outlines 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_RemoveAll {
 
+            get {
 
+                return ResourceManager.GetString("Outline_RemoveAll", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Rename 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_Rename {
 
+            get {
 
+                return ResourceManager.GetString("Outline_Rename", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Outline 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_Title {
 
+            get {
 
+                return ResourceManager.GetString("Outline_Title", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Promote 的本地化字符串。
 
+        /// </summary>
 
+        public static string Outline_Up {
 
+            get {
 
+                return ResourceManager.GetString("Outline_Up", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Clear 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogClear {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogClear", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Drawing 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogDraw {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogDraw", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Sign here 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogDrawHint {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogDrawHint", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Cancel 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogNo {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogNo", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Image 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogPicture {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogPicture", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Select image file 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogPictureHint {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogPictureHint", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Remove Background 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogPictureReBkg {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogPictureReBkg", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Remove white background from images 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogPictureReBkgHint {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogPictureReBkgHint", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Reselect 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogPictureReselect {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogPictureReselect", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Keyboard 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogText {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogText", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Enter your signature here 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogTextHint {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogTextHint", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Create New Signature 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogTitle {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogTitle", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Apply 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_DialogYes {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_DialogYes", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Signature 的本地化字符串。
 
+        /// </summary>
 
+        public static string Signatur_Title {
 
+            get {
 
+                return ResourceManager.GetString("Signatur_Title", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Stamp 的本地化字符串。
 
+        /// </summary>
 
+        public static string Stamp_Title {
 
+            get {
 
+                return ResourceManager.GetString("Stamp_Title", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 All pages 的本地化字符串。
 
+        /// </summary>
 
+        public static string WritableComboBox_AllPage {
 
+            get {
 
+                return ResourceManager.GetString("WritableComboBox_AllPage", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Custom Range 的本地化字符串。
 
+        /// </summary>
 
+        public static string WritableComboBox_CustomRange {
 
+            get {
 
+                return ResourceManager.GetString("WritableComboBox_CustomRange", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Even Pages 的本地化字符串。
 
+        /// </summary>
 
+        public static string WritableComboBox_EvenPage {
 
+            get {
 
+                return ResourceManager.GetString("WritableComboBox_EvenPage", resourceCulture);
 
+            }
 
+        }
 
+        
+        /// <summary>
 
+        ///   查找类似 Odd Pages 的本地化字符串。
 
+        /// </summary>
 
+        public static string WritableComboBox_OddPage {
 
+            get {
 
+                return ResourceManager.GetString("WritableComboBox_OddPage", resourceCulture);
 
+            }
 
+        }
 
     }
 
     }
 
 }
 
 }

PDF Office/ViewModels/PropertyPanel/AnnotPanel/SignatureCreateDialogViewModel.cs → PDF Office/ViewModels/Dialog/SignatureCreateDialogViewModel.cs
Ver ficheiro


+ 14 - 17
PDF Office/Views/BOTA/OutLineControl.xaml
Ver ficheiro 

@@ -8,8 +8,9 @@
 
     xmlns:local="clr-namespace:PDF_Office.Views.BOTA"
 
     xmlns:local="clr-namespace:PDF_Office.Views.BOTA"
 
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 
     xmlns:model="clr-namespace:PDF_Office.Model.BOTA"
 
     xmlns:model="clr-namespace:PDF_Office.Model.BOTA"
 
-    x:Name="ttt"
 
+    xmlns:mainPageLoader="clr-namespace:PDF_Office.Strings.MainPage"
 
     d:DataContext="{d:DesignInstance Type=bota:OutLineControlViewModel}"
 
     d:DataContext="{d:DesignInstance Type=bota:OutLineControlViewModel}"
 
+    Loaded="UserControl_Loaded"
 
     mc:Ignorable="d">
 
     mc:Ignorable="d">
 
     <UserControl.Resources>
 
     <UserControl.Resources>
 
         <ResourceDictionary>
 
         <ResourceDictionary>
 
@@ -32,8 +33,7 @@
 
                     VerticalAlignment="Center"
 
                     VerticalAlignment="Center"
 
                     FontFamily="Segoe UI"
 
                     FontFamily="Segoe UI"
 
                     FontSize="14"
 
                     FontSize="14"
 
-                    FontWeight="SemiBold"
 
-                    Text="Outline" />
 
+                    FontWeight="SemiBold"/>
 
                 <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
 
                 <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
 
                     <customcontrol:PathButton
 
                     <customcontrol:PathButton
 
                         x:Name="BtnAdd"
 
                         x:Name="BtnAdd"
 
@@ -82,17 +82,14 @@
 
                                 <MenuItem
 
                                 <MenuItem
 
                                     Name="MenuExpandAll"
 
                                     Name="MenuExpandAll"
 
                                     Command="{Binding ExpandAllCommand}"
 
                                     Command="{Binding ExpandAllCommand}"
 
-                                    CommandParameter="{Binding Outlinelist}"
 
-                                    Header="一键展开" />
 
+                                    CommandParameter="{Binding Outlinelist}" />
 
                                 <MenuItem
 
                                 <MenuItem
 
                                     Name="MenuCollapseAll"
 
                                     Name="MenuCollapseAll"
 
                                     Command="{Binding CollapseAllCommand}"
 
                                     Command="{Binding CollapseAllCommand}"
 
-                                    CommandParameter="{Binding Outlinelist}"
 
-                                    Header="一键折叠" />
 
+                                    CommandParameter="{Binding Outlinelist}"/>
 
                                 <MenuItem
 
                                 <MenuItem
 
                                     Name="MenuDeleteAll"
 
                                     Name="MenuDeleteAll"
 
-                                    Command="{Binding DeleteAllCommand}"
 
-                                    Header="Delete All Outline" />
 
+                                    Command="{Binding DeleteAllCommand}" />
 
                             </ContextMenu>
 
                             </ContextMenu>
 
                         </customcontrol:PathButton.ContextMenu>
 
                         </customcontrol:PathButton.ContextMenu>
 
                     </customcontrol:PathButton>
 
                     </customcontrol:PathButton>
 
@@ -172,40 +169,40 @@
 
                                     <MenuItem
 
                                     <MenuItem
 
                                         x:Name="AddMenu"
 
                                         x:Name="AddMenu"
 
                                         Click="AddMenu_Click"
 
                                         Click="AddMenu_Click"
 
-                                        Header="添加条目" />
 
+                                        Header="{x:Static mainPageLoader:MainPage.Outline_Add}" />
 
                                     <MenuItem
 
                                     <MenuItem
 
                                         x:Name="AddChlidMenu"
 
                                         x:Name="AddChlidMenu"
 
                                         Click="AddChlidMenu_Click"
 
                                         Click="AddChlidMenu_Click"
 
-                                        Header="添加子条目" />
 
+                                        Header="{x:Static mainPageLoader:MainPage.Outline_AddSub}" />
 
                                     <MenuItem
 
                                     <MenuItem
 
                                         x:Name="AddParentMenu"
 
                                         x:Name="AddParentMenu"
 
                                         Click="AddParentMenu_Click"
 
                                         Click="AddParentMenu_Click"
 
-                                        Header="添加上一级条目"
 
+                                        Header="{x:Static mainPageLoader:MainPage.Outline_AddLevel}"
 
                                         IsEnabled="{Binding CanAddParent}" />
 
                                         IsEnabled="{Binding CanAddParent}" />
 
 
 
                                     <MenuItem
 
                                     <MenuItem
 
                                         x:Name="DeleteMenu"
 
                                         x:Name="DeleteMenu"
 
                                         Click="DeleteMenu_Click"
 
                                         Click="DeleteMenu_Click"
 
-                                        Header="删除" />
 
+                                        Header="{x:Static mainPageLoader:MainPage.Outline_Delete}" />
 
 
 
                                     <MenuItem
 
                                     <MenuItem
 
                                         x:Name="RenameMenu"
 
                                         x:Name="RenameMenu"
 
                                         Click="RenameMenu_Click"
 
                                         Click="RenameMenu_Click"
 
-                                        Header="重命名" />
 
+                                        Header="{x:Static mainPageLoader:MainPage.Outline_Rename}" />
 
                                     <MenuItem
 
                                     <MenuItem
 
                                         x:Name="ChangeDestinationMenu"
 
                                         x:Name="ChangeDestinationMenu"
 
                                         Click="ChangeDestinationMenu_Click"
 
                                         Click="ChangeDestinationMenu_Click"
 
-                                        Header="更改目标位置" />
 
+                                        Header="{x:Static mainPageLoader:MainPage.Outline_Change}" />
 
 
 
                                     <MenuItem
 
                                     <MenuItem
 
                                         x:Name="UpgradeMenu"
 
                                         x:Name="UpgradeMenu"
 
                                         Click="UpgradeMenu_Click"
 
                                         Click="UpgradeMenu_Click"
 
-                                        Header="升级"
 
+                                        Header="{x:Static mainPageLoader:MainPage.Outline_Up}"
 
                                         IsEnabled="{Binding CanUp}" />
 
                                         IsEnabled="{Binding CanUp}" />
 
                                     <MenuItem
 
                                     <MenuItem
 
                                         x:Name="DowngradeMenu"
 
                                         x:Name="DowngradeMenu"
 
                                         Click="DowngradeMenu_Click"
 
                                         Click="DowngradeMenu_Click"
 
-                                        Header="降级"
 
+                                        Header="{x:Static mainPageLoader:MainPage.Outline_Down}"
 
                                         IsEnabled="{Binding CanDown}" />
 
                                         IsEnabled="{Binding CanDown}" />
 
                                 </ContextMenu>
 
                                 </ContextMenu>
 
                             </Grid.ContextMenu>
 
                             </Grid.ContextMenu>

+ 14 - 1
PDF Office/Views/BOTA/OutLineControl.xaml.cs
Ver ficheiro 

@@ -56,6 +56,11 @@ namespace PDF_Office.Views.BOTA
 
             InitializeComponent();
 
             InitializeComponent();
 
         }
 
         }
 
 
 
+        private void LoadedLangText()
 
+        {
 
+
 
+        }
 
+
 
         private void BtnMore_Click(object sender, RoutedEventArgs e)
 
         private void BtnMore_Click(object sender, RoutedEventArgs e)
 
         {
 
         {
 
             MenuMore.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom;
 
             MenuMore.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom;
 
@@ -399,7 +404,7 @@ namespace PDF_Office.Views.BOTA
 
         private void ChangeDestinationMenu_Click(object sender, RoutedEventArgs e)
 
         private void ChangeDestinationMenu_Click(object sender, RoutedEventArgs e)
 
         {
 
         {
 
             AlertsMessage alertsMessage = new AlertsMessage();
 
             AlertsMessage alertsMessage = new AlertsMessage();
 
-            alertsMessage.ShowDialog("提示", "确定要将选定大纲的目标位置设置为当前位置吗？", "Cancel", "OK");
 
+            alertsMessage.ShowDialog("", App.MainPageLoader.GetString("Outline_DialogContent"), App.MainPageLoader.GetString("Outline_DialogNO"), App.MainPageLoader.GetString("Outline_DialogYes"));
 
             if (alertsMessage.result == ContentResult.Ok)
 
             if (alertsMessage.result == ContentResult.Ok)
 
             {
 
             {
 
                 (DataContext as OutLineControlViewModel).ChangeOutLineDestination((sender as MenuItem).DataContext as OutlineNode);
 
                 (DataContext as OutLineControlViewModel).ChangeOutLineDestination((sender as MenuItem).DataContext as OutlineNode);
 
@@ -474,5 +479,13 @@ namespace PDF_Office.Views.BOTA
 
                 OutlineView.Focus();
 
                 OutlineView.Focus();
 
             }
 
             }
 
         }
 
         }
 
+
 
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
 
+        {
 
+            TxtTitle.Text = App.MainPageLoader.GetString("Outline_Title");
 
+            MenuExpandAll.Header = App.MainPageLoader.GetString("Outline_Expand");
 
+            MenuCollapseAll.Header = App.MainPageLoader.GetString("Outline_Collapse");
 
+            MenuDeleteAll.Header = App.MainPageLoader.GetString("Outline_RemoveAll");
 
+        }
 
     }
 
     }
 
 }
 
 }

+ 17 - 15
PDF Office/Views/PropertyPanel/AnnotPanel/SignatureCreateDialog.xaml
Ver ficheiro 

@@ -6,6 +6,7 @@
 
              xmlns:local="clr-namespace:PDF_Office.Views.PropertyPanel.AnnotPanel" xmlns:cus="clr-namespace:PDF_Office.CustomControl" xmlns:annotpanel="clr-namespace:PDF_Office.ViewModels.PropertyPanel.AnnotPanel" xmlns:dataconvert="clr-namespace:PDF_Office.DataConvert" xmlns:i="http://schemas.microsoft.com/xaml/behaviors" d:DataContext="{d:DesignInstance Type=annotpanel:SignatureCreateDialogViewModel}"
 
              xmlns:local="clr-namespace:PDF_Office.Views.PropertyPanel.AnnotPanel" xmlns:cus="clr-namespace:PDF_Office.CustomControl" xmlns:annotpanel="clr-namespace:PDF_Office.ViewModels.PropertyPanel.AnnotPanel" xmlns:dataconvert="clr-namespace:PDF_Office.DataConvert" xmlns:i="http://schemas.microsoft.com/xaml/behaviors" d:DataContext="{d:DesignInstance Type=annotpanel:SignatureCreateDialogViewModel}"
 
              xmlns:prism="http://prismlibrary.com/"
 
              xmlns:prism="http://prismlibrary.com/"
 
              prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
 
              prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
 
+             Loaded="UserControl_Loaded"
 
              Width="468"
 
              Width="468"
 
              Height="392"
 
              Height="392"
 
              mc:Ignorable="d" >
 
              mc:Ignorable="d" >
 
@@ -40,13 +41,13 @@
 
             </Setter>
 
             </Setter>
 
         </Style>
 
         </Style>
 
     </UserControl.Resources>
 
     </UserControl.Resources>
 
-    <cus:DialogContent Header="新建签名">
 
+    <cus:DialogContent x:Name="DialogHeader">
 
         <cus:DialogContent.Content>
 
         <cus:DialogContent.Content>
 
             <TabControl
 
             <TabControl
 
                 BorderThickness="0"
 
                 BorderThickness="0"
 
                 Style="{StaticResource FormTabControl }"
 
                 Style="{StaticResource FormTabControl }"
 
                 SelectedIndex="{Binding TabItemIndex,Mode=TwoWay}">
 
                 SelectedIndex="{Binding TabItemIndex,Mode=TwoWay}">
 
-                <TabItem Header="Input">
 
+                <TabItem x:Name="InputItem">
 
                     <Grid>
 
                     <Grid>
 
                         <Grid.RowDefinitions>
 
                         <Grid.RowDefinitions>
 
                             <RowDefinition Height="*"/>
 
                             <RowDefinition Height="*"/>
 
@@ -58,6 +59,7 @@
 
                             <ColumnDefinition Width="16"/>
 
                             <ColumnDefinition Width="16"/>
 
                         </Grid.ColumnDefinitions>
 
                         </Grid.ColumnDefinitions>
 
                         <cus:TextBoxEx 
                         <cus:TextBoxEx 
+                            x:Name="InPutTextBox"
 
                             FontFamily="{Binding ElementName=TextComBox,Path=SelectedValue, TargetNullValue=Segoe UI}" 
                             FontFamily="{Binding ElementName=TextComBox,Path=SelectedValue, TargetNullValue=Segoe UI}" 
                             Background="{StaticResource color.sys.layout.mg}" Grid.Column="1" 
                             Background="{StaticResource color.sys.layout.mg}" Grid.Column="1" 
                             TextChanged="TextBoxEx_TextChanged"
 
                             TextChanged="TextBoxEx_TextChanged"
 
@@ -65,7 +67,7 @@
 
                             HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  
                             HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  
                             ShowClose="False" Text="{Binding InputText,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
 
                             ShowClose="False" Text="{Binding InputText,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
 
                             Foreground ="{Binding RadioButtonIndex,Converter={StaticResource IntToColorBrush}}"  />
 
                             Foreground ="{Binding RadioButtonIndex,Converter={StaticResource IntToColorBrush}}"  />
 
-                        <Button Margin="0,0,8,24" Visibility="{Binding ShowTextButton}" Content="Clear"  Style="{StaticResource btn.sec}" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="24" Width="43" Command="{Binding ClearTextCommnad}" />
 
+                        <Button x:Name="BtnTextClear" Margin="0,0,8,24" Visibility="{Binding ShowTextButton}" Style="{StaticResource btn.sec}" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="24" Width="43" Command="{Binding ClearTextCommnad}" />
 
                         <ComboBox Grid.Row="1" Grid.Column="1" x:Name="TextComBox"
 
                         <ComboBox Grid.Row="1" Grid.Column="1" x:Name="TextComBox"
 
                         Width="200"
 
                         Width="200"
 
                         HorizontalAlignment="Left"
 
                         HorizontalAlignment="Left"
 
@@ -156,7 +158,7 @@
 
                         </StackPanel>
 
                         </StackPanel>
 
                     </Grid>
 
                     </Grid>
 
                 </TabItem>
 
                 </TabItem>
 
-                <TabItem Header="Drawing">
 
+                <TabItem x:Name="DrawItem">
 
                     <Grid>
 
                     <Grid>
 
                         <Grid.RowDefinitions>
 
                         <Grid.RowDefinitions>
 
                             <RowDefinition Height="*"/>
 
                             <RowDefinition Height="*"/>
 
@@ -179,9 +181,9 @@
 
                                             <Binding Path="IsMouseDown"/>
 
                                             <Binding Path="IsMouseDown"/>
 
                                         </MultiBinding>
 
                                         </MultiBinding>
 
                                     </Grid.Visibility>
 
                                     </Grid.Visibility>
 
-                                    <TextBlock Text="此处绘制签名" VerticalAlignment="Center" HorizontalAlignment="Center"/>
 
+                                    <TextBlock x:Name="DrawHint" VerticalAlignment="Center" HorizontalAlignment="Center"/>
 
                                 </Grid>
 
                                 </Grid>
 
-                                <Button Style="{StaticResource btn.sec}" Margin="0,0,8,8" Width="43" Height="24" HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="Clear" Command="{Binding ClearInkCanvasCommnad}" Visibility="{Binding ElementName=PlanGrid,Path=Visibility,Converter={StaticResource UnVisivleConvert}}"/>
 
+                                <Button x:Name="BtnDrawClear" Style="{StaticResource btn.sec}" Margin="0,0,8,8" Width="43" Height="24" HorizontalAlignment="Right" VerticalAlignment="Bottom" Command="{Binding ClearInkCanvasCommnad}" Visibility="{Binding ElementName=PlanGrid,Path=Visibility,Converter={StaticResource UnVisivleConvert}}"/>
 
                             </Grid>
 
                             </Grid>
 
                         </Border>
 
                         </Border>
 
                         <ComboBox Grid.Row="1" Grid.Column="1" 
                         <ComboBox Grid.Row="1" Grid.Column="1" 
@@ -274,7 +276,7 @@
 
                         </StackPanel>
 
                         </StackPanel>
 
                     </Grid>
 
                     </Grid>
 
                 </TabItem>
 
                 </TabItem>
 
-                <TabItem Header="Picture">
 
+                <TabItem x:Name="PictureItem">
 
                     <Grid>
 
                     <Grid>
 
                         <Grid.RowDefinitions>
 
                         <Grid.RowDefinitions>
 
                             <RowDefinition Height="*"/>
 
                             <RowDefinition Height="*"/>
 
@@ -295,7 +297,7 @@
 
                                 IconPress="pack://application:,,,/PDF Office;component/Resources/Dialog/AddImageSuspend.png"  
                                 IconPress="pack://application:,,,/PDF Office;component/Resources/Dialog/AddImageSuspend.png"  
                                 IconMouseOver="pack://application:,,,/PDF Office;component/Resources/Dialog/AddImageSuspend.png"   
                                 IconMouseOver="pack://application:,,,/PDF Office;component/Resources/Dialog/AddImageSuspend.png"   
                                 Command="{Binding OpenImageCommnad}"/>
 
                                 Command="{Binding OpenImageCommnad}"/>
 
-                                    <TextBlock Text="Select image file" FontWeight="Regular" FontSize="14" FontFamily="Segoe UI" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource color.sys.text.neutral.lv3}"/>
 
+                                    <TextBlock x:Name="ImageHint" FontWeight="Regular" FontSize="14" FontFamily="Segoe UI" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource color.sys.text.neutral.lv3}"/>
 
                                 </StackPanel>
 
                                 </StackPanel>
 
                                 <Grid Visibility="{Binding ElementName=AddStackPanel,Path=Visibility,Converter={StaticResource UnVisivleConvert}}">
 
                                 <Grid Visibility="{Binding ElementName=AddStackPanel,Path=Visibility,Converter={StaticResource UnVisivleConvert}}">
 
                                     <Grid.RowDefinitions>
 
                                     <Grid.RowDefinitions>
 
@@ -303,20 +305,20 @@
 
                                         <RowDefinition Height="*"/>
 
                                         <RowDefinition Height="*"/>
 
                                     </Grid.RowDefinitions>
 
                                     </Grid.RowDefinitions>
 
                                     <Image Grid.RowSpan="2" Width="200" Height="200" Source="{Binding ImagePreviewSource}" />
 
                                     <Image Grid.RowSpan="2" Width="200" Height="200" Source="{Binding ImagePreviewSource}" />
 
-                                    <Button Style="{StaticResource btn.sec}" Grid.Row="1" Width="60" Height="24" Margin="0,0,8,8" HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="重新选择" Command="{Binding OpenImageCommnad}"/>
 
+                                    <Button x:Name="BtnPictureReselect" Style="{StaticResource btn.sec}" Grid.Row="1" Width="60" Height="24" Margin="0,0,8,8" HorizontalAlignment="Right" VerticalAlignment="Bottom" Command="{Binding OpenImageCommnad}"/>
 
                                 </Grid>
 
                                 </Grid>
 
                             </Grid>
 
                             </Grid>
 
                         </Border>
 
                         </Border>
 
                         <StackPanel Grid.Column="1"   Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
 
                         <StackPanel Grid.Column="1"   Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
 
                             <CheckBox Width="20" Height="20" IsChecked="{Binding IsRemoveBackground}"/>
 
                             <CheckBox Width="20" Height="20" IsChecked="{Binding IsRemoveBackground}"/>
 
-                            <TextBlock Text="Clear background" FontSize="14" FontFamily="Segoe UI" HorizontalAlignment="Center" VerticalAlignment="Center"/>
 
+                            <TextBlock x:Name="BtnReBkg" FontSize="14" FontFamily="Segoe UI" HorizontalAlignment="Center" VerticalAlignment="Center"/>
 
                             <cus:ImageButton Margin="8,0,0,0"
 
                             <cus:ImageButton Margin="8,0,0,0"
 
                                 Height="16" Width="16" IconHeight="16" IconWidth="16"  
                                 Height="16" Width="16" IconHeight="16" IconWidth="16"  
                                 Icon="pack://application:,,,/PDF Office;component/Resources/Dialog/help.png"  
                                 Icon="pack://application:,,,/PDF Office;component/Resources/Dialog/help.png"  
                                 IconPress="pack://application:,,,/PDF Office;component/Resources/Dialog/help.png"  
                                 IconPress="pack://application:,,,/PDF Office;component/Resources/Dialog/help.png"  
                                 IconMouseOver="pack://application:,,,/PDF Office;component/Resources/Dialog/help.png">
 
                                 IconMouseOver="pack://application:,,,/PDF Office;component/Resources/Dialog/help.png">
 
                                 <cus:ImageButton.ToolTip >
 
                                 <cus:ImageButton.ToolTip >
 
-                                    <ToolTip Style ="{StaticResource TriangleToolTipStyle}" Placement="Bottom" Content="Remove white background from images" >
 
+                                    <ToolTip Style ="{StaticResource TriangleToolTipStyle}" x:Name="BtnReBkgHint" Placement="Bottom" >
 
                                         <ToolTip.HorizontalOffset>
 
                                         <ToolTip.HorizontalOffset>
 
                                             <MultiBinding Converter="{StaticResource CenterToolTipConverter}">
 
                                             <MultiBinding Converter="{StaticResource CenterToolTipConverter}">
 
                                                 <Binding RelativeSource="{RelativeSource Self}" Path="PlacementTarget.ActualWidth"/>
 
                                                 <Binding RelativeSource="{RelativeSource Self}" Path="PlacementTarget.ActualWidth"/>
 
@@ -335,13 +337,13 @@
 
         <cus:DialogContent.BottmBar>
 
         <cus:DialogContent.BottmBar>
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
 
                 <Button
 
                 <Button
 
+                    x:Name="BtnOK"
 
                     Style="{StaticResource Btn.cta}"
 
                     Style="{StaticResource Btn.cta}"
 
                     Grid.Column="0"
 
                     Grid.Column="0"
 
                     Width="80"
 
                     Width="80"
 
                     Height="32"
 
                     Height="32"
 
                     HorizontalAlignment="Right"
 
                     HorizontalAlignment="Right"
 
-                    Command="{Binding CreateCommnad}"
 
-                    Content="确定" >
 
+                    Command="{Binding CreateCommnad}">
 
                     <Button.IsEnabled>
 
                     <Button.IsEnabled>
 
                         <MultiBinding Converter="{StaticResource SignatureButtonConvert }" Mode="OneWay">
 
                         <MultiBinding Converter="{StaticResource SignatureButtonConvert }" Mode="OneWay">
 
                             <Binding Path="TabItemIndex"/>
 
                             <Binding Path="TabItemIndex"/>
 
@@ -352,14 +354,14 @@
 
                     </Button.IsEnabled>
 
                     </Button.IsEnabled>
 
                 </Button>
 
                 </Button>
 
                 <Button
 
                 <Button
 
+                   x:Name="BtnNo"
 
                     Style="{StaticResource btn.sec}"
 
                     Style="{StaticResource btn.sec}"
 
                     Grid.Column="2"
 
                     Grid.Column="2"
 
                     Width="80"
 
                     Width="80"
 
                     Height="32"
 
                     Height="32"
 
                     Margin="16,0,16,0"
 
                     Margin="16,0,16,0"
 
                     HorizontalAlignment="Left"
 
                     HorizontalAlignment="Left"
 
-                    Command="{Binding CancelCommand}"
 
-                    Content="取消" />
 
+                    Command="{Binding CancelCommand}"/>
 
             </StackPanel>
 
             </StackPanel>
 
         </cus:DialogContent.BottmBar>
 
         </cus:DialogContent.BottmBar>
 
     </cus:DialogContent>
 
     </cus:DialogContent>

+ 21 - 0
PDF Office/Views/PropertyPanel/AnnotPanel/SignatureCreateDialog.xaml.cs
Ver ficheiro 

@@ -61,5 +61,26 @@ namespace PDF_Office.Views.PropertyPanel.AnnotPanel
 
         {
 
         {
 
             (DataContext as SignatureCreateDialogViewModel).IsMouseDown = false;
 
             (DataContext as SignatureCreateDialogViewModel).IsMouseDown = false;
 
         }
 
         }
 
+
 
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
 
+        {
 
+            DialogHeader.Header = App.MainPageLoader.GetString("Signatur_DialogTitle");
 
+            BtnOK.Content = App.MainPageLoader.GetString("Signatur_DialogYes");
 
+            BtnNo.Content = App.MainPageLoader.GetString("Signatur_DialogNo");
 
+
 
+            InputItem.Header = App.MainPageLoader.GetString("Signatur_DialogText");
 
+            InPutTextBox.PlaceholderText = App.MainPageLoader.GetString("Signatur_DialogTextHint");
 
+            BtnTextClear.Content = App.MainPageLoader.GetString("Signatur_DialogClear");
 
+
 
+            DrawItem.Header = App.MainPageLoader.GetString("Signatur_DialogDraw");
 
+            DrawHint.Text = App.MainPageLoader.GetString("Signatur_DialogPictureHint");
 
+            BtnDrawClear.Content = App.MainPageLoader.GetString("Signatur_DialogClear");
 
+
 
+            PictureItem.Header = App.MainPageLoader.GetString("Signatur_DialogPicture");
 
+            BtnPictureReselect.Content= App.MainPageLoader.GetString("Signatur_DialogPictureReselect");
 
+            ImageHint.Text = App.MainPageLoader.GetString("Signatur_DialogPictureHint");
 
+            BtnReBkg.Text = App.MainPageLoader.GetString("Signatur_DialogPictureReBkg");
 
+            BtnReBkgHint.Content = App.MainPageLoader.GetString("Signatur_DialogPictureReBkgHint");
 
+        }
 
     }
 
     }
 
 }
 
 }

+ 19 - 16
PDF Office/Views/Dialog/ToolsDialogs/MergeDialog.xaml
Ver ficheiro 

@@ -9,6 +9,7 @@
 
              prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
 
              prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
 
              Width="818"
 
              Width="818"
 
              Height="600"
 
              Height="600"
 
+             Loaded="UserControl_Loaded"
 
              >
 
              >
 
     <UserControl.Resources>
 
     <UserControl.Resources>
 
         <dataconvert:IndexConverter x:Key="IndexConverter"/>
 
         <dataconvert:IndexConverter x:Key="IndexConverter"/>
 
@@ -75,9 +76,9 @@
 
     <Grid Background="{StaticResource color.sys.layout.anti}">
 
     <Grid Background="{StaticResource color.sys.layout.anti}">
 
         <Grid.ColumnDefinitions>
 
         <Grid.ColumnDefinitions>
 
             <ColumnDefinition Width="16"/>
 
             <ColumnDefinition Width="16"/>
 
-            <ColumnDefinition Width="526"/>
 
+            <ColumnDefinition Width="*"/>
 
             <ColumnDefinition Width="16"/>
 
             <ColumnDefinition Width="16"/>
 
-            <ColumnDefinition Width="260"/>
 
+            <ColumnDefinition Width="0"/>
 
         </Grid.ColumnDefinitions>
 
         </Grid.ColumnDefinitions>
 
         <Grid.RowDefinitions>
 
         <Grid.RowDefinitions>
 
             <RowDefinition Height="16"/>
 
             <RowDefinition Height="16"/>
 
@@ -92,7 +93,7 @@
 
         <Border Grid.Column="1" Grid.Row="1"  Grid.RowSpan="2" Padding="50,6,50,6" Visibility="{Binding Visibility, Converter={StaticResource UnVisivleConvert}, ElementName=NoFileStackPanel}">
 
         <Border Grid.Column="1" Grid.Row="1"  Grid.RowSpan="2" Padding="50,6,50,6" Visibility="{Binding Visibility, Converter={StaticResource UnVisivleConvert}, ElementName=NoFileStackPanel}">
 
             <Grid>
 
             <Grid>
 
                 <Grid.ColumnDefinitions>
 
                 <Grid.ColumnDefinitions>
 
-                    <ColumnDefinition Width="201"/>
 
+                    <ColumnDefinition Width="429"/>
 
                     <ColumnDefinition Width="160"/>
 
                     <ColumnDefinition Width="160"/>
 
                     <ColumnDefinition Width="*"/>
 
                     <ColumnDefinition Width="*"/>
 
                 </Grid.ColumnDefinitions>
 
                 </Grid.ColumnDefinitions>
 
@@ -141,16 +142,16 @@
 
                                     <Line  X1="0"  X2="{Binding ActualWidth, ElementName=ContentPanel}" HorizontalAlignment="Stretch" StrokeThickness="1" Stroke="{StaticResource color.item-state.hov.bg}" VerticalAlignment="Bottom"/>
 
                                     <Line  X1="0"  X2="{Binding ActualWidth, ElementName=ContentPanel}" HorizontalAlignment="Stretch" StrokeThickness="1" Stroke="{StaticResource color.item-state.hov.bg}" VerticalAlignment="Bottom"/>
 
                                     <Grid x:Name="ContentPanel" Height="76" >
 
                                     <Grid x:Name="ContentPanel" Height="76" >
 
                                         <Grid.ColumnDefinitions>
 
                                         <Grid.ColumnDefinitions>
 
-                                            <ColumnDefinition Width="40"/>
 
+                                            <ColumnDefinition Width="41"/>
 
                                             <ColumnDefinition Width="60"/>
 
                                             <ColumnDefinition Width="60"/>
 
                                             <ColumnDefinition Width="8"/>
 
                                             <ColumnDefinition Width="8"/>
 
-                                            <ColumnDefinition Width="133"/>
 
+                                            <ColumnDefinition Width="372"/>
 
                                             <ColumnDefinition Width="auto"/>
 
                                             <ColumnDefinition Width="auto"/>
 
                                             <ColumnDefinition Width="16"/>
 
                                             <ColumnDefinition Width="16"/>
 
-                                            <ColumnDefinition Width="56"/>
 
-                                            <ColumnDefinition Width="17"/>
 
-                                            <ColumnDefinition Width="*"/>
 
-                                            <ColumnDefinition Width="17"/>
 
+                                            <ColumnDefinition Width="64"/>
 
+                                            <ColumnDefinition Width="16"/>
 
+                                            <ColumnDefinition Width="16"/>
 
+                                            <ColumnDefinition Width="43"/>
 
                                         </Grid.ColumnDefinitions>
 
                                         </Grid.ColumnDefinitions>
 
                                         <Line   Margin="0,0,0,0" Grid.ColumnSpan="10" Visibility="{Binding IsForward, Converter={StaticResource BoolToVisible}}" X1="0"  X2="{Binding ActualWidth, ElementName=ContentPanel}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" StrokeThickness="1" Stroke="{StaticResource color.sys.layout.accent}" />
 
                                         <Line   Margin="0,0,0,0" Grid.ColumnSpan="10" Visibility="{Binding IsForward, Converter={StaticResource BoolToVisible}}" X1="0"  X2="{Binding ActualWidth, ElementName=ContentPanel}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" StrokeThickness="1" Stroke="{StaticResource color.sys.layout.accent}" />
 
 
 
@@ -201,7 +202,7 @@
 
                 </ListView>
 
                 </ListView>
 
             </Grid>
 
             </Grid>
 
         </Border>
 
         </Border>
 
-        <Border Grid.Column="3" Grid.RowSpan="7" Background="{StaticResource color.sys.layout.mg}">
 
+        <Border Grid.Column="3" Grid.RowSpan="7" Background="{StaticResource color.sys.layout.mg}" Visibility="Collapsed">
 
             <Grid>
 
             <Grid>
 
                 <Grid.RowDefinitions>
 
                 <Grid.RowDefinitions>
 
                     <RowDefinition Height="14"/>
 
                     <RowDefinition Height="14"/>
 
@@ -265,13 +266,14 @@
 
                         <TextBlock Text="mm" VerticalAlignment="Center" FontWeight="Regular" FontSize="14" FontFamily="Segoe UI" Margin="8,0,0,0"/>
 
                         <TextBlock Text="mm" VerticalAlignment="Center" FontWeight="Regular" FontSize="14" FontFamily="Segoe UI" Margin="8,0,0,0"/>
 
                     </StackPanel>
 
                     </StackPanel>
 
                 </StackPanel>
 
                 </StackPanel>
 
-                <StackPanel Grid.Column="1" Grid.Row="2"  HorizontalAlignment="Center" VerticalAlignment="Bottom">
 
-                    <Button x:Name="BtnMerge" Width="228" Content="Merge"  Height="32" Style="{StaticResource Btn.cta}" Command="{Binding MergeCommand}" IsEnabled="{Binding ElementName=NoFileStackPanel,Path=Visibility,Converter={StaticResource UnVisibleToBoolConvert}}"/>
 
-                    <Button Margin="0,16,0,0" Width="228" Content="Cancel" Height="32" Style="{StaticResource btn.sec}" Command="{Binding CancelCommand}"/>
 
-                </StackPanel>
 
             </Grid>
 
             </Grid>
 
         </Border>
 
         </Border>
 
 
 
+        <StackPanel Grid.Column="1" Grid.Row="5"  Orientation="Horizontal" HorizontalAlignment="Right">
 
+            <Button x:Name="BtnMerge" Width="118" Content="Merge"  Height="32" Style="{StaticResource Btn.cta}" Command="{Binding MergeCommand}" IsEnabled="{Binding ElementName=NoFileStackPanel,Path=Visibility,Converter={StaticResource UnVisibleToBoolConvert}}"/>
 
+            <Button Margin="16,0,0,0" Width="118" Content="Cancel" Height="32" Style="{StaticResource btn.sec}" Command="{Binding CancelCommand}"/>
 
+        </StackPanel>
 
+        <StackPanel  Grid.Column="1" Grid.Row="5" Orientation="Horizontal" >
 
         <ComboBox Grid.Column="1" SelectedIndex="0"  Grid.Row="5" Width="113" Height="32" HorizontalAlignment="Left" VerticalAlignment="Bottom" >
 
         <ComboBox Grid.Column="1" SelectedIndex="0"  Grid.Row="5" Width="113" Height="32" HorizontalAlignment="Left" VerticalAlignment="Bottom" >
 
             <ComboBoxItem Tag="0">
 
             <ComboBoxItem Tag="0">
 
                 <TextBlock Text="Add Files" />
 
                 <TextBlock Text="Add Files" />
 
@@ -308,8 +310,8 @@
 
 
 
             </ComboBoxItem>
 
             </ComboBoxItem>
 
         </ComboBox>
 
         </ComboBox>
 
-        <Border BorderThickness="1" Width="32" Height="32" Grid.Column="1" Grid.Row="5" BorderBrush="{StaticResource color.btn.sec.border-color}" 
-            HorizontalAlignment="Right" VerticalAlignment="Bottom" CornerRadius="4">
 
+        <Border Margin="16,0,0,0" BorderThickness="1" Width="32" Height="32" Grid.Column="1" Grid.Row="5" BorderBrush="{StaticResource color.btn.sec.border-color}" 
+            HorizontalAlignment="Left" VerticalAlignment="Bottom" CornerRadius="4">
 
             <customcontrol:PathButton
 
             <customcontrol:PathButton
 
             HorizontalAlignment="Center"
 
             HorizontalAlignment="Center"
 
             VerticalAlignment="Center"
 
             VerticalAlignment="Center"
 
@@ -327,5 +329,6 @@
 
             MouseDownBorderBrush="{StaticResource color.item-state.sel.border.lv3}"
 
             MouseDownBorderBrush="{StaticResource color.item-state.sel.border.lv3}"
 
                     />
 
                     />
 
         </Border>
 
         </Border>
 
+        </StackPanel>
 
     </Grid>
 
     </Grid>
 
 </UserControl>
 
 </UserControl>

+ 5 - 0
PDF Office/Views/Dialog/ToolsDialogs/MergeDialog.xaml.cs
Ver ficheiro 

@@ -296,5 +296,10 @@ namespace PDF_Office.Views.Dialog.ToolsDialogs
 
                 DragDropHelper.DragLeave();
 
                 DragDropHelper.DragLeave();
 
             }
 
             }
 
         }
 
         }
 
+
 
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
 
+        {
 
+
 
+        }
 
     }
 
     }
 
 }
 
 }

+ 2 - 1
PDF Office/Views/PropertyPanel/AnnotPanel/SignatureAnnotProperty.xaml
Ver ficheiro 

@@ -5,6 +5,7 @@
 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:PDF_Office.Views.PropertyPanel.AnnotPanel" xmlns:customcontrol="clr-namespace:PDF_Office.CustomControl" xmlns:annotpanel="clr-namespace:PDF_Office.ViewModels.PropertyPanel.AnnotPanel" xmlns:dataconvert="clr-namespace:PDF_Office.DataConvert" d:DataContext="{d:DesignInstance Type=annotpanel:SignatureAnnotPropertyViewModel}"
 
              xmlns:local="clr-namespace:PDF_Office.Views.PropertyPanel.AnnotPanel" xmlns:customcontrol="clr-namespace:PDF_Office.CustomControl" xmlns:annotpanel="clr-namespace:PDF_Office.ViewModels.PropertyPanel.AnnotPanel" xmlns:dataconvert="clr-namespace:PDF_Office.DataConvert" d:DataContext="{d:DesignInstance Type=annotpanel:SignatureAnnotPropertyViewModel}"
 
              KeyDown="UserControl_KeyDown"
 
              KeyDown="UserControl_KeyDown"
 
+             Loaded="UserControl_Loaded"
 
              mc:Ignorable="d" >
 
              mc:Ignorable="d" >
 
     <UserControl.Resources>
 
     <UserControl.Resources>
 
         <PathGeometry x:Key="Ic_AddButtonPath" Figures="M13.5 8C13.5 11.0376 11.0376 13.5 8 13.5C4.96243 13.5 2.5 11.0376 2.5 8C2.5 4.96243 4.96243 2.5 8 2.5C11.0376 2.5 13.5 4.96243 13.5 8ZM15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8ZM7.25005 4.80003V7.25003H4.80005V8.75003H7.25005V11.2H8.75005V8.75003H11.2V7.25003H8.75005V4.80003H7.25005Z"  FillRule="EvenOdd" />
 
         <PathGeometry x:Key="Ic_AddButtonPath" Figures="M13.5 8C13.5 11.0376 11.0376 13.5 8 13.5C4.96243 13.5 2.5 11.0376 2.5 8C2.5 4.96243 4.96243 2.5 8 2.5C11.0376 2.5 13.5 4.96243 13.5 8ZM15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8ZM7.25005 4.80003V7.25003H4.80005V8.75003H7.25005V11.2H8.75005V8.75003H11.2V7.25003H8.75005V4.80003H7.25005Z"  FillRule="EvenOdd" />
 
@@ -30,7 +31,7 @@
 
                 <ColumnDefinition Width="16"/>
 
                 <ColumnDefinition Width="16"/>
 
             </Grid.ColumnDefinitions>
 
             </Grid.ColumnDefinitions>
 
             <TextBlock Grid.Column="1" x:Name="TxtTitle" HorizontalAlignment="Left"
 
             <TextBlock Grid.Column="1" x:Name="TxtTitle" HorizontalAlignment="Left"
 
-                    VerticalAlignment="Center" FontSize="18" FontWeight="SemiBold" Text="Signature" />
 
+                    VerticalAlignment="Center" FontSize="14" FontWeight="SemiBold"/>
 
             <customcontrol:PathButton Grid.Column="1"
 
             <customcontrol:PathButton Grid.Column="1"
 
             HorizontalAlignment="Right"
 
             HorizontalAlignment="Right"
 
             HorizontalContentAlignment="Center"
 
             HorizontalContentAlignment="Center"

+ 6 - 1
PDF Office/Views/PropertyPanel/AnnotPanel/SignatureAnnotProperty.xaml.cs
Ver ficheiro 

@@ -48,7 +48,7 @@ namespace PDF_Office.Views.PropertyPanel.AnnotPanel
 
         private void DeleteAll_Click(object sender, RoutedEventArgs e)
 
         private void DeleteAll_Click(object sender, RoutedEventArgs e)
 
         {
 
         {
 
             AlertsMessage alertsMessage = new AlertsMessage();
 
             AlertsMessage alertsMessage = new AlertsMessage();
 
-            alertsMessage.ShowDialog("提示", "确定要全部删除吗？", "Cancel", "OK");
 
+            alertsMessage.ShowDialog("", "确定要全部删除吗？", "Cancel", "OK");
 
             if (alertsMessage.result == ContentResult.Ok)
 
             if (alertsMessage.result == ContentResult.Ok)
 
             {
 
             {
 
                 (DataContext as SignatureAnnotPropertyViewModel).DeleteAll();
 
                 (DataContext as SignatureAnnotPropertyViewModel).DeleteAll();
 
@@ -63,5 +63,10 @@ namespace PDF_Office.Views.PropertyPanel.AnnotPanel
 
                 e.Handled = true;
 
                 e.Handled = true;
 
             }
 
             }
 
         }
 
         }
 
+
 
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
 
+        {
 
+            TxtTitle.Text = App.MainPageLoader.GetString("Signatur_Title");
 
+        }
 
     }
 
     }
 
 }
 
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 1
PDF Office/Views/PropertyPanel/AnnotPanel/StampAnnotProperty.xaml


+ 5 - 0
PDF Office/Views/PropertyPanel/AnnotPanel/StampAnnotProperty.xaml.cs
Ver ficheiro 

@@ -92,5 +92,10 @@ namespace PDF_Office.Views.PropertyPanel.AnnotPanel
 
                 e.Handled = true;
 
                 e.Handled = true;
 
             }
 
             }
 
         }
 
         }
 
+
 
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
 
+        {
 
+            AnnoteTypeTitle.Text= App.MainPageLoader.GetString("Stamp_Title");
 
+        }
 
     }
 
     }
 
 }
 
 }