|
@@ -4,6 +4,8 @@
|
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
|
xmlns:titlebars="using:VeloeMinecraftLauncher.Views.TitleBar"
|
|
|
+ xmlns:utils="using:VeloeMinecraftLauncher.Utils"
|
|
|
+ xmlns:controls="using:VeloeMinecraftLauncher.Controls"
|
|
|
mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="450"
|
|
|
Width="600" Height="450"
|
|
|
MaxWidth="600" MaxHeight="450"
|
|
@@ -44,36 +46,150 @@
|
|
|
DockPanel.Dock="Top">
|
|
|
</titlebars:TitleBarWindow>
|
|
|
<TabControl
|
|
|
- HorizontalAlignment="Stretch" DockPanel.Dock="Top">
|
|
|
+ HorizontalAlignment="Stretch"
|
|
|
+ DockPanel.Dock="Top">
|
|
|
<TabItem
|
|
|
Header="Game"
|
|
|
VerticalContentAlignment="Center">
|
|
|
- <Grid Margin="10 0 10 5" ShowGridLines="false" RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto">
|
|
|
-
|
|
|
+ <Grid
|
|
|
+ Margin="10 0 10 5"
|
|
|
+ ShowGridLines="false"
|
|
|
+ RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto">
|
|
|
<Grid.ColumnDefinitions>
|
|
|
<ColumnDefinition Width="250"></ColumnDefinition>
|
|
|
<ColumnDefinition Width="*"></ColumnDefinition>
|
|
|
<ColumnDefinition Width="70"></ColumnDefinition>
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
|
|
- <CheckBox Grid.Row="1" Grid.Column="0" IsChecked="true" IsEnabled="False">Set path to minecraft folder</CheckBox>
|
|
|
- <TextBox Grid.Row="1" Grid.Column="1" Margin="5" Text="{Binding MinecraftFolderPath}" IsEnabled="{Binding SetMinecraftFolder}"></TextBox>
|
|
|
- <Button Grid.Row="1" Grid.Column="2" Content="Open" Command="{Binding OpenMinecraftPathDialog}" CommandParameter="{Binding $parent[Window]}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"></Button>
|
|
|
+ <CheckBox
|
|
|
+ Grid.Row="1" Grid.Column="0"
|
|
|
+ IsChecked="true"
|
|
|
+ IsEnabled="False">
|
|
|
+ Set path to minecraft folder
|
|
|
+ </CheckBox>
|
|
|
+ <TextBox
|
|
|
+ Grid.Row="1" Grid.Column="1"
|
|
|
+ Margin="5"
|
|
|
+ Text="{Binding MinecraftFolderPath}"
|
|
|
+ IsEnabled="{Binding SetMinecraftFolder}"/>
|
|
|
+ <Button
|
|
|
+ Grid.Row="1" Grid.Column="2"
|
|
|
+ Content="Open"
|
|
|
+ Command="{Binding OpenMinecraftPathDialog}"
|
|
|
+ CommandParameter="{Binding $parent[Window]}"
|
|
|
+ HorizontalAlignment="Stretch"
|
|
|
+ HorizontalContentAlignment="Center"/>
|
|
|
|
|
|
- <CheckBox Grid.Row="2" Grid.Column="0" IsChecked="{Binding UseCustomJava}">Use custom java</CheckBox>
|
|
|
- <TextBox Grid.Row="2" Grid.Column="1" Margin="5" Text="{Binding JavaPath}" IsEnabled="{Binding UseCustomJava}"></TextBox>
|
|
|
- <Button Grid.Row="2" Grid.Column="2" Content="Open" Command="{Binding OpenJavaPathDialog}" CommandParameter="{Binding $parent[Window]}" IsEnabled="{Binding UseCustomJava}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"></Button>
|
|
|
+ <CheckBox
|
|
|
+ Grid.Row="2"
|
|
|
+ Grid.Column="0"
|
|
|
+ IsChecked="{Binding UseCustomJava}">
|
|
|
+ Use custom java
|
|
|
+ </CheckBox>
|
|
|
+ <TextBox
|
|
|
+ Grid.Row="2" Grid.Column="1"
|
|
|
+ Margin="5"
|
|
|
+ Text="{Binding JavaPath}"
|
|
|
+ IsEnabled="{Binding UseCustomJava}"/>
|
|
|
+ <Button
|
|
|
+ Grid.Row="2" Grid.Column="2"
|
|
|
+ Content="Open"
|
|
|
+ Command="{Binding OpenJavaPathDialog}"
|
|
|
+ CommandParameter="{Binding $parent[Window]}"
|
|
|
+ IsEnabled="{Binding UseCustomJava}"
|
|
|
+ HorizontalAlignment="Stretch"
|
|
|
+ HorizontalContentAlignment="Center"/>
|
|
|
|
|
|
- <CheckBox Grid.Row="3" Grid.Column="0" IsChecked="{Binding SetMaxRam}">Set max RAM</CheckBox>
|
|
|
- <TextBox Grid.Row="3" Grid.Column="1" Margin="5" Name="MaxRam" Text="{Binding MaxRam}" IsEnabled="{Binding SetMaxRam}" HorizontalAlignment="Left" VerticalAlignment="Top"></TextBox>
|
|
|
+ <CheckBox Grid.Row="3" Grid.Column="0"
|
|
|
+ IsChecked="{Binding FullScreen}">Fullscreen mode</CheckBox>
|
|
|
+
|
|
|
+ <CheckBox
|
|
|
+ Grid.Row="4" Grid.Column="0"
|
|
|
+ IsChecked="{Binding CustomSize}">Set game resolution</CheckBox>
|
|
|
+
|
|
|
+ <StackPanel
|
|
|
+ Grid.Row="4" Grid.Column="1"
|
|
|
+ Orientation="Horizontal">
|
|
|
+ <NumericUpDown
|
|
|
+ Margin="5"
|
|
|
+ Name="GameWidthEdit"
|
|
|
+ Value="{Binding ClientWidth}"
|
|
|
+ MaxWidth="200"
|
|
|
+ ParsingNumberStyle="Integer"
|
|
|
+ Minimum="1280"
|
|
|
+ Maximum="{Binding $parent[Window].MaxGameWidth}"
|
|
|
+ Theme="{StaticResource FixDataValidation}"
|
|
|
+ ClipValueToMinMax ="True"
|
|
|
+ ShowButtonSpinner="False"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ VerticalAlignment="Top">
|
|
|
+ <NumericUpDown.IsEnabled>
|
|
|
+ <MultiBinding Converter="{x:Static utils:Converters.BoolConjuctionConventer}">
|
|
|
+ <Binding Path="!FullScreen"/>
|
|
|
+ <Binding Path="CustomSize"/>
|
|
|
+ </MultiBinding>
|
|
|
+ </NumericUpDown.IsEnabled>
|
|
|
+ </NumericUpDown>
|
|
|
+ <TextBlock VerticalAlignment="Center">x</TextBlock>
|
|
|
+ <NumericUpDown
|
|
|
+ Margin="5"
|
|
|
+ Name="GameHeightEdit"
|
|
|
+ Value="{Binding ClientHeight}"
|
|
|
+ MaxWidth="200"
|
|
|
+ ParsingNumberStyle="Integer"
|
|
|
+ Minimum="720"
|
|
|
+ Maximum="{Binding $parent[Window].MaxGameHeight}"
|
|
|
+ Theme="{StaticResource FixDataValidation}"
|
|
|
+ ClipValueToMinMax ="True"
|
|
|
+ ShowButtonSpinner="False"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ VerticalAlignment="Top">
|
|
|
+ <NumericUpDown.IsEnabled>
|
|
|
+ <MultiBinding Converter="{x:Static utils:Converters.BoolConjuctionConventer}">
|
|
|
+ <Binding Path="!FullScreen"/>
|
|
|
+ <Binding Path="CustomSize"/>
|
|
|
+ </MultiBinding>
|
|
|
+ </NumericUpDown.IsEnabled>
|
|
|
+ </NumericUpDown>
|
|
|
+ </StackPanel>
|
|
|
|
|
|
- <CheckBox Grid.Row="4" Grid.ColumnSpan="2" IsChecked="{Binding CheckAssets}" IsEnabled="True">Check vanilla game files before start</CheckBox>
|
|
|
+ <CheckBox
|
|
|
+ Grid.Row="5" Grid.Column="0" IsChecked="{Binding SetMaxRam}">Set max RAM</CheckBox>
|
|
|
+ <StackPanel
|
|
|
+ Grid.Row="5" Grid.Column="1"
|
|
|
+ Orientation="Horizontal">
|
|
|
+ <NumericUpDown
|
|
|
+ Grid.Row="5" Grid.Column="1"
|
|
|
+ Margin="5"
|
|
|
+ Name="MaxRamEdit"
|
|
|
+ Value="{Binding MaxRam}"
|
|
|
+ ParsingNumberStyle="Integer"
|
|
|
+ MaxWidth="200"
|
|
|
+ Minimum="256"
|
|
|
+ Maximum="{Binding $parent[Window].MaxRam}"
|
|
|
+ Theme="{StaticResource FixDataValidation}"
|
|
|
+ ClipValueToMinMax ="True"
|
|
|
+ ShowButtonSpinner="False"
|
|
|
+ IsEnabled="{Binding SetMaxRam}"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ VerticalAlignment="Top"/>
|
|
|
+ <TextBlock VerticalAlignment="Center">MB</TextBlock>
|
|
|
+ </StackPanel>
|
|
|
+ <CheckBox
|
|
|
+ Grid.Row="6" Grid.ColumnSpan="2"
|
|
|
+ IsChecked="{Binding CheckAssets}"
|
|
|
+ IsEnabled="True">
|
|
|
+ Check vanilla game files before start
|
|
|
+ </CheckBox>
|
|
|
</Grid>
|
|
|
</TabItem>
|
|
|
<TabItem
|
|
|
Header="Log"
|
|
|
VerticalContentAlignment="Center">
|
|
|
- <Grid Margin="10 0 10 5" ShowGridLines="false" RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto">
|
|
|
+ <Grid
|
|
|
+ Margin="10 0 10 5"
|
|
|
+ ShowGridLines="false"
|
|
|
+ RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto">
|
|
|
|
|
|
<Grid.ColumnDefinitions>
|
|
|
<ColumnDefinition Width="250"></ColumnDefinition>
|
|
@@ -81,23 +197,76 @@
|
|
|
<ColumnDefinition Width="70"></ColumnDefinition>
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
|
|
- <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">Console log event level</TextBlock>
|
|
|
- <ComboBox Grid.Row="1" Grid.Column="1" Margin="5" ItemsSource="{Binding LogEventLevels}" PlaceholderText="Select level" SelectedItem="{Binding ConsoleLogEventLevel}" HorizontalAlignment="Stretch"></ComboBox>
|
|
|
+ <TextBlock
|
|
|
+ Grid.Row="1" Grid.Column="0"
|
|
|
+ VerticalAlignment="Center" Text="Console log event level"/>
|
|
|
+ <ComboBox
|
|
|
+ Grid.Row="1" Grid.Column="1"
|
|
|
+ Margin="5"
|
|
|
+ ItemsSource="{Binding LogEventLevels}"
|
|
|
+ PlaceholderText="Select level"
|
|
|
+ SelectedItem="{Binding ConsoleLogEventLevel}"
|
|
|
+ HorizontalAlignment="Stretch"/>
|
|
|
|
|
|
- <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center">File log event level</TextBlock>
|
|
|
- <ComboBox Grid.Row="2" Grid.Column="1" Margin="5" ItemsSource="{Binding LogEventLevels}" PlaceholderText="Select level" SelectedItem="{Binding FileLogEventLevel}" HorizontalAlignment="Stretch"></ComboBox>
|
|
|
+ <TextBlock
|
|
|
+ Grid.Row="2" Grid.Column="0"
|
|
|
+ VerticalAlignment="Center">File log event level</TextBlock>
|
|
|
+ <ComboBox
|
|
|
+ Grid.Row="2" Grid.Column="1"
|
|
|
+ Margin="5"
|
|
|
+ ItemsSource="{Binding LogEventLevels}"
|
|
|
+ PlaceholderText="Select level"
|
|
|
+ SelectedItem="{Binding FileLogEventLevel}"
|
|
|
+ HorizontalAlignment="Stretch"/>
|
|
|
|
|
|
- <CheckBox Grid.Row="3" Grid.Column="0" IsChecked="{Binding SetMaxLog}">Set max log size</CheckBox>
|
|
|
- <TextBox Grid.Row="3" Grid.Column="1" Margin="5" Name="MaxLog" Text="{Binding MaxLog}" IsEnabled="{Binding SetMaxLog}" HorizontalAlignment="Left" VerticalAlignment="Top"></TextBox>
|
|
|
-
|
|
|
- <CheckBox Grid.Row="4" Grid.ColumnSpan="2" IsChecked="{Binding GameLogToLauncher}">Show game log in launcher (performace issues)</CheckBox>
|
|
|
- <Button Grid.Row="5" Grid.ColumnSpan="2" Content="Open log" Command="{Binding OpenLogFile}"></Button>
|
|
|
+ <CheckBox
|
|
|
+ Grid.Row="3" Grid.Column="0"
|
|
|
+ IsChecked="{Binding SetMaxLog}">Set max log size</CheckBox>
|
|
|
+ <StackPanel
|
|
|
+ Grid.Row="3" Grid.Column="1"
|
|
|
+ Orientation="Horizontal">
|
|
|
+ <NumericUpDown
|
|
|
+ Margin="5"
|
|
|
+ Name="MaxLogEdit"
|
|
|
+ Value="{Binding MaxLog}"
|
|
|
+ MaxWidth="200"
|
|
|
+ ParsingNumberStyle="Integer"
|
|
|
+ IsEnabled="{Binding SetMaxLog}"
|
|
|
+ Minimum="1"
|
|
|
+ Maximum="1048576"
|
|
|
+ Theme="{StaticResource FixDataValidation}"
|
|
|
+ ClipValueToMinMax ="True"
|
|
|
+ ShowButtonSpinner="False"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ VerticalAlignment="Top"/>
|
|
|
+ <TextBlock VerticalAlignment="Center">KB</TextBlock>
|
|
|
+ </StackPanel>
|
|
|
+ <DockPanel
|
|
|
+ Grid.Row="4" Grid.ColumnSpan="3">
|
|
|
+ <Button
|
|
|
+ DockPanel.Dock="Right"
|
|
|
+ Content="Open log"
|
|
|
+ Command="{Binding OpenLogFile}"/>
|
|
|
+ <CheckBox
|
|
|
+ DockPanel.Dock="Left"
|
|
|
+ IsChecked="{Binding GameLogToLauncher}">Show game log in launcher (performace issues)</CheckBox>
|
|
|
+ </DockPanel>
|
|
|
</Grid>
|
|
|
</TabItem>
|
|
|
|
|
|
</TabControl>
|
|
|
- <Button Command="{Binding SaveSettings}" IsEnabled="{Binding IsValid}" Content="Save" VerticalAlignment="Bottom" Margin="10 0 0 10"></Button>
|
|
|
- <TextBlock Text="{Binding LauncherVersion}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 10 10"></TextBlock>
|
|
|
+ <TextBlock
|
|
|
+ Text="{Binding LauncherVersion}"
|
|
|
+ HorizontalAlignment="Left"
|
|
|
+ VerticalAlignment="Bottom"
|
|
|
+ Margin="10 0 0 10"/>
|
|
|
+ <Button
|
|
|
+ Command="{Binding SaveSettings}"
|
|
|
+ IsEnabled="{Binding IsValid}"
|
|
|
+ Content="Save"
|
|
|
+ HorizontalAlignment="Right"
|
|
|
+ VerticalAlignment="Bottom"
|
|
|
+ Margin="0 0 10 10"/>
|
|
|
</DockPanel>
|
|
|
</Panel>
|
|
|
</Window>
|