快捷键-调整快捷键实现方式

PDF Office/Helper/GlobalCommands.cs

@@ -8,10 +8,11 @@ using System.Threading.Tasks;
 namespace PDF_Master.Helper
 {
     /// <summary>
-    /// 全局可用的命令 注册后，在任何界面可以当作静态资源绑定
+    /// 全局可用的命令 注册后，在任何界面可以当作静态资源绑定(需要留意 该命令没有办法区分页签，需要谨慎使用)
     /// </summary>
     public static class GlobalCommands
     {
+        //一下命令已调整成其他方式实现
         public static CompositeCommand PrePageCommand = new CompositeCommand();
 
         public static CompositeCommand NextPageCommand = new CompositeCommand();

PDF Office/ViewModels/BottomToolContentViewModel.cs

@@ -245,6 +245,21 @@ namespace PDF_Master.ViewModels
         /// </summary>
         public DelegateCommand<object> PreviewKeyDown { get; set; }
 
+        /// <summary>
+        /// 进入单页
+        /// </summary>
+        public DelegateCommand SinglePageCommand { get; set; }
+
+        /// <summary>
+        /// 进入双页
+        /// </summary>
+        public DelegateCommand DoublePageCommand { get; set; }
+
+        /// <summary>
+        /// 回到实际大小
+        /// </summary>
+        public DelegateCommand RealSizeCommand { get; set; }
+
         private bool isShowViewModular = false;
 
         /// <summary>
@@ -441,6 +456,9 @@ namespace PDF_Master.ViewModels
             ShowViewModularCommand = new DelegateCommand<object>(ShowViewModularEvent);
             PreviewKeyDown = new DelegateCommand<object>(previewkeydown);
             PreViewCommand = new DelegateCommand(undo);
+            SinglePageCommand = new DelegateCommand(()=> { IsSingleView = true; });
+            DoublePageCommand = new DelegateCommand(()=> { IsDoubleView = true; });
+            RealSizeCommand = new DelegateCommand(ZoomToRealSize);
 
             NextViewCommnad = new DelegateCommand(redo);
 
@@ -927,8 +945,12 @@ namespace PDF_Master.ViewModels
             }
             if(e.PropertyName== "IsPropertyOpen")
             {
-                //监听的属性面板的变化
-                IsShowViewModular = ViewContentViewModel.IsPropertyOpen;
+                //右上角按钮收起属性面板后，底部工具栏按钮状态同步变化
+                if (ViewContentViewModel.IsPropertyOpen == false)
+                {
+                    //监听的属性面板的变化
+                    IsShowViewModular = ViewContentViewModel.IsPropertyOpen;
+                }
             }
         }
 
@@ -1067,6 +1089,7 @@ namespace PDF_Master.ViewModels
             if (viewContentViewModel != null)
             {
                 this.ViewContentViewModel = viewContentViewModel;
+                ViewContentViewModel.bottom = this;
                 IsShowViewModular = viewContentViewModel.IsPropertyOpen;
                 viewContentViewModel.PropertyChanged -= ViewContentViewModel_PropertyChanged;
                 viewContentViewModel.PropertyChanged += ViewContentViewModel_PropertyChanged;
@@ -1094,25 +1117,6 @@ namespace PDF_Master.ViewModels
                 }
                 CurrentZoom = PDFViewer.ZoomFactor * 100;
                 PDFViewer.InfoChanged += PDFViewer_InfoChanged;
-            }
-
-            //避免重复注册
-            if (GlobalCommands.FirstPageCommand.RegisteredCommands.Count < 1)
-            {
-                //注册成全局命令
-                GlobalCommands.FirstPageCommand.RegisterCommand(FirstPageCommand);
-                GlobalCommands.LastPageCommand.RegisterCommand(LastPageCommand);
-                GlobalCommands.NextPageCommand.RegisterCommand(NextPageCommand);
-                GlobalCommands.PrePageCommand.RegisterCommand(PrePageCommand);
-                GlobalCommands.PreViewCommand.RegisterCommand(PreViewCommand);
-                GlobalCommands.NextViewCommand.RegisterCommand(NextViewCommnad);
-                GlobalCommands.UpCommand.RegisterCommand(UpCommand);
-                GlobalCommands.DownCommand.RegisterCommand(DownCommand);
-                GlobalCommands.SinglePageCommand.RegisterCommand(new DelegateCommand(() => { IsSingleView = true; }));
-                GlobalCommands.DoublePageCommand.RegisterCommand(new DelegateCommand(() => { IsDoubleView = true; }));
-                GlobalCommands.ZoomInCommand.RegisterCommand(ZoomInCommand);
-                GlobalCommands.ZoomOutPageCommand.RegisterCommand(ZoomOutCommand);
-                GlobalCommands.RealSizeCommand.RegisterCommand(new DelegateCommand(() => { ZoomToRealSize(); }));
             }
         }
 

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -210,6 +210,9 @@ namespace PDF_Master.ViewModels
         public CPDFViewer PDFViewer { get; set; }
         public bool ReadModeIsShowProperty { get; set; } = false;
         public MainContentViewModel mainViewModel { get; set; }
