Version 1.0.4.9:

- Made a binding for the Profiles - Rewritten the Versions download closes #12 - Fixed a bug when starting Forge - Updated the Libraries Download - Added automatic Forge Installer - Worked on Localization #49 - Some other bug fixes and enhancements
JBou · Apr 10, 2014 · e3dd645 · e3dd645
1 parent d65e3fc
commit e3dd645
Show file tree

Hide file tree

Showing 19 changed files with 743 additions and 251 deletions.
diff --git a/MinecraftLauncher/MainWindow.xaml b/MinecraftLauncher/MainWindow.xaml
@@ -176,7 +176,7 @@
                     <Label Content="Ram" HorizontalAlignment="Right" Margin="0,0,291,10" VerticalAlignment="Bottom" Height="32" Width="78" FontSize="15" ToolTip="Nur verfügbar mit Java 64 bit" Visibility="Hidden"/>
                     <Button x:Name="btn_new_profile" Content="Neu" HorizontalAlignment="Left" Margin="10,0,0,10" VerticalAlignment="Bottom" Width="26" Height="33" MinWidth="50" TabIndex="4"/>
                     <Button x:Name="btn_edit_profile" Content="Bearbeiten" HorizontalAlignment="Left" Margin="65,0,0,10" VerticalAlignment="Bottom" Width="89" Height="33" TabIndex="5"/>
-                    <ComboBox x:Name="cb_profiles" HorizontalAlignment="Left" Margin="10,0,0,48" VerticalAlignment="Bottom" Width="218" Height="31" TabIndex="3"/>
+                    <ComboBox ItemsSource="{Binding Path=Profiles}" SelectedItem="{Binding selectedprofile, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="cb_profiles" HorizontalAlignment="Left" Margin="10,0,0,48" VerticalAlignment="Bottom" Width="218" Height="31" TabIndex="3"/>
                     <Button x:Name="btn_delete_profile" Content="Löschen" HorizontalAlignment="Left" Margin="159,0,0,10" VerticalAlignment="Bottom" Width="69" Height="33" TabIndex="6"/>
                     <ListBox x:Name="lb_libraries_extract" HorizontalAlignment="Left" Height="271" Margin="648,120,-48,0" VerticalAlignment="Top" Width="342" Visibility="Collapsed"/>
                     <ListBox x:Name="lb_libraries" HorizontalAlignment="Left" Height="271" Margin="-2,120,0,0" VerticalAlignment="Top" Width="320" Visibility="Collapsed"/>
@@ -210,7 +210,7 @@
             </TabItem>
             <TabItem Header="Mods">
                 <Grid>
-                    <ListView x:Name="lb_mods" Margin="10,77,0,35" Width="352" HorizontalAlignment="Left" BorderThickness="0" >
+                    <ListView x:Name="lb_mods" Margin="10,72,0,35" Width="352" HorizontalAlignment="Left" BorderThickness="0" >
                         <ListView.View>
                             <GridView ColumnHeaderContainerStyle="{StaticResource myHeaderStyle}">
                                 <GridViewColumn>
@@ -225,12 +225,12 @@
                             </GridView>
                         </ListView.View>
                     </ListView>
-                    <Label Content="Mods installieren in:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="367,10,0,0" Height="16" Padding="5,0"/>
-                    <TextBox x:Name="tb_modsfolder" Margin="395,62,110,0" VerticalAlignment="Top" IsReadOnly="True" Height="26"/>
-                    <Button x:Name="btn_resetmodsfoler" Margin="0,62,41,0" Content="Standard" HorizontalAlignment="Right" VerticalAlignment="Top" Height="26" />
-                    <Button x:Name="btn_selectmodsfolder" Margin="0,62,10,0" Content="..." HorizontalAlignment="Right" VerticalAlignment="Top" Width="26" Height="26" />
-                    <Image x:Name="img_installed" Height="23" Width="23" Margin="367,99,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="images/check_green.png"/>
-                    <Label x:Name="lbl_name" Margin="395,93,110,0" VerticalAlignment="Top" Height="29" FontWeight="Bold" VerticalContentAlignment="Center" Background="#00000000" Foreground="#FF1F94F5" FontSize="15" />
+                    <Label Content="Mods installieren in:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="367,10,0,0" Height="26" Padding="5,0" VerticalContentAlignment="Center"/>
+                    <TextBox x:Name="tb_modsfolder" Margin="517,41,110,0" VerticalAlignment="Top" IsReadOnly="True" Height="26"/>
+                    <Button x:Name="btn_resetmodsfoler" Margin="0,41,41,0" Content="Standard" HorizontalAlignment="Right" VerticalAlignment="Top" Height="26" />
+                    <Button x:Name="btn_selectmodsfolder" Margin="0,41,10,0" Content="..." HorizontalAlignment="Right" VerticalAlignment="Top" Width="26" Height="26" />
+                    <Image x:Name="img_installed" Height="23" Width="23" Margin="367,78,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="images/check_green.png"/>
+                    <Label x:Name="lbl_name" Margin="395,72,110,0" VerticalAlignment="Top" Height="29" FontWeight="Bold" VerticalContentAlignment="Center" Background="#00000000" Foreground="#FF1F94F5" FontSize="15" />
                     <DockPanel  Margin="367,0,10,10" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="32" >
                         <Button x:Name="btn_website" Content="Website besuchen" Height="32" Width="125" Margin="0,0,5,0" />
                         <Button x:Name="btn_video" Content="Video ansehen" Height="32" Width="125" Margin="5,0" />
