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

Settings - Brought the with and margins of different tabs in line with eachother

Browse Source 
Settings - Tweaked card title font size and spacing
Plugins - Show extra information on plugins in their config dialog 
Plugins - Added the ability to provide a license in plugin.json
This commit is contained in:
Robert 2023-05-18 11:18:55 +02:00
parent a76ecec97d
commit c86dba30fc
15 changed files with 146 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Artemis.Core/Plugins/PluginInfo.cs
View File

@ -29,6 +29,8 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
private Uri? _website;
private Uri? _helpPage;
private bool _hotReloadSupported;
private Uri? _license;
private string? _licenseName;
internal PluginInfo()
{
@ -103,6 +105,26 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
get => _helpPage;
set => SetAndNotify(ref _helpPage, value);
}
/// <summary>
/// Gets or sets the help page of this plugin
/// </summary>
[JsonProperty]
public Uri? License
{
get => _license;
set => SetAndNotify(ref _license, value);
}
/// <summary>
/// Gets or sets the author of this plugin
/// </summary>
[JsonProperty]
public string? LicenseName
{
get => _licenseName;
set => SetAndNotify(ref _licenseName, value);
}
/// <summary>
/// The plugins display icon that's shown in the settings see <see href="https://materialdesignicons.com" /> for

48
src/Artemis.UI.Shared/Controls/ArtemisIcon.axaml.cs
View File

@ -43,30 +43,18 @@ public partial class ArtemisIcon : UserControl
// If it's a string there are several options
else if (Icon is string iconString)
{
// An URI pointing to an image
if (ImageRegex.IsMatch(iconString))
{
Image image = new() {Source = new Bitmap(iconString), VerticalAlignment = VerticalAlignment.Stretch, HorizontalAlignment = HorizontalAlignment.Stretch};
RenderOptions.SetBitmapInterpolationMode(image, BitmapInterpolationMode.HighQuality);
Content = image;
}
// An enum defined as a string
if (Enum.TryParse(iconString, true, out MaterialIconKind parsedIcon))
else if (Enum.TryParse(iconString, true, out MaterialIconKind parsedIcon))
{
Content = new MaterialIcon {Kind = parsedIcon, Width = Bounds.Width, Height = Bounds.Height};
}
// An URI pointing to an image
else if (ImageRegex.IsMatch(iconString))
{
if (!Fill)
Content = new Image
{
Source = new Bitmap(iconString),
VerticalAlignment = VerticalAlignment.Stretch,
HorizontalAlignment = HorizontalAlignment.Stretch
};
else
Content = new Border
{
Background = TextElement.GetForeground(this),
VerticalAlignment = VerticalAlignment.Stretch,
HorizontalAlignment = HorizontalAlignment.Stretch,
OpacityMask = new ImageBrush(new Bitmap(iconString))
};
}
else
{
Content = new MaterialIcon {Kind = MaterialIconKind.QuestionMark, Width = Bounds.Width, Height = Bounds.Height};
@ -87,10 +75,10 @@ public partial class ArtemisIcon : UserControl
contentControl.Height = Bounds.Height;
}
}
private void OnPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
{
if (e.Property == IconProperty || e.Property == FillProperty)
if (e.Property == IconProperty)
Update();
}
@ -119,21 +107,5 @@ public partial class ArtemisIcon : UserControl
set => SetValue(IconProperty, value);
}
/// <summary>
/// Gets or sets a boolean indicating whether or not the icon should be filled in with the primary text color of the
/// theme
/// </summary>
public static readonly StyledProperty<bool> FillProperty = AvaloniaProperty.Register<ArtemisIcon, bool>(nameof(Icon));
/// <summary>
/// Gets or sets a boolean indicating whether or not the icon should be filled in with the primary text color of the
/// theme
/// </summary>
public bool Fill
{
get => GetValue(FillProperty);
set => SetValue(FillProperty, value);
}
#endregion
}

1
src/Artemis.UI.Shared/Styles/Artemis.axaml
View File

@ -33,4 +33,5 @@
<StyleInclude Source="/Styles/Notifications.axaml" />
<StyleInclude Source="/Styles/NumberBox.axaml" />
<StyleInclude Source="/Styles/TreeView.axaml" />
<StyleInclude Source="/Styles/Plugins.axaml" />
</Styles>

5
src/Artemis.UI.Shared/Styles/Plugins.axaml Normal file
View File

