DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Linux - Fixed invalid culture when picking layout

Browse Source
This commit is contained in:
Diogo Trindade 2022-07-29 17:04:13 +01:00
parent 5d6208f852
commit d91fc93ff2
5 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Artemis.UI.Linux/App.axaml.cs
View File

@ -38,7 +38,14 @@ namespace Artemis.UI.Linux
private void RegisterProviders()
{
IInputService inputService = _kernel.Get<IInputService>();
// inputService.AddInputProvider(_kernel.Get<LinuxInputProvider>());
try
{
inputService.AddInputProvider(_kernel.Get<LinuxInputProvider>());
}
catch
{
//TODO: handle not having permissions for the input file.
}
}
}
}

5
src/Artemis.UI.Shared/packages.lock.json
View File

@ -1621,7 +1621,10 @@
"Unosquare.Swan.Lite": {
"type": "Transitive",
"resolved": "3.0.0",
"contentHash": "noPwJJl1Q9uparXy1ogtkmyAPGNfSGb0BLT1292nFH1jdMKje6o2kvvrQUvF9Xklj+IoiAI0UzF6Aqxlvo10lw=="
"contentHash": "noPwJJl1Q9uparXy1ogtkmyAPGNfSGb0BLT1292nFH1jdMKje6o2kvvrQUvF9Xklj+IoiAI0UzF6Aqxlvo10lw==",
"dependencies": {
"System.ValueTuple": "4.5.0"
}
},
"artemis.core": {
"type": "Project",

5
src/Artemis.UI/Screens/Device/Tabs/DeviceLogicalLayoutDialogViewModel.cs
View File

@ -25,7 +25,10 @@ public class DeviceLogicalLayoutDialogViewModel : ContentDialogViewModelBase
Device = device;
ApplyLogicalLayout = ReactiveCommand.Create(ExecuteApplyLogicalLayout, this.WhenAnyValue(vm => vm.SelectedRegion).Select(r => r != null));
Regions = new ObservableCollection<RegionInfo>(CultureInfo.GetCultures(CultureTypes.SpecificCultures)
.Where(c => c.LCID != LOCALE_INVARIANT && c.LCID != LOCALE_NEUTRAL && c.LCID != LOCALE_CUSTOM_DEFAULT)
.Where(c => c.LCID != LOCALE_INVARIANT &&
c.LCID != LOCALE_NEUTRAL &&
c.LCID != LOCALE_CUSTOM_DEFAULT &&
!c.CultureTypes.HasFlag(CultureTypes.UserCustomCulture))
.Select(c => new RegionInfo(c.LCID))
.GroupBy(r => r.EnglishName)
.Select(g => g.First())

5
src/Artemis.UI/packages.lock.json
View File

@ -1680,7 +1680,10 @@
"Unosquare.Swan.Lite": {
"type": "Transitive",
"resolved": "3.0.0",
"contentHash": "noPwJJl1Q9uparXy1ogtkmyAPGNfSGb0BLT1292nFH1jdMKje6o2kvvrQUvF9Xklj+IoiAI0UzF6Aqxlvo10lw=="
"contentHash": "noPwJJl1Q9uparXy1ogtkmyAPGNfSGb0BLT1292nFH1jdMKje6o2kvvrQUvF9Xklj+IoiAI0UzF6Aqxlvo10lw==",
"dependencies": {
"System.ValueTuple": "4.5.0"
}
},
"artemis.core": {
"type": "Project",

5
src/Artemis.VisualScripting/packages.lock.json
View File

@ -1631,7 +1631,10 @@
"Unosquare.Swan.Lite": {
"type": "Transitive",
"resolved": "3.0.0",
"contentHash": "noPwJJl1Q9uparXy1ogtkmyAPGNfSGb0BLT1292nFH1jdMKje6o2kvvrQUvF9Xklj+IoiAI0UzF6Aqxlvo10lw=="
"contentHash": "noPwJJl1Q9uparXy1ogtkmyAPGNfSGb0BLT1292nFH1jdMKje6o2kvvrQUvF9Xklj+IoiAI0UzF6Aqxlvo10lw==",
"dependencies": {
"System.ValueTuple": "4.5.0"
}
},
"artemis.core": {
"type": "Project",