diff options
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/gtk.pm | 16 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index a1fa46ebf..dedb66af2 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -59,7 +59,7 @@ sub load_rc { my $f = $name; -r $name or $f = find { -r $_ } map { "$_/themes-$name.rc" } ("share", $ENV{SHARE_PATH}, dirname(__FILE__) . '/..'); if ($f) { - Gtk2::Rc->parse_string($o->{doc} ? $theme_overriding_for_doc : scalar cat_($f)); + Gtk3::Rc->parse_string($o->{doc} ? $theme_overriding_for_doc : scalar cat_($f)); } } @@ -68,7 +68,7 @@ sub load_font { my ($o) = @_; if (defined($::WizardWindow) && lang::text_direction_rtl()) { - Gtk2::Widget->set_default_direction('rtl'); + Gtk3::Widget->set_default_direction('rtl'); my ($x, $y) = $::WizardWindow->get_position; my ($width) = $::WizardWindow->get_size; $::WizardWindow->move($::rootwidth - $width - $x, $y); @@ -76,7 +76,7 @@ sub load_font { my $font = lang::l2pango_font($o->{locale}{lang}); my $s = qq(gtk-font-name="$font"); - Gtk2::Rc->parse_string($s); + Gtk3::Rc->parse_string($s); mkdir("/root"); output("/root/.gtkrc-2.0", $s); } @@ -169,7 +169,7 @@ sub update_steps_position { exists $steps{steps}{$_} or next; if ($o->{steps}{$_}{entered} && !$o->{steps}{$_}{done}) { # we need to flush the X queue since else we got a temporary Y position of -1 when switching locales: - mygtk3::flush(); #- for auto_installs which never go through the Gtk2 main loop + mygtk3::flush(); #- for auto_installs which never go through the Gtk3 main loop $o->{steps_widget}->move_selection($steps{steps}{$_}{text}); if ($last_step) { @@ -179,7 +179,7 @@ sub update_steps_position { } $last_step = $_; } - mygtk3::flush(); #- for auto_installs which never go through the Gtk2 main loop + mygtk3::flush(); #- for auto_installs which never go through the Gtk3 main loop } #------------------------------------------------------------------------------ @@ -199,14 +199,14 @@ q(<fontconfig> $ENV{FONTCONFIG_FILE} = '/tmp/fonts.conf'; } - Gtk2->init; - Gtk2->set_locale; + Gtk3->init; + Gtk3->set_locale; } #------------------------------------------------------------------------------ sub init_sizes { my ($o) = @_; - ($::rootwidth, $::rootheight) = (Gtk2::Gdk->screen_width, Gtk2::Gdk->screen_height); + ($::rootwidth, $::rootheight) = (Gtk3::Gdk->screen_width, Gtk3::Gdk->screen_height); $::stepswidth = $::rootwidth <= 640 ? 0 : 196; ($::logowidth, $::logoheight) = $::rootwidth <= 640 ? (0, 0) : (800, 75); ($o->{windowwidth}, $o->{windowheight}) = ($::rootwidth - $::stepswidth, $::rootheight); diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index d88fa2106..f57c9cecc 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -180,7 +180,7 @@ sub leavingStep { sub charsetChanged { my ($o) = @_; - Gtk2->set_locale; + Gtk3->set_locale; install::gtk::load_font($o); install::gtk::create_steps_window($o); } @@ -264,11 +264,11 @@ sub reallyChooseDesktop { $prev->signal_connect(key_press_event => sub { my (undef, $event) = @_; if (!$event || ($event->keyval & 0x7f) == 0xd) { - Gtk2->main_quit; + Gtk3->main_quit; } }); my $img = gtksignal_connect( - gtkadd(Gtk2::EventBox->new, gtknew('Image', file => "desktop-$val->[0]")), + gtkadd(Gtk3::EventBox->new, gtknew('Image', file => "desktop-$val->[0]")), 'button-press-event' => sub { my %title = ( KDE => N("KDE Desktop"), @@ -286,7 +286,7 @@ sub reallyChooseDesktop { 1, gtknew('Image', file => "desktop-$val->[0]-big"), 0, gtknew('HSeparator'), 0, gtknew('HButtonBox', layout => 'end', children_loose => [ - gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit }) + gtknew('Button', text => N("Close"), clicked => sub { Gtk3->main_quit }) ]), ]), ); @@ -355,7 +355,7 @@ sub reallyChooseGroups { gtknew('Install_Button', text => N("Help"), clicked => sub { interactive::gtk::display_help($o, { interactive_help_id => 'choosePackageGroups' }) }), gtknew('Button', text => N("Unselect All"), clicked => sub { $_->set_active(0) foreach @entries }), - gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }), + gtknew('Button', text => N("Next"), clicked => sub { Gtk3->main_quit }), ]), ]), ) @@ -572,7 +572,7 @@ sub installPackages { my $pl = $f; $pl =~ s/\.png$/.pl/; eval(cat_($pl)) if -e $pl; $banner->{text} = $title; - Gtk2::Banner::update_text($banner); + Gtk3::Banner::update_text($banner); } }; @@ -788,7 +788,7 @@ It will then continue from the hard disk drive and the packages will remain avai 0, gtknew('HButtonBox', layout => 'edge', children_tight => [ gtknew('Install_Button', text => N("Help"), clicked => sub { interactive::gtk::display_help($o, { interactive_help_id => 'choosePackagesTree' }) }), - gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }), + gtknew('Button', text => N("Next"), clicked => sub { Gtk3->main_quit }), ]), ]), ); |