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

PDF Office/Views/Dialog/CustomCreateDialog.xaml

@@ -15,6 +15,7 @@
              mc:Ignorable="d" 
              Width="468"
              Height="406"
+             Loaded="UserControl_Loaded"
              >
 
     <UserControl.Resources>
@@ -71,7 +72,7 @@
                         <Border  Grid.Row="1" BorderBrush="#DFE1E5" BorderThickness="1" CornerRadius="4" Background="#F7F8FA" Padding="20">
                             <Image  Source="{Binding TextImageSource}"/>
                         </Border>
-                        <cus:TextBoxEx Grid.Row="3" VerticalContentAlignment="Center" Text="{Binding StampText,Mode=TwoWay}" TextChanged="TextBox_TextChanged">
+                        <cus:TextBoxEx x:Name="InPutTextBox" Grid.Row="3" VerticalContentAlignment="Center" Text="{Binding StampText,Mode=TwoWay}" TextChanged="TextBox_TextChanged">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="LostFocus">
                                     <i:InvokeCommandAction Command="{Binding UpDataDynamicCommnad}" PassEventArgsToCommand="True" />

PDF Office/Views/Dialog/CustomCreateDialog.xaml.cs

@@ -37,5 +37,11 @@ namespace PDF_Office.Views.PropertyPanel.AnnotPanel
             (DataContext as CustomCreateDialogViewModel).StampText = (e.OriginalSource as TextBox).Text;
             (DataContext as CustomCreateDialogViewModel).UpDataStamp();
         }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            InPutTextBox.Focus();
+            InPutTextBox.SelectAll();
+        }
     }
 }

PDF Office/Views/PropertyPanel/AnnotPanel/StampAnnotProperty.xaml

@@ -62,13 +62,13 @@
                         <DataTemplate >
                             <Grid >
                                 <Grid.ContextMenu>
-                                        <ContextMenu>
-                                            <MenuItem Header="导出图章">
-                                                <MenuItem x:Name="SavePNG" Header="PNG" Tag="PNG" Click="Save_Click"/>
-                                                <MenuItem x:Name="SavePDF" Header="PDF" Tag="PDF" Click="Save_Click"/>
-                                            </MenuItem>
-                                        </ContextMenu>
-                                    </Grid.ContextMenu>
+                                    <ContextMenu>
+                                        <MenuItem Header="导出图章">
+                                            <MenuItem x:Name="SavePNG" Header="PNG" Tag="PNG" Click="Save_Click"/>
+                                            <MenuItem x:Name="SavePDF" Header="PDF" Tag="PDF" Click="Save_Click"/>
+                                        </MenuItem>
+                                    </ContextMenu>
+                                </Grid.ContextMenu>
                                 <Image Source="{Binding SourcePath}" Stretch="Uniform" Height="48"/>
                             </Grid>
                         </DataTemplate>
@@ -125,7 +125,7 @@
 
                         </TextBlock>
                     </StackPanel>
-                <ListBox Name="CusListbox" Margin="0 0 0 56"  Visibility="{Binding ElementName=NoStampStackPanel,Path=Visibility,Converter={StaticResource UnVisivleConvert}}"
+                    <ListBox Name="CusListbox" Margin="0 0 0 56"  Visibility="{Binding ElementName=NoStampStackPanel,Path=Visibility,Converter={StaticResource UnVisivleConvert}}"
                              VerticalAlignment="Top"
                              Height="auto"
                              BorderThickness="0"
@@ -133,33 +133,42 @@
                              ItemsSource="{Binding CustomStampList}"
                              SelectedIndex="{Binding CusListboxIndex,Mode=TwoWay}"
                              >
