ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Command panel UI improvements

Browse Source
This commit is contained in:
Ádám Kovács
2023-07-27 19:08:15 +02:00
parent 4344938a85
commit 0cc4ff8e1d
1 changed files with 65 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml
View File

@@ -301,76 +301,75 @@
Value="0" /> Value="0" />
</ia:DataTriggerBehavior> </ia:DataTriggerBehavior>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<Grid ColumnDefinitions="Auto,10"> <ItemsControl
<ItemsControl ItemsSource="{Binding AppState.TimelineViewModel.ParallelCommandsGroups.Collection}"
ItemsSource="{Binding AppState.TimelineViewModel.ParallelCommandsGroups.Collection}" VerticalAlignment="Stretch"
VerticalAlignment="Top" x:Name="CommandGroups">
x:Name="CommandGroups"> <ItemsControl.ItemsPanel>
<ItemsControl.ItemsPanel> <ItemsPanelTemplate>
<ItemsPanelTemplate> <StackPanel Orientation="Horizontal" />
<StackPanel Orientation="Horizontal" /> </ItemsPanelTemplate>
</ItemsPanelTemplate> </ItemsControl.ItemsPanel>
</ItemsControl.ItemsPanel> <ItemsControl.ItemTemplate>
<ItemsControl.ItemTemplate> <DataTemplate>
<DataTemplate> <Grid ColumnDefinitions="300,10" VerticalAlignment="Stretch">
<Border <ScrollViewer>
Background="{DynamicResource ContainerBackgroundColor}" <ItemsControl ItemsSource="{Binding Commands.Collection}">
CornerRadius="10" <ItemsControl.ItemTemplate>
Height="70" <DataTemplate>
Margin="0,0,10,0" <Border
Padding="5" Background="{DynamicResource ContainerBackgroundColor}"
Width="300"> BorderThickness="1"
<ScrollViewer> Classes.SelectedTimelineCommand="{Binding IsSelected}"
<ItemsControl ItemsSource="{Binding Commands.Collection}"> CornerRadius="10"
<ItemsControl.ItemTemplate> Margin="0,0,10,0"
<DataTemplate> Padding="5"
<Border BorderThickness="1" Classes.SelectedTimelineCommand="{Binding IsSelected}"> VerticalAlignment="Top">
<Grid ColumnDefinitions="*, *" RowDefinitions="Auto, Auto"> <Grid ColumnDefinitions="*, *" RowDefinitions="Auto, Auto">
<TextBlock Grid.ColumnSpan="2" Text="{Binding DisplayLabel^}" /> <TextBlock Grid.ColumnSpan="2" Text="{Binding DisplayLabel^}" />
<StackPanel <StackPanel
Grid.Column="0" Grid.Column="0"
Grid.Row="1" Grid.Row="1"
Margin="0,5,5,5"> Margin="0,5,5,5">
<TextBlock Text="{Binding DisplayDetailLabel^}" TextAlignment="Right" /> <TextBlock Text="{Binding DisplayDetailLabel^}" TextAlignment="Right" />
<ProgressBar <ProgressBar
Margin="0,5,0,0" Margin="0,5,0,0"
Maximum="100" Maximum="100"
MinWidth="50" MinWidth="50"
Value="{Binding CurrentProgress^}" /> Value="{Binding CurrentProgress^}" />
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Column="1" Grid.Column="1"
Grid.Row="1" Grid.Row="1"
Margin="5,5,0,5"> Margin="5,5,0,5">
<TextBlock Text="{Binding TotalProgress^, StringFormat={}{0}%}" TextAlignment="Right" /> <TextBlock Text="{Binding TotalProgress^, StringFormat={}{0}%}" TextAlignment="Right" />
<ProgressBar <ProgressBar
Margin="0,5,0,0" Margin="0,5,0,0"
Maximum="100" Maximum="100"
MinWidth="50" MinWidth="50"
Value="{Binding TotalProgress^}" /> Value="{Binding TotalProgress^}" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>
</DataTemplate> </DataTemplate>
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ItemsControl> </ItemsControl>
</ScrollViewer> </ScrollViewer>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<Rectangle <Rectangle
Fill="{DynamicResource ContentSeparatorBrush}" Fill="{DynamicResource ContentSeparatorBrush}"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Margin="0,10,0,10" Margin="0,10,0,10"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Width="1" /> Width="1" />
</Grid> </Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid> </Grid>
<ItemsControl Grid.Row="1" ItemsSource="{Binding AppState.Tabs}"> <ItemsControl Grid.Row="1" ItemsSource="{Binding AppState.Tabs}">