UI-调整首页UI

PDF Office/Styles/ExpanderStyle.xaml

@@ -28,7 +28,6 @@
                                 Fill="#8F96A7"
                                 SnapsToDevicePixels="false" />
                             <ContentPresenter
-                                Margin="4,0,0,0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 RecognizesAccessKey="True"
@@ -74,7 +73,7 @@
                                 x:Name="HeaderSite"
                                 MinWidth="0"
                                 MinHeight="0"
-                                Margin="1"
+                                Margin="0"
                                 Padding="{TemplateBinding Padding}"
                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"

PDF Office/ViewModels/HomePanel/PDFTools/QuickToolsContentViewModel.cs

@@ -47,9 +47,9 @@ namespace PDF_Master.ViewModels.HomePanel.PDFTools
         #endregion
         #region 属性
         /// <summary>
-        /// 扩展/收缩
+        /// 扩展/收缩 默认展开
         /// </summary>
-        private bool _isExpendTools = false;
+        private bool _isExpendTools = true;
         public bool IsExpendTools
         {
             get { return _isExpendTools; }

PDF Office/Views/HomeContent.xaml

@@ -11,13 +11,13 @@
     xmlns:viewmodels="clr-namespace:PDF_Master.ViewModels"
     d:DataContext="{d:DesignInstance Type=viewmodels:HomeContentViewModel}"
     d:DesignHeight="450"
+    d:DesignWidth="800"
+    prism:ViewModelLocator.AutoWireViewModel="True"
     AllowDrop="True"
     DragEnter="UserControl_DragEnter"
-    DragOver="UserControl_DragOver"
     DragLeave="UserControl_DragLeave"
+    DragOver="UserControl_DragOver"
     Drop="UserControl_Drop"
-    d:DesignWidth="800"
-    prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
     <UserControl.InputBindings>
         <KeyBinding Command="{Binding OpenFileCommand}" Gesture="Ctrl+O" />
@@ -61,7 +61,7 @@
             <Button
                 x:Name="BtnOpenPDF"
                 Height="40"
-                Margin="41,54,41,0"
+                Margin="32,32,32,0"
                 Command="{Binding OpenFileCommand}"
                 Foreground="#FFFFFF"
                 Style="{StaticResource btn.brand}">
@@ -75,10 +75,9 @@
                 </StackPanel>
             </Button>
 
-            <Grid Margin="41,8,41,0">
+            <Grid Margin="32,16,32,24">
                 <Button
                     x:Name="BtnCreatPDF"
-                    Width="188"
                     Height="40"
                     Command="{Binding CreateFromOtherFile}"
                     Content="{Binding T_CreatePDF}"

PDF Office/Views/HomePanel/HomeGuidContent.xaml

@@ -23,11 +23,11 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition />
                 </Grid.RowDefinitions>
-                <pDFTools:QuickToolsContent x:Name="hometool" Margin="32,32,0,0" />
+                <pDFTools:QuickToolsContent x:Name="hometool" Margin="32" />
                 <recentFiles:RecentFilesContent
                     x:Name="Recentlist"
                     Grid.Row="1"
-                    Margin="0,0,32,0" />
+                    Margin="32,0" />
             </Grid>
         </ScrollViewer>
     </Grid>

PDF Office/Views/HomePanel/PDFTools/QuickToolsContent.xaml

@@ -12,7 +12,6 @@
     xmlns:pdftools="clr-namespace:PDF_Master.ViewModels.HomePanel.PDFTools"
     xmlns:prism="http://prismlibrary.com/"
     d:DataContext="{d:DesignInstance Type=pdftools:QuickToolsContentViewModel}"
-    d:DesignHeight="450"
     d:DesignWidth="800"
     prism:ViewModelLocator.AutoWireViewModel="True"
     Loaded="UserControl_Loaded"
@@ -39,7 +38,7 @@
             </DataTemplate>
 
             <ItemsPanelTemplate x:Key="ListItemsPanelTemplate">
-                <controls:VirtualizingWrapPanel />
+                <WrapPanel />
             </ItemsPanelTemplate>
 
             <Style
@@ -47,21 +46,21 @@
                 BasedOn="{StaticResource ListBoxItemStyle}"
                 TargetType="{x:Type customControl:ListItemQuickTool}">
                 <EventSetter Event="PreviewMouseLeftButtonUp" Handler="QuickTools_Click" />
+                <Setter Property="Width" Value="223" />
                 <Setter Property="Margin" Value="8,0" />
-                <Setter Property="Width" Value="218" />
             </Style>
 
         </ResourceDictionary>
 
     </UserControl.Resources>
-    <Grid Grid.ColumnSpan="2" Margin="0,0,20,0">
+    <Grid Grid.ColumnSpan="2">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
+            <RowDefinition Height="32" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <TextBlock
             x:Name="TxbQuickToolsTitle"
-            Margin="0,2,0,2"
+            Margin="0,2"
             FontFamily="Segoe UI"
             FontSize="20"
             FontWeight="SemiBold"
@@ -73,7 +72,6 @@
             x:Name="PnlToolsUIBtns"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            Margin="0,0,12,0"
             HorizontalAlignment="Right"
             VerticalAlignment="Center"
             Orientation="Horizontal"
@@ -83,7 +81,6 @@
                 x:Name="BtnTools"
                 Width="68"
                 Height="28"
-                Margin="0,0,0,0"
                 Command="{Binding ShowToolCommand}"
                 Content="Tools"
                 Visibility="Collapsed" />
@@ -91,7 +88,6 @@
                 x:Name="BtnMore"
                 Width="32"
                 Height="32"
-                Margin="12,0,0,16"
                 Command="{Binding OpenMenuCommand}"
                 CommandParameter="{Binding ElementName=BtnMore}"
                 Style="{StaticResource btn.sec}">
@@ -109,14 +105,15 @@
         <Grid
             x:Name="GridAllTools"
             Grid.Row="1"
-            Height="270"
-            Margin="0,0,12,0"
+            Height="152"
+            Margin="0,16,0,0"
             SizeChanged="GridAllTools_SizeChanged">
 
             <customControl:ListBoxEx
                 x:Name="ListBoxExpendToolBars"
                 Grid.Row="3"
                 MinWidth="250"
+                Padding="-8,0,-8,0"
                 HorizontalAlignment="Stretch"
                 AllowDrop="True"
                 Background="Transparent"
@@ -133,6 +130,7 @@
                 x:Name="ListBoxToolBars"
                 Grid.Row="3"
                 MinWidth="250"
+                Padding="-8,0,-8,0"
                 AllowDrop="True"
                 Background="Transparent"
                 BorderThickness="0"

PDF Office/Views/HomePanel/PromotionContent.xaml

@@ -19,6 +19,7 @@
             <DataTemplate x:Key="PromotionDataTemplate">
                 <StackPanel
                     Height="32"
+                    Margin="16 0"
                     Background="Transparent"
                     Cursor="Hand"
                     Orientation="Horizontal">
@@ -26,9 +27,9 @@
                         Width="16"
                         Height="16"
                         Margin="0,0,10,0"
-                        Source="{Binding ImagePath}" 
                         RenderOptions.BitmapScalingMode="HighQuality"
-                        UseLayoutRounding="True"/>
+                        Source="{Binding ImagePath}"
+                        UseLayoutRounding="True" />
                     <TextBlock
                         VerticalAlignment="Center"
                         FontSize="14"
@@ -38,7 +39,7 @@
             </DataTemplate>
         </ResourceDictionary>
     </UserControl.Resources>
-    <ScrollViewer VerticalScrollBarVisibility="Auto">
+    <ScrollViewer Margin="16,0" VerticalScrollBarVisibility="Auto">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
@@ -47,15 +48,16 @@
             <StackPanel>
                 <Expander
                     x:Name="PDFProSeriesExpander"
-                    Margin="20,20,0,0"
+                    Padding="0"
                     IsExpanded="True"
                     Style="{StaticResource PromotionExpanderStyle}">
                     <Expander.Header>
-                        <Grid
-                            Name="GridHeader"
-                            Height="32"
-                            HorizontalAlignment="Center">
-                            <TextBlock VerticalAlignment="Center" Text="PDF Pro Series" />
+                        <Grid Name="GridHeader" Height="32">
+                            <TextBlock
+                                Margin="16,0"
+                                VerticalAlignment="Center"
+                                Text="PDF Pro Series"
+                                TextAlignment="Left" />
                         </Grid>
                     </Expander.Header>
                     <Border CornerRadius="4">
@@ -71,11 +73,12 @@
                                     <Style BasedOn="{StaticResource EmptyListViewItem}" TargetType="{x:Type ListViewItem}">
                                         <Style.Triggers>
                                             <Trigger Property="IsMouseOver" Value="True">
-                                                <Setter Property="Background" Value="{StaticResource color.item-state.hov.bg}" />
+                                                <Setter Property="Background" Value="{StaticResource color.item-state.sel.bg.lv2}" />
                                             </Trigger>
                                         </Style.Triggers>
                                         <EventSetter Event="PreviewMouseLeftButtonDown" Handler="FrameworkElement_PreviewMouseLeftButtonDown" />
                                         <Setter Property="AllowDrop" Value="True" />
+                                        <Setter Property="Height" Value="32" />
                                     </Style>
                                 </ListView.ItemContainerStyle>
                             </ListView>
@@ -86,13 +89,14 @@
 
                 <Expander
                     x:Name="OthersExpander"
-                    Margin="20,8,0,0"
+                    Margin="0,8,0,0"
                     IsExpanded="True"
                     Style="{StaticResource PromotionExpanderStyle}">
                     <Expander.Header>
                         <Grid
                             Name="GridHeaderOthers"
                             Height="32"
+                            Margin="16,0"
                             HorizontalAlignment="Center">
                             <TextBlock VerticalAlignment="Center" Text="Others" />
                         </Grid>
@@ -108,13 +112,15 @@
                                 ItemTemplate="{StaticResource PromotionDataTemplate}">
                                 <ListView.ItemContainerStyle>
                                     <Style BasedOn="{StaticResource EmptyListViewItem}" TargetType="{x:Type ListViewItem}">
+
                                         <Style.Triggers>
                                             <Trigger Property="IsMouseOver" Value="True">
-                                                <Setter Property="Background" Value="{StaticResource color.item-state.hov.bg}" />
+                                                <Setter Property="Background" Value="{StaticResource color.item-state.sel.bg.lv2}" />
                                             </Trigger>
                                         </Style.Triggers>
                                         <EventSetter Event="PreviewMouseLeftButtonDown" Handler="FrameworkElement_PreviewMouseLeftButtonDown" />
                                         <Setter Property="AllowDrop" Value="True" />
+                                        <Setter Property="Height" Value="32" />
                                     </Style>
                                 </ListView.ItemContainerStyle>
                             </ListView>
@@ -129,7 +135,7 @@
                 Grid.Row="1"
                 Width="184"
                 Height="243"
-                Margin="0,30"
+                Margin="0,24"
                 VerticalAlignment="Bottom"
                 PreviewMouseLeftButtonDown="ImgeActivity_PreviewMouseLeftButtonDown" />
         </Grid>

PDF Office/Views/HomePanel/RecentFiles/DocItemControl.xaml

@@ -9,16 +9,14 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <Grid
-        Width="226"
-        Height="248"
         DataContext="{Binding}"
         Loaded="Grid_Loaded"
         ToolTip="{Binding FilePath}">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
-            <RowDefinition />
+            <RowDefinition Height="52" />
         </Grid.RowDefinitions>
-        <Grid Height="165" Margin="51,16">
+        <Grid Margin="51,8">
             <Border
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
@@ -64,6 +62,7 @@
                 VerticalAlignment="Top"
                 FontSize="14"
                 Text="{Binding FileName}"
+                TextAlignment="Center"
                 TextTrimming="CharacterEllipsis"
                 TextWrapping="Wrap"
                 ToolTip="{Binding FileName}" />

PDF Office/Views/HomePanel/RecentFiles/DocItemListViewControl.xaml

@@ -31,13 +31,7 @@
         DataContext="{Binding}"
         Loaded="Grid_Loaded"
         ToolTip="{Binding FilePath}">
-        <Grid.Background>
-            <SolidColorBrush Opacity="0.01" Color="White" />
-        </Grid.Background>
-        <Grid
-            x:Name="FileInfoGrid"
-            Margin="6,6,6,6"
-            HorizontalAlignment="Stretch">
+        <Grid x:Name="FileInfoGrid" HorizontalAlignment="Stretch">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="4.5*" MinWidth="0" />
                 <ColumnDefinition Width="3*" />
@@ -50,18 +44,22 @@
                     <ColumnDefinition />
                 </Grid.ColumnDefinitions>
 
-                <Border
-                    Margin="10,0"
-                    BorderBrush="{StaticResource color.item-state.sel.border.lv3}"
-                    BorderThickness="1">
-                    <Image
-                        x:Name="CoverImage"
-                        Width="40"
-                        Height="60"
-                        RenderOptions.BitmapScalingMode="HighQuality"
-                        UseLayoutRounding="True" />
-                </Border>
-                <StackPanel Grid.Column="1" Margin="8,8,0,8">
+                <Grid
+                    Width="40"
+                    Height="60"
+                    Margin="10,0">
+                    <Border
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        BorderBrush="{StaticResource color.sys.layout.divider}"
+                        BorderThickness="1">
+                        <Image
+                            x:Name="CoverImage"
+                            RenderOptions.BitmapScalingMode="HighQuality"
+                            UseLayoutRounding="True" />
+                    </Border>
+                </Grid>
+                <StackPanel Grid.Column="1" Margin="8,12,0,12">
                     <StackPanel Grid.Column="1" Orientation="Horizontal">
                         <Rectangle
                             Name="RecNewMark"

PDF Office/Views/HomePanel/RecentFiles/RecentFilesContent.xaml

@@ -41,7 +41,7 @@
             </DataTemplate>
 
             <ItemsPanelTemplate x:Key="listPanel">
-                <StackPanel Orientation="Vertical" />
+                <StackPanel Margin="0,-30,0,0" Orientation="Vertical" />
             </ItemsPanelTemplate>
 
             <ItemsPanelTemplate x:Key="gridPanel">
@@ -87,7 +87,7 @@
                 TargetType="{x:Type ListViewItem}">
                 <Setter Property="ContextMenu" Value="{StaticResource FlyoutMenu}" />
                 <Setter Property="HorizontalContentAlignment" Value="Center" />
-                <Setter Property="Margin" Value="0,0,0,0" />
+                <Setter Property="Height" Value="72" />
                 <EventSetter Event="PreviewMouseRightButtonDown" Handler="ListViewItem_PreviewMouseRightButtonDown" />
                 <EventSetter Event="PreviewMouseDoubleClick" Handler="RecentFilesList_PreviewMouseDoubleClick" />
             </Style>
@@ -98,6 +98,10 @@
                 TargetType="{x:Type ListViewItem}">
                 <Setter Property="ContextMenu" Value="{StaticResource FlyoutMenu}" />
                 <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />
+                <Setter Property="Width" Value="226" />
+                <Setter Property="Height" Value="248" />
+                <Setter Property="Padding" Value="0" />
                 <EventSetter Event="PreviewMouseRightButtonDown" Handler="ListViewItem_PreviewMouseRightButtonDown" />
                 <EventSetter Event="PreviewMouseDoubleClick" Handler="RecentFilesList_PreviewMouseDoubleClick" />
             </Style>
@@ -111,7 +115,7 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
             </Grid.RowDefinitions>
-            <Grid x:Name="GridRecentFilesTile" Margin="32,38,0,13">
+            <Grid x:Name="GridRecentFilesTile">
                 <TextBlock
                     x:Name="TxbRecentlyTile"
                     Margin="0,0,0,0"
@@ -221,7 +225,10 @@
                 </StackPanel>
             </Grid>
 
-            <Grid Grid.Row="2" Visibility="{Binding IsEmpty, Converter={StaticResource InvertBoolToVisibleConvert}}">
+            <Grid
+                Grid.Row="2"
+                Margin="0,16,0,0"
+                Visibility="{Binding IsEmpty, Converter={StaticResource InvertBoolToVisibleConvert}}">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="799*" />
                     <ColumnDefinition Width="*" />
@@ -232,9 +239,6 @@
                         Grid.ColumnSpan="2"
                         MinWidth="380"
                         MinHeight="216"
-                        Margin="32,0,0,0"
-                        Padding="0,0,0,0"
-                        Background="Transparent"
                         BorderThickness="0"
                         ItemContainerStyle="{StaticResource SubFilesListViewItemStyle}"
                         ItemTemplate="{StaticResource listviewItem}"
@@ -255,8 +259,6 @@
                     Grid.ColumnSpan="2"
                     MinWidth="380"
                     MinHeight="216"
-                    Margin="32,0,0,0"
-                    Padding="0,0,0,0"
                     Background="Transparent"
                     BorderThickness="0"
                     ItemContainerStyle="{StaticResource HomeGridViewItemStyle}"