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

Merge branch 'development' into feature/releases

Browse Source
This commit is contained in:
Robert 2024-03-30 20:46:09 +01:00
commit 7030c7af2a
6 changed files with 151 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Artemis.Core/Models/Surface/LayoutSelection.cs
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);
}
} }

5
src/Artemis.Core/Services/DeviceService.cs
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 />

193
src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLayoutTabView.axaml
View File

@ -9,100 +9,111 @@
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,*">
<Border Classes="card" Margin="5"> <controls:InfoBar Grid.Row="0"
<Grid RowDefinitions="*,Auto"> Title="Failed to apply layout"
<StackPanel Grid.Row="0"> IsOpen="{CompiledBinding Device.LayoutSelection.ErrorState, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto"> Message="{CompiledBinding Device.LayoutSelection.ErrorState}"
<StackPanel Grid.Row="0" Grid.Column="0"> Severity="Error"
<TextBlock Text="Default layout file path" /> IsClosable="False"
<TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding DefaultLayoutPath}" /> Margin="5 0"/>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
<Button
Classes="icon-button"
HorizontalAlignment="Right"
IsEnabled="{CompiledBinding !!DefaultLayoutPath}"
ToolTip.Tip="Copy layout file path to clipboard"
Click="LayoutPathButton_OnClick">
<avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
</Button>
</StackPanel>
</Grid>
<Border Classes="card-separator" /> <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto"> <Border Classes="card" Margin="5">
<StackPanel Grid.Row="1" Grid.Column="0"> <Grid RowDefinitions="*,Auto">
<TextBlock Text="Image file path" /> <StackPanel Grid.Row="0">
<TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding ImagePath, TargetNullValue=None}" /> <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
</StackPanel> <StackPanel Grid.Row="0" Grid.Column="0">
<StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"> <TextBlock Text="Default layout file path" />
<Button <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding DefaultLayoutPath}" />
Classes="icon-button" </StackPanel>
HorizontalAlignment="Right" <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
IsEnabled="{CompiledBinding !!ImagePath}" <Button
ToolTip.Tip="Copy image file path to clipboard" Classes="icon-button"
Click="ImagePathButton_OnClick"> HorizontalAlignment="Right"
<avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" /> IsEnabled="{CompiledBinding !!DefaultLayoutPath}"
</Button> ToolTip.Tip="Copy layout file path to clipboard"
</StackPanel> Click="LayoutPathButton_OnClick">
</Grid> <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
</Button>
</StackPanel>
</Grid>
<Border Classes="card-separator" /> <Border Classes="card-separator" />
<Grid RowDefinitions="*,*,*" ColumnDefinitions="*,Auto"> <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
<StackPanel Grid.Row="1" Grid.Column="0"> <StackPanel Grid.Row="1" Grid.Column="0">
<TextBlock Text="Layout provider" /> <TextBlock Text="Image file path" />
<TextBlock Classes="subtitle" FontSize="12" Text="Choose between different ways to load a layout for this device." /> <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding ImagePath, TargetNullValue=None}" />
</StackPanel> </StackPanel>
<StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"> <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center">
<StackPanel.Styles> <Button
<Style Selector="ComboBox.layoutProvider /template/ ContentControl#ContentPresenter"> Classes="icon-button"
<Setter Property="ContentTemplate"> HorizontalAlignment="Right"
<Setter.Value> IsEnabled="{CompiledBinding !!ImagePath}"
<DataTemplate x:DataType="layoutProviders:ILayoutProviderViewModel"> ToolTip.Tip="Copy image file path to clipboard"
Click="ImagePathButton_OnClick">
<avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
</Button>
</StackPanel>
</Grid>
<Border Classes="card-separator" />
<Grid RowDefinitions="*,*,*" ColumnDefinitions="*,Auto">
<StackPanel Grid.Row="1" Grid.Column="0">
<TextBlock Text="Layout provider" />
<TextBlock Classes="subtitle" FontSize="12" Text="Choose between different ways to load a layout for this device." />
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center">
<StackPanel.Styles>
<Style Selector="ComboBox.layoutProvider /template/ ContentControl#ContentPresenter">
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate x:DataType="layoutProviders:ILayoutProviderViewModel">
<TextBlock Text="{CompiledBinding Name}" TextWrapping="Wrap" MaxWidth="350" />
</DataTemplate>
</Setter.Value>
</Setter>
</Style>
</StackPanel.Styles>
<ComboBox Classes="layoutProvider"
Width="150"
SelectedItem="{CompiledBinding SelectedLayoutProvider}"
ItemsSource="{CompiledBinding LayoutProviders}">
<ComboBox.ItemTemplate>
<DataTemplate x:DataType="layoutProviders:ILayoutProviderViewModel">
<StackPanel>
<TextBlock Text="{CompiledBinding Name}" TextWrapping="Wrap" MaxWidth="350" /> <TextBlock Text="{CompiledBinding Name}" TextWrapping="Wrap" MaxWidth="350" />
</DataTemplate> <TextBlock Classes="subtitle" Text="{CompiledBinding Description}" TextWrapping="Wrap" MaxWidth="350" />
</Setter.Value> </StackPanel>
</Setter> </DataTemplate>
</Style> </ComboBox.ItemTemplate>
</StackPanel.Styles> </ComboBox>
<ComboBox Classes="layoutProvider" </StackPanel>
Width="150" </Grid>
SelectedItem="{CompiledBinding SelectedLayoutProvider}"
ItemsSource="{CompiledBinding LayoutProviders}">
<ComboBox.ItemTemplate>
<DataTemplate x:DataType="layoutProviders:ILayoutProviderViewModel">
<StackPanel>
<TextBlock Text="{CompiledBinding Name}" TextWrapping="Wrap" MaxWidth="350" />
<TextBlock Classes="subtitle" Text="{CompiledBinding Description}" TextWrapping="Wrap" MaxWidth="350" />
</StackPanel>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</StackPanel>
</Grid>
<ContentControl Content="{CompiledBinding SelectedLayoutProvider}" ClipToBounds="False" /> <ContentControl Content="{CompiledBinding SelectedLayoutProvider}" ClipToBounds="False" />
<Border Classes="card-separator" />
<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
<StackPanel Grid.Row="1" Grid.Column="0">
<TextBlock Text="Export current layout" />
<TextBlock Classes="subtitle" FontSize="12" Text="If there is a layout used, export that. Otherwise, export the LEDs present." />
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
<Button HorizontalAlignment="Right" Content="Export" Command="{CompiledBinding ExportLayout}" />
</StackPanel>
</Grid>
</StackPanel>
<controls:HyperlinkButton
Grid.Row="1"
Content="Learn more about layouts on the wiki"
NavigateUri="https://wiki.artemis-rgb.com/en/guides/developer/layouts?mtm_campaign=artemis&amp;mtm_kwd=device-properties"
Margin="0 20"
HorizontalAlignment="Right"
VerticalAlignment="Bottom" />
</Grid>
</Border>
</ScrollViewer>
</Grid>
<Border Classes="card-separator" />
<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
<StackPanel Grid.Row="1" Grid.Column="0">
<TextBlock Text="Export current layout" />
<TextBlock Classes="subtitle" FontSize="12" Text="If there is a layout used, export that. Otherwise, export the LEDs present." />
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
<Button HorizontalAlignment="Right" Content="Export" Command="{CompiledBinding ExportLayout}" />
</StackPanel>
</Grid>
</StackPanel>
<controls:HyperlinkButton
Grid.Row="1"
Content="Learn more about layouts on the wiki"
NavigateUri="https://wiki.artemis-rgb.com/en/guides/developer/layouts?mtm_campaign=artemis&amp;mtm_kwd=device-properties"
Margin="0 20"
HorizontalAlignment="Right"
VerticalAlignment="Bottom" />
</Grid>
</Border>
</ScrollViewer>
</UserControl> </UserControl>

