Browse Source

修复BUG-18923,18975,18979,18978

lvle 1 year ago
parent
commit
b2a9fd5400

+ 12 - 1
PDF Office/ViewModels/Dialog/ServiceDialog/UserDialogViewModel.cs

@@ -83,6 +83,16 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
         }
 
+        private string _Text_cancel = "";
+
+        public string Text_cancel
+        {
+            get { return _Text_cancel; }
+            set
+            {
+                SetProperty(ref _Text_cancel, value);
+            }
+        }
         private string _Text_no = "";
 
         public string Text_no
@@ -235,7 +245,8 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             Text_useracc = App.ServiceLoader.GetString("Text_useracc");
             Text_admail = App.ServiceLoader.GetString("Text_admail");
             Text_logout = App.ServiceLoader.GetString("Text_logout");
-
+            Text_cancel = App.ServiceLoader.GetString("Text_cancel");
+            
             Text_userouttol = App.ServiceLoader.GetString("Text_userouttol");
             Text_useroutmsg = App.ServiceLoader.GetString("Text_useroutmsg");
             Text_yes = App.ServiceLoader.GetString("Text_yes");

+ 1 - 2
PDF Office/ViewModels/ViewContentViewModel.cs

@@ -3554,8 +3554,7 @@ namespace PDF_Master.ViewModels
             if (currentBar == "TabItemEdit")
             {
                 if (!ServiceHelper.IAPBeforeFunction())
-                {
-                    TabSelectedIndex = 0;
+                {          
                     isInPageEdit = false;
                     return;
                 }

File diff suppressed because it is too large
+ 6 - 6
PDF Office/Views/Dialog/ServiceDialog/NOInternetRegion.xaml


+ 3 - 5
PDF Office/Views/Dialog/ServiceDialog/RegisterOKRegion.xaml

@@ -84,11 +84,10 @@
                     Text="{Binding TextEnjoy}"
                     TextWrapping="Wrap" />
             </StackPanel>
-            <StackPanel
-                Width="340"
+            <StackPanel               
                 Height="136"
-                Margin="0,228,32,0"
-                HorizontalAlignment="Right"
+                Margin="32,228,0,0"
+                HorizontalAlignment="Left"
                 VerticalAlignment="Top">
                 <TextBlock
                     FontFamily="Segoe UI"
@@ -98,7 +97,6 @@
                     Text="{Binding TextOrsubscribe}"
                     TextWrapping="Wrap" />
                 <StackPanel
-                    Width="319"
                     Height="20"
                     Margin="0,12,0,0"
                     HorizontalAlignment="Left"

+ 1 - 1
PDF Office/Views/Dialog/ServiceDialog/UserDialog.xaml

@@ -65,7 +65,7 @@
                         <Button.ContextMenu>
                             <ContextMenu Name="MenuMore">
                                 <MenuItem Command="{Binding LogOutCommand}" Header="{Binding Text_logout}" />
-                                <MenuItem Command="{Binding UserOutCommand}" Header="Cancellation" />
+                                <MenuItem Command="{Binding UserOutCommand}" Header="{Binding Text_cancel}" />
                             </ContextMenu>
                         </Button.ContextMenu>
                     </Button>