From c93a2ce89284dc9a5cbe70615ab3dd62c19b6b65 Mon Sep 17 00:00:00 2001
From: xiangbing <nails-totems0k@icloud.com>
Date: Sun, 19 Jan 2025 12:56:36 +0800
Subject: [PATCH] update

---
 Views/Video.xaml | 85 +++++++++++++++++-------------------------------
 1 file changed, 30 insertions(+), 55 deletions(-)

diff --git a/Views/Video.xaml b/Views/Video.xaml
index 935f0f6..ade55eb 100644
--- a/Views/Video.xaml
+++ b/Views/Video.xaml
@@ -7,7 +7,7 @@
         xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
         xmlns:local="clr-namespace:VideoConcat.Views"
         mc:Ignorable="d"
-        Title="视频拼接" Height="900" Width="800" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
+        Title="视频拼接" Height="800" Width="780" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -20,48 +20,24 @@
         </ResourceDictionary>
     </Window.Resources>
     <Grid>
-        <StackPanel>
-            <StackPanel>
-                <WrapPanel Margin="10,10">
-
-
-                    <!--<Grid VerticalAlignment="Center" Margin="10,10">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="35"></RowDefinition>
-                        <RowDefinition Height="35"></RowDefinition>
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="120"></ColumnDefinition>
-                        <ColumnDefinition Width="*"></ColumnDefinition>
-                        <ColumnDefinition Width="120"></ColumnDefinition>
-                    </Grid.ColumnDefinitions>-->
-
-                    <Label VerticalAlignment="Center" Width="100" FontSize="16" Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2" Style="{StaticResource MaterialDesignLabel}" VerticalContentAlignment="Stretch">视频文件夹：</Label>
-                    <TextBox Grid.Column="1" Width="500" Name="FoldPath"  Text="{Binding VideoModel.FolderPath,Mode=TwoWay}" IsReadOnly="True" Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2"  FontSize="16" VerticalContentAlignment="Center" materialDesign:HintAssist.Hint="选择视频主文件夹"/>
-                    <Button  Grid.Column="2"  Width="100" Content="选    择" FontSize="16"   Command="{Binding VideoModel.BtnOpenFolderCommand}" Background="#40568D" BorderBrush="#7F7F7F" BorderThickness="2" ToolTip="选择含有视频的主文件夹" Style="{StaticResource MaterialDesignRaisedButton}"  Margin="5,2" IsEnabled="{Binding VideoModel.IsCanOperate}"/>
-                    <Label Grid.Row="1" Width="100" VerticalAlignment="Center" FontSize="16" Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2" Style="{StaticResource MaterialDesignLabel}" VerticalContentAlignment="Stretch">选择广审：</Label>
-                    <TextBox Grid.Row="1" Width="500" Grid.Column="1"   Text="{Binding VideoModel.AuditImagePath,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2"  FontSize="16" VerticalContentAlignment="Center" ToolTip="请选择" materialDesign:HintAssist.Hint="请选择"/>
-                    <Button  Grid.Row="1" Width="100" Grid.Column="2"  Content="选择文件" FontSize="16"   Command="{Binding VideoModel.BtnChooseAuditImageCommand}" Background="#E54858" BorderBrush="#7F7F7F" BorderThickness="2" ToolTip="选择广审" Style="{StaticResource MaterialDesignRaisedButton}"  Margin="5,2" IsEnabled="{Binding VideoModel.IsCanOperate}"/>
-                    <Label Grid.Row="1" Width="100" VerticalAlignment="Center" FontSize="16" Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2" Style="{StaticResource MaterialDesignLabel}" VerticalContentAlignment="Stretch">视频个数：</Label>
-                    <TextBox Grid.Row="1" Width="500" Grid.Column="1"  Text="{Binding VideoModel.Num,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2"  FontSize="16" VerticalContentAlignment="Center" ToolTip="请输入合成视频个数" materialDesign:HintAssist.Hint="请输入拼接视频数目" IsEnabled="{Binding VideoModel.IsCanOperate}"/>
-                    <Button  Grid.Row="1" Width="100" Grid.Column="2"  Content="开始拼接" FontSize="16"   Command="{Binding VideoModel.BtnStartVideoConcatCommand}" Background="#E54858" BorderBrush="#7F7F7F" BorderThickness="2" ToolTip="开始拼接视频" Style="{StaticResource MaterialDesignRaisedButton}"  Margin="5,2" IsEnabled="{Binding VideoModel.CanStart}" Cursor="Hand"/>
-
-                    <!--</Grid>-->
-                </WrapPanel>
+        <StackPanel >
+            <WrapPanel   Height="120">
+                <Label VerticalAlignment="Center" Width="100" FontSize="16" Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2" Style="{StaticResource MaterialDesignLabel}" VerticalContentAlignment="Stretch">视频文件夹：</Label>
+                <TextBox Grid.Column="1" Width="500" Name="FoldPath"  Text="{Binding VideoModel.FolderPath,Mode=TwoWay}" IsReadOnly="True" Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2"  FontSize="16" VerticalContentAlignment="Center" materialDesign:HintAssist.Hint="选择视频主文件夹"/>
+                <Button  Grid.Column="2"  Width="100" Content="选    择" FontSize="16"   Command="{Binding VideoModel.BtnOpenFolderCommand}" Background="#40568D" BorderBrush="#7F7F7F" BorderThickness="2" ToolTip="选择含有视频的主文件夹" Style="{StaticResource MaterialDesignRaisedButton}"  Margin="5,2" IsEnabled="{Binding VideoModel.IsCanOperate}"/>
+                <Label Grid.Row="1" Width="100" VerticalAlignment="Center" FontSize="16" Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2" Style="{StaticResource MaterialDesignLabel}" VerticalContentAlignment="Stretch">选择广审：</Label>
+                <TextBox Grid.Row="1" Width="500" Grid.Column="1"   Text="{Binding VideoModel.AuditImagePath,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" IsReadOnly="True" Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2"  FontSize="16" VerticalContentAlignment="Center" ToolTip="请选择" materialDesign:HintAssist.Hint="请选择"/>
+                <Button  Grid.Row="1" Width="100" Grid.Column="2"  Content="选择文件" FontSize="16"   Command="{Binding VideoModel.BtnChooseAuditImageCommand}" Background="#E54858" BorderBrush="#7F7F7F" BorderThickness="2" ToolTip="选择广审" Style="{StaticResource MaterialDesignRaisedButton}"  Margin="5,2" IsEnabled="{Binding VideoModel.IsCanOperate}"/>
+                <Label Grid.Row="1" Width="100" VerticalAlignment="Center" FontSize="16" Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2" Style="{StaticResource MaterialDesignLabel}" VerticalContentAlignment="Stretch">视频个数：</Label>
+                <TextBox Grid.Row="1" Width="500" Grid.Column="1"  Text="{Binding VideoModel.Num,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  Margin="5,2" BorderBrush="#7F7F7F" BorderThickness="2"  FontSize="16" VerticalContentAlignment="Center" ToolTip="请输入合成视频个数" materialDesign:HintAssist.Hint="请输入拼接视频数目" IsEnabled="{Binding VideoModel.IsCanOperate}" />
+                <Button  Grid.Row="1" Width="100" Grid.Column="2"  Content="开始拼接" FontSize="16"   Command="{Binding VideoModel.BtnStartVideoConcatCommand}" Background="#E54858" BorderBrush="#7F7F7F" BorderThickness="2" ToolTip="开始拼接视频" Style="{StaticResource MaterialDesignRaisedButton}"  Margin="5,2" IsEnabled="{Binding VideoModel.CanStart}" Cursor="Hand"/>
+            </WrapPanel>
+            <StackPanel Height="30">
+                <Label FontWeight="ExtraBold" FontSize="16" Grid.Row="1">文件信息：</Label>
             </StackPanel>
