Skip to content
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

Jump to bottom

Show shell items in sidebar context menu #5836

Merged
merged 2 commits into from Aug 17, 2021
Merged

Show shell items in sidebar context menu #5836

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
7ca0e5c
Show shell items in sidebar context menu
gave92 Aug 15, 2021
3cd3707
Fix enable empty recyclebin item
gave92 Aug 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions Files/Helpers/RecycleBinHelpers.cs
View file
Open in desktop
Expand Up @@ -118,5 +118,25 @@ public async Task<bool> HasRecycleBin(string path)
}
return false;
}

public async Task<bool> RecycleBinHasItems()
{
var recycleBinHasItems = false;
var connection = await AppServiceConnectionHelper.Instance;
if (connection != null)
{
var value = new ValueSet
{
{ "Arguments", "RecycleBin" },
{ "action", "Query" }
};
var (status, response) = await connection.SendMessageForResponseAsync(value);
if (status == AppServiceResponseStatus.Success && response.TryGetValue("NumItems", out var numItems))
{
recycleBinHasItems = (long)numItems > 0;
}
}
return recycleBinHasItems;
}
}
}
105 changes: 0 additions & 105 deletions Files/UserControls/SidebarControl.xaml
View file
Open in desktop
Expand Up @@ -94,111 +94,6 @@

<mconv:BoolNegationConverter x:Key="BoolNegationConverter" />

<MenuFlyout x:Name="SideBarItemContextFlyout" x:FieldModifier="public">
<MenuFlyout.Items>
<MenuFlyoutItem
x:Name="CreateNewLibrary"
x:Uid="SideBarCreateNewLibrary"
x:Load="{x:Bind IsLibrariesHeader, Mode=OneWay}"
Command="{x:Bind CreateLibraryCommand, Mode=OneWay}"
Text="Create new library">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE710;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="RestoreLibraries"
x:Uid="SideBarRestoreLibraries"
x:Load="{x:Bind IsLibrariesHeader, Mode=OneWay}"
Command="{x:Bind RestoreLibrariesCommand, Mode=OneWay}"
Text="Restore default libraries">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE10E;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="EmptyRecycleBin"
x:Uid="BaseLayoutContextFlyoutEmptyRecycleBin"
x:Load="{x:Bind ShowEmptyRecycleBin, Mode=OneWay}"
Command="{x:Bind EmptyRecycleBinCommand, Mode=OneWay}"
IsEnabled="{x:Bind RecycleBinHasItems, Mode=OneWay}"
Text="Empty recycle bin">
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource RecycleBinIcons}" Glyph="&#xEF88;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="OpenInNewPane"
x:Uid="SideBarOpenInNewPane"
x:Load="{x:Bind conv:MultiBooleanConverter.AndConvert(IsLocationItem, CanOpenInNewPane), Mode=OneWay}"
Click="OpenInNewPane_Click"
Text="Open in new pane">
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF117;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="OpenInNewTab"
x:Uid="SideBarOpenInNewTab"
x:Load="{x:Bind IsLocationItem, Mode=OneWay}"
Click="OpenInNewTab_Click"
Text="Open in new tab">
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF113;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="OpenInNewWindow"
x:Uid="SideBarOpenInNewWindow"
x:Load="{x:Bind IsLocationItem, Mode=OneWay}"
Click="OpenInNewWindow_Click"
Text="Open in new window">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE737;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="UnpinItem"
x:Uid="SideBarUnpinFromFavorites"
x:Load="{x:Bind ShowUnpinItem, Mode=OneWay}"
Click="{x:Bind UnpinItem_Click}"
Text="Unpin from Favorites">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE77A;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="HideSectionItem"
x:Load="{x:Bind ShowHideSection, Mode=OneWay}"
Click="{x:Bind HideSection_Click}"
Text="Hide section">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE77A;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="EjectDevice"
x:Uid="SideBarEjectDevice"
x:Load="{x:Bind ShowEjectDevice, Mode=OneWay}"
Click="EjectDevice_Click"
Text="Eject">
<MenuFlyoutItem.Icon>
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF10B;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
x:Name="PropertiesFolder"
x:Uid="BaseLayoutContextFlyoutPropertiesFolder"
x:Load="{x:Bind ShowProperties, Mode=OneWay}"
Click="Properties_Click"
Text="Properties">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE946;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
</MenuFlyout.Items>
</MenuFlyout>

<Style TargetType="SplitView">
<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundTransparentBrush}" />
<Setter Property="BorderThickness" Value="{ThemeResource SplitViewLeftBorderThemeThickness}" />
Expand Down