Merge

PDF Office/App.xaml.cs

@@ -32,8 +32,11 @@ using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePagePrinter;
 using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
 using PDF_Office.Views.Dialog.ConverterDialogs;
 using PDF_Office.Helper;
+<<<<<<< Updated upstream
 using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageConverter;
 using PDF_Office.Views.EditTools.Watermark;
+=======
+>>>>>>> Stashed changes
 using PDF_Office.Views.EditTools.Background;
 
 namespace PDF_Office
@@ -113,6 +116,7 @@ namespace PDF_Office
             containerRegistry.RegisterForNavigation<HomePageCompressDialog>();
             containerRegistry.RegisterForNavigation<HomePageSetPasswordDialog>();
             containerRegistry.RegisterForNavigation<ConverterBarContent>();
+<<<<<<< Updated upstream
             containerRegistry.RegisterForNavigation<HomePageConverterDialog>();
             containerRegistry.RegisterForNavigation<HomePageConverterCSV>();
             containerRegistry.RegisterForNavigation<HomePageConverterImg>();
@@ -120,6 +124,15 @@ namespace PDF_Office
             containerRegistry.RegisterForNavigation<HomePageConverterExcel>();
             containerRegistry.RegisterForNavigation<WatermarkContent>();
             containerRegistry.RegisterForNavigation<BackgroundContent>();
+=======
+            containerRegistry.RegisterForNavigation<BackgroundContent>();
+            containerRegistry.RegisterForNavigation<BackgroundTemplateListBaseContent>();
+            containerRegistry.RegisterForNavigation<BackgroundTemplateListColorContent>();
+            containerRegistry.RegisterForNavigation<BackgroundTemplateListFileContent>();
+            containerRegistry.RegisterForNavigation<BackgroundCreateBaseContent>();
+            containerRegistry.RegisterForNavigation<BackgroundCreateColorContent>();
+            containerRegistry.RegisterForNavigation<BackgroundCreateFileContent>();
+>>>>>>> Stashed changes
 
             //注册弹窗
             containerRegistry.RegisterDialog<VerifyPassWordDialog>(DialogNames.VerifyPassWordDialog);
@@ -183,8 +196,11 @@ namespace PDF_Office
 #if DEBUG
             devKey = "ehrnKqkWc1XSEAWyPUt6+95GzCoLEyoKrCbsUuJkCqGmxmP5ozX4bS0R6crHItQVNTFvC5mBZ1M7QjJ6Ekdu4Daj7PM+EDLTBKbFJinK4Ri9E5E2X+a9vF5zSj0TkIscQPVnwj9ikxAFOWGIyybMwQQzwc8a4j1cGOqGXQRDMMY=";
             devSecret = "mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4gQurxTxGuBlGAhs0P1mD3X3bHT+AHfcLiymaqE4DY7kTFHoPs9I3tl5ErS+BHdzHRhrp9sGpqfp0B228KI+IMTu4aGVjtYuk+Uxs/kosIBw1367/WkJ00tM7U7tttD6ccHhEu996bvBgqf8Sw8OekQKQq13VBewK5AckaDux4W7SGRhCUNWC4MItkr36JnXMD2tiFQYzMG8C66HYmRGSLh";
+<<<<<<< Updated upstream
             devKey = sdkhelper.DevKey;
             devSecret = sdkhelper.DevSecret;
+=======
+>>>>>>> Stashed changes
 #endif
             string userKey = sdkhelper.UserKey; 
             string userSecret = sdkhelper.UserSecret; 

PDF Office/EventAggregators/EditToolsEvent.cs

@@ -7,11 +7,26 @@ using System.Threading.Tasks;
 
 namespace PDF_Office.EventAggregators
 {
-    public class EditToolsEvent:PubSubEvent<string>
+
+    public enum EnumTemplateListOrCreate
+    {
+        StatusTemplate,
+        StatusCreate
+    }
+
+    public class EnterSelectedEditToolEvent : PubSubEvent<string>
     {
     }
 
     public class CloseEditToolEvent : PubSubEvent
     {
     }
+<<<<<<< Updated upstream
+=======
+
+    public class EnterTemplateListOrCreateEvent : PubSubEvent<EnumTemplateListOrCreate>
+    {
+
+    }
+>>>>>>> Stashed changes
 }

