页面编辑-bug修复 轻会员-登出策略修改 工具滚动条

PDF Office/App.xaml

@@ -107,7 +107,7 @@
                                     <ContentPresenter
                                         x:Name="IGTHost"
                                         Grid.Column="2"
-                                        Margin="8,0"
+                                        Margin="0,0"
                                         VerticalAlignment="Center"
                                         ContentSource="InputGestureText" />
                                     <Grid

PDF Office/Styles/RadioButtonStyle.xaml

@@ -434,13 +434,16 @@
     <Style x:Key="MenuRadioBtnStyle" TargetType="{x:Type RadioButton}">
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Margin" Value="-3" />
         <Setter Property="Template">
+            
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RadioButton}">
                     <Border
                         x:Name="templateRoot"
-                        Background="{TemplateBinding Background}"
-                        CornerRadius="0"
+                        CornerRadius="7"
+                        Background="Transparent"
+                        Height="32"
                         SnapsToDevicePixels="True">
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -449,6 +452,8 @@
                             </Grid.ColumnDefinitions>
 
                             <Path
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
                                 x:Name="pathIcon"
                                 Data="M11.1144 1.57308L5.71438 9.28737C5.58464 9.47271 5.37817 9.58958 5.15248 9.60543C4.9268 9.62128 4.70603 9.5344 4.55166 9.36901L0.95166 5.51187L2.04824 4.48839L5.01649 7.66866L9.88553 0.712891L11.1144 1.57308Z"
                                 Fill="{StaticResource color.icon.base.neutral.norm.lv1}"
@@ -459,7 +464,7 @@
                                 Grid.Column="1"
                                 Margin="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                VerticalAlignment="Center"
                                 Focusable="False"
                                 RecognizesAccessKey="True"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />

PDF Office/ViewModels/BOTA/AnnotationContentViewModel.cs

@@ -1012,11 +1012,15 @@ namespace PDF_Master.ViewModels.BOTA
                 if ((AnnotationList.Items[i] as AnnotationHandlerEventArgs).AnnotIndex == annotindex && (AnnotationList.Items[i] as AnnotationHandlerEventArgs).PageIndex == pageindex)
                 {
                     var item = AnnotationList.Items[i] as AnnotationHandlerEventArgs;
-                    //需要手动搜寻在哪一个分组 展开分组头
-                    ExpandGroupHeader(item, AnnotationList);
-                    AnnotationList.SelectedItem = item;
-                    await Task.Delay(1);
-                    AnnotationList.ScrollIntoView(item);
+                    if (item.EventType != AnnotArgsType.AnnotLink)
+                    {
+                        //需要手动搜寻在哪一个分组 展开分组头
+                        ExpandGroupHeader(item, AnnotationList);
+                        AnnotationList.SelectedItem = item;
+                        await Task.Delay(1);
+                        AnnotationList.ScrollIntoView(item);
+                    }
+                    
                 }
             }
         }

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

@@ -656,10 +656,17 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
 
                     if (viewContentViewModel.IsRightMenuSelectedTextAddLink == false)
                     {
-                        AnnotAttribEvent?.UpdateAttrib(AnnotAttrib.LinkType, LINK_TYPE.GOTO);
-                        AnnotAttribEvent?.UpdateAttrib(AnnotAttrib.LinkDestIndx, pageNum - 1);
-                        AnnotAttribEvent?.UpdateAnnot();
-                        LinkAnnotArgs?.InvokeLinkSaveCalled(this, EventArgs.Empty);
+                        int index = (int)AnnotAttribEvent.Attribs[AnnotAttrib.LinkDestIndx];
+                        if (index != (pageNum - 1))
+                        {
+                            AnnotAttribEvent?.UpdateAttrib(AnnotAttrib.LinkType, LINK_TYPE.GOTO);
+                            AnnotAttribEvent?.UpdateAttrib(AnnotAttrib.LinkDestIndx, pageNum - 1);
+                            AnnotAttribEvent?.UpdateAnnot();
+                        }
+                        else
+                        {
+                            LinkAnnotArgs?.InvokeLinkSaveCalled(this, EventArgs.Empty);
+                        }
                     }
                     else
                     {
@@ -679,7 +686,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                         pdfViewer.SetToolParam(annotArgs);
                         return;
                     }
