DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 03:48:56 +00:00
Code Issues Releases Wiki Activity

Profiles - Only set imports as changed if they actually had real changes

Browse Source 
Default layouts - Added default keyboard and headset layouts
This commit is contained in:
Robert committed 2021-05-18 16:59:58 +02:00
1 parent 9168ac2823
commit f1eefe0761
145 files changed
+5874 -92
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/Settings/Device/DeviceDialogViewModel.cs
+2 -2
View File
@@ -46,7 +46,7 @@ namespace Artemis.UI.Screens.Settings.Device
SelectedLeds = new BindableCollection<ArtemisLed>();
Items.Add(factory.DevicePropertiesTabViewModel(device));
if (device.RgbDevice.DeviceInfo.DeviceType == RGBDeviceType.Keyboard)
if (device.DeviceType == RGBDeviceType.Keyboard)
Items.Add(factory.InputMappingsTabViewModel(device));
Items.Add(factory.DeviceInfoTabViewModel(device));
Items.Add(factory.DeviceLedsTabViewModel(device));
@@ -178,7 +178,7 @@ namespace Artemis.UI.Screens.Settings.Device
string directory = Path.Combine(
dialog.SelectedPath,
Device.RgbDevice.DeviceInfo.Manufacturer,
Device.RgbDevice.DeviceInfo.DeviceType.ToString()
Device.DeviceType.ToString()
);
string filePath = Path.Combine(directory, Device.GetLayoutFileName());
Core.Utilities.CreateAccessibleDirectory(directory);
src/Artemis.UI/Screens/Settings/Device/Tabs/DeviceInfoTabView.xaml
+1 -1
View File
@@ -40,7 +40,7 @@
<TextBlock Style="{StaticResource MaterialDesignTextBlock}"
Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}"
TextWrapping="Wrap"
Text="{Binding Device.RgbDevice.DeviceInfo.DeviceType}" />
Text="{Binding Device.DeviceType}" />
<Separator Style="{StaticResource MaterialDesignSeparator}" Margin="0 5" />
<StackPanel Visibility="{Binding IsKeyboard, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}">
src/Artemis.UI/Screens/Settings/Device/Tabs/DeviceInfoTabViewModel.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace Artemis.UI.Screens.Settings.Device.Tabs
DisplayName = "INFO";
}
public bool IsKeyboard => Device.RgbDevice.DeviceInfo.DeviceType == RGBDeviceType.Keyboard;
public bool IsKeyboard => Device.DeviceType == RGBDeviceType.Keyboard;
public ArtemisDevice Device { get; }
public string DefaultLayoutPath
src/Artemis.UI/Screens/Settings/Device/Tabs/InputMappingsTabViewModel.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace Artemis.UI.Screens.Settings.Device.Tabs
public InputMappingsTabViewModel(ArtemisDevice device, IRgbService rgbService, IInputService inputService)
{
if (device.RgbDevice.DeviceInfo.DeviceType != RGBDeviceType.Keyboard)
if (device.DeviceType != RGBDeviceType.Keyboard)
throw new ArtemisUIException("The input mappings tab only supports keyboards");
_rgbService = rgbService;
_inputService = inputService;
src/Artemis.UI/Screens/Settings/Tabs/Devices/DeviceSettingsView.xaml
+1 -1
View File
@@ -50,7 +50,7 @@
<TextBlock TextWrapping="Wrap" Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
<Run Text="{Binding Device.RgbDevice.DeviceInfo.Manufacturer, Mode=OneWay}" />
-
<Run Text="{Binding Device.RgbDevice.DeviceInfo.DeviceType, Mode=OneWay}" />
<Run Text="{Binding Device.DeviceType, Mode=OneWay}" />
</TextBlock>
</StackPanel>
<StackPanel HorizontalAlignment="Right" Grid.Row="2" Orientation="Horizontal" Margin="8">
src/Artemis.UI/Screens/Settings/Tabs/Devices/DeviceSettingsViewModel.cs
+3 -3
View File
@@ -35,7 +35,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Devices
_rgbService = rgbService;
Device = device;
Type = Device.RgbDevice.DeviceInfo.DeviceType.ToString().Humanize();
Type = Device.DeviceType.ToString().Humanize();
Name = Device.RgbDevice.DeviceInfo.Model;
Manufacturer = Device.RgbDevice.DeviceInfo.Manufacturer;
}
@@ -46,8 +46,8 @@ namespace Artemis.UI.Screens.Settings.Tabs.Devices
public string Name { get; }
public string Manufacturer { get; }
public bool CanDetectInput => Device.RgbDevice.DeviceInfo.DeviceType == RGBDeviceType.Keyboard ||
Device.RgbDevice.DeviceInfo.DeviceType == RGBDeviceType.Mouse;
public bool CanDetectInput => Device.DeviceType == RGBDeviceType.Keyboard ||
Device.DeviceType == RGBDeviceType.Mouse;
public bool IsDeviceEnabled
{