PDF Office/PDF Office.csproj

@@ -277,7 +277,10 @@
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
     </Compile>
+<<<<<<< Updated upstream
     <Compile Include="ViewModels\EditTools\Background\BackgroundContentViewModel.cs" />
+=======
+>>>>>>> Stashed changes
     <Compile Include="ViewModels\BOTA\BOTAContentViewModel.cs" />
     <Compile Include="ViewModels\BottomToolContentViewModel.cs" />
     <Compile Include="ViewModels\Dialog\ConverterDialogs\ConverterProgressBarDialogViewModel.cs" />
@@ -289,11 +292,21 @@
     <Compile Include="ViewModels\Dialog\ConverterDialogs\ConverterRTFDialogViewModel.cs" />
     <Compile Include="ViewModels\Dialog\ConverterDialogs\ConverterTextDialogViewModel.cs" />
     <Compile Include="ViewModels\Dialog\ConverterDialogs\ConverterWordDialogViewModel.cs" />
+<<<<<<< Updated upstream
     <Compile Include="ViewModels\Dialog\HomePageToolsDialogs\HomePageBatchProcessing\HomePageConverter\HomePageConverterDialogViewModel.cs" />
     <Compile Include="ViewModels\Dialog\HomePageToolsDialogs\HomePageBatchProcessing\HomePageConverter\HomePageConverterCSVViewModel.cs" />
     <Compile Include="ViewModels\Dialog\HomePageToolsDialogs\HomePageBatchProcessing\HomePageConverter\HomePageConverterExcelViewModel.cs" />
     <Compile Include="ViewModels\Dialog\HomePageToolsDialogs\HomePageBatchProcessing\HomePageConverter\HomePageConverterImgViewModel.cs" />
     <Compile Include="ViewModels\Dialog\HomePageToolsDialogs\HomePageBatchProcessing\HomePageConverter\HomePageConverterWordViewModel.cs" />
+=======
+    <Compile Include="ViewModels\EditTools\Background\BackgroundContentViewModel.cs" />
+    <Compile Include="ViewModels\EditTools\Background\BackgroundCreateBaseContentViewModel.cs" />
+    <Compile Include="ViewModels\EditTools\Background\BackgroundCreateColorContentViewModel.cs" />
+    <Compile Include="ViewModels\EditTools\Background\BackgroundCreateFileContentViewModel.cs" />
+    <Compile Include="ViewModels\EditTools\Background\BackgroundTemplateListBaseContentViewModel.cs" />
+    <Compile Include="ViewModels\EditTools\Background\BackgroundTemplateListColorContentViewModel.cs" />
+    <Compile Include="ViewModels\EditTools\Background\BackgroundTemplateListFileContentViewModel.cs" />
+>>>>>>> Stashed changes
     <Compile Include="ViewModels\Tools\ConverterBarContentViewModel.cs" />
     <Compile Include="ViewModels\Dialog\ExtractDialogViewModel.cs" />
     <Compile Include="ViewModels\Dialog\FullScreenWindowViewModel.cs" />
@@ -460,6 +473,7 @@
     <Compile Include="Views\EditTools\Background\BackgroundContent.xaml.cs">
       <DependentUpon>BackgroundContent.xaml</DependentUpon>
     </Compile>
+<<<<<<< Updated upstream
     <Compile Include="Views\EditTools\Watermark\WatermarkContent.xaml.cs">
       <DependentUpon>WatermarkContent.xaml</DependentUpon>
     </Compile>
@@ -480,6 +494,25 @@
     </Compile>
     <Compile Include="Views\EditTools\Watermark\WatermarkTemplateListTextContent.xaml.cs">
       <DependentUpon>WatermarkTemplateListTextContent.xaml</DependentUpon>
