summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-08-31 21:12:05 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-08-31 21:12:05 +0000
commit3385b46f67b8ec9e9d6a6afd4402155d44620ab4 (patch)
tree553a5f3c3d5e2c9787a34bc60baaf3ee70d8a9e8
parent9fbed9ab76940bea1d9285057c33bcb4a585b0ee (diff)
downloaddrakx-3385b46f67b8ec9e9d6a6afd4402155d44620ab4.tar
drakx-3385b46f67b8ec9e9d6a6afd4402155d44620ab4.tar.gz
drakx-3385b46f67b8ec9e9d6a6afd4402155d44620ab4.tar.bz2
drakx-3385b46f67b8ec9e9d6a6afd4402155d44620ab4.tar.xz
drakx-3385b46f67b8ec9e9d6a6afd4402155d44620ab4.zip
fix dialogs height: replace"small" option by "height" & "weight" ones
rationale: make thecommon path be the easiest one to set up (and make the uncommon path be the hardest one to follow)
-rwxr-xr-xperl-install/standalone/drakconnect8
-rwxr-xr-xperl-install/standalone/drakfloppy2
-rwxr-xr-xperl-install/standalone/harddrake22
-rw-r--r--perl-install/ugtk2.pm8
4 files changed, 10 insertions, 10 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 90c0cb79e..19d705362 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -280,7 +280,7 @@ $window1->{window}->add(
gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => \&quit_global),
gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub {
if ($button_apply->get('sensitive')) {
- my $dialog = _create_dialog(N("Please wait"), { small => 1 });
+ my $dialog = _create_dialog(N("Please wait"));
gtkpack($dialog->vbox,
Gtk2::Label->new(N("Please Wait... Applying the configuration")));
$dialog->show_all;
@@ -434,7 +434,7 @@ sub get_intf_status {
sub configure_lan() {
sensitive_buttons(0);
- my $window = _create_dialog(N("LAN configuration"), { small => 1 });
+ my $window = _create_dialog(N("LAN configuration"));
my @card_tab;
if (@all_cards < 1) {
@@ -568,7 +568,7 @@ sub configure_net {
Gtk2->main_quit;
};
if (!$netcnx->{type}) {
- $dialog = _create_dialog(N("LAN configuration"), { small => 1 });
+ $dialog = _create_dialog(N("LAN configuration"));
$dialog->vbox->add(Gtk2::Label->new(N("You don't have an Internet connection.
Create one first by clicking on 'Configure'")));
gtkpack($dialog->action_area,
@@ -580,7 +580,7 @@ Create one first by clicking on 'Configure'")));
}
my $cnx = {};
$cnx = $netcnx->{$netcnx->{type}};
- $dialog = _create_dialog(N("Internet connection configuration"), { small => 1 });
+ $dialog = _create_dialog(N("Internet connection configuration"));
$dialog->signal_connect(delete_event => $exit_dialogsub);
$dialog->set_border_width(10);
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index e3e01f151..1bca87d5a 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -309,7 +309,7 @@ sub build_it() {
info_dialog(N("Floppy creation completed"), N("The creation of the boot floppy has been successfully completed \n"));
ugtk2->exit;
} else {
- err_dialog(N("Error"), N("Unable to properly close mkbootdisk:\n\n<span foreground=\"Red\"><tt>%s</tt></span>", $log), { use_markup => 1, small => 1 });
+ err_dialog(N("Error"), N("Unable to properly close mkbootdisk:\n\n<span foreground=\"Red\"><tt>%s</tt></span>", $log), { use_markup => 1 });
}
return 0;
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 767a9a3d3..2db0049fb 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -109,7 +109,7 @@ my @menu_items =
create_dialog(N("Harddrake help"),
N("Description of the fields:\n\n")
#-PO Do not alter the <span ..> and </span> tags
- . join("\n\n", map { if_($fields{$_}[0], "<span foreground=\"royalblue3\">$fields{$_}[0]:</span> $fields{$_}[1]") } sort keys %$current_device), { use_markup => 1, if_(!$::isEmbedded, transient => $w->{window}) })
+ . join("\n\n", map { if_($fields{$_}[0], "<span foreground=\"royalblue3\">$fields{$_}[0]:</span> $fields{$_}[1]") } sort keys %$current_device), { use_markup => 1, if_(!$::isEmbedded, transient => $w->{window}), height => 400 })
} else {
create_dialog(N("Select a device !"), N("Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"), { if_(!$::isEmbedded, transient => $w->{window}) })
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index e4013d543..382ce4ebc 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -364,7 +364,7 @@ sub _create_dialog {
my $dialog = Gtk2::Dialog->new;
$dialog->set_title($title);
$dialog->set_position('center-on-parent'); # center-on-parent doesn't work
- $dialog->set_size_request(-1, $o_options->{small} ? -1 : 400);
+ $dialog->set_size_request($o_options->{height} || -1, $o_options->{height} || -1);
$dialog->set_modal(1);
$dialog->set_transient_for($o_options->{transient}) if $o_options->{transient};
$dialog;
@@ -406,21 +406,21 @@ sub create_dialog {
sub info_dialog {
my ($title, $label, $o_options) = @_;
$o_options ||= { };
- add2hash_($o_options, { small => 1, stock => 'gtk-dialog-info' });
+ add2hash_($o_options, { stock => 'gtk-dialog-info' });
create_dialog($title, $label, $o_options);
}
sub warn_dialog {
my ($title, $label, $o_options) = @_;
$o_options ||= { };
- add2hash_($o_options, { small => 1, stock => 'gtk-dialog-warning', cancel => 1 });
+ add2hash_($o_options, { stock => 'gtk-dialog-warning', cancel => 1 });
create_dialog($title, $label, $o_options);
}
sub err_dialog {
my ($title, $label, $o_options) = @_;
$o_options ||= { };
- add2hash_($o_options, { small => 1, stock => 'gtk-dialog-error' });
+ add2hash_($o_options, { stock => 'gtk-dialog-error' });
create_dialog($title, $label, $o_options);
}