@ -0,0 +1,5 @@
<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style Selector=":is(Control).plugin-introduction">
<Setter Property="Margin" Value="0 25 0 0" />
</Style>
</Styles>

5
src/Artemis.UI.Shared/Styles/TextBlock.axaml
View File

@ -45,4 +45,9 @@
<Style Selector="TextBlock.subtitle">
<Setter Property="Foreground" Value="{DynamicResource TextFillColorTertiaryBrush}" />
</Style>
<Style Selector="TextBlock.card-title">
<Setter Property="FontSize" Value="15" />
<Setter Property="FontWeight" Value="Medium" />
<Setter Property="Margin" Value="0 25 0 5" />
</Style>
</Styles>

8
src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml
View File

@ -9,13 +9,13 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:DataType="local:DeviceSettingsViewModel"
x:Class="Artemis.UI.Screens.Device.DeviceSettingsView">
<Border Classes="card" Padding="0" Width="200" ClipToBounds="True" Margin="5">
<Grid RowDefinitions="140,*,Auto">
<Border Classes="card" Padding="0" Width="240" ClipToBounds="True" Margin="5">
<Grid RowDefinitions="160,*,Auto">
<Rectangle Grid.Row="0" Fill="{DynamicResource CheckerboardBrush}" />
<shared:DeviceVisualizer Grid.Row="0"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Margin="5"
Margin="10"
ShowColors="False"
Device="{CompiledBinding Device}"
RenderOptions.BitmapInterpolationMode="HighQuality" />
@ -28,7 +28,7 @@
Command="{CompiledBinding IdentifyDevice}">
<avalonia:MaterialIcon Kind="AlarmLight" />
</Button>
<StackPanel Grid.Row="1" Margin="8 24 8 0">
<StackPanel Grid.Row="1" Margin="8 16 8 0">
<TextBlock Text="{CompiledBinding Device.RgbDevice.DeviceInfo.Model}" />
<StackPanel>
<TextBlock TextWrapping="Wrap" Classes="subtitle" Text="{CompiledBinding Device.RgbDevice.DeviceInfo.Manufacturer, Mode=OneWay}" />

61
src/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml
View File

@ -4,6 +4,9 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
xmlns:plugins="clr-namespace:Artemis.UI.Screens.Plugins"
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Plugins.PluginSettingsWindowView"
x:DataType="plugins:PluginSettingsWindowViewModel"
@ -11,9 +14,63 @@
Title="{CompiledBinding DisplayName}"
Width="800"
Height="800"
MaxWidth="800"
WindowStartupLocation="CenterOwner">
<Panel>
<ContentControl Content="{CompiledBinding ConfigurationViewModel}"></ContentControl>
<StackPanel Classes="notification-container" Name="NotificationContainer" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
<Grid RowDefinitions="Auto,Auto, *" ColumnDefinitions="Auto,*,Auto" Margin="15" MaxWidth="800">
<shared:ArtemisIcon Grid.Column="0"
Grid.RowSpan="2"
Width="65"
Height="65"
VerticalAlignment="Center"
Margin="0 0 20 0"
Icon="{CompiledBinding Plugin.Info.ResolvedIcon}" />
<TextBlock Grid.Row="0" Grid.Column="1" FontSize="28" VerticalAlignment="Bottom" Text="{CompiledBinding Plugin.Info.Name}" />
<StackPanel Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Bottom" Orientation="Horizontal">
<controls:HyperlinkButton Classes="icon-button"
IsVisible="{CompiledBinding Plugin.Info.HelpPage, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
NavigateUri="{CompiledBinding Plugin.Info.HelpPage}"
ToolTip.Tip="{CompiledBinding Plugin.Info.HelpPage}">
<avalonia:MaterialIcon Kind="Quiz" />
</controls:HyperlinkButton>
<controls:HyperlinkButton Classes="icon-button"
IsVisible="{CompiledBinding Plugin.Info.Website, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
NavigateUri="{CompiledBinding Plugin.Info.Website}"
ToolTip.Tip="{CompiledBinding Plugin.Info.Website}">
<avalonia:MaterialIcon Kind="Web" />
</controls:HyperlinkButton>
<controls:HyperlinkButton Classes="icon-button"
IsVisible="{CompiledBinding Plugin.Info.Repository, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
NavigateUri="{CompiledBinding Plugin.Info.Repository}"
ToolTip.Tip="{CompiledBinding Plugin.Info.Repository}">
<avalonia:MaterialIcon Kind="Git" />
</controls:HyperlinkButton>
</StackPanel>
<TextBlock Grid.Row="1"
Grid.Column="1"
VerticalAlignment="Top"
Classes="subtitle"
Text="{CompiledBinding Plugin.Info.Version}" />
<controls:HyperlinkButton Grid.Row="1"
Grid.Column="2"
IsVisible="{CompiledBinding Plugin.Info.License, Converter={x:Static ObjectConverters.IsNotNull}}"
VerticalAlignment="Top"
NavigateUri="{CompiledBinding Plugin.Info.License}"
Content="{CompiledBinding LicenseButtonText}" />
<ScrollViewer Grid.Row="2"
Grid.Column="0"
Grid.ColumnSpan="3"
Margin="0 0 -10 0"
VerticalScrollBarVisibility="Auto"
HorizontalScrollBarVisibility="Disabled">
<ContentControl Margin="0 0 5 0" Content="{CompiledBinding ConfigurationViewModel}"></ContentControl>
</ScrollViewer>
</Grid>
<StackPanel Name="NotificationContainer" Classes="notification-container" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
</Panel>
</windowing:AppWindow>

