mirror of
https://github.com/bloxstraplabs/bloxstrap.git
synced 2025-04-21 10:01:27 -07:00
add roblox studio option to launch dialog
This commit is contained in:
parent
0ffaec74ea
commit
72e2810a2d
@ -4,6 +4,7 @@
|
|||||||
{
|
{
|
||||||
Terminate,
|
Terminate,
|
||||||
LaunchSettings,
|
LaunchSettings,
|
||||||
LaunchRoblox
|
LaunchRoblox,
|
||||||
|
LaunchRobloxStudio
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,6 +21,10 @@ namespace Bloxstrap
|
|||||||
LaunchRoblox(LaunchMode.Player);
|
LaunchRoblox(LaunchMode.Player);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case NextAction.LaunchRobloxStudio:
|
||||||
|
LaunchRoblox(LaunchMode.Studio);
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
App.Terminate(isUnfinishedInstall ? ErrorCode.ERROR_INSTALL_USEREXIT : ErrorCode.ERROR_SUCCESS);
|
App.Terminate(isUnfinishedInstall ? ErrorCode.ERROR_INSTALL_USEREXIT : ErrorCode.ERROR_SUCCESS);
|
||||||
break;
|
break;
|
||||||
|
9
Bloxstrap/Resources/Strings.Designer.cs
generated
9
Bloxstrap/Resources/Strings.Designer.cs
generated
@ -1612,6 +1612,15 @@ namespace Bloxstrap.Resources {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Launch Roblox Studio.
|
||||||
|
/// </summary>
|
||||||
|
public static string LaunchMenu_LaunchRobloxStudio {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("LaunchMenu.LaunchRobloxStudio", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to See the Wiki for help.
|
/// Looks up a localized string similar to See the Wiki for help.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -1236,4 +1236,7 @@ Would you like to enable test mode?</value>
|
|||||||
<value>Icons</value>
|
<value>Icons</value>
|
||||||
<comment>Name of the folder that gets created according to the "create shortcut icons" option. Ensure that it is a valid folder name.</comment>
|
<comment>Name of the folder that gets created according to the "create shortcut icons" option. Ensure that it is a valid folder name.</comment>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="LaunchMenu.LaunchRobloxStudio" xml:space="preserve">
|
||||||
|
<value>Launch Roblox Studio</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
@ -64,6 +64,12 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</ui:CardAction>
|
</ui:CardAction>
|
||||||
|
|
||||||
|
<ui:CardAction Margin="0,8,0,0" Icon="ArrowRight12" Command="{Binding LaunchRobloxStudioCommand, Mode=OneTime}">
|
||||||
|
<StackPanel>
|
||||||
|
<TextBlock FontSize="14" Text="{x:Static resources:Strings.LaunchMenu_LaunchRobloxStudio}" />
|
||||||
|
</StackPanel>
|
||||||
|
</ui:CardAction>
|
||||||
|
|
||||||
<ui:CardAction Margin="0,8,0,0" Icon="Settings28" Command="{Binding LaunchSettingsCommand, Mode=OneTime}">
|
<ui:CardAction Margin="0,8,0,0" Icon="Settings28" Command="{Binding LaunchSettingsCommand, Mode=OneTime}">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock FontSize="14" Text="{x:Static resources:Strings.LaunchMenu_ConfigureSettings}" />
|
<TextBlock FontSize="14" Text="{x:Static resources:Strings.LaunchMenu_ConfigureSettings}" />
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using System.Windows.Input;
|
using System.Windows;
|
||||||
|
using System.Windows.Input;
|
||||||
using CommunityToolkit.Mvvm.Input;
|
using CommunityToolkit.Mvvm.Input;
|
||||||
|
|
||||||
using Bloxstrap.UI.Elements.About;
|
using Bloxstrap.UI.Elements.About;
|
||||||
@ -9,10 +10,14 @@ namespace Bloxstrap.UI.ViewModels.Installer
|
|||||||
{
|
{
|
||||||
public string Version => string.Format(Strings.Menu_About_Version, App.Version);
|
public string Version => string.Format(Strings.Menu_About_Version, App.Version);
|
||||||
|
|
||||||
|
public Visibility ShowRobloxStudioOption => String.IsNullOrEmpty(App.State.Prop.Studio.VersionGuid) ? Visibility.Collapsed : Visibility.Visible;
|
||||||
|
|
||||||
public ICommand LaunchSettingsCommand => new RelayCommand(LaunchSettings);
|
public ICommand LaunchSettingsCommand => new RelayCommand(LaunchSettings);
|
||||||
|
|
||||||
public ICommand LaunchRobloxCommand => new RelayCommand(LaunchRoblox);
|
public ICommand LaunchRobloxCommand => new RelayCommand(LaunchRoblox);
|
||||||
|
|
||||||
|
public ICommand LaunchRobloxStudioCommand => new RelayCommand(LaunchRobloxStudio);
|
||||||
|
|
||||||
public ICommand LaunchAboutCommand => new RelayCommand(LaunchAbout);
|
public ICommand LaunchAboutCommand => new RelayCommand(LaunchAbout);
|
||||||
|
|
||||||
public event EventHandler<NextAction>? CloseWindowRequest;
|
public event EventHandler<NextAction>? CloseWindowRequest;
|
||||||
@ -21,6 +26,8 @@ namespace Bloxstrap.UI.ViewModels.Installer
|
|||||||
|
|
||||||
private void LaunchRoblox() => CloseWindowRequest?.Invoke(this, NextAction.LaunchRoblox);
|
private void LaunchRoblox() => CloseWindowRequest?.Invoke(this, NextAction.LaunchRoblox);
|
||||||
|
|
||||||
|
private void LaunchRobloxStudio() => CloseWindowRequest?.Invoke(this, NextAction.LaunchRobloxStudio);
|
||||||
|
|
||||||
private void LaunchAbout() => new MainWindow().ShowDialog();
|
private void LaunchAbout() => new MainWindow().ShowDialog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user