Add help topics and improve design

This commit is contained in:
pizzaboxer 2023-02-01 00:29:08 +00:00
parent e9aa42e4f1
commit f9140334b3
19 changed files with 231 additions and 93 deletions

View File

@ -12,6 +12,7 @@ using Bloxstrap.Models;
using Bloxstrap.Dialogs.Menu; using Bloxstrap.Dialogs.Menu;
using Bloxstrap.Enums; using Bloxstrap.Enums;
using Bloxstrap.Helpers; using Bloxstrap.Helpers;
using Bloxstrap.Views;
namespace Bloxstrap namespace Bloxstrap
{ {
@ -64,6 +65,9 @@ namespace Bloxstrap
// see https://aka.ms/applicationconfiguration. // see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize(); ApplicationConfiguration.Initialize();
new MainWindow().ShowDialog();
return;
LaunchArgs = e.Args; LaunchArgs = e.Args;
HttpClient.Timeout = TimeSpan.FromMinutes(5); HttpClient.Timeout = TimeSpan.FromMinutes(5);
@ -96,7 +100,7 @@ namespace Bloxstrap
BaseDirectory = Path.Combine(Directories.LocalAppData, ProjectName); BaseDirectory = Path.Combine(Directories.LocalAppData, ProjectName);
else else
//new Preferences().ShowDialog(); //new Preferences().ShowDialog();
new Configuration.MainWindow().ShowDialog(); new MainWindow().ShowDialog();
} }
else else
{ {
@ -130,7 +134,7 @@ namespace Bloxstrap
#if DEBUG #if DEBUG
//new Preferences().ShowDialog(); //new Preferences().ShowDialog();
new Configuration.MainWindow().ShowDialog(); new MainWindow().ShowDialog();
#else #else
if (LaunchArgs.Length > 0) if (LaunchArgs.Length > 0)
{ {

View File

@ -1,13 +0,0 @@
namespace Bloxstrap.Configuration
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow
{
public MainWindow()
{
InitializeComponent();
}
}
}

View File

@ -1,13 +0,0 @@
namespace Bloxstrap.Configuration.Pages
{
/// <summary>
/// Interaction logic for AboutPage.xaml
/// </summary>
public partial class AboutPage
{
public AboutPage()
{
InitializeComponent();
}
}
}

View File

@ -1,13 +0,0 @@
namespace Bloxstrap.Configuration.Pages
{
/// <summary>
/// Interaction logic for IntegrationsPage.xaml
/// </summary>
public partial class IntegrationsPage
{
public IntegrationsPage()
{
InitializeComponent();
}
}
}

View File

@ -4,6 +4,7 @@ using System.IO;
using System.Windows; using System.Windows;
using Bloxstrap.Dialogs.Menu; using Bloxstrap.Dialogs.Menu;
using Bloxstrap.Views;
namespace Bloxstrap.Helpers namespace Bloxstrap.Helpers
{ {
@ -59,7 +60,7 @@ namespace Bloxstrap.Helpers
); );
//new Preferences().ShowDialog(); //new Preferences().ShowDialog();
new Configuration.MainWindow().ShowDialog(); new MainWindow().ShowDialog();
App.Terminate(); App.Terminate();
} }
} }

View File