-
+                    pdfViewer.SelectAnnotation(LinkAnnotArgs.PageIndex, LinkAnnotArgs.AnnotIndex);
                     //SelectAnnotation();
                 }
                 else
@@ -1055,8 +1062,8 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                 if (historyPageIndex != -1)
                 {
                     pdfViewer.GoToPage(historyPageIndex);
-                    SelectAnnotation();
-
+                    //SelectAnnotation();
+                    pdfViewer.SelectAnnotation(LinkAnnotArgs.PageIndex, LinkAnnotArgs.AnnotIndex);
                     BackToPage(historyPageIndex, pageIndex);
 
                     ChangeBtnGOorBack("GO", btnGOorBack);
@@ -1088,7 +1095,8 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                 {
                     if (historyPageIndex < pageIndex)
                     {
-                        height = vertical + (rect.Bottom * zoom);
+                        //height = vertical + (rect.Bottom * zoom);
+                        height = vertical + (paintrect.Top * zoom);
                         pdfViewer.ScrollToVerticalOffset(height);
                     }
                     else
@@ -1116,7 +1124,8 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                 {
                     if (historyPageIndex < pageIndex)
                     {
-                        height = vertical + (paintrect.Bottom * zoom);
+                        //height = vertical + (paintrect.Bottom * zoom);
+                        height = vertical + (paintrect.Top * zoom);
                         pdfViewer.ScrollToVerticalOffset(height);
                     }
                     else

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

@@ -1247,6 +1247,7 @@ namespace PDF_Master.ViewModels.Tools
                                     case "Link":
                                         PropertyPanel.IsAddLink = true;
                                         GetLink();
+                                        events.GetEvent<LinkAnnotTipCloseEvent>().Publish(new LinkAnnotTipCloseArgs() { UniCode = App.mainWindowViewModel.SelectedItem.Unicode });
                                         break;
                                 }
                             }

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

@@ -330,8 +330,9 @@ namespace PDF_Master.ViewModels.Tools
                     }
                     if (!App.IsLogin)
                     {
-                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-                       
+                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
+                        //弹出比较表后取消工具选中
+                        StrAnnotToolChecked = "";
                         return;
                     }
                     annotArgs = GetStamp();
@@ -365,6 +366,8 @@ namespace PDF_Master.ViewModels.Tools
                     if (!App.IsLogin)
                     {
                         dialogs.ShowDialog(DialogNames.IAPCompareDialog);
+                        //弹出比较表后取消工具选中
+                        StrAnnotToolChecked = "";
                         return;
                     }
                     annotArgs = GetSignature();
@@ -393,8 +396,9 @@ namespace PDF_Master.ViewModels.Tools
                     }
                     if (!App.IsLogin)
                     {
-                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
-                       
+                        dialogs.ShowDialog(DialogNames.IAPCompareDialog);
+                        //弹出比较表后取消工具选中
+                        StrAnnotToolChecked = "";
                         return;
                     }
                     PropertyPanel.IsAddLink = true;
@@ -1439,18 +1443,36 @@ namespace PDF_Master.ViewModels.Tools
 
         #region 菜单
 
