Skip to content

Commit 31be01d

Browse files
num0005num0005
authored
Merge pull request #5 from General-101/master
Launcher cleanup
2 parents 2493a42 + 04c5040 commit 31be01d

File tree

8 files changed

+97
-469
lines changed

8 files changed

+97
-469
lines changed

‎Launcher/MainWindow.xaml‎

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@
1717
<local:ModelContentModifier x:Key="ModelContentModifier" />
1818
<local:TextContentModifier x:Key="TextContentModifier" />
1919
<local:LightmapConfigModifier x:Key="LightmapConfigModifier" />
20-
<local:PRTContentModifier x:Key="PRTContentModifier" />
21-
<local:PhantomVisibility x:Key="PhantomVisibility" />
22-
<local:PackageResourceVisibility x:Key="PackageResourceVisibility" />
2320
<local:CommunityToolsToIsEnabled x:Key="CommunityToolsToIsEnabled" />
2421
<local:CommunityToolsToVisibilityConverter x:Key="CommunityToolsToVisibilityConverter" />
25-
<local:PRTToVisibilityConverter x:Key="PRTToVisibilityConverter" />
2622
<local:H2VCommunityToolsToVisibilityConverter x:Key="H2VCommunityToolsToVisibilityConverter" />
2723
<local:H2VDropdownSelectionToVisibilityConverter x:Key="H2VDropdownSelectionToVisibilityConverter" />
2824
<local:RadiosityContentModifier x:Key="RadiosityContentModifier" />
@@ -202,9 +198,6 @@
202198
</GroupBox.BindingGroup>
203199
<TextBox Name="instance_value" BorderBrush="{StaticResource brushWatermarkBorder}" VerticalAlignment="Center" TextWrapping="Wrap" Background="Transparent" Text="1" MaxLines="1" MaxLength="4" PreviewKeyDown="spaces_PreviewKeyDown" PreviewTextInput="numbers_only" HorizontalAlignment="Center" MinWidth="48" MinHeight="24"/>
204200
</GroupBox>
205-
<GroupBox x:Name="structure_box" Header="Structure Import Settings" Grid.Column="2" MinHeight="90" Visibility="{Binding SelectedIndex, Converter={StaticResource PhantomVisibility}, ConverterParameter=0, ElementName=toolkit_selection}">
206-
<CheckBox x:Name="phantom_hack" Content="Apply Phantom Fix" HorizontalAlignment="Center" VerticalAlignment="Center"/>
207-
</GroupBox>
208201
</Grid>
209202
<Grid Grid.Row="2">
210203
<Grid.ColumnDefinitions>
@@ -379,11 +372,6 @@
379372
<RadioButton Grid.Column="0" x:Name="model_compile_render" Content="{Binding SelectedIndex, Converter={StaticResource ModelContentModifier}, ConverterParameter=1, ElementName=toolkit_selection}" HorizontalAlignment="Left" VerticalAlignment="Top" IsChecked="True" Checked="model_compile_render_Checked"/>
380373
<RadioButton Grid.Column="0" Grid.Row="2" x:Name="model_compile_all" Content="All" HorizontalAlignment="Left" VerticalAlignment="Bottom" Checked="model_compile_all_Checked"/>
381374
</Grid>
382-
<Grid Grid.Row="3">
383-
<GroupBox x:Name="render_type_select_box" Header="Render Type" HorizontalAlignment="Left" VerticalAlignment="Center" MinHeight="55" Visibility="{Binding SelectedIndex, Converter={StaticResource PRTToVisibilityConverter}, ConverterParameter=1, ElementName=toolkit_selection}">
384-
<ToggleButton x:Name ="render_prt" Content ="{Binding IsChecked, Converter={StaticResource PRTContentModifier}, ConverterParameter=1, ElementName=render_prt}" HorizontalAlignment="Left" Padding="4" MinWidth="75" MinHeight="26" MaxHeight="26" VerticalAlignment="Stretch"/>
385-
</GroupBox>
386-
</Grid>
387375
<Grid Grid.Row="4">
388376
<Button x:Name="compile_model" Content="Compile Model" Grid.Row="3" Click="compile_model_Click" VerticalAlignment="Bottom" IsEnabled="{Binding Text.Length, ElementName=compile_model_path, Mode=OneWay}"/>
389377
</Grid>
@@ -466,63 +454,6 @@
466454
</StackPanel>
467455
</GroupBox>
468456
</Grid>
469-
<Grid Grid.Row="5">
470-
<Grid.ColumnDefinitions>
471-
<ColumnDefinition Width="Auto"/>
472-
<ColumnDefinition Width="8"/>
473-
<ColumnDefinition Width="*"/>
474-
</Grid.ColumnDefinitions>
475-
<GroupBox Grid.Column="0" x:Name="class_type" Header="Class" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Visibility="{Binding SelectedIndex, Converter={StaticResource H2VDropdownSelectionToVisibilityConverter}, ConverterParameter=1, ElementName=toolkit_selection}">
476-
<ComboBox x:Name="class_dropdown" SelectedIndex="0" VerticalAlignment="Center">
477-
<ComboBoxItem Content="Projectile Impact"/>
478-
<ComboBoxItem Content="Projectile Detonation"/>
479-
<ComboBoxItem Content="Projectile Flyby"/>
480-
<ComboBoxItem Content="Unused"/>
481-
<ComboBoxItem Content="Weapon Fire"/>
482-
<ComboBoxItem Content="Weapon Ready"/>
483-
<ComboBoxItem Content="Weapon Reload"/>
484-
<ComboBoxItem Content="Weapon Empty"/>
485-
<ComboBoxItem Content="Weapon Charge"/>
486-
<ComboBoxItem Content="Weapon Overheat"/>
487-
<ComboBoxItem Content="Weapon Idle"/>
488-
<ComboBoxItem Content="Weapon Melee"/>
489-
<ComboBoxItem Content="Weapon Animation"/>
490-
<ComboBoxItem Content="Object Impacts"/>
491-
<ComboBoxItem Content="Particle Impacts"/>
492-
<ComboBoxItem Content="Unit Footsteps"/>
493-
<ComboBoxItem Content="Unit Dialog"/>
494-
<ComboBoxItem Content="Unit Animation"/>
495-
<ComboBoxItem Content="Vehicle Collision"/>
496-
<ComboBoxItem Content="Vehicle Engine"/>
497-
<ComboBoxItem Content="Vehicle Animation"/>
498-
<ComboBoxItem Content="Device Door"/>
499-
<ComboBoxItem Content="Device Machinery"/>
500-
<ComboBoxItem Content="Device Stationary"/>
501-
<ComboBoxItem Content="Music"/>
502-
<ComboBoxItem Content="Ambient Nature"/>
503-
<ComboBoxItem Content="Ambient Machinery"/>
504-
<ComboBoxItem Content="Huge Ass"/>
505-
<ComboBoxItem Content="Object Looping"/>
506-
<ComboBoxItem Content="Cinematic Music"/>
507-
<ComboBoxItem Content="Cortana Mission"/>
508-
<ComboBoxItem Content="Cortana Cinematic"/>
509-
<ComboBoxItem Content="Mission Dialog"/>
510-
<ComboBoxItem Content="Cinematic Dialog"/>
511-
<ComboBoxItem Content="Scripted Cinematic Foley"/>
512-
<ComboBoxItem Content="Game Event"/>
513-
<ComboBoxItem Content="UI"/>
514-
<ComboBoxItem Content="Test"/>
515-
<ComboBoxItem Content="Multilingual Test"/>
516-
</ComboBox>
517-
</GroupBox>
518-
<GroupBox Grid.Column="2" x:Name="import_box" Header="Import Type" VerticalAlignment="Stretch" Visibility="{Binding SelectedIndex, Converter={StaticResource H2VDropdownSelectionToVisibilityConverter}, ConverterParameter=1, ElementName=toolkit_selection}">
519-
<ComboBox x:Name="sound_import_type" VerticalAlignment="Center" SelectedIndex="0">
520-
<ComboBoxItem Content="Single Shot"/>
521-
<ComboBoxItem Content="Single Layer"/>
522-
<ComboBoxItem Content="Multi Layer"/>
523-
</ComboBox>
524-
</GroupBox>
525-
</Grid>
526457
<Grid Grid.Row="6">
527458
<Button x:Name="import_sound" Content="Compile Sound" VerticalAlignment="Bottom" Click="import_sound_Click" IsEnabled="{Binding Text.Length, ElementName=import_sound_path, Mode=OneWay}"/>
528459
</Grid>
@@ -564,21 +495,6 @@
564495
</Grid>
565496
<TextBox Grid.Column="3" Name="package_level_path" BorderBrush="{StaticResource brushWatermarkBorder}" VerticalAlignment="Center" Background="Transparent" MinHeight="26" MaxHeight="26"/>
566497
</Grid>
567-
<GroupBox Grid.Row="2" x:Name="package_box" Header="Settings" HorizontalAlignment="Stretch" VerticalAlignment="Top" MinHeight="90" Visibility="{Binding SelectedIndex, Converter={StaticResource PackageResourceVisibility}, ConverterParameter=0, ElementName=toolkit_selection}">
568-
<Grid>
569-
<Grid.RowDefinitions>
570-
<RowDefinition Height="5"/>
571-
<RowDefinition Height="Auto"/>
572-
<RowDefinition Height="8"/>
573-
<RowDefinition Height="Auto"/>
574-
</Grid.RowDefinitions>
575-
<CheckBox Grid.Row="1" x:Name="update_resource_maps" Content="Update resource maps (advanced)" HorizontalAlignment="Left" VerticalAlignment="Center"/>
576-
<ComboBox Grid.Row="3" x:Name="cache_type" SelectedIndex="0" VerticalAlignment="Center">
577-
<ComboBoxItem Content="PC"/>
578-
<ComboBoxItem Content="MCC"/>
579-
</ComboBox>
580-
</Grid>
581-
</GroupBox>
582498
<Button Grid.Row="3" Content="Package Level" VerticalAlignment="Bottom" Click="PackageLevel" IsEnabled="{Binding Text.Length, ElementName=package_level_path, Mode=OneWay}"/>
583499
</Grid>
584500
</Grid>

0 commit comments

Comments
 (0)