From 28fb25a0f245ee4cd5eb4f923fd7206fd8e76943 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Tue, 20 Jul 2004 09:49:56 +0000 Subject: use the power of the Gtk2::Dialog widget, thus giving change_color() more luck to succeed --- perl-install/standalone/net_monitor | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'perl-install/standalone/net_monitor') diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor index 556ad8fa2..089ee9fb6 100755 --- a/perl-install/standalone/net_monitor +++ b/perl-install/standalone/net_monitor @@ -336,21 +336,16 @@ sub get_val() { sub change_color { my ($color) = @_; my $dialog = _create_dialog(N("Color configuration")); - my $doit; $dialog->vbox->add(my $colorsel = Gtk2::ColorSelection->new); - gtkpack($dialog->action_area, - gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { - $doit = 1; - $dialog->destroy; - }), - gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub { - $dialog->destroy; - }), - ); $colorsel->set_current_color($color); + $dialog->add_button(N("Cancel"), 'cancel'); + $dialog->add_button(N("Ok"), 'ok'); $dialog->show_all; - $dialog->run; - $doit ? $colorsel->get_current_color : $color; + if ($dialog->run eq 'ok') { + $color = $colorsel->get_current_color; + } + $dialog->destroy; + $color; } my ($scale_r, $scale_t); -- cgit v1.2.1