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

Fixed compile errors in Artemis.UI

Browse Source
This commit is contained in:
Robert committed 2023-03-30 23:13:39 +02:00
1 parent 81e83e59f6
commit d171b947b7
160 files changed
+407 -521
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/StartupWizard/StartupWizardView.axaml.cs
+6 -10
View File
@@ -11,10 +11,8 @@ using ReactiveUI;
namespace Artemis.UI.Screens.StartupWizard;
public class StartupWizardView : ReactiveAppWindow<StartupWizardViewModel>
public partial class StartupWizardView : ReactiveAppWindow<StartupWizardViewModel>
{
private readonly Frame _frame;
public StartupWizardView()
{
InitializeComponent();
@@ -22,8 +20,6 @@ public class StartupWizardView : ReactiveAppWindow<StartupWizardViewModel>
this.AttachDevTools();
#endif
_frame = this.Get<Frame>("Frame");
this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.CurrentStep).Subscribe(ApplyCurrentStep).DisposeWith(d));
}
@@ -35,14 +31,14 @@ public class StartupWizardView : ReactiveAppWindow<StartupWizardViewModel>
private void ApplyCurrentStep(int step)
{
if (step == 1)
_frame.NavigateToType(typeof(WelcomeStep), null, new FrameNavigationOptions());
Frame.NavigateToType(typeof(WelcomeStep), null, new FrameNavigationOptions());
else if (step == 2)
_frame.NavigateToType(typeof(DevicesStep), null, new FrameNavigationOptions());
Frame.NavigateToType(typeof(DevicesStep), null, new FrameNavigationOptions());
else if (step == 3)
_frame.NavigateToType(typeof(LayoutStep), null, new FrameNavigationOptions());
Frame.NavigateToType(typeof(LayoutStep), null, new FrameNavigationOptions());
else if (step == 4)
_frame.NavigateToType(typeof(SettingsStep), null, new FrameNavigationOptions());
Frame.NavigateToType(typeof(SettingsStep), null, new FrameNavigationOptions());
else if (step == 5)
_frame.NavigateToType(typeof(FinishStep), null, new FrameNavigationOptions());
Frame.NavigateToType(typeof(FinishStep), null, new FrameNavigationOptions());
}
}
src/Artemis.UI/Screens/StartupWizard/Steps/DevicesStep.axaml.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.StartupWizard.Steps;
public class DevicesStep : UserControl
public partial class DevicesStep : UserControl
{
public DevicesStep()
{
src/Artemis.UI/Screens/StartupWizard/Steps/FinishStep.axaml.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.StartupWizard.Steps;
public class FinishStep : UserControl
public partial class FinishStep : UserControl
{
public FinishStep()
{
src/Artemis.UI/Screens/StartupWizard/Steps/LayoutStep.axaml.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.StartupWizard.Steps;
public class LayoutStep : UserControl
public partial class LayoutStep : UserControl
{
public LayoutStep()
{
src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStep.axaml.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.StartupWizard.Steps;
public class SettingsStep : UserControl
public partial class SettingsStep : UserControl
{
public SettingsStep()
{
src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStep.axaml.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.StartupWizard.Steps;
public class WelcomeStep : UserControl
public partial class WelcomeStep : UserControl
{
public WelcomeStep()
{