summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-07-14 19:22:03 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-07-14 19:22:03 +0000
commitbd71077466edeaab67b19302f9a0b7a5ef4559db (patch)
tree43be33a1f162c9b572088eaaede7308a0a15838b
parentee3c1dbd19b9b385435eac756d7ca6e38987b964 (diff)
downloaddrakx-bd71077466edeaab67b19302f9a0b7a5ef4559db.tar
drakx-bd71077466edeaab67b19302f9a0b7a5ef4559db.tar.gz
drakx-bd71077466edeaab67b19302f9a0b7a5ef4559db.tar.bz2
drakx-bd71077466edeaab67b19302f9a0b7a5ef4559db.tar.xz
drakx-bd71077466edeaab67b19302f9a0b7a5ef4559db.zip
- (create_dialog)
o add the stock option in order to be able to use a stock icon o add a new "small" option to net make dialogs too big - (err_dialog, warn_dialog) new wrappers upon create_dialog to use warning and error stock icons - add a new export tag for dialogs
-rw-r--r--perl-install/ugtk2.pm22
1 files changed, 20 insertions, 2 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 66d6f0820..4c70a2081 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -25,6 +25,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @icon_paths $force_center $force_focus
ask => [ qw(ask_browse_tree_info ask_browse_tree_info_given_widgets ask_dir ask_from_entry ask_okcancel ask_warn
ask_yesorno ) ],
+ dialogs => [ qw(err_dialog warn_dialog) ],
);
$EXPORT_TAGS{all} = [ map { @$_ } values %EXPORT_TAGS ];
@@ -367,14 +368,19 @@ sub _create_dialog {
}
-# drakfloppy / drakfont / harddrake2
+# drakfloppy / drakfont / harddrake2 / mcc
sub create_dialog {
my ($title, $label, $o_options) = @_;
my $ret = 0;
my $dialog = _create_dialog($title, $o_options);
$dialog->set_border_width(10);
my $text = $o_options->{use_markup} ? gtkset_markup(Gtk2::Label->new(), $label) : Gtk2::Label->new($label);
- $dialog->vbox->pack_start(create_scrolled_window($text, [ 'never', 'automatic' ]), 1, 1, 0);
+ gtkpack($dialog->vbox,
+ gtkpack_(Gtk2::HBox->new,
+ if_($o_options->{stock}, 0, Gtk2::Image->new_from_stock($o_options->{stock}, 'dialog')),
+ 1, create_scrolled_window($text, [ 'never', 'automatic' ]),
+ ),
+ );
$text->set_line_wrap(1);
if ($o_options->{cancel}) {
@@ -395,6 +401,18 @@ sub create_dialog {
$ret;
}
+sub warn_dialog {
+ my ($title, $label, $o_options) = @_;
+ add2hash_($o_options, { small => 1, stock => 'gtk-dialog-warning', cancel => 1 });
+ create_dialog($title, $label, $o_options);
+}
+
+sub err_dialog {
+ my ($title, $label, $o_options) = @_;
+ add2hash_($o_options, { small => 1, stock => 'gtk-dialog-error' });
+ create_dialog($title, $label, $o_options);
+}
+
sub create_hbox { gtkset_layout(gtkset_border_width(Gtk2::HButtonBox->new, 3), $_[0] || 'spread') }
sub create_vbox { gtkset_layout(Gtk2::VButtonBox->new, $_[0] || 'spread') }