Skip to content

Feature: Separated the archive options in the right click menu #12655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 20, 2023
Merged

Feature: Separated the archive options in the right click menu #12655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6366066
Feature: Separated the archive options in the right click menu
yaira2 Jun 19, 2023
7e2bbfa
Update src/Files.App/Helpers/ContextFlyoutItemHelper.cs
yaira2 Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 21 additions & 31 deletions src/Files.App/Helpers/ContextFlyoutItemHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,45 +509,35 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
}.Build(),
new ContextMenuFlyoutItemViewModel
{
Text = "Archive".GetLocalizedResource(),
Text = "Compress".GetLocalizedResource(),
ShowInSearchPage = true,
OpacityIcon = new OpacityIconModel()
{
OpacityIconStyle = "ColorIconZip",
},
Items = new List<ContextMenuFlyoutItemViewModel>
{
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchive)
{
IsVisible = ArchiveHelpers.CanDecompress(selectedItems)
}.Build(),
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchiveHere)
{
IsVisible = ArchiveHelpers.CanDecompress(selectedItems)
}.Build(),
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchiveToChildFolder)
{
IsVisible = ArchiveHelpers.CanDecompress(selectedItems)
}.Build(),
new ContextMenuFlyoutItemViewModel
{
ShowItem = canDecompress && canCompress,
ItemType = ContextMenuFlyoutItemType.Separator,
},
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoArchive)
{
IsVisible = ArchiveHelpers.CanCompress(selectedItems)
}.Build(),
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoZip)
{
IsVisible = ArchiveHelpers.CanCompress(selectedItems)
}.Build(),
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoSevenZip)
{
IsVisible = ArchiveHelpers.CanCompress(selectedItems)
}.Build(),
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoArchive).Build(),
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoZip).Build(),
new ContextMenuFlyoutItemViewModelBuilder(commands.CompressIntoSevenZip).Build(),
},
ShowItem = itemsSelected
ShowItem = itemsSelected && ArchiveHelpers.CanCompress(selectedItems)
},
new ContextMenuFlyoutItemViewModel
{
Text = "Extract".GetLocalizedResource(),
ShowInSearchPage = true,
OpacityIcon = new OpacityIconModel()
{
OpacityIconStyle = "ColorIconZip",
},
Items = new List<ContextMenuFlyoutItemViewModel>
{
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchive).Build(),
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchiveHere).Build(),
new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchiveToChildFolder).Build(),
},
ShowItem = ArchiveHelpers.CanDecompress(selectedItems)
},
new ContextMenuFlyoutItemViewModel()
{
Expand Down
6 changes: 3 additions & 3 deletions src/Files.App/Strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2223,6 +2223,9 @@
<data name="CompressionInProgress" xml:space="preserve">
<value>Compressing archive</value>
</data>
<data name="Compress" xml:space="preserve">
<value>Compress</value>
</data>
<data name="SelectFilesAndFoldersOnHover" xml:space="preserve">
<value>Select files and folders when hovering over them</value>
</data>
Expand Down Expand Up @@ -2271,9 +2274,6 @@
<data name="SortingAndGrouping" xml:space="preserve">
<value>Sorting and grouping</value>
</data>
<data name="Archive" xml:space="preserve">
<value>Archive</value>
</data>
<data name="CreateArchive" xml:space="preserve">
<value>Create archive</value>
</data>
Expand Down