summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-03-06 12:48:55 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-03-06 12:48:55 +0000
commit3cadca720b447f23c15e15197ae0cdd0ff31a053 (patch)
tree270c5cd37ced1e811d64bd36602a3656476bff19
parent8798aae6e68709ee2050d27478a4377e68c40deb (diff)
downloaddrakx-backup-do-not-use-3cadca720b447f23c15e15197ae0cdd0ff31a053.tar
drakx-backup-do-not-use-3cadca720b447f23c15e15197ae0cdd0ff31a053.tar.gz
drakx-backup-do-not-use-3cadca720b447f23c15e15197ae0cdd0ff31a053.tar.bz2
drakx-backup-do-not-use-3cadca720b447f23c15e15197ae0cdd0ff31a053.tar.xz
drakx-backup-do-not-use-3cadca720b447f23c15e15197ae0cdd0ff31a053.zip
- display "wait while searching" message also when embedded: we do not
want it only when embedded for explanations - flush this wait dialog draw queue on each update so that it get displayed when embedded
-rwxr-xr-xperl-install/standalone/logdrake11
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 1506b6f7f..6a83ed901 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -238,18 +238,19 @@ sub parse_file {
$file =~ s/\.gz$//;
my ($pbar, $win_pb);
- unless ($::isEmbedded) {
+ unless ($::isEmbedded && $::isExplain) {
gtkadd($win_pb = gtkset_modal(new Gtk2::Window('toplevel'), 1),
gtkpack(new Gtk2::VBox(2,0),
new Gtk2::Label(" " . N("please wait, parsing file: %s", $files{$_}{desc}) . " "),
$pbar = new Gtk2::ProgressBar()
)
);
- $win_pb->set_transient_for($my_win->{rwindow});
+ $win_pb->set_transient_for($my_win->{rwindow}) unless $::isEmbedded;
$win_pb->set_modal(1);
$win_pb->set_position('center');
$win_pb->realize();
$win_pb->show_all();
+ gtkflush();
}
my $ey = $e_yes->get_chars(0, -1);
my $en = $e_no->get_chars(0, -1);
@@ -280,16 +281,16 @@ sub parse_file {
my $i = 0;
foreach (@all) {
$i++;
- if (!$::isEmbedded && $i % 10) {
+ if ($pbar && $i % 10) {
$pbar->set_fraction($i/$taille);
- gtkflush();
+ $win_pb->window->process_updates(1); # no gtkflush() because we do not want to refresh the TextView
}
if ($en eq "" and /$ey/i) { logcolorize($_); next }
if (! /$en/i and /$ey/i) { logcolorize($_); next }
if (! /$en/i and $ey eq "") { logcolorize($_); next }
}
- $win_pb->destroy() unless $::isEmbedded;
+ $win_pb->destroy() unless $::isEmbedded && $::isExplain;
if ($::isTail) {
close F;