@@ -242,25 +242,25 @@
                         </Button>
                         <Button Foreground="{DynamicResource AccentColorBrush}" x:Name="btn_downloadmod" Content="Installieren" Height="32" FontWeight="Bold" Margin="5,0,0,0" />
                     </DockPanel>
-                    <ScrollViewer Margin="367,161,10,47">
+                    <ScrollViewer Margin="367,106,10,47">
                         <StackPanel >
+                            <Label x:Name="lbl_type" VerticalAlignment="Top" Height="29" FontWeight="Bold" VerticalContentAlignment="Center" Background="{x:Null}" Foreground="#FFF51F1F" FontSize="15" />
                             <TextBox x:Name="tb_description" TextWrapping="Wrap" BorderThickness="0" HorizontalScrollBarVisibility="Visible" AcceptsReturn="True" IsReadOnly="True" VerticalContentAlignment="Top" VerticalScrollBarVisibility="Auto" Text="Markdown + Video in einen Webbrowser per html. Das ganze dann noch in eine Scrollview" Padding="5"/>
                             <local:AspectRatioLayoutDecorator AspectRatio="1.77777778" >
                                 <awe:WebControl x:Name="wc_mod_video" />
                             </local:AspectRatioLayoutDecorator>
                         </StackPanel>
                     </ScrollViewer>
-                    <ComboBox x:Name="cb_modversions" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="352" Height="31"/>
+                    <ComboBox x:Name="cb_modversions" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="352" Height="26"/>
                     <Button x:Name="btn_play" Content="Play" Margin="192,466,628,24" Visibility="Hidden" />
                     <TextBox x:Name="tb_downloadlink" HorizontalAlignment="Left" Height="26" Margin="362,439,-17,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="597" Visibility="Hidden"/>
-                    <Label x:Name="lbl_autor" Content="" Margin="517,93,10,0" VerticalAlignment="Top" Height="29" FontWeight="Bold" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" Background="#00000000" Foreground="#FF1F94F5" FontSize="15"/>
-                    <TextBox x:Name="tb_search_mods" Controls:TextboxHelper.ClearTextButton="True" Controls:TextboxHelper.Watermark="Suche" Margin="10,46,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="352" />
-                    <Label x:Name="lbl_type" Margin="367,127,80,0" VerticalAlignment="Top" Height="29" FontWeight="Bold" VerticalContentAlignment="Center" Background="{x:Null}" Foreground="#FFF51F1F" FontSize="15" />
-                    <ComboBox x:Name="cb_mods_profilename" HorizontalAlignment="Left" Margin="396,31,0,0" VerticalAlignment="Top" Width="262" Height="26"/>
-                    <RadioButton x:Name="rb_mods_profile" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="367,31,0,0" Height="26" Width="24" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
-                    <RadioButton x:Name="rb_mods_folder" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="367,62,0,0" Width="23" Height="26" IsChecked="True" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
+                    <Label x:Name="lbl_autor" Content="" Margin="517,72,80,0" VerticalAlignment="Top" Height="29" FontWeight="Bold" VerticalContentAlignment="Center" HorizontalContentAlignment="Right" Background="#00000000" Foreground="#FF1F94F5" FontSize="15"/>
+                    <TextBox x:Name="tb_search_mods" Controls:TextboxHelper.ClearTextButton="True" Controls:TextboxHelper.Watermark="Suche" Margin="10,41,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="352" />
+                    <ComboBox ItemsSource="{Binding Path=Profiles}" SelectedItem="{Binding selectedprofile, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" x:Name="cb_mods_profilename" HorizontalAlignment="Left" Margin="517,10,0,0" VerticalAlignment="Top" Width="168" Height="26"/>
+                    <RadioButton x:Name="rb_mods_profile" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="488,10,0,0" Height="26" Width="24" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
+                    <RadioButton x:Name="rb_mods_folder" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="488,41,0,0" Width="24" Height="26" IsChecked="True" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
                     <Label Content="SHIFT oder STRG für Mehrfachauswahl" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="10,0,0,10" Height="19" Width="352" Padding="5,0" HorizontalContentAlignment="Center"/>
-                    <ComboBox x:Name="cb_mods_description_language" HorizontalAlignment="Right" Margin="0,127,10,0" VerticalAlignment="Top" Width="65" Height="29"/>
+                    <ComboBox x:Name="cb_mods_description_language" HorizontalAlignment="Right" Margin="0,72,10,0" VerticalAlignment="Top" Width="65" Height="29"/>
                 </Grid>
             </TabItem>
             <TabItem Header="ResourcePacks" Visibility="Collapsed">