Skip to content

Properties: Add support for combined and drive properties #1211

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 3 commits into from
Jun 24, 2020
Merged

Properties: Add support for combined and drive properties #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
194ced4
Properties: Add support for combined and drive properties
tsvietOK Jun 23, 2020
5fedac3
Fix CodeFactor
tsvietOK Jun 23, 2020
aaabe66
Make method less complex
tsvietOK Jun 23, 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
8 changes: 4 additions & 4 deletions Files/BaseLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ internal set
if (SelectedItems.Count == 1)
{
SelectedItemsPropertiesViewModel.SelectedItemsCount = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemSelected/Text");
SelectedItemsPropertiesViewModel.ItemsSize = SelectedItem.FileSize;
SelectedItemsPropertiesViewModel.ItemSize = SelectedItem.FileSize;
}
else
{
Expand All @@ -95,11 +95,11 @@ internal set
{
size += item.FileSizeBytes;
}
SelectedItemsPropertiesViewModel.ItemsSize = ByteSizeLib.ByteSize.FromBytes(size).ToBinaryString().ConvertSizeAbbreviation();
SelectedItemsPropertiesViewModel.ItemSize = ByteSizeLib.ByteSize.FromBytes(size).ToBinaryString().ConvertSizeAbbreviation();
}
else
{
SelectedItemsPropertiesViewModel.ItemsSize = string.Empty;
SelectedItemsPropertiesViewModel.ItemSize = string.Empty;
}
}
}
Expand All @@ -115,7 +115,7 @@ public BaseLayout()
{
this.Loaded += Page_Loaded;
Page_Loaded(null, null);
SelectedItemsPropertiesViewModel = new SelectedItemsPropertiesViewModel(null);
SelectedItemsPropertiesViewModel = new SelectedItemsPropertiesViewModel(null as ListedItem);
DirectoryPropertiesViewModel = new DirectoryPropertiesViewModel();
// QuickLook Integration
ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
Expand Down
10 changes: 10 additions & 0 deletions Files/Enums/PropertiesType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace Files.Enums
{
public enum PropertiesType
{
File,
Folder,
Combined,
Drive
}
}
1 change: 1 addition & 0 deletions Files/Files.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
<DependentUpon>RenameDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Enums\FormFactorMode.cs" />
<Compile Include="Enums\PropertiesType.cs" />
<Compile Include="Enums\SidebarOpacity.cs" />
<Compile Include="Enums\SortOption.cs" />
<Compile Include="Enums\TimeStyle.cs" />
Expand Down
12 changes: 5 additions & 7 deletions Files/Interacts/Interaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,12 +468,9 @@ private async void ShowProperties()
{
if (App.CurrentInstance.ContentPage.IsItemSelected)
{
if (AppSettings.OpenPropertiesInMultipleWindows)
if (App.CurrentInstance.ContentPage.SelectedItems.Count > 1)
{
foreach (var item in App.CurrentInstance.ContentPage.SelectedItems)
{
await OpenPropertiesWindow(item);
}
await OpenPropertiesWindow(App.CurrentInstance.ContentPage.SelectedItems);
}
else
{
Expand All @@ -489,12 +486,13 @@ private async void ShowProperties()
}
else
{
//TODO: Implement drive properties
await OpenPropertiesWindow(App.AppSettings.DrivesManager.Drives
.Single(x => x.Path.Equals(App.CurrentInstance.FilesystemViewModel.CurrentFolder.ItemPath)));
}
}
}

private async Task OpenPropertiesWindow(ListedItem item)
private async Task OpenPropertiesWindow(object item)
{
if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
{
Expand Down
34 changes: 29 additions & 5 deletions Files/MultilingualResources/Files.de-DE.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,10 +829,6 @@
<source>Show Owner in properties</source>
<target state="new">Show Owner in properties</target>
</trans-unit>
<trans-unit id="SettingsExperimentalPropertiesMultipleWindows.Text" translate="yes" xml:space="preserve">
<source>Open properties in Multiple Windows</source>
<target state="new">Open properties in Multiple Windows</target>
</trans-unit>
<trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
<source>bytes</source>
<target state="new">bytes</target>
Expand Down Expand Up @@ -873,7 +869,35 @@
<source>{0:#,##0} Files, {1:#,##0} Folders</source>
<target state="new">{0:#,##0} Files, {1:#,##0} Folders</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypesEquals" translate="yes" xml:space="preserve">
<source>All type of {0}</source>
<target state="new">All type of {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypeDifferent" translate="yes" xml:space="preserve">
<source>Different types</source>
<target state="new">Different types</target>
</trans-unit>
<trans-unit id="PropertiesCombinedItemPath" translate="yes" xml:space="preserve">
<source>All in {0}</source>
<target state="new">All in {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveUsedSpace.Text" translate="yes" xml:space="preserve">
<source>Used space:</source>
<target state="new">Used space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFreeSpace.Text" translate="yes" xml:space="preserve">
<source>Free space:</source>
<target state="new">Free space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveCapacity.Text" translate="yes" xml:space="preserve">
<source>Capacity:</source>
<target state="new">Capacity:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFileSystem.Text" translate="yes" xml:space="preserve">
<source>File system:</source>
<target state="new">File system:</target>
</trans-unit>
</group>
</body>
</file>
</xliff>
</xliff>
32 changes: 28 additions & 4 deletions Files/MultilingualResources/Files.es-ES.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,10 +822,6 @@
<source>Show Owner in properties</source>
<target state="translated">Mostrar propietario de archivo en propiedades</target>
</trans-unit>
<trans-unit id="SettingsExperimentalPropertiesMultipleWindows.Text" translate="yes" xml:space="preserve">
<source>Open properties in Multiple Windows</source>
<target state="translated">Ver propiedades de multiples elementos seleccionados</target>
</trans-unit>
<trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
<source>bytes</source>
<target state="new">bytes</target>
Expand Down Expand Up @@ -866,6 +862,34 @@
<source>{0:#,##0} Files, {1:#,##0} Folders</source>
<target state="new">{0:#,##0} Files, {1:#,##0} Folders</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypesEquals" translate="yes" xml:space="preserve">
<source>All type of {0}</source>
<target state="new">All type of {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypeDifferent" translate="yes" xml:space="preserve">
<source>Different types</source>
<target state="new">Different types</target>
</trans-unit>
<trans-unit id="PropertiesCombinedItemPath" translate="yes" xml:space="preserve">
<source>All in {0}</source>
<target state="new">All in {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveUsedSpace.Text" translate="yes" xml:space="preserve">
<source>Used space:</source>
<target state="new">Used space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFreeSpace.Text" translate="yes" xml:space="preserve">
<source>Free space:</source>
<target state="new">Free space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveCapacity.Text" translate="yes" xml:space="preserve">
<source>Capacity:</source>
<target state="new">Capacity:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFileSystem.Text" translate="yes" xml:space="preserve">
<source>File system:</source>
<target state="new">File system:</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
32 changes: 28 additions & 4 deletions Files/MultilingualResources/Files.fr-FR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,10 +825,6 @@
<source>Show Owner in properties</source>
<target state="new">Show Owner in properties</target>
</trans-unit>
<trans-unit id="SettingsExperimentalPropertiesMultipleWindows.Text" translate="yes" xml:space="preserve">
<source>Open properties in Multiple Windows</source>
<target state="new">Open properties in Multiple Windows</target>
</trans-unit>
<trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
<source>bytes</source>
<target state="new">bytes</target>
Expand Down Expand Up @@ -869,6 +865,34 @@
<source>{0:#,##0} Files, {1:#,##0} Folders</source>
<target state="new">{0:#,##0} Files, {1:#,##0} Folders</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypesEquals" translate="yes" xml:space="preserve">
<source>All type of {0}</source>
<target state="new">All type of {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypeDifferent" translate="yes" xml:space="preserve">
<source>Different types</source>
<target state="new">Different types</target>
</trans-unit>
<trans-unit id="PropertiesCombinedItemPath" translate="yes" xml:space="preserve">
<source>All in {0}</source>
<target state="new">All in {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveUsedSpace.Text" translate="yes" xml:space="preserve">
<source>Used space:</source>
<target state="new">Used space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFreeSpace.Text" translate="yes" xml:space="preserve">
<source>Free space:</source>
<target state="new">Free space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveCapacity.Text" translate="yes" xml:space="preserve">
<source>Capacity:</source>
<target state="new">Capacity:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFileSystem.Text" translate="yes" xml:space="preserve">
<source>File system:</source>
<target state="new">File system:</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
32 changes: 28 additions & 4 deletions Files/MultilingualResources/Files.it-IT.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,10 +830,6 @@
<source>Show Owner in properties</source>
<target state="new">Show Owner in properties</target>
</trans-unit>
<trans-unit id="SettingsExperimentalPropertiesMultipleWindows.Text" translate="yes" xml:space="preserve">
<source>Open properties in Multiple Windows</source>
<target state="new">Open properties in Multiple Windows</target>
</trans-unit>
<trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
<source>bytes</source>
<target state="new">bytes</target>
Expand Down Expand Up @@ -874,6 +870,34 @@
<source>{0:#,##0} Files, {1:#,##0} Folders</source>
<target state="new">{0:#,##0} Files, {1:#,##0} Folders</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypesEquals" translate="yes" xml:space="preserve">
<source>All type of {0}</source>
<target state="new">All type of {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypeDifferent" translate="yes" xml:space="preserve">
<source>Different types</source>
<target state="new">Different types</target>
</trans-unit>
<trans-unit id="PropertiesCombinedItemPath" translate="yes" xml:space="preserve">
<source>All in {0}</source>
<target state="new">All in {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveUsedSpace.Text" translate="yes" xml:space="preserve">
<source>Used space:</source>
<target state="new">Used space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFreeSpace.Text" translate="yes" xml:space="preserve">
<source>Free space:</source>
<target state="new">Free space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveCapacity.Text" translate="yes" xml:space="preserve">
<source>Capacity:</source>
<target state="new">Capacity:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFileSystem.Text" translate="yes" xml:space="preserve">
<source>File system:</source>
<target state="new">File system:</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
32 changes: 28 additions & 4 deletions Files/MultilingualResources/Files.ja-JP.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,10 +823,6 @@
<source>Show Owner in properties</source>
<target state="new">Show Owner in properties</target>
</trans-unit>
<trans-unit id="SettingsExperimentalPropertiesMultipleWindows.Text" translate="yes" xml:space="preserve">
<source>Open properties in Multiple Windows</source>
<target state="new">Open properties in Multiple Windows</target>
</trans-unit>
<trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
<source>bytes</source>
<target state="new">bytes</target>
Expand Down Expand Up @@ -867,6 +863,34 @@
<source>{0:#,##0} Files, {1:#,##0} Folders</source>
<target state="new">{0:#,##0} Files, {1:#,##0} Folders</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypesEquals" translate="yes" xml:space="preserve">
<source>All type of {0}</source>
<target state="new">All type of {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypeDifferent" translate="yes" xml:space="preserve">
<source>Different types</source>
<target state="new">Different types</target>
</trans-unit>
<trans-unit id="PropertiesCombinedItemPath" translate="yes" xml:space="preserve">
<source>All in {0}</source>
<target state="new">All in {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveUsedSpace.Text" translate="yes" xml:space="preserve">
<source>Used space:</source>
<target state="new">Used space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFreeSpace.Text" translate="yes" xml:space="preserve">
<source>Free space:</source>
<target state="new">Free space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveCapacity.Text" translate="yes" xml:space="preserve">
<source>Capacity:</source>
<target state="new">Capacity:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFileSystem.Text" translate="yes" xml:space="preserve">
<source>File system:</source>
<target state="new">File system:</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
32 changes: 28 additions & 4 deletions Files/MultilingualResources/Files.nl-NL.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,10 +825,6 @@
<source>Show Owner in properties</source>
<target state="new">Show Owner in properties</target>
</trans-unit>
<trans-unit id="SettingsExperimentalPropertiesMultipleWindows.Text" translate="yes" xml:space="preserve">
<source>Open properties in Multiple Windows</source>
<target state="new">Open properties in Multiple Windows</target>
</trans-unit>
<trans-unit id="ItemSizeBytes" translate="yes" xml:space="preserve">
<source>bytes</source>
<target state="new">bytes</target>
Expand Down Expand Up @@ -869,6 +865,34 @@
<source>{0:#,##0} Files, {1:#,##0} Folders</source>
<target state="new">{0:#,##0} Files, {1:#,##0} Folders</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypesEquals" translate="yes" xml:space="preserve">
<source>All type of {0}</source>
<target state="new">All type of {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveItemTypeDifferent" translate="yes" xml:space="preserve">
<source>Different types</source>
<target state="new">Different types</target>
</trans-unit>
<trans-unit id="PropertiesCombinedItemPath" translate="yes" xml:space="preserve">
<source>All in {0}</source>
<target state="new">All in {0}</target>
</trans-unit>
<trans-unit id="PropertiesDriveUsedSpace.Text" translate="yes" xml:space="preserve">
<source>Used space:</source>
<target state="new">Used space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFreeSpace.Text" translate="yes" xml:space="preserve">
<source>Free space:</source>
<target state="new">Free space:</target>
</trans-unit>
<trans-unit id="PropertiesDriveCapacity.Text" translate="yes" xml:space="preserve">
<source>Capacity:</source>
<target state="new">Capacity:</target>
</trans-unit>
<trans-unit id="PropertiesDriveFileSystem.Text" translate="yes" xml:space="preserve">
<source>File system:</source>
<target state="new">File system:</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
Loading