update

1 files changed, 12 insertions, 30 deletions

diff --git a/control-center b/control-center
index d820000b..27e7575f 100755
--- a/control-center
+++ b/control-center
@@ -1,6 +1,5 @@
 #!/usr/bin/perl -w 
-
-# Control-center
+# $Id$
 
 # Copyright (C) 1999-2001 MandrakeSoft
 #                                 Damien Krotkine (damien@mandrakesoft.com)
@@ -37,7 +36,7 @@ my $_sbindir = "/usr/sbin";
 my $_iconsdir = "/usr/share/icons";
 my $_docdir = "/usr/share/doc";
 
-my $_version = "0.62";
+my $_version = "0.70";
 
 sub _ {
     my $s = shift @_; my $t = I_($s);
@@ -107,12 +106,10 @@ $hpane_global->pack1($scrolled_global,0,1);
 
 my $notebook_global = new Gtk::Notebook;
 $notebook_global->set_show_border(0);
-$notebook_global->set_show_tabs(1);
+$notebook_global->set_show_tabs(0);
 $hpane_global->pack2($notebook_global,0,1);
 
-
 my ($pix_splash_map, $pix_splash_mask) = gtkcreate_png("$xpm_path_l/splash.png");
-
 my @anim;
 ($anim[$_]->[0], $anim[$_]->[1]) = gtkcreate_png("$xpm_path_l/anim_" . ($_ + 1) . ".png") foreach (0..9);
 
@@ -143,11 +140,11 @@ map {
 } ([_("Boot Disk"), 'drakfloppy-mdk.png',4] , [_("Boot Config"),'drakboot-mdk.png',4] , 
    [_("Display"),'XFdrake-mdk.png',3] , [_("Hardware"),'harddrake-mdk.png',3] , [_("Mouse"), 'mousedrake-mdk.png',3] ,
    [_("Printer"),'printer-mdk.png',3] , [_("Keyboard"), 'keyboard-mdk.png',3],
-   [_("Connection") , 'draknet-mdk.png',2] , [_("Connection Sharing"),'drakgw-mdk.png',2], [_("Samba Conf") , 'menudrake-mdk.png',2],
+   [_("Connection") , 'draknet-mdk.png',2] , [_("Connection Sharing"),'drakgw-mdk.png',2],
    [_("Security Level"), 'draksec-mdk.png',1],  [_("Firewalling"), 'firewall-mdk.png',1],
    [_("Menus") , 'menudrake-mdk.png',0], [_("Services") , 'service-mdk.png' , 0],
    [_("Fonts"), 'drakfont-mdk.png',0], [_("Date & Time") , 'time-mdk.png',0],
-   [_("Software Manager"), 'harddrake-mdk.png',0],[_("test gecko"), 'draknet-mdk.png',0]
+   [_("Software Manager"), 'harddrake-mdk.png',0],[_("Console"), 'draknet-mdk.png',0]
    );
 
 my %tree_exec = (_("Boot Disk") => "$_xbindir/drakfloppy.real", _("Boot Config") => "$_sbindir/drakboot", 
@@ -156,7 +153,6 @@ my %tree_exec = (_("Boot Disk") => "$_xbindir/drakfloppy.real", _("Boot Config")
 		 _("Printer") => "$_sbindir/printerdrake" , _("Keyboard") => "$_sbindir/keyboarddrake" ,
 		 _("Connection") => "$_sbindir/draknet" ,
 		 _("Connection Sharing") => "$_sbindir/drakgw" ,
-                 _("Samba Conf") => "/sbin/smbdrake",
 		 _("Firewalling") => "$_sbindir/tinyfirewall" ,
 		 _("Security Level") => "$_sbindir/draksec" ,
 		 _("Date & Time") => "$_sbindir/clock.pm",
@@ -164,7 +160,7 @@ my %tree_exec = (_("Boot Disk") => "$_xbindir/drakfloppy.real", _("Boot Config")
 		 _("Services") => "$_sbindir/drakxservices",
 		 _("Fonts") => "$_xbindir/drakfont",
 		 _("Software Manager") => "$_bindir/rpmdrake",
-		 _("test gecko") => "./gecko.pm",
+		 _("Console") => "./gecko.pm",
 		 );
 
 my @pid_launched;
@@ -376,27 +372,19 @@ sub exec_treeitem {
     }
     if (!$tree_launched{$label}->[0]) {
 
-  	if ($label eq _("Printer") && -e "/usr/bin/mozilla") {
+  	if ($label eq _("Console")) {
 	    my $socket = new Gtk::Socket;
 	    $notebook_global->append_page($socket, new Gtk::Label(""));
 	    $nb_pages++;
 	    $tree_launched{$label}->[0]=$nb_pages;
 	    $notebook_global->set_page($nb_pages);
 	    $socket->realize;
-	    #$socket->steal(launch_wait("LC_ALL=C perl /home/yves/c/soft/control-center/control-center", "control-center",2,5));
-	    #$socket->steal(launch_wait("kmail", "kmail",2,5));
-	    $socket->steal(launch_wait("rxvt", "rxvt",1,10));
-	    #$socket->steal(launch_wait("mozilla", "mozilla",6,10));
-	    #$socket->steal(launch_wait("kups", "kups",2));
-	    #$socket->steal(launch_wait("LC_ALL=C konqueror", "konqueror",3));
-	    #$socket->steal(launch_wait("linuxconf", "linuxconf",3,5));
-	    #$socket->steal(launch_wait("LC_ALL=C nautilus --no-desktop", "nautilus",8));
-	    $notebook_global->show_all();
+	    $socket->steal(launch_wait("rxvt", "rxvt",1));
+	    $notebook_global->show_all();	    
 	    $notebook_global->set_page($nb_pages);
 	    return;
 	}
-#	$label eq _("Software Manager") and system($exec_string . " --embedded &" ), return;
-	$label eq _("Samba Conf") and system($exec_string . " & "), return;
+	#$label eq _("Samba Conf") and system($exec_string . " & "), return;
 	my $vbox = new Gtk::VBox(0, 0);
 	$vbox->show;
 	my $vbox2 = new Gtk::VBox(0, 0);
@@ -452,19 +440,14 @@ sub exec_treeitem {
 	    splash_warning(_("cannot fork: $~")) unless defined $pid;
 	    exec("$a");
 	}
-
 	$pid_launched[$nb_pages-1] = $pid;
-
-	print "test 1\n $nb_pages\n";
-	print "$pid_launched[$nb_pages]\n";
     } else {
 	$notebook_global->set_page($tree_launched{$label}->[0]);
     }
 }
 
 sub launch_wait {
-    my ($exec, $grep, $num,$zz) = @_;
-    my ($exec, $grep, $num) = @_;
+    my ($exec, $grep, $num, $zz) = @_;
     print "{{ $exec }}\n";
     my $b = "xwininfo -root -tree -int | grep '" . $grep . "'";
     my @before = split ('\n', `$b`);
@@ -473,7 +456,7 @@ sub launch_wait {
 	exec($exec);
     }
     $pid_launched[$nb_pages] = $pid;
-    $nb_pages++;
+#    $nb_pages++;
     my $res = 0;
     while (!$res) {
 	my @after = split ('\n', `$b`);
@@ -492,7 +475,6 @@ sub launch_wait {
 	$res=$1;
 	print "[" . $res . "]\n";
     }
-    sleep($zz);
     $res;
 }