resolve conflict

PDF Office/App.xaml.cs

@@ -32,11 +32,8 @@ 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.Watermark; 
 using PDF_Office.Views.EditTools.Background;
 
 namespace PDF_Office
@@ -116,7 +113,6 @@ namespace PDF_Office
             containerRegistry.RegisterForNavigation<HomePageCompressDialog>();
             containerRegistry.RegisterForNavigation<HomePageSetPasswordDialog>();
             containerRegistry.RegisterForNavigation<ConverterBarContent>();
-<<<<<<< Updated upstream
             containerRegistry.RegisterForNavigation<HomePageConverterDialog>();
             containerRegistry.RegisterForNavigation<HomePageConverterCSV>();
             containerRegistry.RegisterForNavigation<HomePageConverterImg>();
@@ -124,7 +120,6 @@ namespace PDF_Office
             containerRegistry.RegisterForNavigation<HomePageConverterExcel>();
             containerRegistry.RegisterForNavigation<WatermarkContent>();
             containerRegistry.RegisterForNavigation<BackgroundContent>();
-=======
             containerRegistry.RegisterForNavigation<BackgroundContent>();
             containerRegistry.RegisterForNavigation<BackgroundTemplateListBaseContent>();
             containerRegistry.RegisterForNavigation<BackgroundTemplateListColorContent>();
@@ -132,7 +127,6 @@ namespace PDF_Office
             containerRegistry.RegisterForNavigation<BackgroundCreateBaseContent>();
             containerRegistry.RegisterForNavigation<BackgroundCreateColorContent>();
             containerRegistry.RegisterForNavigation<BackgroundCreateFileContent>();
->>>>>>> Stashed changes
 
             //注册弹窗
             containerRegistry.RegisterDialog<VerifyPassWordDialog>(DialogNames.VerifyPassWordDialog);
@@ -196,11 +190,8 @@ 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

@@ -21,12 +21,8 @@ namespace PDF_Office.EventAggregators
     public class CloseEditToolEvent : PubSubEvent
     {
     }
-<<<<<<< Updated upstream
-=======
-
     public class EnterTemplateListOrCreateEvent : PubSubEvent<EnumTemplateListOrCreate>
     {
 
     }
->>>>>>> Stashed changes
 }

PDF Office/PDF Office.csproj

@@ -277,10 +277,7 @@
       <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" />
@@ -292,13 +289,11 @@
     <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" />
@@ -306,7 +301,6 @@
     <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" />
@@ -473,7 +467,6 @@
     <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>
@@ -494,7 +487,7 @@
     </Compile>
     <Compile Include="Views\EditTools\Watermark\WatermarkTemplateListTextContent.xaml.cs">
       <DependentUpon>WatermarkTemplateListTextContent.xaml</DependentUpon>
-=======
+    </Compile>
     <Compile Include="Views\EditTools\Background\BackgroundCreateBaseContent.xaml.cs">
       <DependentUpon>BackgroundCreateBaseContent.xaml</DependentUpon>
     </Compile>
@@ -512,7 +505,6 @@
     </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>
@@ -801,7 +793,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-<<<<<<< Updated upstream
     <Page Include="Views\EditTools\Watermark\WatermarkContent.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -827,7 +818,9 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Views\EditTools\Watermark\WatermarkTemplateListTextContent.xaml">
-=======
+          <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\EditTools\Background\BackgroundCreateBaseContent.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -849,7 +842,6 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Views\EditTools\Background\BackgroundTemplateListFileContent.xaml">
->>>>>>> Stashed changes
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

PDF Office/SDKLisence.xml

@@ -1,7 +1,7 @@
 <Lisences