+=======
+    <Compile Include="Views\EditTools\Background\BackgroundCreateBaseContent.xaml.cs">
+      <DependentUpon>BackgroundCreateBaseContent.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\EditTools\Background\BackgroundCreateColorContent.xaml.cs">
+      <DependentUpon>BackgroundCreateColorContent.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\EditTools\Background\BackgroundCreateFileContent.xaml.cs">
+      <DependentUpon>BackgroundCreateFileContent.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\EditTools\Background\BackgroundTemplateListBaseContent.xaml.cs">
+      <DependentUpon>BackgroundTemplateListBaseContent.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\EditTools\Background\BackgroundTemplateListColorContent.xaml.cs">
+      <DependentUpon>BackgroundTemplateListColorContent.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\EditTools\Background\BackgroundTemplateListFileContent.xaml.cs">
+      <DependentUpon>BackgroundTemplateListFileContent.xaml</DependentUpon>
+>>>>>>> Stashed changes
     </Compile>
     <Compile Include="Views\HomePanel\CloudDrive\CloudDriveContent.xaml.cs">
       <DependentUpon>CloudDriveContent.xaml</DependentUpon>
@@ -564,6 +597,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\CheckBoxStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles\ComboxStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -764,6 +801,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+<<<<<<< Updated upstream
     <Page Include="Views\EditTools\Watermark\WatermarkContent.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -789,6 +827,29 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Views\EditTools\Watermark\WatermarkTemplateListTextContent.xaml">
+=======
+    <Page Include="Views\EditTools\Background\BackgroundCreateBaseContent.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\EditTools\Background\BackgroundCreateColorContent.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\EditTools\Background\BackgroundCreateFileContent.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\EditTools\Background\BackgroundTemplateListBaseContent.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\EditTools\Background\BackgroundTemplateListColorContent.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\EditTools\Background\BackgroundTemplateListFileContent.xaml">
+>>>>>>> Stashed changes
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

PDF Office/ViewModels/Tools/ToolsBarContentViewModel.cs

@@ -38,6 +38,9 @@ namespace PDF_Office.ViewModels.Tools
 
         public DelegateCommand SetWatermarkCommand { get; set; }
 
+        public DelegateCommand<object> SetEditToolsCommand { get; set; }
+
+
         public ToolsBarContentViewModel(IDialogService dialogService, IEventAggregator eventAggregator)
         {
             dialogs= dialogService;
@@ -53,7 +56,11 @@ namespace PDF_Office.ViewModels.Tools
             var args = e as System.Windows.Controls.Button;
             if (args != null)
             {
+<<<<<<< Updated upstream
                 this.eventAggregator.GetEvent<EditToolsEvent>().Publish(args.Name);
+=======
+                this.eventAggregator.GetEvent<EnterSelectedEditToolEvent>().Publish(args.Name);
+>>>>>>> Stashed changes
             }
         }
 

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -18,6 +18,11 @@ using System.Windows.Controls;
 using System.IO;
 using Prism.Events;
 using PDF_Office.EventAggregators;
+<<<<<<< Updated upstream
+=======
+using PDF_Office.Views.EditTools.Background;
+
+>>>>>>> Stashed changes
 namespace PDF_Office.ViewModels
 {
 
@@ -44,6 +49,8 @@ namespace PDF_Office.ViewModels
 
         public string ConverterBarContentRegionName { get; set; }
 
+       public string BackgroundContentRegionName{get; set;}
+
         /// <summary>
         /// 是否处于页面编辑模式，用于执行undo redo 的具体操作
         /// </summary>
@@ -164,17 +171,17 @@ namespace PDF_Office.ViewModels
             }
         }
 
-        private Visibility toolsbarContentVisible = Visibility.Collapsed;
+        private Visibility toolsBarContentVisible = Visibility.Collapsed;
         /// <summary>
         /// 控制ToolsBarContent的显示
         /// 留意：显示前需要先注入内容、设置好行和跨行数
         /// </summary>
         public Visibility ToolsBarContentVisible
         {
-            get { return toolsbarContentVisible; }
+            get { return toolsBarContentVisible; }
             set
             {
-                SetProperty(ref toolsbarContentVisible, value);
+                SetProperty(ref toolsBarContentVisible, value);
             }
         }
 
@@ -280,9 +287,15 @@ namespace PDF_Office.ViewModels
             barContentByTabItem = new Dictionary<string, string>();
             InitialregionNameByTabItem(ref regionNameByTabItem);
             InitialbarContentByTabItem(ref barContentByTabItem);