+
+        public BottomToolContentViewModel bottom { get; set; }
+
         public bool IsSettingOut = false;
         public IRegionManager region;
 
@@ -774,6 +777,39 @@ namespace PDF_Master.ViewModels
 
         public DelegateCommand<object> OpenPropertyCommand { get; set; }
 
+        /// <summary>
+        /// 用于底部工具栏的部分Bug
+        /// </summary>
+        public DelegateCommand RealSizeCommand { get; set; }
+
+        public DelegateCommand OpenFullCommand { get; set; }
+
+        public DelegateCommand SinglePageCommand { get; set; }
+
+        public DelegateCommand DoublePageCommand { get; set; }
+
+        public DelegateCommand FirstPageCommand { get; set; }
+
+        public DelegateCommand LastPageCommand { get; set; }
+
+        public DelegateCommand UpCommand { get; set; }
+
+        public DelegateCommand DownCommand { get; set; }
+
+
+        public DelegateCommand PrePageCommand { get; set; }
+
+        public DelegateCommand NextPageCommmand { get; set; }
+
+        public DelegateCommand PreViewCommand { get; set; }
+
+        public DelegateCommand NextViewCommand { get; set; }
+
+        public DelegateCommand ZoomInCommand { get; set; }
+
+        public DelegateCommand ZoomOutCommand { get; set; }
+
+
         #endregion 命令
 
         public ViewContentViewModel(IRegionManager regionManager, IDialogService dialogService, IEventAggregator eventAggregator)
@@ -821,6 +857,22 @@ namespace PDF_Master.ViewModels
             SettingsCommand = new DelegateCommand(SettingsEvent);
             CreateLinkCommand = new DelegateCommand<object>(CreateLinkEvent);
             ClosePropertyCommand = new DelegateCommand(CloseProperty);
+            //底部工具栏相关的命令  绑在这一层响应更快
+            RealSizeCommand = new DelegateCommand(realsize);
+            OpenFullCommand = new DelegateCommand(OpenFullWindow);
+            FirstPageCommand = new DelegateCommand(firstpage);
+            LastPageCommand = new DelegateCommand(lastpage);
+            PreViewCommand = new DelegateCommand(preview);
+            NextViewCommand = new DelegateCommand(nextview);
+            PrePageCommand = new DelegateCommand(prepage);
+            NextPageCommmand = new DelegateCommand(nextpage);
+            ZoomInCommand = new DelegateCommand(zoomin);
+            ZoomOutCommand = new DelegateCommand(zoomout);
+            UpCommand = new DelegateCommand(up);
+            DownCommand = new DelegateCommand(down);
+            SinglePageCommand = new DelegateCommand(singlepage);
+            DoublePageCommand = new DelegateCommand(doublepage);
+
             //未显示时无法注册上Region名称
             ToolContentVisible = Visibility.Visible;
             ToolsBarContentVisible = Visibility.Visible;
@@ -854,6 +906,76 @@ namespace PDF_Master.ViewModels
             StartAutoSave();
         }
 
+        private void doublepage()
+        {
+            bottom?.DoublePageCommand.Execute();
+        }
+
+        private void singlepage()
+        {
+            bottom?.SinglePageCommand.Execute();
+        }
+
+        private void down()
+        {
+            bottom?.DownCommand.Execute();
+        }
+
+        private void up()
+        {
+            bottom?.UpCommand.Execute();
+        }
+
+        private void zoomin()
+        {
+            bottom?.ZoomInCommand.Execute();
+        }
+
+        private void zoomout()
+        {
+            bottom?.ZoomOutCommand.Execute();
+        }
+
+        private void nextpage()
+        {
+            bottom?.NextPageCommand.Execute();
+        }
+
+        private void prepage()
+        {
+            bottom?.PrePageCommand.Execute();
+        }
+
+        private void nextview()
+        {
+
+            bottom?.NextViewCommnad.Execute();
+        }
+
+        private void preview()
+        {
+            bottom?.PreViewCommand.Execute();
+        }
+
+        private void lastpage()
+        {
+            bottom?.LastPageCommand.Execute();
+        }
+
+        private void firstpage()
+        {
+            bottom?.FirstPageCommand.Execute();
+        }
+
+
+        /// <summary>
+        /// 底部工具栏的缩放至实际大小
+        /// </summary>
+        private void realsize()
+        {
+            bottom?.RealSizeCommand.Execute();
+        }
+
         /// <summary>
         /// 进入全屏模式
         /// </summary>
