mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-12 11:56:30 +00:00
Fixed compile errors in Artemis.UI
This commit is contained in:
1 parent
81e83e59f6
commit
d171b947b7
160 files changed
+407
-521
No files matched your search
@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
|
||||
|
||||
namespace Artemis.UI.Screens.Device;
|
||||
|
||||
public class DeviceDetectInputView : ReactiveUserControl<DeviceDetectInputViewModel>
|
||||
public partial class DeviceDetectInputView : ReactiveUserControl<DeviceDetectInputViewModel>
|
||||
{
|
||||
public DeviceDetectInputView()
|
||||
{
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<controls1:CoreWindow xmlns="https://github.com/avaloniaui"
|
||||
<windowing:AppWindow xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:controls1="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||
xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
|
||||
xmlns:device="clr-namespace:Artemis.UI.Screens.Device"
|
||||
xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
|
||||
mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="800"
|
||||
x:Class="Artemis.UI.Screens.Device.DevicePropertiesView"
|
||||
x:DataType="device:DevicePropertiesViewModel"
|
||||
@@ -13,9 +13,9 @@
|
||||
WindowStartupLocation="CenterOwner"
|
||||
Width="1250"
|
||||
Height="900">
|
||||
<controls1:CoreWindow.KeyBindings>
|
||||
<windowing:AppWindow.KeyBindings>
|
||||
<KeyBinding Gesture="Escape" Command="{CompiledBinding ClearSelectedLeds}" />
|
||||
</controls1:CoreWindow.KeyBindings>
|
||||
</windowing:AppWindow.KeyBindings>
|
||||
<Grid ColumnDefinitions="*,0,1.5*">
|
||||
<Grid.Background>
|
||||
<VisualBrush TileMode="Tile" Stretch="Uniform" DestinationRect="0,0,25,25">
|
||||
@@ -71,5 +71,4 @@
|
||||
|
||||
<StackPanel Grid.Column="0" Grid.ColumnSpan="3" Classes="notification-container" Name="NotificationContainer" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
|
||||
</Grid>
|
||||
|
||||
</controls1:CoreWindow>
|
||||
</windowing:AppWindow>
|
||||
@@ -7,7 +7,7 @@ using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace Artemis.UI.Screens.Device;
|
||||
|
||||
public class DevicePropertiesView : ReactiveAppWindow<DevicePropertiesViewModel>
|
||||
public partial class DevicePropertiesView : ReactiveAppWindow<DevicePropertiesViewModel>
|
||||
{
|
||||
public DevicePropertiesView()
|
||||
{
|
||||
|
||||
@@ -36,8 +36,8 @@
|
||||
<Grid Grid.Row="2" Margin="10" ColumnDefinitions="25,*">
|
||||
<CheckBox IsChecked="{Binding IsDeviceEnabled}" />
|
||||
|
||||
<controls:SplitButton Grid.Column="1" Content="Properties" Command="{Binding ViewProperties}" HorizontalAlignment="Right">
|
||||
<controls:SplitButton.Flyout>
|
||||
<SplitButton Grid.Column="1" Content="Properties" Command="{Binding ViewProperties}" HorizontalAlignment="Right">
|
||||
<SplitButton.Flyout>
|
||||
<MenuFlyout Placement="Bottom">
|
||||
<MenuItem Header="Open plugin directory" Command="{Binding OpenPluginDirectory}">
|
||||
<MenuItem.Icon>
|
||||
@@ -50,8 +50,8 @@
|
||||
</MenuItem.Icon>
|
||||
</MenuItem>
|
||||
</MenuFlyout>
|
||||
</controls:SplitButton.Flyout>
|
||||
</controls:SplitButton>
|
||||
</SplitButton.Flyout>
|
||||
</SplitButton>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
|
||||
|
||||
namespace Artemis.UI.Screens.Device;
|
||||
|
||||
public class DeviceSettingsView : ReactiveUserControl<DeviceSettingsViewModel>
|
||||
public partial class DeviceSettingsView : ReactiveUserControl<DeviceSettingsViewModel>
|
||||
{
|
||||
public DeviceSettingsView()
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
|
||||
|
||||
namespace Artemis.UI.Screens.Device;
|
||||
|
||||
public class DeviceInfoTabView : ReactiveUserControl<DeviceInfoTabViewModel>
|
||||
public partial class DeviceInfoTabView : ReactiveUserControl<DeviceInfoTabViewModel>
|
||||
{
|
||||
public DeviceInfoTabView()
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
|
||||
|
||||
namespace Artemis.UI.Screens.Device;
|
||||
|
||||
public class DeviceLedsTabView : ReactiveUserControl<DeviceLedsTabViewModel>
|
||||
public partial class DeviceLedsTabView : ReactiveUserControl<DeviceLedsTabViewModel>
|
||||
{
|
||||
public DeviceLedsTabView()
|
||||
{
|
||||
|
||||
@@ -8,17 +8,15 @@ using Avalonia.Threading;
|
||||
|
||||
namespace Artemis.UI.Screens.Device;
|
||||
|
||||
public class DeviceLogicalLayoutDialogView : ReactiveUserControl<DeviceLogicalLayoutDialogViewModel>
|
||||
public partial class DeviceLogicalLayoutDialogView : ReactiveUserControl<DeviceLogicalLayoutDialogViewModel>
|
||||
{
|
||||
private readonly AutoCompleteBox _autoCompleteBox;
|
||||
|
||||
public DeviceLogicalLayoutDialogView()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
_autoCompleteBox = this.Get<AutoCompleteBox>("RegionsAutoCompleteBox");
|
||||
_autoCompleteBox.ItemFilter += SearchRegions;
|
||||
|
||||
|
||||
RegionsAutoCompleteBox.ItemFilter += SearchRegions;
|
||||
Dispatcher.UIThread.InvokeAsync(DelayedAutoFocus);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
|
||||
|
||||
namespace Artemis.UI.Screens.Device;
|
||||
|
||||
public class DevicePhysicalLayoutDialogView : ReactiveUserControl<DevicePhysicalLayoutDialogViewModel>
|
||||
public partial class DevicePhysicalLayoutDialogView : ReactiveUserControl<DevicePhysicalLayoutDialogViewModel>
|
||||
{
|
||||
public DevicePhysicalLayoutDialogView()
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@ using Avalonia.ReactiveUI;
|
||||
|
||||
namespace Artemis.UI.Screens.Device;
|
||||
|
||||
public class DevicePropertiesTabView : ReactiveUserControl<DevicePropertiesTabViewModel>
|
||||
public partial class DevicePropertiesTabView : ReactiveUserControl<DevicePropertiesTabViewModel>
|
||||
{
|
||||
public DevicePropertiesTabView()
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@ using Avalonia.ReactiveUI;
|
||||
|
||||
namespace Artemis.UI.Screens.Device;
|
||||
|
||||
public class InputMappingsTabView : ReactiveUserControl<InputMappingsTabViewModel>
|
||||
public partial class InputMappingsTabView : ReactiveUserControl<InputMappingsTabViewModel>
|
||||
{
|
||||
public InputMappingsTabView()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user