+<<<<<<< Updated upstream
             eventAggregator.GetEvent<EditToolsEvent>().Subscribe(EnterEditTools);
             eventAggregator.GetEvent<CloseEditToolEvent>().Subscribe(CloseEditTool);
 
+=======
+
+            eventAggregator.GetEvent<EnterSelectedEditToolEvent>().Subscribe(EnterEditTools);
+            eventAggregator.GetEvent<CloseEditToolEvent>().Subscribe(CloseEditTool);
+>>>>>>> Stashed changes
         }
 
         private void InitialregionNameByTabItem(ref Dictionary<string, string> dictionary)
@@ -326,6 +339,7 @@ namespace PDF_Office.ViewModels
                 case "TabItemPageEdit":
                     ToolContentVisible = Visibility.Visible;
                     break;
+<<<<<<< Updated upstream
                 case "WatermarkContent":
                     ToolContentVisible = Visibility.Visible;
                     break;
@@ -333,6 +347,11 @@ namespace PDF_Office.ViewModels
                     ToolContentVisible = Visibility.Visible;
                     break;
                    
+=======
+                case "BackgroundContent":
+                    ToolContentVisible = Visibility.Visible;
+                    break;
+>>>>>>> Stashed changes
                 default:
                     break;
             }
@@ -749,6 +768,7 @@ namespace PDF_Office.ViewModels
         /// <param name="EditToolName"></param>
         private void EnterEditTools(string EditToolName)
         {
+<<<<<<< Updated upstream
             EnterSelectedEditTool(EditToolName);
         }
         private void EnterSelectedEditTool(string EditToolName)
@@ -760,7 +780,28 @@ namespace PDF_Office.ViewModels
         {
             currentBar = "TabItemTool";
             EnterSelectedBar(currentBar);
+=======
+           
+                EnterSelectedEditTool(EditToolName);
+>>>>>>> Stashed changes
         }
+        /// <summary>
+        /// 二级菜单指定目标处理
+        /// </summary>
+        /// <param name="e"></param>
+        private void EnterSelectedEditTool(string EditToolName)
+        {
+            currentBar = EditToolName;
+            EnterToolMode(EditToolName);
+        }
+
+        private void CloseEditTool()
+        {
+            currentBar = "TabItemTool";
+            EnterSelectedBar(currentBar);
+        }
+
+
         /// <summary>
         /// 进入工具编辑(如页面编辑、水印、密文等)模式
         /// </summary> 

PDF Office/Views/Tools/ToolsBarContent.xaml

@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 <UserControl x:Class="PDF_Office.Views.Tools.ToolsBarContent"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -151,3 +152,158 @@
         </Border>
     </Grid>
 </UserControl>