-            <StackPanel Margin="0,5,0,0">
-                <Label FontWeight="ExtraBold" FontSize="16">文件信息：</Label>
-            </StackPanel>
-            <StackPanel MinHeight="100">
+            <StackPanel Height="200">
                 <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                    </Grid.RowDefinitions>
-                    <DockPanel Grid.Row="0">
-
-                    </DockPanel>
-                    <DataGrid Grid.Row="1" ItemsSource="{Binding VideoModel.FolderInfos}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" >
+                    <DataGrid Grid.Row="1" ItemsSource="{Binding VideoModel.FolderInfos}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" VerticalScrollBarVisibility="Auto" MaxHeight="200">
                         <DataGrid.Columns>
                             <DataGridTextColumn Header="文件夹" Binding="{Binding DirectoryInfo.Name,Mode=OneWay}" Width="*"></DataGridTextColumn>
                             <DataGridTextColumn Header="视频数量" Binding="{Binding Num,Mode=OneWay}"  Width="*"></DataGridTextColumn>
@@ -69,23 +45,22 @@
                     </DataGrid>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="0,20,0,0">
+            
+            <StackPanel Height="30">
                 <Label FontWeight="ExtraBold" FontSize="16">视频合成进度：</Label>
             </StackPanel>
-            <StackPanel MinHeight="200">
 
-                <Grid>
-                    <DataGrid Grid.Row="1" ItemsSource="{Binding VideoModel.ConcatVideos}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" >
-                        <DataGrid.Columns>
-                            <DataGridTextColumn Header="序号" Binding="{Binding Index}" Width="auto"></DataGridTextColumn>
-                            <DataGridTextColumn Header="文件名" Binding="{Binding FileName}" Width="auto"></DataGridTextColumn>
-                            <DataGridTextColumn Header="大小（MB）" Binding="{Binding Size}"  Width="auto"></DataGridTextColumn>
-                            <DataGridTextColumn Header="时长（秒）" Binding="{Binding Seconds}"  Width="auto"></DataGridTextColumn>
-                            <DataGridTextColumn Header="进度" Binding="{Binding Progress}"  Width="auto"></DataGridTextColumn>
-                            <DataGridTextColumn Header="状态" Binding="{Binding Status}"  Width="auto"></DataGridTextColumn>
-                        </DataGrid.Columns>
-                    </DataGrid>
-                </Grid>
+            <StackPanel Height="400">
+                <DataGrid ItemsSource="{Binding VideoModel.ConcatVideos}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" VerticalScrollBarVisibility="Auto" MaxHeight="400" ScrollViewer.CanContentScroll="True">
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Header="序号" Binding="{Binding Index}" Width="auto"></DataGridTextColumn>
+                        <DataGridTextColumn Header="文件名" Binding="{Binding FileName}" Width="auto"></DataGridTextColumn>
+                        <DataGridTextColumn Header="大小（MB）" Binding="{Binding Size}"  Width="auto"></DataGridTextColumn>
+                        <DataGridTextColumn Header="时长（秒）" Binding="{Binding Seconds}"  Width="auto"></DataGridTextColumn>
+                        <DataGridTextColumn Header="进度" Binding="{Binding Progress}"  Width="auto"></DataGridTextColumn>
+                        <DataGridTextColumn Header="状态" Binding="{Binding Status}"  Width="auto"></DataGridTextColumn>
+                    </DataGrid.Columns>
+                </DataGrid>
             </StackPanel>
         </StackPanel>
     </Grid>