Skip to content

Commit 1cfae5f

Browse files
yaira2yaira2
authored
Merge branch 'main' into bug-10549
2 parents e406cc9 + bbe652c commit 1cfae5f

File tree

85 files changed

+8103
-1668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+8103
-1668
lines changed

‎.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github: [yaichenbaum]
1+
github: [yaira2]

‎builds/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ steps:
117117
inputs:
118118
testSelector: 'testAssemblies'
119119
testAssemblyVer2: |
120-
**\$(buildConfiguration)\Files.InteractionTests\net7.0\Files.InteractionTests.dll
120+
**\*Files.InteractionTests.dll
121121
!**\*TestAdapter.dll
122122
!**\obj\**
123123
searchFolder: '$(System.DefaultWorkingDirectory)'

‎src/Files.App (Package)/Files.Package.wapproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<DisableXbfLineInfo>False</DisableXbfLineInfo>
6262
<GenerateTestArtifacts>True</GenerateTestArtifacts>
6363
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
64-
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fil-PH;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
64+
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;da-DK;de-DE;el;en-GB;es-ES;es-419;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hu-HU;id-ID;it-IT;ja-JP;ka;ko-KR;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
6565
<UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
6666
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
6767
<EntryPointProjectUniqueName>..\Files.App\Files.App.csproj</EntryPointProjectUniqueName>

‎src/Files.App (Package)/Package.appxmanifest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<Resource Language="en-GB"/>
3434
<Resource Language="es-ES"/>
3535
<Resource Language="es-419"/>
36+
<Resource Language="fi-FI"/>
3637
<Resource Language="fil-PH"/>
3738
<Resource Language="fr-FR"/>
3839
<Resource Language="he-IL"/>

‎src/Files.App/App.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
240240

241241
_ = InitializeAppComponentsAsync().ContinueWith(t => Logger.Warn(t.Exception, "Error during InitializeAppComponentsAsync()"), TaskContinuationOptions.OnlyOnFaulted);
242242

243-
_ = Window.InitializeApplication(activatedEventArgs);
243+
_ = Window.InitializeApplication(activatedEventArgs.Data);
244244
}
245245

246246
private void EnsureWindowIsInitialized()
@@ -264,8 +264,9 @@ private void Window_Activated(object sender, WindowActivatedEventArgs args)
264264
public void OnActivated(AppActivationArguments activatedEventArgs)
265265
{
266266
Logger.Info($"App activated. Activated args type: {activatedEventArgs.Data.GetType().Name}");
267+
var data = activatedEventArgs.Data;
267268
// InitializeApplication accesses UI, needs to be called on UI thread
268-
_ = Window.DispatcherQueue.EnqueueAsync(() => Window.InitializeApplication(activatedEventArgs));
269+
_ = Window.DispatcherQueue.EnqueueAsync(() => Window.InitializeApplication(data));
269270
}
270271

271272
/// <summary>

‎src/Files.App/Assets/FilesOpenDialog/FilesLauncher.exe

349 KB
Binary file not shown.

