updated

1 files changed, 68 insertions, 72 deletions

diff --git a/control-center3 b/control-center3
index 2a383059..ba802bbd 100755
--- a/control-center3
+++ b/control-center3
@@ -136,21 +136,21 @@ $tree->set_selection_mode('browse');
 $vbox_global_left->pack_start($tree,1,1,0);
 map {
     create_tree_item($tree, $_->[0] , "$xpm_path_l/$_->[1]",1);
-} ([_("Boot"), 'logo.xpm'] , [_("Hardware"), 'logo.xpm'] , [_("User and Groups"),'logo.xpm'], 
-   [_("Network & Internet"),'logo.xpm'] , [_("Menu Customization"),'logo.xpm'] , [_("Font Management"),'logo.xpm']);
+} ([_("Boot"), 'drakboot-mdk.xpm'] , [_("Hardware"), 'logo.xpm'] , [_("User and Groups"),'adduserdrake-mdk.xpm'], 
+   [_("Network & Internet"),'draknet-mdk.xpm'] , [_("Menu Customization"),'menudrake-mdk.xpm'] , [_("Font Management"),'drakfont-mdk.xpm']);
 
 map {
     create_tree_item($treeitem_sub[int($_->[2])],$_->[0], "$xpm_path_l/$_->[1]",0);
-} ([_("Boot Loader"),'item.xpm',5] , [_("Boot Disk"), 'item.xpm',5] , [_("Boot Logo"), 'item.xpm',5],
+} ([_("Boot Loader"),'drakboot-mdk.xpm',5] , [_("Boot Disk"), 'drakboot-mdk.xpm',5] , [_("Boot Logo"), 'drakboot-mdk.xpm',5],
    [_("XFDrake"),'item.xpm',4] , [_("HardDrake"),'item.xpm',4] , [_("Mousedrake"), 'item.xpm',4] , 
-   [_("Printerdrake"),'item.xpm',4] , [_("Keyboarddrake"), 'item.xpm',4],
+   [_("Printerdrake"),'printer-mdk.xpm',4] , [_("Keyboarddrake"), 'keyboard-mdk.xpm',4],
    [_("Userdrake"),'item.xpm',3] ,
-   [_("Draknet") , 'item.xpm',2] , [_("Drakgw"),'item.xpm',2],
+   [_("Draknet") , 'draknet-mdk.xpm',2] , [_("Drakgw"),'drakgw-mdk.xpm',2],
    [_("Menudrake") , 'item.xpm',1] ,
-   [_("Drakfont"), 'item.xpm',0]
+   [_("Drakfont"), 'drakfont-mdk.xpm',0]
    );
 
