updated

4 files changed, 43 insertions, 13 deletions

diff --git a/control-center b/control-center
index 3abf0e83..d5d830fc 100755
--- a/control-center
+++ b/control-center
@@ -22,6 +22,7 @@ my $_xbindir = "/usr/X11R6/bin";
 my $_bindir = "/usr/bin";
 my $_sbindir = "/usr/sbin";
 my $mcc_dir = "/usr/share/mcc";
+my $_wizdir = "/usr/share/wizards";
 
 !$ENV{DISPLAY} and exec ("$_sbindir/drakxconf; reset");
 
@@ -91,11 +92,37 @@ my $exec_hash =
    _("Date & Time") => [ "clock", "$_sbindir/clock.pl", 1 ],
    _("Software Manager") => [ "rpmdrake", "$_bindir/rpmdrake", -1 ],
    _("Logs") => [ "logdrake", "$_sbindir/logdrake", 1 ],
-   _("Console") => [ "rxvt", "$_xbindir/rxvt", 0, ["rxvt", "rxvt", 1] ],
-   _("Servers") => [ "wizdrake", "$_sbindir/wizdrake", 1 ],
+   _("Console") => [ "rxvt", "", 0, ["$_xbindir/rxvt", "rxvt", 1] ],
    _("Users") => [ "userdrake", "$_bindir/userdrake", 1 ],
+
+   _("DNS Client") => ["Client wizard", "wiz $_wizdir/client_wizard/client.wiz", -1 ],
+   _("DHCP") => ["DHCP wizard", "wiz $_wizdir/dhcp_wizard/dhcp.wiz",  -1 ],
+   _("DNS") => ["DNS wizard", "wiz $_wizdir/dns_wizard/dns.wiz", -1 ],
+   _("Firewall") => ["Firewall wizard", "wiz $_wizdir/firewall_wizard/firewall.wiz", -1 ],
+   _("FTP") => ["FTP wizard", "wiz $_wizdir/ftp_wizard/ftp.wiz", -1 ],
+   _("News") => ["News wizard", "wiz $_wizdir/news_wizard/news.wiz", -1 ],
+   _("Postfix") => ["Postfix wizard", "wiz $_wizdir/postfix_wizard/postfix.wiz", -1 ],
+   _("Proxy") => ["Squid wizard", "wiz $_wizdir/proxy_wizard/proxy.wiz", -1 ],
+   _("Samba") => ["Samba wizard", "wiz $_wizdir/samba_wizard/samba.wiz", -1 ],
+   _("Server") => ["Server wizard", "wiz $_wizdir/server_wizard/server.wiz", -1 ],
+   _("Time") => ["Time wizard", "wiz $_wizdir/time_wizard/time.wiz", -1 ],
+   _("Web") => ["Web wizard", "wiz $_wizdir/web_wizard/web.wiz", -1 ],
   };
 
+my %wizard = ( "client" => [ _("DNS Client"), 'server-mdk'],
+ 	       "dhcp" => [ _("DHCP"), 'server-mdk'],
+ 	       "dns" => [ _("DNS"), 'server-mdk'],
+ 	       "firewall" => [ _("Firewall"), 'server-mdk'],
+ 	       "ftp" => [ _("FTP"), 'server-mdk'],
+ 	       "news" => [ _("News"), 'server-mdk'],
+ 	       "postfix" => [ _("Postfix"), 'server-mdk'],
+ 	       "proxy" => [ _("Proxy"), 'server-mdk'],
+ 	       "samba" => [ _("Samba"), 'server-mdk'],
+ 	       "server" => [ _("Server"), 'server-mdk'],
+ 	       "time" => [ _("Time"), 'server-mdk'],
+ 	       "web" => [ _("Web"), 'server-mdk'],
+ 	     );
+
 my @tree =
   ( [_("Boot"), 'boot-mdk',  
      [
@@ -133,7 +160,7 @@ my @tree =
 	  (
 	   [ 'cdrom', _("CD-ROM"), sub { @{$cdroms_by_type{cdrom} || []} } ],
 	   [ 'dvd', _("DVD"), sub { @{$cdroms_by_type{DVD} || []} } ],
-	   [ 'cdburner', _("CD Burner"), sub { @{$cdroms_by_type{burner} || []} } ],
+	   [ 'cdwriter', _("CD Burner"), sub { @{$cdroms_by_type{burner} || []} } ],
 	   [ 'floppy', _("Floppy"), \&detect_devices::floppies ],
 	   [ 'zip', _("Zip"), \&detect_devices::zips ],
 	  ),
@@ -168,11 +195,13 @@ my @tree =
      ]
     ],
     if_($::isWiz,
-	[_("Configuration Wizards"), 'wizard-mdk',
-	 [
-	  [_("Servers"),'server-mdk'],
-	 ]
-	]),
+ 	[_("Server Configuration"), 'wizard-mdk',
+ 	 [
+ 	  ( map { if_(/wizards_lib-(\w+)-\d+.*/ && member($1, keys %wizard), $wizard{$1}) }
+	    split('\n', `rpm -qa | grep wizards_lib-`)
+	  )
+ 	 ]
+ 	]),
   );
 
 #-------------------------------------------------------------
@@ -444,10 +473,11 @@ $notebook_global->signal_connect( switch_page => sub {
 				  });
 $window_global->show_all;
 $emb_box->hide;
-foreach (0..$#tree) {
-  $notebook_global->set_page($_);
-  Gtk->main_iteration while Gtk->events_pending;
-}
+#my $p = $#tree + $::isWiz ? 1 : 0;
+#foreach (0..) {
+#  $notebook_global->set_page($_);
+#  Gtk->main_iteration while Gtk->events_pending;
+#}
 $notebook_global->set_page(0);
 
 $window_global->set_default_size(715, 515);
@@ -537,7 +567,7 @@ sub compute_exec_string {
 	    $emb_socket->realize;
 	    $exec = $exec . " --embedded " . $emb_socket->window->XWINDOW . " " . $$;
 	}
-	if ($gtkplug) {
+	if ($gtkplug > 0) {
 	    $emb_wait->show;
 	    $left_locked = 1;
 	    $pending_app = 1;
diff --git a/pixmaps/default/partition-mdk.png b/pixmaps/default/partition-mdk.png
index 4f59cd91..9901e599 100644
--- a/pixmaps/default/partition-mdk.png
+++ b/pixmaps/default/partition-mdk.png
diff --git a/pixmaps/default/partition-mdk2.png b/pixmaps/default/partition-mdk2.png
index 05da667c..907ce280 100644
--- a/pixmaps/default/partition-mdk2.png
+++ b/pixmaps/default/partition-mdk2.png
diff --git a/pixmaps/default/partition-mdk_highlight.png b/pixmaps/default/partition-mdk_highlight.png
index 120f6592..fe6f6b61 100644
--- a/pixmaps/default/partition-mdk_highlight.png
+++ b/pixmaps/default/partition-mdk_highlight.png