1
src/Artemis.UI/Screens/Plugins/PluginSettingsWindowViewModel.cs
View File

@ -16,4 +16,5 @@ public class PluginSettingsWindowViewModel : ActivatableViewModelBase
public PluginConfigurationViewModel ConfigurationViewModel { get; }
public Plugin Plugin { get; }
public string LicenseButtonText => Plugin.Info.LicenseName ?? "View license";
}

3
src/Artemis.UI/Screens/Plugins/PluginView.axaml
View File

@ -12,7 +12,6 @@
<Grid RowDefinitions="*,Auto">
<Grid Grid.Row="0" RowDefinitions="Auto,Auto,*" ColumnDefinitions="80,*, Auto">
<shared:ArtemisIcon Icon="{CompiledBinding Plugin.Info.ResolvedIcon}"
Fill="False"
Width="48"
Height="48"
Margin="0 5 0 0"
@ -95,7 +94,7 @@
IsVisible="{CompiledBinding Plugin.Info.HelpPage, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
NavigateUri="{CompiledBinding Plugin.Info.HelpPage}"
ToolTip.Tip="{CompiledBinding Plugin.Info.HelpPage}">
<avalonia:MaterialIcon Kind="HelpCircle" />
<avalonia:MaterialIcon Kind="Quiz" />
</controls:HyperlinkButton>
<controls:HyperlinkButton Classes="icon-button icon-button-large"
IsVisible="{CompiledBinding Plugin.Info.Website, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"

12
src/Artemis.UI/Screens/ProfileEditor/Panels/Playback/PlaybackView.axaml
View File

@ -7,8 +7,12 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="48"
x:Class="Artemis.UI.Screens.ProfileEditor.Playback.PlaybackView"
x:DataType="playback:PlaybackViewModel">
<DockPanel Margin="8 0">
<StackPanel Orientation="Horizontal" Spacing="5">
<Grid Margin="8 0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="200"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="5">
<Button Classes="icon-button icon-button-large"
ToolTip.Tip="Play from start (Shift+Space)" Command="{CompiledBinding PlayFromStart}"
Focusable="False">
@ -60,6 +64,6 @@
</ToggleButton>
</StackPanel>
<TextBlock Classes="h4" Text="{CompiledBinding FormattedCurrentTime, FallbackValue=00.000}" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0" />
</DockPanel>
<TextBlock Grid.Column="1" Classes="h4" Height="32" Text="{CompiledBinding FormattedCurrentTime, FallbackValue=00.000}" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0" />
</Grid>
</UserControl>

9
src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml
View File

@ -11,7 +11,14 @@
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<StackPanel Margin="15" MaxWidth="800">
<Grid RowDefinitions="*,*" ColumnDefinitions="Auto,*,Auto">
<Image Grid.Column="0" Grid.RowSpan="2" Width="65" Height="65" VerticalAlignment="Center" Source="/Assets/Images/Logo/bow.png" Margin="0 0 20 0" />
<Image Grid.Column="0"
Grid.RowSpan="2"
Width="65"
Height="65"
VerticalAlignment="Center"
Source="/Assets/Images/Logo/bow.png"
Margin="0 0 20 0"
RenderOptions.BitmapInterpolationMode="HighQuality"/>
<TextBlock Grid.Row="0" Grid.Column="1" FontSize="36" VerticalAlignment="Bottom">
Artemis 2
</TextBlock>

