summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-06-11 15:21:03 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-06-11 15:21:03 +0000
commit0a3636aa7ebf1c699689e0bb43604141a24437db (patch)
treebd9eee9581a51274e961e9e750363c16a82c8999
parentabdacf5381f9d9c6d0e6988883e4e2eaa712cbdc (diff)
downloaddrakx-0a3636aa7ebf1c699689e0bb43604141a24437db.tar
drakx-0a3636aa7ebf1c699689e0bb43604141a24437db.tar.gz
drakx-0a3636aa7ebf1c699689e0bb43604141a24437db.tar.bz2
drakx-0a3636aa7ebf1c699689e0bb43604141a24437db.tar.xz
drakx-0a3636aa7ebf1c699689e0bb43604141a24437db.zip
make draksplash work again...
-rwxr-xr-xperl-install/standalone/draksplash49
1 files changed, 25 insertions, 24 deletions
diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash
index 6cf84790f..91cc3664b 100755
--- a/perl-install/standalone/draksplash
+++ b/perl-install/standalone/draksplash
@@ -126,18 +126,18 @@ my %boot_conf_frame = ('frame' => Gtk2::Frame->new(N("Configure bootsplash pictu
'quiet' => N("Make kernel message quiet by default"),
},
},
- 'pos' => [ 'tx 1',
- 'ty 1',
- 'tw 1',
- 'th 1',
- 'px 1',
- 'py 1',
- 'pw 1',
- 'ph 1',
+ 'pos' => [ 'tx',
+ 'ty',
+ 'tw',
+ 'th',
+ 'px',
+ 'py',
+ 'pw',
+ 'ph',
'pc',
'logo',
'quiet',
- 'annul',
+ # 'annul',
'prev',
'save',
'kill',
@@ -370,48 +370,49 @@ sub mk_frame {
my $u = create_packtable({ col_spacings => 10, row_spacings => 5 },
map {
my @widgets;
+ my $pos = $_;
#- look for label
- if ($ref->{widget}{label}{$1}) {
- my $w = $ref->{widgets}{label}{$1} = Gtk2::Label->new($ref->{widget}{label}{$1});
+ if ($ref->{widget}{label}{$pos}) {
+ my $w = $ref->{widgets}{label}{$pos} = Gtk2::Label->new($ref->{widget}{label}{$pos});
push @widgets, $w;
}
#- look for scale
- if ($ref->{widget}{scale}{$1}) {
- my $w = $ref->{widgets}{scale}{$1} = Gtk2::HScale->new($adj{$1} = Gtk2::Adjustment->new(0, 0, $scale_size{$1}, 1, 10, 0));
- $ref->{widgets}{scale}{$1}->set_digits(0);
+ if ($ref->{widget}{scale}{$pos}) {
+ my $w = $ref->{widgets}{scale}{$pos} = Gtk2::HScale->new($adj{$pos} = Gtk2::Adjustment->new(0, 0, $scale_size{$pos}, 1, 10, 0));
+ $ref->{widgets}{scale}{$pos}->set_digits(0);
push @widgets, $w;
}
- $adj{$1} and $adj{$1}->set_value($theme{boot_conf}{$1});
+ $adj{$pos} and $adj{$pos}->set_value($theme{boot_conf}{$pos});
#- look for combo
my @popdown;
- if ($ref->{widget}{combo}{$1}) {
- @popdown = @{$ref->{widget}{combo}{$1}};
- my $w = $ref->{widgets}{combo}{$1} = $ref->{widget}{extras}{$1}{noneditable} ? Gtk2::ComboBox->new_text : Gtk2::Combo->new;
+ if ($ref->{widget}{combo}{$pos}) {
+ @popdown = @{$ref->{widget}{combo}{$pos}};
+ my $w = $ref->{widgets}{combo}{$pos} = $ref->{widget}{extras}{$pos}{noneditable} ? Gtk2::ComboBox->new_text : Gtk2::Combo->new;
$w->set_popdown_strings(@popdown);
$w->set_active(0) if $w->isa('Gtk2::ComboBox');
push @widgets, $w;
}
#- look for checkbox
- if ($ref->{widget}{check}{$1}) {
- my $w = $ref->{widgets}{check}{$1} = Gtk2::CheckButton->new($ref->{widget}{check}{$1});
- $ref->{widgets}{check}{$1}->set_active(1);
+ if ($ref->{widget}{check}{$pos}) {
+ my $w = $ref->{widgets}{check}{$pos} = Gtk2::CheckButton->new($ref->{widget}{check}{$pos});
+ $ref->{widgets}{check}{$pos}->set_active(1);
push @widgets, $w;
}
#- look for button
- if ($ref->{widget}{button}{$1}) {
- my $w = $ref->{widgets}{button}{$1} = Gtk2::Button->new($ref->{widget}{button}{$1});
+ if ($ref->{widget}{button}{$pos}) {
+ my $w = $ref->{widgets}{button}{$pos} = Gtk2::Button->new($ref->{widget}{button}{$pos});
@widgets ?
push @widgets, $w
: push @buttons, $w;
}
#- look for tooltips
- $ref->{widget}{tooltip}{$1} and tool_tip($1, \%$ref);
+ $ref->{widget}{tooltip}{$pos} and tool_tip($pos, \%$ref);
if_(@widgets, \@widgets);
} @{$ref->{pos}}
);