24
src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs
View File

@ -34,7 +34,7 @@ public abstract partial class TreeItemViewModel : ActivatableViewModelBase
private RenderProfileElement? _currentProfileElement; private RenderProfileElement? _currentProfileElement;
private ObservableAsPropertyHelper<bool>? _isFocused; private ObservableAsPropertyHelper<bool>? _isFocused;
private TimeSpan _time; private TimeSpan _time;
[Notify] private bool _canPaste; [Notify] private bool _canPaste;
[Notify] private bool _isExpanded; [Notify] private bool _isExpanded;
[Notify] private bool _isFlyoutOpen; [Notify] private bool _isFlyoutOpen;
@ -100,7 +100,7 @@ public abstract partial class TreeItemViewModel : ActivatableViewModelBase
public ReactiveCommand<Unit, Unit> Paste { get; } public ReactiveCommand<Unit, Unit> Paste { get; }
public ReactiveCommand<Unit, Unit> Delete { get; } public ReactiveCommand<Unit, Unit> Delete { get; }
public abstract bool SupportsChildren { get; } public abstract bool SupportsChildren { get; }
public async Task ShowBrokenStateExceptions() public async Task ShowBrokenStateExceptions()
{ {
if (ProfileElement == null) if (ProfileElement == null)
@ -117,7 +117,7 @@ public abstract partial class TreeItemViewModel : ActivatableViewModelBase
return; return;
} }
} }
public void InsertElement(TreeItemViewModel elementViewModel, int targetIndex) public void InsertElement(TreeItemViewModel elementViewModel, int targetIndex)
{ {
if (elementViewModel.Parent == this && Children.IndexOf(elementViewModel) == targetIndex) if (elementViewModel.Parent == this && Children.IndexOf(elementViewModel) == targetIndex)
@ -239,26 +239,22 @@ public abstract partial class TreeItemViewModel : ActivatableViewModelBase
await _windowService.ShowDialogAsync<LayerHintsDialogViewModel, bool>(layer); await _windowService.ShowDialogAsync<LayerHintsDialogViewModel, bool>(layer);
await ProfileEditorService.SaveProfileAsync(); await ProfileEditorService.SaveProfileAsync();
} }
private void ExecuteApplyAdaptionHints() private void ExecuteApplyAdaptionHints()
{ {
if (ProfileElement is not Layer layer) if (ProfileElement is not Layer layer)
return; return;
ProfileEditorService.ExecuteCommand(new ApplyAdaptionHints(layer, _deviceService.EnabledDevices.ToList())); ProfileEditorService.ExecuteCommand(new ApplyAdaptionHints(layer, _deviceService.EnabledDevices.ToList()));
} }
private async void UpdateCanPaste(bool isFlyoutOpen) private async void UpdateCanPaste(bool isFlyoutOpen)
{ {
string[] formats = await Shared.UI.Clipboard.GetFormatsAsync(); string[]? formats = await Shared.UI.Clipboard.GetFormatsAsync();
//diogotr7: This can be null on Linux sometimes. I'm not sure why.
if (formats == null!) // Can be null on some platforms
{ // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
CanPaste = false; CanPaste = formats != null && formats.Contains(ProfileElementExtensions.ClipboardDataFormat);
return;
}
CanPaste = formats.Contains(ProfileElementExtensions.ClipboardDataFormat);
} }
private bool GetIsFocused(ProfileEditorFocusMode focusMode, RenderProfileElement? currentProfileElement) private bool GetIsFocused(ProfileEditorFocusMode focusMode, RenderProfileElement? currentProfileElement)

