From 3c2f5372682a6ffce933a632cbee148ab8414866 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 6 Aug 2002 12:49:30 +0000 Subject: - simplify POSIX usage - inline one-liner callbacks (report_bug and display_logs) - simplify mandrake relase retrieving - remove unused variables --- ChangeLog | 14 ++++++++++++++ control-center | 40 +++++++++++----------------------------- drakconf.spec | 10 +++++++++- 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b4ca56c..ab2c5864 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,21 @@ +2002-08-06 13:42 tvignaud + + * control-center: - use gtk as other modules + - small cleanups + +2002-08-06 13:36 tvignaud + + * ChangeLog: [no log message] + 2002-08-06 13:31 gc * drakconf.spec: 9.0-0.4mdk +2002-08-06 13:27 tvignaud + + * control-center: - inline embedded_mode one-liner + - remove unused $version + 2002-08-06 13:26 gc * pixmaps/default/MandrakeUpdate_highlight.png: meuh diff --git a/control-center b/control-center index ff2ad5c7..98be5860 100755 --- a/control-center +++ b/control-center @@ -38,7 +38,7 @@ use my_gtk qw(:helpers :wrappers); # set the locale, needed for proper fontset and charset selection Gtk->set_locale; use Config; -use POSIX; +use POSIX qw(uname); my $in = 'interactive'->vnew('su', 'default'); @@ -251,12 +251,10 @@ my $cursor_normal = new Gtk::Gdk::Cursor 68; my $cursor_busy = new Gtk::Gdk::Cursor 150; my @back; ($back[0], undef) = gtkcreate_png_('mcc-left-back'); -($back[2], undef) = gtkcreate_png_('mcc-left-back2'); $back[1] = $back[0]; -my $index = 0; +($back[2], undef) = gtkcreate_png_('mcc-left-back2'); +my ($index, $left_locked, $pending_app) = (0, 0, 0); my $darea_left_sav; -my $left_locked = 0; -my $pending_app = 0; foreach (@tree) { $index++; my $index = $index; @@ -395,9 +393,7 @@ $embedded_check_box->set_active($embedded); update_exp(); res_socket(); -foreach (@darea_left_list) { - $fixed_left->put($_->[1], 0, $_->[0]); -} +foreach (@darea_left_list) { $fixed_left->put($_->[1], 0, $_->[0]) } $fixed_left->signal_connect(realize => sub { $fixed_left->window->set_back_pixmap($pixmap_back_left, 0) }); @@ -449,14 +445,11 @@ $darea1->signal_connect(expose_event => sub { my $style = $darea1->style->copy(); $style->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-20-*-100-100-p-*-iso8859-1,*-r-*"))); $pix_dbl->draw_string($style->font, $darea1->style->black_gc, 80, 115, _("Welcome to the Mandrake Control Center")); - my @revtree; open VERS, "/etc/mandrake-release" or die _("cannot open this file for read: %s", $!); - while () { push (@revtree,$_) } - my @info_tree = split / /, $revtree[0]; - my ($sysname, $nodename, $release, undef, $machine) = POSIX::uname(); + my ($sysname, $nodename, $release, undef, $machine) = uname(); my $i = 0; foreach( - [_("System:"), "$info_tree[0] $info_tree[1] $info_tree[3] $info_tree[4]"], + [_("System:"), substr(, 0, -1)], [_("Hostname:"), $nodename], [_("Kernel Version:"), "$release"], [_("Machine:"), $machine]) { @@ -657,9 +650,7 @@ sub res_socket { } sub quit_global { - foreach(@pid_launched) { - kill 'TERM', $_ if (defined $_); - } + foreach(@pid_launched) { kill 'TERM', $_ if (defined $_) } setVarsInSh($conffile, { EMBEDDED => bool2text($embedded), LOGS => bool2text($logs), @@ -757,7 +748,6 @@ sub connect_to_site { my ($link,$help)=@_; my $browser = $ENV{BROWSER}; my $initial_user = $ENV{INITIAL_USER}; - my $user_current = $ENV{USER}; if (!$browser) { splash_warning(" ". _("Warning: No browser specified") ." "); return } @@ -772,21 +762,11 @@ sub connect_to_site { } } -sub report_bug { - system("drakbug --report drakconf"); -} - -sub display_logs { - $logs = $log_check_box->active; - update_exp(); -} - sub get_main_menu { my ($window) = @_; my $accel_group = new Gtk::AccelGroup(); my $item_factory = new Gtk::ItemFactory('Gtk::MenuBar', '
', $accel_group); my @theme_list = grep { -d "$mcc_dir/$_" } all($mcc_dir); - my $ignore_active; $item_factory->create_items( ( { path => _("/_File"), @@ -797,7 +777,9 @@ sub get_main_menu { { path => _("/_Options"), type => '' }, { path => _("/Options")._("/Display _Logs"), - callback => \&display_logs, + callback => sub { + $logs = $log_check_box->active; + update_exp() }, type => '' }, { path => _("/Options")._("/_Embedded Mode"), callback => sub { $embedded = $embedded_check_box->active }, @@ -822,7 +804,7 @@ sub get_main_menu { { path => _("/_Help"), type => '' }, { path => _("/Help")._("/_Report Bug"), - callback => \&report_bug }, + callback => sub { system("drakbug --report drakconf") } }, { path => _("/Help")._("/_About..."), callback => \&about_mdk_cc } ) diff --git a/drakconf.spec b/drakconf.spec index c8c71f40..ff0f6c59 100644 --- a/drakconf.spec +++ b/drakconf.spec @@ -6,7 +6,7 @@ Summary: The Mandrake Control Center Name: drakconf Version: %version -Release: 0.4mdk +Release: 0.5mdk # get the source from our cvs repository (see # http://www.linuxmandrake.com/en/cvs.php3) Source0: %name-%version.tar.bz2 @@ -72,12 +72,16 @@ ln -sf %_bindir/drakconf %buildroot/%_sbindir/drakconf %postun %clean_menus +%triggerun -- %{name} < 9.0-0.5mdk +cp -af /{root,etc}/mcc.conf + %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) %doc COPYING +%config(noreplace) %ghost /etc/mcc %_bindir/* %_sbindir/* %_menudir/drakconf @@ -93,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT %_datadir/mcc/kde %changelog +* Tue Aug 6 2002 Thierry Vignaud 9.0-0.5mdk +- cleanups +- config file is /etc/mcc not /root/.mcc + * Tue Aug 6 2002 Guillaume Cottenceau 9.0-0.4mdk - add missing rpmdrake icons - Thierry Vignaud: -- cgit v1.2.1