@@ -2245,6 +2367,8 @@ namespace PDF_Master.ViewModels
                 parameters.Add(ParameterNames.ViewContentViewModel, this);
                 region.RequestNavigate(BottomToolRegionName, "BottomToolContent", parameters);
             }
+            PDFViewer.SnapsToDevicePixels = true;
+            PDFViewer.UseLayoutRounding = true;
             region.AddToRegion(ViwerRegionName, PDFViewer);
 
             if (App.mainWindowViewModel != null)
@@ -2369,11 +2493,11 @@ namespace PDF_Master.ViewModels
         /// <summary>
         /// 已有路径文档的保存逻辑
         /// </summary>
-        public bool saveFile(bool autosave=false)
+        public bool saveFile(bool autosave = false)
         {
             try
             {
-                if ((string.IsNullOrEmpty(PDFViewer.Document.FilePath) || mainViewModel.NewFile)&&!autosave)
+                if ((string.IsNullOrEmpty(PDFViewer.Document.FilePath) || mainViewModel.NewFile) && !autosave)
                     return saveAsFile();
 
                 //文档已被修复时 提示另存为
@@ -2525,7 +2649,7 @@ namespace PDF_Master.ViewModels
                                       OpenFileInfo info = SettingHelper.GetFileInfo(PDFViewer.Document.FilePath);
                                       try
                                       {
-                                          if (info!=null&&!string.IsNullOrEmpty(info.ThumbImgPath) && !PDFViewer.Document.IsEncrypted)//加密的文档不获取缩略图
+                                          if (info != null && !string.IsNullOrEmpty(info.ThumbImgPath) && !PDFViewer.Document.IsEncrypted)//加密的文档不获取缩略图
                                           {
                                               var size = PDFViewer.Document.GetPageSize(0);
                                               System.Drawing.Bitmap bitmap = ToolMethod.RenderPageBitmapNoWait(PDFViewer.Document, (int)size.Width, (int)size.Height, 0, true, true);
@@ -2569,12 +2693,10 @@ namespace PDF_Master.ViewModels
                     //弹窗前 激活主窗体
                     //App.Current.MainWindow.Activate();
                     AlertsMessage alertsMessage = new AlertsMessage();
-                    System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
-                    {
-
-                        //文件被占用 保存失败时
-                        alertsMessage.ShowDialog("", App.MainPageLoader.GetString("Main_TheFileOccupiedWarning"), App.ServiceLoader.GetString("Text_cancel"), App.ServiceLoader.GetString("Text_ok"));
-                    }));
+                    //文件被占用 保存失败时
+                    alertsMessage.ShowDialog("", App.MainPageLoader.GetString("Main_TheFileOccupiedWarning"), App.ServiceLoader.GetString("Text_cancel"), App.ServiceLoader.GetString("Text_ok"));
+                    //显示当前窗体，防止窗口置底
+                    App.Current.MainWindow.Activate();
                     if (alertsMessage.result == ContentResult.Ok)
                         return saveAsFile();
                     else

PDF Office/Views/ViewContent.xaml

@@ -20,6 +20,7 @@
     DragOver="UserControl_DragOver"
     Drop="UserControl_Drop"
     IsVisibleChanged="UserControl_IsVisibleChanged"
+    Loaded="UserControl_Loaded"
     MouseDown="UserControl_MouseDown"
     Unloaded="UserControl_Unloaded"
     mc:Ignorable="d">
@@ -87,71 +88,71 @@
         <KeyBinding Command="{Binding RedoCommand}" Gesture="Ctrl+Shift+Z" />
         <KeyBinding
             Key="Up"
-            Command="{x:Static helper:GlobalCommands.FirstPageCommand}"
+            Command="{Binding FirstPageCommand}"
             Modifiers="Ctrl" />
         <KeyBinding
             Key="Down"
-            Command="{x:Static helper:GlobalCommands.LastPageCommand}"
+            Command="{Binding LastPageCommand}"
             Modifiers="Ctrl" />
-        <KeyBinding Key="Up" Command="{x:Static helper:GlobalCommands.UpCommand}" />
-        <KeyBinding Key="Down" Command="{x:Static helper:GlobalCommands.DownCommand}" />
-        <KeyBinding Key="Left" Command="{x:Static helper:GlobalCommands.PrePageCommand}" />
-        <KeyBinding Key="PageUp" Command="{x:Static helper:GlobalCommands.PrePageCommand}" />
-        <KeyBinding Key="PageDown" Command="{x:Static helper:GlobalCommands.NextPageCommand}" />
-        <KeyBinding Key="Right" Command="{x:Static helper:GlobalCommands.NextPageCommand}" />
+        <KeyBinding Key="Up" Command="{Binding UpCommand}" />
+        <KeyBinding Key="Left" Command="{Binding PrePageCommand}" />
+        <KeyBinding Key="Left" Command="{Binding PrePageCommand}" />
+        <KeyBinding Key="Down" Command="{Binding DownCommand}" />
+        <KeyBinding Key="PageDown" Command="{Binding NextPageCommmand}" />
+        <KeyBinding Key="PageDown" Command="{Binding NextPageCommmand}" />
         <KeyBinding
             Key="B"
             Command="{x:Static helper:GlobalCommands.BookMarkCommand}"
             Modifiers="Ctrl" />
-        <KeyBinding Key="F11" Command="{x:Static helper:GlobalCommands.FullWindowCommand}" />
+        <KeyBinding Key="F11" Command="{Binding OpenFullCommand}" />
         <KeyBinding
             Key="NumPad1"
-            Command="{x:Static helper:GlobalCommands.SinglePageCommand}"
+            Command="{Binding SinglePageCommand}"
             Modifiers="Ctrl" />
         <KeyBinding
             Key="D1"
-            Command="{x:Static helper:GlobalCommands.SinglePageCommand}"
+            Command="{Binding SinglePageCommand}"
             Modifiers="Ctrl" />
         <KeyBinding
             Key="NumPad2"
-            Command="{x:Static helper:GlobalCommands.DoublePageCommand}"
+            Command="{Binding DoublePageCommand}"
             Modifiers="Ctrl" />
         <KeyBinding
             Key="D2"
-            Command="{x:Static helper:GlobalCommands.DoublePageCommand}"
+            Command="{Binding DoublePageCommand}"
             Modifiers="Ctrl" />
         <KeyBinding
             Key="NumPad0"
-            Command="{x:Static helper:GlobalCommands.RealSizeCommand}"
+            Command="{Binding RealSizeCommand}"
             Modifiers="Ctrl" />
         <KeyBinding
             Key="D0"
-            Command="{x:Static helper:GlobalCommands.RealSizeCommand}"
+            Command="{Binding RealSizeCommand}"
             Modifiers="Ctrl" />
         <KeyBinding
             Key="Add"
-            Command="{x:Static helper:GlobalCommands.ZoomInCommand}"
+            Command="{Binding ZoomInCommand}"
             Modifiers="Ctrl" />
         <KeyBinding
             Key="OemPlus"
-            Command="{x:Static helper:GlobalCommands.ZoomInCommand}"
+            Command="{Binding ZoomInCommand}"
             Modifiers="Ctrl" />
         <KeyBinding
             Key="Subtract"
-            Command="{x:Static helper:GlobalCommands.ZoomOutPageCommand}"
+            Command="{Binding ZoomOutCommand}"
             Modifiers="Ctrl" />
         <KeyBinding
             Key="OemMinus"
-            Command="{x:Static helper:GlobalCommands.ZoomOutPageCommand}"
+            Command="{Binding ZoomOutCommand}"
             Modifiers="Ctrl" />
 
         <KeyBinding
             Key="OemOpenBrackets"
-            Command="{x:Static helper:GlobalCommands.PreViewCommand}"
+            Command="{Binding PreViewCommand}"
             Modifiers="Ctrl" />
         <KeyBinding
             Key="OemCloseBrackets"
-            Command="{x:Static helper:GlobalCommands.NextViewCommand}"
+            Command="{Binding NextViewCommand}"
             Modifiers="Ctrl" />
     </UserControl.InputBindings>
 
@@ -717,10 +718,10 @@
             Width="{Binding ActualWidth, ElementName=ReadModeContent, Mode=OneWay}"
             Height="44"
             Margin="0,0,0,5"
-            IsHitTestVisible="False"
             HorizontalAlignment="Center"
             VerticalAlignment="Bottom"
             Fill="Transparent"
+            IsHitTestVisible="False"
             MouseEnter="RectangleReadMode_MouseEnter"
             Visibility="Collapsed" />
     </Grid>

PDF Office/Views/ViewContent.xaml.cs

@@ -540,5 +540,12 @@ namespace PDF_Master.Views
            
 
         }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            //自动聚焦，修复快捷键无响应的问题
+            this.Focusable = true;
+            this.Focus();
+        }
     }
 }