+=======
+<UserControl x:Class="PDF_Office.Views.Tools.ToolsBarContent"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:prism="http://prismlibrary.com/" xmlns:tools="clr-namespace:PDF_Office.ViewModels.Tools" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"  
+             prism:ViewModelLocator.AutoWireViewModel="True">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../../Styles/CustomBtnStyle.xaml"/>
+                <ResourceDictionary Source="../../Styles/MenuStyle.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <Border x:Name="ToolsBorder" BorderBrush="#1A000000" BorderThickness="0,1,0,1" Height="40">
+            <WrapPanel HorizontalAlignment="Center" Height="40">
+                <Button Style="{StaticResource InsideBarBtnStyle }" Command="{Binding CompressCommand}">
+
+                    <StackPanel Orientation="Horizontal" Margin="12 0 12 0">
+                        <StackPanel Margin="0,0,8,0">
+                            <Border Height="30" Width="30" Background="LightSeaGreen" ></Border>
+                        </StackPanel >
+                        <TextBlock Text="压缩" VerticalAlignment="Center"></TextBlock>
+                    </StackPanel>
+                </Button>
+                <Button Style="{StaticResource InsideBarBtnStyle }" >
+
+                    <StackPanel Orientation="Horizontal" Margin="12 0 12 0">
+                        <StackPanel Margin="0,0,8,0">
+                            <Border Height="30" Width="30" Background="LightSeaGreen" ></Border>
+                        </StackPanel >
+                        <TextBlock Text="合并" VerticalAlignment="Center"></TextBlock>
+                    </StackPanel>
+                </Button>
+                <Button Style="{StaticResource InsideBarBtnStyle }">
+
+                    <StackPanel Orientation="Horizontal" Margin="12 0 12 0">
+                        <StackPanel Margin="0,0,8,0">
+                            <Border Height="30" Width="30" Background="LightSeaGreen" ></Border>
+                        </StackPanel >
+                        <TextBlock Text="文件对比" VerticalAlignment="Center"></TextBlock>
+                    </StackPanel>
+                </Button>
+                <Menu Background="White">
+                    <MenuItem x:Name="btnPassword" Height="40" Padding="0" Width="auto" BorderThickness="0" >
+                        <MenuItem.Header>
+                            <StackPanel Orientation="Horizontal" Margin="12 0 12 0" VerticalAlignment="Center">
+                                <StackPanel Margin="0,0,8,0" VerticalAlignment="Center">
+                                    <Border Height="30" Width="30" Background="LightSeaGreen" ></Border>
+                                </StackPanel >
+                                <TextBlock x:Name="txtPassword" Padding="0,12,0,0" Text="安全" Height="40" FontSize="12"/>
+                                <Path Fill="Black" VerticalAlignment="Center" HorizontalAlignment="Right" Data="M0 0L4 4L8 0H0Z">
+                                    <Path.RenderTransform>
+                                        <TranslateTransform X="8"/>
+                                    </Path.RenderTransform>
+                                </Path>
+                            </StackPanel>
+                        </MenuItem.Header>
+                        <MenuItem Name="MenuEncrypt" Style="{StaticResource ToolsMenuStyle }" Command="{Binding SetPasswordCommand}">
+                            <MenuItem.Header>
+                                <TextBlock Text="设置密码" ></TextBlock>
+                            </MenuItem.Header>
+                        </MenuItem>
+                        <MenuItem Name="MenuDecrypt"  Style="{StaticResource ToolsMenuStyle }"  Command="{Binding CancelPasswordCommand}">
+                            <MenuItem.Header>
+                                <TextBlock Text="解除安全性设置"></TextBlock>
+                            </MenuItem.Header>
+                        </MenuItem>
+                    </MenuItem>
+                </Menu>
+                <Button Style="{StaticResource InsideBarBtnStyle }" >
+
+                    <StackPanel Orientation="Horizontal" Margin="12 0 12 0">
+                        <StackPanel Margin="0,0,8,0">
+                            <Border Height="30" Width="30" Background="LightSeaGreen" ></Border>
+                        </StackPanel >
+                        <TextBlock Text="密文" VerticalAlignment="Center"></TextBlock>
+                        <Path Fill="Black" VerticalAlignment="Center" HorizontalAlignment="Right" Data="M0 0L4 4L8 0H0Z">
+                            <Path.RenderTransform>
+                                <TranslateTransform X="8"/>
+                            </Path.RenderTransform>
+                        </Path>
+                    </StackPanel>
+                </Button>
+                <Button x:Name="WatermarkContent" Style="{StaticResource InsideBarBtnStyle }" Command="{Binding SetEditToolsCommand }" CommandParameter="{Binding ElementName=WatermarkContent}">
+
+                    <StackPanel Orientation="Horizontal" Margin="12 0 12 0">
+                        <StackPanel Margin="0,0,8,0">
+                            <Border Height="30" Width="30" Background="LightSeaGreen" ></Border>
+                        </StackPanel >
+                        <TextBlock Text="水印" VerticalAlignment="Center"></TextBlock>
+                        <Path Fill="Black" VerticalAlignment="Center" HorizontalAlignment="Right" Data="M0 0L4 4L8 0H0Z">
+                            <Path.RenderTransform>
+                                <TranslateTransform X="8"/>
+                            </Path.RenderTransform>
+                        </Path>
+                    </StackPanel>
+                </Button>
+                <Button  Name="BackgroundContent" Style="{StaticResource InsideBarBtnStyle }" Command="{Binding SetEditToolsCommand }" CommandParameter="{Binding ElementName=BackgroundContent}">
+
+                    <StackPanel Orientation="Horizontal" Margin="12 0 12 0">
+                        <StackPanel Margin="0,0,8,0">
+                            <Border Height="30" Width="30" Background="LightSeaGreen" ></Border>
+                        </StackPanel >
+                        <TextBlock Text="背景" VerticalAlignment="Center"></TextBlock>
+                        <Path Fill="Black" VerticalAlignment="Center" HorizontalAlignment="Right" Data="M0 0L4 4L8 0H0Z">
+                            <Path.RenderTransform>
+                                <TranslateTransform X="8"/>
+                            </Path.RenderTransform>
+                        </Path>
+                    </StackPanel>
+                </Button>
+                <Button Style="{StaticResource InsideBarBtnStyle }" >
+
+                    <StackPanel Orientation="Horizontal" Margin="12 0 12 0">
+                        <StackPanel Margin="0,0,8,0">
+                            <Border Height="30" Width="30" Background="LightSeaGreen" ></Border>
+                        </StackPanel >
+                        <TextBlock Text="页眉页脚" VerticalAlignment="Center"></TextBlock>
+                        <Path Fill="Black" VerticalAlignment="Center" HorizontalAlignment="Right" Data="M0 0L4 4L8 0H0Z">
+                            <Path.RenderTransform>
+                                <TranslateTransform X="8"/>
+                            </Path.RenderTransform>
+                        </Path>
+                    </StackPanel>
+                </Button>
+                <Button Style="{StaticResource InsideBarBtnStyle }" >
+
+                    <StackPanel Orientation="Horizontal" Margin="12 0 12 0">
+                        <StackPanel Margin="0,0,8,0">
+                            <Border Height="30" Width="30" Background="LightSeaGreen" ></Border>
+                        </StackPanel >
+                        <TextBlock Text="贝茨码" VerticalAlignment="Center"></TextBlock>
+                        <Path Fill="Black" VerticalAlignment="Center" HorizontalAlignment="Right" Data="M0 0L4 4L8 0H0Z">
+                            <Path.RenderTransform>
+                                <TranslateTransform X="8"/>
+                            </Path.RenderTransform>
+                        </Path>
+                    </StackPanel>
+                </Button>
+                <Button Style="{StaticResource InsideBarBtnStyle }">
+
+                    <StackPanel Orientation="Horizontal" Margin="12 0 12 0">
+                        <StackPanel Margin="0,0,8,0">
+                            <Border Height="30" Width="30" Background="LightSeaGreen" ></Border>
+                        </StackPanel >
+                        <TextBlock Text="裁剪" VerticalAlignment="Center"></TextBlock>
+                    </StackPanel>
+                </Button>
+            </WrapPanel>
+        </Border>
+    </Grid>
+</UserControl>
+>>>>>>> Stashed changes

