Skip to content

Commit eb88b5b

Browse files
LamparterLamparter
committed
Files.App.ViewModels
1 parent 383d82c commit eb88b5b

26 files changed

+171
-171
lines changed

‎src/Files.App/ViewModels/Dialogs/AddItemDialog/AddItemDialogViewModel.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public async Task AddItemsToListAsync(IEnumerable<ShellNewEntry> itemTypes)
3333

3434
AddItemsList.Add(new()
3535
{
36-
Header = "Folder".ToLocalized(),
37-
SubHeader = "AddDialogListFolderSubHeader".ToLocalized(),
36+
Header = Strings.Folder.ToLocalized(),
37+
SubHeader = Strings.AddDialogListFolderSubHeader.ToLocalized(),
3838
Glyph = "\xE838",
3939
IsItemEnabled = true,
4040
ItemResult = new()
@@ -45,8 +45,8 @@ public async Task AddItemsToListAsync(IEnumerable<ShellNewEntry> itemTypes)
4545

4646
AddItemsList.Add(new()
4747
{
48-
Header = "File".ToLocalized(),
49-
SubHeader = "AddDialogListFileSubHeader".ToLocalized(),
48+
Header = Strings.File.ToLocalized(),
49+
SubHeader = Strings.AddDialogListFileSubHeader.ToLocalized(),
5050
Glyph = "\xE8A5",
5151
IsItemEnabled = true,
5252
ItemResult = new()
@@ -58,8 +58,8 @@ public async Task AddItemsToListAsync(IEnumerable<ShellNewEntry> itemTypes)
5858

5959
AddItemsList.Add(new()
6060
{
61-
Header = "Shortcut".ToLocalized(),
62-
SubHeader = "AddDialogListShortcutSubHeader".ToLocalized(),
61+
Header = Strings.Shortcut.ToLocalized(),
62+
SubHeader = Strings.AddDialogListShortcutSubHeader.ToLocalized(),
6363
Glyph = "\uE71B",
6464
IsItemEnabled = true,
6565
ItemResult = new()

‎src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -149,48 +149,48 @@ public static FileSystemDialogViewModel GetDialogViewModel(FileSystemDialogMode
149149

150150
if (dialogMode.ConflictsExist)
151151
{
152-
titleText = "ConflictingItemsDialogTitle".GetLocalizedFormatResource(totalCount);
152+
titleText = Strings.ConflictingItemsDialogTitle.GetLocalizedFormatResource(totalCount);
153153

154154
descriptionText = nonConflictingItems.Count > 0
155-
? "ConflictingItemsDialogSubtitleConflictsNonConflicts".GetLocalizedFormatResource(conflictingItems.Count, nonConflictingItems.Count)
156-
: "ConflictingItemsDialogSubtitleConflicts".GetLocalizedFormatResource(conflictingItems.Count);
155+
? Strings.ConflictingItemsDialogSubtitleConflictsNonConflicts.GetLocalizedFormatResource(conflictingItems.Count, nonConflictingItems.Count)
156+
: Strings.ConflictingItemsDialogSubtitleConflicts.GetLocalizedFormatResource(conflictingItems.Count);
157157

158-
primaryButtonText = "ConflictingItemsDialogPrimaryButtonText".ToLocalized();
159-
secondaryButtonText = "Cancel".ToLocalized();
158+
primaryButtonText = Strings.ConflictingItemsDialogPrimaryButtonText.ToLocalized();
159+
secondaryButtonText = Strings.Cancel.ToLocalized();
160160
}
161161
else
162162
{
163163
switch (operationType)
164164
{
165165
case FilesystemOperationType.Copy:
166166
{
167-
titleText = "CopyItemsDialogTitle".GetLocalizedFormatResource(totalCount);
167+
titleText = Strings.CopyItemsDialogTitle.GetLocalizedFormatResource(totalCount);
168168

169-
descriptionText = "CopyItemsDialogSubtitle".GetLocalizedFormatResource(totalCount);
170-
primaryButtonText = "Copy".ToLocalized();
171-
secondaryButtonText = "Cancel".ToLocalized();
169+
descriptionText = Strings.CopyItemsDialogSubtitle.GetLocalizedFormatResource(totalCount);
170+
primaryButtonText = Strings.Copy.ToLocalized();
171+
secondaryButtonText = Strings.Cancel.ToLocalized();
172172

173173
break;
174174
}
175175

176176
case FilesystemOperationType.Move:
177177
{
178-
titleText = "MoveItemsDialogTitle".GetLocalizedFormatResource(totalCount);
178+
titleText = Strings.MoveItemsDialogTitle.GetLocalizedFormatResource(totalCount);
179179

180-
descriptionText = "MoveItemsDialogSubtitle".GetLocalizedFormatResource(totalCount);
181-
primaryButtonText = "MoveItemsDialogPrimaryButtonText".ToLocalized();
182-
secondaryButtonText = "Cancel".ToLocalized();
180+
descriptionText = Strings.MoveItemsDialogSubtitle.GetLocalizedFormatResource(totalCount);
181+
primaryButtonText = Strings.MoveItemsDialogPrimaryButtonText.ToLocalized();
182+
secondaryButtonText = Strings.Cancel.ToLocalized();
183183

184184
break;
185185
}
186186

187187
case FilesystemOperationType.Delete:
188188
{
189-
titleText = "DeleteItemsDialogTitle".GetLocalizedFormatResource(totalCount);
189+
titleText = Strings.DeleteItemsDialogTitle.GetLocalizedFormatResource(totalCount);
190190

191-
descriptionText = "DeleteItemsDialogSubtitle".GetLocalizedFormatResource(totalCount);
192-
primaryButtonText = "Delete".ToLocalized();
193-
secondaryButtonText = "Cancel".ToLocalized();
191+
descriptionText = Strings.DeleteItemsDialogSubtitle.GetLocalizedFormatResource(totalCount);
192+
primaryButtonText = Strings.Delete.ToLocalized();
193+
secondaryButtonText = Strings.Cancel.ToLocalized();
194194

195195
isInDeleteMode = true;
196196

‎src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public sealed partial class ReorderSidebarItemsDialogViewModel : ObservableObjec
99
{
1010
private readonly IQuickAccessService quickAccessService = Ioc.Default.GetRequiredService<IQuickAccessService>();
1111

12-
public string HeaderText = "ReorderSidebarItemsDialogText".GetLocalizedResource();
12+
public string HeaderText = Strings.ReorderSidebarItemsDialogText.GetLocalizedResource();
1313
public ICommand PrimaryButtonCommand { get; private set; }
1414

1515
public ObservableCollection<LocationItem> SidebarPinnedFolderItems = new(App.QuickAccessManager.Model._PinnedFolderItems

‎src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,23 +125,23 @@ public async Task DragOverAsync(DragEventArgs e)
125125
e.DragUIOverride.IsCaptionVisible = true;
126126
if (pwd.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))
127127
{
128-
e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName);
128+
e.DragUIOverride.Caption = string.Format(Strings.MoveToFolderCaptionText.GetLocalizedResource(), folderName);
129129
// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
130130
e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy;
131131
}
132132
else if (e.Modifiers.HasFlag(DragDropModifiers.Alt) || e.Modifiers.HasFlag(DragDropModifiers.Control | DragDropModifiers.Shift))
133133
{
134-
e.DragUIOverride.Caption = string.Format("LinkToFolderCaptionText".GetLocalizedResource(), folderName);
134+
e.DragUIOverride.Caption = string.Format(Strings.LinkToFolderCaptionText.GetLocalizedResource(), folderName);
135135
e.AcceptedOperation = DataPackageOperation.Link;
136136
}
137137
else if (e.Modifiers.HasFlag(DragDropModifiers.Control))
138138
{
139-
e.DragUIOverride.Caption = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), folderName);
139+
e.DragUIOverride.Caption = string.Format(Strings.CopyToFolderCaptionText.GetLocalizedResource(), folderName);
140140
e.AcceptedOperation = DataPackageOperation.Copy;
141141
}
142142
else if (e.Modifiers.HasFlag(DragDropModifiers.Shift))
143143
{
144-
e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName);
144+
e.DragUIOverride.Caption = string.Format(Strings.MoveToFolderCaptionText.GetLocalizedResource(), folderName);
145145
// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
146146
e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy;
147147
}
@@ -150,18 +150,18 @@ x.Item is ZipStorageFile ||
150150
x.Item is ZipStorageFolder) ||
151151
ZipStorageFolder.IsZipPath(pwd))
152152
{
153-
e.DragUIOverride.Caption = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), folderName);
153+
e.DragUIOverride.Caption = string.Format(Strings.CopyToFolderCaptionText.GetLocalizedResource(), folderName);
154154
e.AcceptedOperation = DataPackageOperation.Copy;
155155
}
156156
else if (draggedItems.AreItemsInSameDrive(_associatedInstance.ShellViewModel.WorkingDirectory))
157157
{
158-
e.DragUIOverride.Caption = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), folderName);
158+
e.DragUIOverride.Caption = string.Format(Strings.MoveToFolderCaptionText.GetLocalizedResource(), folderName);
159159
// Some applications such as Edge can't raise the drop event by the Move flag (#14008), so we set the Copy flag as well.
160160
e.AcceptedOperation = DataPackageOperation.Move | DataPackageOperation.Copy;
161161
}
162162
else
163163
{
164-
e.DragUIOverride.Caption = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), folderName);
164+
e.DragUIOverride.Caption = string.Format(Strings.CopyToFolderCaptionText.GetLocalizedResource(), folderName);
165165
e.AcceptedOperation = DataPackageOperation.Copy;
166166
}
167167

