-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'SmallRefactor' of https://github.com/cinqmilleans/Files …
…into SmallRefactor
- Loading branch information
Showing
89 changed files
with
8,144 additions
and
1,705 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| github: [yaichenbaum] | ||
| github: [yaira2] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| <ContentDialog | ||
| x:Class="Files.App.Dialogs.CreateArchiveDialog" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:helpers="using:Files.App.Helpers" | ||
| xmlns:local="using:Files.App.Dialogs" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| Title="{helpers:ResourceString Name=CreateArchive}" | ||
| d:DesignHeight="300" | ||
| d:DesignWidth="400" | ||
| CloseButtonText="{helpers:ResourceString Name=Cancel}" | ||
| Closing="ContentDialog_Closing" | ||
| CornerRadius="{StaticResource OverlayCornerRadius}" | ||
| DefaultButton="Primary" | ||
| IsPrimaryButtonEnabled="True" | ||
| Loaded="ContentDialog_Loaded" | ||
| PrimaryButtonText="{helpers:ResourceString Name=Create}" | ||
| RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}" | ||
| Style="{StaticResource DefaultContentDialogStyle}" | ||
| mc:Ignorable="d"> | ||
| <StackPanel Width="440" Spacing="8"> | ||
|
|
||
| <!-- Archive Name --> | ||
| <Grid | ||
| Padding="12" | ||
| Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" | ||
| BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" | ||
| BorderThickness="1" | ||
| ColumnSpacing="8" | ||
| CornerRadius="4"> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition Width="*" /> | ||
| <ColumnDefinition Width="Auto" /> | ||
| </Grid.ColumnDefinitions> | ||
| <TextBlock | ||
| Grid.Column="0" | ||
| VerticalAlignment="Center" | ||
| Text="{helpers:ResourceString Name=Name}" /> | ||
| <TextBox | ||
| x:Name="FileNameBox" | ||
| Grid.Column="1" | ||
| Width="260" | ||
| PlaceholderText="{helpers:ResourceString Name=EnterName}" | ||
| Text="{x:Bind ViewModel.FileName, Mode=TwoWay}" /> | ||
| </Grid> | ||
|
|
||
| <!-- Archive Options --> | ||
| <Grid | ||
| Padding="12" | ||
| Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" | ||
| BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" | ||
| BorderThickness="1" | ||
| ColumnSpacing="8" | ||
| CornerRadius="4" | ||
| RowSpacing="12"> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition Width="*" /> | ||
| <ColumnDefinition Width="Auto" /> | ||
| </Grid.ColumnDefinitions> | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="Auto" /> | ||
| <RowDefinition Height="Auto" /> | ||
| <RowDefinition Height="Auto" /> | ||
| </Grid.RowDefinitions> | ||
|
|
||
| <!-- Archive Format --> | ||
| <TextBlock | ||
| Grid.Row="0" | ||
| Grid.Column="0" | ||
| VerticalAlignment="Center" | ||
| Text="{helpers:ResourceString Name=Format}" /> | ||
| <ComboBox | ||
| x:Name="FileFormatSelector" | ||
| Grid.Row="0" | ||
| Grid.Column="1" | ||
| Width="160" | ||
| ItemsSource="{x:Bind ViewModel.FileFormats}" | ||
| SelectedItem="{x:Bind ViewModel.FileFormat, Mode=TwoWay}" | ||
| DisplayMemberPath="Label" | ||
| SelectedValuePath="Key" /> | ||
|
|
||
| <!-- Compression Level --> | ||
| <TextBlock | ||
| Grid.Row="1" | ||
| Grid.Column="0" | ||
| VerticalAlignment="Center" | ||
| Text="{helpers:ResourceString Name=CompressionLevel}" /> | ||
| <ComboBox | ||
| x:Name="CompressionLevelSelector" | ||
| Grid.Row="1" | ||
| Grid.Column="1" | ||
| Width="160" | ||
| HorizontalAlignment="Right" | ||
| DisplayMemberPath="Label" | ||
| ItemsSource="{x:Bind ViewModel.CompressionLevels}" | ||
| SelectedItem="{x:Bind ViewModel.CompressionLevel, Mode=TwoWay}" | ||
| SelectedValuePath="Key" /> | ||
|
|
||
| <!-- Splitting Size --> | ||
| <TextBlock | ||
| Grid.Row="2" | ||
| Grid.Column="0" | ||
| VerticalAlignment="Center" | ||
| Text="{helpers:ResourceString Name=SplittingSize}" /> | ||
| <ComboBox | ||
| x:Name="SplittingSizeSelector" | ||
| Grid.Row="2" | ||
| Grid.Column="1" | ||
| Width="160" | ||
| HorizontalAlignment="Right" | ||
| IsEnabled="{x:Bind ViewModel.CanSplit, Mode=OneWay}" | ||
| ItemsSource="{x:Bind ViewModel.SplittingSizes}" | ||
| SelectedItem="{x:Bind ViewModel.SplittingSize, Mode=TwoWay}" | ||
| SelectedValuePath="Key"> | ||
| <ComboBox.ItemTemplate> | ||
| <DataTemplate x:DataType="local:SplittingSizeItem"> | ||
| <StackPanel Orientation="Horizontal" Spacing="4"> | ||
| <TextBlock Text="{x:Bind Label}" /> | ||
| <TextBlock Text="{x:Bind Separator}" Visibility="{Binding IsDropDownOpen, ElementName=SplittingSizeSelector}" /> | ||
| <TextBlock Text="{x:Bind Description}" Visibility="{Binding IsDropDownOpen, ElementName=SplittingSizeSelector}" /> | ||
| </StackPanel> | ||
| </DataTemplate> | ||
| </ComboBox.ItemTemplate> | ||
| </ComboBox> | ||
| </Grid> | ||
|
|
||
| <!-- Encryption Options --> | ||
| <Expander | ||
| HorizontalAlignment="Stretch" | ||
| Header="{helpers:ResourceString Name=Encryption}" | ||
| IsExpanded="{x:Bind ViewModel.UseEncryption, Mode=TwoWay}"> | ||
| <Expander.Content> | ||
| <Grid Width="400"> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition Width="*" /> | ||
| <ColumnDefinition Width="Auto" /> | ||
| </Grid.ColumnDefinitions> | ||
| <TextBlock | ||
| Grid.Column="0" | ||
| VerticalAlignment="Center" | ||
| Text="{helpers:ResourceString Name=Password}" /> | ||
| <PasswordBox | ||
| x:Name="PasswordBox" | ||
| Grid.Column="1" | ||
| Width="260" | ||
| IsPasswordRevealButtonEnabled="True" | ||
| Loading="PasswordBox_Loading" | ||
| Password="{x:Bind ViewModel.Password, Mode=TwoWay}" | ||
| PasswordRevealMode="Peek" | ||
| PlaceholderText="{helpers:ResourceString Name=Password}" /> | ||
| </Grid> | ||
| </Expander.Content> | ||
| </Expander> | ||
| </StackPanel> | ||
| </ContentDialog> |
Oops, something went wrong.