Skip to content

Commit 2473e16

Browse files
author
RandomEngy
committed
Fixed layout and background coloring of the completed items tab. Tweaked the color on the progress bar.
1 parent 73a5b3b commit 2473e16

3 files changed

Lines changed: 68 additions & 67 deletions

File tree

‎VidCoder/Controls/SeekBar.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<Setter.Value>
4040
<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
4141
<GradientStop Color="#6DAAED" Offset="0.0" />
42-
<GradientStop Color="#3890ED" Offset="1.0" />
42+
<GradientStop Color="#3180CE" Offset="1.0" />
4343
</LinearGradientBrush>
4444
</Setter.Value>
4545
</Setter>
@@ -49,7 +49,7 @@
4949
<Setter.Value>
5050
<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
5151
<GradientStop Color="#999999" Offset="0.0" />
52-
<GradientStop Color="#7F7F7F" Offset="1.0" />
52+
<GradientStop Color="#707070" Offset="1.0" />
5353
</LinearGradientBrush>
5454
</Setter.Value>
5555
</Setter>

‎VidCoder/View/MainWindow.xaml‎

Lines changed: 64 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -855,60 +855,59 @@
855855
</StackPanel>
856856
</Button>
857857
</Grid>
858-
859-
860-
861-
862-
863-
864-
865858

866859
<Label Height="28" Margin="215,15,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="47">Preset:</Label>
867860
</Grid>
868861

869862
<!-- Queue section -->
870863
<Grid
871-
Grid.Row="4" Name="tabsArea">
864+
Grid.Row="4">
872865
<Grid.Background>
873866
<SolidColorBrush Color="{StaticResource SectionBackgroundBottomColor}" />
874867
</Grid.Background>
875-
<TabControl Name="queueItemsTabControl" BorderThickness="0" SelectedIndex="{Binding SelectedTabIndex}">
876-
<TabControl.Background>
868+
869+
<Grid
870+
Name="tabsArea">
871+
<Grid.Background>
877872
<SolidColorBrush Color="{StaticResource SectionBackgroundBottomColor}" />
878-
</TabControl.Background>
879-
<TabItem Name="queueTab" Visibility="Collapsed">
880-
<TabItem.Header>
881-
<TextBlock Text="{Binding QueuedTabHeader}" />
882-
</TabItem.Header>
883-
<ListView
873+
</Grid.Background>
874+
<TabControl Name="queueItemsTabControl" BorderThickness="0" SelectedIndex="{Binding SelectedTabIndex}">
875+
<TabControl.Background>
876+
<SolidColorBrush Color="{StaticResource SectionBackgroundBottomColor}" />
877+
</TabControl.Background>
878+
<TabItem Name="queueTab" Visibility="Collapsed">
879+
<TabItem.Header>
880+
<TextBlock Text="{Binding QueuedTabHeader}" />
881+
</TabItem.Header>
882+
<ListView
884883
Name="queueView"
885884
ItemsSource="{Binding EncodeQueue}"
886885
VidCoderDragDrop:DragDropHelper.IsDragSource="True"
887886
VidCoderDragDrop:DragDropHelper.IsDropTarget="True"
888887
VidCoderDragDrop:DragDropHelper.DragDropTemplate="{StaticResource QueueDragTemplate}"
889888
VidCoderDragDrop:DragDropHelper.AllowDropAtTop="{Binding Encoding, Converter={StaticResource InverseBoolConverter}}">
890-
<ListView.ItemContainerStyle>
891-
<Style TargetType="ListViewItem">
892-
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
893-
</Style>
894-
</ListView.ItemContainerStyle>
895-
<ListView.View>
896-
<GridView x:Name="queueGridView">
897-
<GridView.Columns>
898-
<GridViewColumn Width="75" CellTemplate="{StaticResource QueueRemoveTemplate}" />
899-
</GridView.Columns>
900-
</GridView>
901-
</ListView.View>
902-
<ListView.ContextMenu>
903-
<ContextMenu>
904-
<MenuItem Header="Customize columns..." Command="{Binding CustomizeQueueColumnsCommand}" />
905-
</ContextMenu>
906-
</ListView.ContextMenu>
907-
</ListView>
908-
</TabItem>
909-
<TabItem Name="completedTab" Visibility="Collapsed">
910-
<TabItem.Header>
911-
<TextBlock Text="{Binding CompletedTabHeader}">
889+
<ListView.ItemContainerStyle>
890+
<Style TargetType="ListViewItem">
891+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
892+
</Style>
893+
</ListView.ItemContainerStyle>
894+
<ListView.View>
895+
<GridView x:Name="queueGridView">
896+
<GridView.Columns>
897+
<GridViewColumn Width="75" CellTemplate="{StaticResource QueueRemoveTemplate}" />
898+
</GridView.Columns>
899+
</GridView>
900+
</ListView.View>
901+
<ListView.ContextMenu>
902+
<ContextMenu>
903+
<MenuItem Header="Customize columns..." Command="{Binding CustomizeQueueColumnsCommand}" />
904+
</ContextMenu>
905+
</ListView.ContextMenu>
906+
</ListView>
907+
</TabItem>
908+
<TabItem Name="completedTab" Visibility="Collapsed">
909+
<TabItem.Header>
910+
<TextBlock Text="{Binding CompletedTabHeader}">
912911
<TextBlock.ContextMenu>
913912
<ContextMenu>
914913
<MenuItem Header="Clear Completed" Command="{Binding ClearCompletedCommand}">
@@ -918,38 +917,40 @@
918917
</MenuItem>
919918
</ContextMenu>
920919
</TextBlock.ContextMenu>
921-
</TextBlock>
922-
</TabItem.Header>
923-
<ListView
920+
</TextBlock>
921+
</TabItem.Header>
922+
<ListView
924923
ItemsSource="{Binding CompletedJobs}"
925924
ItemContainerStyle="{StaticResource CompletedItemStyle}">
926-
<ListView.View>
927-
<GridView x:Name="completedGridView">
928-
<GridView.Columns>
929-
<GridViewColumn Width="300" Header="Destination" CellTemplate="{StaticResource CompletedDestinationTemplate}" />
930-
<GridViewColumn Width="95" Header="Status" CellTemplate="{StaticResource CompletedStatusTemplate}" />
931-
<GridViewColumn Width="90" Header="Elapsed Time" CellTemplate="{StaticResource CompletedTimeTemplate}" />
932-
</GridView.Columns>
933-
</GridView>
934-
</ListView.View>
935-
<ListView.ContextMenu>
936-
<ContextMenu>
937-
<MenuItem Header="Clear Completed" Command="{Binding ClearCompletedCommand}">
938-
<MenuItem.Icon>
939-
<Image Source="/Icons/delete.png" Width="16" Height="16" />
940-
</MenuItem.Icon>
941-
</MenuItem>
942-
</ContextMenu>
943-
</ListView.ContextMenu>
944-
</ListView>
945-
</TabItem>
946-
</TabControl>
925+
<ListView.View>
926+
<GridView x:Name="completedGridView">
927+
<GridView.Columns>
928+
<GridViewColumn Width="300" Header="Destination" CellTemplate="{StaticResource CompletedDestinationTemplate}" />
929+
<GridViewColumn Width="95" Header="Status" CellTemplate="{StaticResource CompletedStatusTemplate}" />
930+
<GridViewColumn Width="90" Header="Elapsed Time" CellTemplate="{StaticResource CompletedTimeTemplate}" />
931+
</GridView.Columns>
932+
</GridView>
933+
</ListView.View>
934+
<ListView.ContextMenu>
935+
<ContextMenu>
936+
<MenuItem Header="Clear Completed" Command="{Binding ClearCompletedCommand}">
937+
<MenuItem.Icon>
938+
<Image Source="/Icons/delete.png" Width="16" Height="16" />
939+
</MenuItem.Icon>
940+
</MenuItem>
941+
</ContextMenu>
942+
</ListView.ContextMenu>
943+
</ListView>
944+
</TabItem>
945+
</TabControl>
947946