20
src/Artemis.UI/Screens/Settings/Tabs/DevicesTabView.axaml
View File

@ -6,26 +6,22 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Settings.DevicesTabView"
x:DataType="settings:DevicesTabViewModel">
<Grid RowDefinitions="Auto,*">
<StackPanel MaxWidth="1050">
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<StackPanel Margin="15" MaxWidth="1000">
<TextBlock Classes="h4">Device management</TextBlock>
<TextBlock>
<TextBlock TextWrapping="Wrap">
Below you view and manage the devices that were detected by Artemis.
</TextBlock>
<TextBlock>
<LineBreak />
Disabling a device will cause it to stop updating. Some SDKs will even go back to using manufacturer lighting (Artemis restart may be required).
</TextBlock>
</StackPanel>
<ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<ItemsControl ItemsSource="{CompiledBinding Devices}" Margin="-5 0" MaxWidth="1050">
<ItemsControl ItemsSource="{CompiledBinding Devices}" Margin="0 25 0 0">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>
</ScrollViewer>
</Grid>
</StackPanel>
</ScrollViewer>
</UserControl>

16
src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml
View File

@ -14,8 +14,12 @@
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<StackPanel Margin="15" MaxWidth="1000">
<TextBlock Classes="h4">General settings</TextBlock>
<TextBlock>
Here you can change the general settings op the application, for plugin and device specific settings, see the other tabs.
</TextBlock>
<!-- General settings -->
<TextBlock Classes="h4" Margin="0 15">
<TextBlock Classes="card-title">
General
</TextBlock>
<Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">
@ -95,7 +99,7 @@
</Border>
<!-- Web server settings -->
<TextBlock Classes="h4" Margin="0 15">
<TextBlock Classes="card-title">
Web server
</TextBlock>
<Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">
@ -138,7 +142,7 @@
<!-- Update settings -->
<StackPanel>
<TextBlock Classes="h4" Margin="0 15">
<TextBlock Classes="card-title">
Updating
</TextBlock>
<Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">
@ -191,7 +195,7 @@
</StackPanel>
<!-- Profile editor settings -->
<TextBlock Classes="h4" Margin="0 15">
<TextBlock Classes="card-title">
Profile editor
</TextBlock>
<Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">
@ -262,7 +266,7 @@
</Border>
<!-- Rendering settings -->
<TextBlock Classes="h4" Margin="0 15">
<TextBlock Classes="card-title">
Rendering
</TextBlock>
<Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">
@ -335,7 +339,7 @@
</Border>
<!-- Tools -->
<TextBlock Classes="h4" Margin="0 15">
<TextBlock Classes="card-title">
Tools
</TextBlock>
<Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">

4
src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml
View File

@ -9,7 +9,7 @@
x:Class="Artemis.UI.Screens.Settings.PluginsTabView"
x:DataType="settings:PluginsTabViewModel">
<Grid RowDefinitions="Auto,*">
<Grid Grid.Row="0" Grid.Column="0" MaxWidth="900" Margin="0 10">
<Grid Grid.Row="0" Grid.Column="0" MaxWidth="1000" Margin="0 22 0 10">
<Grid.ColumnDefinitions>
<ColumnDefinition MinWidth="165" MaxWidth="400" />
<ColumnDefinition Width="*" />
@ -25,7 +25,7 @@
</Grid>
<ScrollViewer Grid.Row="1" Grid.Column="0" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" VerticalAlignment="Top">
<ItemsRepeater ItemsSource="{CompiledBinding Plugins}" MaxWidth="900" VerticalAlignment="Center">
<ItemsRepeater ItemsSource="{CompiledBinding Plugins}" MaxWidth="1000" VerticalAlignment="Center">
<ItemsRepeater.ItemTemplate>
<DataTemplate x:DataType="plugins:PluginSettingsViewModel">
<ContentControl Content="{CompiledBinding}" Height="200"/>

4
src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStep.axaml
View File

@ -19,7 +19,7 @@
<!-- Auto-run settings -->
<StackPanel IsVisible="{CompiledBinding IsAutoRunSupported}">
<TextBlock Classes="h4" Margin="0 15">
<TextBlock Classes="card-title">
Auto-run
</TextBlock>
<Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">
@ -69,7 +69,7 @@
<!-- Update settings -->
<StackPanel>
<TextBlock Classes="h4" Margin="0 15">
<TextBlock Classes="card-title">
Updating
</TextBlock>
<Border Classes="card" VerticalAlignment="Stretch" Margin="0,0,5,0">