Skip to content

Commit d114a46

Browse files
LamparterLamparter
committed
Files.App.Data
1 parent 383d82c commit d114a46

11 files changed

+84
-84
lines changed

‎src/Files.App/Data/Commands/HotKey/HotKey.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ private static string GetLocalizedKey(string key)
365365

366366
private static string GetLocalizedNumPadKey(string key)
367367
{
368-
return "NumPadTypeName".GetLocalizedResource() + " " + key;
368+
return Strings.NumPadTypeName.GetLocalizedResource() + " " + key;
369369
}
370370

371371
private static string GetKeyCharacter(Forms.Keys key)

‎src/Files.App/Data/Factories/AppThemeResourcesFactory.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,102 +10,102 @@ public static class AppThemeResourceFactory
1010
new AppThemeResourceItem
1111
{
1212
BackgroundColor = "#00000000", /* Transparent */
13-
Name = "Default".GetLocalizedResource()
13+
Name = Strings.Default.GetLocalizedResource()
1414
},
1515
new AppThemeResourceItem
1616
{
1717
BackgroundColor = "#32FFB900", /* #FFB900 */
18-
Name = "YellowGold".GetLocalizedResource()
18+
Name = Strings.YellowGold.GetLocalizedResource()
1919
},
2020
new AppThemeResourceItem
2121
{
2222
BackgroundColor = "#32F7630C", /* #F7630C */
23-
Name = "OrangeBright".GetLocalizedResource()
23+
Name = Strings.OrangeBright.GetLocalizedResource()
2424
},
2525
new AppThemeResourceItem
2626
{
2727
BackgroundColor = "#32D13438", /* #D13438 */
28-
Name = "BrickRed".GetLocalizedResource()
28+
Name = Strings.BrickRed.GetLocalizedResource()
2929
},
3030
new AppThemeResourceItem
3131
{
3232
BackgroundColor = "#32FF4343", /* #FF4343 */
33-
Name = "ModRed".GetLocalizedResource()
33+
Name = Strings.ModRed.GetLocalizedResource()
3434
},
3535
new AppThemeResourceItem
3636
{
3737
BackgroundColor = "#32EA005E", /* #EA005E */
38-
Name = "Red".GetLocalizedResource()
38+
Name = Strings.Red.GetLocalizedResource()
3939
},
4040
new AppThemeResourceItem
4141
{
4242
BackgroundColor = "#32EA005E", /* #EA005E */
43-
Name = "RoseBright".GetLocalizedResource()
43+
Name = Strings.RoseBright.GetLocalizedResource()
4444
},
4545
new AppThemeResourceItem
4646
{
4747
BackgroundColor = "#320078D7", /* #0078D7 */
48-
Name = "Blue".GetLocalizedResource()
48+
Name = Strings.Blue.GetLocalizedResource()
4949
},
5050
new AppThemeResourceItem
5151
{
5252
BackgroundColor = "#328764B8", /* #8764B8 */
53-
Name = "IrisPastel".GetLocalizedResource()
53+
Name = Strings.IrisPastel.GetLocalizedResource()
5454
},
5555
new AppThemeResourceItem
5656
{
5757
BackgroundColor = "#32B146C2", /* #B146C2 */
58-
Name = "VioletRedLight".GetLocalizedResource()
58+
Name = Strings.VioletRedLight.GetLocalizedResource()
5959
},
6060
new AppThemeResourceItem
6161
{
6262
BackgroundColor = "#320099BC", /* #0099BC */
63-
Name = "CoolBlueBright".GetLocalizedResource()
63+
Name = Strings.CoolBlueBright.GetLocalizedResource()
6464
},
6565
new AppThemeResourceItem
6666
{
6767
BackgroundColor = "#3200B7C3", /* #00B7C3 */
68-
Name = "Seafoam".GetLocalizedResource()
68+
Name = Strings.Seafoam.GetLocalizedResource()
6969
},
7070
new AppThemeResourceItem
7171
{
7272
BackgroundColor = "#3200B294", /* #00B294 */
73-
Name = "MintLight".GetLocalizedResource()
73+
Name = Strings.MintLight.GetLocalizedResource()
7474
},
7575
new AppThemeResourceItem
7676
{
7777
BackgroundColor = "#327A7574", /* #7A7574 */
78-
Name = "Gray".GetLocalizedResource()
78+
Name = Strings.Gray.GetLocalizedResource()
7979
},
8080
new AppThemeResourceItem
8181
{
8282
BackgroundColor = "#32107C10", /* #107C10 */
83-
Name = "Green".GetLocalizedResource()
83+
Name = Strings.Green.GetLocalizedResource()
8484
},
8585
new AppThemeResourceItem
8686
{
8787
BackgroundColor = "#32767676", /* #767676 */
88-
Name = "Overcast".GetLocalizedResource()
88+
Name = Strings.Overcast.GetLocalizedResource()
8989
},
9090
new AppThemeResourceItem
9191
{
9292
BackgroundColor = "#324C4A48", /* #4C4A48 */
93-
Name = "Storm".GetLocalizedResource()
93+
Name = Strings.Storm.GetLocalizedResource()
9494
},
9595
new AppThemeResourceItem
9696
{
9797
BackgroundColor = "#3269797E", /* #69797E */
98-
Name = "BlueGray".GetLocalizedResource()
98+
Name = Strings.BlueGray.GetLocalizedResource()
9999
},
100100
new AppThemeResourceItem
101101
{
102102
BackgroundColor = "#324A5459", /* #4A5459 */
103-
Name = "GrayDark".GetLocalizedResource()
103+
Name = Strings.GrayDark.GetLocalizedResource()
104104
},
105105
new AppThemeResourceItem
106106
{
107107
BackgroundColor = "#327E735F", /* #7E735F */
108-
Name = "Camouflage".GetLocalizedResource()
108+
Name = Strings.Camouflage.GetLocalizedResource()
109109
}
110110
];
111111
}

