轻会员-高保真调整

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -495,16 +495,16 @@
           <target state="new">Enjoy all advanced features now</target>
         </trans-unit>
         <trans-unit id="TextInsert" translate="yes" xml:space="preserve">
-          <source>Insert, delete, extract, split PDF pages</source>
-          <target state="new">Insert, delete, extract, split PDF pages</target>
+          <source>AI translation, AI rewriting, AI correction.</source>
+          <target state="new">AI translation, AI rewriting, AI correction.</target>
         </trans-unit>
         <trans-unit id="TextLimit10" translate="yes" xml:space="preserve">
           <source>(Limit first 10 pages)</source>
           <target state="new">(Limit first 10 pages)</target>
         </trans-unit>
         <trans-unit id="TextMore" translate="yes" xml:space="preserve">
-          <source>More Features</source>
-          <target state="new">More Features</target>
+          <source>Merge</source>
+          <target state="new">Merge</target>
         </trans-unit>
         <trans-unit id="Textoff" translate="yes" xml:space="preserve">
           <source>50% OFF</source>
@@ -519,8 +519,8 @@
           <target state="new">Order Information</target>
         </trans-unit>
         <trans-unit id="TextOrganize" translate="yes" xml:space="preserve">
-          <source>Organize Pages</source>
-          <target state="new">Organize Pages</target>
+          <source>AI Assistant</source>
+          <target state="new">AI Assistant</target>
         </trans-unit>
         <trans-unit id="TextOrsubscribe" translate="yes" xml:space="preserve">
           <source>Or subscribe to us to unlock more powerful features</source>
@@ -563,8 +563,8 @@
           <target state="new">Subscription Expired</target>
         </trans-unit>
         <trans-unit id="TextSuch" translate="yes" xml:space="preserve">
-          <source>Such as OCR, stamps, links</source>
-          <target state="new">Such as OCR, stamps, links</target>
+          <source>Merge two files at once, unlimited times.</source>
+          <target state="new">Merge two files at once, unlimited times.</target>
         </trans-unit>
         <trans-unit id="TextSupportAI" translate="yes" xml:space="preserve">
           <source>Support AI translation, AI rewriting, AI correction</source>

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

@@ -495,16 +495,16 @@
           <target state="new">Enjoy all advanced features now</target>
         </trans-unit>
         <trans-unit id="TextInsert" translate="yes" xml:space="preserve">
-          <source>Insert, delete, extract, split PDF pages</source>
-          <target state="new">Insert, delete, extract, split PDF pages</target>
+          <source>AI translation, AI rewriting, AI correction.</source>
+          <target state="new">AI translation, AI rewriting, AI correction.</target>
         </trans-unit>
         <trans-unit id="TextLimit10" translate="yes" xml:space="preserve">
           <source>(Limit first 10 pages)</source>
           <target state="new">(Limit first 10 pages)</target>
         </trans-unit>
         <trans-unit id="TextMore" translate="yes" xml:space="preserve">
-          <source>More Features</source>
-          <target state="new">More Features</target>
+          <source>Merge</source>
+          <target state="new">Merge</target>
         </trans-unit>
         <trans-unit id="Textoff" translate="yes" xml:space="preserve">
           <source>50% OFF</source>
@@ -519,8 +519,8 @@
           <target state="new">Order Information</target>
         </trans-unit>
         <trans-unit id="TextOrganize" translate="yes" xml:space="preserve">
-          <source>Organize Pages</source>
-          <target state="new">Organize Pages</target>
+          <source>AI Assistant</source>
+          <target state="new">AI Assistant</target>
         </trans-unit>
         <trans-unit id="TextOrsubscribe" translate="yes" xml:space="preserve">
           <source>Or subscribe to us to unlock more powerful features</source>
@@ -563,8 +563,8 @@
           <target state="new">Subscription Expired</target>
         </trans-unit>
         <trans-unit id="TextSuch" translate="yes" xml:space="preserve">