@ -1,12 +1,13 @@
<ui:UiWindow x:Class="Bloxstrap.Configuration.MainWindow" <ui:UiWindow x:Class="Bloxstrap.Views.MainWindow"
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:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:pages="clr-namespace:Bloxstrap.Configuration.Pages" xmlns:pages="clr-namespace:Bloxstrap.Views.Pages"
mc:Ignorable="d" mc:Ignorable="d"
Title="Bloxstrap - Preferences" Title="Bloxstrap - Preferences"
MinWidth="880"
Width="920" Width="920"
Height="580" Height="580"
Background="{ui:ThemeResource ApplicationBackgroundBrush}" Background="{ui:ThemeResource ApplicationBackgroundBrush}"
@ -26,7 +27,7 @@
<ui:TitleBar x:Name="RootTitleBar" Grid.Row="0" ForceShutdown="False" MinimizeToTray="False" ShowHelp="False" UseSnapLayout="True" /> <ui:TitleBar x:Name="RootTitleBar" Grid.Row="0" ForceShutdown="False" MinimizeToTray="False" ShowHelp="False" UseSnapLayout="True" />
<Grid x:Name="RootGrid" Grid.Row="1" Margin="4,0,0,0" Visibility="Visible"> <Grid x:Name="RootGrid" Grid.Row="1" Margin="12,0,0,0" Visibility="Visible">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
@ -49,7 +50,7 @@
</Border> </Border>
<StackPanel Grid.Column="1" Margin="12,0,0,0" VerticalAlignment="Center"> <StackPanel Grid.Column="1" Margin="12,0,0,0" VerticalAlignment="Center">
<TextBlock FontSize="18" FontWeight="Medium" Text="Bloxstrap" /> <TextBlock FontSize="18" FontWeight="Medium" Text="Bloxstrap" />
<TextBlock Text="Configure your preferences" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock Text="Configuration Menu" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</Grid> </Grid>
@ -59,6 +60,8 @@
<ui:NavigationItem Content="Mods" PageType="{x:Type pages:ModsPage}" Tag="mods" /> <ui:NavigationItem Content="Mods" PageType="{x:Type pages:ModsPage}" Tag="mods" />
<ui:NavigationItem Content="Bootstrapper" PageType="{x:Type pages:BootstrapperPage}" Tag="bootstrapper" /> <ui:NavigationItem Content="Bootstrapper" PageType="{x:Type pages:BootstrapperPage}" Tag="bootstrapper" />
<ui:NavigationItem Content="Installation" PageType="{x:Type pages:InstallationPage}" Tag="installation" /> <ui:NavigationItem Content="Installation" PageType="{x:Type pages:InstallationPage}" Tag="installation" />
<ui:NavigationSeparator />
<ui:NavigationItem Content="ReShade Help" PageType="{x:Type pages:ReShadeHelpPage}" Tag="reshadehelp" />
<ui:NavigationItem Content="About" PageType="{x:Type pages:AboutPage}" Tag="about" /> <ui:NavigationItem Content="About" PageType="{x:Type pages:AboutPage}" Tag="about" />
</ui:NavigationFluent.Items> </ui:NavigationFluent.Items>
</ui:NavigationFluent> </ui:NavigationFluent>

View File

@ -0,0 +1,35 @@
using System.Windows.Controls;
using System;
using Wpf.Ui.Controls.Interfaces;
using Wpf.Ui.Mvvm.Contracts;
using Wpf.Ui.Mvvm.Services;
namespace Bloxstrap.Views
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : INavigationWindow
{
public MainWindow()
{
InitializeComponent();
}
#region INavigationWindow methods
public Frame GetFrame() => RootFrame;
public INavigation GetNavigation() => RootNavigation;
public bool Navigate(Type pageType) => RootNavigation.Navigate(pageType);
public void SetPageService(IPageService pageService) => RootNavigation.PageService = pageService;
public void ShowWindow() => Show();
public void CloseWindow() => Close();
#endregion INavigationWindow methods
}
}

