Skip to content

Feature: Moved "open on Windows startup" to advanced settings #12584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 11, 2023
Merged

Feature: Moved "open on Windows startup" to advanced settings #12584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d727e8
Feature: Move open at startup to advanced settings
yaira2 Jun 11, 2023
8db4155
Fix
yaira2 Jun 11, 2023
392e14b
Update AdvancedPage.xaml
yaira2 Jun 11, 2023
3959976
Update AdvancedPage.xaml
yaira2 Jun 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions src/Files.App/ViewModels/Settings/AdvancedViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public class AdvancedViewModel : ObservableObject
public ICommand ExportSettingsCommand { get; }
public ICommand ImportSettingsCommand { get; }
public ICommand OpenSettingsJsonCommand { get; }
public AsyncRelayCommand OpenFilesOnWindowsStartupCommand { get; }


public AdvancedViewModel()
{
Expand All @@ -40,6 +42,9 @@ public AdvancedViewModel()
ExportSettingsCommand = new AsyncRelayCommand(ExportSettings);
ImportSettingsCommand = new AsyncRelayCommand(ImportSettings);
OpenSettingsJsonCommand = new AsyncRelayCommand(OpenSettingsJson);
OpenFilesOnWindowsStartupCommand = new AsyncRelayCommand(OpenFilesOnWindowsStartup);

_ = DetectOpenFilesAtStartup();
}

private async Task OpenSettingsJson()
Expand Down Expand Up @@ -287,5 +292,78 @@ private FileOpenPicker InitializeWithWindow(FileOpenPicker obj)

return obj;
}

private bool openOnWindowsStartup;
public bool OpenOnWindowsStartup
{
get => openOnWindowsStartup;
set => SetProperty(ref openOnWindowsStartup, value);
}

private bool canOpenOnWindowsStartup;
public bool CanOpenOnWindowsStartup
{
get => canOpenOnWindowsStartup;
set => SetProperty(ref canOpenOnWindowsStartup, value);
}

public async Task OpenFilesOnWindowsStartup()
{
var stateMode = await ReadState();

bool state = stateMode switch
{
StartupTaskState.Enabled => true,
StartupTaskState.EnabledByPolicy => true,
StartupTaskState.DisabledByPolicy => false,
StartupTaskState.DisabledByUser => false,
_ => false,
};

if (state != OpenOnWindowsStartup)
{
StartupTask startupTask = await StartupTask.GetAsync("3AA55462-A5FA-4933-88C4-712D0B6CDEBB");
if (OpenOnWindowsStartup)
await startupTask.RequestEnableAsync();
else
startupTask.Disable();
await DetectOpenFilesAtStartup();
}
}

public async Task DetectOpenFilesAtStartup()
{
var stateMode = await ReadState();

switch (stateMode)
{
case StartupTaskState.Disabled:
CanOpenOnWindowsStartup = true;
OpenOnWindowsStartup = false;
break;
case StartupTaskState.Enabled:
CanOpenOnWindowsStartup = true;
OpenOnWindowsStartup = true;
break;
case StartupTaskState.DisabledByPolicy:
CanOpenOnWindowsStartup = false;
OpenOnWindowsStartup = false;
break;
case StartupTaskState.DisabledByUser:
CanOpenOnWindowsStartup = false;
OpenOnWindowsStartup = false;
break;
case StartupTaskState.EnabledByPolicy:
CanOpenOnWindowsStartup = false;
OpenOnWindowsStartup = true;
break;
}
}

public async Task<StartupTaskState> ReadState()
{
var state = await StartupTask.GetAsync("3AA55462-A5FA-4933-88C4-712D0B6CDEBB");
return state.State;
}
}
}
77 changes: 0 additions & 77 deletions src/Files.App/ViewModels/Settings/GeneralViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using Microsoft.Extensions.Logging;
using System.Collections.Specialized;
using System.Globalization;
using Windows.ApplicationModel;
using Windows.Globalization;
using Windows.Storage;
using Windows.Storage.Pickers;
Expand All @@ -23,7 +22,6 @@ public class GeneralViewModel : ObservableObject, IDisposable

private ReadOnlyCollection<IMenuFlyoutItemViewModel> addFlyoutItemsSource;

public AsyncRelayCommand OpenFilesAtStartupCommand { get; }
public AsyncRelayCommand ChangePageCommand { get; }
public RelayCommand RemovePageCommand { get; }
public RelayCommand<string> AddPageCommand { get; }
Expand Down Expand Up @@ -93,7 +91,6 @@ public int SelectedAppLanguageIndex

public GeneralViewModel()
{
OpenFilesAtStartupCommand = new AsyncRelayCommand(OpenFilesAtStartup);
ChangePageCommand = new AsyncRelayCommand(ChangePage);
RemovePageCommand = new RelayCommand(RemovePage);
AddPageCommand = new RelayCommand<string>(async (path) => await AddPage(path));
Expand All @@ -115,7 +112,6 @@ public GeneralViewModel()
PagesOnStartupList.CollectionChanged += PagesOnStartupList_CollectionChanged;

_ = InitStartupSettingsRecentFoldersFlyout();
_ = DetectOpenFilesAtStartup();
}