‎src/Files.App/Dialogs/CreateArchiveDialog.xaml

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
<ContentDialog
2+
x:Class="Files.App.Dialogs.CreateArchiveDialog"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:helpers="using:Files.App.Helpers"
7+
xmlns:local="using:Files.App.Dialogs"
8+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
Title="{helpers:ResourceString Name=CreateArchive}"
10+
d:DesignHeight="300"
11+
d:DesignWidth="400"
12+
CloseButtonText="{helpers:ResourceString Name=Cancel}"
13+
Closing="ContentDialog_Closing"
14+
CornerRadius="{StaticResource OverlayCornerRadius}"
15+
DefaultButton="Primary"
16+
IsPrimaryButtonEnabled="True"
17+
Loaded="ContentDialog_Loaded"
18+
PrimaryButtonText="{helpers:ResourceString Name=Create}"
19+
RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
20+
Style="{StaticResource DefaultContentDialogStyle}"
21+
mc:Ignorable="d">
22+
<StackPanel Width="440" Spacing="8">
23+
24+
<!-- Archive Name -->
25+
<Grid
26+
Padding="12"
27+
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
28+
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
29+
BorderThickness="1"
30+
ColumnSpacing="8"
31+
CornerRadius="4">
32+
<Grid.ColumnDefinitions>
33+
<ColumnDefinition Width="*" />
34+
<ColumnDefinition Width="Auto" />
35+
</Grid.ColumnDefinitions>
36+
<TextBlock
37+
Grid.Column="0"
38+
VerticalAlignment="Center"
39+
Text="{helpers:ResourceString Name=Name}" />
40+
<TextBox
41+
x:Name="FileNameBox"
42+
Grid.Column="1"
43+
Width="260"
44+
PlaceholderText="{helpers:ResourceString Name=EnterName}"
45+
Text="{x:Bind ViewModel.FileName, Mode=TwoWay}" />
46+
</Grid>
47+
48+
<!-- Archive Options -->
49+
<Grid
50+
Padding="12"
51+
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
52+
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
53+
BorderThickness="1"
54+
ColumnSpacing="8"
55+
CornerRadius="4"
56+
RowSpacing="12">
57+
<Grid.ColumnDefinitions>
58+
<ColumnDefinition Width="*" />
59+
<ColumnDefinition Width="Auto" />
60+
</Grid.ColumnDefinitions>
61+
<Grid.RowDefinitions>
62+
<RowDefinition Height="Auto" />
63+
<RowDefinition Height="Auto" />
64+
<RowDefinition Height="Auto" />
65+
</Grid.RowDefinitions>
66+
67+
<!-- Archive Format -->
68+
<TextBlock
69+
Grid.Row="0"
70+
Grid.Column="0"
71+
VerticalAlignment="Center"
72+
Text="{helpers:ResourceString Name=Format}" />
73+
<ComboBox
74+
x:Name="FileFormatSelector"
75+
Grid.Row="0"
76+
Grid.Column="1"
77+
Width="160"
78+
ItemsSource="{x:Bind ViewModel.FileFormats}"
79+
SelectedItem="{x:Bind ViewModel.FileFormat, Mode=TwoWay}"
80+
DisplayMemberPath="Label"
81+
SelectedValuePath="Key" />
82+
83+
<!-- Compression Level -->
84+
<TextBlock
85+
Grid.Row="1"
86+
Grid.Column="0"
87+
VerticalAlignment="Center"
88+
Text="{helpers:ResourceString Name=CompressionLevel}" />
89+
<ComboBox
90+
x:Name="CompressionLevelSelector"
91+
Grid.Row="1"
92+
Grid.Column="1"
93+
Width="160"
94+
HorizontalAlignment="Right"
95+
DisplayMemberPath="Label"
96+
ItemsSource="{x:Bind ViewModel.CompressionLevels}"
97+
SelectedItem="{x:Bind ViewModel.CompressionLevel, Mode=TwoWay}"
98+
SelectedValuePath="Key" />
99+
100+
<!-- Splitting Size -->
101+
<TextBlock
102+
Grid.Row="2"
103+
Grid.Column="0"
104+
VerticalAlignment="Center"
105+
Text="{helpers:ResourceString Name=SplittingSize}" />
106+
<ComboBox
107+
x:Name="SplittingSizeSelector"
108+
Grid.Row="2"
109+
Grid.Column="1"
110+
Width="160"
111+
HorizontalAlignment="Right"
112+
IsEnabled="{x:Bind ViewModel.CanSplit, Mode=OneWay}"
113+
ItemsSource="{x:Bind ViewModel.SplittingSizes}"
114+
SelectedItem="{x:Bind ViewModel.SplittingSize, Mode=TwoWay}"
115+
SelectedValuePath="Key">
116+
<ComboBox.ItemTemplate>
117+
<DataTemplate x:DataType="local:SplittingSizeItem">
118+
<StackPanel Orientation="Horizontal" Spacing="4">
119+
<TextBlock Text="{x:Bind Label}" />
120+
<TextBlock Text="{x:Bind Separator}" Visibility="{Binding IsDropDownOpen, ElementName=SplittingSizeSelector}" />
121+
<TextBlock Text="{x:Bind Description}" Visibility="{Binding IsDropDownOpen, ElementName=SplittingSizeSelector}" />
122+
</StackPanel>
123+
</DataTemplate>
124+
</ComboBox.ItemTemplate>
125+
</ComboBox>
126+
</Grid>
127+
128+
<!-- Encryption Options -->
129+
<Expander
130+
HorizontalAlignment="Stretch"
131+
Header="{helpers:ResourceString Name=Encryption}"
132+
IsExpanded="{x:Bind ViewModel.UseEncryption, Mode=TwoWay}">
133+
<Expander.Content>
134+
<Grid Width="400">
135+
<Grid.ColumnDefinitions>
136+
<ColumnDefinition Width="*" />
137+
<ColumnDefinition Width="Auto" />
138+
</Grid.ColumnDefinitions>
139+
<TextBlock
140+
Grid.Column="0"
141+
VerticalAlignment="Center"
142+
Text="{helpers:ResourceString Name=Password}" />
143+
<PasswordBox
144+
x:Name="PasswordBox"
145+
Grid.Column="1"
146+
Width="260"
147+
IsPasswordRevealButtonEnabled="True"
148+
Loading="PasswordBox_Loading"
149+
Password="{x:Bind ViewModel.Password, Mode=TwoWay}"
150+
PasswordRevealMode="Peek"
151+
PlaceholderText="{helpers:ResourceString Name=Password}" />
152+
</Grid>
153+
</Expander.Content>
154+
</Expander>
155+
</StackPanel>
156+
</ContentDialog>

0 commit comments

Comments
 (0)