PDF Office/Views/ViewContent.xaml

@@ -31,7 +31,11 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Name="HeadRow" Height="40" />
+<<<<<<< Updated upstream
             <RowDefinition Name="ToolRow" Height="40" />
+=======
+            <RowDefinition Name="ToolRow" Height="40" /> 
+>>>>>>> Stashed changes
             <RowDefinition Height="*" />
             <RowDefinition Height="32" />
         </Grid.RowDefinitions>
@@ -193,12 +197,22 @@
             Grid.Row="{Binding GridToolRow}"
             prism:RegionManager.RegionName="{Binding ToolsBarContentRegionName}"
             Visibility="{Binding ToolsBarContentVisible}" />
+        
         <ContentControl
             Name="ContentConverterBar"
             Grid.Row="{Binding GridToolRow}"
             prism:RegionManager.RegionName="{Binding ConverterBarContentRegionName}"
             Visibility="{Binding ConverterBarContentVisible}" />
         
+<<<<<<< Updated upstream
+=======
+        <ContentControl
+            Name="ContentBackground"
+            Grid.Row="{Binding GridToolRow}"
+            Grid.RowSpan="{Binding GridToolRowSpan}"
+            prism:RegionManager.RegionName="{Binding BackgroundContentRegionName}"
+            Visibility="{Binding BackgroundContentVisible}" />
+>>>>>>> Stashed changes
     </Grid>
 
 </UserControl>