ソースを参照

Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

OYXH\oyxh 2 年 前
コミット
7f37a6c547

+ 1 - 1
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -49,7 +49,6 @@ namespace PDF_Office.ViewModels.Tools
             events = eventAggregator;
             dialogs = dialogService;
             InitCommand();
-            BindingEvent();
             InitDefaultValue();
             InitToolDict();
             InitToolTipDict();
@@ -647,6 +646,7 @@ namespace PDF_Office.ViewModels.Tools
             navigationContext.Parameters.TryGetValue<ViewContentViewModel>(ParameterNames.ViewContentViewModel, out viewContentViewModel);
             navigationContext.Parameters.TryGetValue<CPDFViewer>(ParameterNames.PDFViewer, out PDFViewer);
             BindingPDFViewerHandler();
+            BindingEvent();
             LoaedStickyNotePopup();
         }
 

+ 2 - 2
PDF Office/Views/Dialog/ToolsDialogs/CompressDialogs/CompressDialog.xaml

@@ -32,11 +32,11 @@
         </cus:DialogContent.Content>
         <cus:DialogContent.BottmBar>
         <Grid Grid.Row="2" Width="468"  VerticalAlignment="Center">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+            <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                     <Button Width="80" Height="32" Margin="16,0,0,0" Command="{Binding BatchCompressCommand}"  Style="{StaticResource btn.sec}" Content="Batch">
                    
                 </Button>
-            </StackPanel>
+            </StackPanel>-->
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                     <Button  Width="80" Height="32" Margin="0,0,16,0" Command="{Binding CompressCommand}" Style="{StaticResource Btn.cta}" Content="Compress" >