View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.Configuration.Pages.AboutPage" <ui:UiPage x:Class="Bloxstrap.Views.Pages.AboutPage"
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"
@ -30,14 +30,14 @@
<TextBlock Grid.Column="0" Text="Bloxstrap" Margin="0,0,4,0" FontSize="24" FontWeight="Medium" /> <TextBlock Grid.Column="0" Text="Bloxstrap" Margin="0,0,4,0" FontSize="24" FontWeight="Medium" />
<TextBlock Grid.Column="1" Text="Version 2.0.0" Margin="4,0,0,2" VerticalAlignment="Bottom" FontSize="16" FontWeight="Medium" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock Grid.Column="1" Text="Version 2.0.0" Margin="4,0,0,2" VerticalAlignment="Bottom" FontSize="16" FontWeight="Medium" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</Grid> </Grid>
<TextBlock Text="An open-source, feature-packed alternative bootstrapper for Roblox" FontSize="13" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock Text="An open-source, feature-packed alternative bootstrapper for Roblox" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
<TextBlock Text="Developed by pizzaboxer" FontSize="13" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock Text="Developed by pizzaboxer - if this is useful, please consider leaving a star on GitHub!" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</Grid> </Grid>
<!--not enough contributors to be worth doing this yet--> <!--not enough contributors to be worth doing this yet-->
<TextBlock Text="Contributions" FontWeight="Medium" FontSize="20" Margin="0,16,0,0" /> <TextBlock Text="Contributions" FontWeight="Medium" FontSize="20" Margin="0,16,0,0" />
<TextBlock Text="These are the people who have made notable contributions to Bloxstrap, helping make it what it is." FontSize="13" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock Text="These are the people who have made notable contributions to Bloxstrap, helping make it what it is." TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
<Grid Column="0" Margin="0,16,0,0"> <Grid Column="0" Margin="0,16,0,0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*" /> <RowDefinition Height="*" />
@ -49,15 +49,16 @@
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,16,8" FontSize="13" Text="Multako" /> <TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,16,8" FontSize="14" FontWeight="Medium" Text="Multako" />
<TextBlock Grid.Row="0" Grid.Column="1" Margin="0,0,0,8" FontSize="13" Text="Designing the Bloxstrap logo" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock Grid.Row="0" Grid.Column="1" Margin="0,0,0,8" VerticalAlignment="Bottom" Text="Designing the Bloxstrap logo" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
<TextBlock Grid.Row="1" Grid.Column="0" Margin="0,0,16,8" FontSize="13" Text="bluepilledgreat" /> <TextBlock Grid.Row="1" Grid.Column="0" Margin="0,0,16,8" FontSize="14" FontWeight="Medium" Text="bluepilledgreat" />
<TextBlock Grid.Row="1" Grid.Column="1" Margin="0,0,0,8" FontSize="13" Text="Helping with bootstrapper functionality and UX" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock Grid.Row="1" Grid.Column="1" Margin="0,0,0,8" VerticalAlignment="Bottom" Text="Helping with bootstrapper functionality and UX" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
<TextBlock Grid.Row="2" Grid.Column="0" Margin="0,0,16,8" FontSize="13" Text="sitiom" /> <TextBlock Grid.Row="2" Grid.Column="0" Margin="0,0,16,0" FontSize="14" FontWeight="Medium" Text="sitiom" />
<TextBlock Grid.Row="2" Grid.Column="1" Margin="0,0,0,8" FontSize="13" Text="Setting up GitHub CI workflows and Winget releases" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock Grid.Row="2" Grid.Column="1" Margin="0,0,0,0" VerticalAlignment="Bottom" Text="Setting up GitHub CI workflows and Winget releases" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</Grid> </Grid>
<ui:Anchor Margin="0,16,0,0" Content="See all contributors" NavigateUri="https://github.com/pizzaboxer/bloxstrap/graphs/contributors" />
<TextBlock Text="Licenses" FontWeight="Medium" FontSize="18" Margin="0,16,0,0" /> <TextBlock Text="Licenses" FontWeight="Medium" FontSize="18" Margin="0,16,0,0" />
<Grid> <Grid>
@ -75,51 +76,52 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="Bloxstrap" FontSize="14" TextWrapping="Wrap" Margin="0,8,0,0" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock Grid.Row="0" Grid.Column="0" Text="Bloxstrap" FontSize="14" TextWrapping="Wrap" Margin="0,8,0,0" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
<ui:CardAction Grid.Row="1" Grid.Column="0" Tag="messagebox" Margin="0,8,8,0"> <ui:CardAction Grid.Row="1" Grid.Column="0" Tag="messagebox" Margin="0,8,8,0" Command="{Binding OpenWebpageCommand}" CommandParameter="https://github.com/pizzaboxer/bloxstrap/blob/main/LICENSE">
<StackPanel> <StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="Bloxstrap by pizzaboxer" /> <TextBlock FontSize="13" FontWeight="Medium" Text="Bloxstrap by pizzaboxer" />
<TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</ui:CardAction> </ui:CardAction>
<ui:CardAction Grid.Row="1" Grid.Column="1" Tag="messagebox" Margin="0,8,8,0"> <ui:CardAction Grid.Row="1" Grid.Column="1" Tag="messagebox" Margin="0,8,8,0" Command="{Binding OpenWebpageCommand}" CommandParameter="https://github.com/lepoco/wpfui/blob/main/LICENSE">
<StackPanel> <StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="WPF-UI by Lepoco" /> <TextBlock FontSize="13" FontWeight="Medium" Text="WPF-UI by Lepoco" />
<TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</ui:CardAction> </ui:CardAction>
<ui:CardAction Grid.Row="1" Grid.Column="2" Tag="messagebox" Margin="0,8,0,0"> <ui:CardAction Grid.Row="1" Grid.Column="2" Tag="messagebox" Margin="0,8,0,0" Command="{Binding OpenWebpageCommand}" CommandParameter="https://github.com/securifybv/ShellLink/blob/master/LICENSE.txt">
<StackPanel> <StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="ShellLink by securifybv" /> <TextBlock FontSize="13" FontWeight="Medium" Text="ShellLink by securifybv" />
<TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</ui:CardAction> </ui:CardAction>
<ui:CardAction Grid.Row="2" Grid.Column="0" Tag="messagebox" Margin="0,8,8,0"> <ui:CardAction Grid.Row="2" Grid.Column="0" Tag="messagebox" Margin="0,8,8,0" Command="{Binding OpenWebpageCommand}" CommandParameter="https://github.com/rickyah/ini-parser/blob/development/LICENSE">
<StackPanel> <StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="ini-parser by rickyah" /> <TextBlock FontSize="13" FontWeight="Medium" Text="ini-parser by rickyah" />
<TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</ui:CardAction> </ui:CardAction>
<ui:CardAction Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Tag="messagebox" Margin="0,8,0,0"> <!--should this be here? i only borrowed and modified three files, and each source file should have an appropriate copyright notice in the source-->
<!--<ui:CardAction Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Tag="messagebox" Margin="0,8,0,0" Command="{Binding OpenWebpageCommand}" CommandParameter="">
<StackPanel> <StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="Roblox Studio Mod Manager by MaximumADHD" /> <TextBlock FontSize="13" FontWeight="Medium" Text="Roblox Studio Mod Manager by MaximumADHD" />
<TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</ui:CardAction> </ui:CardAction>-->
<TextBlock Grid.Row="3" Grid.Column="0" Text="Integrations" FontSize="14" TextWrapping="Wrap" Margin="0,8,0,0" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock Grid.Row="3" Grid.Column="0" Text="Integrations" FontSize="14" TextWrapping="Wrap" Margin="0,8,0,0" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
<ui:CardAction Grid.Row="4" Grid.Column="0" Tag="messagebox" Margin="0,8,8,0"> <ui:CardAction Grid.Row="4" Grid.Column="0" Tag="messagebox" Margin="0,8,8,0" Command="{Binding OpenWebpageCommand}" CommandParameter="https://github.com/Lachee/discord-rpc-csharp/blob/master/LICENSE">
<StackPanel> <StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="DiscordRPC by Lachee" /> <TextBlock FontSize="13" FontWeight="Medium" Text="DiscordRPC by Lachee" />
<TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</ui:CardAction> </ui:CardAction>
<ui:CardAction Grid.Row="4" Grid.Column="1" Tag="messagebox" Margin="0,8,8,0"> <ui:CardAction Grid.Row="4" Grid.Column="1" Tag="messagebox" Margin="0,8,8,0" Command="{Binding OpenWebpageCommand}" CommandParameter="https://github.com/crosire/reshade/blob/main/LICENSE.md">
<StackPanel> <StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="ReShade by crosire" /> <TextBlock FontSize="13" FontWeight="Medium" Text="ReShade by crosire" />
<TextBlock FontSize="12" Text="BSD 3-Clause License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock FontSize="12" Text="BSD 3-Clause License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</ui:CardAction> </ui:CardAction>
<ui:CardAction Grid.Row="4" Grid.Column="2" Tag="messagebox" Margin="0,8,0,0"> <ui:CardAction Grid.Row="4" Grid.Column="2" Tag="messagebox" Margin="0,8,0,0" Command="{Binding OpenWebpageCommand}" CommandParameter="https://github.com/axstin/rbxfpsunlocker/blob/master/LICENSE">
<StackPanel> <StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="rbxfpsunlocker by axstin" /> <TextBlock FontSize="13" FontWeight="Medium" Text="rbxfpsunlocker by axstin" />
<TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />

