Merge remote-tracking branch 'origin/dev' into dev

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePagePrinter/HomePagePrinterDialogViewModel.cs

@@ -1036,6 +1036,7 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs.HomePagePrinter
                 ///TODO:
                 ///此处填入需要执行的代码
             }
+
             if (!result.IsDiscryptied)
             {
                 System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>

PDF Office/ViewModels/PropertyPanel/AnnotPanel/FreetextAnnotPropertyViewModel.cs

@@ -445,8 +445,8 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
 
             FontVm.CurrentPresetFont = new ComboDataItem(item.mTag, item.mTagContent);
             SelectedPresetFont();
-            if (BasicVm.IsMultiSelected == false)
-                PropertyPanel.InvokeToMyTools(BasicVm.AnnotType, Annot);
+            //if (BasicVm.IsMultiSelected == false)
+            //    PropertyPanel.InvokeToMyTools(BasicVm.AnnotType, Annot);
         }
 
         private void RestoreDefaultStyle()

PDF Office/Views/Tools/ToolsBarContent.xaml

@@ -227,7 +227,7 @@
                         Name="CropPageMenuMore"
                         Click="CropPageMore_Click"
                         Initialized="CropPageMore_Initialized"
-                        IsEnabled="{Binding ElementName=SecurityMenuMore, Path=IsOpen, Converter={StaticResource InvertBoolConvert}}"
+                        IsEnabled="{Binding ElementName=CropPageMenu, Path=IsOpen, Converter={StaticResource InvertBoolConvert}}"
                         Style="{StaticResource InsideBarBtnStyle}"
                         Visibility="Visible">
                         <StackPanel Margin="4,0,4,0" Orientation="Horizontal">