diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-07-14 19:29:56 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-07-14 19:29:56 +0000 |
| commit | fae70fdba042a01095bbc65695ceda1b8544475c (patch) | |
| tree | 96dcd97bfcc656e89107c97b9c3bba8a511c9245 | |
| parent | aac4547ad8300c4fb84aac4b8c19fafea1765985 (diff) | |
| download | control-center-fae70fdba042a01095bbc65695ceda1b8544475c.tar control-center-fae70fdba042a01095bbc65695ceda1b8544475c.tar.gz control-center-fae70fdba042a01095bbc65695ceda1b8544475c.tar.bz2 control-center-fae70fdba042a01095bbc65695ceda1b8544475c.tar.xz control-center-fae70fdba042a01095bbc65695ceda1b8544475c.zip | |
euse new std dialogs, thus simplify quite a lot splash_warning()
| -rwxr-xr-x | control-center | 20 | ||||
| -rw-r--r-- | drakconf.spec | 6 |
2 files changed, 5 insertions, 21 deletions
diff --git a/control-center b/control-center index 6f240ded..b52e4a19 100755 --- a/control-center +++ b/control-center @@ -31,7 +31,7 @@ use lang; # i18n: IMPORTANT: to get correct namespace (drakconf instead of libDrakX) BEGIN { unshift @::textdomains, 'drakconf' } -use ugtk2 qw(:create :helpers :wrappers); +use ugtk2 qw(:create :dialogs :helpers :wrappers); #------------------------------------------------------------- @@ -823,23 +823,7 @@ sub quit_global() { sub splash_warning { my ($label, $o_cancel_button) = @_; - my $ret; - my $window = new_dialog(N("Warning"), 1); - - gtkpack__($window->action_area, - gtkadd(Gtk2::HButtonBox->new, - gtksignal_connect(Gtk2::Button->new_from_stock($o_cancel_button ? 'gtk-ok' : 'gtk-close'), clicked => sub { $ret = 1; Gtk2->main_quit }), - if_($o_cancel_button, gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { Gtk2->main_quit })), - ) - ); - gtkpack($window->vbox, - Gtk2::Image->new_from_stock('gtk-dialog-warning', 'dialog'), - Gtk2::Label->new($label), - ); - $window->show_all; - Gtk2->main; - $window->destroy; - $ret; + warn_dialog(N("Warning"), $label, { cancel => $o_cancel_button }); } sub new_dialog { diff --git a/drakconf.spec b/drakconf.spec index 1a630018..52f0a66c 100644 --- a/drakconf.spec +++ b/drakconf.spec @@ -4,7 +4,7 @@ Summary: The Mandrake Control Center Name: drakconf Version: 9.2 -Release: 0.5mdk +Release: 0.6mdk # get the source from our cvs repository (see # http://www.linuxmandrake.com/en/cvs.php3) Source0: %name-%version.tar.bz2 @@ -17,8 +17,8 @@ Url: http://www.mandrakelinux.com/en/cvs.php3 Obsoletes: DrakConf Provides: DrakConf BuildRequires: gettext -Requires: mandrake-release, drakxtools >= 9.2-0.9mdk -Requires: harddrake-ui >= 9.1-31mdk, popt >= 1.6.4-24mdk, usermode +Requires: mandrake-release, drakxtools >= 9.2-0.13mdk +Requires: harddrake-ui >= 9.2-13mdk, popt >= 1.6.4-24mdk, usermode Requires: perl-Gtk2 >= 0.26.cvs.2003.07.09.1-2mdk Requires: gtk+2.0 >= 2.2.0-3mdk, perl-MDK-Common => 1.0.4-16mdk Requires: drakcronat >= 0.1.3-1mdk, menudrake >= 0.7.2-1mdk, rxvt, userdrake => 0.92-6mdk |