‎src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,49 @@ public static ObservableCollection<NavigationViewItemButtonStyleItem> Initialize
1515

1616
var generalItem = new NavigationViewItemButtonStyleItem()
1717
{
18-
Name = "General".GetLocalizedResource(),
18+
Name = Strings.General.GetLocalizedResource(),
1919
ItemType = PropertiesNavigationViewItemType.General,
2020
ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.General"],
2121
};
2222
var securityItem = new NavigationViewItemButtonStyleItem()
2323
{
24-
Name = "Security".GetLocalizedResource(),
24+
Name = Strings.Security.GetLocalizedResource(),
2525
ItemType = PropertiesNavigationViewItemType.Security,
2626
ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Security"],
2727
};
2828
var hashesItem = new NavigationViewItemButtonStyleItem()
2929
{
30-
Name = "Hashes".GetLocalizedResource(),
30+
Name = Strings.Hashes.GetLocalizedResource(),
3131
ItemType = PropertiesNavigationViewItemType.Hashes,
3232
ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Hashes"],
3333
};
3434
var shortcutItem = new NavigationViewItemButtonStyleItem()
3535
{
36-
Name = "Shortcut".GetLocalizedResource(),
36+
Name = Strings.Shortcut.GetLocalizedResource(),
3737
ItemType = PropertiesNavigationViewItemType.Shortcut,
3838
ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Shortcut"],
3939
};
4040
var libraryItem = new NavigationViewItemButtonStyleItem()
4141
{
42-
Name = "Library".GetLocalizedResource(),
42+
Name = Strings.Library.GetLocalizedResource(),
4343
ItemType = PropertiesNavigationViewItemType.Library,
4444
ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Library"],
4545
};
4646
var detailsItem = new NavigationViewItemButtonStyleItem()
4747
{
48-
Name = "Details".GetLocalizedResource(),
48+
Name = Strings.Details.GetLocalizedResource(),
4949
ItemType = PropertiesNavigationViewItemType.Details,
5050
ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Info"],
5151
};
5252
var customizationItem = new NavigationViewItemButtonStyleItem()
5353
{
54-
Name = "Customization".GetLocalizedResource(),
54+
Name = Strings.Customization.GetLocalizedResource(),
5555
ItemType = PropertiesNavigationViewItemType.Customization,
5656
ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.CustomizeFolder"],
5757
};
5858
var compatibilityItem = new NavigationViewItemButtonStyleItem()
5959
{
60-
Name = "Compatibility".GetLocalizedResource(),
60+
Name = Strings.Compatibility.GetLocalizedResource(),
6161
ItemType = PropertiesNavigationViewItemType.Compatibility,
6262
ThemedIconStyle = (Style)Application.Current.Resources["App.ThemedIcons.Properties.Compatability"],
6363
};

