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

Settings - Fixed start minimized not enabled

Browse Source 
Wizard - Fixed start minimized not enabled
Wizard - Removed unintended black lines
Wizard - Change step description so it fits
This commit is contained in:
SpoinkyNL 2020-12-13 17:41:57 +01:00
parent 52809a6c9a
commit 34bcfccb4c
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,6 +108,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
{ {
_settingsService.GetSetting("UI.AutoRun", false).Value = value; _settingsService.GetSetting("UI.AutoRun", false).Value = value;
_settingsService.GetSetting("UI.AutoRun", false).Save(); _settingsService.GetSetting("UI.AutoRun", false).Save();
NotifyOfPropertyChange(nameof(StartWithWindows));
Task.Run(ApplyAutorun); Task.Run(ApplyAutorun);
} }
} }
@ -119,6 +120,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
{ {
_settingsService.GetSetting("UI.ShowOnStartup", true).Value = !value; _settingsService.GetSetting("UI.ShowOnStartup", true).Value = !value;
_settingsService.GetSetting("UI.ShowOnStartup", true).Save(); _settingsService.GetSetting("UI.ShowOnStartup", true).Save();
NotifyOfPropertyChange(nameof(StartMinimized));
} }
} }
@ -245,6 +247,8 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
File.Delete(autoRunFile); File.Delete(autoRunFile);
if (StartWithWindows) if (StartWithWindows)
ShortcutUtilities.Create(autoRunFile, executableFile, "--autorun", new FileInfo(executableFile).DirectoryName, "Artemis", "", ""); ShortcutUtilities.Create(autoRunFile, executableFile, "--autorun", new FileInfo(executableFile).DirectoryName, "Artemis", "", "");
else
StartMinimized = false;
} }
catch (Exception e) catch (Exception e)
{ {

3
src/Artemis.UI/Screens/StartupWizard/StartupWizardView.xaml
View File

@ -15,6 +15,7 @@
Foreground="{DynamicResource MaterialDesignBody}" Foreground="{DynamicResource MaterialDesignBody}"
Background="{DynamicResource MaterialDesignPaper}" Background="{DynamicResource MaterialDesignPaper}"
FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto" FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
UseLayoutRounding="True"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<mde:Stepper IsLinear="True" Layout="Horizontal" ActiveStepChanged="{s:Action ActiveStepChanged}" CancelNavigation="{s:Action SkipOrFinishWizard}" Margin="15"> <mde:Stepper IsLinear="True" Layout="Horizontal" ActiveStepChanged="{s:Action ActiveStepChanged}" CancelNavigation="{s:Action SkipOrFinishWizard}" Margin="15">
@ -44,7 +45,7 @@
</mde:Step> </mde:Step>
<mde:Step> <mde:Step>
<mde:Step.Header> <mde:Step.Header>
<mde:StepTitleHeader FirstLevelTitle="Settings" SecondLevelTitle="Choose your preferences" /> <mde:StepTitleHeader FirstLevelTitle="Settings" SecondLevelTitle="Set your preferences" />
</mde:Step.Header> </mde:Step.Header>
<mde:Step.Content> <mde:Step.Content>
<ContentControl s:View.Model="{Binding ActiveItem}" /> <ContentControl s:View.Model="{Binding ActiveItem}" />

5
src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepViewModel.cs
View File

@ -33,6 +33,7 @@ namespace Artemis.UI.Screens.StartupWizard.Steps
{ {
_settingsService.GetSetting("UI.AutoRun", false).Value = value; _settingsService.GetSetting("UI.AutoRun", false).Value = value;
_settingsService.GetSetting("UI.AutoRun", false).Save(); _settingsService.GetSetting("UI.AutoRun", false).Save();
NotifyOfPropertyChange(nameof(StartWithWindows));
Task.Run(ApplyAutorun); Task.Run(ApplyAutorun);
} }
} }
@ -44,10 +45,10 @@ namespace Artemis.UI.Screens.StartupWizard.Steps
{ {
_settingsService.GetSetting("UI.ShowOnStartup", true).Value = !value; _settingsService.GetSetting("UI.ShowOnStartup", true).Value = !value;
_settingsService.GetSetting("UI.ShowOnStartup", true).Save(); _settingsService.GetSetting("UI.ShowOnStartup", true).Save();
NotifyOfPropertyChange(nameof(StartMinimized));
} }
} }
public ApplicationColorScheme SelectedColorScheme public ApplicationColorScheme SelectedColorScheme
{ {
get => _settingsService.GetSetting("UI.ColorScheme", ApplicationColorScheme.Automatic).Value; get => _settingsService.GetSetting("UI.ColorScheme", ApplicationColorScheme.Automatic).Value;
@ -69,6 +70,8 @@ namespace Artemis.UI.Screens.StartupWizard.Steps
File.Delete(autoRunFile); File.Delete(autoRunFile);
if (StartWithWindows) if (StartWithWindows)
ShortcutUtilities.Create(autoRunFile, executableFile, "--autorun", new FileInfo(executableFile).DirectoryName, "Artemis", "", ""); ShortcutUtilities.Create(autoRunFile, executableFile, "--autorun", new FileInfo(executableFile).DirectoryName, "Artemis", "", "");
else
StartMinimized = false;
} }
catch (Exception e) catch (Exception e)
{ {