‎src/Files.App/ViewModels/Properties/BasePropertiesPage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
8686

8787
string[] extensions =
8888
[
89-
"BitmapFiles".GetLocalizedResource(), "*.bmp",
89+
Strings.BitmapFiles.GetLocalizedResource(), "*.bmp",
9090
"JPEG", "*.jpg;*.jpeg",
9191
"PNG", "*.png",
9292
];

‎src/Files.App/ViewModels/Properties/CompatibilityViewModel.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,26 +85,26 @@ public CompatibilityViewModel(ListedItem item)
8585

8686
CompatibilityOptions = WindowsCompatibilityService.GetCompatibilityOptionsForPath(ItemPath);
8787

88-
CompatibilityModes.Add(WindowsCompatModeKind.None, "None".GetLocalizedResource());
88+
CompatibilityModes.Add(WindowsCompatModeKind.None, Strings.None.GetLocalizedResource());
8989
CompatibilityModes.Add(WindowsCompatModeKind.WindowsVista, "Windows Vista");
9090
CompatibilityModes.Add(WindowsCompatModeKind.WindowsVistaSP1, "Windows Vista (Service Pack 1)");
9191
CompatibilityModes.Add(WindowsCompatModeKind.WindowsVistaSP2, "Windows Vista (Service Pack 2)");
9292
CompatibilityModes.Add(WindowsCompatModeKind.Windows7, "Windows 7");
9393
CompatibilityModes.Add(WindowsCompatModeKind.Windows8, "Windows 8");
9494

