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

Feature: Rename the "Path:" text to "Location:" #12243

Merged
merged 14 commits into from
May 1, 2023
+24 −21
Merged

Feature: Rename the "Path:" text to "Location:" #12243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0965bb5
Rename the 'Path:' text to 'Location:'
memory-hunter Apr 30, 2023
c8282e8
Merge branch 'files-community:main' into path-to-location
memory-hunter Apr 30, 2023
fd5bed6
Reverted back Path to Path:
memory-hunter May 1, 2023
cb12dee
Added in Location variable
memory-hunter May 1, 2023
f04c0f2
Replaced Path variable with Location variable
memory-hunter May 1, 2023
3d4be62
Merge branch 'path-to-location' of github.com:memory-hunter/Files int…
memory-hunter May 1, 2023
b20fd4d
Merge branch 'main' into path-to-location
memory-hunter May 1, 2023
f88c43c
Reverted us-GB back
memory-hunter May 1, 2023
615c52e
Merge branch 'files-community:main' into path-to-location
memory-hunter May 1, 2023
89e30bd
Pulled Resources.resw from main
memory-hunter May 1, 2023
c8209f3
Updated to ItemLocation, ItemLocationVisibility
memory-hunter May 1, 2023
418be01
Update src/Files.App/Views/Properties/GeneralPage.xaml
memory-hunter May 1, 2023
9282332
Updated to PropertiesCombinedItemLocation
memory-hunter May 1, 2023
bce68b7
Merge branch 'main' into path-to-location
memory-hunter May 1, 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
7 changes: 5 additions & 2 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 @@ -477,7 +477,7 @@
<data name="PropertiesDriveItemTypeDifferent" xml:space="preserve">
<value>Different types</value>
</data>
<data name="PropertiesCombinedItemPath" xml:space="preserve">
<data name="PropertiesCombinedItemLocation" xml:space="preserve">
<value>All in {0}</value>
</data>
<data name="PropertiesDriveUsedSpace.Text" xml:space="preserve">
Expand Down Expand Up @@ -3205,4 +3205,7 @@
<data name="RedoDescription" xml:space="preserve">
<value>Redo the last file operation</value>
</data>
</root>
<data name="Location" xml:space="preserve">
<value>Location:</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/Files.App/ViewModels/Properties/Items/CombinedProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public override void GetBaseProperties()
(Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath));

if (itemsPath.Distinct().Count() == 1)
ViewModel.ItemPath = string.Format("PropertiesCombinedItemPath".GetLocalizedResource(), itemsPath.First());
ViewModel.ItemLocation = string.Format("PropertiesCombinedItemLocation".GetLocalizedResource(), itemsPath.First());
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/ViewModels/Properties/Items/FileProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public override void GetBaseProperties()
ViewModel.ItemName = Item.Name;
ViewModel.OriginalItemName = Item.Name;
ViewModel.ItemType = Item.ItemType;
ViewModel.ItemPath = (Item as RecycleBinItem)?.ItemOriginalFolder ??
ViewModel.ItemLocation = (Item as RecycleBinItem)?.ItemOriginalFolder ??
(Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath);
ViewModel.ItemModifiedTimestamp = Item.ItemDateModified;
ViewModel.ItemCreatedTimestamp = Item.ItemDateCreated;
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/ViewModels/Properties/Items/FolderProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public override void GetBaseProperties()
ViewModel.ItemName = Item.Name;
ViewModel.OriginalItemName = Item.Name;
ViewModel.ItemType = Item.ItemType;
ViewModel.ItemPath = (Item as RecycleBinItem)?.ItemOriginalFolder ??
ViewModel.ItemLocation = (Item as RecycleBinItem)?.ItemOriginalFolder ??
(Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath);
ViewModel.ItemModifiedTimestamp = Item.ItemDateModified;
ViewModel.ItemCreatedTimestamp = Item.ItemDateCreated;
Expand Down
18 changes: 9 additions & 9 deletions src/Files.App/ViewModels/SelectedItemsPropertiesViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,22 @@ public bool DriveFileSystemVisibility
set => SetProperty(ref driveFileSystemVisibility, value);
}

private string itemPath;
public string ItemPath
private string itemLocation;
public string ItemLocation
{
get => itemPath;
get => itemLocation;
set
{
ItemPathVisibility = true;
SetProperty(ref itemPath, value);
ItemLocationVisibility = true;
SetProperty(ref itemLocation, value);
}
}

private bool itemPathVisibility = false;
public bool ItemPathVisibility
private bool itemLocationVisibility = false;
public bool ItemLocationVisibility
{
get => itemPathVisibility;
set => SetProperty(ref itemPathVisibility, value);
get => itemLocationVisibility;
set => SetProperty(ref itemLocationVisibility, value);
}

private string itemSize;
Expand Down
14 changes: 7 additions & 7 deletions src/Files.App/Views/Properties/GeneralPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
x:Name="ItemDetails"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
x:Load="{x:Bind ViewModel.ItemPathVisibility, Mode=OneWay}"
x:Load="{x:Bind ViewModel.ItemLocationVisibility, Mode=OneWay}"
Header="{helpers:ResourceString Name=MoreDetails}"
IsExpanded="True">
<Expander.Content>
Expand All @@ -166,23 +166,23 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<!-- Item Path -->
<!-- Item Location -->
<TextBlock
Grid.Row="0"
Grid.Column="0"
HorizontalAlignment="Left"
Style="{StaticResource PropertyName}"
Text="{helpers:ResourceString Name=Path}"
Visibility="{x:Bind ViewModel.ItemPathVisibility, Mode=OneWay}" />
Text="{helpers:ResourceString Name=Location}"
Visibility="{x:Bind ViewModel.ItemLocationVisibility, Mode=OneWay}" />

<TextBlock
x:Name="itemPathValue"
x:Name="itemLocationValue"
Grid.Row="0"
Grid.Column="1"
Style="{StaticResource PropertyValueTextBlock}"
Text="{x:Bind ViewModel.ItemPath, Mode=OneWay}"
Text="{x:Bind ViewModel.ItemLocation, Mode=OneWay}"
TextWrapping="Wrap"
Visibility="{x:Bind ViewModel.ItemPathVisibility, Mode=OneWay}" />
Visibility="{x:Bind ViewModel.ItemLocationVisibility, Mode=OneWay}" />

<!-- Item Size -->
<TextBlock
Expand Down