summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-10-24 17:44:02 +0000
committerdamien <damien@mandriva.com>2001-10-24 17:44:02 +0000
commitd3e3e3e0e17fdc4beedbc1fc3ba39a403038f31b (patch)
tree11bee14722b9e1330c392049ec8c75c6d4e55b57
parente56057cd0e5421156887762f37a96f536b0386fe (diff)
downloaddrakx-d3e3e3e0e17fdc4beedbc1fc3ba39a403038f31b.tar
drakx-d3e3e3e0e17fdc4beedbc1fc3ba39a403038f31b.tar.gz
drakx-d3e3e3e0e17fdc4beedbc1fc3ba39a403038f31b.tar.bz2
drakx-d3e3e3e0e17fdc4beedbc1fc3ba39a403038f31b.tar.xz
drakx-d3e3e3e0e17fdc4beedbc1fc3ba39a403038f31b.zip
updated
-rwxr-xr-xperl-install/standalone/drakfont12
1 files changed, 7 insertions, 5 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 3d5324b97..e86336fbf 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -419,8 +419,10 @@ sub create_fontsel {
sub display_error {
my $message = @_;
+ my $label;
${$central_widget}->destroy();
- gtkpack($font_box, $message);
+ gtkpack($font_box, $label = new Gtk::Label($message));
+ $central_widget = \$message;
}
sub interactive_mode {
@@ -449,7 +451,7 @@ sub interactive_mode {
0, _("DrakFont"),
0, gtkadd(gtkset_layout(new Gtk::VButtonBox, -end),
gtksignal_connect(new Gtk::Button(_("Windows Importation")), clicked =>
- sub { gtkdestroy($central_widget); $windows = 1; license() }),
+ sub { ${$central_widget}->destroy(); $windows = 1; license() }),
gtksignal_connect(new Gtk::Button(_("Advanced Importation")), clicked =>
sub { }),
gtksignal_connect(new Gtk::Button(_("Uninstall Fonts")), clicked => sub { Gtk->main_quit() }),
@@ -462,7 +464,7 @@ sub interactive_mode {
)
),
);
- $central_widget = $font_sel;
+ $central_widget = \$font_sel;
$window1->show_all;
$window1->realize;
$window1->show_all();
@@ -527,14 +529,14 @@ sub import_status {
my $table;
gtkpack($font_box,
$table = create_packtable({ col_spacings => 30, row_spacings => 20},
- if_($windows, [_("Search Fonts on your System"), $pbar = new_with_adjustment Gtk::ProgressBar($adj), gtkset_sensitive($check1 = new Gtk::CheckButton(), 0)]),
+ [_("Search Fonts on your System"), $pbar = new_with_adjustment Gtk::ProgressBar($adj), gtkset_sensitive($check1 = new Gtk::CheckButton(), 0)],
["Supress Doublons ", $pbar1 = new_with_adjustment Gtk::ProgressBar($adj1), gtkset_sensitive($check2 = new Gtk::CheckButton(), 0)],
["Install Fonts ", $pbar2 = new_with_adjustment Gtk::ProgressBar($adj2), gtkset_sensitive($check3 = new Gtk::CheckButton(), 0)],
["Post Install Fonts ", $pbar3 = new_with_adjustment Gtk::ProgressBar($adj3), gtkset_sensitive($check4 = new Gtk::CheckButton(), 0)],
),
);
$central_widget = \$table;
-# $font_box->show_all();
+ $font_box->show_all();
# my $timer = Gtk->timeout_add( 5, \&progress_timeout );
# my $timer1 = Gtk->timeout_add( 10, \&progress_timeout1 );
# my $timer2 = Gtk->timeout_add( 15, \&progress_timeout2 );