DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +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 committed 2023-05-18 11:18:55 +02:00
1 parent a76ecec97d
commit c86dba30fc
15 files changed
+146 -73
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml
+8 -1
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>
src/Artemis.UI/Screens/Settings/Tabs/DevicesTabView.axaml
+8 -12
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>
src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml
+10 -6
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">
src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml
+2 -2
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"/>