95-
ReducedColorModes.Add(WindowsCompatReducedColorModeKind.None, "CompatibilityNoReducedColor".GetLocalizedResource());
96-
ReducedColorModes.Add(WindowsCompatReducedColorModeKind.Color8Bit, "CompatibilityReducedColorModeColor8bit".GetLocalizedResource());
97-
ReducedColorModes.Add(WindowsCompatReducedColorModeKind.Color16Bit, "CompatibilityReducedColorModeColor16bit".GetLocalizedResource());
95+
ReducedColorModes.Add(WindowsCompatReducedColorModeKind.None, Strings.CompatibilityNoReducedColor.GetLocalizedResource());
96+
ReducedColorModes.Add(WindowsCompatReducedColorModeKind.Color8Bit, Strings.CompatibilityReducedColorModeColor8bit.GetLocalizedResource());
97+
ReducedColorModes.Add(WindowsCompatReducedColorModeKind.Color16Bit, Strings.CompatibilityReducedColorModeColor16bit.GetLocalizedResource());
9898

99-
HighDpiOptions.Add(WindowsCompatDPIOptionKind.None, "CompatibilityDoNotAdjustDPI".GetLocalizedResource());
100-
HighDpiOptions.Add(WindowsCompatDPIOptionKind.UseDPIOnLogin, "CompatibilityOnWindowsLogin".GetLocalizedResource());
101-
HighDpiOptions.Add(WindowsCompatDPIOptionKind.UseDPIOnProgramStart, "CompatibilityOnProgramStart".GetLocalizedResource());
99+
HighDpiOptions.Add(WindowsCompatDPIOptionKind.None, Strings.CompatibilityDoNotAdjustDPI.GetLocalizedResource());
100+
HighDpiOptions.Add(WindowsCompatDPIOptionKind.UseDPIOnLogin, Strings.CompatibilityOnWindowsLogin.GetLocalizedResource());
101+
HighDpiOptions.Add(WindowsCompatDPIOptionKind.UseDPIOnProgramStart, Strings.CompatibilityOnProgramStart.GetLocalizedResource());
102102