‎src/Files.App/Data/Factories/SecurityAdvancedAccessControlItemFactory.cs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,109 +28,109 @@ public static ObservableCollection<AccessMaskItem> Initialize(AccessControlEntry
2828
new(current)
2929
{
3030
AccessMask = AccessMaskFlags.FullControl,
31-
AccessMaskName = "SecurityFullControlLabel/Text".GetLocalizedResource(),
31+
AccessMaskName = Strings.SecurityFullControlLabel_Text.GetLocalizedResource(),
3232
IsEditable = !isInherited
3333
},
3434
new(current)
3535
{
3636
AccessMask = AccessMaskFlags.Traverse,
37-
AccessMaskName = "SecurityTraverseLabel/Text".GetLocalizedResource(),
37+
AccessMaskName = Strings.SecurityTraverseLabel_Text.GetLocalizedResource(),
3838
IsEditable = !isInherited
3939
},
4040
new(current)
4141
{
4242
AccessMask = AccessMaskFlags.ExecuteFile,
43-
AccessMaskName = "SecurityExecuteFileLabel/Text".GetLocalizedResource(),
43+
AccessMaskName = Strings.SecurityExecuteFileLabel_Text.GetLocalizedResource(),
4444
IsEditable = !isInherited
4545
},
4646
new(current)
4747
{
4848
AccessMask = AccessMaskFlags.ListDirectory,
49-
AccessMaskName = "SecurityListDirectoryLabel/Text".GetLocalizedResource(),
49+
AccessMaskName = Strings.SecurityListDirectoryLabel_Text.GetLocalizedResource(),
5050
IsEditable = !isInherited
5151
},
5252
new(current)
5353
{
5454
AccessMask = AccessMaskFlags.ReadData,
55-
AccessMaskName = "SecurityReadDataLabel/Text".GetLocalizedResource(),
55+
AccessMaskName = Strings.SecurityReadDataLabel_Text.GetLocalizedResource(),
5656
IsEditable = !isInherited
5757
},
5858
new(current)
5959
{
6060
AccessMask = AccessMaskFlags.ReadAttributes,
61-
AccessMaskName = "SecurityReadAttributesLabel/Text".GetLocalizedResource(),
61+
AccessMaskName = Strings.SecurityReadAttributesLabel_Text.GetLocalizedResource(),
6262
IsEditable = !isInherited
6363
},
6464
new(current)
6565
{
6666
AccessMask = AccessMaskFlags.ReadExtendedAttributes,
67-
AccessMaskName = "SecurityReadExtendedAttributesLabel/Text".GetLocalizedResource(),
67+
AccessMaskName = Strings.SecurityReadExtendedAttributesLabel_Text.GetLocalizedResource(),
6868
IsEditable = !isInherited
6969
},
7070
new(current)
7171
{
7272
AccessMask = AccessMaskFlags.CreateFiles,
73-
AccessMaskName = "SecurityCreateFilesLabel/Text".GetLocalizedResource(),
73+
AccessMaskName = Strings.SecurityCreateFilesLabel_Text.GetLocalizedResource(),
7474
IsEditable = !isInherited
7575
},
7676
new(current)
7777
{
7878
AccessMask = AccessMaskFlags.CreateDirectories,
79-
AccessMaskName = "SecurityCreateDirectoriesLabel/Text".GetLocalizedResource(),
79+
AccessMaskName = Strings.SecurityCreateDirectoriesLabel_Text.GetLocalizedResource(),
8080
IsEditable = !isInherited
8181
},
8282
new(current)
8383
{
8484
AccessMask = AccessMaskFlags.WriteData,
85-
AccessMaskName = "SecurityWriteDataLabel/Text".GetLocalizedResource(),
85+
AccessMaskName = Strings.SecurityWriteDataLabel_Text.GetLocalizedResource(),
8686
IsEditable = !isInherited
8787
},
8888
new(current)
8989
{
9090
AccessMask = AccessMaskFlags.AppendData,
91-
AccessMaskName = "SecurityAppendDataLabel/Text".GetLocalizedResource(),
91+
AccessMaskName = Strings.SecurityAppendDataLabel_Text.GetLocalizedResource(),
9292
IsEditable = !isInherited
9393
},
9494
new(current)
9595
{
9696
AccessMask = AccessMaskFlags.WriteAttributes,
97-
AccessMaskName = "SecurityWriteAttributesLabel/Text".GetLocalizedResource(),
97+
AccessMaskName = Strings.SecurityWriteAttributesLabel_Text.GetLocalizedResource(),
9898
IsEditable = !isInherited
9999
},
100100
new(current)
101101
{
102102
AccessMask = AccessMaskFlags.WriteExtendedAttributes,
103-
AccessMaskName = "SecurityWriteExtendedAttributesLabel/Text".GetLocalizedResource(),
103+
AccessMaskName = Strings.SecurityWriteExtendedAttributesLabel_Text.GetLocalizedResource(),
104104
IsEditable = !isInherited
105105
},
106106
new(current)
107107
{
108108
AccessMask = AccessMaskFlags.DeleteSubdirectoriesAndFiles,
109-
AccessMaskName = "SecurityDeleteSubdirectoriesAndFilesLabel/Text".GetLocalizedResource(),
109+
AccessMaskName = Strings.SecurityDeleteSubdirectoriesAndFilesLabel_Text.GetLocalizedResource(),
110110
IsEditable = !isInherited
111111
},
112112
new(current)
113113
{
114114
AccessMask = AccessMaskFlags.Delete,
115-
AccessMaskName = "Delete".GetLocalizedResource(),
115+
AccessMaskName = Strings.Delete.GetLocalizedResource(),
116116
IsEditable = !isInherited
117117
},
118118
new(current)
119119
{
120120
AccessMask = AccessMaskFlags.ReadPermissions,
121-
AccessMaskName = "SecurityReadPermissionsLabel/Text".GetLocalizedResource(),
121+
AccessMaskName = Strings.SecurityReadPermissionsLabel_Text.GetLocalizedResource(),
122122
IsEditable = !isInherited
123123
},
124124
new(current)
125125
{
126126
AccessMask = AccessMaskFlags.ChangePermissions,
127-
AccessMaskName = "SecurityChangePermissionsLabel/Text".GetLocalizedResource(),
127+
AccessMaskName = Strings.SecurityChangePermissionsLabel_Text.GetLocalizedResource(),
128128
IsEditable = !isInherited
129129
},
130130
new(current)
131131
{
132132
AccessMask = AccessMaskFlags.TakeOwnership,
133-
AccessMaskName = "SecurityTakeOwnershipLabel/Text".GetLocalizedResource(),
133+
AccessMaskName = Strings.SecurityTakeOwnershipLabel_Text.GetLocalizedResource(),
134134
IsEditable = !isInherited
135135
}
136136
];
@@ -160,42 +160,42 @@ public static ObservableCollection<AccessMaskItem> Initialize(AccessControlEntry
160160
new(current)
161161
{
162162
AccessMask = AccessMaskFlags.FullControl,
163-
AccessMaskName = "SecurityFullControlLabel/Text".GetLocalizedResource(),
163+
AccessMaskName = Strings.SecurityFullControlLabel_Text.GetLocalizedResource(),
164164
IsEditable = !isInherited
165165
},
166166
new(current)
167167
{
168168
AccessMask = AccessMaskFlags.Modify,
169-
AccessMaskName = "Modify".GetLocalizedResource(),
169+
AccessMaskName = Strings.Modify.GetLocalizedResource(),
170170
IsEditable = !isInherited
171171
},
172172
new(current)
173173
{
174174
AccessMask = AccessMaskFlags.ReadAndExecute,
175-
AccessMaskName = "SecurityReadAndExecuteLabel/Text".GetLocalizedResource(),
175+
AccessMaskName = Strings.SecurityReadAndExecuteLabel_Text.GetLocalizedResource(),
176176
IsEditable = !isInherited
177177
},
178178
new(current)
179179
{
180180
AccessMask = AccessMaskFlags.ListDirectory,
181-
AccessMaskName = "SecurityListDirectoryLabel/Text".GetLocalizedResource(),
181+
AccessMaskName = Strings.SecurityListDirectoryLabel_Text.GetLocalizedResource(),
182182
IsEditable = !isInherited
183183
},
184184
new(current)
185185
{
186186
AccessMask = AccessMaskFlags.Read,
187-
AccessMaskName = "SecurityReadLabel/Text".GetLocalizedResource(),
187+
AccessMaskName = Strings.SecurityReadLabel_Text.GetLocalizedResource(),
188188
IsEditable = !isInherited
189189
},
190190
new(current)
191191
{
192192
AccessMask = AccessMaskFlags.Write,
193-
AccessMaskName = "Write".GetLocalizedResource(),
193+
AccessMaskName = Strings.Write.GetLocalizedResource(),
194194
IsEditable = !isInherited
195195
},
196196
new(current, false)
197197
{
198-
AccessMaskName = "SecuritySpecialLabel/Text".GetLocalizedResource()
198+
AccessMaskName = Strings.SecuritySpecialLabel_Text.GetLocalizedResource()
199199
}
200200
];
201201

‎src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private static void LoadMenuFlyoutItem(
8888
{
8989
var menuLayoutSubItem = new ContextMenuFlyoutItemViewModel()
9090
{
91-
Text = "ShowMoreOptions".GetLocalizedResource(),
91+
Text = Strings.ShowMoreOptions.GetLocalizedResource(),
9292
Glyph = "\xE712",
9393
};
9494
LoadMenuFlyoutItem(menuLayoutSubItem.Items, contextMenu, overflowItems, cancellationToken, showIcons);
@@ -335,7 +335,7 @@ x.Tag is Win32ContextMenuItem menuItem &&
335335
overflowItem.Visibility = overflowItems?.Any() ?? false ? Visibility.Visible : Visibility.Collapsed;
336336
overflowSeparator.Visibility = overflowItems?.Any() ?? false ? Visibility.Visible : Visibility.Collapsed;
337337

338-
overflowItem.Label = "ShowMoreOptions".GetLocalizedResource();
338+
overflowItem.Label = Strings.ShowMoreOptions.GetLocalizedResource();
339339
overflowItem.IsEnabled = true;
340340
}
341341

0 commit comments

Comments
 (0)