948-
<Button
947+
<Button
949948
Name="clearCompletedQueueItemsButton"
950949
Margin="0,2,0,0" VerticalAlignment="Top" HorizontalAlignment="Right"
951950
Command="{Binding ClearCompletedCommand}" Style="{StaticResource RemoveButtonStyle}"
952951
Visibility="Collapsed">Clear completed queue items</Button>
952+
</Grid>
953953
</Grid>
954+
954955
</Grid>
955956
</Window>

‎VidCoder/View/MainWindow.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ private void RefreshQueueTabs()
236236
this.completedTab.Visibility = Visibility.Visible;
237237
this.clearCompletedQueueItemsButton.Visibility = Visibility.Visible;
238238
this.queueItemsTabControl.BorderThickness = new Thickness(1);
239-
this.tabsArea.Margin = new Thickness(6, 132, 6, 6);
239+
this.tabsArea.Margin = new Thickness(6);
240240

241241
this.tabsVisible = true;
242242
return;
@@ -248,7 +248,7 @@ private void RefreshQueueTabs()
248248
this.completedTab.Visibility = Visibility.Collapsed;
249249
this.clearCompletedQueueItemsButton.Visibility = Visibility.Collapsed;
250250
this.queueItemsTabControl.BorderThickness = new Thickness(0);
251-
this.tabsArea.Margin = new Thickness(2, 128, 2, 2);
251+
this.tabsArea.Margin = new Thickness(2);
252252

253253
this.viewModel.SelectedTabIndex = MainViewModel.QueuedTabIndex;
254254

0 commit comments

Comments
 (0)