diff options
| -rwxr-xr-x | control-center | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/control-center b/control-center index ffb24011..614779f8 100755 --- a/control-center +++ b/control-center @@ -44,7 +44,7 @@ my $themes_dir = "$mcc_dir/themes/"; my (%tool_pids, %tool_feedback); -my ($version, $conffile, $class_install) = ( `cat /etc/mandrakelinux-release`=~/\b(\d+\.{1}.+\))/, "/etc/mcc.conf", "/etc/sysconfig/system"); +my ($version, $conffile, $class_install) = ( `cat /etc/mandrakelinux-release`=~/\b(\d+\.{1}.+\))/, "/etc/mcc.conf", "/etc/sysconfig/system" ); my ($default_heigth, $default_width) = (523, 720); @@ -719,7 +719,7 @@ my @tree = "Monitor", "Resolution", if_(0, "Graphical server configuration"), - if_(-x "$bindir/drakfax","Fax"), + if_(-x "$bindir/drakfax", "Fax"), "TV Cards", "Keyboard", "Mouse", @@ -783,7 +783,7 @@ my @tree = [ 'cdwriter', sub { @{$cdroms_by_type{burner} || []} }, N("CD/DVD burner") ], [ 'floppy', \&detect_devices::floppies, N("Floppy drive") ], [ 'zip', \&detect_devices::zips, N("ZIP drive") ], - ), + ), }), "NFS mount points",, "Samba mount points", @@ -890,9 +890,9 @@ my @menu_items = ( exec "$0 --theme $name"; }; }, undef, '<CheckItem>' - ] - } @themes), - [ N("/_Themes").N("/_More themes"), undef, \&more_themes, undef, '<Item>' ] + ]; + } @themes), + [ N("/_Themes") . N("/_More themes"), undef, \&more_themes, undef, '<Item>' ] ), [ $shared_translations{profiles}, undef, undef, undef, '<Branch>' ], [ $shared_translations{profiles} . $shared_translations{new}, undef, sub { @@ -956,9 +956,9 @@ my @menu_items = ( [ join('/', $shared_translations{profiles}, ""), undef, undef, undef, '<Separator>' ], [ N("/_Help"), undef, undef, undef, '<Branch>' ], - [ N("/_Help").N("/_Help"), undef, sub { fork_("drakhelp --id $help_on_context") }, undef, '<StockItem>', N("Help") ], - [ N("/_Help").N("/_Report Bug"), undef, sub { fork_("drakbug --report drakconf &") }, undef, '<Item>' ], - [ N("/_Help").N("/_About..."), undef, \&about_mdk_cc, undef, '<Item>' ] + [ N("/_Help") . N("/_Help"), undef, sub { fork_("drakhelp --id $help_on_context") }, undef, '<StockItem>', N("Help") ], + [ N("/_Help") . N("/_Report Bug"), undef, sub { fork_("drakbug --report drakconf &") }, undef, '<Item>' ], + [ N("/_Help") . N("/_About..."), undef, \&about_mdk_cc, undef, '<Item>' ] ); my ($menu, $factory) = create_factory_menu($window_global, @menu_items); @@ -1025,7 +1025,7 @@ Are you sure you want to do the switch?", $netcnx->{PROFILE}, $prof), { transien update_profiles(); %check_boxes = map { - $_ => $factory->get_widget("<main>" . get_path(@{$options{$_}})) + $_ => $factory->get_widget("<main>" . get_path(@{$options{$_}})); } ("show_log", if_(0 && $isWiz, "wiz_expert")); @@ -1070,7 +1070,7 @@ widget "*mcc*" style "mcc" ))); $notebook_global->reset_rc_styles; -}; +} $notebook_global->signal_connect(realize => \¬ebook_set_background); $window_global->signal_connect("style-set" => sub { notebook_set_background($notebook_global) }); @@ -1108,7 +1108,7 @@ foreach (@tree) { my @subtree; foreach my $stuff (@$subtree) { - my $exec = first(split /\s+/, $programs{$stuff}->{binary}); + my $exec = first(split /\s+/, $programs{$stuff}{binary}); # do not complain about missing entries in move: if (-x $exec) { push @subtree, $stuff; @@ -1180,9 +1180,9 @@ my %icons = ( # manage tools not present in MCC (localedrake, drakauth, ...): foreach my $label (difference2([ keys %programs ], [ keys %tool_callbacks ])) { - my $text = $programs{$label}->{description}; + my $text = $programs{$label}{description}; $tool_callbacks{$label} = sub { compute_exec_string($label, undef, $icons{$label} || 'wizard-mdk', $text, $programs{$label}) }; - $tool_feedback{$label} = sub { }; + $tool_feedback{$label} = sub {}; } @@ -1193,7 +1193,7 @@ foreach (keys %check_boxes) { } else { print STDERR qq(BUG with LANGUAGE "$ENV{LANGUAGE}" for "$_"\n); } -}; +} # "wait while launching a program" area : |