another layout change

1 files changed, 29 insertions, 30 deletions

diff --git a/cest_ton_boot b/cest_ton_boot
index 4168853d..54583c33 100755
--- a/cest_ton_boot
+++ b/cest_ton_boot
@@ -44,13 +44,13 @@ local $_ = join '', @ARGV;
 /-h/ and die I_("usage: drakfloppy\n");
 
 $x_mode = 0;
+$a_mode = (-e "/etc/aurora/Monitor");
 
 my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel;
 $window->signal_connect( 'delete_event', sub { $::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0) });
 $window->set_title( I_("ce soir tu choisis ton boot") );
 #$window->set_policy('automatic', 'automatic');
 $window->set_policy(0, 0, 0);
-#$window->set_usize( 300, 300 );
 $window->border_width (10);
 
 ### menus definition
@@ -92,28 +92,31 @@ $global_vbox->pack_start (new Gtk::Label(I_("special c'est ton choix")), 0, 0, 0
 
 ######## aurora part
 my $aurora_frame = new Gtk::Frame( I_("Boot mode") );
-my $aurora_sw = new Gtk::ScrolledWindow();
-$aurora_sw->set_policy( 'automatic', 'automatic' );
-#$aurora_sw->set_usize( 500, 500 );
-my $box2 = new Gtk::VBox(0,10);
-$box2->border_width(10);
+my $a_dedans = new Gtk::VBox( 0, 10 );
+$a_dedans->border_width (5);
+my $a_box = new Gtk::VBox(0, 0 );
 
-$button = new Gtk::RadioButton I_("horizontal nice looking aurora");
-$button->set_active(1);
-$box2->pack_start($button, 1, 1, 0);
+my $a_button = new Gtk::CheckButton( I_("Launch Aurora at boot time") );
+$a_button->signal_connect( "clicked", sub {
+			     ($a_mode) ? $a_box->set_sensitive(0) : $a_box->set_sensitive(1);
+			     $a_mode = !$a_mode;
+			   });
+$a_dedans->pack_start ($a_button, 0, 0, 0);
 
-$button = new Gtk::RadioButton I_("vertical traditionnal aurora"), $button;
-$box2->pack_start($button, 1, 1, 0);
+my $a_h_button = new Gtk::RadioButton I_("horizontal nice looking aurora");
+$a_h_button->set_active(1);
+$a_box->pack_start($a_h_button, 1, 1, 0);
 
-$button = new Gtk::RadioButton I_("gMonitor (choose this only if you have a non FrameBuffer kernel"), $button;
-$box2->pack_start($button, 1, 1, 0);
+my $a_v_button = new Gtk::RadioButton I_("vertical traditionnal aurora"), $a_h_button;
+$a_box->pack_start($a_v_button, 1, 1, 0);
 
-$button = new Gtk::RadioButton I_("old text based boot"), $button;
-$box2->pack_start($button, 1, 1, 0);
+my $a_g_button = new Gtk::RadioButton I_("gMonitor (choose this only if you have a non FrameBuffer kernel"), $a_h_button;
+$a_box->pack_start($a_g_button, 1, 1, 0);
 
-$aurora_sw->add_with_viewport ($box2);
-$aurora_frame->add($aurora_sw);
-$global_vbox->pack_start ($aurora_frame, 0, 0, 0);
+$a_box->set_sensitive (0);
+$a_dedans->pack_start ($a_box, 0, 0, 0);
+$aurora_frame->add($a_dedans);
+$global_vbox->pack_start ($aurora_frame, 1, 1, 0);
 
 ### X mode
 my $x_main_frame = new Gtk::Frame( I_("System mode") );
@@ -123,22 +126,18 @@ my $x_box = new Gtk::VBox(0, 0 );
 
 my $x_button = new Gtk::CheckButton( I_("Launch the X-Window system at start") );
 $x_button->signal_connect( "clicked", sub {
-				  if ($x_mode) {
-				    $x_box->set_sensitive(0)
-				  } else {
-				    $x_box->set_sensitive(1);
-				  }
-				    $x_mode = !$x_mode;
-				});
+			     ($x_mode) ? $x_box->set_sensitive(0) : $x_box->set_sensitive(1);
+			     $x_mode = !$x_mode;
+			   });
 $x_dedans->pack_start ($x_button, 0, 0, 0);
 
 
-$button = new Gtk::RadioButton I_("no, I do not want autologin"), $button;
-$button->set_active(1);
-$x_box->pack_start($button, 1, 1, 0);
+my $x_no_button = new Gtk::RadioButton I_("no, I do not want autologin");
+#$x_no_button->set_active(1);
+$x_box->pack_start($x_no_button, 1, 1, 0);
 
-$button = new Gtk::RadioButton I_("yes, I want it with all my friends"), $button;
-$x_box->pack_start($button, 1, 1, 0);
+my $x_yes_button = new Gtk::RadioButton I_("yes, I want it with all my friends"), $x_no_button;
+$x_box->pack_start($x_yes_button, 1, 1, 0);
 
 my $user_dedans = new Gtk::VBox( 0, 10 );
 $user_dedans->border_width (0);