add menu entry and fix some stuffs

1 files changed, 21 insertions, 15 deletions

diff --git a/control-center3 b/control-center3
index f577ee34..291c34b5 100755
--- a/control-center3
+++ b/control-center3
@@ -68,7 +68,7 @@ $window_global->add($vbox_global);
 ######### menus
 my @item_factory_entries = (
 			    [_("/_File"),	undef,	0,	"<Branch>"],
-			    [_("/File/tearoff1"),	undef,	0,	"<Tearoff>"],
+			    #[_("/File/tearoff1"),	undef,	0,	"<Tearoff>"],
 			    {
 				'path' => _("/File/_Quit"), 
 				'accelerator' => _("<control>Q"),	
@@ -78,7 +78,11 @@ my @item_factory_entries = (
 			    [_("/_Help"),	undef,	0,	"<Branch>"],
 			    [_("/Help/_Mandrake Control Center"),	undef,	2],
 			    [_("/Help/_Report Bug"),  undef, 3 ],
-			    [_("/Help/_About..."),  undef,  4 ]
+			    [_("/Help/_About..."),  undef,  4 ],
+			    [_("/_Extras"),     undef, 0,    "<Branch>"],
+			    [_("/_Extras/_Mandrake Security News"), undef, 5],
+			    [_("/_Extras/_Mandrake Campus"), undef, 6],
+			    [_("/_Extras/_Mandrake Expert"), undef, 7],
 			    );
 
 my ($accel_group, $item_factory, $box1, $label, $box2);
@@ -132,7 +136,7 @@ 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 {
+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],
@@ -250,22 +254,21 @@ sub about_mdk_cc
     $window_about->set_modal(1);
 }
 
-sub help_mandrake_cc
+sub connect_to_site
 {
-    my $docdir="/usr/share/doc";
-    my $browser="netscape"; 
-  
-    system("$browser -geometry 600x800+10+10 -no-about-splash  $_docdir/Drakconf/help.html &");
-    
-} 
+    my ($link)=@_;
+    my $browser="netscape";
+    system("$browser -geometry 600x800+10+10 -no-about-splash $link &");
+}
 
-sub bug_report
+sub connect_exp_site
 {
-    my $bug_url="https://qa.mandrakesoft.com/dimension";
+    my $exp_site_url="http://www.mandrakeexpert.com/";
     my $browser="netscape";
-    system("$browser -geometry 600x800+10+10 -no-about-splash $bug_url &");
+    system("$browser -geometry 600x800+10+10 -no-about-splash $exp_site_url &")
 }
 
+
 sub create_tree_item
 {
     my ($parent_tree, $label, $pixmap, $tree_depth_max) =@_;
@@ -356,8 +359,11 @@ sub item_factory_cb {
     print "ItemFactory: activated ", $widget->item_factory_path(), " -> ", $action, "\n";
     $action == 1 and quit_global();
     $action == 4 and about_mdk_cc();
-    $action == 2 and help_mandrake_cc();
-    $action == 3 and bug_report();
+    $action == 2 and connect_to_site("/usr/share/doc/DrakConf.html");
+    $action == 3 and connect_to_site("https://qa.mandrakesoft.com");
+    $action == 5 and connect_to_site("http://www.mandrake.com");
+    $action == 6 and connect_to_site("http://www.mandrakecampus.com");
+    $action == 7 and connect_to_site("http://www.mandrakeexpert.com");
 }