changing name

1 files changed, 23 insertions, 30 deletions

diff --git a/control-center b/control-center
index 70b7cf16..5ea3a1b2 100755
--- a/control-center
+++ b/control-center
@@ -23,7 +23,6 @@
 my $_xbindir = "/usr/X11R6/bin";
 my $_bindir = "/usr/bin";
 my $_sbindir = "/usr/sbin";
-my $_iconsdir = "/usr/share/icons";
 
 !$ENV{DISPLAY} and exec ("$_sbindir/drakxconf; reset");
 
@@ -41,10 +40,9 @@ Gtk->set_locale;
 use Config;
 use POSIX;
 
-my $_version = "0.95";
-
 my $in = 'interactive'->vnew('su', 'default');
 
+my $_version = "0.95";
 my $conffile = "/root/.mcc";
 my %h = getVarsFromSh($conffile);
 my $embedded;
@@ -55,8 +53,6 @@ defined $h{LOGS} or $h{LOGS} = bool2text(0);
 
 my ($log_check_box, $embedded_check_box);
 
-my $png_path="$_iconsdir";
-
 $::isWiz = -e "/usr/sbin/wizdrake"; #- $in->do_pkgs->is_installed(q(wizard));
 
 my $exec_hash = 
@@ -78,7 +74,7 @@ my $exec_hash =
    _("Connection Sharing") => [ "drakgw", "$_sbindir/drakgw", 1 ],
    _("Security Level") => [ "draksec", "$_sbindir/draksec", 1 ],
    _("Firewalling") => [ "tinyfirewall", "$_sbindir/tinyfirewall", 1 ],
-   _("Menus") => [ "menudrake", "$_sbindir/menus.pm", 1, "$_bindir/menudrake" ],
+   _("Menus") => [ "menudrake", "$_sbindir/menus_launcher.pl", 1, "$_bindir/menudrake" ],
    _("Services") => [ "drakxservices", "$_sbindir/drakxservices", 1 ],
    _("Fonts") => [ "drakfont", "$_sbindir/drakfont", 1 ],
    _("Date & Time") => [ "clock", "$_sbindir/clock.pm", 1 ],
@@ -98,55 +94,54 @@ my @tree =
     ],
     [_("Hardware"), 'drakhard-mdk',
      [
-      [_("Display"),'XFdrake-mdk', "$_sbindir/XFdrake"],
-      [_("Hardware"),'harddrake-mdk', "$_sbindir/harddrake"],
-      [_("Mouse"), 'mousedrake-mdk', "$_sbindir/mousedrake"],
-      [_("Printer"),'printer-mdk', "$_sbindir/print.pm"],
-      [_("Keyboard"), 'keyboard-mdk', "$_sbindir/keyboarddrake"],
+      [_("Display"),'XFdrake-mdk'],
+      [_("Hardware"),'harddrake-mdk'],
+      [_("Mouse"), 'mousedrake-mdk'],
+      [_("Printer"),'printer-mdk'],
+      [_("Keyboard"), 'keyboard-mdk'],
      ]
     ],
     [_("Mount Points"),'partition-mdk',
      [
-      [_("Hard Drives"), 'diskdrake_hd', "$_sbindir/diskdrake --hd"],
-      [_("Removable disks"), 'diskdrake_other',"$_sbindir/diskdrake --removable"],
-      [_("NFS mount points"), 'diskdrake_nfs', "$_sbindir/diskdrake --nfs"],
-      [_("Samba mount points"), 'diskdrake_samba', "$_sbindir/diskdrake --smb"],
+      [_("Hard Drives"), 'diskdrake_hd'],
+      [_("Removable disks"), 'diskdrake_other'],
+      [_("NFS mount points"), 'diskdrake_nfs'],
+      [_("Samba mount points"), 'diskdrake_samba'],
      ]
     ],
     [_("Network & Internet"),'net-mdk',
      [
-      [_("Connection"), 'draknet-mdk', "$_sbindir/draknet"],
-      [_("Connection Sharing"),'drakgw-mdk', "$_sbindir/drakgw"],
+      [_("Connection"), 'draknet-mdk'],
+      [_("Connection Sharing"),'drakgw-mdk'],
       #[_("Proxy"), 'drakgw-mdk', "$_sbindir/drakproxy"],
      ],
     ],
     [_("Security"),'security-mdk',
      [
-      [_("Security Level"), 'draksec-mdk', "$_sbindir/draksec"],
-      [_("Firewalling"), 'firewall-mdk', "$_sbindir/tinyfirewall"],
+      [_("Security Level"), 'draksec-mdk'],
+      [_("Firewalling"), 'firewall-mdk'],
      ]
     ],
     [_("System"),'system-mdk',
      [
-      [_("Menus") , 'menudrake-mdk', "$_sbindir/menus.pm"],
-      [_("Services") , 'service-mdk', "$_sbindir/drakxservices"],
-      [_("Fonts"), 'drakfont-mdk', "$_sbindir/drakfont"],
-      [_("Date & Time") , 'time-mdk', "$_sbindir/clock.pm"],
-      [_("Software Manager"), 'harddrake-mdk', "$_bindir/rpmdrake"],
-      [_("Logs"), 'logdrake-mdk', "$_sbindir/logdrake"],
-      [_("Console"), 'drakboot-mdk', "$_xbindir/rxvt"],
+      [_("Menus") , 'menudrake-mdk'],
+      [_("Services") , 'service-mdk'],
+      [_("Fonts"), 'drakfont-mdk'],
+      [_("Date & Time") , 'time-mdk'],
+      [_("Software Manager"), 'harddrake-mdk'],
+      [_("Logs"), 'logdrake-mdk'],
+      [_("Console"), 'drakboot-mdk'],
      ]
     ],
     if_($::isWiz,
 	[_("Configuration Wizards"), 'wizard-mdk',
 	 [
-	  [_("Servers"),'draknet-mdk', "$_sbindir/wizdrake"],
+	  [_("Servers"),'draknet-mdk'],
 	 ]
 	]),
   );
 
 #-------------------------------------------------------------
-my @menu_items = 
 
 my $nb_pages=0;
 my $window_global = new Gtk::Window -toplevel;
@@ -416,8 +411,6 @@ foreach (0..$#tree) {
   Gtk->main_iteration while Gtk->events_pending;
 }
 $notebook_global->set_page(0);
-my @anim;
-($anim[$_]->[0], $anim[$_]->[1]) = gtkcreate_png("$png_path/anim_" . ($_ + 1) . ".png") foreach (0..9);
 
 $window_global->set_default_size(715, 515);
 $window_global->set_position(1);