mirror of
https://github.com/knah/VRCMelonAssistant.git
synced 2024-05-21 12:53:18 +12:00
Merge pull request #343 from megalon/fix/scrollbars
Add ScrollViewer for non Mod pages
This commit is contained in:
commit
8b59a3fab6
|
@ -9,7 +9,8 @@
|
|||
Icon="Resources/icon.ico"
|
||||
SizeChanged="Window_SizeChanged"
|
||||
UIElement.PreviewMouseDown="Window_PreviewMouseDown"
|
||||
mc:Ignorable="d">
|
||||
mc:Ignorable="d"
|
||||
MinWidth="800" MinHeight="430">
|
||||
<Grid>
|
||||
<Rectangle Fill="{DynamicResource ModAssistantBackground}" />
|
||||
<Rectangle>
|
||||
|
|
|
@ -12,57 +12,58 @@
|
|||
d:DesignWidth="1182"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
|
||||
</Grid.RowDefinitions>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Margin="0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
FontSize="24"
|
||||
Text="{DynamicResource About:PageTitle}" />
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="1"
|
||||
Margin="0,5"
|
||||
FontSize="16"
|
||||
Text="{DynamicResource About:List:Header}"
|
||||
TextWrapping="Wrap" />
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="2"
|
||||
Margin="15,5"
|
||||
FontSize="16">
|
||||
•
|
||||
<TextBlock Text="{DynamicResource About:List:Item1}" />
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="3"
|
||||
Margin="15,5"
|
||||
FontSize="16">
|
||||
•
|
||||
<TextBlock Text="{DynamicResource About:List:Item2}" />
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="4"
|
||||
Margin="15,5"
|
||||
FontSize="16">
|
||||
•
|
||||
<TextBlock Text="{DynamicResource About:List:Item3}" />
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="5"
|
||||
Margin="15,5"
|
||||
FontSize="16">
|
||||
|
@ -70,27 +71,27 @@
|
|||
<TextBlock Text="{DynamicResource About:List:Item4}" />
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="6"
|
||||
Margin="0,5,5,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="About:SupportAssistant" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="7"
|
||||
Margin="0,10,5,5"
|
||||
FontSize="20"
|
||||
Text="{DynamicResource About:SpecialThanks}" />
|
||||
|
||||
<StackPanel
|
||||
<StackPanel
|
||||
Grid.Row="8"
|
||||
HorizontalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
|
||||
<StackPanel Margin="10" Orientation="Vertical">
|
||||
<TextBlock
|
||||
<StackPanel Margin="10" Orientation="Vertical">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="20"
|
||||
|
@ -98,31 +99,31 @@
|
|||
<Hyperlink NavigateUri="https://umbranox.carrd.co/" RequestNavigate="Hyperlink_RequestNavigate">
|
||||
Umbranox
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
Inspiration
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
Creating the Mod Manager
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
<Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/scoresaber">
|
||||
<Run Text="{DynamicResource About:Donate}" />
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Margin="10" Orientation="Vertical">
|
||||
<TextBlock
|
||||
<StackPanel Margin="10" Orientation="Vertical">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="20"
|
||||
|
@ -130,37 +131,37 @@
|
|||
<Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.jackbaron.com/">
|
||||
lolPants
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
Inspiration
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
Creating ModSaber
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
The first Mod repository
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
<Hyperlink NavigateUri="https://www.paypal.me/jackbarondev" RequestNavigate="Hyperlink_RequestNavigate">
|
||||
<Run Text="{DynamicResource About:Donate}" />
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Margin="10" Orientation="Vertical">
|
||||
<TextBlock
|
||||
<StackPanel Margin="10" Orientation="Vertical">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="20"
|
||||
|
@ -168,25 +169,25 @@
|
|||
<Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.github.com/Caeden117">
|
||||
Caeden117
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
Theme Support
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
<Hyperlink NavigateUri="https://ko-fi.com/Caeden117" RequestNavigate="Hyperlink_RequestNavigate">
|
||||
<Run Text="{DynamicResource About:Donate}" />
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Margin="10" Orientation="Vertical">
|
||||
<TextBlock
|
||||
<StackPanel Margin="10" Orientation="Vertical">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="20"
|
||||
|
@ -194,25 +195,25 @@
|
|||
<Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://twitter.com/moarinterz">
|
||||
Interz
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
Logos and icon design
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
<Hyperlink NavigateUri="https://streamlabs.com/lnterz/tip" RequestNavigate="Hyperlink_RequestNavigate">
|
||||
<Run Text="{DynamicResource About:Donate}" />
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Margin="10" Orientation="Vertical">
|
||||
<TextBlock
|
||||
<StackPanel Margin="10" Orientation="Vertical">
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="20"
|
||||
|
@ -220,36 +221,36 @@
|
|||
<Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://github.com/megalon">
|
||||
Megalon2D
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
BSMG Theme
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
Lots of fixes
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16">
|
||||
<Hyperlink NavigateUri="https://ko-fi.com/megalon" RequestNavigate="Hyperlink_RequestNavigate">
|
||||
<Run Text="{DynamicResource About:Donate}" />
|
||||
</Hyperlink>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
|
||||
</StackPanel>
|
||||
<StackPanel
|
||||
</StackPanel>
|
||||
<StackPanel
|
||||
Grid.Row="9"
|
||||
Margin="5"
|
||||
HorizontalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<Button
|
||||
<Button
|
||||
x:Name="PatButton"
|
||||
Height="30"
|
||||
MinWidth="80"
|
||||
|
@ -258,7 +259,7 @@
|
|||
x:FieldModifier="public"
|
||||
Click="HeadpatsButton_Click"
|
||||
Content="{DynamicResource About:HeadpatsButton}" />
|
||||
<Button
|
||||
<Button
|
||||
x:Name="HugButton"
|
||||
Height="30"
|
||||
MinWidth="80"
|
||||
|
@ -267,28 +268,29 @@
|
|||
x:FieldModifier="public"
|
||||
Click="HugsButton_Click"
|
||||
Content="{DynamicResource About:HugsButton}" />
|
||||
</StackPanel>
|
||||
<Popup
|
||||
</StackPanel>
|
||||
<Popup
|
||||
x:Name="PatUp"
|
||||
Width="auto"
|
||||
Height="auto"
|
||||
Placement="Center">
|
||||
<Border BorderBrush="Gray" BorderThickness="3">
|
||||
<wfi:WindowsFormsHost>
|
||||
<winForms:PictureBox x:Name="PatImage" />
|
||||
</wfi:WindowsFormsHost>
|
||||
</Border>
|
||||
</Popup>
|
||||
<Popup
|
||||
<Border BorderBrush="Gray" BorderThickness="3">
|
||||
<wfi:WindowsFormsHost>
|
||||
<winForms:PictureBox x:Name="PatImage" />
|
||||
</wfi:WindowsFormsHost>
|
||||
</Border>
|
||||
</Popup>
|
||||
<Popup
|
||||
x:Name="HugUp"
|
||||
Width="auto"
|
||||
Height="auto"
|
||||
Placement="Center">
|
||||
<Border BorderBrush="Gray" BorderThickness="3">
|
||||
<wfi:WindowsFormsHost>
|
||||
<winForms:PictureBox x:Name="HugImage" />
|
||||
</wfi:WindowsFormsHost>
|
||||
</Border>
|
||||
</Popup>
|
||||
</Grid>
|
||||
<Border BorderBrush="Gray" BorderThickness="3">
|
||||
<wfi:WindowsFormsHost>
|
||||
<winForms:PictureBox x:Name="HugImage" />
|
||||
</wfi:WindowsFormsHost>
|
||||
</Border>
|
||||
</Popup>
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</Page>
|
||||
|
|
|
@ -10,105 +10,106 @@
|
|||
d:DesignWidth="1182"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
|
||||
</Grid.RowDefinitions>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Margin="0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="48"
|
||||
Text="{DynamicResource Intro:PageTitle}" />
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="1"
|
||||
Margin="0"
|
||||
FontSize="28"
|
||||
FontWeight="Bold"
|
||||
Text="{DynamicResource Intro:Terms:Header}" />
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="2"
|
||||
Margin="0,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="Intro:Terms:Line1" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="3"
|
||||
Margin="0,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="Intro:Terms:Line2" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="4"
|
||||
Margin="15,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="Intro:Terms:Term1" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="5"
|
||||
Margin="15,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="Intro:Terms:Term2" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="6"
|
||||
Margin="15,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="Intro:Terms:Term3" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="7"
|
||||
Margin="0,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="Intro:ReviewsBeatGamesFault" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="8"
|
||||
Margin="0,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="Intro:ReviewsRustySpoon" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="9"
|
||||
Margin="0,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="Intro:WikiGuide" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<StackPanel
|
||||
<StackPanel
|
||||
Grid.Row="10"
|
||||
Margin="10"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<Button
|
||||
<Button
|
||||
Name="Agree"
|
||||
Height="35"
|
||||
Margin="0,0,10,0"
|
||||
|
@ -116,13 +117,13 @@
|
|||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Click="Agree_Click">
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="18"
|
||||
Text="{DynamicResource Intro:AgreeButton}" />
|
||||
</Button>
|
||||
<Button
|
||||
</Button>
|
||||
<Button
|
||||
Name="Disagree"
|
||||
Height="35"
|
||||
Margin="10,0,0,0"
|
||||
|
@ -130,12 +131,13 @@
|
|||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Click="Disagree_Click">
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="18"
|
||||
Text="{DynamicResource Intro:DisagreeButton}" />
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</Page>
|
||||
|
|
|
@ -10,40 +10,41 @@
|
|||
d:DesignWidth="1182"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.ColumnSpan="2"
|
||||
Margin="0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="48"
|
||||
Text="{DynamicResource Invalid:PageTitle}" />
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="1"
|
||||
Grid.ColumnSpan="2"
|
||||
Margin="0"
|
||||
FontSize="28"
|
||||
FontWeight="Bold"
|
||||
Text="{DynamicResource Invalid:PageSubtitle}" />
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="2"
|
||||
Grid.ColumnSpan="2"
|
||||
Margin="0,5"
|
||||
|
@ -51,40 +52,40 @@
|
|||
Text="{DynamicResource Invalid:List:Header}"
|
||||
TextWrapping="Wrap" />
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="3"
|
||||
Grid.ColumnSpan="2"
|
||||
Margin="15,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="Invalid:List:Line1" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="4"
|
||||
Grid.ColumnSpan="2"
|
||||
Margin="15,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="Invalid:List:Line2" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="5"
|
||||
Grid.ColumnSpan="2"
|
||||
Margin="15,5"
|
||||
FontSize="16"
|
||||
TextWrapping="Wrap">
|
||||
<StaticResource ResourceKey="Invalid:List:Line3" />
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="6"
|
||||
Grid.ColumnSpan="2"
|
||||
Margin="0"
|
||||
FontSize="28"
|
||||
FontWeight="Bold" />
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="7"
|
||||
Grid.ColumnSpan="2"
|
||||
Margin="0"
|
||||
|
@ -93,20 +94,20 @@
|
|||
<TextBlock Text="{DynamicResource Invalid:BoughtGame1}" />
|
||||
:
|
||||
</TextBlock>
|
||||
<Border
|
||||
<Border
|
||||
Grid.Row="8"
|
||||
Height="30"
|
||||
MinWidth="650"
|
||||
Background="LightGray">
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Name="DirectoryTextBlock"
|
||||
Margin="5"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Text="{Binding InstallDirectory}" />
|
||||
</Border>
|
||||
<Button
|
||||
</Border>
|
||||
<Button
|
||||
Grid.Row="8"
|
||||
Grid.Column="2"
|
||||
Width="80"
|
||||
|
@ -114,7 +115,7 @@
|
|||
Margin="3"
|
||||
Click="SelectDirButton_Click"
|
||||
Content="{DynamicResource Invalid:SelectFolderButton}" />
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="9"
|
||||
Grid.ColumnSpan="2"
|
||||
Margin="0"
|
||||
|
@ -123,5 +124,6 @@
|
|||
<TextBlock Text="{DynamicResource Invalid:BoughtGame2}" />
|
||||
.
|
||||
</TextBlock>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</Page>
|
||||
|
|
|
@ -10,37 +10,38 @@
|
|||
d:DesignWidth="1182"
|
||||
mc:Ignorable="d">
|
||||
<Page.Resources />
|
||||
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="0"
|
||||
Margin="15,5,5,5"
|
||||
HorizontalAlignment="Left"
|
||||
|
@ -48,7 +49,7 @@
|
|||
FontWeight="Bold"
|
||||
Text="{DynamicResource Options:PageTitle}" />
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="0"
|
||||
Grid.Column="2"
|
||||
Margin="5"
|
||||
|
@ -56,7 +57,7 @@
|
|||
FontSize="22"
|
||||
FontWeight="Bold"
|
||||
Text="A 文" />
|
||||
<ComboBox
|
||||
<ComboBox
|
||||
Name="LanguageSelectComboBox"
|
||||
Grid.Row="0"
|
||||
Grid.Column="3"
|
||||
|
@ -65,14 +66,14 @@
|
|||
VerticalContentAlignment="Center"
|
||||
SelectionChanged="LanguageSelectComboBox_SelectionChanged" />
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="1"
|
||||
Margin="5"
|
||||
HorizontalAlignment="Left"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Text="{DynamicResource Options:InstallFolder}" />
|
||||
<Border
|
||||
<Border
|
||||
Grid.Row="2"
|
||||
Grid.ColumnSpan="2"
|
||||
Height="30"
|
||||
|
@ -81,15 +82,15 @@
|
|||
Background="{DynamicResource DirectoryBackground}"
|
||||
BorderBrush="{DynamicResource DirectoryOutline}"
|
||||
BorderThickness="1">
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Name="DirectoryTextBlock"
|
||||
Margin="5"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Text="{Binding InstallDirectory}" />
|
||||
</Border>
|
||||
<Button
|
||||
</Border>
|
||||
<Button
|
||||
Grid.Row="2"
|
||||
Grid.Column="2"
|
||||
Height="30"
|
||||
|
@ -97,7 +98,7 @@
|
|||
Padding="5"
|
||||
Click="SelectDirButton_Click"
|
||||
Content="{DynamicResource Options:SelectFolderButton}" />
|
||||
<Button
|
||||
<Button
|
||||
Grid.Row="2"
|
||||
Grid.Column="3"
|
||||
Height="30"
|
||||
|
@ -106,14 +107,14 @@
|
|||
Click="OpenDirButton_Click"
|
||||
Content="{DynamicResource Options:OpenFolderButton}" />
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="3"
|
||||
Margin="5"
|
||||
HorizontalAlignment="Left"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Text="{DynamicResource Options:SaveSelectedMods}" />
|
||||
<CheckBox
|
||||
<CheckBox
|
||||
Name="SaveSelected"
|
||||
Grid.Row="3"
|
||||
Grid.Column="1"
|
||||
|
@ -123,14 +124,14 @@
|
|||
IsChecked="{Binding SaveSelection, Mode=TwoWay}"
|
||||
Unchecked="SaveSelected_Unchecked" />
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="4"
|
||||
Margin="5"
|
||||
HorizontalAlignment="Left"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Text="{DynamicResource Options:CheckInstalledMods}" />
|
||||
<CheckBox
|
||||
<CheckBox
|
||||
Name="CheckInstalled"
|
||||
Grid.Row="4"
|
||||
Grid.Column="1"
|
||||
|
@ -140,14 +141,14 @@
|
|||
IsChecked="{Binding CheckInstalledMods, Mode=TwoWay}"
|
||||
Unchecked="CheckInstalled_Unchecked" />
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="5"
|
||||
Margin="50,5,5,5"
|
||||
HorizontalAlignment="Left"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Text="{DynamicResource Options:SelectInstalledMods}" />
|
||||
<CheckBox
|
||||
<CheckBox
|
||||
Name="SelectInstalled"
|
||||
Grid.Row="5"
|
||||
Grid.Column="1"
|
||||
|
@ -157,14 +158,14 @@
|
|||
IsChecked="{Binding SelectInstalledMods, Mode=TwoWay}"
|
||||
Unchecked="SelectInstalled_Unchecked" />
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="6"
|
||||
Margin="50,5,5,5"
|
||||
HorizontalAlignment="Left"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Text="{DynamicResource Options:ReinstallInstalledMods}" />
|
||||
<CheckBox
|
||||
<CheckBox
|
||||
Name="ReinstallInstalled"
|
||||
Grid.Row="6"
|
||||
Grid.Column="1"
|
||||
|
@ -174,17 +175,17 @@
|
|||
IsChecked="{Binding ReinstallInstalledMods, Mode=TwoWay}"
|
||||
Unchecked="ReinstallInstalled_Unchecked" />
|
||||
|
||||
<Menu
|
||||
<Menu
|
||||
Grid.Row="8"
|
||||
Grid.Column="0"
|
||||
Margin="5"
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent">
|
||||
<MenuItem
|
||||
<MenuItem
|
||||
Header="{DynamicResource Options:EnableOneClickInstalls}"
|
||||
StaysOpenOnClick="True"
|
||||
Padding="5,0">
|
||||
<MenuItem
|
||||
<MenuItem
|
||||
Padding="5,0"
|
||||
Header="{DynamicResource Options:BeatSaver}"
|
||||
Name="BeatSaverProtocolHandler"
|
||||
|
@ -193,7 +194,7 @@
|
|||
Checked="BeatSaverProtocolHandler_Checked"
|
||||
IsChecked="{Binding BeatSaverProtocolHandlerEnabled}"
|
||||
Unchecked="BeatSaverProtocolHandler_Unchecked"/>
|
||||
<MenuItem
|
||||
<MenuItem
|
||||
Padding="5,0"
|
||||
Header="{DynamicResource Options:ModelSaber}"
|
||||
Name="ModelSaberProtocolHandler"
|
||||
|
@ -202,7 +203,7 @@
|
|||
Checked="ModelSaberProtocolHandler_Checked"
|
||||
IsChecked="{Binding ModelSaberProtocolHandlerEnabled}"
|
||||
Unchecked="ModelSaberProtocolHandler_Unchecked"/>
|
||||
<MenuItem
|
||||
<MenuItem
|
||||
Padding="5,0"
|
||||
Header="{DynamicResource Options:Playlists}"
|
||||
Name="PlaylistProtocolHandler"
|
||||
|
@ -211,7 +212,7 @@
|
|||
Checked="PlaylistsProtocolHandler_Checked"
|
||||
IsChecked="{Binding PlaylistsProtocolHandlerEnabled}"
|
||||
Unchecked="PlaylistsProtocolHandler_Unchecked" />
|
||||
<!-- <MenuItem
|
||||
<!-- <MenuItem
|
||||
Padding="5,0"
|
||||
Header="{DynamicResource Options:CloseWindow}"
|
||||
Name="CloseWindowToggle"
|
||||
|
@ -221,76 +222,76 @@
|
|||
IsChecked="{Binding CloseWindowOnFinish}"
|
||||
Unchecked="CloseWindowOnFinish_Unchecked" />
|
||||
-->
|
||||
</MenuItem>
|
||||
</Menu>
|
||||
</MenuItem>
|
||||
</Menu>
|
||||
|
||||
<StackPanel
|
||||
<StackPanel
|
||||
Grid.Row="9"
|
||||
Grid.ColumnSpan="2"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Margin="5,5,10,5"
|
||||
HorizontalAlignment="Left"
|
||||
FontSize="16"
|
||||
FontWeight="Bold"
|
||||
Text="{DynamicResource Options:ShowOCIWindow}" />
|
||||
<ComboBox
|
||||
<ComboBox
|
||||
Margin="0,0,0,5"
|
||||
MinWidth="80"
|
||||
Name="ShowOCIWindowComboBox"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Bottom"
|
||||
SelectionChanged="ShowOCIWindowComboBox_SelectionChanged">
|
||||
<ComboBoxItem Tag="Yes" Content="{DynamicResource Options:OCIWindowYes}" />
|
||||
<ComboBoxItem Tag="Close" Content="{DynamicResource Options:OCIWindowClose}" />
|
||||
<ComboBoxItem Tag="No" Content="{DynamicResource Options:OCIWindowNo}"/>
|
||||
</ComboBox>
|
||||
</StackPanel>
|
||||
<ComboBoxItem Tag="Yes" Content="{DynamicResource Options:OCIWindowYes}" />
|
||||
<ComboBoxItem Tag="Close" Content="{DynamicResource Options:OCIWindowClose}" />
|
||||
<ComboBoxItem Tag="No" Content="{DynamicResource Options:OCIWindowNo}"/>
|
||||
</ComboBox>
|
||||
</StackPanel>
|
||||
|
||||
|
||||
<StackPanel
|
||||
<StackPanel
|
||||
Grid.Row="12"
|
||||
Margin="5"
|
||||
HorizontalAlignment="Left"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock FontSize="16" FontWeight="Bold">
|
||||
<TextBlock FontSize="16" FontWeight="Bold">
|
||||
<TextBlock Text="{DynamicResource Options:GameType}" />
|
||||
: 
|
||||
</TextBlock>
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Name="GameTypeTextBlock"
|
||||
FontSize="16"
|
||||
Text="{Binding InstallType}" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel
|
||||
<StackPanel
|
||||
Grid.Row="13"
|
||||
Grid.ColumnSpan="2"
|
||||
Margin="5"
|
||||
HorizontalAlignment="Stretch">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock
|
||||
HorizontalAlignment="Left"
|
||||
FontSize="16"
|
||||
FontWeight="Bold">
|
||||
<TextBlock Text="{DynamicResource Options:ApplicationTheme}" />
|
||||
: 
|
||||
</TextBlock>
|
||||
<ComboBox
|
||||
<ComboBox
|
||||
Name="ApplicationThemeComboBox"
|
||||
Grid.Column="2"
|
||||
Height="30"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalContentAlignment="Center"
|
||||
SelectionChanged="ApplicationThemeComboBox_SelectionChanged" />
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
<Button
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
<Button
|
||||
Name="ApplicationThemeExportTemplate"
|
||||
Grid.Row="13"
|
||||
Grid.Column="2"
|
||||
|
@ -299,7 +300,7 @@
|
|||
Padding="5"
|
||||
Click="ApplicationThemeExportTemplate_Click"
|
||||
Content="{DynamicResource Options:ExportTemplateButton}" />
|
||||
<Button
|
||||
<Button
|
||||
Name="ApplicationThemeOpenThemesFolder"
|
||||
Grid.Row="13"
|
||||
Grid.Column="3"
|
||||
|
@ -309,69 +310,70 @@
|
|||
Click="ApplicationThemeOpenThemesFolder_Click"
|
||||
Content="{DynamicResource Options:OpenFolderButton}" />
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="14"
|
||||
Margin="15,5,5,5"
|
||||
HorizontalAlignment="Left"
|
||||
FontSize="24"
|
||||
FontWeight="Bold"
|
||||
Text="{DynamicResource Options:Tools}" />
|
||||
<StackPanel
|
||||
<StackPanel
|
||||
Grid.Row="15"
|
||||
Grid.ColumnSpan="4"
|
||||
Margin="0"
|
||||
HorizontalAlignment="Left"
|
||||
Orientation="Horizontal">
|
||||
<Button
|
||||
<Button
|
||||
Height="30"
|
||||
Margin="5"
|
||||
Padding="5"
|
||||
Click="InstallPlaylistButton_Click"
|
||||
Content="{DynamicResource Options:InstallPlaylist}" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<TextBlock
|
||||
<TextBlock
|
||||
Grid.Row="16"
|
||||
Margin="15,5,5,5"
|
||||
HorizontalAlignment="Left"
|
||||
FontSize="24"
|
||||
FontWeight="Bold"
|
||||
Text="{DynamicResource Options:Diagnostics}" />
|
||||
<StackPanel
|
||||
<StackPanel
|
||||
Grid.Row="17"
|
||||
Grid.ColumnSpan="4"
|
||||
Margin="0"
|
||||
HorizontalAlignment="Left"
|
||||
Orientation="Horizontal">
|
||||
<Button
|
||||
<Button
|
||||
Height="30"
|
||||
Margin="5"
|
||||
Padding="5"
|
||||
Click="OpenLogsDirButton_Click"
|
||||
Content="{DynamicResource Options:OpenLogsButton}" />
|
||||
<Button
|
||||
<Button
|
||||
x:Name="OpenAppData"
|
||||
Height="30"
|
||||
Margin="5"
|
||||
Padding="5"
|
||||
Click="OpenAppDataButton_Click"
|
||||
Content="{DynamicResource Options:OpenAppDataButton}" />
|
||||
<Button
|
||||
<Button
|
||||
x:Name="YeetBSIPA"
|
||||
Height="30"
|
||||
Margin="5"
|
||||
Padding="5"
|
||||
Click="YeetBSIPAButton_Click"
|
||||
Content="{DynamicResource Options:UninstallBSIPAButton}" />
|
||||
<Button
|
||||
<Button
|
||||
Height="30"
|
||||
Margin="5"
|
||||
Padding="5"
|
||||
Background="{DynamicResource ButtonDangerBackground}"
|
||||
Click="YeetModsButton_Click">
|
||||
<TextBlock Foreground="White" Text="{DynamicResource Options:RemoveAllModsButton}" />
|
||||
</Button>
|
||||
</StackPanel>
|
||||
<TextBlock Foreground="White" Text="{DynamicResource Options:RemoveAllModsButton}" />
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</Page>
|
||||
|
|
Loading…
Reference in a new issue