Skip to content

Recycle bin improvements #2703

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
yair100 merged 13 commits into from
Dec 27, 2020
Merged

Recycle bin improvements #2703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1a20c40
Fix open recyclebin in newtab (#2661)
gave92 Dec 25, 2020
a44777e
Add original path column in recyclebin
gave92 Dec 25, 2020
544ad12
Fix crash when clicking on sidebar at startup
gave92 Dec 25, 2020
57afded
Fix exception when opening bin in a new tab
gave92 Dec 25, 2020
cde6472
[WIP] sort by original name
gave92 Dec 25, 2020
9a20ef7
[WIP] sort by original path
gave92 Dec 25, 2020
14d4eb4
Show original path in properties (#1680)
gave92 Dec 25, 2020
30cbb51
Merge remote-tracking branch 'origin' into recyclebin
gave92 Dec 25, 2020
2fd4e6a
Fix merge conflicts
gave92 Dec 25, 2020
f27b852
Removed duplicate code
gave92 Dec 25, 2020
3d5bb01
Small fix
gave92 Dec 26, 2020
afa1441
Merge remote-tracking branch 'origin' into recyclebin
gave92 Dec 27, 2020
f53e9ed
Merge remote-tracking branch 'origin' into recyclebin
gave92 Dec 27, 2020
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
3 changes: 2 additions & 1 deletion Files/Enums/SortOption.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ public enum SortOption : byte
Name,
DateModified,
Size,
FileType
FileType,
OriginalPath
}
}
3 changes: 3 additions & 0 deletions Files/Filesystem/ListedItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.Toolkit.Uwp.Extensions;
using System;
using System.IO;
using Windows.Storage;
using Windows.UI.Xaml.Media.Imaging;

Expand Down Expand Up @@ -264,6 +265,8 @@ public RecycleBinItem(string folderRelativeId, string returnFormat) : base(folde

// For recycle bin elements (path + name)
public string ItemOriginalPath { get; set; }
// For recycle bin elements (path)
public string ItemOriginalFolder => Path.IsPathRooted(ItemOriginalPath) ? Path.GetDirectoryName(ItemOriginalPath) : ItemOriginalPath;
}

public class ShortcutItem : ListedItem
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.de-DE.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1929,6 +1929,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.es-ES.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,6 +1928,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.fr-FR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,6 +1928,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.he-IL.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1926,6 +1926,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.hi-IN.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,6 +1936,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.hu-HU.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,6 +1928,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.it-IT.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1929,6 +1929,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="translated">Percorso originale</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="translated">Percorso originale</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.ja-JP.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,6 +1928,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.nl-NL.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1938,6 +1938,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.or-IN.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,6 +1936,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.pl-PL.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1937,6 +1937,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,6 +1928,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.ru-RU.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,6 +1928,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.ta.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,6 +1933,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.tr-TR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,6 +1933,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.uk-UA.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,6 +1928,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,6 +1933,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
8 changes: 8 additions & 0 deletions Files/MultilingualResources/Files.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1935,6 +1935,14 @@
<source>Context Menu</source>
<target state="new">Context Menu</target>
</trans-unit>
<trans-unit id="originalPathColumn.Header" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
<trans-unit id="BaseLayoutContextFlyoutSortByOriginalPath.Text" translate="yes" xml:space="preserve">
<source>Original path</source>
<target state="new">Original path</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
6 changes: 6 additions & 0 deletions Files/Strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1557,4 +1557,10 @@
<data name="SettingsPreferencesContextMenu.Text" xml:space="preserve">
<value>Context Menu</value>
</data>
<data name="originalPathColumn.Header" xml:space="preserve">
<value>Original path</value>
</data>
<data name="BaseLayoutContextFlyoutSortByOriginalPath.Text" xml:space="preserve">
<value>Original path</value>
</data>
</root>
6 changes: 6 additions & 0 deletions Files/Strings/it-IT/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,4 +1449,10 @@
<data name="SettingsEnableLayoutPreferencesPerFolder.Header" xml:space="preserve">
<value>Abilita impostazioni di visualizzazione per cartella</value>
</data>
<data name="originalPathColumn.Header" xml:space="preserve">
<value>Percorso originale</value>
</data>
<data name="BaseLayoutContextFlyoutSortByOriginalPath.Text" xml:space="preserve">
<value>Percorso originale</value>
</data>
</root>
6 changes: 5 additions & 1 deletion Files/View Models/FolderSettingsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,11 @@ private static void UpdateLayoutPreferencesForPath(string folderPath, LayoutPref
{
App.AppSettings.DefaultLayoutMode = prefs.LayoutMode;
App.AppSettings.DefaultGridViewSize = prefs.GridViewSize;
App.AppSettings.DefaultDirectorySortOption = prefs.DirectorySortOption;
// Do not save OriginalPath as global sort option (only works in recycle bin)
if (prefs.DirectorySortOption != SortOption.OriginalPath)
{
App.AppSettings.DefaultDirectorySortOption = prefs.DirectorySortOption;
}
App.AppSettings.DefaultDirectorySortDirection = prefs.DirectorySortDirection;
}
}
Expand Down
18 changes: 18 additions & 0 deletions Files/View Models/ItemViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ public void UpdateSortOptionStatus()
NotifyPropertyChanged(nameof(IsSortedByDate));
NotifyPropertyChanged(nameof(IsSortedByType));
NotifyPropertyChanged(nameof(IsSortedBySize));
NotifyPropertyChanged(nameof(IsSortedByOriginalPath));
OrderFiles();
}