-	devKey = "sTHSivIW4YnZQavIYDLVw4vaFcN5DQTUtRGrVyv5p9aeaHX3GirG/MBxl6Wy9TJbNOwR4CU6LPjHmGe3Po3OtBCPqIRheam9+LomScw3AvoUTHFlG1134e2J4enF43WJQ6PyOnjwZqsG1kUdlBPNztkoPzDAE2pQKgZWf6V2i34="
-    devSecret = "mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4gQurxTxGuBlGAhs0P1mD3X3bHT+AHfcLiymaqE4DY7kTFHoPs9I3tl5ErS+BHdzHRhrp9sGpqfp0B228KI+IMTu4aGVjtYuk+Uxs/kosIBw1367/WkJ00tM7U7tttD6cfaiHpW8pgW2aur3AxuQIBBLuJD5gcmNxTYW3KA32JLG8alfyXjKFVS3gka9bngvwfZ7GuNXybjKlmz1tnN6iVHpnbSj+xOHhWEperY4HHrSg=="
-	userKey = "iBPRM/Tz8b6Z1G2GQt52X7hiNCGfVYXztnPjalgrgARvqfKV6lFNH8QeScTzBRYI8GGFpwelfgh790Kd9JmL7V4adI1jCiFHUT2DLT7QucxY5Nkgys2aJItQS482Ck2G2Xf8gNgojxYxRt65o/MEzkj93foj8qIdfHagXsSorSs="
+	  devKey = "ehrnKqkWc1XSEAWyPUt6+95GzCoLEyoKrCbsUuJkCqGmxmP5ozX4bS0R6crHItQVNTFvC5mBZ1M7QjJ6Ekdu4Daj7PM+EDLTBKbFJinK4Ri9E5E2X+a9vF5zSj0TkIscQPVnwj9ikxAFOWGIyybMwQQzwc8a4j1cGOqGXQRDMMY="
+            devSecret = "mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4gQurxTxGuBlGAhs0P1mD3X3bHT+AHfcLiymaqE4DY7kTFHoPs9I3tl5ErS+BHdzHRhrp9sGpqfp0B228KI+IMTu4aGVjtYuk+Uxs/kosIBw1367/WkJ00tM7U7tttD6ccHhEu996bvBgqf8Sw8OekQKQq13VBewK5AckaDux4W7SGRhCUNWC4MItkr36JnXMD2tiFQYzMG8C66HYmRGSLh"
+          userKey = "iBPRM/Tz8b6Z1G2GQt52X7hiNCGfVYXztnPjalgrgARvqfKV6lFNH8QeScTzBRYI8GGFpwelfgh790Kd9JmL7V4adI1jCiFHUT2DLT7QucxY5Nkgys2aJItQS482Ck2G2Xf8gNgojxYxRt65o/MEzkj93foj8qIdfHagXsSorSs="
 	userSecret="mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4ivEHOmPIqbfhpDnKKj+7Ymj2rXQvfZRmke06HMV+3tt064G64WjPW8+EbGCNZaAh1hrp9sGpqfp0B228KI+IMTu4aGVjtYuk+Uxs/kosIBw1FKJi6HYB+DuugQyaqI2prfej861QnJrU4s2T/npZK/"
 	ConverterDevKey="Eahwo7OZAYHJaCF7TJQYKSVqC62MzfBdllVXnC5BRR5BQFDKnQ1FJtCRVdug+VNg/ti+/DeA5Sq4IH2CBpQjAZst5705uk5Sz0ZwRu8Qdn9HFGwh2pG6dJEIrl7lOccoZS6+1IxgOTcTeHqYpym3NsmtbhBWE848Pvme3scpW28="
 	ConverterDevSecret="mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4iccr16WMBclnQACarlyblNUvAm/S8uFbhXMvxwgBSgULSsrbuyF/SIZ3I+dl0qU8EiR4IKrcJxus3VRNu+jx8P7CGq2BlSjPVXRHBI1lV8ukpCIUGmcK+P+Z0QbYdkAHAm6NPgs2c4tp1jOFPPbnUkTtX7riDb9xRCx1YNm3/+xd96PzrVCcmtTizZP+elkr8="

PDF Office/ViewModels/Tools/ToolsBarContentViewModel.cs

@@ -38,7 +38,6 @@ namespace PDF_Office.ViewModels.Tools
 
         public DelegateCommand SetWatermarkCommand { get; set; }
 
-        public DelegateCommand<object> SetEditToolsCommand { get; set; }
 
 
         public ToolsBarContentViewModel(IDialogService dialogService, IEventAggregator eventAggregator)
@@ -56,11 +55,7 @@ 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,14 +18,10 @@ 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
 {
-
     public class ViewContentViewModel : BindableBase, INavigationAware
     {
         #region 属性、变量
@@ -287,15 +283,10 @@ 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)
@@ -339,19 +330,13 @@ namespace PDF_Office.ViewModels
                 case "TabItemPageEdit":
                     ToolContentVisible = Visibility.Visible;
                     break;
-<<<<<<< Updated upstream
                 case "WatermarkContent":
                     ToolContentVisible = Visibility.Visible;
                     break;
                 case "BackgroundContent":
                     ToolContentVisible = Visibility.Visible;
                     break;
-                   
-=======
-                case "BackgroundContent":
-                    ToolContentVisible = Visibility.Visible;
-                    break;
->>>>>>> Stashed changes
+
                 default:
                     break;
             }
@@ -768,22 +753,13 @@ namespace PDF_Office.ViewModels
         /// <param name="EditToolName"></param>
         private void EnterEditTools(string EditToolName)
         {
-<<<<<<< Updated upstream
             EnterSelectedEditTool(EditToolName);
         }
-        private void EnterSelectedEditTool(string EditToolName)
-        {
-            currentBar = EditToolName;
-            EnterToolMode(EditToolName);
-        }
+
         private void CloseEditTool()
         {
             currentBar = "TabItemTool";
             EnterSelectedBar(currentBar);
-=======
-           
-                EnterSelectedEditTool(EditToolName);
->>>>>>> Stashed changes
         }
         /// <summary>
         /// 二级菜单指定目标处理
@@ -795,12 +771,7 @@ namespace PDF_Office.ViewModels
             EnterToolMode(EditToolName);
         }
 
-        private void CloseEditTool()
-        {
-            currentBar = "TabItemTool";
-            EnterSelectedBar(currentBar);
-        }
-
+ 
 
         /// <summary>
         /// 进入工具编辑(如页面编辑、水印、密文等)模式

PDF Office/Views/Tools/ToolsBarContent.xaml

@@ -1,159 +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"
-             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 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>
-=======
-<UserControl x:Class="PDF_Office.Views.Tools.ToolsBarContent"
+<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"  
@@ -305,5 +150,4 @@
             </WrapPanel>
         </Border>
     </Grid>
-</UserControl>
->>>>>>> Stashed changes
+</UserControl>

PDF Office/Views/ViewContent.xaml

@@ -31,11 +31,8 @@
     <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>
@@ -204,15 +201,6 @@
             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>