-my %tree_exec = (_("Boot Loader") => "../bootlookdrake/bootlookdrake", _("Boot Disk") => "$_xbindir/drakfloppy", 
+my %tree_exec = (_("Boot Loader") => "$_sbindir/drakboot", _("Boot Disk") => "$_xbindir/drakfloppy", 
 		 _("Boot Logo") => "$_xbindir/DrakeLogo" , _("XFDrake")  => "$_sbindir/XFdrake --expert" , 
 		 _("HardDrake") => "$_bindir/harddrake-auth" , _("Mousedrake") => "$_sbindir/mousedrake" , 
 		 _("Printerdrake") => "$_sbindir/printerdrake" , _("Keyboarddrake") => "$_sbindir/keyboarddrake" , 
@@ -292,10 +292,7 @@ sub connect_to_site
     my ($link)=@_;
 #    my $browser=$ENV{'BROWSER'};
 #    system("$browser -geometry 600x800+10+10 $link &");
-    
-#}
 
-#=======
 #    my $browser="netscape";
     splash_warning(_("We won't launch a browser in root mode. This will be corrected, be patient."));
 #    if (system("$browser -geometry 600x800+10+10 -no-about-splash $link "))
@@ -304,40 +301,40 @@ sub connect_to_site
 #    }
 }
 
-my $treeitem_old;
-my $left = sub { &$next_child($_[0]->parent, 0); };
-my $right = sub {
-    print "RRRRRRRRRR\n";
-    my ($c) = @_;
-    if ($c->subtree) {
-	$c->expand;
-	($c->subtree->children)[0];
-    } else {
-	$c;
-    }
-};
-my $down = sub {
-    my ($c) = @_;
-    return &$right($c) if ref $c eq "Gtk::TreeItem" && $c->subtree && $c->expanded;
-
-    if (my $n = &$next_child($c, 1)) {
-	$n;
-    } else {
-	return if ref $c->parent ne 'Gtk::Tree';
-	&$down($c->parent);
-    }
-};
-my $up = sub {
-    my ($c) = @_;
-    if (my $n = &$next_child($c, -1)) {
-	$n = ($n->subtree->children)[-1] while ref $n eq "Gtk::TreeItem" && $n->subtree && $n->expanded;
-	$n;
-    } else {
-	return if ref $c->parent ne 'Gtk::Tree';
-	&$left($c);
-    }
-};
+#  my $left = sub { &$next_child($_[0]->parent, 0); };
+#  my $right = sub {
+#      print "RRRRRRRRRR\n";
+#      my ($c) = @_;
+#      if ($c->subtree) {
+#  	$c->expand;
+#  	($c->subtree->children)[0];
+#      } else {
+#  	$c;
+#      }
+#  };
+#  my $down = sub {
+#      my ($c) = @_;
+#      return &$right($c) if ref $c eq "Gtk::TreeItem" && $c->subtree && $c->expanded;
+
+#      if (my $n = &$next_child($c, 1)) {
+#  	$n;
+#      } else {
+#  	return if ref $c->parent ne 'Gtk::Tree';
+#  	&$down($c->parent);
+#      }
+#  };
+#  my $up = sub {
+#      my ($c) = @_;
+#      if (my $n = &$next_child($c, -1)) {
+#  	$n = ($n->subtree->children)[-1] while ref $n eq "Gtk::TreeItem" && $n->subtree && $n->expanded;
+#  	$n;
+#      } else {
+#  	return if ref $c->parent ne 'Gtk::Tree';
+#  	&$left($c);
+#      }
+#  };
 
+my $treeitem_old;
 sub create_tree_item
 {
     my ($parent_tree, $label, $pixmap, $tree_depth_max) =@_;
@@ -350,12 +347,12 @@ sub create_tree_item
     $treebox->show();
     if ($tree_depth_max == 0) {
 #	$treeitem->signal_connect('clicked', sub { exec_treeitem($label, $tree_exec{$label});});
-	$treeitem->signal_connect('select', sub { exec_treeitem($label, $tree_exec{$label});});
+	$treeitem->signal_connect('select', sub { print "EEEEE\n"; exec_treeitem($label, $tree_exec{$label}); });
     } else {
 	$treeitem->signal_connect('select', sub { $treeitem_old and $$treeitem_old->collapse(); $treeitem->expand(); $treeitem_old=\$treeitem;
 						  #$treeitem->deselect();
 					      });
-	$treeitem->signal_connect('deselect', sub { $treeitem->collapse(); });
+#	$treeitem->signal_connect('deselect', sub { $treeitem->collapse(); });
     }
     $parent_tree->append($treeitem);
     $treeitem->show();
@@ -368,31 +365,31 @@ sub create_tree_item
 	unshift(@treeitem_sub, $new_subtree);
     }
 
-    $treeitem->signal_connect(key_press_event => sub {
-        my (undef, $e) = @_;
-        local $_ = chr ($e->{keyval});
-
-	if ($e->{keyval} > 0x100) {
-	    my $n;
-	    $n = &$left($treeitem)  if /[Q´\x96]/;
-	    print "RRRRRRRR\n";
-	    $n = &$right($treeitem) if /[S¶\x98]/;
-	    print "RRRRRRRR\n";
-	    $n = &$up($treeitem)    if /[R¸\x97]/;
-	    $n = &$down($treeitem)  if /[T²\x99]/;
-	    if ($n) {
-		$n->focus('up');
-		$treeitem->signal_emit_stop("key_press_event"); 
-	    }
-	    $treeitem->expand if /[+«]/;
-	    $treeitem->collapse if /[-\xad]/;
-	    do {
-		$treeitem->expanded ? $treeitem->collapse : $treeitem->expand; 
-		$treeitem->signal_emit_stop("key_press_event"); 
-	    } if /[\r\x8d]/;
-	}
-        1;
-    });
+#      $treeitem->signal_connect(key_press_event => sub {
+#          my (undef, $e) = @_;
+#          local $_ = chr ($e->{keyval});
+
+#  	if ($e->{keyval} > 0x100) {
+#  	    my $n;
+#  	    $n = &$left($treeitem)  if /[Q´\x96]/;
+#  	    print "RRRRRRRR\n";
+#  	    $n = &$right($treeitem) if /[S¶\x98]/;
+#  	    print "RRRRRRRR\n";
+#  	    $n = &$up($treeitem)    if /[R¸\x97]/;
+#  	    $n = &$down($treeitem)  if /[T²\x99]/;
+#  	    if ($n) {
+#  		$n->focus('up');
+#  		$treeitem->signal_emit_stop("key_press_event"); 
+#  	    }
+#  	    $treeitem->expand if /[+«]/;
+#  	    $treeitem->collapse if /[-\xad]/;
+#  	    do {
+#  		$treeitem->expanded ? $treeitem->collapse : $treeitem->expand; 
+#  		$treeitem->signal_emit_stop("key_press_event"); 
+#  	    } if /[\r\x8d]/;
+#  	}
+#          1;
+#      });
 }
 
 sub xpm_label_box
@@ -423,8 +420,7 @@ sub xpm_label_box
     return ( $box );
 }
 
-sub exec_treeitem
-{
+sub exec_treeitem {
     my ($label, $exec_string) = @_;
     if ($exec_string) {
 	print _("SELECTED\n");