-        private bool InBookModeSetIsEnabled(MenuItem menuItem)
+        private bool InBookModeSetIsHidden(object obj)
         {
-            if (viewContentViewModel.mainViewModel.IsBookMode)
-            {
-                menuItem.IsEnabled = false;
-                return true;
+            bool flag = false;
+            if (obj is MenuItem menuItem)
+            {
+                if (viewContentViewModel.mainViewModel.IsBookMode)
+                {
+                    menuItem.Visibility = Visibility.Collapsed;
+                    return true;
+                }
+                else
+                {
+                    menuItem.Visibility = Visibility.Visible;
+                    return false;
+                }
             }
-            else
-            {
-                menuItem.IsEnabled = true;
-                return false;
+            if (obj is Separator separator)
+            {
+                if (viewContentViewModel.mainViewModel.IsBookMode)
+                {
+                    separator.Visibility = Visibility.Collapsed;
+                    return true;
+                }
+                else
+                {
+                    separator.Visibility = Visibility.Visible;
+                    return false;
+                }
             }
+            return flag;
         }
 
         private void ExportPicture_MenuItemClick()

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

@@ -21,6 +21,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using WIA;
 using static Dropbox.Api.TeamLog.AdminAlertSeverityEnum;
 using MenuItem = System.Windows.Controls.MenuItem;
 
@@ -148,7 +149,8 @@ namespace PDF_Master.ViewModels.Tools
                 {
                     isAddBookMark = true;
                 }
-
+                var separator = contextMenu.Items[contextMenu.Items.Count - 3];
+                InBookModeSetIsHidden(separator);
                 foreach (var item in contextMenu.Items)
                 {
                     if (item is MenuItem menuItem1)
@@ -229,6 +231,7 @@ namespace PDF_Master.ViewModels.Tools
                                 break;
 
                             case "ViewZoom":
+                                InBookModeSetIsHidden(menuItem1);
                                 if (menuItem1.Items.Count > 0)
                                 {
                                     ViewZoom(menuItem1.Items);
@@ -242,17 +245,20 @@ namespace PDF_Master.ViewModels.Tools
                                 }
                                 break;
 
-                            case "Select":
+                            case "Select":
+                                InBookModeSetIsHidden(menuItem1);
                                 menuItem1.Click -= Select_Click;
 
                                 menuItem1.Click += Select_Click;
                                 break;
 
-                            case "Print":
+                            case "Print":
+                                InBookModeSetIsHidden(menuItem1);
                                 menuItem1.Command = viewContentViewModel.PrintCommand;
                                 break;
 
-                            case "HighlightLinks":
+                            case "HighlightLinks":
+                                InBookModeSetIsHidden(menuItem1);
                                 if (OpenFileInfo != null)
                                 {
                                     menuItem1.IsChecked = OpenFileInfo.ShowHighLightLink;
@@ -435,7 +441,8 @@ namespace PDF_Master.ViewModels.Tools
                 //popMenu.Items.Add(menuItem);
             }
             separator = SetSeparator();
-            popMenu.Items.Add(separator);
+            popMenu.Items.Add(separator);
+            InBookModeSetIsHidden(separator);
 
             SetSelectTextOrImageMenuItem(T_RightMenuSelectionAddLink, "Link", annotCommand, out menuItem);
             popMenu.Items.Add(menuItem);
@@ -455,16 +462,10 @@ namespace PDF_Master.ViewModels.Tools
             menuItem.Header = header;
             menuItem.Tag = tag;
 
-            if (tag == "OutLine")
+            if (tag == "OutLine" || tag == "Link")
             {
-                if (viewContentViewModel.mainViewModel.IsBookMode)
-                {
-                    menuItem.IsEnabled = false;
-                }
-                else
-                {
-                    menuItem.IsEnabled = true;
-                }
+                InBookModeSetIsHidden(menuItem);
+                
             }
 
             menuItem.Click -= AnnotToolMenu_Click;
@@ -535,6 +536,7 @@ namespace PDF_Master.ViewModels.Tools
         public string T_RightMenuStampNoteAnnotExportPDF = App.MainPageLoader.GetString("ViewRightMenuStampAnnotExport_PDF");
         public string T_RightMenuTextNoteAnnotCopyText = App.MainPageLoader.GetString("ViewRightMenuTextAnnot_CopyText");
         public string T_RightMenuTextNoteAnnotDelete = App.MainPageLoader.GetString("ViewRightMenuTextAnnot_Delete");
+
         #endregion 注释-右键菜单文案
 
         private ColorMenuItem colorContent;
@@ -802,6 +804,7 @@ namespace PDF_Master.ViewModels.Tools
                 familyRdioBtn.Tag = item.ValueStr;
                 familyRdioBtn.GroupName = "FontFamily";
                 familyRdioBtn.Content = item.Content;
+
                 pop.BindingEvent(pop.AddChild("FreeTextFontFamily", familyRdioBtn), FreeTextFontFamily_MenuCommand);
             }
 

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 注释 - 右键菜单
 
@@ -138,7 +140,7 @@ namespace PDF_Master.ViewModels.Tools
             if (annotBtn == null || annotBtn.Tag == null) return;
 
             PDFViewer.SetDrawAnnot((bool)annotBtn.IsChecked);
-
+            PDFViewer.ReloadVisibleAnnots();
             bool isTabItemAnnotation = IsBOTATabItemShow(out BOTAContentViewModel bOTAContentViewModel, out BOTAContent bOTAContent, "TabItemAnnotation");
             if (annotBtn.IsChecked == true)
             {
@@ -914,18 +916,27 @@ namespace PDF_Master.ViewModels.Tools
             //}
             if (bOTAContentVM != null && bOTA != null)
             {
-                BookmarkContentViewModel bookmarkContentViewModel = GetBookmarkContentViewModel(bOTAContentVM, out BookmarkContent bookmark);
-
-                if (bookmarkContentViewModel != null && bookmark != null && bOTA != null)
-                {
-                    //bookmarkContentViewModel.AddBookmarkCommand.Execute(bookmark.BookMarkListView);
-                    bookmark.BtnAddBookmark_Click(null, null);
-                    isAddBookMark = bookmarkContentViewModel.isAddBookMark;
-                    return;
-                }
+                AddBookMark(bOTAContentVM, bOTA);
             }
-        }
-
+            //if (viewContentViewModel.mainViewModel.IsBookMode)
+            //{
+            //    AddBookMark(bOTAContentVM, bOTA);
+            //}
+        }
+
+        private void AddBookMark(BOTAContentViewModel bOTAContentVM, BOTAContent bOTA)
+        {
+            BookmarkContentViewModel bookmarkContentViewModel = GetBookmarkContentViewModel(bOTAContentVM, out BookmarkContent bookmark);
+
+            if (bookmarkContentViewModel != null && bookmark != null && bOTA != null)
+            {
+                //bookmarkContentViewModel.AddBookmarkCommand.Execute(bookmark.BookMarkListView);
+                bookmark.BtnAddBookmark_Click(null, null);
+                isAddBookMark = bookmarkContentViewModel.isAddBookMark;
+                return;
+            }
+        }
+
         private BookmarkContentViewModel GetBookmarkContentViewModel(BOTAContentViewModel bOTAContentViewModel, out BookmarkContent bookmark)
         {
             BookmarkContentViewModel viewModel = null;
@@ -975,6 +986,7 @@ namespace PDF_Master.ViewModels.Tools
         private void DisplayAnnot_Click(object sender, RoutedEventArgs e)
         {
             PDFViewer.SetDrawAnnot(true);
+            PDFViewer.ReloadVisibleAnnots();
             BtnShowAnnotIsChecked = true;
 
             bool isTabItemAnnotation = IsBOTATabItemShow(out BOTAContentViewModel bOTAContentViewModel, out BOTAContent bOTAContent, "TabItemAnnotation");
@@ -990,6 +1002,7 @@ namespace PDF_Master.ViewModels.Tools
         {
             PDFViewer.ClearSelectAnnots();
             PDFViewer.SetDrawAnnot(false);
+            PDFViewer.ReloadVisibleAnnots();
             BtnShowAnnotIsChecked = false;
 
             bool isTabItemAnnotation = IsBOTATabItemShow(out BOTAContentViewModel bOTAContentViewModel, out BOTAContent bOTAContent, "TabItemAnnotation");
@@ -1003,18 +1016,20 @@ namespace PDF_Master.ViewModels.Tools
 
         private void SetAddAnnotation(ItemCollection items)
         {
+            var separator = items[items.Count - 4];
+            InBookModeSetIsHidden(separator);
             foreach (var item in items)
             {
                 if (item is MenuItem menuItem)
                 {
                     string str = menuItem.Tag.ToString();
-                    //if (str == AddAnnotType.AnnotLink.ToString()
-                    //|| str == AddAnnotType.AnnotStamp.ToString()
-                    //|| str == AddAnnotType.AnnotAutograph.ToString()
-                    //)
-                    //{
-                    //    InBookModeSetIsEnabled(menuItem);
-                    //}
+                    if (str == AddAnnotType.AnnotLink.ToString()
+                    || str == AddAnnotType.AnnotStamp.ToString()
+                    || str == AddAnnotType.AnnotAutograph.ToString()
+                    )
+                    {
+                        InBookModeSetIsHidden(menuItem);
+                    }
                     menuItem.CommandParameter = item;
                     menuItem.Command = SetAddAnnotationCommand;
                 }
@@ -1820,8 +1835,7 @@ namespace PDF_Master.ViewModels.Tools
         /// 按下Ctrl + Alt + 序列键，响应注释工具
         /// </summary>
         private void AnnotToolCtrlAltKey()
-        {
-            
+        {
             var tuple = GetCtrlAltKey();
             if (tuple != null)
             {

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -204,6 +204,7 @@ namespace PDF_Master.ViewModels
         #endregion 文案
 
         #region 属性、变量
+
         public bool IsMultiSelected { get; set; } = false;
         public OpenFileInfo OpenFileInfo = null;
         public CPDFViewer PDFViewer { get; set; }
@@ -655,6 +656,7 @@ namespace PDF_Master.ViewModels
                 {
                     BOTAWidth = new GridLength(260);
                 }
+                Settings.Default.AppProperties.InitialVIew.RememberBOTA = openBOTA;
                 //关闭BOTA的逻辑在xaml.cs代码里控制，无法绑定后台
             }
         }
@@ -1980,11 +1982,16 @@ namespace PDF_Master.ViewModels
             PDFViewer.DisableClearSelectAnnot(false);
             PDFViewer.ClearSelectAnnots();
             PDFViewer.SetMouseMode(MouseModes.PanTool);
-
+            var annotArgs = new SelectToolArgs();
+            PDFViewer.SetToolParam(annotArgs);
             ShowTip(true);
+
+            this.events.GetEvent<CleanSelectAllEvent>().Publish(new CleanSelectAllArgs() { Unicode = App.mainWindowViewModel.SelectedItem.Unicode, IsCleanSelectAll = true });
+
             await Task.Delay(3000);
             //ReadModelTip = Visibility.Collapsed;
             TipVisible = Visibility.Collapsed;
+
         }
 
         #region PDFViewer鼠标滚轮缩放事件
@@ -2026,7 +2033,6 @@ namespace PDF_Master.ViewModels
 
         #endregion PDFViewer鼠标滚轮缩放事件
 
-
         #region 方法
 
         /// <summary>
@@ -2172,8 +2178,8 @@ namespace PDF_Master.ViewModels
             CanSave = PDFViewer.UndoManager.CanSave;
             CanUndo = PDFViewer.UndoManager.CanUndo;
             CanRedo = PDFViewer.UndoManager.CanRedo;
-           
-            if(!CheckPassword())
+
+            if (!CheckPassword())
             {
                 return false;
             }
@@ -2182,7 +2188,7 @@ namespace PDF_Master.ViewModels
             PDFViewer.SetFormFieldHighlight(Settings.Default.AppProperties.InitialVIew.HighlightLink);
             PDFViewer.SetBackgroundBrush(new System.Windows.Media.SolidColorBrush(Settings.Default.AppProperties.InitialVIew.BackGround));
             //设置移动注释参考线
-            ComPDFKitViewer.CommonDrawData.MovePen = new System.Windows.Media.Pen((System.Windows.Media.Brush)new BrushConverter().ConvertFromString("#1770F4"),1);
+            ComPDFKitViewer.CommonDrawData.MovePen = new System.Windows.Media.Pen((System.Windows.Media.Brush)new BrushConverter().ConvertFromString("#1770F4"), 1);
             //还原上一次关闭前的视图设置
             GetOpenFileInfo();
 
@@ -2619,7 +2625,7 @@ namespace PDF_Master.ViewModels
         {
             PDFViewer.UndoManager.CanSave = false;
 
-            //从新路径重新加载 
+            //从新路径重新加载
             //用mianviewmodel.openfile的方法会有其他模块的pdfview更新不过来的情况，需要调整成现有的方法
             PDFViewer.CloseDocument();
             PDFViewer.InitDocument(targetPath);

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

@@ -299,7 +299,7 @@
                                 <MenuItem
                                     Command="{Binding HelpCommand}"
                                     CommandParameter="Guid"
-                                    Header="快速教学" />
+                                    Header="Quick Guide" />
                                 <MenuItem
                                     Command="{Binding HelpCommand}"
                                     CommandParameter="Online"
@@ -308,11 +308,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"
@@ -326,7 +326,7 @@
                                 <MenuItem
                                     Command="{Binding HelpCommand}"
                                     CommandParameter="FeedBack"
-                                    Header="意见反馈" />
+                                    Header="Feedback" />
                             </MenuItem>
                         </ContextMenu>
                     </Button.ContextMenu>