summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-05-15 15:28:56 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-05-15 15:28:56 +0000
commit099fe3554fd99b00f0a3b95b3ebad3d676939f56 (patch)
tree08caa22a5c018b43b2a5a162dd15a15659f0b48c
parent8ab3dfff357a05a5eea4912325d022e19f6e3cbd (diff)
downloaddrakx-099fe3554fd99b00f0a3b95b3ebad3d676939f56.tar
drakx-099fe3554fd99b00f0a3b95b3ebad3d676939f56.tar.gz
drakx-099fe3554fd99b00f0a3b95b3ebad3d676939f56.tar.bz2
drakx-099fe3554fd99b00f0a3b95b3ebad3d676939f56.tar.xz
drakx-099fe3554fd99b00f0a3b95b3ebad3d676939f56.zip
(create_dialog) :
- update caller list - add title parameter and update callers
-rwxr-xr-xperl-install/standalone/drakfloppy8
-rwxr-xr-xperl-install/standalone/drakfont4
-rw-r--r--perl-install/ugtk2.pm6
3 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index 57b288abc..c3a7575ef 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -294,22 +294,22 @@ sub build_it() {
}
$co .= " " . $kernel_combo->entry->get_text();
$co .= " 2>&1 |";
- create_dialog(N("Be sure a media is present for the device %s", $device_combo->entry->get_text()), 1) or return;
+ create_dialog(N("Warning"), N("Be sure a media is present for the device %s", $device_combo->entry->get_text()), 1) or return;
# we test if the media is present
test:
my $a = "dd count=1 if=/dev/null of=" . $device_combo->entry->get_text() . " 2>&1";
my $b = `$a`;
if ($b =~ /dd/) {
- create_dialog(N("There is no medium or it is write-protected for device %s.\nPlease insert one.", $device_combo->entry->get_text()), 1) ? goto test : return 0;
+ create_dialog(N("Error"), N("There is no medium or it is write-protected for device %s.\nPlease insert one.", $device_combo->entry->get_text()), 1) ? goto test : return 0;
}
local *STATUS;
- open STATUS, $co or do { create_dialog(N("Unable to fork: %s", $!), 0); return };
+ open STATUS, $co or do { create_dialog(N("Error"), N("Unable to fork: %s", $!), 0); return };
local $_;
while (<STATUS>) {
gtktext_append($output, [ [ $_ ] ]);
}
- close STATUS or create_dialog(N("Unable to properly close mkbootdisk: \n %s \n %s", $!, $?), 0);
+ close STATUS or create_dialog(N("Error"), N("Unable to properly close mkbootdisk: \n %s \n %s", $!, $?), 0);
return (0);
}
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index d1bb2ddcc..4efd6d815 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -605,7 +605,7 @@ sub text_view {
}
sub help() {
- ugtk2::create_dialog(N("
+ ugtk2::create_dialog(N("Help"), N("
Copyright (C) 2001-2002 by MandrakeSoft
DUPONT Sebastien (original version)
CHAUMETTE Damien <dchaumette\@mandrakesoft.com>
@@ -723,7 +723,7 @@ sub file_ok_sel {
my ($_widget, $file_selection) = @_;
my $file_name = $file_selection->get_filename();
if ($file_name =~ /$select_font_msg/) {
- create_dialog(N("You've not selected any font"));
+ create_dialog(N("Error"), N("You've not selected any font"));
} else {
print "-- @install\n";
if (!member($file_name, @install)) {
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 9a62e6c4e..42eea50ea 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -352,13 +352,13 @@ sub create_box_with_title {
}
}
-# drakfloppy / logdrake
+# drakfloppy / drakfont
sub create_dialog {
- my ($label, $o_c) = @_;
+ my ($title, $label, $o_c) = @_;
my $ret = 0;
my $dialog = Gtk2::Dialog->new;
$dialog->signal_connect(delete_event => sub { Gtk2->main_quit });
-# $dialog->set_title(N("logdrake"));
+ $dialog->set_title($title);
$dialog->set_border_width(10);
$dialog->set_position('center-on-parent'); # center-on-parent doesn't work
$dialog->vbox->pack_start(Gtk2::Label->new($label), 1, 1, 0);