diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-02-21 12:39:08 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-02-21 12:39:08 +0000 |
| commit | a258002e5c03e53ced189ad817e6248d93b8b435 (patch) | |
| tree | b928875af4b6a62edc2395f317f0719f07c3722d | |
| parent | 012eeb0c164cd3b690ef0ec06e549b311101aed6 (diff) | |
| download | drakx-backup-do-not-use-a258002e5c03e53ced189ad817e6248d93b8b435.tar drakx-backup-do-not-use-a258002e5c03e53ced189ad817e6248d93b8b435.tar.gz drakx-backup-do-not-use-a258002e5c03e53ced189ad817e6248d93b8b435.tar.bz2 drakx-backup-do-not-use-a258002e5c03e53ced189ad817e6248d93b8b435.tar.xz drakx-backup-do-not-use-a258002e5c03e53ced189ad817e6248d93b8b435.zip | |
more translatable strings;
hide scantv output on console;
check that we're under X11 before running scantv in an xterm
| -rwxr-xr-x | perl-install/standalone/drakxtv | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index fd50823fd..0ea4f673e 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -1,5 +1,6 @@ #!/usr/bin/perl # DrakxTV +# $Id$ # Copyright (C) 2002 MandrakeSoft (tvignaud@mandrakesoft.com) # @@ -48,17 +49,17 @@ sub scan4channels { { label => _("Area :"), val => \$ftable_id, list => [keys %freqtables], not_edit => 1, sort => 1}, ], complete => sub { - my $wait = $in->wait_message('Please wait', + my $wait = $in->wait_message(_('Please wait'), _("Scanning for TV channels in progress ...")); # france is a bogus table provided to scantv which will # ignore it as "All" is selected because of -a $ftable_id = $freqtables{$ftable_id}; $ftable_id = "france -a " if ($ftable_id eq -1); - - system( (( -x "/usr/X11R6/bin/xvt") ? - "xvt -title '"._("Scanning for TV channels")." ...' -e " : "") - . "scantv -n $norm -f $ftable_id -o ~/.xawtv"); + my $use_X =$ENV{DISPLAY} && -x "/usr/X11R6/bin/xvt"; + system( (($use_X ) ? + "xvt -title '"._("Scanning for TV channels")." ...' -e ":"") + . "scantv -n $norm -f $ftable_id -o ~/.xawtv".(($use_X )?"":" &>~/tmp/scantv.log")); $in->exit(0); }, ) or $in->exit(0); |