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

Setup wizard - Renamed to startup wizard

Browse Source
This commit is contained in:
SpoinkyNL 2020-12-12 17:06:57 +01:00
parent 8e8258506b
commit 7d77a340db
15 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Artemis.UI/Screens/RootViewModel.cs
View File

@ -10,8 +10,8 @@ using Artemis.Core.Services;
using Artemis.UI.Events; using Artemis.UI.Events;
using Artemis.UI.Screens.Modules; using Artemis.UI.Screens.Modules;
using Artemis.UI.Screens.Settings.Tabs.General; using Artemis.UI.Screens.Settings.Tabs.General;
using Artemis.UI.Screens.SetupWizard;
using Artemis.UI.Screens.Sidebar; using Artemis.UI.Screens.Sidebar;
using Artemis.UI.Screens.StartupWizard;
using Artemis.UI.Services; using Artemis.UI.Services;
using Artemis.UI.Services.Interfaces; using Artemis.UI.Services.Interfaces;
using Artemis.UI.Utilities; using Artemis.UI.Utilities;
@ -300,7 +300,7 @@ namespace Artemis.UI.Screens
private void ShowSetupWizard() private void ShowSetupWizard()
{ {
_windowManager.ShowDialog(_kernel.Get<SetupWizardViewModel>()); _windowManager.ShowDialog(_kernel.Get<StartupWizardViewModel>());
} }
protected override void OnClose() protected override void OnClose()

2
src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabView.xaml
View File

@ -92,7 +92,7 @@
<StackPanel Grid.Column="0" VerticalAlignment="Center"> <StackPanel Grid.Column="0" VerticalAlignment="Center">
<TextBlock Style="{StaticResource MaterialDesignTextBlock}">Setup wizard</TextBlock> <TextBlock Style="{StaticResource MaterialDesignTextBlock}">Setup wizard</TextBlock>
<TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}"> <TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}">
Opens the setup wizard usually shown when Artemis first starts. Opens the startup wizard usually shown when Artemis first starts.
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"> <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">

4
src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs
View File

@ -7,7 +7,7 @@ using System.Threading.Tasks;
using Artemis.Core; using Artemis.Core;
using Artemis.Core.LayerBrushes; using Artemis.Core.LayerBrushes;
using Artemis.Core.Services; using Artemis.Core.Services;
using Artemis.UI.Screens.SetupWizard; using Artemis.UI.Screens.StartupWizard;
using Artemis.UI.Services.Interfaces; using Artemis.UI.Services.Interfaces;
using Artemis.UI.Shared; using Artemis.UI.Shared;
using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services;
@ -213,7 +213,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
public void ShowSetupWizard() public void ShowSetupWizard()
{ {
_windowManager.ShowDialog(_kernel.Get<SetupWizardViewModel>()); _windowManager.ShowDialog(_kernel.Get<StartupWizardViewModel>());
} }
public void ShowDataFolder() public void ShowDataFolder()

5
src/Artemis.UI/Screens/SetupWizard/SetupWizardView.xaml → src/Artemis.UI/Screens/StartupWizard/StartupWizardView.xaml
View File

@ -1,9 +1,8 @@
<mde:MaterialWindow x:Class="Artemis.UI.Screens.SetupWizard.SetupWizardView" <mde:MaterialWindow x:Class="Artemis.UI.Screens.StartupWizard.StartupWizardView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Artemis.UI.Screens.SetupWizard"
xmlns:mde="https://spiegelp.github.io/MaterialDesignExtensions/winfx/xaml" xmlns:mde="https://spiegelp.github.io/MaterialDesignExtensions/winfx/xaml"
xmlns:s="https://github.com/canton7/Stylet" xmlns:s="https://github.com/canton7/Stylet"
mc:Ignorable="d" mc:Ignorable="d"
@ -11,7 +10,7 @@
Height="600" Height="600"
ResizeMode="NoResize" ResizeMode="NoResize"
Icon="/Resources/Images/Logo/logo-512.png" Icon="/Resources/Images/Logo/logo-512.png"
Title="Artemis setup wizard" Title="Artemis startup wizard"
TitleBarIcon="{StaticResource BowIcon}" TitleBarIcon="{StaticResource BowIcon}"
Foreground="{DynamicResource MaterialDesignBody}" Foreground="{DynamicResource MaterialDesignBody}"
Background="{DynamicResource MaterialDesignPaper}" Background="{DynamicResource MaterialDesignPaper}"

13
src/Artemis.UI/Screens/SetupWizard/SetupWizardViewModel.cs → src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs
View File

