综合-注释、阅读页选择文本图片右键菜单、书签取消选中

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

@@ -503,11 +503,10 @@ namespace PDF_Master.ViewModels.Tools
                             viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
                         }
                     }
-                    else
-                    {
-                        if (propertyPanel.IsMultiSelected)
-                            viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
-                    }
+                }
+                if (string.IsNullOrWhiteSpace(StrAnnotToolChecked))
+                {
+                    viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
                 }
             }
         }

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

@@ -167,11 +167,8 @@ namespace PDF_Master.ViewModels.Tools
                             case "AddBookMark":
 
                                 menuItem1.Command = AddBookMarkCommand;
-                                SetMenuItemVisibility(menuItem1, "DelBookMark", "AddBookMark", isAddBookMark);
-                                if (viewContentViewModel.mainViewModel.IsBookMode)
-                                {
-                                    menuItem1.IsEnabled = false;
-                                }
+                                SetMenuItemVisibility(menuItem1, "DelBookMark", "AddBookMark", isAddBookMark);
+
                                 break;
 
                             case "DelBookMark":
@@ -190,13 +187,15 @@ namespace PDF_Master.ViewModels.Tools
                             case "ReadModel":
                                 SetMenuItemVisibility(menuItem1, "ReadModel", "UnReadModel", viewContentViewModel.mainViewModel.IsBookMode);
                                 menuItem1.Click -= ReadModel_Click;
-                                menuItem1.Click += ReadModel_Click;
+                                menuItem1.Click += ReadModel_Click;
+                                
                                 break;
 
                             case "UnReadModel":
                                 SetMenuItemVisibility(menuItem1, "ReadModel", "UnReadModel", viewContentViewModel.mainViewModel.IsBookMode);
                                 menuItem1.Click -= UnReadModel_Click;
                                 menuItem1.Click += UnReadModel_Click;
+
                                 break;
 
                             case "ViewZoom":
@@ -327,38 +326,41 @@ namespace PDF_Master.ViewModels.Tools
                 popMenu.Items.Add(menuItem);
 
                 SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Strikethrough"), "Strikeout", annotCommand, out menuItem);
-                popMenu.Items.Add(menuItem);
+                popMenu.Items.Add(menuItem);
+
+                separator = SetSeparator();
+                //popMenu.Items.Add(separator);
+
+                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Text"), "Freetext", annotCommand, out menuItem);
+                //popMenu.Items.Add(menuItem);
+
+                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Note"), "StickyNote", annotCommand, out menuItem);
+                //popMenu.Items.Add(menuItem);
+
+                separator = SetSeparator();
+                popMenu.Items.Add(separator);
+
+                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Rectangle"), "Rect", annotCommand, out menuItem);
+                popMenu.Items.Add(menuItem);
+
+                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Oval"), "Circle", annotCommand, out menuItem);
+                popMenu.Items.Add(menuItem);
+
+                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_StraightLine"), "Line", annotCommand, out menuItem);
+                //popMenu.Items.Add(menuItem);
             }
             separator = SetSeparator();
             popMenu.Items.Add(separator);
 
-            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Text"), "Freetext", annotCommand, out menuItem);
-            popMenu.Items.Add(menuItem);
-
-            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Note"), "StickyNote", annotCommand, out menuItem);
-            popMenu.Items.Add(menuItem);
-
-            separator = SetSeparator();
-            popMenu.Items.Add(separator);
-
-            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Rectangle"), "Rect", annotCommand, out menuItem);
-            popMenu.Items.Add(menuItem);
-
-            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_Oval"), "Circle", annotCommand, out menuItem);
-            popMenu.Items.Add(menuItem);
-
-            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_StraightLine"), "Line", annotCommand, out menuItem);
-            popMenu.Items.Add(menuItem);
-
-            separator = SetSeparator();
-            popMenu.Items.Add(separator);
-
             SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_AddLink"), "Link", annotCommand, out menuItem);
-            popMenu.Items.Add(menuItem);
-
-            SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_AddOutline"), "OutLine", annotCommand, out menuItem);
-            popMenu.Items.Add(menuItem);
-
+            popMenu.Items.Add(menuItem);
+
+            if (annotCommand.CommandTarget == TargetType.Annot)
+            {
+                SetSelectTextOrImageMenuItem(App.MainPageLoader.GetString("ViewRightMenu_AddOutline"), "OutLine", annotCommand, out menuItem);
+                popMenu.Items.Add(menuItem);
+            }
+
             return popMenu;
         }
 

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -590,15 +590,24 @@ namespace PDF_Master.ViewModels.Tools
                         if (outLineControlViewModel != null && outLineControl != null)
                         {
                             string str = null;
-                            if (string.IsNullOrEmpty(annotCommand.Text))
-                            {
-                                str = (annotCommand.PageIndex + 1).ToString();
-                            }
-                            else
+                            if (!string.IsNullOrEmpty(annotCommand.Text))
                             {
                                 str = annotCommand.Text;
                             }
 
+                            #region 选择图片
+
+                            //if (string.IsNullOrEmpty(annotCommand.Text))
+                            //{
+                            //    str = (annotCommand.PageIndex + 1).ToString();
+                            //}
+                            //else
+                            //{
+                            //    str = annotCommand.Text;
+                            //}
+
+                            #endregion 选择图片
+
                             outLineControl.AddOutlineNode(str);
                         }
 

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

@@ -53,12 +53,19 @@ namespace PDF_Master.Views.BOTA
 
         private void CleanSelectAll(CleanSelectAllArgs obj)
         {
-            ListViewItem listItem = (ListViewItem)(BookMarkListView.ItemContainerGenerator.ContainerFromItem(BookMarkListView.SelectedItem));
-            TextBlock textBlock = CommonHelper.FindVisualChild<TextBlock>(listItem);
-            TextBox text = CommonHelper.FindVisualChild<TextBox>(listItem);
-            if (textBlock.Visibility == Visibility.Collapsed)
+            
+            foreach (var item in BookMarkListView.SelectedItems)
             {
-                textBlock.Visibility = Visibility.Visible;
+                ListViewItem listItem = (ListViewItem)(BookMarkListView.ItemContainerGenerator.ContainerFromItem(item));
+                if(listItem != null)
+                {
+                    TextBlock textBlock = CommonHelper.FindVisualChild<TextBlock>(listItem);
+                    //TextBox text = CommonHelper.FindVisualChild<TextBox>(listItem);
+                    if (textBlock.Visibility == Visibility.Collapsed)
+                    {
+                        textBlock.Visibility = Visibility.Visible;
+                    }
+                }
             }
             BookMarkListView.SelectedItems.Clear();
         }