From 7c1f7767aaead0630bd17ef954171cbc84954d1c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 2 Jan 2003 08:28:34 +0000 Subject: - perl-gtk2 port - cleanups --- clock.pl | 267 +++++++++++++++++++++++++----------------------------- menus_launcher.pl | 52 +++++------ print_launcher.pl | 36 ++++---- 3 files changed, 167 insertions(+), 188 deletions(-) diff --git a/clock.pl b/clock.pl index 2eb0aa22..cfa1a8f8 100755 --- a/clock.pl +++ b/clock.pl @@ -4,26 +4,19 @@ use strict; use lib qw(/usr/lib/libDrakX); use POSIX; use common; -use my_gtk qw(:helpers :wrappers :various);; +use ugtk2 qw(:helpers :wrappers); use interactive; use standalone; use timezone; #------------------------------------------------------------- -# i18n -# IMPORTANT: next code is needed to get correct namespace -# (drakconf instead of libDrakX) -# (This version is now UTF8 compliant - Sg 2001-08-18) -#------------------------------------------------------------- - +# i18n : IMPORTANT to get correct namespace (drakconf instead of libDrakX) push @::textdomains, 'drakconf'; my $in = interactive->vnew('su'); my $pixmap; my $radius; -my $dRadians_hour; -my $dRadians_min; -my $dRadians_sec; +my ($dRadians_hour, $dRadians_min, $dRadians_sec); my $Radian; my $type; my $timer; @@ -34,24 +27,23 @@ my $h_old; my ($old_year, $old_month, $old_day); my $its_reset = 0; -my $my_win = my_gtk->new('print_launcher'); +my $my_win = ugtk2->new('print_launcher'); $my_win->{rwindow}->set_title(N("DrakClock")) unless $::isEmbedded; -my $vbox = new Gtk::VBox(0,0); +my $vbox = Gtk2::VBox->new(0,0); $my_win->{window}->add($vbox); -$my_win->{window}->signal_connect (delete_event => sub { my_gtk->exit(0) }); -my $hbox = new Gtk::HBox(0,0); +$my_win->{window}->signal_connect(delete_event => sub { ugtk2->exit(0) }); +my $hbox = Gtk2::HBox->new(0,0); $vbox->pack_start($hbox, 1, 1, 0); -my $vbox1 = new Gtk::VBox(0,0); +my $vbox1 = Gtk2::VBox->new(0,0); $hbox->pack_start($vbox1, 1, 1, 0); -my $calendar = new Gtk::Calendar; +my $calendar = Gtk2::Calendar->new; $vbox1->pack_start($calendar, 1, 1, 0); -$calendar->signal_connect ($_ => \&cal_changed) - foreach ('month-changed', 'day-selected', 'day-selected-double-click', 'prev-month', 'next-month', 'prev-year', 'next-year'); +$calendar->signal_connect($_ => \&cal_changed) foreach 'month-changed', 'day-selected', 'day-selected-double-click', 'prev-month', 'next-month', 'prev-year', 'next-year'; -my $button_time = new Gtk::Button N("Time Zone"); +my $button_time = Gtk2::Button->new(N("Time Zone")); $vbox1->pack_start($button_time, 0, 1, 10); -$button_time->signal_connect (clicked => sub { +$button_time->signal_connect(clicked => sub { local $::isEmbedded = 0; # to prevent sub window embedding $in->{timezone} = {}; add2hash($in->{timezone}, timezone::read('')); @@ -64,47 +56,47 @@ $button_time->signal_connect (clicked => sub { $in->{timezone}{timezone} = $timezone; } }); -my $vbox2 = new Gtk::VBox(0,0); +my $vbox2 = Gtk2::VBox->new(0,0); my $pressed; $hbox->pack_start($vbox2, 1, 1, 0); -my $drawing_area = new Gtk::DrawingArea; +my $drawing_area = Gtk2::DrawingArea->new; $drawing_area->size(300,300); $vbox2->pack_start($drawing_area, 1, 1, 0); -$drawing_area->set_events(['button_press_mask', 'button_release_mask', "pointer_motion_mask" ]); -$drawing_area->signal_connect (expose_event => \&expose_event); -$drawing_area->signal_connect (configure_event => \&configure_event); -$drawing_area->signal_connect (button_press_event => sub { $pressed = 1 }); -$drawing_area->signal_connect (button_release_event => sub { $first = 1; $pressed = 0 }); -$drawing_area->signal_connect (motion_notify_event => \&motion_event); - -my $hbox11 = new Gtk::HBox(1,0); +$drawing_area->set_events([ 'button_press_mask', 'button_release_mask', "pointer_motion_mask" ]); +$drawing_area->signal_connect(expose_event => \&expose_event); +$drawing_area->signal_connect(realize => \&configure_event); +$drawing_area->signal_connect(button_press_event => sub { $pressed = 1 }); +$drawing_area->signal_connect(button_release_event => sub { $first = 1; $pressed = 0 }); +$drawing_area->signal_connect(motion_notify_event => \&motion_event); + +my $hbox11 = Gtk2::HBox->new(1,0); $vbox2->pack_start($hbox11, 0, 0, 10); -my $hbox2 = new Gtk::HBox(1,0); +my $hbox2 = Gtk2::HBox->new(1,0); $hbox11->pack_start($hbox2, 0, 0, 0); -my $adj_h = new Gtk::Adjustment 0.0, 0.0, 23.0, 1.0, 5.0, 0.0; -my $spinner_h = new Gtk::SpinButton $adj_h, 0, 0; +my $adj_h = Gtk2::Adjustment->new(0.0, 0.0, 23.0, 1.0, 5.0, 0.0); +my $spinner_h = Gtk2::SpinButton->new($adj_h, 0, 0); $hbox2->pack_start($spinner_h, 0, 0, 0); $spinner_h->set_wrap(1); -$spinner_h->signal_connect (activate => \&spinned); -$spinner_h->signal_connect (button_release_event => \&spinned); -$spinner_h->signal_connect (changed => \&changed); -my $adj_m = new Gtk::Adjustment 0.0, 0.0, 59.0, 1.0, 5.0, 0.0; -my $spinner_m = new Gtk::SpinButton $adj_m, 0, 0; +$spinner_h->signal_connect(activate => \&spinned); +$spinner_h->signal_connect(button_release_event => \&spinned); +$spinner_h->signal_connect(changed => \&changed); +my $adj_m = Gtk2::Adjustment->new(0.0, 0.0, 59.0, 1.0, 5.0, 0.0); +my $spinner_m = Gtk2::SpinButton->new($adj_m, 0, 0); $hbox2->pack_start($spinner_m, 0, 0, 0); $spinner_m->set_wrap(1); -$spinner_m->signal_connect (activate => \&spinned); -$spinner_m->signal_connect (button_release_event => \&spinned); -my $adj_s = new Gtk::Adjustment 0.0, 0.0, 59.0, 1.0, 5.0, 0.0; -my $spinner_s = new Gtk::SpinButton $adj_s, 0, 0; +$spinner_m->signal_connect(activate => \&spinned); +$spinner_m->signal_connect(button_release_event => \&spinned); +my $adj_s = Gtk2::Adjustment->new(0.0, 0.0, 59.0, 1.0, 5.0, 0.0); +my $spinner_s = Gtk2::SpinButton->new($adj_s, 0, 0); $hbox2->pack_start($spinner_s, 0, 0, 0); $spinner_s->set_wrap(1); -$spinner_s->signal_connect (activate => \&spinned); -$spinner_s->signal_connect (button_release_event => \&spinned); +$spinner_s->signal_connect(activate => \&spinned); +$spinner_s->signal_connect(button_release_event => \&spinned); -my $bbox = new Gtk::HButtonBox; -$bbox->set_layout(-end); +my $bbox = Gtk2::HButtonBox->new; +$bbox->set_layout('end'); $vbox->pack_start($bbox, 0, 0, 5); -$bbox->add(gtksignal_connect(new Gtk::Button(N("OK")), +$bbox->add(gtksignal_connect(Gtk2::Button->new(N("OK")), clicked => sub { my ($year, $month, $day) = $calendar->get_date; $month++; @@ -112,14 +104,14 @@ $bbox->add(gtksignal_connect(new Gtk::Button(N("OK")), system("date " . join('', map { print_it0($_) } ($month, $day, $hour, $min, $year)) . '.' . print_it0($sec)); -e '/sbin/hwclock' and system('/sbin/hwclock --systohc'); - my_gtk->exit(0); - } )); -$bbox->add(gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { my_gtk->exit(0) })); + ugtk2->exit(0); + })); +$bbox->add(gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { ugtk2->exit(0) })); my $button_reset; -$button_reset = gtksignal_connect(new Gtk::Button(N("Reset")), clicked => sub { +$button_reset = gtksignal_connect(Gtk2::Button->new(N("Reset")), clicked => sub { $its_reset = 1; - $timer = Gtk->timeout_add(120, sub { time_to_rad(localtime(time)); Repaint($drawing_area) }); - time_to_rad(localtime(time)); Repaint($drawing_area); + $timer = Gtk2->timeout_add(120, \&update_time); + Repaint($drawing_area, 1); $calendar->select_month($old_month, $old_year); $calendar->select_day($old_day); $button_reset->set_sensitive(0); @@ -130,40 +122,46 @@ $bbox->add($button_reset); $my_win->{window}->show_all; -Gtk->main_iteration while Gtk->events_pending; +gtkflush(); $calendar->realize; -(undef,undef,$h_old,$old_day,$old_month,$old_year) = localtime(time); -$is24 = $h_old>12; +(undef, undef, $h_old, $old_day, $old_month, $old_year) = localtime(time()); +$is24 = $h_old > 12; $old_year += 1900; $calendar->select_month($old_month, $old_year); $calendar->select_day($old_day); $button_reset->set_sensitive(0); -$timer = Gtk->timeout_add(120, sub { time_to_rad(localtime(time)); Repaint($drawing_area) }); +$timer = Gtk2->timeout_add(120, \&update_time); +#$drawing_area->show; $my_win->main; -my_gtk->exit(0); +ugtk2->exit(0); + + +sub update_time { + Repaint($drawing_area, 1); +}; sub cal_changed { - !$its_reset and $timer and Gtk->timeout_remove($timer); + !$its_reset and $timer and Gtk2->timeout_remove($timer); $button_reset->set_sensitive(1); } sub changed { - if ($h_old > $adj_h->get_value && $adj_h->get_value < ($is24 ? 18 : 6) && $h_old > ($is24 ? 18 : 6) && $h_old < ($is24 ? 24 : 12)) { - $is24 = !$is24; - } - elsif ($h_old < $adj_h->get_value && $adj_h->get_value > ($is24 ? 18 : 6) && $h_old < ($is24 ? 18 : 6) && ($adj_h->get_value-$h_old != 12)) { - $is24 = !$is24; - } - $h_old = $adj_h->get_value; + my $val = $adj_h->get_value; + my $limit = ($is24 ? 18 : 6); + if (($limit > $val && $h_old > $limit && $h_old < ($is24 ? 24 : 12)) || + ($limit < $val && $h_old < $limit && $val-$h_old != 12)) { + $is24 = !$is24; + } + $h_old = $val; } sub spinned { - Gtk->timeout_remove($timer); + Gtk2->timeout_remove($timer); $button_reset->set_sensitive(1); - my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); - time_to_rad($adj_s->get_value,$adj_m->get_value,$adj_h->get_value,$mday,$mon,$year,$wday,$yday,$isdst); + my (undef, undef, undef, @values) = localtime(time()); + time_to_rad($adj_s->get_value, $adj_m->get_value, $adj_h->get_value, @values); Repaint($drawing_area); } @@ -171,12 +169,12 @@ sub motion_event { my ($widget, $event) = @_; $pressed or return; if ($first) { - Gtk->timeout_remove($timer); - ($Radian, $type) = determine_radian($event->{'x'}, $event->{'y'}); + Gtk2->timeout_remove($timer); + ($Radian, $type) = determine_radian($event->x, $event->y); $button_reset->set_sensitive(1); } - $$Radian = -atan2(($event->{'x'}-$midx),($event->{'y'}-$midy)) + $PI; + $$Radian = -atan2(($event->x-$midx), ($event->y-$midy)) + $PI; Repaint($widget); rad_to_time(); @@ -190,40 +188,33 @@ sub determine_radian { my $r; my $i = 0; foreach (\$dRadians_hour, \$dRadians_min, \$dRadians_sec) { - my $d = sqrt ( ($x - ($midx + 7/10 * $radius * sin ($$_)))**2 + ($y - ($midy - 7/10 * $radius * cos ($$_)))**2); + my $d = sqrt( ($x - ($midx + 7/10 * $radius * sin($$_)))**2 + ($y - ($midy - 7/10 * $radius * cos($$_)))**2); $res or $res = $d, $r = $_; - $d<$res and $res = $d, $r = $_, $i++; + $d < $res and $res = $d, $r = $_, $i++; } ($r, $i); } sub expose_event { -my ($widget) = @_; -$widget->window->draw_pixmap ( - $widget->style->fg_gc('normal'), - $pixmap, - 0, 0, 0, 0, - $widget->allocation->[2], $widget->allocation->[3]); + my ($widget, $event) = @_; + my ($x, $y, $width, $height) = $event->area->values; + $widget->window->draw_drawable($widget->style->fg_gc('normal'), $pixmap, $x, $y, $x, $y, $width, $height); } sub configure_event { my ($widget) = @_; - $pixmap = new Gtk::Gdk::Pixmap ($widget->window, - $widget->allocation->[2], - $widget->allocation->[3], - -1); - Repaint($widget); + my $window = $widget->window; + $pixmap = Gtk2::Gdk::Pixmap->new($window, $widget->allocation->width, $widget->allocation->height, $window->get_depth); } sub rad_to_time { - my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); $adj_h->set_value(POSIX::floor($dRadians_hour * 6 / $PI) + ($is24 ? 12 : 0)); $adj_m->set_value(POSIX::floor($dRadians_min*30/$PI)); $adj_s->set_value(POSIX::floor($dRadians_sec*30/$PI)); } sub time_to_rad { - my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = @_; + my ($sec, $min, $hour, undef, undef, undef, undef, undef, undef) = @_; $dRadians_hour = $hour % 12 * $PI / 6; $dRadians_min = $min * $PI / 30; $dRadians_sec = $sec * $PI / 30; @@ -233,88 +224,76 @@ sub time_to_rad { } sub Repaint { - my ($drawing_area) = @_; + my ($drawing_area, $update_time) = @_; + time_to_rad(localtime(time())) if $update_time; + my ($width, $height) = ($drawing_area->allocation->width, $drawing_area->allocation->height); my $dRadians_hour_real = POSIX::floor($dRadians_hour / $PI*6) * $PI/6.0 + $dRadians_min / 12; - my $dRadians_min_real = POSIX::floor($dRadians_min / $PI * 30) * $PI / 30; - my $dRadians_sec_real = $dRadians_sec; - $pixmap->draw_rectangle($drawing_area->style->white_gc, 1, 0, 0, - $drawing_area->allocation->[2], - $drawing_area->allocation->[3]); - $midx = $drawing_area->allocation->[2] / 2; - $midy = $drawing_area->allocation->[3] / 2; - $radius = $midx < $midy ? $midx -10 : $midy - 10; - - my $nHour; - my $gray_gc = $drawing_area->style->bg_gc('normal'); + my $dRadians_min_real = POSIX::floor($dRadians_min / $PI * 30) * $PI / 30; + my $dRadians_sec_real = $dRadians_sec; + $pixmap->draw_rectangle($drawing_area->style->white_gc, 1, 0, 0, $width, $height); + my ($midx, $midy) = ($width / 2, $height / 2); + $radius = ($midx < $midy ? $midx : $midy) - 10; + + my $gray_gc = $drawing_area->style->bg_gc('normal'); my $black_gc = $drawing_area->style->black_gc; - foreach my $i ([\&DrawTickAt, 12], [\&DrawPointAt, 60]) { $i->[0]($pixmap, $black_gc, $gray_gc, $_, $midx, $midy) foreach (1..$i->[1]) } - my $now = time; - my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); - my $dRadians; - foreach ([$gray_gc, 5], [$black_gc, 0]) { - DrawHour ($pixmap, $_->[0], $midx, $midy, $dRadians_hour_real, $_->[1]); - DrawMin ($pixmap, $_->[0], $midx, $midy, $dRadians_min_real, $_->[1]); - DrawSec ($pixmap, $_->[0], $midx, $midy, $dRadians_sec_real, $_->[1]); + foreach ([ $gray_gc, 5 ], [ $black_gc, 0 ]) { + &DrawTickAt($pixmap, $_->[0], $midx, $midy, $_->[1]); + &DrawHour($pixmap, $_->[0], $midx, $midy, $dRadians_hour_real, $_->[1]); + &DrawMin($pixmap, $_->[0], $midx, $midy, $dRadians_min_real, $_->[1]); + &DrawSec($pixmap, $_->[0], $midx, $midy, $dRadians_sec_real, $_->[1]); } - $drawing_area->draw(undef); + &DrawPointAt($pixmap, $black_gc, $_, $midx, $midy) foreach (1..60); + $drawing_area->queue_draw; 1; } sub DrawSec { my ($pixmap, $gc, $midx, $midy, $dRadians, $dec) = @_; - $pixmap->draw_line ($gc, - $midx+$dec, $midy+$dec, - $midx+$dec + (8/10 * $radius * sin ($dRadians)), - $midy+$dec - (8/10 * $radius * cos ($dRadians))) + $pixmap->draw_line($gc, + $midx+$dec, $midy+$dec, + $midx+$dec + (8/10 * $radius * sin($dRadians)), + $midy+$dec - (8/10 * $radius * cos($dRadians))) } sub DrawMin { my ($pixmap, $gc, $midx, $midy, $dRadians, $dec) = @_; - $pixmap->draw_polygon ($gc, 1, - $midx+$dec - 3/100 * $radius * sin ($dRadians), - $midy+$dec + 3/100 * $radius * cos ($dRadians), - $midx+$dec - 3/100 * $radius * sin ($dRadians+$PI/2), - $midy+$dec + 3/100 * $radius * cos ($dRadians+$PI/2), - $midx+$dec + 8/10 * $radius * sin ($dRadians), - $midy+$dec - 8/10 * $radius * cos ($dRadians), - $midx+$dec + 3/100 * $radius * sin ($dRadians+$PI/2), - $midy+$dec - 3/100 * $radius * cos ($dRadians+$PI/2)); + $pixmap->draw_polygon($gc, 1, [ Gtk2::Gdk::Point->new($midx+$dec - 3/100 * $radius * sin($dRadians), $midy+$dec + 3/100 * $radius * cos($dRadians)), + Gtk2::Gdk::Point->new($midx+$dec - 3/100 * $radius * sin($dRadians+$PI/2), $midy+$dec + 3/100 * $radius * cos($dRadians+$PI/2)), + Gtk2::Gdk::Point->new($midx+$dec + 8/10 * $radius * sin($dRadians), $midy+$dec - 8/10 * $radius * cos($dRadians)), + Gtk2::Gdk::Point->new($midx+$dec + 3/100 * $radius * sin($dRadians+$PI/2), $midy+$dec - 3/100 * $radius * cos($dRadians+$PI/2)) + ]); } sub DrawHour { my ($pixmap, $gc, $midx, $midy, $dRadians, $dec) = @_; - $pixmap->draw_polygon ($gc, 1, - $midx+$dec - 5/100 * $radius * sin ($dRadians), - $midy+$dec + 5/100 * $radius * cos ($dRadians), - $midx+$dec - 5/100 * $radius * sin ($dRadians+$PI/2), - $midy+$dec + 5/100 * $radius * cos ($dRadians+$PI/2), - $midx+$dec + 7/10 * $radius * sin ($dRadians), - $midy+$dec - 7/10 * $radius * cos ($dRadians), - $midx+$dec + 5/100 * $radius * sin ($dRadians+$PI/2), - $midy+$dec - 5/100 * $radius * cos ($dRadians+$PI/2)); + $pixmap->draw_polygon($gc, 1, [ Gtk2::Gdk::Point->new($midx+$dec - 5/100 * $radius * sin($dRadians), $midy+$dec + 5/100 * $radius * cos($dRadians)), + Gtk2::Gdk::Point->new($midx+$dec - 5/100 * $radius * sin($dRadians+$PI/2), $midy+$dec + 5/100 * $radius * cos($dRadians+$PI/2)), + Gtk2::Gdk::Point->new($midx+$dec + 7/10 * $radius * sin($dRadians), $midy+$dec - 7/10 * $radius * cos($dRadians)), + Gtk2::Gdk::Point->new($midx+$dec + 5/100 * $radius * sin($dRadians+$PI/2), $midy+$dec - 5/100 * $radius * cos($dRadians+$PI/2)) + ]); } sub DrawTickAt { - my ($pixmap, $black_gc, $gray_gc, $nHour, $cx, $cy) = @_; - my $dRadians = $nHour * $PI / 6.0; - - $pixmap->draw_line ($_->[0], - $cx+$_->[1] + 9/10 * $radius * sin ($dRadians), - $cy+$_->[1] - 9/10 * $radius * cos ($dRadians), - $cx+$_->[1] + 1 * $radius * sin ($dRadians), - $cy+$_->[1] - 1 * $radius * cos ($dRadians)) - foreach ([$gray_gc, 5], [$black_gc, 0]); + my ($pixmap, $gc, $cx, $cy, $dec) = @_; + foreach my $nHour (1..12) { + my $dRadians = $nHour * $PI / 6.0; + $pixmap->draw_line($gc, + $cx + $dec + 9/10 * $radius * sin($dRadians), + $cy + $dec - 9/10 * $radius * cos($dRadians), + $cx + $dec + 1 * $radius * sin($dRadians), + $cy + $dec - 1 * $radius * cos($dRadians)); + } } sub DrawPointAt { - my ($pixmap, $black_gc, $gray_gc, $nHour, $cx, $cy) = @_; + my ($pixmap, $black_gc, $nHour, $cx, $cy) = @_; my $dRadians = $nHour * $PI / 30; - $pixmap->draw_point ($black_gc, - $cx + 95/100 * $radius * sin ($dRadians), - $cy - 95/100 * $radius * cos ($dRadians)) + $pixmap->draw_point($black_gc, + $cx + 95/100 * $radius * sin($dRadians), + $cy - 95/100 * $radius * cos($dRadians)) } -sub print_it0 { sprintf("%02d", @_[0]) } +sub print_it0 { sprintf("%02d", $_[0]) } diff --git a/menus_launcher.pl b/menus_launcher.pl index e598f362..1de58f61 100755 --- a/menus_launcher.pl +++ b/menus_launcher.pl @@ -3,7 +3,7 @@ use strict; use lib qw(/usr/lib/libDrakX); use common; -use my_gtk qw(:helpers :wrappers :various);; +use ugtk2 qw(:helpers :wrappers); use interactive; use standalone; @@ -16,47 +16,47 @@ use standalone; push @::textdomains, 'drakconf'; my $bindir = "/usr/bin/"; -my $my_win = my_gtk->new('print_launcher'); +my $my_win = ugtk2->new('print_launcher'); $my_win->{rwindow}->set_title(N("Menu Configuration Center")) unless $::isEmbedded; $my_win->{window}->signal_connect(delete_event => sub { gtkset_mousecursor_normal(); - my_gtk->exit(0); -} ); -my $vbox = new Gtk::VBox(0, 0); + ugtk2->exit(0); +}); +my $vbox = Gtk2::VBox->new(0, 0); $my_win->{window}->add($vbox); -$vbox->pack_start(new Gtk::Label(N("Menu Configuration Center") . N("\n\nChoose which menu you want to configure")), 0, 0, 5); -$vbox->pack_start(new Gtk::HSeparator, 0, 0, 5); -my $table = new Gtk::Table (3, 2, 0); +$vbox->pack_start(Gtk2::Label->new(N("Menu Configuration Center") . N("\n\nChoose which menu you want to configure")), 0, 0, 5); +$vbox->pack_start(Gtk2::HSeparator->new, 0, 0, 5); +my $table = Gtk2::Table->new(3, 2, 0); $table->set_border_width(5); $table->set_row_spacings(5); $table->set_col_spacings(5); -my $hbox = new Gtk::HBox(0, 0); +my $hbox = Gtk2::HBox->new(0, 0); $vbox->pack_start($hbox, 1, 1, 1); $hbox->pack_start($table, 0, 0, 5); -$table->attach (new Gtk::Label(N("System menu")), 0, 1, 0, 1, 'fill', 'fill', 0, 0); -my $b1 = gtksignal_connect(new Gtk::Button(N("Configure...")), clicked => sub { system("$bindir/menudrake --systemmenu &") } ); -$table->attach ($b1, 1, 2, 0, 1, 'fill', 'fill', 0, 0); -$table->attach (new Gtk::Label(N("User menu")), 0, 1, 1, 2, 'fill', 'fill', 0, 0); +$table->attach(Gtk2::Label->new(N("System menu")), 0, 1, 0, 1, 'fill', 'fill', 0, 0); +my $b1 = gtksignal_connect(Gtk2::Button->new(N("Configure...")), clicked => sub { system("$bindir/menudrake --systemmenu &") }); +$table->attach($b1, 1, 2, 0, 1, 'fill', 'fill', 0, 0); +$table->attach(Gtk2::Label->new(N("User menu")), 0, 1, 1, 2, 'fill', 'fill', 0, 0); my (@user_info, @usernames); setpwent(); do { @user_info = getpwent(); my ($uname, $uid) = @user_info[0, 2]; - push (@usernames, $uname) if $uid > 500 && $uname eq $ENV{INITIAL_USER}; - } while (@user_info); -my $combo = new Gtk::Combo; -$combo->set_popdown_strings (@usernames, "root"); -$table->attach ($combo, 2, 3, 1, 2, 'fill', 'fill', 0, 0); -my $b2 = gtksignal_connect(new Gtk::Button(N("Configure...")), - clicked => sub { system($combo->entry->get_text() eq "root" ? "$bindir/menudrake --usermenu &" : " su $a -c \"$bindir/menudrake &\"") } ); -$table->attach ($b2, 1, 2, 1, 2, 'fill', 'fill', 0, 0); -$vbox->pack_start(new Gtk::HSeparator, 0, 0, 5); -my $bbox = new Gtk::HButtonBox; + push(@usernames, $uname) if $uid > 500 && $uname eq $ENV{INITIAL_USER}; + } while @user_info; +my $combo = Gtk2::Combo->new; +$combo->set_popdown_strings(@usernames, "root"); +$table->attach($combo, 2, 3, 1, 2, 'fill', 'fill', 0, 0); +my $b2 = gtksignal_connect(Gtk2::Button->new(N("Configure...")), + clicked => sub { my $a = $combo->entry->get_text(); system($a eq "root" ? "$bindir/menudrake --usermenu &" : " su $a -c \"$bindir/menudrake &\"") }); +$table->attach($b2, 1, 2, 1, 2, 'fill', 'fill', 0, 0); +$vbox->pack_start(Gtk2::HSeparator->new, 0, 0, 5); +my $bbox = Gtk2::HButtonBox->new; $vbox->pack_start($bbox, 0, 0, 5); -$bbox->set_layout(-end); -my $button_ok = gtksignal_connect(new Gtk::Button(N("Done")), clicked => sub { my_gtk->exit(0) }); +$bbox->set_layout('end'); +my $button_ok = gtksignal_connect(Gtk2::Button->new(N("Done")), clicked => sub { ugtk2->exit(0) }); $button_ok->can_default(1); $bbox->add($button_ok); $my_win->{window}->show_all; $my_win->main; -my_gtk->exit(0); +ugtk2->exit(0); diff --git a/print_launcher.pl b/print_launcher.pl index f5742e39..ae25660e 100755 --- a/print_launcher.pl +++ b/print_launcher.pl @@ -3,7 +3,7 @@ use strict; use lib qw(/usr/lib/libDrakX); use common; -use my_gtk qw(:helpers :wrappers :various);; +use ugtk2 qw(:helpers :wrappers);; use interactive; use standalone; @@ -16,34 +16,34 @@ use standalone; push @::textdomains, 'drakconf'; my $sbindir = "/usr/sbin/"; -my $my_win = my_gtk->new('print_launcher'); +my $my_win = ugtk2->new('print_launcher'); $my_win->{rwindow}->set_title(N("Printing configuration")) unless $::isEmbedded; -$my_win->{rwindow}->signal_connect (delete_event => sub { +$my_win->{rwindow}->signal_connect(delete_event => sub { gtkset_mousecursor_normal(); - my_gtk->exit(0); - } ); -my $vbox = new Gtk::VBox(0, 0); + ugtk2->exit(0); + }); +my $vbox = Gtk2::VBox->new(0, 0); $my_win->{window}->add($vbox); -$vbox->pack_start(new Gtk::Label(N("Printing configuration")), 0, 0, 5); -$vbox->pack_start(new Gtk::HSeparator, 0, 0, 5); -my $table = new Gtk::Table (2, 1, 0); +$vbox->pack_start(Gtk2::Label->new(N("Printing configuration")), 0, 0, 5); +$vbox->pack_start(Gtk2::HSeparator->new, 0, 0, 5); +my $table = Gtk2::Table->new(2, 1, 0); $table->set_border_width(5); $table->set_row_spacings(5); $table->set_col_spacings(5); -my $hbox = new Gtk::HBox(0, 0); +my $hbox = Gtk2::HBox->new(0, 0); $vbox->pack_start($hbox, 1, 1, 1); $hbox->pack_start($table, 0, 0, 5); -$table->attach (new Gtk::Label(N("Click here to configure the printing system")), 0, 1, 0, 1, 'fill', 'fill', 0, 0); -my $b1 = gtksignal_connect(new Gtk::Button(N("Configure...")), clicked => sub { system("$sbindir/printerdrake &") } ); -$table->attach ($b1, 1, 2, 0, 1, 'fill', 'fill', 0, 0); -$vbox->pack_start(new Gtk::HSeparator, 0, 0, 5); -my $bbox = new Gtk::HButtonBox; +$table->attach(Gtk2::Label->new(N("Click here to configure the printing system")), 0, 1, 0, 1, 'fill', 'fill', 0, 0); +my $b1 = gtksignal_connect(Gtk2::Button->new(N("Configure...")), clicked => sub { system("$sbindir/printerdrake &") }); +$table->attach($b1, 1, 2, 0, 1, 'fill', 'fill', 0, 0); +$vbox->pack_start(Gtk2::HSeparator->new, 0, 0, 5); +my $bbox = Gtk2::HButtonBox->new; $vbox->pack_start($bbox, 0, 0, 5); -$bbox->set_layout(-end); -my $button_ok = gtksignal_connect(new Gtk::Button(N("Done")), clicked => sub { my_gtk->exit(0) }); +$bbox->set_layout('end'); +my $button_ok = gtksignal_connect(Gtk2::Button->new(N("Done")), clicked => sub { ugtk2->exit(0) }); $button_ok->can_default(1); $bbox->add($button_ok); $my_win->{window}->show_all; $my_win->main; -my_gtk->exit(0); +ugtk2->exit(0); -- cgit v1.2.1