@ -1,22 +1,19 @@
using System.Collections; using System.Linq;
using System.Collections.Generic;
using System.Linq;
using Artemis.Core; using Artemis.Core;
using Artemis.Core.Services; using Artemis.Core.Services;
using Artemis.UI.Screens.SetupWizard.Steps; using Artemis.UI.Screens.StartupWizard.Steps;
using MaterialDesignExtensions.Controllers; using MaterialDesignExtensions.Controllers;
using MaterialDesignExtensions.Controls; using MaterialDesignExtensions.Controls;
using MaterialDesignExtensions.Model;
using Stylet; using Stylet;
namespace Artemis.UI.Screens.SetupWizard namespace Artemis.UI.Screens.StartupWizard
{ {
public class SetupWizardViewModel : Conductor<Screen>.Collection.OneActive public class StartupWizardViewModel : Conductor<Screen>.Collection.OneActive
{ {
private readonly ISettingsService _settingsService; private readonly ISettingsService _settingsService;
private StepperController _stepperController; private StepperController _stepperController;
public SetupWizardViewModel(ISettingsService settingsService, public StartupWizardViewModel(ISettingsService settingsService,
WelcomeStepViewModel welcome, WelcomeStepViewModel welcome,
DevicesStepViewModel devices, DevicesStepViewModel devices,
LayoutStepViewModel layout, LayoutStepViewModel layout,

2
src/Artemis.UI/Screens/SetupWizard/Steps/DevicesStepView.xaml → src/Artemis.UI/Screens/StartupWizard/Steps/DevicesStepView.xaml
View File

@ -1,4 +1,4 @@
<UserControl x:Class="Artemis.UI.Screens.SetupWizard.Steps.DevicesStepView" <UserControl x:Class="Artemis.UI.Screens.StartupWizard.Steps.DevicesStepView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
src/Artemis.UI/Screens/SetupWizard/Steps/DevicesStepViewModel.cs → src/Artemis.UI/Screens/StartupWizard/Steps/DevicesStepViewModel.cs
View File

@ -6,7 +6,7 @@ using Artemis.UI.Ninject.Factories;
using Artemis.UI.Screens.Settings.Tabs.Plugins; using Artemis.UI.Screens.Settings.Tabs.Plugins;
using Stylet; using Stylet;
namespace Artemis.UI.Screens.SetupWizard.Steps namespace Artemis.UI.Screens.StartupWizard.Steps
{ {
public class DevicesStepViewModel : Conductor<PluginFeatureViewModel>.Collection.AllActive public class DevicesStepViewModel : Conductor<PluginFeatureViewModel>.Collection.AllActive
{ {

3
src/Artemis.UI/Screens/SetupWizard/Steps/FinishStepView.xaml → src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepView.xaml
View File

@ -1,9 +1,8 @@
<UserControl x:Class="Artemis.UI.Screens.SetupWizard.Steps.FinishStepView" <UserControl x:Class="Artemis.UI.Screens.StartupWizard.Steps.FinishStepView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Artemis.UI.Screens.SetupWizard.Steps"
xmlns:mde="https://spiegelp.github.io/MaterialDesignExtensions/winfx/xaml" xmlns:mde="https://spiegelp.github.io/MaterialDesignExtensions/winfx/xaml"
xmlns:s="https://github.com/canton7/Stylet" xmlns:s="https://github.com/canton7/Stylet"
mc:Ignorable="d" mc:Ignorable="d"

4
src/Artemis.UI/Screens/SetupWizard/Steps/FinishStepViewModel.cs → src/Artemis.UI/Screens/StartupWizard/Steps/FinishStepViewModel.cs
View File

@ -2,7 +2,7 @@
using Artemis.Core.Services; using Artemis.Core.Services;
using Stylet; using Stylet;
namespace Artemis.UI.Screens.SetupWizard.Steps namespace Artemis.UI.Screens.StartupWizard.Steps
{ {
public class FinishStepViewModel : Screen public class FinishStepViewModel : Screen
{ {
@ -20,7 +20,7 @@ namespace Artemis.UI.Screens.SetupWizard.Steps
public void Finish() public void Finish()
{ {
((SetupWizardViewModel) Parent).SkipOrFinishWizard(); ((StartupWizardViewModel) Parent).SkipOrFinishWizard();
} }
protected override void OnActivate() protected override void OnActivate()

3
src/Artemis.UI/Screens/SetupWizard/Steps/LayoutStepView.xaml → src/Artemis.UI/Screens/StartupWizard/Steps/LayoutStepView.xaml
View File

@ -1,9 +1,8 @@
<UserControl x:Class="Artemis.UI.Screens.SetupWizard.Steps.LayoutStepView" <UserControl x:Class="Artemis.UI.Screens.StartupWizard.Steps.LayoutStepView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Artemis.UI.Screens.SetupWizard.Steps"
xmlns:mde="https://spiegelp.github.io/MaterialDesignExtensions/winfx/xaml" xmlns:mde="https://spiegelp.github.io/MaterialDesignExtensions/winfx/xaml"
xmlns:s="https://github.com/canton7/Stylet" xmlns:s="https://github.com/canton7/Stylet"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"

10
src/Artemis.UI/Screens/SetupWizard/Steps/LayoutStepViewModel.cs → src/Artemis.UI/Screens/StartupWizard/Steps/LayoutStepViewModel.cs
View File

@ -1,7 +1,7 @@
using Artemis.Core.Services; using Artemis.Core.Services;
using Stylet; using Stylet;
namespace Artemis.UI.Screens.SetupWizard.Steps namespace Artemis.UI.Screens.StartupWizard.Steps
{ {
public class LayoutStepViewModel : Screen public class LayoutStepViewModel : Screen
{ {
@ -15,15 +15,15 @@ namespace Artemis.UI.Screens.SetupWizard.Steps
public void ApplyLeftHandedPreset() public void ApplyLeftHandedPreset()
{ {
_surfaceService.AutoArrange(); _surfaceService.AutoArrange();
SetupWizardViewModel setupWizardViewModel = (SetupWizardViewModel) Parent; StartupWizardViewModel startupWizardViewModel = (StartupWizardViewModel) Parent;
setupWizardViewModel.Continue(); startupWizardViewModel.Continue();
} }
public void ApplyRightHandedPreset() public void ApplyRightHandedPreset()
{ {
_surfaceService.AutoArrange(); _surfaceService.AutoArrange();
SetupWizardViewModel setupWizardViewModel = (SetupWizardViewModel) Parent; StartupWizardViewModel startupWizardViewModel = (StartupWizardViewModel) Parent;
setupWizardViewModel.Continue(); startupWizardViewModel.Continue();
} }
} }
} }

2
src/Artemis.UI/Screens/SetupWizard/Steps/SettingsStepView.xaml → src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepView.xaml
View File

@ -1,4 +1,4 @@
<UserControl x:Class="Artemis.UI.Screens.SetupWizard.Steps.SettingsStepView" <UserControl x:Class="Artemis.UI.Screens.StartupWizard.Steps.SettingsStepView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
src/Artemis.UI/Screens/SetupWizard/Steps/SettingsStepViewModel.cs → src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepViewModel.cs
View File

@ -9,7 +9,7 @@ using Artemis.UI.Shared;
using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services;
using Stylet; using Stylet;
namespace Artemis.UI.Screens.SetupWizard.Steps namespace Artemis.UI.Screens.StartupWizard.Steps
{ {
public class SettingsStepViewModel : Conductor<PluginFeatureViewModel>.Collection.AllActive public class SettingsStepViewModel : Conductor<PluginFeatureViewModel>.Collection.AllActive
{ {

4
src/Artemis.UI/Screens/SetupWizard/Steps/WelcomeStepView.xaml → src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepView.xaml
View File

@ -1,4 +1,4 @@
<UserControl x:Class="Artemis.UI.Screens.SetupWizard.Steps.WelcomeStepView" <UserControl x:Class="Artemis.UI.Screens.StartupWizard.Steps.WelcomeStepView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -12,7 +12,7 @@
<RowDefinition /> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel> <StackPanel>
<TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}">Welcome to the Artemis setup wizard!</TextBlock> <TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}">Welcome to the Artemis startup wizard!</TextBlock>
<TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap"> <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap">
In this wizard we'll walk you through the initial configuration of Artemis.<LineBreak/> In this wizard we'll walk you through the initial configuration of Artemis.<LineBreak/>

6
src/Artemis.UI/Screens/SetupWizard/Steps/WelcomeStepViewModel.cs → src/Artemis.UI/Screens/StartupWizard/Steps/WelcomeStepViewModel.cs
View File

@ -1,8 +1,6 @@
using System; using Stylet;
using Artemis.UI.Shared;
using Stylet;
namespace Artemis.UI.Screens.SetupWizard.Steps namespace Artemis.UI.Screens.StartupWizard.Steps
{ {
public class WelcomeStepViewModel : Screen public class WelcomeStepViewModel : Screen
{ {