综合- 显示比较表后取消链接的选中

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Function.cs

@@ -312,7 +312,8 @@ namespace PDF_Master.ViewModels.Tools
                              //付费锁
                     if (!App.IsLogin)
                     {
-                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
+                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
+                        //弹出比较表后取消工具选中
                         return;
                     }
                     annotArgs = GetStamp();
@@ -327,7 +328,8 @@ namespace PDF_Master.ViewModels.Tools
                                  //付费锁
                     if (!App.IsLogin)
                     {
-                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
+                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
+                        //弹出比较表后取消工具选中
                         return;
                     }
                     annotArgs = GetSignature();
@@ -338,7 +340,9 @@ namespace PDF_Master.ViewModels.Tools
                             //付费锁
                     if (!App.IsLogin)
                     {
-                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
+                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
+                        //弹出比较表后取消工具选中
+                        StrAnnotToolChecked = "";
                         return;
                     }
                     PropertyPanel.IsAddLink = true;

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -102,6 +102,8 @@ namespace PDF_Master.ViewModels.Tools
             PropertyRegionName = Guid.NewGuid().ToString();
             HandCommand = new DelegateCommand(Hand_Click);
             ShowOrHiddenAnnotCommand = new DelegateCommand<CustomIconToggleBtn>(ShowOrHiddenAnnot_Click);
+
+            GlobalCommands.BookMarkCommand.RegisterCommand(AddBookMarkCommand);
 
             #region 注释 - 右键菜单
 

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -655,6 +655,7 @@ namespace PDF_Master.ViewModels
                 {
                     BOTAWidth = new GridLength(260);
                 }
+                Settings.Default.AppProperties.InitialVIew.RememberBOTA = openBOTA;
                 //关闭BOTA的逻辑在xaml.cs代码里控制，无法绑定后台
             }
         }

PDF Office/Views/BOTA/BOTAContent.xaml

@@ -13,6 +13,7 @@
     d:DataContext="{d:DesignInstance Type=bota:BOTAContentViewModel}"
     d:DesignHeight="450"
     d:DesignWidth="800"
+    SizeChanged="UserControl_SizeChanged"
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
     <UserControl.Resources>
@@ -22,8 +23,6 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-
-
     <Grid Background="{StaticResource color.sys.layout.mg}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="48" />

PDF Office/Views/BOTA/BOTAContent.xaml.cs

@@ -27,11 +27,6 @@ namespace PDF_Master.Views.BOTA
             InitializeComponent();
         }
 
-        private void Border_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-
-        }
-
         private void IconAndTextTabItem_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             var item = sender as TabItem;
@@ -97,5 +92,13 @@ namespace PDF_Master.Views.BOTA
             }
 
         }
+
+        private void UserControl_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if(e.NewSize.Width<=48&&TabBOTA.SelectedItem!=null&&(TabBOTA.SelectedItem as TabItem)!=null)
+            {
+                (TabBOTA.SelectedItem as TabItem).IsSelected = false;
+            }
+        }
     }
 }

PDF Office/Views/ViewContent.xaml

@@ -298,7 +298,7 @@
                                 <MenuItem
                                     Command="{Binding HelpCommand}"
                                     CommandParameter="Guid"
-                                    Header="快速教学" />
+                                    Header="Quick Guide" />
                                 <MenuItem
                                     Command="{Binding HelpCommand}"
                                     CommandParameter="Online"
@@ -307,11 +307,11 @@
                                 <MenuItem
                                     Command="{Binding HelpCommand}"
                                     CommandParameter="More"
-                                    Header="更多产品" />
+                                    Header="More Products" />
                                 <MenuItem
                                     Command="{Binding HelpCommand}"
                                     CommandParameter="Template"
-                                    Header="免费PDF模板" />
+                                    Header="Free Template" />
                                 <MenuItem
                                     Command="{Binding HelpCommand}"
                                     CommandParameter="Blog"
@@ -325,7 +325,7 @@
                                 <MenuItem
                                     Command="{Binding HelpCommand}"
                                     CommandParameter="FeedBack"
-                                    Header="意见反馈" />
+                                    Header="Feedback" />
                             </MenuItem>
                         </ContextMenu>
                     </Button.ContextMenu>