summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog5
-rw-r--r--perl-install/install_steps_gtk.pm3
-rw-r--r--perl-install/interactive_gtk.pm5
-rw-r--r--perl-install/lang.pm2
4 files changed, 12 insertions, 3 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 49a7ce72a..c7154a2cb 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,5 +1,8 @@
2000-02-24 Pixel <pixel@mandrakesoft.com>
+ * interactive_gtk.pm (new): added the "new" method to initialize
+ windowheight for isStandalone
+
* install_steps_gtk.pm (new): returns undef in case no X server
works
@@ -7,7 +10,7 @@
to here
* install2.pm (main): fix the $SIG{SEGV} handler
* install2.pm (main): added a "try again" in text install if the
- new fails
+ "new" fails
* install_steps_interactive.pm (createBootdisk): fix an error for
non fdX choice of floppy drive
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 520abe4f3..a95249ed9 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -791,7 +791,8 @@ sub create_logo_window() {
sub init_sizes() {
($::rootheight, $::rootwidth) = (480, 640);
($::rootheight, $::rootwidth) = my_gtk::gtkroot()->get_size;
- ($::stepswidth, $::stepsheight) = (140, $::rootheight);
+ ($::rootheight, $::rootwidth) = (min(600, $::rootheight), min(800, $::rootwidth));
+ ($::stepswidth, $::stepsheight) = (140, $::rootheight);
($::logowidth, $::logoheight) = ($::rootwidth - $::stepswidth, 40);
($::helpwidth, $::helpheight) = ($::rootwidth - $::stepswidth, 100);
($::windowwidth, $::windowheight) = ($::rootwidth - $::stepswidth, $::rootheight - $::helpheight - $::logoheight);
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index d59a1ea15..1e81785d7 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -12,6 +12,11 @@ use my_gtk qw(:helpers :wrappers);
1;
+sub new {
+ $::windowheight ||= 400 if $::isStandalone;
+ goto &interactive::new;
+}
+
#-#- redefine ask_warn
#-sub ask_warn {
#- my $o = shift;
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index aa7087390..b75ea5c01 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -283,7 +283,7 @@ sub load_po($) {
$f = commands::install_cpio("$f/po", "$lang.po");
}
local *F;
- unless (-e $f) {
+ unless ($f && -e $f) {
-e ($f = "$_/po/$lang.po.bz2") and last foreach @INC;
if (-e $f) {
open F, "bzip2 -dc $f 2>/dev/null |";