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'

Browse Source
This commit is contained in:
Robert 2024-02-28 23:27:41 +01:00
commit 1d23c69d39
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ namespace Artemis.Core;
/// </summary> /// </summary>
public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
{ {
private Version? _api; private Version? _api = new(1, 0, 0);
private string? _author; private string? _author;
private bool _autoEnableFeatures = true; private bool _autoEnableFeatures = true;
private string? _description; private string? _description;
@ -38,7 +38,7 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
/// The plugins GUID /// The plugins GUID
/// </summary> /// </summary>
[JsonRequired] [JsonRequired]
[JsonInclude] [JsonInclude]
public Guid Guid public Guid Guid
{ {
get => _guid; get => _guid;
@ -49,7 +49,7 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
/// The name of the plugin /// The name of the plugin
/// </summary> /// </summary>
[JsonRequired] [JsonRequired]
[JsonInclude] [JsonInclude]
public string Name public string Name
{ {
get => _name; get => _name;
@ -91,7 +91,7 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
get => _repository; get => _repository;
set => SetAndNotify(ref _repository, value); set => SetAndNotify(ref _repository, value);
} }
/// <summary> /// <summary>
/// Gets or sets the help page of this plugin /// Gets or sets the help page of this plugin
/// </summary> /// </summary>
@ -100,7 +100,7 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
get => _helpPage; get => _helpPage;
set => SetAndNotify(ref _helpPage, value); set => SetAndNotify(ref _helpPage, value);
} }
/// <summary> /// <summary>
/// Gets or sets the help page of this plugin /// Gets or sets the help page of this plugin
/// </summary> /// </summary>
@ -109,7 +109,7 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
get => _license; get => _license;
set => SetAndNotify(ref _license, value); set => SetAndNotify(ref _license, value);
} }
/// <summary> /// <summary>
/// Gets or sets the author of this plugin /// Gets or sets the author of this plugin
/// </summary> /// </summary>
@ -133,7 +133,7 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
/// The version of the plugin /// The version of the plugin
/// </summary> /// </summary>
[JsonRequired] [JsonRequired]
[JsonInclude] [JsonInclude]
public string Version public string Version
{ {
get => _version; get => _version;
@ -144,7 +144,7 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
/// The main entry DLL, should contain a class implementing Plugin /// The main entry DLL, should contain a class implementing Plugin
/// </summary> /// </summary>
[JsonRequired] [JsonRequired]
[JsonInclude] [JsonInclude]
public string Main public string Main
{ {
get => _main; get => _main;
@ -164,7 +164,7 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
/// <summary> /// <summary>
/// Gets a boolean indicating whether this plugin requires elevated admin privileges /// Gets a boolean indicating whether this plugin requires elevated admin privileges
/// </summary> /// </summary>
[JsonInclude] [JsonInclude]
public bool RequiresAdmin public bool RequiresAdmin
{ {
get => _requiresAdmin; get => _requiresAdmin;
@ -183,7 +183,7 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
/// <summary> /// <summary>
/// Gets /// Gets
/// </summary> /// </summary>
[JsonInclude] [JsonInclude]
public PluginPlatform? Platforms public PluginPlatform? Platforms
{ {
get => _platforms; get => _platforms;
@ -193,7 +193,7 @@ public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
/// <summary> /// <summary>
/// Gets the API version the plugin was built for /// Gets the API version the plugin was built for
/// </summary> /// </summary>
[JsonInclude] [JsonInclude]
public Version? Api public Version? Api
{ {
get => _api; get => _api;

8
src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml
View File

@ -36,9 +36,9 @@
<Button HorizontalAlignment="Center" Command="{CompiledBinding AddSubmission}">Submit new entry</Button> <Button HorizontalAlignment="Center" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
</StackPanel> </StackPanel>
<StackPanel Spacing="15"> <Grid RowDefinitions="Auto,*">
<Button HorizontalAlignment="Right" Command="{CompiledBinding AddSubmission}">Submit new entry</Button> <Button Grid.Row="0" Margin="0 0 0 15" HorizontalAlignment="Right" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
<ScrollViewer IsVisible="{CompiledBinding Entries.Count}"> <ScrollViewer Grid.Row="1" IsVisible="{CompiledBinding Entries.Count}">
<ItemsControl ItemsSource="{CompiledBinding Entries}"> <ItemsControl ItemsSource="{CompiledBinding Entries}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
@ -52,7 +52,7 @@
</ItemsControl.ItemsPanel> </ItemsControl.ItemsPanel>
</ItemsControl> </ItemsControl>
</ScrollViewer> </ScrollViewer>
</StackPanel> </Grid>
</Panel> </Panel>
</Panel> </Panel>