Expand All @@ -189,6 +190,19 @@ public bool IsSortedByName
}
}

public bool IsSortedByOriginalPath
{
get => FolderSettings.DirectorySortOption == SortOption.OriginalPath;
set
{
if (value)
{
FolderSettings.DirectorySortOption = SortOption.OriginalPath;
NotifyPropertyChanged(nameof(IsSortedByOriginalPath));
}
}
}

public bool IsSortedByDate
{
get => FolderSettings.DirectorySortOption == SortOption.DateModified;
Expand Down Expand Up @@ -497,6 +511,10 @@ private IList<ListedItem> OrderFiles2(IList<ListedItem> listToSort)
case SortOption.Size:
orderFunc = item => item.FileSizeBytes;
break;

case SortOption.OriginalPath:
orderFunc = item => ((RecycleBinItem)item).ItemOriginalFolder;
break;
}

// In ascending order, show folders first, then files.
Expand Down
8 changes: 6 additions & 2 deletions Files/View Models/Properties/CombinedProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,12 @@ public override void GetBaseProperties()
{
ViewModel.ItemType = "PropertiesDriveItemTypeDifferent".GetLocalized();
}
ViewModel.ItemPath = string.Format(
"PropertiesCombinedItemPath".GetLocalized(), Path.GetDirectoryName(List.First().ItemPath));
var itemsPath = List.Select(Item => (Item as RecycleBinItem)?.ItemOriginalFolder ??
(Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath));
if (itemsPath.Distinct().Count() == 1)
{
ViewModel.ItemPath = string.Format("PropertiesCombinedItemPath".GetLocalized(), itemsPath.First());
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion Files/View Models/Properties/FileProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ public override void GetBaseProperties()
ViewModel.ItemName = Item.ItemName;
ViewModel.OriginalItemName = Item.ItemName;
ViewModel.ItemType = Item.ItemType;
ViewModel.ItemPath = Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath;
ViewModel.ItemPath = (Item as RecycleBinItem)?.ItemOriginalFolder ??
(Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath);
ViewModel.ItemModifiedTimestamp = Item.ItemDateModified;
//ViewModel.FileIconSource = Item.FileImage;
ViewModel.LoadFolderGlyph = Item.LoadFolderGlyph;
Expand Down
Loading