Skip to content

Commit 8eacb07

Browse files
ValyreonValyreon
committed
UI updates
1 parent d92e75b commit 8eacb07

File tree

12 files changed

+58
-31
lines changed

12 files changed

+58
-31
lines changed

‎.vs/SubLoad/v15/.suo

6.5 KB
Binary file not shown.

‎.vs/SubLoad/v15/Server/sqlite3/storage.ide

0 Bytes
Binary file not shown.

‎.vs/SubLoad/v15/Server/sqlite3/storage.ide-shm

0 Bytes
Binary file not shown.

‎.vs/SubLoad/v15/Server/sqlite3/storage.ide-wal

0 Bytes
Binary file not shown.

‎SubLoad/MainWindow.xaml

+33-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
Left="0" Top="0"
1717
UseLayoutRounding="True"
1818
RenderOptions.BitmapScalingMode="HighQuality"
19-
DataContext="{Binding RelativeSource={RelativeSource Self}}">
19+
DataContext="{Binding RelativeSource={RelativeSource Self}}"
20+
FontFamily="Segoe UI Semibold">
2021
<Window.BorderBrush>
2122
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
2223
<GradientStop Color="Black" Offset="0"/>
@@ -25,33 +26,58 @@
2526
</Window.BorderBrush>
2627
<StackPanel Margin="0">
2728
<DataGrid
29+
FontFamily="Segoe UI"
2830
CanUserResizeRows="False"
2931
HeadersVisibility="Column"
3032
IsReadOnly="True"
3133
x:Name="dataTable"
32-
GridLinesVisibility="None"
34+
GridLinesVisibility="All"
35+
HorizontalGridLinesBrush="#EDEDED"
36+
VerticalGridLinesBrush="#EDEDED"
3337
Height="400" BorderThickness="0,0,0,1"
3438
BorderBrush="#bbbbbb"
35-
AlternatingRowBackground="#f2f2f2"
39+
AlternatingRowBackground="#f9f9f9"
3640
AutoGenerateColumns="False"
3741
SelectionChanged="TableRowNewSelect"
3842
Background="#f5f5f5"
39-
RowHeight="20"
43+
RowHeight="22"
4044
CellStyle="{StaticResource Body_Content_DataGrid_Centering}"
4145
Style="{StaticResource DatagridStyle}"
4246
ScrollViewer.VerticalScrollBarVisibility="Auto"
4347
ItemsSource="{Binding Collection}">
4448
<DataGrid.Columns>
45-
<DataGridTextColumn ElementStyle="{StaticResource ColumnElementStyle}" Header="Name" Width="15*" Binding="{Binding Name}"/>
46-
<DataGridTextColumn ElementStyle="{StaticResource ColumnElementStyle}" Header="Language" Width="5*" Binding="{Binding Language}" SortDirection="Ascending"/>
49+
<DataGridTextColumn ElementStyle="{StaticResource ColumnElementStyle}" Header="Name" Width="15*" Binding="{Binding Name}">
50+
<DataGridTextColumn.HeaderStyle>
51+
<Style TargetType="DataGridColumnHeader">
52+
<Setter Property="HorizontalContentAlignment" Value="Center" />
53+
<Setter Property="Background" Value="#e8e8e8"/>
54+
<Setter Property="BorderBrush" Value="#bbb"/>
55+
<Setter Property="BorderThickness" Value="1"/>
56+
<Setter Property="FontFamily" Value="Segoe UI Semibold"/>
57+
</Style>
58+
</DataGridTextColumn.HeaderStyle>
59+
</DataGridTextColumn>
60+
<DataGridTextColumn ElementStyle="{StaticResource ColumnElementStyle}" Header="Language" Width="5*" Binding="{Binding Language}" SortDirection="Ascending">
61+
<DataGridTextColumn.HeaderStyle>
62+
<Style TargetType="DataGridColumnHeader">
63+
<Setter Property="HorizontalContentAlignment" Value="Center" />
64+
<Setter Property="Background" Value="#e8e8e8"/>
65+
<Setter Property="BorderBrush" Value="#bbb"/>
66+
<Setter Property="BorderThickness" Value="1"/>
67+
<Setter Property="Height" Value="25"/>
68+
<Setter Property="FontFamily" Value="Segoe UI Semibold"/>
69+
</Style>
70+
</DataGridTextColumn.HeaderStyle>
71+
</DataGridTextColumn>
4772
</DataGrid.Columns>
73+
4874
<DataGrid.Resources>
4975
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="#6bb9f0"/>
5076
<SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="#6bb9f0"/>
5177
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="White"/>
5278
</DataGrid.Resources>
5379
</DataGrid>
54-
<StatusBar Height="23" BorderThickness="0,0,0,1" BorderBrush="#bbbbbb" Background="#e8e8e8">
80+
<StatusBar Height="23" BorderThickness="0,0,0,1" BorderBrush="#bbbbbb" Background="#e8e8e8" FontFamily="Segoe UI Semibold">
5581
<StatusBarItem>
5682
<TextBlock x:Name="statusText" Text="Open a video file." Height="25" TextAlignment="Center" FontStyle="Italic" Width="500" HorizontalAlignment="Center" MinHeight="25" />
5783
</StatusBarItem>

