Skip to content

Commit 74716bb

Browse files
authored
Feature: Separated the archive options in the right click menu (#12655)
1 parent 4b55ae0 commit 74716bb

File tree

2 files changed

+24
-34
lines changed

2 files changed

+24
-34
lines changed

src/Files.App/Helpers/ContextFlyoutItemHelper.cs

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -509,45 +509,35 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
509509
}.Build(),
510510
new ContextMenuFlyoutItemViewModel
511511
{
512-
Text = "Archive".GetLocalizedResource(),
512+
Text = "Compress".GetLocalizedResource(),
513513
ShowInSearchPage = true,
514514
OpacityIcon = new OpacityIconModel()
515515
{
516516
OpacityIconStyle = "ColorIconZip",
517517
},
518518
Items = new List<ContextMenuFlyoutItemViewModel>
519519
{
520-
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchive)
521-
{
522-
IsVisible = ArchiveHelpers.CanDecompress(selectedItems)
523-
}.Build(),
524-
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchiveHere)
525-
{
526-
IsVisible = ArchiveHelpers.CanDecompress(selectedItems)
527-
}.Build(),
528-
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchiveToChildFolder)
529-
{
530-
IsVisible = ArchiveHelpers.CanDecompress(selectedItems)
531-
}.Build(),
532-
new ContextMenuFlyoutItemViewModel
533-
{
534-
ShowItem = canDecompress && canCompress,
535-
ItemType = ContextMenuFlyoutItemType.Separator,
536-
},
537-
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoArchive)
538-
{
539-
IsVisible = ArchiveHelpers.CanCompress(selectedItems)
540-
}.Build(),
541-
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoZip)
542-
{
543-
IsVisible = ArchiveHelpers.CanCompress(selectedItems)
544-
}.Build(),
545-
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoSevenZip)
546-
{
547-
IsVisible = ArchiveHelpers.CanCompress(selectedItems)
548-
}.Build(),
520+
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoArchive).Build(),
521+
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoZip).Build(),
522+
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoSevenZip).Build(),
549523
},
550-
ShowItem = itemsSelected
524+
ShowItem = itemsSelected && ArchiveHelpers.CanCompress(selectedItems)
525+
},
526+
new ContextMenuFlyoutItemViewModel
527+
{
528+
Text = "Extract".GetLocalizedResource(),
529+
ShowInSearchPage = true,
530+
OpacityIcon = new OpacityIconModel()
531+
{
532+
OpacityIconStyle = "ColorIconZip",
533+
},
534+
Items = new List<ContextMenuFlyoutItemViewModel>
535+
{
536+
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchive).Build(),
537+
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchiveHere).Build(),
538+
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchiveToChildFolder).Build(),
539+
},
540+
ShowItem = ArchiveHelpers.CanDecompress(selectedItems)
551541
},
552542
new ContextMenuFlyoutItemViewModel()
553543
{

src/Files.App/Strings/en-US/Resources.resw

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,6 +2223,9 @@
22232223
<data name="CompressionInProgress" xml:space="preserve">
22242224
<value>Compressing archive</value>
22252225
</data>
2226+
<data name="Compress" xml:space="preserve">
2227+
<value>Compress</value>
2228+
</data>
22262229
<data name="SelectFilesAndFoldersOnHover" xml:space="preserve">
22272230
<value>Select files and folders when hovering over them</value>
22282231
</data>
@@ -2271,9 +2274,6 @@
22712274
<data name="SortingAndGrouping" xml:space="preserve">
22722275
<value>Sorting and grouping</value>
22732276
</data>
2274-
<data name="Archive" xml:space="preserve">
2275-
<value>Archive</value>
2276-
</data>
22772277
<data name="CreateArchive" xml:space="preserve">
22782278
<value>Create archive</value>
22792279
</data>

0 commit comments

Comments
 (0)