diff options
| -rwxr-xr-x | control-center3 | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/control-center3 b/control-center3 index 6d3c5e48..d74246f9 100755 --- a/control-center3 +++ b/control-center3 @@ -77,10 +77,10 @@ my @item_factory_entries = ( [_("/Help/_Mandrake Control Center"), undef, 2], [_("/Help/_Report Bug"), undef, 3 ], [_("/Help/_About..."), undef, 4 ], - [_("/_Extras"), undef, 0, "<Branch>"], - [_("/_Extras/Mandrake Security _News"), undef, 5], - [_("/_Extras/Mandrake _Campus"), undef, 6], - [_("/_Extras/Mandrake _Expert"), undef, 7], + # [_("/_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); @@ -287,16 +287,14 @@ sub splash_warning 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 ")) -# { -# splash_warning(_("You don't seem to have Netscape installed")); -# } + my ($link,$help)=@_; + if($help) { + my $browser=$ENV{'BROWSER'}; + system("$browser -geometry 600x800+10+10 $link&"); + } else + { + splash_warning(_("\nIf you want to report bug please connect as normal user to \n \nhttps://qa.mandrakesoft.com and fill a bug report\n\n")); + } } # my $left = sub { &$next_child($_[0]->parent, 0); }; @@ -440,7 +438,7 @@ sub exec_treeitem { my $pid; #($pid = fork) ? $pid_launched[$nb_pages] = $pid : system($a) == 0 or splash_warning(_("couldn't exec $a: $!")); unless ($pid = fork) { - splash_warning("cannot fork: $~") unless defined $pid; + splash_warning(_("cannot fork: $~")) unless defined $pid; exec("$a"); } $pid_launched[$nb_pages] = undef; @@ -458,11 +456,9 @@ 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 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"); + $action == 2 and connect_to_site("$_docdir/DrakConf/DrakeConf.html",1); + $action == 3 and connect_to_site("https://qa.mandrakesoft.com",0); + } |