‎SubLoad/Simple Styles.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1208,4 +1208,5 @@
12081208
<Style x:Key="ColumnElementStyle" TargetType="TextBlock">
12091209
<Setter Property="Margin" Value="5,0,0,0" />
12101210
</Style>
1211+
12111212
</ResourceDictionary>

‎SubLoad/bin/Release/SubLoad.exe

512 Bytes
Binary file not shown.

‎SubLoad/obj/Release/MainWindow.baml

612 Bytes
Binary file not shown.

‎SubLoad/obj/Release/MainWindow.g.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FA4C9B419486A44A231D06D706359CCEBEA2B443"
1+
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "78AF25EC6DAE775EC588AF96857A95BFAE6ED49B"
22
//------------------------------------------------------------------------------
33
// <auto-generated>
44
// This code was generated by a tool.
@@ -49,47 +49,47 @@ public partial class MainWindow : System.Windows.Window, System.Windows.Markup.I
4949
#line hidden
5050

5151

52-
#line 31 "..\..\MainWindow.xaml"
52+
#line 33 "..\..\MainWindow.xaml"
5353
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
5454
internal System.Windows.Controls.DataGrid dataTable;
5555

5656
#line default
5757
#line hidden
5858

5959

60-
#line 56 "..\..\MainWindow.xaml"
60+
#line 82 "..\..\MainWindow.xaml"
6161
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
6262
internal System.Windows.Controls.TextBlock statusText;
6363

6464
#line default
6565
#line hidden
6666

6767

68-
#line 60 "..\..\MainWindow.xaml"
68+
#line 86 "..\..\MainWindow.xaml"
6969
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
7070
internal System.Windows.Controls.Button chooseFileButton;
7171

7272
#line default
7373
#line hidden
7474

7575

76-
#line 61 "..\..\MainWindow.xaml"
76+
#line 87 "..\..\MainWindow.xaml"
7777
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
7878
internal System.Windows.Controls.Button refreshButton;
7979

8080
#line default
8181
#line hidden
8282

8383

84-
#line 62 "..\..\MainWindow.xaml"
84+
#line 88 "..\..\MainWindow.xaml"
8585
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
8686
internal System.Windows.Controls.Button downloadButton;
8787

8888
#line default
8989
#line hidden
9090

9191

92-
#line 63 "..\..\MainWindow.xaml"
92+
#line 89 "..\..\MainWindow.xaml"
9393
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
9494
internal System.Windows.Controls.Button closeButton;
9595

@@ -144,7 +144,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
144144
case 2:
145145
this.dataTable = ((System.Windows.Controls.DataGrid)(target));
146146

147-
#line 37 "..\..\MainWindow.xaml"
147+
#line 41 "..\..\MainWindow.xaml"
148148
this.dataTable.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.TableRowNewSelect);
149149

150150
#line default
@@ -156,7 +156,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
156156
case 4:
157157
this.chooseFileButton = ((System.Windows.Controls.Button)(target));
158158

159-
#line 60 "..\..\MainWindow.xaml"
159+
#line 86 "..\..\MainWindow.xaml"
160160
this.chooseFileButton.Click += new System.Windows.RoutedEventHandler(this.ChooseFileButton_ClickAsync);
161161

162162
#line default
@@ -165,7 +165,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
165165
case 5:
166166
this.refreshButton = ((System.Windows.Controls.Button)(target));
167167

168-
#line 61 "..\..\MainWindow.xaml"
168+
#line 87 "..\..\MainWindow.xaml"
169169
this.refreshButton.Click += new System.Windows.RoutedEventHandler(this.RefreshButton_ClickAsync);
170170

171171
#line default
@@ -174,7 +174,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
174174
case 6:
175175
this.downloadButton = ((System.Windows.Controls.Button)(target));
176176

177-
#line 62 "..\..\MainWindow.xaml"
177+
#line 88 "..\..\MainWindow.xaml"
178178
this.downloadButton.Click += new System.Windows.RoutedEventHandler(this.DownloadButton_ClickAsync);
179179

