summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-15 13:41:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-15 13:41:51 +0000
commitae1ca0772cea076c0098a83c15de2581e8aee3f5 (patch)
tree3df8809b28956670bca8ba3b447409c5d8bdfdd5 /perl-install
parent1e19a1f7ea181f9fd40e0f81ac3b7fda8563d391 (diff)
downloaddrakx-ae1ca0772cea076c0098a83c15de2581e8aee3f5.tar
drakx-ae1ca0772cea076c0098a83c15de2581e8aee3f5.tar.gz
drakx-ae1ca0772cea076c0098a83c15de2581e8aee3f5.tar.bz2
drakx-ae1ca0772cea076c0098a83c15de2581e8aee3f5.tar.xz
drakx-ae1ca0772cea076c0098a83c15de2581e8aee3f5.zip
- add and use aewm-drakx
- add some "skip" title on help/logo/steps windows so that aewm-drakx know they don't need keyboard focus - add some more title to ease debugging (when aewm-drakx is in debug mode)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm1
-rw-r--r--perl-install/install_gtk.pm3
-rw-r--r--perl-install/install_steps_gtk.pm9
3 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index a26666ae9..55391995c 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -774,6 +774,7 @@ sub selectLanguage {
my ($in, $lang, $langs) = @_;
$in->ask_from_(
{ messages => _("Please, choose a language to use."),
+ title => 'language choice',
advanced_messages => _("You can choose other languages that will be available after install"),
callbacks => {
focus_out => sub { $langs->{$lang} = 1 },
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index da7ade600..f9dfab493 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -100,6 +100,7 @@ sub create_help_window {
$w->{rwindow} = $w->{window} = new Gtk::Window;
$w->{rwindow}->set_uposition($::rootwidth - $::helpwidth, $::rootheight - $::helpheight);
$w->{rwindow}->set_usize($::helpwidth, $::helpheight);
+ $w->{rwindow}->set_title('skip');
$w->sync;
}
my $pixmap = gtkpng("$ENV{SHARE_PATH}/help.png");
@@ -127,6 +128,7 @@ sub create_steps_window {
$w->{rwindow}->set_usize($::stepswidth, $::stepsheight);
$w->{rwindow}->set_name('Steps');
$w->{rwindow}->set_events('button_press_mask');
+ $w->{rwindow}->set_title('skip');
#$w->show;
gtkadd($w->{window},
@@ -187,6 +189,7 @@ sub create_logo_window {
$w->{rwindow}->set_uposition($::stepswidth, 0);
$w->{rwindow}->set_usize($::logowidth, $::logoheight);
$w->{rwindow}->set_name("logo");
+ $w->{rwindow}->set_title('skip');
$w->show;
my $file = $o->{meta_class} eq 'desktop' ? "logo-mandrake-Desktop.png" : "logo-mandrake.png";
$o->{meta_class} eq 'firewall' and $file = "logo-mandrake-Firewall.png";
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 36f183245..471e322fe 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -33,8 +33,6 @@ sub new($$) {
$ENV{DISPLAY} ||= $o->{display} || ":0";
unless ($::testing) {
- $my_gtk::force_focus = $ENV{DISPLAY} eq ":0";
-
if ($ENV{DISPLAY} eq ":0" && !$::live) {
my $f = "/tmp/Xconf";
install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{wacom}[0]);
@@ -58,7 +56,10 @@ sub new($$) {
foreach (1..60) {
sleep 1;
log::l("Server died"), return 0 if !$ok;
- return 1 if c::Xtest($ENV{DISPLAY});
+ if (c::Xtest($ENV{DISPLAY})) {
+ fork || exec("aewm-drakx") || exec("true");
+ return 1;
+ }
}
log::l("Timeout!!");
0;
@@ -155,7 +156,7 @@ sub selectInstallClass1 {
my ($o, $verif, $l, $def, $l2, $def2) = @_;
$::live || @$l == 1 and return $o->SUPER::selectInstallClass1($verif, $l, $def, $l2, $def2);
- my $w = my_gtk->new('');
+ my $w = my_gtk->new(_("Install Class"));
my $focused;
gtkadd($w->{window},
gtkpack($w->create_box_with_title(_("Please, choose one of the following classes of installation:")),