private async void DoRestart()
Expand Down Expand Up @@ -391,79 +387,6 @@ public DateTimeFormats DateTimeFormat
}
}

private bool openInLogin;
public bool OpenInLogin
{
get => openInLogin;
set => SetProperty(ref openInLogin, value);
}

private bool canOpenInLogin;
public bool CanOpenInLogin
{
get => canOpenInLogin;
set => SetProperty(ref canOpenInLogin, value);
}

public async Task OpenFilesAtStartup()
{
var stateMode = await ReadState();

bool state = stateMode switch
{
StartupTaskState.Enabled => true,
StartupTaskState.EnabledByPolicy => true,
StartupTaskState.DisabledByPolicy => false,
StartupTaskState.DisabledByUser => false,
_ => false,
};

if (state != OpenInLogin)
{
StartupTask startupTask = await StartupTask.GetAsync("3AA55462-A5FA-4933-88C4-712D0B6CDEBB");
if (OpenInLogin)
await startupTask.RequestEnableAsync();
else
startupTask.Disable();
await DetectOpenFilesAtStartup();
}
}

public async Task DetectOpenFilesAtStartup()
{
var stateMode = await ReadState();

switch (stateMode)
{
case StartupTaskState.Disabled:
CanOpenInLogin = true;
OpenInLogin = false;
break;
case StartupTaskState.Enabled:
CanOpenInLogin = true;
OpenInLogin = true;
break;
case StartupTaskState.DisabledByPolicy:
CanOpenInLogin = false;
OpenInLogin = false;
break;
case StartupTaskState.DisabledByUser:
CanOpenInLogin = false;
OpenInLogin = false;
break;
case StartupTaskState.EnabledByPolicy:
CanOpenInLogin = false;
OpenInLogin = true;
break;
}
}

public async Task<StartupTaskState> ReadState()
{
var state = await StartupTask.GetAsync("3AA55462-A5FA-4933-88C4-712D0B6CDEBB");
return state.State;
}

public bool SearchUnindexedItems
{
get => UserSettingsService.GeneralSettingsService.SearchUnindexedItems;
Expand Down
19 changes: 18 additions & 1 deletion src/Files.App/Views/Settings/AdvancedPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,25 @@
Glyph="&#xE8A7;" />
</local:SettingsBlockControl>

<!-- Open on Windows startup -->
<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsOpenInLogin}" HorizontalAlignment="Stretch">
<local:SettingsBlockControl.Icon>
<FontIcon Glyph="&#xE7E8;" />
</local:SettingsBlockControl.Icon>
<ToggleSwitch
AutomationProperties.Name="{helpers:ResourceString Name=SettingsOpenInLogin}"
IsEnabled="{x:Bind ViewModel.CanOpenOnWindowsStartup, Mode=OneWay}"
IsOn="{x:Bind ViewModel.OpenOnWindowsStartup, Mode=TwoWay}"
Style="{StaticResource RightAlignedToggleSwitchStyle}">
<i:Interaction.Behaviors>
<icore:EventTriggerBehavior EventName="Toggled">
<icore:InvokeCommandAction Command="{x:Bind ViewModel.OpenFilesOnWindowsStartupCommand, Mode=OneWay}" />
</icore:EventTriggerBehavior>
</i:Interaction.Behaviors>
</ToggleSwitch>
</local:SettingsBlockControl>

<!-- Default file manager -->
<!-- Experimental Settings -->
<TextBlock
Padding="0,16,0,4"
FontSize="16"
Expand Down
14 changes: 0 additions & 14 deletions src/Files.App/Views/Settings/GeneralPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,20 +187,6 @@
IsOn="{x:Bind ViewModel.AlwaysOpenANewInstance, Mode=TwoWay}"
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
</local:SettingsBlockControl>

<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsOpenInLogin}" HorizontalAlignment="Stretch">
<ToggleSwitch
AutomationProperties.Name="{helpers:ResourceString Name=SettingsOpenInLogin}"
IsEnabled="{x:Bind ViewModel.CanOpenInLogin, Mode=OneWay}"
IsOn="{x:Bind ViewModel.OpenInLogin, Mode=TwoWay}"
Style="{StaticResource RightAlignedToggleSwitchStyle}">
<i:Interaction.Behaviors>
<icore:EventTriggerBehavior EventName="Toggled">
<icore:InvokeCommandAction Command="{x:Bind ViewModel.OpenFilesAtStartupCommand, Mode=OneWay}" />
</icore:EventTriggerBehavior>
</i:Interaction.Behaviors>
</ToggleSwitch>
</local:SettingsBlockControl>
</StackPanel>
</local:SettingsBlockControl.ExpandableContent>
</local:SettingsBlockControl>
Expand Down