180180
#line default
@@ -183,7 +183,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
183183
case 7:
184184
this.closeButton = ((System.Windows.Controls.Button)(target));
185185

186-
#line 63 "..\..\MainWindow.xaml"
186+
#line 89 "..\..\MainWindow.xaml"
187187
this.closeButton.Click += new System.Windows.RoutedEventHandler(this.CloseButton_Click);
188188

189189
#line default

‎SubLoad/obj/Release/MainWindow.g.i.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FA4C9B419486A44A231D06D706359CCEBEA2B443"
1+
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "78AF25EC6DAE775EC588AF96857A95BFAE6ED49B"
22
//------------------------------------------------------------------------------
33
// <auto-generated>
44
// This code was generated by a tool.
@@ -49,47 +49,47 @@ public partial class MainWindow : System.Windows.Window, System.Windows.Markup.I
4949
#line hidden
5050

5151

52-
#line 31 "..\..\MainWindow.xaml"
52+
#line 33 "..\..\MainWindow.xaml"
5353
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
5454
internal System.Windows.Controls.DataGrid dataTable;
5555

5656
#line default
5757
#line hidden
5858

5959

60-
#line 56 "..\..\MainWindow.xaml"
60+
#line 82 "..\..\MainWindow.xaml"
6161
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
6262
internal System.Windows.Controls.TextBlock statusText;
6363

6464
#line default
6565
#line hidden
6666

6767

68-
#line 60 "..\..\MainWindow.xaml"
68+
#line 86 "..\..\MainWindow.xaml"
6969
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
7070
internal System.Windows.Controls.Button chooseFileButton;
7171

7272
#line default
7373
#line hidden
7474

7575

76-
#line 61 "..\..\MainWindow.xaml"
76+
#line 87 "..\..\MainWindow.xaml"
7777
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
7878
internal System.Windows.Controls.Button refreshButton;
7979

8080
#line default
8181
#line hidden
8282

8383

84-
#line 62 "..\..\MainWindow.xaml"
84+
#line 88 "..\..\MainWindow.xaml"
8585
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
8686
internal System.Windows.Controls.Button downloadButton;
8787

8888
#line default
8989
#line hidden
9090

9191

92-
#line 63 "..\..\MainWindow.xaml"
92+
#line 89 "..\..\MainWindow.xaml"
9393
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
9494
internal System.Windows.Controls.Button closeButton;
9595

@@ -144,7 +144,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
144144
case 2:
145145
this.dataTable = ((System.Windows.Controls.DataGrid)(target));
146146

147-
#line 37 "..\..\MainWindow.xaml"
147+
#line 41 "..\..\MainWindow.xaml"
148148
this.dataTable.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.TableRowNewSelect);
149149

150150
#line default
@@ -156,7 +156,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
156156
case 4:
157157
this.chooseFileButton = ((System.Windows.Controls.Button)(target));
158158

159-
#line 60 "..\..\MainWindow.xaml"
159+
#line 86 "..\..\MainWindow.xaml"
160160
this.chooseFileButton.Click += new System.Windows.RoutedEventHandler(this.ChooseFileButton_ClickAsync);
161161

162162
#line default
@@ -165,7 +165,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
165165
case 5:
166166
this.refreshButton = ((System.Windows.Controls.Button)(target));
167167

168-
#line 61 "..\..\MainWindow.xaml"
168+
#line 87 "..\..\MainWindow.xaml"
169169
this.refreshButton.Click += new System.Windows.RoutedEventHandler(this.RefreshButton_ClickAsync);
170170

171171
#line default
@@ -174,7 +174,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
174174
case 6:
175175
this.downloadButton = ((System.Windows.Controls.Button)(target));
176176

177-
#line 62 "..\..\MainWindow.xaml"
177+
#line 88 "..\..\MainWindow.xaml"
178178
this.downloadButton.Click += new System.Windows.RoutedEventHandler(this.DownloadButton_ClickAsync);
179179

180180
#line default
@@ -183,7 +183,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
183183
case 7:
184184
this.closeButton = ((System.Windows.Controls.Button)(target));
185185

186-
#line 63 "..\..\MainWindow.xaml"
186+
#line 89 "..\..\MainWindow.xaml"
187187
this.closeButton.Click += new System.Windows.RoutedEventHandler(this.CloseButton_Click);
188188

189189
#line default

‎SubLoad/obj/Release/SubLoad.exe

512 Bytes
Binary file not shown.

‎SubLoad/obj/Release/SubLoad.g.resources

612 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)