diff options
| -rw-r--r-- | perl-install/install_gtk.pm | 7 | ||||
| -rw-r--r-- | perl-install/ugtk2.pm | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index a1e68617b..aa58371e1 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -129,17 +129,18 @@ sub create_steps_window { $o->{steps_window} and $o->{steps_window}->destroy; my $w = bless {}, 'ugtk2'; $w->{rwindow} = $w->{window} = Gtk2::Window->new('toplevel'); - $w->{rwindow}->set_uposition(lang::text_direction_rtl() ? ($::rootwidth - $::stepswidth - 8) : 8, 160); + $w->{rwindow}->set_uposition(lang::text_direction_rtl() ? ($::rootwidth - $::stepswidth - 8) : 8, 150); $w->{rwindow}->set_size_request($::stepswidth, -1); $w->{rwindow}->set_name('Steps'); $w->{rwindow}->set_title('skip'); $steps{$_} ||= gtkcreate_pixbuf("steps_$_") foreach qw(on off); + my $category = sub { gtkset_markup(Gtk2::Label->new, '<span foreground="gray81">' . $_[0] . '</span>') }; - gtkpack__(my $vb = Gtk2::VBox->new(0, 3), $steps{inst} = Gtk2::Label->new(N("System installation")), ''); + gtkpack__(my $vb = Gtk2::VBox->new(0, 3), $steps{inst} = $category->(N("System installation")), ''); foreach (grep { !eval $o->{steps}{$_}{hidden} } @{$o->{orderedSteps}}) { $_ eq 'setRootPassword' - and gtkpack__($vb, '', '', $steps{conf} = Gtk2::Label->new(N("System configuration")), ''); + and gtkpack__($vb, '', '', $steps{conf} = $category->(N("System configuration")), ''); $steps{steps}{$_} = { img => gtkcreate_img('steps_off.png'), txt => Gtk2::Label->new(translate($o->{steps}{$_}{text})) }; gtkpack__($vb, gtkpack__(Gtk2::HBox->new(0, 7), $steps{steps}{$_}{img}, $steps{steps}{$_}{txt})); diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 983e670bd..8994baf51 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -769,7 +769,7 @@ sub new { if ($::isInstall) { $::WizardTable->set_size_request($::windowwidth * 0.90, $::windowheight * ($::logoheight ? 0.73 : 0.9)); - $::WizardWindow->set_uposition($::stepswidth + $::windowwidth * 0.04, $::logoheight + $::windowheight * ($::logoheight ? 0.15 : 0.05)); + $::WizardWindow->set_uposition($::stepswidth + $::windowwidth * 0.04, $::logoheight + $::windowheight * ($::logoheight ? 0.12 : 0.05)); $::WizardWindow->signal_connect(key_press_event => sub { my (undef, $event) = @_; my $d = ${{ Gtk2::Gdk::Event::Key->Sym_F2 => 'screenshot' }}{$event->keyval}; |