Merge pull request #161 from Parapass/patch-4

Add the OneClick UI for Playlists
This commit is contained in:
Assistant 2020-05-19 11:57:05 -06:00 committed by GitHub
commit 05dc6b502a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 0 deletions

View file

@ -100,6 +100,7 @@
<sys:String x:Key="Options:EnableOneClickInstalls">Options:EnableOneClickInstalls</sys:String>
<sys:String x:Key="Options:BeatSaver">Options:BeatSaver</sys:String>
<sys:String x:Key="Options:ModelSaber">Options:ModelSaber</sys:String>
<sys:String x:Key="Options:Playlists">Options:Playlists</sys:String>
<sys:String x:Key="Options:GameType">Options:GameType</sys:String>
<sys:String x:Key="Options:GameType:Steam">Options:GameType:Steam</sys:String>
<sys:String x:Key="Options:GameType:Oculus">Options:GameType:Oculus</sys:String>

View file

@ -140,6 +140,7 @@
<sys:String x:Key="Options:EnableOneClickInstalls">Enable OneClick™ Installs</sys:String>
<sys:String x:Key="Options:BeatSaver">BeatSaver</sys:String>
<sys:String x:Key="Options:ModelSaber">ModelSaber</sys:String>
<sys:String x:Key="Options:Playlists">Playlists</sys:String>
<sys:String x:Key="Options:GameType">Game Type</sys:String>
<sys:String x:Key="Options:GameType:Steam">Steam</sys:String>
<sys:String x:Key="Options:GameType:Oculus">Oculus</sys:String>

View file

@ -31,6 +31,7 @@
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
@ -199,6 +200,23 @@
Checked="ModelSaberProtocolHandler_Checked"
IsChecked="{Binding ModelSaberProtocolHandlerEnabled}"
Unchecked="ModelSaberProtocolHandler_Unchecked" />
<TextBlock
Grid.Row="10"
Margin="50,5,5,5"
HorizontalAlignment="Left"
FontSize="16"
FontWeight="Bold"
Text="{DynamicResource Options:Playlists}" />
<CheckBox
Name="PlaylistProtocolHandler"
Grid.Row="10"
Grid.Column="1"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Checked="PlaylistsProtocolHandler_Checked"
IsChecked="{Binding PlaylistsProtocolHandlerEnabled}"
Unchecked="PlaylistsProtocolHandler_Unchecked" />
<StackPanel
Grid.Row="12"

View file

@ -24,6 +24,7 @@ namespace ModAssistant.Pages
public bool ReinstallInstalledMods { get; set; }
public bool ModelSaberProtocolHandlerEnabled { get; set; }
public bool BeatSaverProtocolHandlerEnabled { get; set; }
public bool PlaylistsProtocolHandlerEnabled { get; set; }
public string LogURL { get; private set; }
public Options()
@ -51,6 +52,7 @@ namespace ModAssistant.Pages
{
ModelSaberProtocolHandlerEnabled = OneClickInstaller.IsRegistered("modelsaber");
BeatSaverProtocolHandlerEnabled = OneClickInstaller.IsRegistered("beatsaver");
PlaylistsProtocolHandlerEnabled = OneClickInstaller.IsRegistered("bsplaylist");
}
private void SelectDirButton_Click(object sender, RoutedEventArgs e)
@ -133,6 +135,15 @@ namespace ModAssistant.Pages
{
OneClickInstaller.Unregister("beatsaver");
}
public void PlaylistsProtocolHandler_Checked(object sender, RoutedEventArgs e)
{
OneClickInstaller.Register("bsplaylist");
}
public void PlaylistsProtocolHandler_Unchecked(object sender, RoutedEventArgs e)
{
OneClickInstaller.Unregister("bsplaylist");
}
private void SelectInstalled_Checked(object sender, RoutedEventArgs e)
{