Skip to content

Commit 38e59b1

Browse files
committed
🖼️ Adjust layout
- Align output template and download path options in a grid. - Use relative size for configuration area.
1 parent a0bb502 commit 38e59b1

File tree

1 file changed

+60
-21
lines changed

1 file changed

+60
-21
lines changed

YoutubeDl.Wpf/Views/HomeView.xaml

Lines changed: 60 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Grid Margin="16">
1515
<Grid.RowDefinitions>
1616
<RowDefinition Height="Auto" />
17-
<RowDefinition Height="Auto" />
17+
<RowDefinition Height="1.5*" />
1818
<RowDefinition Height="Auto" />
1919
<RowDefinition Height="*" />
2020
</Grid.RowDefinitions>
@@ -38,8 +38,7 @@
3838
<RowDefinition Height="40" />
3939
<RowDefinition Height="40" />
4040
<RowDefinition Height="40" />
41-
<RowDefinition Height="40" />
42-
<RowDefinition Height="40" />
41+
<RowDefinition Height="80" />
4342
<RowDefinition Height="40" MaxHeight="40" />
4443
<RowDefinition Height="Auto" />
4544
</Grid.RowDefinitions>
@@ -140,79 +139,119 @@
140139
Style="{StaticResource MaterialDesignFilterChipAccentOutlineCheckBox}"
141140
Content="Auto-generated" />
142141
</StackPanel>
142+
143143
<StackPanel Orientation="Horizontal" Grid.Row="3" Grid.Column="1">
144-
<ToggleButton x:Name="metadataToggle"
145-
Margin="4"/>
144+
<ToggleButton x:Name="metadataToggle" Margin="4"/>
146145
<TextBlock VerticalAlignment="Center" Margin="4">Add metadata</TextBlock>
147-
<ToggleButton x:Name="thumbnailToggle"
148-
Margin="8 4 4 4"/>
146+
147+
<ToggleButton x:Name="thumbnailToggle" Margin="8 4 4 4"/>
149148
<TextBlock VerticalAlignment="Center" Margin="4">Download thumbnail</TextBlock>
150-
<ToggleButton x:Name="playlistToggle"
151-
Margin="8 4 4 4"/>
149+
150+
<ToggleButton x:Name="playlistToggle" Margin="8 4 4 4"/>
152151
<TextBlock VerticalAlignment="Center" Margin="4">Download playlist</TextBlock>
153152
<TextBox x:Name="playlistItemsTextBox"
154153
Margin="4"
155154
Width="96"
156155
VerticalAlignment="Center"
157156
materialDesign:HintAssist.Hint="Items (optional)"/>
158157
</StackPanel>
159-
<StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="1">
158+
159+
<Grid Grid.Row="4" Grid.Column="1">
160+
<Grid.RowDefinitions>
161+
<RowDefinition Height="*"/>
162+
<RowDefinition Height="*"/>
163+
</Grid.RowDefinitions>
164+
165+
<Grid.ColumnDefinitions>
166+
<ColumnDefinition Width="Auto"/>
167+
<ColumnDefinition Width="Auto"/>
168+
<ColumnDefinition Width="*"/>
169+
<ColumnDefinition Width="Auto"/>
170+
<ColumnDefinition Width="Auto"/>
171+
</Grid.ColumnDefinitions>
172+
160173
<ToggleButton x:Name="outputTemplateToggle"
174+
Grid.Row="0"
175+
Grid.Column="0"
161176
Margin="4"/>
162-
<TextBlock VerticalAlignment="Center" Margin="4">Custom output template</TextBlock>
177+
178+
<TextBlock Grid.Row="0"
179+
Grid.Column="1"
180+
Margin="4"
181+
VerticalAlignment="Center">
182+
Custom output template
183+
</TextBlock>
184+
163185
<ComboBox x:Name="outputTemplateComboBox"
186+
Grid.Row="0"
187+
Grid.Column="2"
188+
Margin="4"
164189
IsEditable="True"
165190
IsReadOnly="False"
166191
StaysOpenOnEdit="True"
167-
Margin="4"
168-
Width="200"
169192
VerticalAlignment="Center">
170193
<ComboBox.ItemsPanel>
171194
<ItemsPanelTemplate>
172195
<VirtualizingStackPanel />
173196
</ItemsPanelTemplate>
174197
</ComboBox.ItemsPanel>
175198
</ComboBox>
199+
176200
<Button x:Name="resetOutputTemplateButton"
201+
Grid.Row="0"
202+
Grid.Column="3"
177203
Margin="4"
178204
Style="{StaticResource MaterialDesignFlatButton}"
179205
Content="Reset"/>
180-
</StackPanel>
181-
<StackPanel Orientation="Horizontal" Grid.Row="5" Grid.Column="1">
206+
182207
<ToggleButton x:Name="pathToggle"
208+
Grid.Row="1"
209+
Grid.Column="0"
183210
Margin="4"/>
184-
<TextBlock VerticalAlignment="Center" Margin="4">Custom download path</TextBlock>
211+
212+
<TextBlock Grid.Row="1"
213+
Grid.Column="1"
214+
Margin="4"
215+
VerticalAlignment="Center">Custom download path</TextBlock>
216+
185217
<ComboBox x:Name="pathComboBox"
218+
Grid.Row="1"
219+
Grid.Column="2"
220+
Margin="4"
186221
IsEditable="True"
187222
IsReadOnly="False"
188223
StaysOpenOnEdit="True"
189-
Margin="4"
190-
Width="300"
191224
VerticalAlignment="Center">
192225
<ComboBox.ItemsPanel>
193226
<ItemsPanelTemplate>
194227
<VirtualizingStackPanel />
195228
</ItemsPanelTemplate>
196229
</ComboBox.ItemsPanel>
197230
</ComboBox>
231+
198232
<Button x:Name="browseButton"
233+
Grid.Row="1"
234+
Grid.Column="3"
199235
Margin="4"
200236
Style="{StaticResource MaterialDesignFlatButton}"
201237
Content="Browse"/>
238+
202239
<Button x:Name="openFolderButton"
240+
Grid.Row="1"
241+
Grid.Column="4"
203242
Margin="4"
204243
Style="{StaticResource MaterialDesignFlatButton}"
205244
Content="Open Folder"/>
206-
</StackPanel>
245+
</Grid>
207246

208-
<TextBlock Grid.Row="6"
247+
<TextBlock Grid.Row="5"
209248
Grid.Column="0"
210249
Margin="8"
211250
VerticalAlignment="Center"
212251
Style="{StaticResource MaterialDesignSubtitle1TextBlock}">
213252
Arguments
214253
</TextBlock>
215-
<ItemsControl Grid.Row="6"
254+
<ItemsControl Grid.Row="5"
216255
Grid.RowSpan="2"
217256
Grid.Column="1"
218257
x:Name="argumentsItemsControl">

0 commit comments

Comments
 (0)