7
src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs
View File

@ -174,8 +174,11 @@ public partial class TimelineKeyframeViewModel<T> : ActivatableViewModelBase, IT
private async void UpdateCanPaste(bool isFlyoutOpen) private async void UpdateCanPaste(bool isFlyoutOpen)
{ {
string[] formats = await Shared.UI.Clipboard.GetFormatsAsync(); string[]? formats = await Shared.UI.Clipboard.GetFormatsAsync();
CanPaste = formats.Contains("Artemis.Keyframes");
// Can be null on some platforms
// ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
CanPaste = formats != null && formats.Contains("Artemis.Keyframes");
} }
#endregion #endregion

24
src/Artemis.UI/Styles/Markdown.axaml
View File

@ -1,10 +1,11 @@
<Styles xmlns="https://github.com/avaloniaui" <Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:avalonia="clr-namespace:Markdown.Avalonia;assembly=Markdown.Avalonia" xmlns:avalonia="clr-namespace:Markdown.Avalonia;assembly=Markdown.Avalonia"
xmlns:ctxt="clr-namespace:ColorTextBlock.Avalonia;assembly=ColorTextBlock.Avalonia"> xmlns:ctxt="clr-namespace:ColorTextBlock.Avalonia;assembly=ColorTextBlock.Avalonia"
xmlns:controls="clr-namespace:Markdown.Avalonia.Controls;assembly=Markdown.Avalonia">
<Design.PreviewWith> <Design.PreviewWith>
<avalonia:MarkdownScrollViewer> <avalonia:MarkdownScrollViewer MarkdownStyleName="FluentAvalonia">
Test Markdown.Xaml support ```inline code ``` and block code.
</avalonia:MarkdownScrollViewer> </avalonia:MarkdownScrollViewer>
</Design.PreviewWith> </Design.PreviewWith>
<Style Selector="ScrollViewer > StackPanel"> <Style Selector="ScrollViewer > StackPanel">
@ -65,4 +66,21 @@
<Setter Property="Margin" Value="0,10,0,5" /> <Setter Property="Margin" Value="0,10,0,5" />
</Style.Setters> </Style.Setters>
</Style> </Style>
<Style Selector="ctxt|CCode">
<Style.Setters>
<Setter Property="Foreground" Value="#CE9178" />
<Setter Property="Background" Value="#333333" />
<Setter Property="Padding" Value="4 3 4 -1"></Setter>
<Setter Property="Margin" Value="0 2 0 0"></Setter>
<Setter Property="CornerRadius" Value="5" />
<Setter Property="TextVerticalAlignment" Value="Bottom"></Setter>
</Style.Setters>
</Style>
<Style Selector="controls|Rule">
<Style.Setters>
<Setter Property="Foreground" Value="{DynamicResource ButtonBorderBrush}"/>
</Style.Setters>
</Style>
</Styles> </Styles>