browser commented

1 files changed, 36 insertions, 27 deletions

diff --git a/control-center3 b/control-center3
index b49a1c78..2a383059 100755
--- a/control-center3
+++ b/control-center3
@@ -24,6 +24,7 @@
 use Gtk;
 use Gtk::Gdk::ImlibImage;
 use Config;
+use Env;
 use POSIX;
 # for i18n
 use Locale::GetText;
@@ -137,32 +138,35 @@ 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']);
+
 map {
-       create_tree_item($treeitem_sub[int($_->[2])],$_->[0], "$xpm_path/$_->[1]",0);
-   } ([_("Boot Loader"),'item.xpm',5] , [_("Boot Disk"), 'item.xpm',5] , [_("Boot Logo"), 'item.xpm',5],
-      [_("XFDrake"),'item.xpm',4] , [_("HardDrake"),'item.xpm',4] , [_("Mousedrake"), 'item.xpm',4] , [_("Printerdrake"),'item.xpm',4] , [_("Keyboarddrake"), 'item.xpm',4],
-      [_("Userdrake"),'item.xpm',3] ,
-      [_("Draknet") , 'item.xpm',2] , [_("Drakgw"),'item.xpm',2],
-      [_("Menudrake") , 'item.xpm',1] ,
-      [_("Drakfont"), 'item.xpm', 0]);
-      
-my %tree_exec = (_("Boot Loader") => " ../bootlookdrake/bootlookdrake", _("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" , 
-	      _("Userdrake") => "$_bindir/userdrake" , _("Draknet") => "$_sbindir/draknet" ,
-	      _("Drakgw") => "$_sbindir/drakgw" , _("Menudrake") => "$_bindir/menudrake" , _("Drakfont") => "$_xbindir/drakfont"
-	      );
+    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],
+   [_("XFDrake"),'item.xpm',4] , [_("HardDrake"),'item.xpm',4] , [_("Mousedrake"), 'item.xpm',4] , 
+   [_("Printerdrake"),'item.xpm',4] , [_("Keyboarddrake"), 'item.xpm',4],
+   [_("Userdrake"),'item.xpm',3] ,
+   [_("Draknet") , 'item.xpm',2] , [_("Drakgw"),'item.xpm',2],
+   [_("Menudrake") , 'item.xpm',1] ,
+   [_("Drakfont"), 'item.xpm',0]
+   );
+
+my %tree_exec = (_("Boot Loader") => "../bootlookdrake/bootlookdrake", _("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" , 
+		 _("Userdrake") => "$_bindir/userdrake" , _("Draknet") => "$_sbindir/draknet" ,
+		 _("Drakgw") => "$_sbindir/drakgw" , _("Menudrake") => "$_bindir/menudrake" , _("Drakfont") => "$_xbindir/drakfont"
+		 );
 
 my @pid_launched;
 my %tree_launched = (_("Boot Loader") => -1, _("Boot Disk") => -1, 
-	      _("Boot Logo") => -1 , _("XFDrake")  => -1 , 
-	      _("HardDrake") => -1 , _("Mousedrake") => -1 , 
-	      _("Printerdrake") => -1 , _("Keyboarddrake") => -1 , 
-	      _("Userdrake") => -1 , _("Draknet") => -1 ,
-	      _("Drakgw") => -1 , _("Menudrake") => -1 ,
-	      _("Drakfont") => -1
-	      );
+		     _("Boot Logo") => -1 , _("XFDrake")  => -1 , 
+		     _("HardDrake") => -1 , _("Mousedrake") => -1 , 
+		     _("Printerdrake") => -1 , _("Keyboarddrake") => -1 , 
+		     _("Userdrake") => -1 , _("Draknet") => -1 ,
+		     _("Drakgw") => -1 , _("Menudrake") => -1 ,
+		     _("Drakfont") => -1
+		     );
 
 #exec_treeitem("harddrake-auth",4);
 my $rc = "control-center.rc";
@@ -248,7 +252,7 @@ sub about_mdk_cc
     $button->signal_connect_object("clicked",$window_about => 'destroy');
     $bbox1->add($button);
     
-    my $label = new Gtk::Label( _("Mandrake Control Center 1.0 \n Copyright (C) 2001 Mandrakesoft SA\n") );
+    my $label = new Gtk::Label( _("Mandrake Control Center 0.61 \n Copyright (C) 2001 Mandrakesoft SA\n") );
     my $style1 = new Gtk::Style;
     $style1->font(Gtk::Gdk::Font->fontset_load(_("-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*")));
     $label->set_style($style1); 
@@ -286,7 +290,13 @@ sub splash_warning
 sub connect_to_site
 {
     my ($link)=@_;
-    my $browser="netscape";
+#    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 "))
 #    {
@@ -333,8 +343,8 @@ sub create_tree_item
     my ($parent_tree, $label, $pixmap, $tree_depth_max) =@_;
 
     my ($treeitem, $treebox, $new_subtree);
-
     $treeitem = new Gtk::TreeItem();
+    $treeitem_selected=$treeitem;
     $treebox = xpm_label_box($window_global,$pixmap,$label);
     $treeitem->add($treebox);
     $treebox->show();
@@ -448,7 +458,6 @@ sub exec_treeitem
 
 sub item_factory_cb {
     my ($widget, $action, @data) = @_;
-
     print "ItemFactory: activated ", $widget->item_factory_path(), " -> ", $action, "\n";
     $action == 1 and quit_global();
     $action == 4 and about_mdk_cc();
@@ -485,7 +494,7 @@ sub create_item_factory {
 	$box1 = new Gtk::VBox(0, 0);
 	$item_factory_window->add($box1);
 	$box1->pack_start($item_factory->get_widget('<main>'), 0, 0, 0);
-
+	
 	$label = new Gtk::Label( _("Type\n<alt>\nto start") );
 	
 	$label->set_usize(200, 200);