updated

1 files changed, 100 insertions, 92 deletions

diff --git a/control-center b/control-center
index a311bcef..e67125c6 100755
--- a/control-center
+++ b/control-center
@@ -70,8 +70,8 @@ my @tree_parent =
    [_("Network & Internet"),'net-mdk.png'],
    [_("Security"),'security-mdk.png'],
    [_("System"),'system-mdk.png'],
-   if_($::isWiz, [_("Wizard"), 'net-mdk.png']) 
-  );
+   if_($::isWiz, [_("Servers"),'net-mdk.png'])
+);
 
 my @tree_app = 
   ([_("Boot Disk"), 'drakfloppy-mdk.png',1] , [_("Boot Config"),'drakboot-mdk.png',1], [_("Auto Install"), 'drakfloppy-mdk.png', 1],
@@ -88,19 +88,21 @@ my @tree_app =
    [_("Software Manager"), 'harddrake-mdk.png',5], [_("Logs"), 'logdrake-mdk.png',5],
    [_("Console"), 'drakboot-mdk.png', 5],
 
-   if_($::isWiz,[_("client"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("Database"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("Dhcp Server"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("DNS"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("Firewall"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("Ftp Server"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("global"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("News Server"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("Mail Server"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("Samba Server"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("server"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("Time"), 'drakboot-mdk.png', 6]),
-   if_($::isWiz,[_("Web Server"), 'drakboot-mdk.png', 6]),
+   if_($::isWiz,[_("Configuration Wizards"), 'service-mdk.png', 6]),
+
+#     if_($::isWiz,[_("client"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("Database"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("Dhcp Server"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("DNS"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("Firewall"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("Ftp Server"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("global"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("News Server"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("Mail Server"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("Samba Server"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("server"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("Time"), 'drakboot-mdk.png', 6]),
+#     if_($::isWiz,[_("Web Server"), 'drakboot-mdk.png', 6]),
    );
 
 my %tree_exec = (_("Boot Disk") => "$_xbindir/drakfloppy.real", _("Boot Config") => "$_sbindir/drakboot", _("Auto Install") => "$_sbindir/drakautoinst",
@@ -121,35 +123,36 @@ my %tree_exec = (_("Boot Disk") => "$_xbindir/drakfloppy.real", _("Boot Config")
 		 _("Logs") => "$_sbindir/logdrake",
 		 _("Console") => "$_xbindir/rxvt",
 		 # wizard java
-		 _("client") => "$_wizdir/client_wizard/client.wiz",
-		 _("Database") => "$_wizdir/db_wizard/db.wiz",
-		 _("Dhcp Server") => "$_wizdir/dhcp_wizard/dhcp.wiz",
-		 _("DNS") => "$_wizdir/dns_wizard/dns.wiz",
-		 _("Firewall") => "$_wizdir/firewall_wizard/firewall.wiz",
-		 _("Ftp Server") => "$_wizdir/ftp_wizard/ftp.wiz",
-		 _("global") => "$_wizdir/global_wizard/global.wiz",
-		 _("News Server") => "$_wizdir/news_wizard/news.wiz",
-		 _("Mail Server") => "$_wizdir/postfix_wizard/postfix.wiz",
-		 _("Samba Server") => "$_wizdir/samba_wizard/samba.wiz",
-		 _("server") => "$_wizdir/server_wizard/server.wiz",
-		 _("Time") => "$_wizdir/time_wizard/time.wiz",
-		 _("Web Server") => "$_wizdir/web_wizard/web.wiz",
+		 _("Configuration Wizards") => "$_sbindir/wizdrake",
+#  		 _("client") => "$_wizdir/client_wizard/client.wiz",
+#  		 _("Database") => "$_wizdir/db_wizard/db.wiz",
+#  		 _("Dhcp Server") => "$_wizdir/dhcp_wizard/dhcp.wiz",
+#  		 _("DNS") => "$_wizdir/dns_wizard/dns.wiz",
+#  		 _("Firewall") => "$_wizdir/firewall_wizard/firewall.wiz",
+#  		 _("Ftp Server") => "$_wizdir/ftp_wizard/ftp.wiz",
+#  		 _("global") => "$_wizdir/global_wizard/global.wiz",
+#  		 _("News Server") => "$_wizdir/news_wizard/news.wiz",
+#  		 _("Mail Server") => "$_wizdir/postfix_wizard/postfix.wiz",
+#  		 _("Samba Server") => "$_wizdir/samba_wizard/samba.wiz",
+#  		 _("server") => "$_wizdir/server_wizard/server.wiz",
+#  		 _("Time") => "$_wizdir/time_wizard/time.wiz",
+#  		 _("Web Server") => "$_wizdir/web_wizard/web.wiz",
 		 );
 
 my %xapp = (_("Console") => ["rxvt", "rxvt", 1],
-	    _("client") => ["wiz $_wizdir/client_wizard/client.wiz", "wizdrake", 1],
-	    _("Database") => ["wiz $_wizdir/db_wizard/db.wiz", "wizdrake", 1],
-	    _("Dhcp Server") => ["wiz $_wizdir/dhcp_wizard/dhcp.wiz", "wizdrake", 1],
-	    _("DNS") => ["wiz $_wizdir/dns_wizard/dns.wiz", "wizdrake", 1],
-	    _("Firewall") => ["wiz $_wizdir/firewall_wizard/firewall.wiz", "wizdrake", 1],
-	    _("Ftp Server") => ["wiz $_wizdir/ftp_wizard/ftp.wiz", "wizdrake", 1],
-	    _("global") => ["wiz $_wizdir/global_wizard/global.wiz", "wizdrake", 1],
-	    _("News Server") => ["wiz $_wizdir/news_wizard/news.wiz", "wizdrake", 1],
-	    _("Mail Server") => ["wiz $_wizdir/postfix_wizard/postfix.wiz", "wizdrake", 1],
-	    _("Samba Server") => ["wiz $_wizdir/samba_wizard/samba.wiz", "wizdrake", 1],
-	    _("server") => ["wiz $_wizdir/server_wizard/server.wiz", "wizdrake", 1],
-	    _("Time") => ["wiz $_wizdir/time_wizard/time.wiz", "wizdrake", 1],
-	    _("Web Server") => ["wiz $_wizdir/web_wizard/web.wiz", "wizdrake", 1],
+#  	    _("client") => ["wiz $_wizdir/client_wizard/client.wiz", "wizdrake", 1],
+#  	    _("Database") => ["wiz $_wizdir/db_wizard/db.wiz", "wizdrake", 1],
+#  	    _("Dhcp Server") => ["wiz $_wizdir/dhcp_wizard/dhcp.wiz", "wizdrake", 1],
+#  	    _("DNS") => ["wiz $_wizdir/dns_wizard/dns.wiz", "wizdrake", 1],
+#  	    _("Firewall") => ["wiz $_wizdir/firewall_wizard/firewall.wiz", "wizdrake", 1],
+#  	    _("Ftp Server") => ["wiz $_wizdir/ftp_wizard/ftp.wiz", "wizdrake", 1],
+#  	    _("global") => ["wiz $_wizdir/global_wizard/global.wiz", "wizdrake", 1],
+#  	    _("News Server") => ["wiz $_wizdir/news_wizard/news.wiz", "wizdrake", 1],
+#  	    _("Mail Server") => ["wiz $_wizdir/postfix_wizard/postfix.wiz", "wizdrake", 1],
+#  	    _("Samba Server") => ["wiz $_wizdir/samba_wizard/samba.wiz", "wizdrake", 1],
+#  	    _("server") => ["wiz $_wizdir/server_wizard/server.wiz", "wizdrake", 1],
+#  	    _("Time") => ["wiz $_wizdir/time_wizard/time.wiz", "wizdrake", 1],
+#  	    _("Web Server") => ["wiz $_wizdir/web_wizard/web.wiz", "wizdrake", 1],
 	   );
 
 
@@ -285,7 +288,7 @@ sub st {
 
 sub exec_treeitem {
     my ($label, $exec_string, $available) = @_;
-    $scrolled_global->set_usize($label eq _("Software Manager") ? 1 : 210, 0);
+#    $scrolled_global->set_usize($label eq _("Software Manager") ? 1 : 210, 0);
     if (!$available) {
 	my $vbox = new Gtk::VBox(0, 0);
 	$vbox->pack_start( new Gtk::Label( _("The application cannot be loaded,\nthe file '%s' has not been found.\nTry to install it.", $exec_string)), 1, 0, 0);
@@ -305,62 +308,67 @@ sub exec_treeitem {
 
 sub gtkplug {
     my ($label, $exec_string) =@_;
-    my $vbox = new Gtk::VBox(0, 0);
-    $vbox->show;
-    my $vbox2 = new Gtk::VBox(0, 0);
-    $vbox2->show;
-    $global_vbox=\$vbox2;
-    $vbox->pack_start($vbox2,1,0,0);
-    my $label_ = new Gtk::Label (_("Please wait while loading ..."));
-    $vbox2->pack_start( $label_, 0, 0, 0);
-    $label_->show;
-    my $hbox = new Gtk::HBox(0, 0);
-    $hbox->show;
-    $vbox2->pack_start($hbox,0,0,0);
-    my $darea1= new Gtk::DrawingArea();
-    $darea1->size(350,12);
-    $darea1->set_usize(340,12);
-    $frame0 = new Gtk::Frame;
-    $frame0->add($darea1);
-    $frame0->show;
-    $darea1->show;
-    $frame0->set_shadow_type('etched_out');
-    $hbox->pack_start($frame0,1,0,0);
-    my $socket = new Gtk::Socket;
-    $global_socket = \$socket;
-    $vbox->pack_start($socket, 1, 1, 0);
-    $notebook_global->append_page($vbox, "");
-    $nb_pages++;
-    $tree_launched{$label}->[0]=$nb_pages;
-    $notebook_global->set_page($nb_pages);
-    $tree_launched{$_}->[0] or ${$tree_launched{$_}->[1]} and ${$tree_launched{$_}->[1]}->set_sensitive(0) foreach (keys %tree_launched);
-    my $anim_nb=0;
-    $global_time_tag = Gtk->timeout_add(100, sub {
-					    $darea1->window->draw_pixmap
-					      ($darea1->style->white_gc,
-					       $anim[$anim_nb]->[0], 0, 0,
-					       ($darea1->allocation->[2]-340)/2, ($darea1->allocation->[3]-15)/2,
-					       350, 13);
-					    $anim_nb++;
-					    $anim_nb > 9 and $anim_nb=0;
-					    1;
-					});
-    $lock_time_tag = Gtk->timeout_add(15000, sub {
-					  Gtk->timeout_remove($global_time_tag);
-					  ${$tree_launched{$_}->[1]} and ${$tree_launched{$_}->[1]}->set_sensitive(1) foreach (keys %tree_launched);
-					  $vbox->pack_start(new Gtk::Label (_("After 20 sec., Failed to launch \nSee if it's installed")), 1, 1, 0);
+    my $a;
+    if($label eq _("Software Manager")) {
+	$a = $exec_string;
+    } else {
+	my $vbox = new Gtk::VBox(0, 0);
+	$vbox->show;
+	my $vbox2 = new Gtk::VBox(0, 0);
+	$vbox2->show;
+	$global_vbox=\$vbox2;
+	$vbox->pack_start($vbox2,1,0,0);
+	my $label_ = new Gtk::Label (_("Please wait while loading ..."));
+	$vbox2->pack_start( $label_, 0, 0, 0);
+	$label_->show;
+	my $hbox = new Gtk::HBox(0, 0);
+	$hbox->show;
+	$vbox2->pack_start($hbox,0,0,0);
+	my $darea1= new Gtk::DrawingArea();
+	$darea1->size(350,12);
+	$darea1->set_usize(340,12);
+	$frame0 = new Gtk::Frame;
+	$frame0->add($darea1);
+	$frame0->show;
+	$darea1->show;
+	$frame0->set_shadow_type('etched_out');
+	$hbox->pack_start($frame0,1,0,0);
+	my $socket = new Gtk::Socket;
+	$global_socket = \$socket;
+	$vbox->pack_start($socket, 1, 1, 0);
+	$notebook_global->append_page($vbox, "");
+	$nb_pages++;
+	$tree_launched{$label}->[0]=$nb_pages;
+	$notebook_global->set_page($nb_pages);
+	$tree_launched{$_}->[0] or ${$tree_launched{$_}->[1]} and ${$tree_launched{$_}->[1]}->set_sensitive(0) foreach (keys %tree_launched);
+	my $anim_nb=0;
+	$global_time_tag = Gtk->timeout_add(100, sub {
+						$darea1->window->draw_pixmap
+						  ($darea1->style->white_gc,
+						   $anim[$anim_nb]->[0], 0, 0,
+						   ($darea1->allocation->[2]-340)/2, ($darea1->allocation->[3]-15)/2,
+						   350, 13);
+						$anim_nb++;
+						$anim_nb > 9 and $anim_nb=0;
+						1;
+					    });
+	$lock_time_tag = Gtk->timeout_add(15000, sub {
+					      Gtk->timeout_remove($global_time_tag);
+					      ${$tree_launched{$_}->[1]} and ${$tree_launched{$_}->[1]}->set_sensitive(1) foreach (keys %tree_launched);
+					      $vbox->pack_start(new Gtk::Label (_("After 20 sec., Failed to launch \nSee if it's installed")), 1, 1, 0);
 					  $label_->set(_("After 15 sec., Failed to launch '%s'\nSee if it's installed", $exec_string)); $darea1->hide;
-				      });
-    
-    $socket->realize;
-    #$label->destroy;
-    my $a = $exec_string . " --embedded " . $socket->window->XWINDOW . " " . $$;
+					  });
+	
+	$socket->realize;
+	#$label->destroy;
+	$a = $exec_string . " --embedded " . $socket->window->XWINDOW . " " . $$;
+    }
     my $pid;
     unless ($pid = fork) {
 	splash_warning(_("cannot fork: %s", $~)) unless defined $pid;
 	exec("$a");
     }
-    $pid_launched[$nb_pages-1] = $pid;
+    $pid_launched[$nb_pages-1] = $pid unless $label eq _("Software Manager");
 }
 
 sub xplug {