|
3 | 3 | xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
4 | 4 | xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
5 | 5 | xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
|
| 6 | + xmlns:uilib="using:Microsoft.UI.Xaml.Controls" |
6 | 7 | xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
7 | 8 | xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
8 | 9 | xmlns:local="using:Files"
|
|
242 | 243 | </VisualStateGroup>
|
243 | 244 | </VisualStateManager.VisualStateGroups>
|
244 | 245 | <Grid Height="50" Width="50" x:Name="ContentRoot" MinHeight="50" Margin="0,0">
|
245 |
| - |
246 |
| - |
| 246 | + |
| 247 | + |
247 | 248 | <Viewbox x:Name="ContentViewbox" AutomationProperties.AccessibilityView="Raw" HorizontalAlignment="Stretch" Height="16" Margin="{StaticResource AppBarButtonContentViewboxCollapsedMargin}">
|
248 | 249 | <ContentPresenter x:Name="Content" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}"/>
|
249 | 250 | </Viewbox>
|
|
296 | 297 | <RowDefinition Height="Auto"/>
|
297 | 298 | <RowDefinition Height="80*"/>
|
298 | 299 | </Grid.RowDefinitions>
|
299 |
| - <TextBlock Name="EmptyText" Visibility="{x:Bind local2:ItemViewModel.TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="425,135.2,0,0" Canvas.ZIndex="5" Grid.Row="2"/> |
| 300 | + <TextBlock Name="EmptyText" Visibility="{x:Bind local2:ItemViewModel.TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,55,0,0" Canvas.ZIndex="5" Grid.Row="2"/> |
300 | 301 | <Grid DataContext="{Binding BackObject}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
|
301 |
| - |
302 |
| - <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="-15,0,0,0"> |
303 |
| - <StackPanel Orientation="Vertical" Margin="2"> |
| 302 | + |
| 303 | + <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="-15,0,0,0"> |
| 304 | + <StackPanel Orientation="Vertical" Margin="2"> |
304 | 305 | <AppBarButton LabelPosition="Collapsed" Style="{ThemeResource AppBarButtonFixedStyle}" HorizontalAlignment="Center" x:FieldModifier="public" IsEnabled="{x:Bind local2:ItemViewModel.BS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Back" VerticalAlignment="Center" Height="50" Width="50">
|
305 |
| - |
| 306 | + |
306 | 307 | <AppBarButton.ContentTemplate>
|
307 | 308 | <DataTemplate>
|
308 | 309 | <TextBlock Text="" FontFamily="Segoe MDL2 Assets" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" />
|
309 | 310 | </DataTemplate>
|
310 | 311 | </AppBarButton.ContentTemplate>
|
311 | 312 | </AppBarButton>
|
312 |
| - <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" HorizontalAlignment="Center" TextAlignment="Center" Text="Back" Width="60"/> |
313 |
| - </StackPanel> |
314 |
| - <StackPanel Orientation="Vertical" Margin="2"> |
315 |
| - <Grid HorizontalAlignment="Center" DataContext="{Binding ForwardObject}" VerticalAlignment="Center"> |
| 313 | + <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" HorizontalAlignment="Center" TextAlignment="Center" Text="Back" Width="60"/> |
| 314 | + </StackPanel> |
| 315 | + <StackPanel Orientation="Vertical" Margin="2"> |
| 316 | + <Grid HorizontalAlignment="Center" DataContext="{Binding ForwardObject}" VerticalAlignment="Center"> |
316 | 317 | <AppBarButton LabelPosition="Collapsed" Style="{ThemeResource AppBarButtonFixedStyle}" IsEnabled="{x:Bind local2:ItemViewModel.FS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Forward" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Top" Height="50" Width="50" HorizontalAlignment="Left">
|
317 | 318 | <AppBarButton.ContentTemplate>
|
318 | 319 | <DataTemplate>
|
319 | 320 | <TextBlock Text="" FontFamily="Segoe MDL2 Assets" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" />
|
320 | 321 | </DataTemplate>
|
321 | 322 | </AppBarButton.ContentTemplate>
|
322 | 323 | </AppBarButton>
|
323 |
| - </Grid> |
324 |
| - <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" TextAlignment="Center" HorizontalAlignment="Center" Text="Forward" Width="60"/> |
325 |
| - </StackPanel> |
326 |
| - <StackPanel Orientation="Vertical" Margin="2"> |
| 324 | + </Grid> |
| 325 | + <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" TextAlignment="Center" HorizontalAlignment="Center" Text="Forward" Width="60"/> |
| 326 | + </StackPanel> |
| 327 | + <StackPanel Orientation="Vertical" Margin="2"> |
327 | 328 | <AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="Refresh" Style="{ThemeResource AppBarButtonFixedStyle}" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50">
|
328 | 329 | <AppBarButton.ContentTemplate>
|
329 | 330 | <DataTemplate>
|
|
332 | 333 | </AppBarButton.ContentTemplate>
|
333 | 334 | </AppBarButton>
|
334 | 335 | <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Refresh" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
|
335 |
| - </StackPanel> |
336 |
| - <StackPanel Orientation="Vertical" Margin="2"> |
| 336 | + </StackPanel> |
| 337 | + <StackPanel Orientation="Vertical" Margin="2"> |
337 | 338 | <AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="AddItem" Style="{ThemeResource AppBarButtonFixedStyle}" Content="" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
|
338 |
| - <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Add Item" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/> |
339 |
| - </StackPanel> |
340 |
| - <StackPanel Orientation="Vertical" Margin="2"> |
| 339 | + <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Add Item" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/> |
| 340 | + </StackPanel> |
| 341 | + <StackPanel Orientation="Vertical" Margin="2"> |
341 | 342 | <AppBarButton LabelPosition="Collapsed" IsEnabled="{x:Bind local3:Interaction.PS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" x:Name="Paste" Style="{ThemeResource AppBarButtonFixedStyle}" Content="" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
|
342 |
| - <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Paste" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/> |
343 |
| - </StackPanel> |
344 |
| - <StackPanel Orientation="Vertical" Margin="2"> |
| 343 | + <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Paste" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/> |
| 344 | + </StackPanel> |
| 345 | + <StackPanel Orientation="Vertical" Margin="2"> |
345 | 346 | <AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="GetPath" Style="{ThemeResource AppBarButtonFixedStyle}" Content="" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
|
346 |
| - <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Copy Path" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/> |
347 |
| - </StackPanel> |
348 |
| - <StackPanel Orientation="Vertical" Margin="2"> |
| 347 | + <TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Copy Path" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/> |
| 348 | + </StackPanel> |
| 349 | + <StackPanel Orientation="Vertical" Margin="2"> |
349 | 350 | <AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="ViewMode" Style="{ThemeResource AppBarButtonFixedStyle}" Content="" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
|
350 |
| - <TextBlock VerticalAlignment="Bottom" TextWrapping="WrapWholeWords" Text="Layout Mode" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/> |
351 |
| - </StackPanel> |
| 351 | + <TextBlock VerticalAlignment="Bottom" TextWrapping="WrapWholeWords" Text="Layout Mode" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/> |
352 | 352 | </StackPanel>
|
| 353 | + </StackPanel> |
| 354 | + |
| 355 | + |
| 356 | + |
353 | 357 |
|
354 |
| - |
355 | 358 | </Grid>
|
356 | 359 |
|
357 | 360 | <ScrollViewer Padding="5" HorizontalScrollMode="Auto" HorizontalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="1" >
|
|
444 | 447 | </controls:DataGridTemplateColumn.CellTemplate>
|
445 | 448 | </controls:DataGridTemplateColumn>
|
446 | 449 | <controls:DataGridTextColumn Header="Name" Width="385" Binding="{Binding FileName}" Tag="Name"/>
|
447 |
| - <controls:DataGridTextColumn IsReadOnly="True" Header="Date modified" Width="300" Binding="{Binding FileDate}" Tag="Date"/> |
| 450 | + <controls:DataGridTextColumn IsReadOnly="True" Header="Date modified" Width="Auto" Binding="{Binding FileDate}" Tag="Date"/> |
448 | 451 | <controls:DataGridTextColumn IsReadOnly="True" Header="Type" Width="150" Binding="{Binding FileExtension}" Tag="Type"/>
|
449 | 452 | <controls:DataGridTextColumn IsReadOnly="True" Header="Size" Binding="{Binding FileSize}" Tag="Size"/>
|
450 | 453 | </controls:DataGrid.Columns>
|
|
0 commit comments