fix, removed disdrake from xapp

1 files changed, 17 insertions, 13 deletions

diff --git a/control-center b/control-center
index 44d8521f..b8e1f493 100755
--- a/control-center
+++ b/control-center
@@ -22,6 +22,7 @@
 
 use Config;
 use POSIX;
+use Data::Dumper;
 
 my $_xbindir = "/usr/X11R6/bin";
 my $_bindir = "/usr/bin";
@@ -37,6 +38,8 @@ my $_version = "0.70";
 use lib qw(/usr/lib/libDrakX);
 use common;
 use interactive;
+use standalone;
+
 my $in = 'interactive'->vnew('su', 'default');
 
 require Gtk;
@@ -59,7 +62,7 @@ my @treeitem_sub;
 # leaf: label, icon, parent, file_to_seek, exec, gtk/x, grep, num_xwininfo
 # hum need to have a function to install a package when clicked. => rpmdrake
 
-$::isWiz = (-e $_wizdir);
+$::isWiz = $in->do_pkgs->is_installed(q(wizard));
 
 my @tree_parent =
   ([_("Boot"), 'boot-mdk.png'],
@@ -134,20 +137,19 @@ my %tree_exec = (_("Boot Disk") => "$_xbindir/drakfloppy.real", _("Boot Config")
 		 );
 
 my %xapp = (_("Console") => ["rxvt", "rxvt", 1],
-#	    _("Mount Points") => ["$_sbindir/diskdrake", "Diskdrake", 2],
 	    _("client") => ["wiz $_wizdir/client_wizard/client.wiz", "wizdrake", 1],
-	    _("db") => ["wiz $_wizdir/db_wizard/db.wiz", "wizdrake", 1],
-	    _("dhcp") => ["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") => ["wiz $_wizdir/ftp_wizard/ftp.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") => ["wiz $_wizdir/news_wizard/news.wiz", "wizdrake", 1],
-	    _("postfix") => ["wiz $_wizdir/postfix_wizard/postfix.wiz", "wizdrake", 1],
-	    _("samba") => ["wiz $_wizdir/samba_wizard/samba.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") => ["wiz $_wizdir/web_wizard/web.wiz", "wizdrake", 1],
+	    _("Time") => ["wiz $_wizdir/time_wizard/time.wiz", "wizdrake", 1],
+	    _("Web Server") => ["wiz $_wizdir/web_wizard/web.wiz", "wizdrake", 1],
 	   );
 
 
@@ -193,7 +195,7 @@ $hpane_global->pack1($scrolled_global,0,1);
 
 my $notebook_global = new Gtk::Notebook;
 $notebook_global->set_show_border(0);
-$notebook_global->set_show_tabs(0);
+$notebook_global->set_show_tabs(1);
 $hpane_global->pack2($notebook_global,0,1);
 
 my $vbox_about = new Gtk::VBox(0,0);
@@ -296,6 +298,7 @@ sub exec_treeitem {
     }
     if (!$tree_launched{$label}->[0]) {
   	(member($label, keys(%xapp))) ? xplug($label) : gtkplug($label,$exec_string);
+	print Data::Dumper->Dump( [\@pid_launched]);
     } else {
 	$notebook_global->set_page($tree_launched{$label}->[0]);
     }
@@ -379,6 +382,7 @@ sub launch_xapp {
     my $b = "xwininfo -root -tree -int | grep '" . $_[0]->[1] . "'";
     my @before = split ('\n', `$b`);
     unless ($pid = fork) {
+	print $pid ."\n";
 	splash_warning(_("cannot fork: %s", $~)) unless defined $pid;
 	exec($_[0]->[0]);
     }