-          <source>Such as OCR, stamps, links</source>
-          <target state="new">Such as OCR, stamps, links</target>
+          <source>Merge two files at once, unlimited times.</source>
+          <target state="new">Merge two files at once, unlimited times.</target>
         </trans-unit>
         <trans-unit id="TextSupportAI" translate="yes" xml:space="preserve">
           <source>Support AI translation, AI rewriting, AI correction</source>

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

@@ -495,16 +495,16 @@
           <target state="new">Enjoy all advanced features now</target>
         </trans-unit>
         <trans-unit id="TextInsert" translate="yes" xml:space="preserve">
-          <source>Insert, delete, extract, split PDF pages</source>
-          <target state="new">Insert, delete, extract, split PDF pages</target>
+          <source>AI translation, AI rewriting, AI correction.</source>
+          <target state="new">AI translation, AI rewriting, AI correction.</target>
         </trans-unit>
         <trans-unit id="TextLimit10" translate="yes" xml:space="preserve">
           <source>(Limit first 10 pages)</source>
           <target state="new">(Limit first 10 pages)</target>
         </trans-unit>
         <trans-unit id="TextMore" translate="yes" xml:space="preserve">
-          <source>More Features</source>
-          <target state="new">More Features</target>
+          <source>Merge</source>
+          <target state="new">Merge</target>
         </trans-unit>
         <trans-unit id="Textoff" translate="yes" xml:space="preserve">
           <source>50% OFF</source>
@@ -519,8 +519,8 @@
           <target state="new">Order Information</target>
         </trans-unit>
         <trans-unit id="TextOrganize" translate="yes" xml:space="preserve">
-          <source>Organize Pages</source>
-          <target state="new">Organize Pages</target>
+          <source>AI Assistant</source>
+          <target state="new">AI Assistant</target>
         </trans-unit>
         <trans-unit id="TextOrsubscribe" translate="yes" xml:space="preserve">
           <source>Or subscribe to us to unlock more powerful features</source>
@@ -563,8 +563,8 @@
           <target state="new">Subscription Expired</target>
         </trans-unit>
         <trans-unit id="TextSuch" translate="yes" xml:space="preserve">
-          <source>Such as OCR, stamps, links</source>
-          <target state="new">Such as OCR, stamps, links</target>
+          <source>Merge two files at once, unlimited times.</source>
+          <target state="new">Merge two files at once, unlimited times.</target>
         </trans-unit>
         <trans-unit id="TextSupportAI" translate="yes" xml:space="preserve">
           <source>Support AI translation, AI rewriting, AI correction</source>

PDF Office/PDF Master.csproj

@@ -2361,7 +2361,6 @@
     <Resource Include="Resources\Service\convert.png" />
     <Resource Include="Resources\Service\edit.png" />
     <Resource Include="Resources\Service\more.png" />
-    <Resource Include="Resources\Service\page-edit.png" />
     <Resource Include="Resources\Service\Cheer.png" />
     <Resource Include="Resources\Service\NewRegiserok.png" />
     <Resource Include="Resources\Service\NoWatermark.png" />
@@ -2377,6 +2376,8 @@
     <Resource Include="Resources\Service\Noconvert.png" />
     <Resource Include="Resources\Service\Upgrade.png" />
     <Resource Include="Resources\Service\merging.png" />
+    <Resource Include="Resources\Service\AI.png" />
+    <Resource Include="Resources\Service\merge.png" />
     <Content Include="source\models\OCR.model">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

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

