1
0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-01-01 18:23:32 +00:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Robert
ff2e57aeaa Device properties - We can do a bit better with UX than that :P 2024-03-30 20:40:24 +01:00
Robert
f152812064 Device properties - Show layout error state 2024-03-30 20:28:01 +01:00
3 changed files with 115 additions and 93 deletions

View File

@ -7,6 +7,7 @@ public class LayoutSelection : CorePropertyChanged
{ {
private string? _type; private string? _type;
private string? _parameter; private string? _parameter;
private string? _errorState;
/// <summary> /// <summary>
/// Gets or sets what kind of layout reference this is. /// Gets or sets what kind of layout reference this is.
@ -25,4 +26,13 @@ public class LayoutSelection : CorePropertyChanged
get => _parameter; get => _parameter;
set => SetAndNotify(ref _parameter, value); set => SetAndNotify(ref _parameter, value);
} }
/// <summary>
/// Gets or sets the error state of the layout reference.
/// </summary>
public string? ErrorState
{
get => _errorState;
set => SetAndNotify(ref _errorState, value);
}
} }

View File

@ -184,13 +184,14 @@ internal class DeviceService : IDeviceService
device.ApplyLayout(null, false, false); device.ApplyLayout(null, false, false);
else else
provider?.ApplyLayout(device, layout); provider?.ApplyLayout(device, layout);
UpdateLeds();
} }
catch (Exception e) catch (Exception e)
{ {
device.LayoutSelection.ErrorState = e.Message;
_logger.Error(e, "Failed to apply device layout"); _logger.Error(e, "Failed to apply device layout");
} }
UpdateLeds();
} }
/// <inheritdoc /> /// <inheritdoc />

View File

@ -9,7 +9,16 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
x:Class="Artemis.UI.Screens.Device.Layout.DeviceLayoutTabView" x:Class="Artemis.UI.Screens.Device.Layout.DeviceLayoutTabView"
x:DataType="layout:DeviceLayoutTabViewModel"> x:DataType="layout:DeviceLayoutTabViewModel">
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"> <Grid RowDefinitions="Auto,*">
<controls:InfoBar Grid.Row="0"
Title="Failed to apply layout"
IsOpen="{CompiledBinding Device.LayoutSelection.ErrorState, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
Message="{CompiledBinding Device.LayoutSelection.ErrorState}"
Severity="Error"
IsClosable="False"
Margin="5 0"/>
<ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<Border Classes="card" Margin="5"> <Border Classes="card" Margin="5">
<Grid RowDefinitions="*,Auto"> <Grid RowDefinitions="*,Auto">
<StackPanel Grid.Row="0"> <StackPanel Grid.Row="0">
@ -105,4 +114,6 @@
</Grid> </Grid>
</Border> </Border>
</ScrollViewer> </ScrollViewer>
</Grid>
</UserControl> </UserControl>