103-
HighDpiOverrides.Add(WindowsCompatDpiOverrideKind.None, "CompatibilityDoNotOverrideDPI".GetLocalizedResource());
104-
HighDpiOverrides.Add(WindowsCompatDpiOverrideKind.Advanced, "Advanced".GetLocalizedResource());
105-
HighDpiOverrides.Add(WindowsCompatDpiOverrideKind.Application, "Application".GetLocalizedResource());
106-
HighDpiOverrides.Add(WindowsCompatDpiOverrideKind.System, "System".GetLocalizedResource());
107-
HighDpiOverrides.Add(WindowsCompatDpiOverrideKind.SystemAdvanced, "CompatibilitySystemEnhanced".GetLocalizedResource());
103+
HighDpiOverrides.Add(WindowsCompatDpiOverrideKind.None, Strings.CompatibilityDoNotOverrideDPI.GetLocalizedResource());
104+
HighDpiOverrides.Add(WindowsCompatDpiOverrideKind.Advanced, Strings.Advanced.GetLocalizedResource());
105+
HighDpiOverrides.Add(WindowsCompatDpiOverrideKind.Application, Strings.Application.GetLocalizedResource());
106+
HighDpiOverrides.Add(WindowsCompatDpiOverrideKind.System, Strings.System.GetLocalizedResource());
107+
HighDpiOverrides.Add(WindowsCompatDpiOverrideKind.SystemAdvanced, Strings.CompatibilitySystemEnhanced.GetLocalizedResource());
108108

109109
RunTroubleshooterCommand = new AsyncRelayCommand(ExecuteRunTroubleshooterCommand);
110110
}

‎src/Files.App/ViewModels/Properties/HashesViewModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private void ToggleIsEnabled(string? algorithm)
7171
// Don't calculate hashes for online files
7272
if (_item.SyncStatusUI.SyncStatus is CloudDriveSyncStatus.FileOnline or CloudDriveSyncStatus.FolderOnline)
7373
{
74-
hashInfoItem.HashValue = "CalculationOnlineFileHashError".GetLocalizedResource();
74+
hashInfoItem.HashValue = Strings.CalculationOnlineFileHashError.GetLocalizedResource();
7575
return;
7676
}
7777