@@ -1231,7 +1231,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Insert, delete, extract, split PDF pages 的本地化字符串。
+        ///   查找类似 AI translation, AI rewriting, AI correction. 的本地化字符串。
         /// </summary>
         public static string TextInsert {
             get {
@@ -1249,7 +1249,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 More Features 的本地化字符串。
+        ///   查找类似 Merge 的本地化字符串。
         /// </summary>
         public static string TextMore {
             get {
@@ -1285,7 +1285,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Organize Pages 的本地化字符串。
+        ///   查找类似 AI Assistant 的本地化字符串。
         /// </summary>
         public static string TextOrganize {
             get {
@@ -1438,7 +1438,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Such as OCR, stamps, links 的本地化字符串。
+        ///   查找类似 Merge two files at once, unlimited times. 的本地化字符串。
         /// </summary>
         public static string TextSuch {
             get {

PDF Office/Strings/Service/Service.resx

@@ -319,13 +319,13 @@
     <value>Enjoy all advanced features now</value>
   </data>
   <data name="TextInsert" xml:space="preserve">
-    <value>Insert, delete, extract, split PDF pages</value>
+    <value>AI translation, AI rewriting, AI correction.</value>
   </data>
   <data name="TextLimit10" xml:space="preserve">
     <value>(Limit first 10 pages)</value>
   </data>
   <data name="TextMore" xml:space="preserve">
-    <value>More Features</value>
+    <value>Merge</value>
   </data>
   <data name="Textoff" xml:space="preserve">
     <value>50% OFF</value>
@@ -337,7 +337,7 @@
     <value>Order Information</value>
   </data>
   <data name="TextOrganize" xml:space="preserve">
-    <value>Organize Pages</value>
+    <value>AI Assistant</value>
   </data>
   <data name="TextOrsubscribe" xml:space="preserve">
     <value>Or subscribe to us to unlock more powerful features</value>
@@ -388,7 +388,7 @@
     <value>Subscription Expired</value>
   </data>
   <data name="TextSuch" xml:space="preserve">
-    <value>Such as OCR, stamps, links</value>
+    <value>Merge two files at once, unlimited times.</value>
   </data>
   <data name="TextSupportAI" xml:space="preserve">
     <value>Support AI translation, AI rewriting, AI correction</value>

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

@@ -295,7 +295,13 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             get { return _UserRegionName; }
             set { _UserRegionName = value; }
         }
-
+        
+         private Visibility _LinkuserdataVis = Visibility.Collapsed;
+        public Visibility LinkuserdataVis
+        {
+            get { return _LinkuserdataVis; }
+            set { _LinkuserdataVis = value; }
+        }
         private Visibility _Subscriptionbox =Visibility.Collapsed;
         public Visibility Subscriptionbox
         {
@@ -358,8 +364,9 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             TextSubscribeEndtime = Settings.Default.UserDate.subscribeendDate;
             UserEmail = Settings.Default.UserDate.Email;
             if(Settings.Default.UserDate.subscribestatus==1&& Settings.Default.UserDate.subscribepayType==1)
-            {                
-                   Subscriptionbox = Visibility.Visible;
+            {
+                LinkuserdataVis = Visibility.Collapsed;
+                 Subscriptionbox = Visibility.Visible;
                 Subscriptionauto= Visibility.Visible;
                 TextSubscribeState= App.ServiceLoader.GetString("TextSubscribeStateOnTrial");
                 TextSubscribeStateColor = (Brush)new BrushConverter().ConvertFromString("#252629");
@@ -367,6 +374,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
             else if(Settings.Default.UserDate.subscribestatus == 1 && Settings.Default.UserDate.subscribepayType == 0)
             {
+                LinkuserdataVis = Visibility.Collapsed;
                 Subscriptionbox = Visibility.Visible;
                 Subscriptionbtn = Visibility.Visible;
                 Subscriptionauto = Visibility.Hidden;
@@ -376,6 +384,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
             else if (Settings.Default.UserDate.subscribestatus == 2 )
             {
+                LinkuserdataVis = Visibility.Collapsed;
                 Subscriptionbox = Visibility.Visible;
                 Subscriptionbtn = Visibility.Visible;
                 Subscriptionauto = Visibility.Hidden;
@@ -385,6 +394,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
             else
             {
+                LinkuserdataVis = Visibility.Visible;
                 Subscriptionbox = Visibility.Collapsed;
                 Subscriptionbtn = Visibility.Collapsed;
                 TextSubscribeState = App.ServiceLoader.GetString("TextSubscribeStateExpired");

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

@@ -48,11 +48,40 @@
             </StackPanel>
 
             <StackPanel
-                Height="204"
                 Margin="28,152,0,0"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top">
-                <Grid Height="42" HorizontalAlignment="Left">
+                <Grid  HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/AI.png" />
+                    </Border>
+                    <StackPanel
+                        Width="129"
+                        Margin="42,0,0,0">
+                        <TextBlock
+                            Height="20"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="SemiBold"
+                            LineHeight="20"
+                            Text="{Binding TextOrganize}" />
+                        <TextBlock
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            TextWrapping="Wrap"
+                            Foreground="#616469"
+                            Text="{Binding TextInsert}" />
+                    </StackPanel>
+                </Grid>
+
+                <Grid
+                    Height="42"
+                    Margin="0,12,0,0"
+                    HorizontalAlignment="Left">
                     <Border
                         Width="36"
                         Height="36"
@@ -120,48 +149,16 @@
                     </StackPanel>
                 </Grid>
                 <Grid
-                    Height="42"
-                    Margin="0,12,0,0"
-                    HorizontalAlignment="Left">
-                    <Border
-                        Width="36"
-                        Height="36"
-                        HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/page-edit.png" />
-                    </Border>
-                    <StackPanel
-                        Height="42"
-                        Margin="42,0,0,0"
-                        HorizontalAlignment="Left">
-                        <TextBlock
-                            Height="20"
-                            FontFamily="Segoe UI"
-                            FontSize="12"
-                            FontWeight="SemiBold"
-                            LineHeight="20"
-                            Text="{Binding TextOrganize}" />
-                        <TextBlock
-                            Height="18"
-                            Margin="0,4,0,0"
-                            FontFamily="Segoe UI"
-                            FontSize="11"
-                            Foreground="#616469"
-                            LineHeight="28"
-                            Text="{Binding TextInsert}" />
-                    </StackPanel>
-                </Grid>
-                <Grid
-                    Height="42"
                     Margin="0,12,0,0"
                     HorizontalAlignment="Left">
                     <Border
                         Width="36"
                         Height="36"
+                        VerticalAlignment="Top"
                         HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/more.png" />
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/merge.png" />
                     </Border>
                     <StackPanel
-                        Height="42"
                         Margin="42,0,0,0"
                         HorizontalAlignment="Left">
                         <TextBlock
@@ -172,12 +169,12 @@
                             LineHeight="20"
                             Text="{Binding TextMore}" />
                         <TextBlock
-                            Height="18"
+                            Width="168"
                             Margin="0,4,0,0"
                             FontFamily="Segoe UI"
                             FontSize="11"
                             Foreground="#616469"
-                            LineHeight="28"
+                            TextWrapping="Wrap"
                             Text="{Binding TextSuch}" />
                     </StackPanel>
                 </Grid>
@@ -190,11 +187,11 @@
                 Background="Transparent"
                 FontFamily="Segoe UI"
                 FontSize="12"
-                Visibility="Collapsed"
                 FontWeight="SemiBold"
-                Foreground="#3F8FF6" >
-                   <Hyperlink Command="{Binding LinkstoreCommand}">
-                         <Hyperlink.Style>
+                Foreground="#3F8FF6"
+                Visibility="Collapsed">
+                <Hyperlink Command="{Binding LinkstoreCommand}">
+                    <Hyperlink.Style>
                         <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
                             <Setter Property="FocusVisualStyle" Value="{x:Null}" />
                             <Setter Property="TextBlock.TextDecorations" Value="{x:Null}" />
@@ -205,8 +202,8 @@
                             </Style.Triggers>
                         </Style>
                     </Hyperlink.Style>
-                        <TextBlock Text="{Binding TextSubscribeNow}" />
-                    </Hyperlink>
+                    <TextBlock Text="{Binding TextSubscribeNow}" />
+                </Hyperlink>
             </TextBlock>
         </Grid>
         <Grid Grid.Column="1">

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

@@ -48,11 +48,40 @@
             </StackPanel>
 
             <StackPanel
-                Height="204"
                 Margin="28,152,0,0"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top">
-                <Grid Height="42" HorizontalAlignment="Left">
+                <Grid  HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/AI.png" />
+                    </Border>
+                    <StackPanel
+                        Width="129"
+                        Margin="42,0,0,0">
+                        <TextBlock
+                            Height="20"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="SemiBold"
+                            LineHeight="20"
+                            Text="{Binding TextOrganize}" />
+                        <TextBlock
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            TextWrapping="Wrap"
+                            Foreground="#616469"
+                            Text="{Binding TextInsert}" />
+                    </StackPanel>
+                </Grid>
+
+                <Grid
+                    Height="42"
+                    Margin="0,12,0,0"
+                    HorizontalAlignment="Left">
                     <Border
                         Width="36"
                         Height="36"
@@ -120,48 +149,16 @@
                     </StackPanel>
                 </Grid>
                 <Grid
-                    Height="42"
-                    Margin="0,12,0,0"
-                    HorizontalAlignment="Left">
-                    <Border
-                        Width="36"
-                        Height="36"
-                        HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/page-edit.png" />
-                    </Border>
-                    <StackPanel
-                        Height="42"
-                        Margin="42,0,0,0"
-                        HorizontalAlignment="Left">
-                        <TextBlock
-                            Height="20"
-                            FontFamily="Segoe UI"
-                            FontSize="12"
-                            FontWeight="SemiBold"
-                            LineHeight="20"
-                            Text="{Binding TextOrganize}" />
-                        <TextBlock
-                            Height="18"
-                            Margin="0,4,0,0"
-                            FontFamily="Segoe UI"
-                            FontSize="11"
-                            Foreground="#616469"
-                            LineHeight="28"
-                            Text="{Binding TextInsert}" />
-                    </StackPanel>
-                </Grid>
-                <Grid
-                    Height="42"
                     Margin="0,12,0,0"
                     HorizontalAlignment="Left">
                     <Border
                         Width="36"
                         Height="36"
+                        VerticalAlignment="Top"
                         HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/more.png" />
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/merge.png" />
                     </Border>
                     <StackPanel
-                        Height="42"
                         Margin="42,0,0,0"
                         HorizontalAlignment="Left">
                         <TextBlock
@@ -172,12 +169,12 @@
                             LineHeight="20"
                             Text="{Binding TextMore}" />
                         <TextBlock
-                            Height="18"
+                            Width="168"
                             Margin="0,4,0,0"
                             FontFamily="Segoe UI"
                             FontSize="11"
                             Foreground="#616469"
-                            LineHeight="28"
+                            TextWrapping="Wrap"
                             Text="{Binding TextSuch}" />
                     </StackPanel>
                 </Grid>

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

@@ -111,6 +111,28 @@
                         TextWrapping="Wrap" />
                 </StackPanel>
             </Grid>
+            <TextBlock
+                    Margin="0,8,0,0"
+                    Visibility="{Binding LinkuserdataVis,Mode=TwoWay}"
+                    FontFamily="Segoe UI"
+                    FontSize="14"
+                    Foreground="#1770F4"
+                    LineHeight="22">
+                    <Hyperlink Command="{Binding LinkuserdataCommand}">
+                        <Hyperlink.Style>
+                            <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
+                                <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+                                <Setter Property="TextBlock.TextDecorations" Value="{x:Null}" />
+                                <Style.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter Property="TextBlock.TextDecorations" Value="None" />
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Hyperlink.Style>
+                        <TextBlock Text="{Binding TextOrderInformation}" />
+                    </Hyperlink>
+                </TextBlock>
             <StackPanel
                 Width="392"
                 Margin="0,22,0,30"