Skip to content

Open recycle bin & this pc in Files when set as default explorer #7408

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
Jan 2, 2022
Merged

Open recycle bin & this pc in Files when set as default explorer #7408

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
7b0c691
[TEST] Open recyclebin & my computer in Files
gave92 Jan 2, 2022
38315ae
Fix empty tab when opening This PC
gave92 Jan 2, 2022
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
Binary file modified src/Files.Launcher/Assets/FilesOpenDialog/SetFilesAsDefault.reg
View file
Open in desktop
Binary file not shown.
Binary file modified src/Files.Launcher/Assets/FilesOpenDialog/UnsetFilesAsDefault.reg
View file
Open in desktop
Binary file not shown.
5 changes: 3 additions & 2 deletions src/Files.Launcher/MessageHandlers/Win32MessageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ public void Initialize(PipeStream connection)

private void DetectIsSetAsDefaultFileManager()
{
using var subkey = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Classes\Directory\shell");
ApplicationData.Current.LocalSettings.Values["IsSetAsDefaultFileManager"] = subkey?.GetValue(string.Empty) as string == "openinfiles";
using var subkey = Registry.ClassesRoot.OpenSubKey(@"Folder\shell\open\command");
var command = (string)subkey?.GetValue(string.Empty);
ApplicationData.Current.LocalSettings.Values["IsSetAsDefaultFileManager"] = !string.IsNullOrEmpty(command) && command.Contains("files.exe");
}

private void DetectIsSetAsOpenFileDialog()
Expand Down
2 changes: 1 addition & 1 deletion src/Files/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ public static void SaveSessionTabs() // Enumerates through all tabs and gets the
}
else
{
var defaultArg = new TabItemArguments() { InitialPageType = typeof(PaneHolderPage), NavigationArg = "NewTab".GetLocalized() };
var defaultArg = new TabItemArguments() { InitialPageType = typeof(PaneHolderPage), NavigationArg = "Home".GetLocalized() };
return defaultArg.Serialize();
}
}).ToList();
Expand Down
6 changes: 3 additions & 3 deletions src/Files/Helpers/CommonPaths.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ public static class CommonPaths

public static Dictionary<string, string> ShellPlaces = new Dictionary<string, string>() {
{ "::{645FF040-5081-101B-9F08-00AA002F954E}", RecycleBinPath },
{ "::{5E5F29CE-E0A8-49D3-AF32-7A7BDC173478}", "NewTab".GetLocalized() /*MyComputerPath*/ },
{ "::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", "NewTab".GetLocalized() /*MyComputerPath*/ },
{ "::{5E5F29CE-E0A8-49D3-AF32-7A7BDC173478}", "Home".GetLocalized() /*MyComputerPath*/ },
{ "::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", "Home".GetLocalized() /*MyComputerPath*/ },
{ "::{F02C1A0D-BE21-4350-88B0-7367FC96EF3C}", NetworkFolderPath },
{ "::{208D2C60-3AEA-1069-A2D7-08002B30309D}", NetworkFolderPath },
{ RecycleBinPath.ToUpperInvariant(), RecycleBinPath },
{ MyComputerPath.ToUpperInvariant(), "NewTab".GetLocalized() /*MyComputerPath*/ },
{ MyComputerPath.ToUpperInvariant(), "Home".GetLocalized() /*MyComputerPath*/ },
{ NetworkFolderPath.ToUpperInvariant(), NetworkFolderPath },
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/Files/Helpers/MultitaskingTabsHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static async Task MoveTabToNewWindow(TabItem tab, IMultitaskingControl mu
}
else
{
await NavigationHelpers.OpenPathInNewWindowAsync("NewTab".GetLocalized());
await NavigationHelpers.OpenPathInNewWindowAsync("Home".GetLocalized());
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Files/ViewModels/MainPageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public static async Task UpdateTabInfo(TabItem tabItem, object navigationArg)
string tabLocationHeader;
var iconSource = new Microsoft.UI.Xaml.Controls.ImageIconSource();

if (currentPath == null || currentPath == "Home".GetLocalized())
if (string.IsNullOrEmpty(currentPath) || currentPath == "Home".GetLocalized())
{
tabLocationHeader = "Home".GetLocalized();
iconSource.ImageSource = new Windows.UI.Xaml.Media.Imaging.BitmapImage(new Uri("ms-appx:///Assets/FluentIcons/Home.png"));
Expand Down
2 changes: 1 addition & 1 deletion src/Files/Views/ColumnShellPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public ColumnShellPage()
FlowDirection = FlowDirection.RightToLeft;
}

//NavigationToolbar.PathControlDisplayText = "NewTab".GetLocalized();
//NavigationToolbar.PathControlDisplayText = "Home".GetLocalized();
//NavigationToolbar.CanGoBack = false;
//NavigationToolbar.CanGoForward = false;
//NavigationToolbar.SearchBox.QueryChanged += ColumnShellPage_QueryChanged;
Expand Down