@@ -106,11 +106,11 @@ private void ToggleIsEnabled(string? algorithm)
106106
catch (IOException)
107107
{
108108
// File is currently open
109-
hashInfoItem.HashValue = "CalculationErrorFileIsOpen".GetLocalizedResource();
109+
hashInfoItem.HashValue = Strings.CalculationErrorFileIsOpen.GetLocalizedResource();
110110
}
111111
catch (Exception)
112112
{
113-
hashInfoItem.HashValue = "CalculationError".GetLocalizedResource();
113+
hashInfoItem.HashValue = Strings.CalculationError.GetLocalizedResource();
114114
}
115115
finally
116116
{

‎src/Files.App/ViewModels/Properties/Items/BaseProperties.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ await Dispatcher.EnqueueOrInvokeAsync(() =>
122122
public void SetItemsCountString()
123123
{
124124
ViewModel.FilesAndFoldersCountString = ViewModel.LocationsCount > 0
125-
? "PropertiesFilesAndFoldersAndLocationsCount".GetLocalizedFormatResource(ViewModel.FilesCount, ViewModel.FoldersCount, ViewModel.LocationsCount)
126-
: "PropertiesFilesAndFoldersCountString".GetLocalizedFormatResource(ViewModel.FilesCount, ViewModel.FoldersCount);
125+
? Strings.PropertiesFilesAndFoldersAndLocationsCount.GetLocalizedFormatResource(ViewModel.FilesCount, ViewModel.FoldersCount, ViewModel.LocationsCount)
126+
: Strings.PropertiesFilesAndFoldersCountString.GetLocalizedFormatResource(ViewModel.FilesCount, ViewModel.FoldersCount);
127127
}
128128
}
129129
}

‎src/Files.App/ViewModels/Properties/Items/CombinedFileProperties.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public async Task GetSystemFilePropertiesAsync()
6464
else if (props.Where(x => x.Property == prop.Property).Any(x => !Equals(x.Value, prop.Value)))
6565
{
6666
// Has multiple values
67-
prop.Value = prop.IsReadOnly ? "MultipleValues".GetLocalizedResource() : null;
68-
prop.PlaceholderText = "MultipleValues".GetLocalizedResource();
67+
prop.Value = prop.IsReadOnly ? Strings.MultipleValues.GetLocalizedResource() : null;
68+
prop.PlaceholderText = Strings.MultipleValues.GetLocalizedResource();
6969
}
7070
}
7171
}

‎src/Files.App/ViewModels/Properties/Items/CombinedProperties.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@ public sealed override void GetBaseProperties()
4141

4242
if (List.All(x => x.ItemType.Equals(List.First().ItemType)))
4343
{
44-
ViewModel.ItemType = string.Format("PropertiesDriveItemTypesEquals".GetLocalizedResource(), List.First().ItemType);
44+
ViewModel.ItemType = string.Format(Strings.PropertiesDriveItemTypesEquals.GetLocalizedResource(), List.First().ItemType);
4545
}
4646
else
4747
{
48-
ViewModel.ItemType = "PropertiesDriveItemTypeDifferent".GetLocalizedResource();
48+
ViewModel.ItemType = Strings.PropertiesDriveItemTypeDifferent.GetLocalizedResource();
4949
}
5050

5151
var itemsPath = List.Select(Item => (Item as RecycleBinItem)?.ItemOriginalFolder ??
5252
(Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath));
5353

5454
if (itemsPath.Distinct().Count() == 1)
55-
ViewModel.ItemLocation = string.Format("PropertiesCombinedItemLocation".GetLocalizedResource(), itemsPath.First());
55+
ViewModel.ItemLocation = string.Format(Strings.PropertiesCombinedItemLocation.GetLocalizedResource(), itemsPath.First());
5656
}
5757
}
5858

0 commit comments

Comments
 (0)