Skip to content

Commit b743fc2

Browse files
yaira2yaira2
authored
Removed duplicate extract all menu item (#1877)
1 parent 083ec05 commit b743fc2

40 files changed

+0
-881
lines changed

‎Files/BaseLayout.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,6 @@ public void RightClickItemContextMenu_Opening(object sender, object e)
430430
{
431431
(this.FindName("OpenItem") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
432432
UnloadMenuFlyoutItemByName("OpenItemWithAppPicker");
433-
UnloadMenuFlyoutItemByName("UnzipItem");
434433
UnloadMenuFlyoutItemByName("RunAsAdmin");
435434
UnloadMenuFlyoutItemByName("RunAsAnotherUser");
436435
UnloadMenuFlyoutItemByName("CreateShortcut");
@@ -442,14 +441,12 @@ public void RightClickItemContextMenu_Opening(object sender, object e)
442441
UnloadMenuFlyoutItemByName("RunAsAdmin");
443442
UnloadMenuFlyoutItemByName("RunAsAnotherUser");
444443
(this.FindName("CreateShortcut") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
445-
(this.FindName("UnzipItem") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
446444
}
447445
else if (SelectedItem.FileExtension.Equals(".exe", StringComparison.OrdinalIgnoreCase)
448446
|| SelectedItem.FileExtension.Equals(".bat", StringComparison.OrdinalIgnoreCase))
449447
{
450448
(this.FindName("OpenItem") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
451449
UnloadMenuFlyoutItemByName("OpenItemWithAppPicker");
452-
UnloadMenuFlyoutItemByName("UnzipItem");
453450
(this.FindName("RunAsAdmin") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
454451
(this.FindName("RunAsAnotherUser") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
455452
(this.FindName("CreateShortcut") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
@@ -458,7 +455,6 @@ public void RightClickItemContextMenu_Opening(object sender, object e)
458455
{
459456
UnloadMenuFlyoutItemByName("OpenItem");
460457
UnloadMenuFlyoutItemByName("OpenItemWithAppPicker");
461-
UnloadMenuFlyoutItemByName("UnzipItem");
462458
UnloadMenuFlyoutItemByName("RunAsAdmin");
463459
(this.FindName("RunAsAnotherUser") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
464460
(this.FindName("CreateShortcut") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
@@ -469,7 +465,6 @@ public void RightClickItemContextMenu_Opening(object sender, object e)
469465
|| SelectedItem.FileExtension.Equals(".msixbundle", StringComparison.OrdinalIgnoreCase))
470466
{
471467
(this.FindName("OpenItemWithAppPicker") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
472-
UnloadMenuFlyoutItemByName("UnzipItem");
473468
UnloadMenuFlyoutItemByName("RunAsAdmin");
474469
UnloadMenuFlyoutItemByName("RunAsAnotherUser");
475470
(this.FindName("CreateShortcut") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
@@ -478,7 +473,6 @@ public void RightClickItemContextMenu_Opening(object sender, object e)
478473
{
479474
(this.FindName("OpenItem") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
480475
(this.FindName("OpenItemWithAppPicker") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
481-
UnloadMenuFlyoutItemByName("UnzipItem");
482476
UnloadMenuFlyoutItemByName("RunAsAdmin");
483477
UnloadMenuFlyoutItemByName("RunAsAnotherUser");
484478
(this.FindName("CreateShortcut") as MenuFlyoutItemBase).Visibility = Visibility.Visible;
@@ -489,7 +483,6 @@ public void RightClickItemContextMenu_Opening(object sender, object e)
489483
{
490484
UnloadMenuFlyoutItemByName("OpenItem");
491485
UnloadMenuFlyoutItemByName("OpenItemWithAppPicker");
492-
UnloadMenuFlyoutItemByName("UnzipItem");
493486
UnloadMenuFlyoutItemByName("CreateShortcut");
494487
}
495488
}
@@ -522,13 +515,11 @@ public void RightClickItemContextMenu_Opening(object sender, object e)
522515
//this.FindName("SidebarPinItem");
523516
//this.FindName("OpenInNewTab");
524517
//this.FindName("OpenInNewWindowItem");
525-
UnloadMenuFlyoutItemByName("UnzipItem");
526518
}
527519
else if (SelectedItems.Count > 5)
528520
{
529521
UnloadMenuFlyoutItemByName("OpenInNewTab");
530522
UnloadMenuFlyoutItemByName("OpenInNewWindowItem");
531-
UnloadMenuFlyoutItemByName("UnzipItem");
532523
}
533524
}
534525

‎Files/Dialogs/ExtractFilesDialog.xaml

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎Files/Dialogs/ExtractFilesDialog.xaml.cs

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎Files/Files.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,6 @@
209209
<Compile Include="Dialogs\ExceptionDialog.xaml.cs">
210210
<DependentUpon>ExceptionDialog.xaml</DependentUpon>
211211
</Compile>
212-
<Compile Include="Dialogs\ExtractFilesDialog.xaml.cs">
213-
<DependentUpon>ExtractFilesDialog.xaml</DependentUpon>
214-
</Compile>
215212
<Compile Include="Dialogs\LayoutDialog.xaml.cs">
216213
<DependentUpon>LayoutDialog.xaml</DependentUpon>
217214
</Compile>
@@ -468,10 +465,6 @@
468465
<SubType>Designer</SubType>
469466
<Generator>MSBuild:Compile</Generator>
470467
</Page>
471-
<Page Include="Dialogs\ExtractFilesDialog.xaml">
472-
<SubType>Designer</SubType>
473-
<Generator>MSBuild:Compile</Generator>
474-
</Page>
475468
<Page Include="Dialogs\LayoutDialog.xaml">
476469
<SubType>Designer</SubType>
477470
<Generator>MSBuild:Compile</Generator>

‎Files/Interacts/Interaction.cs

Lines changed: 0 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,88 +1493,6 @@ public void NewBitmapImage_Click(object sender, RoutedEventArgs e)
14931493
AddItemDialog.CreateFile(AddItemType.BitmapImage);
14941494
}
14951495

1496-
public async void ExtractItems_Click(object sender, RoutedEventArgs e)
1497-
{
1498-
var selectedIndex = CurrentInstance.ContentPage.GetSelectedIndex();
1499-
StorageFile selectedItem = await ItemViewModel.GetFileFromPathAsync(CurrentInstance.FilesystemViewModel.FilesAndFolders[selectedIndex].ItemPath);
1500-
1501-
StatusBanner banner = null;
1502-
ExtractFilesDialog extractFilesDialog = new ExtractFilesDialog(CurrentInstance.FilesystemViewModel.WorkingDirectory);
1503-
await extractFilesDialog.ShowAsync();
1504-
if (((bool)ApplicationData.Current.LocalSettings.Values["Extract_Destination_Cancelled"]) == false)
1505-
{
1506-
var bufferItem = await selectedItem.CopyAsync(ApplicationData.Current.TemporaryFolder, selectedItem.DisplayName, NameCollisionOption.ReplaceExisting);
1507-
string destinationPath = ApplicationData.Current.LocalSettings.Values["Extract_Destination_Path"].ToString();
1508-
StorageFolder destinationFolder = await ItemViewModel.GetFolderFromPathAsync(destinationPath);
1509-
//ZipFile.ExtractToDirectory(selectedItem.Path, destinationPath, );
1510-
var destFolder_InBuffer = await ApplicationData.Current.TemporaryFolder.CreateFolderAsync(selectedItem.DisplayName + "_Extracted", CreationCollisionOption.ReplaceExisting);
1511-
using FileStream fs = new FileStream(bufferItem.Path, FileMode.Open);
1512-
ZipArchive zipArchive = new ZipArchive(fs);
1513-
int totalCount = zipArchive.Entries.Count;
1514-
int index = 0;
1515-
1516-
App.InteractionViewModel.IsContentLoadingIndicatorVisible = false;
1517-
banner = App.CurrentInstance.StatusBarControl.OngoingTasksControl.PostBanner(
1518-
null,
1519-
App.CurrentInstance.FilesystemViewModel.WorkingDirectory,
1520-
0,
1521-
StatusBanner.StatusBannerSeverity.Ongoing,
1522-
StatusBanner.StatusBannerOperation.Extract);
1523-
1524-
await Task.Run((Func<Task>)(async () =>
1525-
{
1526-
foreach (ZipArchiveEntry archiveEntry in zipArchive.Entries)
1527-
{
1528-
uint progressValue = (uint)(index * 100.0 / zipArchive.Entries.Count);
1529-
await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,
1530-
new DispatchedHandler(() =>
1531-
{
1532-
if (banner == null)
1533-
{
1534-
throw new ArgumentNullException();
1535-
}
1536-
else
1537-
{
1538-
banner.Report((uint)progressValue);
1539-
}
1540-
}));
1541-
if (archiveEntry.FullName.Contains('/'))
1542-
{
1543-
var nestedDirectories = archiveEntry.FullName.Split('/').ToList();
1544-
nestedDirectories.Remove(nestedDirectories.Last());
1545-
var relativeOutputPathToEntry = Path.Combine(nestedDirectories.ToArray());
1546-
System.IO.Directory.CreateDirectory(Path.Combine(destFolder_InBuffer.Path, relativeOutputPathToEntry));
1547-
}
1548-
1549-
if (!string.IsNullOrWhiteSpace(archiveEntry.Name))
1550-
archiveEntry.ExtractToFile(Path.Combine(destFolder_InBuffer.Path, archiveEntry.FullName));
1551-
1552-
index++;
1553-
if (index == totalCount)
1554-
{
1555-
App.InteractionViewModel.IsContentLoadingIndicatorVisible = false;
1556-
}
1557-
}
1558-
}));
1559-
1560-
await CloneDirectoryAsync(destFolder_InBuffer, destinationFolder, destFolder_InBuffer.Name, true)
1561-
.ContinueWith(async (x) =>
1562-
{
1563-
await destFolder_InBuffer.DeleteAsync(StorageDeleteOption.PermanentDelete);
1564-
await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
1565-
{
1566-
await MainPage.AddNewTab(typeof(ModernShellPage), destinationPath + "\\" + selectedItem.DisplayName + "_Extracted");
1567-
});
1568-
});
1569-
banner.Report(100);
1570-
App.CurrentInstance.StatusBarControl.OngoingTasksControl.RemoveBanner(banner);
1571-
}
1572-
else if (((bool)ApplicationData.Current.LocalSettings.Values["Extract_Destination_Cancelled"]) == true)
1573-
{
1574-
return;
1575-
}
1576-
}
1577-
15781496
public void SelectAllItems() => CurrentInstance.ContentPage.SelectAllItems();
15791497

15801498
public void InvertAllItems() => CurrentInstance.ContentPage.InvertSelection();

‎Files/MultilingualResources/Files.de-DE.xlf

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -223,26 +223,6 @@
223223
<source>New Tab</source>
224224
<target state="translated">Neuer Tab</target>
225225
</trans-unit>
226-
<trans-unit id="ExtractFilesDialog.Title" translate="yes" xml:space="preserve">
227-
<source>Extract Compressed Archive</source>
228-
<target state="translated">Archiv entpacken</target>
229-
</trans-unit>
230-
<trans-unit id="ExtractFilesDialog.CloseButtonText" translate="yes" xml:space="preserve">
231-
<source>Cancel</source>
232-
<target state="translated">Abbrechen</target>
233-
</trans-unit>
234-
<trans-unit id="ExtractFilesDialog.PrimaryButtonText" translate="yes" xml:space="preserve">
235-
<source>Extract</source>
236-
<target state="translated">Entpacken</target>
237-
</trans-unit>
238-
<trans-unit id="ExtractFilesDialogDescription.Text" translate="yes" xml:space="preserve">
239-
<source>Pick a location to extract this compressed archive to. You'll need to stay in the current folder until we're done. A new tab will open up with the extracted items.</source>
240-
<target state="translated">Wähle aus wohin das Archiv entpackt werden soll. Sie müssen im derzeitigen Ordner bleiben bis das Entpacken beended wurde. Ein neuer Tab mit den entpackten Dateien wird anschließend geöffnet.</target>
241-
</trans-unit>
242-
<trans-unit id="ExtractFilesDialogBrowseButton.Content" translate="yes" xml:space="preserve">
243-
<source>Browse</source>
244-
<target state="translated">Durchsuchen</target>
245-
</trans-unit>
246226
<trans-unit id="BaseLayoutContextFlyoutSortBy.Text" translate="yes" xml:space="preserve">
247227
<source>Sort by</source>
248228
<target state="translated">Sortieren nach</target>
@@ -877,10 +857,6 @@
877857
<source>Deleting files</source>
878858
<target state="translated" state-qualifier="tm-suggestion">Dateien werden gelöscht</target>
879859
</trans-unit>
880-
<trans-unit id="ExtractInProgress.Title" translate="yes" xml:space="preserve">
881-
<source>Extracting files</source>
882-
<target state="translated" state-qualifier="tm-suggestion">Dateien werden extrahiert</target>
883-
</trans-unit>
884860
<trans-unit id="PasteInProgress.Title" translate="yes" xml:space="preserve">
885861
<source>Pasting files</source>
886862
<target state="translated">Dateien werden kopiert</target>

‎Files/MultilingualResources/Files.es-ES.xlf

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -222,26 +222,6 @@
222222
<source>New Tab</source>
223223
<target state="translated">Nueva Pestaña</target>
224224
</trans-unit>
225-
<trans-unit id="ExtractFilesDialog.Title" translate="yes" xml:space="preserve">
226-
<source>Extract Compressed Archive</source>
227-
<target state="translated">Extraer Archivo Comprimido</target>
228-
</trans-unit>
229-
<trans-unit id="ExtractFilesDialog.CloseButtonText" translate="yes" xml:space="preserve">
230-
<source>Cancel</source>
231-
<target state="translated">Cancelar</target>
232-
</trans-unit>
233-
<trans-unit id="ExtractFilesDialog.PrimaryButtonText" translate="yes" xml:space="preserve">
234-
<source>Extract</source>
235-
<target state="translated">Extraer</target>
236-
</trans-unit>
237-
<trans-unit id="ExtractFilesDialogDescription.Text" translate="yes" xml:space="preserve">
238-
<source>Pick a location to extract this compressed archive to. You'll need to stay in the current folder until we're done. A new tab will open up with the extracted items.</source>
239-
<target state="translated">Elija una ubicación para extraer este archivo comprimido. Deberá permanecer en la carpeta actual hasta que hayamos terminado. Se abrirá una nueva pestaña con los elementos extraídos.</target>
240-
</trans-unit>
241-
<trans-unit id="ExtractFilesDialogBrowseButton.Content" translate="yes" xml:space="preserve">
242-
<source>Browse</source>
243-
<target state="translated">Examinar</target>
244-
</trans-unit>
245225
<trans-unit id="BaseLayoutContextFlyoutSortBy.Text" translate="yes" xml:space="preserve">
246226
<source>Sort by</source>
247227
<target state="translated">Ordenar por</target>
@@ -938,10 +918,6 @@
938918
<source>Deleting files</source>
939919
<target state="translated">Eliminando archivos</target>
940920
</trans-unit>
941-
<trans-unit id="ExtractInProgress.Title" translate="yes" xml:space="preserve">
942-
<source>Extracting files</source>
943-
<target state="translated">Extrayendo archivos</target>
944-
</trans-unit>
945921
<trans-unit id="PasteInProgress.Title" translate="yes" xml:space="preserve">
946922
<source>Pasting files</source>
947923
<target state="translated">Pegando archivos</target>

0 commit comments

Comments
 (0)