View File

@ -0,0 +1,35 @@
using System.Diagnostics;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using Bloxstrap.Helpers;
using CommunityToolkit.Mvvm.Input;
using static System.Net.Mime.MediaTypeNames;
namespace Bloxstrap.Views.Pages
{
/// <summary>
/// Interaction logic for AboutPage.xaml
/// </summary>
public partial class AboutPage
{
public AboutPage()
{
DataContext = new AboutPageViewModel();
InitializeComponent();
}
}
public class AboutPageViewModel
{
public ICommand OpenWebpageCommand => new RelayCommand<string>(OpenWebpage);
private void OpenWebpage(string? location)
{
if (location is null)
return;
Utilities.OpenWebsite(location);
}
}
}

View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.Configuration.Pages.BootstrapperPage" <ui:UiPage x:Class="Bloxstrap.Views.Pages.BootstrapperPage"
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"

View File

@ -1,4 +1,4 @@
namespace Bloxstrap.Configuration.Pages namespace Bloxstrap.Views.Pages
{ {
/// <summary> /// <summary>
/// Interaction logic for BootstrapperPage.xaml /// Interaction logic for BootstrapperPage.xaml

View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.Configuration.Pages.InstallationPage" <ui:UiPage x:Class="Bloxstrap.Views.Pages.InstallationPage"
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"

View File

@ -1,4 +1,4 @@
namespace Bloxstrap.Configuration.Pages namespace Bloxstrap.Views.Pages
{ {
/// <summary> /// <summary>
/// Interaction logic for InstallationPage.xaml /// Interaction logic for InstallationPage.xaml

View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.Configuration.Pages.IntegrationsPage" <ui:UiPage x:Class="Bloxstrap.Views.Pages.IntegrationsPage"
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"
@ -59,12 +59,13 @@
<ui:CardAction Grid.Column="0" Margin="0,8,4,0" Icon="Folder24" Tag="messagebox"> <ui:CardAction Grid.Column="0" Margin="0,8,4,0" Icon="Folder24" Tag="messagebox">
<StackPanel> <StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="Open ReShade Folder" /> <TextBlock FontSize="13" FontWeight="Medium" Text="Open ReShade Folder" />
<!--<TextBlock FontSize="12" Text="Bloxstrap must first be installed" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />--> <TextBlock FontSize="12" Text="Shaders and screenshots are stored here" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</ui:CardAction> </ui:CardAction>
<ui:CardAction Grid.Column="1" Margin="4,8,0,0" Icon="BookQuestionMark24" Tag="messagebox"> <ui:CardAction Grid.Column="1" Margin="4,8,0,0" Icon="BookQuestionMark24" Tag="messagebox" Click="NavigateReShadeHelp">
<StackPanel> <StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="Help" /> <TextBlock FontSize="13" FontWeight="Medium" Text="Help" />
<TextBlock FontSize="12" Text="See help information on using ReShade" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</ui:CardAction> </ui:CardAction>
</Grid> </Grid>
@ -74,7 +75,7 @@
<ui:CardControl.Header> <ui:CardControl.Header>
<StackPanel Grid.Column="0"> <StackPanel Grid.Column="0">
<TextBlock FontSize="13" FontWeight="Medium" Text="Use axstin's rbxfpsunlocker" /> <TextBlock FontSize="13" FontWeight="Medium" Text="Use axstin's rbxfpsunlocker" />
<TextBlock FontSize="12" Text="rbxfpsunlocker removes Roblox's 60FPS cap." Foreground="{DynamicResource TextFillColorTertiaryBrush}" /> <TextBlock FontSize="12" Text="rbxfpsunlocker removes Roblox's 60FPS cap and will launch alongside Roblox." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</ui:CardControl.Header> </ui:CardControl.Header>
<ui:ToggleSwitch /> <ui:ToggleSwitch />

View File

@ -0,0 +1,25 @@
using System;
using System.Diagnostics;
using System.Windows;
using Wpf.Ui.Common.Interfaces;
using Wpf.Ui.Mvvm.Contracts;
using Wpf.Ui.Mvvm.Interfaces;
namespace Bloxstrap.Views.Pages
{
/// <summary>
/// Interaction logic for IntegrationsPage.xaml
/// </summary>
public partial class IntegrationsPage
{
public IntegrationsPage()
{
InitializeComponent();
}
private void NavigateReShadeHelp(object sender, EventArgs e)
{
((INavigationWindow)Window.GetWindow(this)!).Navigate(typeof(ReShadeHelpPage));
}
}
}

View File

@ -1,4 +1,4 @@
<ui:UiPage x:Class="Bloxstrap.Configuration.Pages.ModsPage" <ui:UiPage x:Class="Bloxstrap.Views.Pages.ModsPage"
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,25 +12,14 @@
<StackPanel Margin="0,0,14,14"> <StackPanel Margin="0,0,14,14">
<TextBlock Text="Manage and apply file mods to the Roblox game client." FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" /> <TextBlock Text="Manage and apply file mods to the Roblox game client." FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
<Grid Margin="0,16,0,0"> <ui:CardAction Grid.Column="0" Margin="0,16,0,0" Icon="Folder24" Tag="messagebox">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ui:CardAction Grid.Column="0" Margin="0,8,4,0" Icon="Folder24" Tag="messagebox">
<StackPanel> <StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="Open Mods Folder" /> <TextBlock FontSize="13" FontWeight="Medium" Text="Open Mods Folder" />
<!--<TextBlock FontSize="12" Text="Bloxstrap must first be installed" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />--> <TextBlock FontSize="12" Text="This folder contains all the file mods applied to Roblox. See below for more info." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel> </StackPanel>
</ui:CardAction> </ui:CardAction>
<ui:CardAction Grid.Column="1" Margin="4,8,0,0" Icon="BookQuestionMark24" Tag="messagebox">
<StackPanel>
<TextBlock FontSize="13" FontWeight="Medium" Text="Help" />
</StackPanel>
</ui:CardAction>
</Grid>
<TextBlock Text="Presets" FontSize="16" Margin="0,16,0,0" Foreground="{DynamicResource TextFillColorSecondaryBrush}" /> <TextBlock Text="Presets" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" />
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*" /> <RowDefinition Height="*" />
@ -67,5 +56,11 @@
<ui:ToggleSwitch /> <ui:ToggleSwitch />
</ui:CardControl> </ui:CardControl>
</Grid> </Grid>
<TextBlock Text="Adding your own mods" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" />
<TextBlock HorizontalAlignment="Left" Margin="0,8,0,0" TextWrapping="Wrap" Text="The Modifications folder is where you can apply modifications to Roblox files while ensuring that they're preserved whenever Roblox updates." Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
<TextBlock HorizontalAlignment="Left" Margin="0,8,0,0" TextWrapping="Wrap" Text="For example, placing a file at Modifications\content\sounds\ouch.ogg will automatically copy to and overwrite the file at Versions\Version-id\content\sounds\ouch.ogg. In this case, it replaces the death sound, which the old death sound preset does." Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
<TextBlock HorizontalAlignment="Left" Margin="0,8,0,0" TextWrapping="Wrap" Text="When you remove a file, Bloxstrap restores the original version of the file the next time Roblox launches." Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
<TextBlock HorizontalAlignment="Left" Margin="0,8,0,0" TextWrapping="Wrap" Text="The folder is also used for handling mod presets and files for integrations like ReShade, so if you find any files or folders that already exist, you can safely ignore them." Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
</StackPanel> </StackPanel>
</ui:UiPage> </ui:UiPage>

View File

@ -1,4 +1,8 @@
namespace Bloxstrap.Configuration.Pages using System;
using System.Windows;
using Wpf.Ui.Mvvm.Contracts;
namespace Bloxstrap.Views.Pages
{ {
/// <summary> /// <summary>
/// Interaction logic for ModsPage.xaml /// Interaction logic for ModsPage.xaml

View File

@ -0,0 +1,44 @@
<ui:UiPage x:Class="Bloxstrap.Views.Pages.ReShadeHelpPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Bloxstrap.Views.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
Title="ReShadeHelpPage"
Scrollable="True">
<StackPanel Margin="0,0,14,14">
<TextBlock Text="Keyboard Controls" FontSize="20" FontWeight="Medium" />
<Grid Column="0" Margin="0,8,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Margin="0,0,16,8" FontSize="14" FontWeight="Medium" Text="Toggle Menu" />
<TextBlock Grid.Row="0" Grid.Column="1" Margin="0,0,0,8" VerticalAlignment="Bottom" Text="Shift + Tab" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
<TextBlock Grid.Row="1" Grid.Column="0" Margin="0,0,16,8" FontSize="14" FontWeight="Medium" Text="Toggle Shaders" />
<TextBlock Grid.Row="1" Grid.Column="1" Margin="0,0,0,8" VerticalAlignment="Bottom" Text="Shift + F6" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
<TextBlock Grid.Row="2" Grid.Column="0" Margin="0,0,16,8" FontSize="14" FontWeight="Medium" Text="Take Screenshot" />
<TextBlock Grid.Row="2" Grid.Column="1" Margin="0,0,0,8" VerticalAlignment="Bottom" Text="Print Screen" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</Grid>
<TextBlock HorizontalAlignment="Left" Margin="0,8,0,0" TextWrapping="Wrap" Text="If you're using a laptop keyboard, you may have to hold down the Fn key when pressing F6." Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
<TextBlock HorizontalAlignment="Left" Margin="0,8,0,0" TextWrapping="Wrap" Text="Any screenshots you take are saved to the Screenshots folder in the ReShade folder." Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
<TextBlock Text="Adding your own shaders and presets" FontSize="20" FontWeight="Medium" Margin="0,16,0,0" />
<TextBlock HorizontalAlignment="Left" Margin="0,8,0,0" TextWrapping="Wrap" Text="While Bloxstrap provides Extravi's ReShade presets as a great way to enhance Roblox's graphics, it also provides the ability to install custom shaders and presets." Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
<TextBlock HorizontalAlignment="Left" Margin="0,8,0,0" TextWrapping="Wrap" Text="To install custom presets, just extract the necessary .ini files to the ReShade Presets folder. Though, you may also need to add additional shaders and textures." Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
<TextBlock HorizontalAlignment="Left" Margin="0,8,0,0" TextWrapping="Wrap" Text="To install shaders (known as effects), extract the necessary files to the ReShade Shaders folder. The same goes for textures, where you extract them to the ReShade Textures folder. You could alternatively extract them to organized subfolders like how Bloxstrap does them, though you'll have to configure ReShade to look in these folders." Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
</StackPanel>
</ui:UiPage>

View File

@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace Bloxstrap.Views.Pages
{
/// <summary>
/// Interaction logic for ReShadeHelpPage.xaml
/// </summary>
public partial class ReShadeHelpPage
{
public ReShadeHelpPage()
{
InitializeComponent();
}
}
}