-                    <ListBox.ItemTemplate>
-                        <HierarchicalDataTemplate  DataType="{x:Type model:Stamp}" >
-                            <Grid>
-                                <Grid.ContextMenu>
-                                    <ContextMenu>
-                                        <MenuItem x:Name="Delete" Header="删除图章" Click="Delete_Click"/>
-                                        <MenuItem x:Name="DeleteAll" Header="删除全部图章" Click="DeleteAll_Click"/>
-                                        <MenuItem Header="导出图章">
-                                            <MenuItem x:Name="SavePNG" Header="PNG" Tag="PNG" Click="Save_Click"/>
-                                            <MenuItem x:Name="SavePDF" Header="PDF" Tag="PDF" Click="Save_Click"/>
-                                        </MenuItem>
-                                        <MenuItem Header="编辑文字图章" Click="Editor_Click"/>
-                                    </ContextMenu>
-                                </Grid.ContextMenu>
-                                <Image Source="{Binding SourcePath}"/>
-                            </Grid>
-                        </HierarchicalDataTemplate>
-                    </ListBox.ItemTemplate>
+                        <ListBox.ItemTemplate>
+                            <HierarchicalDataTemplate  DataType="{x:Type model:Stamp}" >
+                                <Grid>
+                                    <Grid.ContextMenu>
+                                        <ContextMenu>
+                                            <MenuItem x:Name="Delete" Header="删除图章" Click="Delete_Click"/>
+                                            <MenuItem x:Name="DeleteAll" Header="删除全部图章" Click="DeleteAll_Click"/>
+                                            <MenuItem Header="导出图章">
+                                                <MenuItem x:Name="SavePNG" Header="PNG" Tag="PNG" Click="Save_Click"/>
+                                                <MenuItem x:Name="SavePDF" Header="PDF" Tag="PDF" Click="Save_Click"/>
+                                            </MenuItem>
+                                            <MenuItem Header="编辑文字图章" Click="Editor_Click" Visibility="Collapsed"/>
+                                        </ContextMenu>
+                                    </Grid.ContextMenu>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Source="{Binding SourcePath}"/>
+                                        <Button x:Name="DeleteIcon" Width="20" Height="20" Click="Delete_Click" Visibility="Collapsed"/>
+                                    </StackPanel>
+                                </Grid>
+                                <HierarchicalDataTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter TargetName="DeleteIcon" Property="Visibility" Value="Visible" />
+                                    </Trigger>
+                                </HierarchicalDataTemplate.Triggers>
+                            </HierarchicalDataTemplate>
 
-                    <ListBox.ItemContainerStyle>
-                        <Style TargetType="ListBoxItem">
-                            <Setter Property="Height" Value="64"/>
-                            <!--<Setter Property="Padding" Value="12 5 12 5"/>-->
-                            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                            <EventSetter Event="PreviewMouseLeftButtonDown" Handler="ListBoxItem_PreviewMouseLeftButtonDown"/>
-                        </Style>
-                    </ListBox.ItemContainerStyle>
+                        </ListBox.ItemTemplate>
+
+                        <ListBox.ItemContainerStyle>
+                            <Style TargetType="ListBoxItem">
+                                <Setter Property="Height" Value="64"/>
+                                <!--<Setter Property="Padding" Value="12 5 12 5"/>-->
+                                <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                                <EventSetter Event="PreviewMouseLeftButtonDown" Handler="ListBoxItem_PreviewMouseLeftButtonDown"/>
+                            </Style>
+                        </ListBox.ItemContainerStyle>
                     </ListBox>
                 </Grid>
             </TabItem>

PDF Office/Views/PropertyPanel/AnnotPanel/StampAnnotProperty.xaml.cs

@@ -1,4 +1,5 @@
-using PDF_Office.Model.AnnotPanel;
+using PDF_Office.CustomControl;
+using PDF_Office.Model.AnnotPanel;
 using PDF_Office.ViewModels.PropertyPanel.AnnotPanel;
 using System;
 using System.Collections.Generic;
@@ -45,13 +46,26 @@ namespace PDF_Office.Views.PropertyPanel.AnnotPanel
 
         private void Delete_Click(object sender, RoutedEventArgs e)
         {
-            MenuItem item = sender as MenuItem;
-            (DataContext as StampAnnotPropertyViewModel).DeleteStamp(item.DataContext as Stamp);
+            if (sender is MenuItem)
+            {
+                MenuItem item = sender as MenuItem;
+                (DataContext as StampAnnotPropertyViewModel).DeleteStamp(item.DataContext as Stamp);
+            }
+            else if (sender is Button)
+            {
+                Button item = sender as Button;
+                (DataContext as StampAnnotPropertyViewModel).DeleteStamp(item.DataContext as Stamp);
+            }
         }
 
         private void DeleteAll_Click(object sender, RoutedEventArgs e)
         {
-            (DataContext as StampAnnotPropertyViewModel).DeleteAll();
+            AlertsMessage alertsMessage = new AlertsMessage();
+            alertsMessage.ShowDialog("提示", "确定要全部删除吗？", "Cancel", "OK");
+            if (alertsMessage.result == ContentResult.Ok)
+            {
+                (DataContext as StampAnnotPropertyViewModel).DeleteAll();
+            }
         }
 
         private void Editor_Click(object sender, RoutedEventArgs e)