- disable autologin settings when autologin is disabled

- make embedded app look better
- add vertical separators

1 files changed, 12 insertions, 7 deletions

diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 811caa2fd..ec40b3a56 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -112,7 +112,7 @@ foreach (all('.')) {
 }
 my %combo = ('thms' => '', 'lilo' => '', 'boot' => '');
 foreach (keys(%combo)) {
-    $combo{$_} = new Gtk2::Combo;
+    $combo{$_} = gtkset_size_request(Gtk2::Combo->new, 10, -1);
     $combo{$_}->set_value_in_list(1, 0);
 }
 
@@ -254,18 +254,20 @@ Click on Configure to launch the setup wizard.", $lilogrub),
                        ),
                  #Splash Selector
                  gtkadd(my $thm_frame = new Gtk2::Frame( N("Splash selection")),
-                        gtkpack__(gtkset_border_width(new Gtk2::HBox(0,5),5),
-                                  gtkpack__(new Gtk2::VBox(0,5),
+                        gtkpack(gtkset_border_width(new Gtk2::HBox(0, 5), 5),
+                                  gtkpack__(new Gtk2::VBox(0, 5),
                                             N("Themes"),
                                             $combo{thms},
                                             N("\nSelect the theme for\nlilo and bootsplash,\nyou can choose\nthem separately"),
                                             $logo_thm),
-                                  gtkpack__(new Gtk2::VBox(0,5),
+                                  Gtk2::VSeparator->new,
+                                  gtkpack__(new Gtk2::VBox(0, 5),
                                             N("Lilo screen"),
                                             $combo{lilo},
                                             $lilo_pic,
                                             $B_create),
-                                  gtkpack__(new Gtk2::VBox(0,5),
+                                  Gtk2::VSeparator->new,
+                                  gtkpack__(new Gtk2::VBox(0, 5),
                                             N("Bootsplash"),
                                             $combo{boot},
                                             $boot_pic,
@@ -278,11 +280,11 @@ Click on Configure to launch the setup wizard.", $lilogrub),
                                                         $x_box->set_sensitive(!$x_mode);
                                                         $x_mode = !$x_mode;
                                                     }),
-                                  gtkpack__(gtkset_sensitive($x_box = Gtk2::HBox->new(0, 0), $x_mode),
+                                  gtkpack__(gtkset_sensitive($x_box = Gtk2::VBox->new(0, 0), $x_mode),
                                             gtkpack__(Gtk2::VBox->new(0, 0),
                                                       my @auto_buttons = gtkradio((N("Yes, I want autologin with this (user, desktop)")) x 2, N("No, I don't want autologin")),
                                                      ),
-                                            gtkpack__(new Gtk2::VBox(0, 10),
+                                            gtkpack__(my $auto_box = new Gtk2::VBox(0, 10),
                                                       $user_combo,
                                                       $desktop_combo
                                                      )
@@ -300,6 +302,9 @@ Click on Configure to launch the setup wizard.", $lilogrub),
                 )
       );
 
+$auto_buttons[0]->signal_connect('toggled' => sub { $auto_box->set_sensitive($auto_buttons[0]->get_active()) });
+$auto_buttons[1]->signal_connect('toggled' => sub { $auto_box->set_sensitive(!$auto_buttons[1]->get_active()) });
+
 $window->show_all();
 $no_bootsplash and $thm_frame->hide();
 gtkflush();