From e077d9de9c53e01dab6243941fc2ece05998f6ad Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 1 Aug 2012 17:12:50 +0200
Subject: rename for gtk+3

---
 perl-install/ugtk3.pm | 1652 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1652 insertions(+)
 create mode 100644 perl-install/ugtk3.pm

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
new file mode 100644
index 000000000..3db9ff814
--- /dev/null
+++ b/perl-install/ugtk3.pm
@@ -0,0 +1,1652 @@
+package ugtk2;
+
+use diagnostics;
+use strict;
+use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @icon_paths $wm_icon $grab $border); #- leave it on one line, for automatic removal of the line at package creation
+use locale;
+
+@ISA = qw(Exporter);
+%EXPORT_TAGS = (
+    wrappers => [ qw(gtkadd gtkadd_widget gtkappend gtkappend_page gtkappenditems gtkcombo_setpopdown_strings gtkdestroy
+                     gtkentry gtkflush gtkhide gtkmodify_font gtkmove gtkpack gtkpack2 gtkpack2_
+                     gtkpack2__ gtkpack_ gtkpack__ gtkpowerpack gtkput gtkradio gtkresize gtkroot
+                     gtkset_active gtkset_border_width gtkset_editable gtkset_justify gtkset_alignment gtkset_layout gtkset_line_wrap
+                     gtkset_markup gtkset_modal gtkset_mousecursor gtkset_mousecursor_normal gtkset_mousecursor_wait gtkset_name
+                     gtkset_property gtkset_relief gtkset_selectable gtkset_sensitive gtkset_shadow_type gtkset_size_request
+                     gtkset_text gtkset_tip gtkset_visibility gtksetstyle gtkshow gtksignal_connect gtksize gtktext_append
+                     gtktext_insert ) ],
+
+    helpers => [ qw(add2notebook add_icon_path escape_text_for_TextView_markup_format gtkcolor gtkcreate_img
+                    gtkcreate_pixbuf gtkfontinfo gtkset_background gtktreeview_children set_back_pixmap
+                    get_default_step_items set_default_step_items
+                    string_size string_width) ],
+
+    create => [ qw(create_adjustment create_box_with_title create_dialog create_factory_menu create_factory_popup_menu
+                   create_hbox create_hpaned create_menu create_notebook create_okcancel create_packtable
+                   create_scrolled_window create_vbox create_vpaned _create_dialog gtkcreate_frame) ],
+
+    ask => [ qw(ask_browse_tree_info ask_browse_tree_info_given_widgets ask_dir ask_from_entry ask_okcancel ask_warn
+                ask_yesorno) ],
+    dialogs => [ qw(err_dialog info_dialog warn_dialog) ],
+
+);
+$EXPORT_TAGS{all} = [ map { @$_ } values %EXPORT_TAGS ];
+@EXPORT_OK = map { @$_ } values %EXPORT_TAGS;
+
+use c;
+use log;
+use common;
+use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
+
+use Gtk2;
+
+
+$border = 5;
+
+sub wm_icon() { $wm_icon || $::Wizard_pix_up || "wiz_default_up.png" }
+
+# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---
+#                 wrappers
+#
+# Functional-style wrappers to existing Gtk functions; allows to program in
+# a more functional way, and especially, first, to avoid using temp
+# variables, and second, to "see" directly in the code the user interface
+# you're building.
+
+sub gtkdestroy                { mygtk2::may_destroy($_[0]) }
+sub gtkflush()                { mygtk2::flush() }
+sub gtkhide                   { $_[0]->hide; $_[0] }
+sub gtkmove                   { $_[0]->window->move($_[1], $_[2]); $_[0] }
+sub gtkpack                   { gtkpowerpack(1, 1, @_) }
+sub gtkpack_                  { gtkpowerpack('arg', 1, @_) }
+sub gtkpack__                 { gtkpowerpack(0, 1, @_) }
+sub gtkpack2                  { gtkpowerpack(1, 0, @_) }
+sub gtkpack2_                 { gtkpowerpack('arg', 0, @_) }
+sub gtkpack2__                { gtkpowerpack(0, 0, @_) }
+sub gtkput                    { $_[0]->put(gtkshow($_[1]), $_[2], $_[3]); $_[0] }
+sub gtkresize                 { $_[0]->window->resize($_[1], $_[2]); $_[0] }
+sub gtkset_active             { $_[0]->set_active($_[1]); $_[0] }
+sub gtkset_border_width       { $_[0]->set_border_width($_[1]); $_[0] }
+sub gtkset_editable           { $_[0]->set_editable($_[1]); $_[0] }
+sub gtkset_selectable         { $_[0]->set_selectable($_[1]); $_[0] }
+sub gtkset_justify            { $_[0]->set_justify($_[1]); $_[0] }
+sub gtkset_alignment          { $_[0]->set_alignment($_[1], $_[2]); $_[0] }
+sub gtkset_layout             { $_[0]->set_layout($_[1]); $_[0] }
+sub gtkset_modal              { $_[0]->set_modal($_[1]); $_[0] }
+sub gtkset_mousecursor_normal { gtkset_mousecursor('left-ptr', @_) }
+sub gtkset_mousecursor_wait   { gtkset_mousecursor('watch', @_) }
+sub gtkset_relief             { $_[0]->set_relief($_[1]); $_[0] }
+sub gtkset_sensitive          { $_[0]->set_sensitive($_[1]); $_[0] }
+sub gtkset_visibility         { $_[0]->set_visibility($_[1]); $_[0] }
+sub gtkset_tip                { $_[0]->set_tip($_[1], $_[2]) if $_[2]; $_[1] }
+sub gtkset_shadow_type        { $_[0]->set_shadow_type($_[1]); $_[0] }
+sub gtkset_style              { $_[0]->set_style($_[1]); $_[0] }
+sub gtkset_size_request       { $_[0]->set_size_request($_[1], $_[2]); $_[0] }
+sub gtkshow                   { $_[0]->show; $_[0] }
+sub gtksize                   { $_[0]->size($_[1], $_[2]); $_[0] }
+sub gtkset_markup             { $_[0]->set_markup($_[1]); $_[0] }
+sub gtkset_line_wrap          { $_[0]->set_line_wrap($_[1]); $_[0] }
+
+sub gtkadd {
+    my $w = shift;
+    foreach my $l (@_) {
+	ref $l or $l = gtknew('WrappedLabel', text => $l);
+	$w->add(gtkshow($l));
+    }
+    $w;
+}
+
+sub gtkadd_widget {
+    my $sg = shift;
+    map {
+        my $l = $_;
+        ref $l or $l = gtknew('WrappedLabel', text => $l);
+        $sg->add_widget($l);
+        $l;
+    } @_;
+}
+
+sub gtkappend {
+    my $w = shift;
+    foreach my $l (@_) {
+	ref $l or $l = gtknew('WrappedLabel', text => $l);
+	$w->append(gtkshow($l));
+    }
+    $w;
+}
+
+sub gtkappenditems {
+    my $w = shift;
+    $_->show foreach @_;
+    $w->append_items(@_);
+    $w;
+}
+
+# append page to a notebook
+sub gtkappend_page {
+    my ($notebook, $page, $o_title) = @_;
+    $notebook->append_page($page, $o_title);
+    $notebook;
+}
+
+sub gtkentry {
+    my ($o_text) = @_;
+    my $e = gtknew('Entry');
+    $o_text and $e->set_text($o_text);
+    $e;
+}
+
+sub gtksetstyle { 
+    my ($w, $s) = @_;
+    $w->set_style($s);
+    $w;
+}
+
+sub gtkradio {
+    my $def = shift;
+    my $radio;
+    map {
+        my $w = gtkset_active($radio = Gtk2::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def);
+        $w->get_child->set_line_wrap(1);
+        $w;
+      } @_;
+}
+
+sub gtkroot() { mygtk2::root_window() }
+sub gtkcolor { &mygtk2::rgb2color }
+sub gtkset_background { &mygtk2::set_root_window_background }
+
+sub gtkset_text {
+    my ($w, $s) = @_;
+    $w->set_text($s);
+    $w;
+}
+
+sub gtkcombo_setpopdown_strings {
+    my $w = shift;
+    $w->set_popdown_strings(@_);
+    $w;
+}
+
+sub gtkset_mousecursor {
+    my ($type, $w) = @_;
+    ($w || gtkroot())->set_cursor(Gtk2::Gdk::Cursor->new($type));
+    $w;
+}
+
+sub gtksignal_connect {
+    my $w = shift;
+    $w->signal_connect(@_);
+    $w;
+}
+
+sub gtkset_name {
+    my ($widget, $name) = @_;
+    $widget->set_name($name);
+    $widget;
+}
+
+
+sub gtkpowerpack {
+    #- Get Default Attributes (if any). 2 syntaxes allowed :
+    #- gtkpowerpack( {expand => 1, fill => 0}, $box...) : the attributes are picked from a specified hash ref
+    #- gtkpowerpack(1, 0, 1, $box, ...) : the attributes are picked from the non-ref list, in the order (expand, fill, padding, pack_end).
+    my @attributes_list = qw(expand fill padding pack_end);
+    my $default_attrs = {};
+    if (ref($_[0]) eq 'HASH') {
+	$default_attrs = shift;
+    } elsif (!ref($_[0])) {
+	foreach (@attributes_list) {
+	    ref($_[0]) and last;
+	    $default_attrs->{$_} = shift;
+	}
+    }
+    my $box = shift;
+
+    while (@_) {
+	#- Get attributes (if specified). 4 syntaxes allowed (default values are undef ie. false...) :
+	#- gtkpowerpack({defaultattrs}, $box, $widget1, $widget2, ...) : the attrs are picked from the default ones (if they exist)
+	#- gtkpowerpack($box, {fill=>1, expand=>0, ...}, $widget1, ...) : the attributes are picked from a specified hash ref
+	#- gtkpowerpack($box, [1,0,1], $widget1, ...) : the attributes are picked from the array ref : (expand, fill, padding, pack_end).
+	#- gtkpowerpack({attr=>'arg'}, $box, 1, $widget1, 0, $widget2, etc...) : the 'arg' value will tell gtkpowerpack to always read the 
+	#- attr value directly in the arg list (avoiding confusion between value 0 and Gtk::Label("0"). That can simplify some writings but
+	#- this arg(s) MUST then be present...
+	my (%attr, $attrs);
+	ref($_[0]) eq 'HASH' || ref($_[0]) eq 'ARRAY' and $attrs = shift;
+	foreach (@attributes_list) {
+	    if (($default_attrs->{$_} || '') eq 'arg') {
+		ref($_[0]) and internal_error "error in packing definition\n";
+		$attr{$_} = shift;
+		ref($attrs) eq 'ARRAY' and shift @$attrs;
+	    } elsif (ref($attrs) eq 'HASH' && defined($attrs->{$_})) {
+		$attr{$_} = $attrs->{$_};
+	    } elsif (ref($attrs) eq 'ARRAY') {
+		$attr{$_} = shift @$attrs;
+	    } elsif (defined($default_attrs->{$_})) {
+		$attr{$_} = int $default_attrs->{$_};
+	    } else {
+		$attr{$_} = 0;
+	    }
+	}
+	#- Get and pack the widget (create it if necessary to  a label...)
+	my $widget = ref($_[0]) ? shift : gtknew('WrappedLabel', text => shift);
+	my $pack_call = 'pack_' . ($attr{pack_end} ? 'end' : 'start');
+	$box->$pack_call($widget, $attr{expand}, $attr{fill}, $attr{padding});
+	$widget->show;
+    }
+    return $box;
+}
+
+sub gtktreeview_children {
+    my ($model, $iter) = @_;
+    my @l;
+    $model or return;
+    for (my $p = $model->iter_children($iter); $p; $p = $model->iter_next($p)) {
+	push @l, $p;
+    }
+    @l;
+}
+
+
+
+# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---
+#                 create
+#
+# Helpers that allow omitting common operations on common widgets
+# (e.g. create widgets with good default properties)
+
+sub create_pixbutton {
+    my ($label, $pix, $reverse_order) = @_;
+    my @label_and_pix = (0, $label, if_($pix, 0, $pix));
+    gtkadd(gtknew('Button'),
+	   gtknew('HBox', spacing => 3, children => [
+		    1, "",
+		    $reverse_order ? reverse(@label_and_pix) : @label_and_pix,
+		    1, "",
+		]));
+}
+
+sub create_adjustment {
+    my ($val, $min, $max) = @_;
+    Gtk2::Adjustment->new($val, $min, $max + 1, 1, ($max - $min + 1) / 10, 1);
+}
+
+sub create_scrolled_window {
+    my ($W, $o_policy, $o_viewport_shadow) = @_;
+    gtknew('ScrolledWindow', ($o_policy ? (h_policy => $o_policy->[0], v_policy => $o_policy->[1]) : ()),
+               child => $W, if_($o_viewport_shadow, shadow_type => $o_viewport_shadow));
+}
+
+sub n_line_size {
+    my ($nbline, $type, $widget) = @_;
+    my $spacing = ${{ text => 3, various => 17 }}{$type};
+    my %fontinfo = gtkfontinfo($widget);
+    round($nbline * ($fontinfo{ascent} + $fontinfo{descent} + $spacing) + 8);
+}
+
+# Glib::Markup::escape_text() if no use for us because it'll do extra
+# s/X/&foobar;/ (such as s/'/&apos;/) that are suitable for
+# Gtk2::Labels but are not for Gtk2::TextViews, resulting in
+# displaying the raw enriched text instead...
+#
+sub escape_text_for_TextView_markup_format {
+    my ($str) = @_;
+    my %rules = ('&' => '&amp;',
+               '<' => '&lt;',
+               '>' => '&gt;',
+           );
+    eval { $str =~ s!([&<>])!$rules{$1}!g }; #^(&(amp|lt|gt);)!!) {
+    if (my $err = $@) {
+           internal_error("$err\n$str");
+    }
+    $str;
+}
+
+sub markup_to_TextView_format {
+    my ($s, $o_default_attrs) = @_;
+    require interactive;
+    my $l = interactive::markup_parse($s) or return $s;
+    
+    foreach (@$l) {
+	my ($_txt, $attrs) = @$_;
+	if ($attrs) {
+         $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Gtk2::Pango; Gtk2::Pango->PANGO_WEIGHT_BOLD };
+         $attrs->{size} eq 'larger' and do {
+             $attrs->{scale} = Gtk2::Pango->scale_x_large; # equivalent to Label's size => 'larger'
+             delete $attrs->{size};
+         };
+     }
+	#- nb: $attrs may be empty, need special handling if $o_default_attrs is used
+	add2hash_($_->[1] ||= {}, $o_default_attrs) if $o_default_attrs;
+    }
+    $l;
+}
+
+sub create_box_with_title {
+    my ($o, @l) = @_;
+
+    my $nbline = sum(map { round(length($_) / 60 + 1/2) } map { split "\n" } @l);
+    my $box = gtknew('VBox');
+    if ($nbline == 0) {
+	$o->{box_size} = 0;
+	return $box;
+    }
+    $o->{box_size} = n_line_size($nbline, 'text', $box);
+    if (@l <= 2 && $nbline > 4) {
+	$o->{icon} && !$::isWizard and 
+	  eval { gtkpack__($box, gtknew('HBox', border_width => 5, children_loose => [ gtkcreate_img($o->{icon}) ])) };
+	my $wanted = $o->{box_size};
+	$o->{box_size} = min(200, $o->{box_size});
+	my $has_scroll = $o->{box_size} < $wanted;
+
+	chomp(my $text = join("\n", @l));
+	my $wtext = gtknew('TextView', text => markup_to_TextView_format($text));
+	$wtext->set_justification('fill');
+	$wtext->set_left_margin(12);
+	$wtext->set_right_margin(12);
+	$wtext->can_focus($has_scroll);
+	my $width = 400;
+	my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200);
+	$scroll->signal_connect(realize => sub {
+                                my $layout = $wtext->create_pango_layout($text);
+                                $layout->set_width(($width - 10) * Gtk2::Pango->scale);
+                                $wtext->set_size_request($width,  min(200, second($layout->get_pixel_size) + 10));
+                                $scroll->set_size_request($width, min(200, second($layout->get_pixel_size) + 10));
+                                $o->{rwindow}->queue_resize;
+                            });
+	gtkpack_($box, $o->{box_allow_grow} || 0, $scroll);
+    } else {
+     my $new_label = sub {
+         my ($txt) = @_;
+         ref($txt) ? $txt : gtknew('WrappedLabel', text_markup => $txt,
+                                   # workaround infamous 6 years old gnome bug #101968:
+                                   width => mygtk2::get_label_width());
+     };
+	    gtkpack__($box,
+		      if_($::isWizard, gtknew('Label', height => 10)),
+		      (map {
+			  my $w = $new_label->($_);
+			  $::isWizard ? gtknew('HBox', children_tight => [ gtknew('Label', width => 20), $w ])
+			              : $w;
+		      } @l),
+		      if_($::isWizard, gtknew('Label', height => 15)),
+		     );
+    }
+}
+
+sub _create_dialog {
+    my ($title, $o_options) = @_;
+    my $options = $o_options || {};
+
+    #- keep compatibility with "transient" now called "transient_for"
+    $options->{transient_for} = delete $options->{transient} if $options->{transient};
+
+    gtknew('Dialog', title => $title, 
+	   position_policy => 'center-on-parent', # center-on-parent does not work
+	   modal => 1,
+	   if_(!$::isInstall, icon_no_error => wm_icon()),
+	   %$options, allow_unknown_options => 1,
+       );
+}
+
+
+# drakfloppy / drakfont / harddrake2 / mcc
+sub create_dialog {
+    my ($title, $label, $o_options) = @_;
+    my $ret = 0;
+    $o_options ||= {};
+    $o_options->{transient_for} = $::main_window if !$o_options->{transient_for} && $::main_window;
+
+    my $dialog =  gtkset_border_width(_create_dialog($title, $o_options), 10);
+    $dialog->set_border_width(10);
+    my $text = ref($label) ? $label : $o_options->{use_markup} ? gtknew('WrappedLabel', text_markup => $label) : gtknew('WrappedLabel', text => $label);
+    gtkpack($dialog->vbox,
+            gtknew('HBox', children => [
+                     if_($o_options->{stock},
+                         0, Gtk2::Image->new_from_stock($o_options->{stock}, 'dialog'),
+                         0, gtknew('Label', text => "   "),
+                        ),
+                     1, $o_options->{scroll} ? create_scrolled_window($text, [ 'never', 'automatic' ]) : $text,
+                    ]),
+           );
+
+    if ($o_options->{cancel}) {
+	$dialog->action_area->pack_start(
+	    gtknew('Button', text => N("Cancel"),
+		   clicked => sub { $ret = 0; $dialog->destroy; Gtk2->main_quit },
+		   can_default => 1), 
+	    1, 1, 0);
+    }
+
+    my $button = gtknew('Button', text => N("Ok"), can_default => 1,
+			clicked => sub { $ret = 1; $dialog->destroy; Gtk2->main_quit });
+    $dialog->action_area->pack_start($button, 1, 1, 0);
+    $button->grab_default;
+
+    $dialog->set_has_separator(0);
+    $dialog->show_all;
+    Gtk2->main;
+    $ret;
+}
+
+sub info_dialog {
+    my ($title, $label, $o_options) = @_;
+    $o_options ||= { };
+    add2hash_($o_options, { stock => 'gtk-dialog-info' });
+    create_dialog($title, $label, $o_options);
+}
+
+sub warn_dialog {
+    my ($title, $label, $o_options) = @_;
+    $o_options ||= { };
+    add2hash_($o_options, { stock => 'gtk-dialog-warning', cancel => 1 });
+    create_dialog($title, $label, $o_options);
+}
+
+sub err_dialog {
+    my ($title, $label, $o_options) = @_;
+    $o_options ||= { };
+    add2hash_($o_options, { stock => 'gtk-dialog-error' });
+    create_dialog($title, $label, $o_options);
+}
+
+sub create_hbox { gtknew('HButtonBox', layout => $_[0]) }
+sub create_vbox { gtknew('VButtonBox', layout => $_[0]) }
+
+sub create_factory_menu_ {
+    my ($type, $name, $window, @menu_items) = @_;
+    my $widget = Gtk2::ItemFactory->new($type, $name, my $accel_group = Gtk2::AccelGroup->new);
+    $widget->create_items($window, @menu_items);
+    $window->add_accel_group($accel_group);
+    ($widget->get_widget($name), $widget);
+}
+
+sub create_factory_popup_menu { create_factory_menu_("Gtk2::Menu", '<main>', @_) }
+sub create_factory_menu { create_factory_menu_("Gtk2::MenuBar", '<main>', @_) }
+
+sub create_menu {
+    my $title = shift;
+    my $w = Gtk2::MenuItem->new($title);
+    $w->set_submenu(gtkshow(gtkappend(Gtk2::Menu->new, @_)));
+    $w;
+}
+
+sub create_notebook {
+    my $book = gtknew('Notebook');
+    while (@_) {
+	my ($page, $title) = splice(@_, 0, 2);
+	gtkappend_page($book, $page, $title);
+    }
+    $book;
+}
+
+sub create_packtable {
+    my ($options, @l) = @_;
+    my $w = Gtk2::Table->new(0, 0, $options->{homogeneous} || 0);
+    add2hash_($options, { xpadding => 5, ypadding => 0 });
+    each_index {
+	my ($i, $l) = ($::i, $_);
+	each_index {
+	    my $j = $::i;
+	    if ($_) {
+		ref $_ or $_ = gtknew('WrappedLabel', text => $_);
+		$j != $#$l && !$options->{mcc} ?
+		  $w->attach($_, $j, $j + 1, $i, $i + 1,
+			     'fill', 'fill', $options->{xpadding}, $options->{ypadding}) :
+		  $w->attach($_, $j, $j + 1, $i, $i + 1,
+			     ['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? ['expand', 'fill'] : [], 0, 0);
+		$_->show;
+	    }
+	} @$l;
+    } @l;
+    $w->set_col_spacings($options->{col_spacings} || 0);
+    $w->set_row_spacings($options->{row_spacings} || 0);
+    gtkset_border_width($w, $::isInstall ? 3 : 10);
+}
+
+my $wm_is_kde;
+sub create_okcancel {
+    my ($w, $o_ok, $o_cancel, $_o_spread, @other) = @_;
+    # @other is a list of extra buttons (usually help (eg: XFdrake/drakx caller) or advanced (eg: interactive caller) button)
+    # extra buttons have the following structure [ label, handler, is_first, pack_right ]
+    local $::isWizard = $::isWizard && !$w->{pop_it};
+    my $cancel;
+    if (defined $o_cancel || defined $o_ok) {
+        $cancel = $o_cancel;
+    } elsif (!$::Wizard_no_previous) {
+        $cancel = $::isWizard ? N("Previous") : N("Cancel");
+    }
+    my $ok = defined $o_ok ? $o_ok : $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok");
+    my $bok = $ok && ($w->{ok} = gtknew('Button', text => $ok, clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit }));
+    my $bprev;
+    if ($cancel) {
+        $bprev = $w->{cancel} = gtknew('Button', text => $cancel, clicked => $w->{cancel_clicked} || 
+                                   sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit });
+    }
+    $w->{wizcancel} = gtknew('Button', text =>  ($::Wizard_skip ? N("Skip") : N("Cancel")), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall && !$::Wizard_no_cancel;
+    if (!defined $wm_is_kde) {
+        require any;
+        my $wm = any::running_window_manager();
+        $wm_is_kde = !$::isInstall && ($wm eq "kwin" || $wm eq "compiz" && fuzzy_pidofs(qr/\bkde-window-decorator\b/)) || 0;
+    }
+    my $f = sub { $w->{buttons}{$_[0][0]} = ref($_[0][0]) =~ /Gtk2::Button/ ?
+                    $_[0][0] :
+                    gtknew('Button', text => $_[0][0], clicked => $_[0][1]) };
+    my @left  = ((map { $f->($_) } grep {  $_->[2] && !$_->[3] } @other),
+                  map { $f->($_) } grep { !$_->[2] && !$_->[3] } @other);
+    my @right = ((map { $f->($_) } grep {  $_->[2] &&  $_->[3] } @other),
+                  map { $f->($_) } grep { !$_->[2] &&  $_->[3] } @other);
+    # we put space to group buttons in two packs (but if there's only one when not in wizard mode)
+    # but in the installer where all windows run in wizard mode because of design even when not in a wizard step
+    $bprev = gtknew('Label') if !$cancel && $::Wizard_no_previous && !@left && !@right;
+    if ($::isWizard || $w->{pop_it}) {
+        # wizard mode: order is cancel/left_extras/white/right_extras/prev/next
+        unshift @left, $w->{wizcancel} if $w->{wizcancel};
+        push @right, $bprev, $bok;
+    } else { 
+        # normal mode: cancel/ok button follow GNOME's HIG
+        unshift @left, ($wm_is_kde ? $bok : $bprev);
+        push @left, gtknew('Label') if $ok && $cancel; # space buttons but if there's only one button
+        push @right, ($wm_is_kde ? $bprev : $bok);
+    }
+
+    gtknew('VBox', spacing => 5, children_loose => [
+	    gtknew('HBox', height => 5),
+            gtknew('HSeparator'),
+            gtknew('HBox', children_loose => [
+                   map {
+		       gtknew('HButtonBox', spacing => 5, layout => $_->[1],
+			      children_loose => [
+				  map {
+				      $_->can_default($::isWizard);
+				      $_;
+				  } grep { $_ } @{$_->[0]} 
+			      ]);
+                    } ([ \@left, 'start' ],
+                       [ \@right,  'end' ],
+                      )
+                    ]),
+           ]);
+}
+
+sub _setup_paned {
+    my ($paned, $child1, $child2, %options) = @_;
+    foreach ([ 'resize1', 0 ], [ 'shrink1', 1 ], [ 'resize2', 1 ], [ 'shrink2', 1 ]) {
+        $options{$_->[0]} = $_->[1] unless defined($options{$_->[0]});
+    }
+    $paned->pack1(gtkshow($child1), $options{resize1}, $options{shrink1});
+    $paned->pack2(gtkshow($child2), $options{resize2}, $options{shrink2});
+    gtkshow($paned);
+}
+
+sub create_vpaned {
+    _setup_paned(Gtk2::VPaned->new, @_);
+}
+
+sub create_hpaned {
+    _setup_paned(Gtk2::HPaned->new, @_);
+}
+
+sub gtkcreate_frame {
+    my ($label) = @_;
+    gtknew('Frame', text => $label, border_width => 5);
+}
+
+
+# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---
+#                 helpers
+#
+# Functions that do typical operations on widgets, that you may need in
+# several places of your programs.
+
+sub _find_imgfile {
+    my ($name) = @_;
+
+    if ($name =~ m|/| && -f $name) {
+	$name;
+    } else {
+	foreach my $path (icon_paths()) {
+	    foreach ('', '.png', '.xpm') {
+		my $file = "$path/$name$_";
+		-f $file and return $file;
+	    }
+	}
+    }
+}
+
+# use it if you want to display an icon/image in your app
+sub gtkcreate_img {
+    my ($file, $o_size) = @_;
+    gtknew('Image', file => $file, if_($o_size, size => $o_size));
+}
+
+# use it if you want to draw an image onto a drawingarea
+sub gtkcreate_pixbuf {
+    my ($file, $o_size) = @_;
+    gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size));
+}
+
+sub gtktext_append { gtktext_insert(@_, append => 1) }
+
+sub may_set_icon {
+    my ($w, $name) = @_;
+    if (my $f = $name && _find_imgfile($name)) {
+	$w->set_icon(gtkcreate_pixbuf($f));
+    }
+}
+
+sub gtktext_insert { &mygtk2::_text_insert }
+sub icon_paths { &mygtk2::_icon_paths }
+sub add_icon_path { &mygtk2::add_icon_path }
+
+sub set_main_window_size { 
+    my ($o) = @_;
+    mygtk2::set_main_window_size($o->{rwindow});
+}
+
+# extracts interesting font metrics for a given widget
+sub gtkfontinfo {
+    my ($widget) = @_;
+    my $context = $widget->get_pango_context;
+    my $metrics = $context->get_metrics($context->get_font_description, $context->get_language);
+    my %fontinfo;
+    foreach (qw(ascent descent approximate_char_width approximate_digit_width)) {
+	no strict;
+	my $func = "get_$_";
+	$fontinfo{$_} = Gtk2::Pango->pixels($metrics->$func);
+    }
+    %fontinfo;
+}
+
+sub gtkmodify_font {
+    my ($w, $arg) = @_;
+    $w->modify_font(ref($arg) ? $arg : Gtk2::Pango::FontDescription->from_string($arg));
+    $w;
+}
+
+sub gtkset_property {
+    my ($w, $property, $value) = @_;
+    $w->set_property($property, $value);
+    $w;
+}
+
+sub set_back_pixbuf {
+    my ($widget, $pixbuf) = @_;
+    my $window = $widget->window;
+    my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height);
+    my $pixmap = Gtk2::Gdk::Pixmap->new($window, $width, $height, $window->get_depth);
+    $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0);
+    $window->set_back_pixmap($pixmap, 0);
+}
+
+sub set_back_pixmap {
+    my ($w) = @_;
+    return if !$w->realized;
+    my $window = $w->window;
+    my $pixmap = $w->{back_pixmap} ||= Gtk2::Gdk::Pixmap->new($window, 1, 2, $window->get_depth);
+
+    my $style = $w->get_style;
+    $pixmap->draw_points($style->bg_gc('normal'), 0, 0);
+    $pixmap->draw_points($style->base_gc('normal'), 0, 1);
+    $window->set_back_pixmap($pixmap);
+}
+
+sub add2notebook {
+    my ($n, $title, $book) = @_;
+    $n->append_page($book, gtkshow(gtknew('Label', text => $title)));
+    $book->show;
+}
+
+sub string_size {
+    my ($widget, $text) = @_;
+    my $layout = $widget->create_pango_layout($text);
+    my @size = $layout->get_pixel_size;
+    @size;
+}
+
+sub string_width {
+    my ($widget, $text) = @_;
+    my ($width, undef) = string_size($widget, $text);
+    $width;
+}
+
+
+my ($def_step_title);
+sub set_default_step_items {
+    $def_step_title = translate($_[0]);
+}
+
+sub get_default_step_items { ($def_step_title) }
+
+# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---
+#                 toplevel window creation helper
+#
+# Use the 'new' function as a method constructor and then 'main' on it to
+# launch the main loop. Use $o->{retval} to indicate that the window needs
+# to terminate.
+# Set $::isWizard to have a wizard appearance.
+# Set $::isEmbedded and $::XID so that the window will plug.
+
+sub new {
+    my ($type, $title, %opts) = @_;
+
+    my $o = bless { %opts }, $type;
+    while (my $e = shift @tempory::objects) { $e->destroy }
+
+    my $icon = find { _find_imgfile($_) } $::isInstall ? 'empty-banner' : $opts{icon};
+    my $banner_title = $opts{banner_title};
+    $o->{transient} ||= $::main_window if $::main_window && !$opts{do_not_track_main_window};
+    my $window = gtknew(
+	'MagicWindow',
+	title => $title || '',
+	pop_it => $o->{pop_it},
+	$::isInstall ? (banner => gtknew('Install_Title', text => $title || get_default_step_items())) : (),
+	$::isStandalone && $banner_title && $icon ? (banner => Gtk2::Banner->new($icon, $banner_title)) : (),
+	width => $opts{width}, height => $opts{height}, default_width => $opts{default_width}, default_height => $opts{default_height}, 
+	modal => (!$o->{pop_it} && !$::isInstall) && ($opts{modal} || $grab || $o->{grab}) || $o->{modal},
+	no_Window_Manager => exists $opts{no_Window_Manager} ? $opts{no_Window_Manager} : !$::isStandalone,
+	if_(!$::isInstall, icon_no_error => wm_icon()),
+	if_($o->{transient}, transient_for => $o->{transient}), 
+    );
+    mygtk2::register_main_window($window->{real_window}) if !$opts{do_not_track_main_window};
+    $window->set_border_width(10) if !$window->{pop_it} && !$::noborderWhenEmbedded;
+
+    $o->{rwindow} = $o->{window} = $window;
+    $o->{real_window} = $window->{real_window};
+    $o->{pop_it} = $window->{pop_it};
+
+    $o;
+}
+
+sub main {
+    my ($o, $o_completed, $o_canceled) = @_;
+    gtkset_mousecursor_normal();
+
+    $o->show;
+    mygtk2::main($o->{rwindow},
+		 sub { $o->{retval} ? !$o_completed || $o_completed->() : !$o_canceled || $o_canceled->() });
+    $o->{retval};
+}
+sub show($) {
+    my ($o) = @_;
+    $o->{rwindow}->show;
+}
+sub destroy($) {
+    my ($o) = @_;
+    $o->{rwindow}->destroy;
+    flush();
+}
+sub DESTROY { goto &destroy }
+sub sync {
+    my ($o) = @_;
+    show($o);
+    flush();
+}
+sub flush() { gtkflush() }
+sub shrink_topwindow {
+    my ($o) = @_;
+    $o->{real_window}->signal_emit('size_allocate', Gtk2::Gdk::Rectangle->new(-1, -1, -1, -1));
+}
+sub exit {
+    gtkset_mousecursor_normal(); #- for restoring a normal in any case
+    flush();
+    if ($::isStandalone) {
+        require standalone;
+        standalone::__exit($_[1]); #- workaround
+    } else {
+        c::_exit($_[1]); #- workaround
+    }
+}
+
+#- in case "exit" above was not called by the program
+END { &exit() }
+
+# -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---
+#                 ask
+#
+# Full UI managed functions that will return to you the value that the
+# user chose.
+
+sub ask_warn       { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_warn(@_); main($w) }
+sub ask_yesorno    { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Yes"), N("No")); main($w) }
+sub ask_okcancel   { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Is this correct?"), N("Ok"), N("Cancel")); main($w) }
+sub ask_from_entry { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_from_entry(@_); main($w) }
+sub ask_dir        { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_dir(@_); main($w) }
+
+sub _ask_from_entry($$@) {
+    my ($o, @msgs) = @_;
+    my $entry = gtknew('Entry');
+    my $f = sub { $o->{retval} = $entry->get_text; Gtk2->main_quit };
+    $o->{ok_clicked} = $f;
+    $o->{cancel_clicked} = sub { undef $o->{retval}; Gtk2->main_quit };
+
+    gtkadd($o->{window},
+	  gtkpack($o->create_box_with_title(@msgs),
+		 gtksignal_connect($entry, 'activate' => $f),
+		 ($o->{hide_buttons} ? () : create_okcancel($o))),
+	  );
+    $entry->grab_focus;
+}
+
+sub _ask_warn($@) {
+    my ($o, @msgs) = @_;
+    gtkadd($o->{window},
+	  gtkpack($o->create_box_with_title(@msgs),
+		  my $w = gtknew('Button', text => N("Ok"), clicked => sub { Gtk2->main_quit }),
+		 ),
+	  );
+    $w->grab_focus;
+}
+
+sub _ask_okcancel($@) {
+    my ($o, @msgs) = @_;
+    my ($ok, $cancel) = splice @msgs, -2;
+
+    gtkadd($o->{window},
+	   gtkpack(create_box_with_title($o, @msgs),
+		   create_okcancel($o, $ok, $cancel),
+		 )
+	 );
+    $o->{ok}->grab_focus;
+}
+
+sub create_file_selector {
+    my (%opts) = @_;
+    my $w = ugtk2->new(delete $opts{title}, modal => 1);
+    my ($message, $save, $want_a_dir) = (delete $opts{message}, delete $opts{save}, delete $opts{want_a_dir});
+    my $action = $want_a_dir ? ($save ? 'create_folder' : 'select_folder') : ($save ? 'save' : 'open');
+    add2hash(\%opts, { width => 480, height => 250 });
+    gtkadd($w->{window},
+	   gtkpack_(create_box_with_title($w, $message),
+		    1, $w->{chooser} = gtknew('FileChooser', action => $action, %opts),
+		    0, create_okcancel($w),
+		 ));
+    $w->{chooser}->signal_connect(file_activated => sub { $w->{ok}->clicked });
+    $w;
+}
+
+sub file_selected_check {
+    my ($save, $want_a_dir, $file) = @_;
+
+    if (!$file) {
+	N("No file chosen");
+    } elsif (-f $file && $want_a_dir) {
+	N("You have chosen a file, not a directory");
+    } elsif (-d $file && !$want_a_dir) {
+	N("You have chosen a directory, not a file");
+    } elsif (!-e $file && !$save) {
+	$want_a_dir ? N("No such directory") : N("No such file");
+    } else {
+	'';
+    }
+}
+
+sub _ask_file {
+    my ($o, $title, $path) = @_;
+
+    my $w = create_file_selector(title => $title, want_a_dir => 0, directory => $path);
+    put_in_hash($o, $w);
+
+    $w->{ok}->signal_connect(clicked => sub { $o->{retval} = $w->{chooser}->get_filename });
+}
+sub _ask_dir {
+    my ($o, $title, $path) = @_;
+
+    my $w = create_file_selector(title => $title, want_a_dir => 1, directory => $path);
+    put_in_hash($o, $w);
+
+    $w->{ok}->signal_connect(clicked => sub { $o->{retval} = $w->{chooser}->get_filename });
+}
+
+sub ask_browse_tree_info {
+    my ($common) = @_;
+
+    my $w = ugtk2->new($common->{title});
+
+    my $tree_model = Gtk2::TreeStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String");
+    my $tree = Gtk2::TreeView->new_with_model($tree_model);
+    $tree->get_selection->set_mode('browse');
+    $tree->append_column(my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0));
+    $tree->append_column(my $pixcolumn  = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererPixbuf->new, 'pixbuf' => 1));
+    $tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 2));
+    $tree->set_headers_visible(0);
+    $tree->set_rules_hint(1);
+    $textcolumn->set_min_width(200);
+    $textcolumn->set_max_width(200);
+
+    gtkadd($w->{window}, 
+	   gtknew('VBox', spacing => 5, children => [
+		    0, gtknew('Title2', label => $common->{message},
+                              # workaround infamous 6 years old gnome bug #101968:
+                              width => mygtk2::get_label_width()),
+		    1, gtknew('VBox', children => [
+			       1, gtknew('ScrolledWindow', child => $tree),
+			       0, gtknew('Frame', text => N("Info"), child =>
+				      gtknew('ScrolledWindow', child => my $info = gtknew('TextView', editable => 0, height => 100)),
+				     ) ]),
+		    0, Gtk2::HSeparator->new,
+		    0, my $status = gtknew('Label'),
+		    if_($common->{auto_deps},
+		        0, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps})
+		    ),
+		    0, Gtk2::HSeparator->new,
+		    0, my $box2 = gtknew('HBox', spacing => 10),
+		   ]));
+
+    gtkpack__($box2, gtknew(($::isInstall ? 'Install_Button' : 'Button'), text => N("Help"),
+                            clicked => $common->{interactive_help})) if $common->{interactive_help};
+
+    #gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new('horizontal', 'icons'));
+    gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new);
+
+    my @l = ([ $common->{ok}, 1 ], if_($common->{cancel}, [ $common->{cancel}, 0 ]));
+    @l = reverse @l if !$::isInstall;
+    my @buttons = map {
+	my ($t, $val) = @$_;
+	$box2->pack_end(my $w = gtknew('Button', text => $t, clicked => sub {
+					   $w->{retval} = $val;
+					   Gtk2->main_quit;
+				       }), 0, 1, 20);
+	$w->show;
+	$w;
+    } @l;
+    @buttons = reverse @buttons if !$::isInstall;    
+
+    $status->show;
+
+    $w->{window}->set_size_request(map { $_ - 2 * $border - 4 } $w->{windowwidth}, $w->{windowheight}) if !$::isInstall;
+    $buttons[0]->grab_focus;
+    $w->{rwindow}->show;
+
+    my @toolbar;
+    foreach my $ic (@{$common->{icons} || []}) {
+	push @toolbar, ($ic->{icon} => [ $ic->{help}, sub {
+					     if ($ic->{code}) {
+						 my $_w = $ic->{wait_message} && $common->{wait_message}->('', $ic->{wait_message});
+						 $ic->{code}();
+						 $common->{rebuild_tree}->();
+					     }
+					 } ]);
+    }
+    my %toolbar = @toolbar;
+    foreach (grep_index { $::i % 2 == 0 } @toolbar) {
+	$toolbar->append_item(undef, $toolbar{$_}[0], undef, gtkcreate_img("$_.png"), $toolbar{$_}[1]);
+    }
+
+    $pixcolumn->{is_pix} = 1;
+    $common->{widgets} = { w => $w, tree => $tree, tree_model => $tree_model,
+                           info => $info, status => $status };
+    ask_browse_tree_info_given_widgets($common);
+}
+
+sub ask_browse_tree_info_given_widgets {
+    my ($common) = @_;
+    my $w = $common->{widgets};
+
+    my ($curr, $prev_label, $idle, $mouse_toggle_pending);
+    my (%wtree, %ptree, %pix, %node_state, %state_stats);
+    my $update_size = sub {
+	if ($w->{status}) {
+	    my $new_label = $common->{get_status}();
+	    $prev_label ne $new_label and $w->{status}->set($prev_label = $new_label);
+	}
+    };
+    
+    my $set_node_state_flat = sub {
+	my ($iter, $state) = @_;
+	$state eq 'XXX' and return;
+        $pix{$state} ||= gtkcreate_pixbuf($state);
+        $w->{tree_model}->set($iter, 1 => $pix{$state});
+    };
+    my $set_node_state_tree; $set_node_state_tree = sub {
+	my ($iter, $state) = @_;
+	my $iter_str = $w->{tree_model}->get_path_str($iter);
+	$state eq 'XXX' and return;
+        $pix{$state} ||= gtkcreate_pixbuf($state);
+	if ($node_state{$iter_str} ne $state) {
+	    my $parent;
+	    if (!$w->{tree_model}->iter_has_child($iter) && ($parent = $w->{tree_model}->iter_parent($iter))) {
+		my $parent_str = $w->{tree_model}->get_path_str($parent);
+		my $stats = $state_stats{$parent_str} ||= {}; $stats->{$node_state{$iter_str}}--; $stats->{$state}++;
+		my @list = grep { $stats->{$_} > 0 } keys %$stats;
+		my $new_state = @list == 1 ? $list[0] : 'semiselected';
+		$node_state{$parent_str} ne $new_state and $set_node_state_tree->($parent, $new_state);
+	    }
+            $w->{tree_model}->set($iter, 1 => $pix{$state});
+	    $node_state{$iter_str} = $state;  #- cache for efficiency
+	}
+    };
+    my $set_node_state = $common->{state}{flat} ? $set_node_state_flat : $set_node_state_tree;
+
+    my $set_leaf_state = sub {
+	my ($leaf, $state) = @_;
+	$set_node_state->($_, $state) foreach @{$ptree{$leaf}};
+    };
+    my $add_parent; $add_parent = sub {
+	my ($root, $state) = @_;
+	$root or return undef;
+	if (my $w = $wtree{$root}) { return $w }
+	my $s; foreach (split '\|', $root) {
+	    my $s2 = $s ? "$s|$_" : $_;
+	    $wtree{$s2} ||= do {
+		my $iter = $w->{tree_model}->append_set($s ? $add_parent->($s, $state) : undef, [ 0 => $_ ]);
+		$iter;
+	    };
+	    $s = $s2;
+	}
+	$set_node_state->($wtree{$s}, $state); #- use this state by default as tree is building.
+	$wtree{$s};
+    };
+    my $add_node = sub {
+	my ($leaf, $root, $options) = @_;
+	my $state = $common->{node_state}($leaf) or return;
+	if ($leaf) {
+	    my $iter = $w->{tree_model}->append_set($add_parent->($root, $state), [ 0 => $leaf ]);
+	    $set_node_state->($iter, $state);
+	    push @{$ptree{$leaf}}, $iter;
+	} else {
+	    my $parent = $add_parent->($root, $state);
+	    #- hackery for partial displaying of trees, used in rpmdrake:
+	    #- if leaf is void, we may create the parent and one child (to have the [+] in front of the parent in the ctree)
+	    #- though we use '' as the label of the child; then rpmdrake will connect on tree_expand, and whenever
+	    #- the first child has '' as the label, it will remove the child and add all the "right" children
+	    $options->{nochild} or $w->{tree_model}->append_set($parent, [ 0 => '' ]);
+	}
+    };
+    my $clear_all_caches = sub {
+	foreach (values %ptree) {
+	    foreach my $n (@$_) {
+		delete $node_state{$w->{tree_model}->get_path_str($n)};
+	    }
+	}
+	foreach (values %wtree) {
+	    my $iter_str = $w->{tree_model}->get_path_str($_);
+	    delete $node_state{$iter_str};
+	    delete $state_stats{$iter_str};
+	}
+	%ptree = %wtree = ();
+    };
+    $common->{delete_all} = sub {
+	$clear_all_caches->();
+	$w->{tree_model}->clear;
+    };
+    $common->{rebuild_tree} = sub {
+	$common->{delete_all}->();
+	$set_node_state = $common->{state}{flat} ? $set_node_state_flat : $set_node_state_tree;
+	$common->{build_tree}($add_node, $common->{state}{flat}, $common->{tree_mode});
+	&$update_size;
+    };
+    $common->{delete_category} = sub {
+	my ($cat) = @_;
+	exists $wtree{$cat} or return;
+	foreach (keys %ptree) {
+	    my @to_remove;
+	    foreach my $node (@{$ptree{$_}}) {
+		my $category;
+		my $parent = $node;
+		my @parents;
+		while ($parent = $w->{tree_model}->iter_parent($parent)) {    #- LEAKS
+		    my $parent_name = $w->{tree_model}->get($parent, 0);
+		    $category = $category ? "$parent_name|$category" : $parent_name;
+		    $_->[1] = "$parent_name|$_->[1]" foreach @parents;
+		    push @parents, [ $parent, $category ];
+		}
+		if ($category =~ /^\Q$cat/) {
+		    push @to_remove, $node;
+		    foreach (@parents) {
+			next if $_->[1] eq $cat || !exists $wtree{$_->[1]};
+			delete $wtree{$_->[1]};
+			delete $node_state{$w->{tree_model}->get_path_str($_->[0])};
+			delete $state_stats{$w->{tree_model}->get_path_str($_->[0])};
+		    }
+		}
+	    }
+	    foreach (@to_remove) {
+		delete $node_state{$w->{tree_model}->get_path_str($_)};
+	    }
+	    @{$ptree{$_}} = difference2($ptree{$_}, \@to_remove);
+	}
+	if (exists $wtree{$cat}) {
+	    my $iter_str = $w->{tree_model}->get_path_str($wtree{$cat});
+	    delete $node_state{$iter_str};
+	    delete $state_stats{$iter_str};
+	    $w->{tree_model}->remove($wtree{$cat});
+	    delete $wtree{$cat};
+	}
+	&$update_size;
+    };
+    $common->{add_nodes} = sub {
+	my (@nodes) = @_;
+	$add_node->($_->[0], $_->[1], $_->[2]) foreach @nodes;
+	&$update_size;
+    };
+    
+    $common->{display_info} = sub { gtktext_insert($w->{info}, $common->{get_info}($curr)); 0 };
+    my $children = sub { map { $w->{tree_model}->get($_, 0) } gtktreeview_children($w->{tree_model}, $_[0]) };
+    my $toggle = sub {
+	if (ref($curr) && !$_[0]) {
+	    $w->{tree}->toggle_expansion($w->{tree_model}->get_path($curr));
+	} else {
+	    if (ref $curr) {
+		my @l = $common->{grep_allowed_to_toggle}($children->($curr)) or return;
+		my @unsel = $common->{grep_unselected}(@l);
+		my @p = @unsel ?
+		  #- not all is selected, select all if no option to potentially override
+		  (exists $common->{partialsel_unsel} && $common->{partialsel_unsel}->(\@unsel, \@l) ? difference2(\@l, \@unsel) : @unsel)
+		  : @l;
+		$common->{toggle_nodes}($set_leaf_state, @p);
+		&$update_size;
+	    } else {
+		$common->{check_interactive_to_toggle}($curr) and $common->{toggle_nodes}($set_leaf_state, $curr);
+		&$update_size;
+	    }
+	}
+    };
+
+    $w->{tree}->signal_connect(key_press_event => sub {
+	my $c = chr($_[1]->keyval & 0xff);
+	if ($_[1]->keyval >= 0x100 ? $c eq "\r" || $c eq "\x8d" : $c eq ' ') {
+	    $toggle->(0);
+	}
+	0;
+    });
+
+    $w->{tree}->get_selection->signal_connect(changed => sub {
+	my ($model, $iter) = $_[0]->get_selected;
+	$model && $iter or return;
+	Glib::Source->remove($idle) if $idle;
+	
+	if (!$model->iter_has_child($iter)) {
+	    $curr = $model->get($iter, 0);
+	    $idle = Glib::Timeout->add(100, $common->{display_info});
+	} else {
+	    $curr = $iter;
+	}
+	#- the following test for equality is because we can have a button_press_event first, then
+	#- two changed events, the first being on a different row :/ (is it a bug in gtk2?) - that
+	#- happens in rpmdrake when doing a "search" and directly trying to select a found package
+	if ($mouse_toggle_pending eq $model->get($iter, 0)) {
+	    $toggle->(1);
+            $mouse_toggle_pending = 0;
+	}
+	0;
+    });
+    $w->{tree}->signal_connect(button_press_event => sub {  #- not too good, but CellRendererPixbuf does not have the needed signals :(
+	my ($path, $column) = $w->{tree}->get_path_at_pos($_[1]->x, $_[1]->y);
+	if ($path && $column) {
+	    $column->{is_pix} and $mouse_toggle_pending = $w->{tree_model}->get($w->{tree_model}->get_iter($path), 0);
+	}
+        0;
+    });
+    $common->{rebuild_tree}->();
+    &$update_size;
+    $common->{initial_selection} and $common->{toggle_nodes}($set_leaf_state, @{$common->{initial_selection}});
+    my $_b = before_leaving { $clear_all_caches->() };
+    $common->{init_callback}->() if $common->{init_callback};
+    $w->{w}->main;
+}
+
+sub gtk_set_treelist {
+    my ($treelist, $l) = @_;
+
+    my $list = $treelist->get_model;
+    $list->clear;
+    $list->append_set([ 0 => $_ ]) foreach @$l;
+}
+
+
+sub gtk_TextView_get_log {
+    my ($log_w, $command, $filter_output, $when_command_is_over) = @_;
+
+    my $pid = open(my $F, "$command |") or return;
+    common::nonblock($F);
+
+    my $gtk_buffer = $log_w->get_buffer;
+    $log_w->signal_connect(destroy => sub { 
+	kill 9, $pid if $pid; #- we do not continue in background
+	$pid = $gtk_buffer = ''; #- ensure $gtk_buffer is valid when its value is non-null
+    });
+
+    Glib::Timeout->add(100, sub {
+        if ($gtk_buffer) {
+	    my $end = $gtk_buffer->get_end_iter;
+	    while (defined (my $s = <$F>)) {
+		$gtk_buffer->insert($end, $filter_output->($s));
+	    }
+	    $log_w->{to_bottom}->();
+	}
+	if (waitpid($pid, c::WNOHANG()) > 0) {
+	    #- we do not call $when_command_is_over if $gtk_buffer does not exist anymore
+	    #- since it is not a normal case
+	    $when_command_is_over->($gtk_buffer) if $when_command_is_over && $gtk_buffer;
+	    $pid = '';
+	    0;
+	} else {
+	    to_bool($gtk_buffer);
+	}
+    });
+    $pid; #- $pid becomes invalid after $when_command_is_over is called
+}
+
+sub gtk_new_TextView_get_log {
+    my ($command, $filter_output, $when_command_is_over) = @_;
+
+    my $log_w = gtknew('TextView', editable => 0);
+    my $log_scroll = gtknew('ScrolledWindow', child => $log_w, to_bottom => 1);
+    my $pid = gtk_TextView_get_log($log_w, $command, $filter_output, $when_command_is_over) or return;
+    $log_scroll, $pid;
+}
+
+# misc helpers:
+
+package Gtk2::TreeStore;
+sub append_set {
+    my ($model, $parent, @values) = @_;
+    # compatibility:
+    @values = @{$values[0]} if @values == 1 && ref($values[0]) eq 'ARRAY';
+    my $iter = $model->append($parent);
+    $model->set($iter, @values);
+    return $iter;
+}
+
+
+package Gtk2::ListStore;
+# Append a new row, set the values, return the TreeIter
+sub append_set {
+    my ($model, @values) = @_;
+    # compatibility:
+    @values = @{$values[0]} if @values == 1 && ref($values[0]) eq 'ARRAY';
+    my $iter = $model->append;
+    $model->set($iter, @values);
+    return $iter;
+}
+
+
+package Gtk2::TreeModel;
+# gets the string representation of a TreeIter
+sub get_path_str {
+    my ($self, $iter) = @_;
+    my $path = $self->get_path($iter);
+    $path or return;
+    $path->to_string;
+}
+
+sub iter_each_children {
+    my ($model, $iter, $f) = @_;
+    for (my $child = $model->iter_children($iter); $child; $child = $model->iter_next($child)) {
+	$f->($child);
+    }
+}
+
+package Gtk2::TreeView;
+# likewise gtk-1.2 function
+sub toggle_expansion {
+    my ($self, $path, $b_open_all) = @_;
+    if ($self->row_expanded($path)) {
+	$self->collapse_row($path);
+    } else {
+	$self->expand_row($path, $b_open_all || 0);
+    }
+}
+
+
+# With GTK+, for more GUIes coherency, GtkOptionMenu is recommended instead of a
+# combo if the user is selecting from a fixed set of options.
+#
+# That is, non-editable combo boxes are not encouraged. GtkOptionMenu is much
+# easier to use than GtkCombo as well. Use GtkCombo only when you need the
+# editable text entry.
+#
+# GtkOptionMenu is a much better-implemented widget and also the right UI for
+# noneditable sets of choices.)
+#
+# GtkCombo is deprecated in 2.4.x because it still uses deprecated
+# GtkList. GtkOption menu is deprecated in order to have an unified widget.
+#
+# GtkComBox widget replaces GtkOption menu whereas GtkComBoxEntry replaces GtkCombo.
+#
+#
+# This layer try to make OptionMenu and ComboBox look being api
+# compatible with Combo since its API is quite nice.
+
+package Gtk2::OptionMenu;
+use MDK::Common;
+
+# try to get combox <==> option menu mapping
+sub set_popdown_strings {
+    my ($w, @strs) = @_;
+    my $menu = Gtk2::Menu->new;
+    # keep string list around for ->set_text compatibilty helper
+    $w->{strings} = \@strs;
+    #$w->set_menu((ugtk2::create_factory_menu($window, [ "File", (undef) x 3, '<Branch>' ], map { [ "File/" . $_, (undef) x 3, '<Item>' ] } @strs))[0]);
+    $menu->append(ugtk2::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs;
+    $w->set_menu($menu);
+    $w;
+}
+
+sub new_with_strings {
+    my ($class, $strs, $o_val) = @_;
+    my $w = $class->new;
+    $w->set_popdown_strings(@$strs);
+    $w->set_text($o_val) if $o_val;
+    $w;
+}
+
+sub entry {
+    my ($w) = @_;
+    return $w;
+}
+
+sub get_text {
+    my ($w) = @_;
+    $w->get_history == -1 ? '' : $w->{strings}[$w->get_history];
+}
+
+sub set_text {
+    my ($w, $val) = @_;
+    each_index {
+        if ($_ eq $val) {
+            $w->set_history($::i);
+            return;
+        }
+    } @{$w->{strings}};
+}
+
+
+
+
+package Gtk2::ComboBox;
+use MDK::Common;
+
+# try to get combox <==> option menu mapping
+sub set_popdown_strings {
+    my ($w, @strs) = @_;
+    $w->get_model->clear;
+    # keep string list around for ->set_text compatibilty helper
+    $w->{strings} = \@strs;
+    $w->append_text($_) foreach @strs;
+    $w;
+}
+
+sub new_with_strings {
+    my ($class, $strs, $o_val) = @_;
+    my $w = $class->new_text;
+    $w->set_popdown_strings(@$strs);
+    $w->set_text($o_val) if $o_val;
+    $w;
+}
+
+sub entry {
+    my ($w) = @_;
+    return $w;
+}
+
+sub get_text {
+    my ($w) = @_;
+    $w->get_active == -1 ? '' : $w->{strings}[$w->get_active];
+}
+
+sub set_text {
+    my ($w, $val) = @_;
+    eval { 
+	my $val_index = find_index { $_ eq $val } @{$w->{strings}};
+	$w->set_active($val_index);
+    };
+    # internal_error(qq(impossible to lookup "$val":\n\t) . chomp_($@)) if $@;
+}
+
+
+package Gtk2::Label;
+sub set {
+    my ($label, $text) = @_;
+    mygtk2::gtkset($label, text => $text);
+}
+
+
+package Gtk2::WrappedLabel;
+sub new {
+    my ($_type, $o_text, $o_align) = @_;
+    mygtk2::gtknew('WrappedLabel', text => $o_text || '', alignment => [ $o_align || 0, 0.5 ]);
+}
+
+
+package Gtk2::Entry;
+sub new_with_text {
+    my ($_class, $o_text) = @_;
+    mygtk2::gtknew('Entry', text => $o_text);
+}
+
+
+package Gtk2::Banner;
+
+use MDK::Common;
+use mygtk2 qw(gtknew);
+use ugtk2 qw(:helpers :wrappers);
+
+sub set_pixmap {
+    my ($darea) = @_;
+    return if !$darea->realized;
+    ugtk2::set_back_pixbuf($darea, $darea->{back_pixbuf});
+    update_text($darea);
+}
+
+sub update_text {
+    my ($darea) = @_;
+    $darea->{layout} = $darea->create_pango_layout($darea->{text});
+    $darea->{txt_width} = first($darea->{layout}->get_pixel_size);
+    $darea->queue_draw;
+}
+
+
+sub new {
+    my ($_class, $icon, $text, $o_options) = @_;
+
+    mygtk2::import_style_ressources();
+    my $darea = gtknew('DrawingArea', widget_name => 'Banner');
+    $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background');
+    my $d_height = $darea->{back_pixbuf}->get_height;
+    $darea->set_size_request(-1, $d_height);
+    $darea->modify_font(Gtk2::Pango::FontDescription->from_string("13"));
+    eval { $darea->{icon} = ugtk2::gtkcreate_pixbuf($icon) };
+    $darea->{icon} ||= ugtk2::gtkcreate_pixbuf(ugtk2::wm_icon());
+    my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk2::text_direction_rtl()) };
+    my $blue_width = $blue_part->get_width;
+    $darea->{text} = $text;
+    require lang;
+    my $is_rtl = lang::text_direction_rtl();
+
+    $darea->signal_connect(realize => \&set_pixmap);
+    $darea->signal_connect("style-set" => \&set_pixmap);
+    $darea->signal_connect(expose_event => sub {
+                               my $style = $darea->get_style;
+                               my $height = $darea->{icon}->get_height;
+                               my $width = $darea->{icon}->get_width;
+                               # fix icon position when not using the default height:
+                               (undef, undef, undef, $d_height) = $darea->window->get_geometry;
+                               my $padding = int(($d_height - $height)/2);
+                               my $d_width = $darea->allocation->width;
+                               my $x_blue = $is_rtl ? $d_width - $blue_width : 0;
+                               my $x_icon = $is_rtl ? $d_width - 12 - $width : 12;
+                               # here: 48 is the amount of white background in the blue background we wish to ignore:
+                               my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $darea->{txt_width} : $blue_width - 48;
+                               $darea->{layout_height} ||= second($darea->{layout}->get_pixel_size);
+                               $blue_part->render_to_drawable($darea->window, $style->bg_gc('normal'),
+                                                                  0, 0, $x_blue, 0, -1, -1, 'none', 0, 0);
+                               $darea->{icon}->render_to_drawable($darea->window, $style->bg_gc('normal'),
+                                                                  0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0);
+                               $darea->window->draw_layout($style->fg_gc('normal'), $x_text,
+                                                           $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2,
+                                                           $darea->{layout});
+                               1;
+                           });
+                               
+    return $darea;
+}
+
+
+package Gtk2::MDV::CellRendererPixWithLabel;
+
+use MDK::Common;
+use Glib::Object::Subclass "Gtk2::CellRenderer",
+  properties => [
+      Glib::ParamSpec->string("label", "Label", "A meaningfull label", "", [qw(readable writable)]),
+      Glib::ParamSpec->object("pixbuf", "Pixbuf file", "Something nice to display", 'Gtk2::Gdk::Pixbuf', [qw(readable writable)]),
+  ];
+
+my $x_padding = 2;
+my $y_padding = 2;
+
+sub INIT_INSTANCE {}
+
+sub pixbuf_size {
+    my ($cell) = @_;
+    my $pixbuf = $cell->get('pixbuf');
+    $pixbuf ? ($pixbuf->get_width, $pixbuf->get_height) : (0, 0);
+}
+
+sub calc_size {
+    my ($cell, $layout) = @_;
+    my ($width, $height) = $layout->get_pixel_size;
+    my ($pwidth, $pheight) = pixbuf_size($cell);
+    
+    return 0, 0,
+            $width + $x_padding * 3 + $pwidth,
+            max($pheight, $height + $y_padding * 2);
+}
+
+sub GET_SIZE {
+  my ($cell, $widget, $_cell_area) = @_;
+
+  my $layout = get_layout($cell, $widget);
+  $layout->set_text($cell->get('label'));
+
+  return calc_size($cell, $layout);
+}
+
+sub get_layout {
+  my ($_cell, $widget) = @_;
+  return $widget->create_pango_layout("");
+}
+
+sub RENDER { # not that efficient...
+  my ($cell, $window, $widget, $_background_area, $cell_area, $_expose_area, $flags) = @_;
+  my $state;
+  if ($flags & 'selected') {
+    $state = $widget->has_focus
+      ? 'selected'
+      : 'active';
+  } else {
+    $state = $widget->state eq 'insensitive'
+      ? 'insensitive'
+      : 'normal';
+  }
+
+  my $layout = get_layout($cell, $widget);
+  $layout->set_text($cell->get('label'));
+
+  my $is_rtl = lang::text_direction_rtl();
+  my $txt_width = first($layout->get_pixel_size);
+
+  my ($x_offset, $y_offset, $_width, $_height) = calc_size($cell, $layout);
+  my $pixbuf = $cell->get('pixbuf');
+  my ($pwidth, $pheight) = pixbuf_size($cell);
+  my $txt_offset = $cell_area->x + $x_offset + $x_padding * 2 + $pwidth;
+
+  if ($pixbuf) {
+      $pixbuf->render_to_drawable($window, $widget->style->fg_gc('normal'), 
+                                  0, 0,
+                                  $is_rtl ? $cell_area->width - $cell_area->x - $pwidth : $cell_area->x ,#+ $x_padding,
+                                  $cell_area->y, #+ $y_padding,
+                                  $pwidth, $pheight, 'none', 0, 0);
+  }
+  $widget->get_style->paint_layout($window,
+                                       $state,
+                                       1,
+                                       $cell_area,
+                                       $widget,
+                                       "cellrenderertext",
+                                       $is_rtl ? $cell_area->width - $txt_width - $txt_offset : $txt_offset,
+                                       $cell_area->y + $y_offset + $y_padding,
+                                       $layout);
+
+}
+
+1;
+
+
+package Gtk2::Notify::Queue;
+
+sub new {
+    my ($class, $statusicon) = @_;
+
+    require Gtk2::Notify;
+
+    my $self = bless {
+        queue => [],
+        statusicon => $statusicon,
+        display => 5000,
+        delay => 500,
+    }, $class;
+    $self;
+}
+
+sub process_next {
+    my ($self) = @_;
+    shift @{$self->{queue}};
+    #- wait for some time so that the new notification is noticeable
+    @{$self->{queue}} and Glib::Timeout->add($self->{delay}, sub { $self->show; 0 });
+}
+
+sub add {
+    my ($self, $info) = @_;
+    push @{$self->{queue}}, $info;
+    @{$self->{queue}} == 1 and $self->show;
+}
+
+sub show {
+    my ($self) = @_; # perl_checker: $self = Gtk2::Notify->new
+    my $info = $self->{queue}[0];
+    my $notification = Gtk2::Notify->new($info->{title}, $info->{message}, $self->{statusicon});
+    $notification->set_icon_from_pixbuf($info->{pixbuf}) if $info->{pixbuf};
+    $notification->set_urgency($info->{urgency}) if $info->{urgency};
+    foreach my $a (@{$info->{actions} || []}) {
+        $notification->add_action(
+            $a->{action}, $a->{label},
+            sub {
+                $info->{processed} = 1;
+                #- $a->{callback} has to call $selft->process_next when done
+                $a->{callback}->();
+            });
+    }
+    $notification->signal_connect(closed => sub {
+                                        $info->{processed} and return;
+                                        $info->{timeout}->() if $info->{timeout};
+                                        $self->process_next;
+                                    });
+    # this makes net_applet to segfault (mga#9102):
+    #eval { $notification->show };
+}
+
+1;
+
+
+package Gtk2::GUI_Update_Guard;
+
+use MDK::Common::Func qw(before_leaving);
+use ugtk2;
+
+sub new {
+    my ($_class) = @_; # prevent a perl_checker warning in callers
+    my $old_signal = $SIG{ALRM};
+    $SIG{ALRM} = sub {
+        ugtk2::gtkflush();
+        alarm(1);
+    };
+    alarm(1);
+    return before_leaving {
+        alarm(0);
+        $SIG{ALRM} = $old_signal || 'DEFAULT';   # restore default action
+    };
+}
+
+1;
-- 
cgit v1.2.1


From 504f6c89db28716c7038153fb7838565b4ba0583 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 1 Aug 2012 17:16:09 +0200
Subject: use (my|u)gtk3 instead of *tk2

---
 perl-install/ugtk3.pm | 74 +++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 3db9ff814..d1db5ed79 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1,4 +1,4 @@
-package ugtk2;
+package ugtk3;
 
 use diagnostics;
 use strict;
@@ -36,7 +36,7 @@ $EXPORT_TAGS{all} = [ map { @$_ } values %EXPORT_TAGS ];
 use c;
 use log;
 use common;
-use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
+use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version
 
 use Gtk2;
 
@@ -53,8 +53,8 @@ sub wm_icon() { $wm_icon || $::Wizard_pix_up || "wiz_default_up.png" }
 # variables, and second, to "see" directly in the code the user interface
 # you're building.
 
-sub gtkdestroy                { mygtk2::may_destroy($_[0]) }
-sub gtkflush()                { mygtk2::flush() }
+sub gtkdestroy                { mygtk3::may_destroy($_[0]) }
+sub gtkflush()                { mygtk3::flush() }
 sub gtkhide                   { $_[0]->hide; $_[0] }
 sub gtkmove                   { $_[0]->window->move($_[1], $_[2]); $_[0] }
 sub gtkpack                   { gtkpowerpack(1, 1, @_) }
@@ -152,9 +152,9 @@ sub gtkradio {
       } @_;
 }
 
-sub gtkroot() { mygtk2::root_window() }
-sub gtkcolor { &mygtk2::rgb2color }
-sub gtkset_background { &mygtk2::set_root_window_background }
+sub gtkroot() { mygtk3::root_window() }
+sub gtkcolor { &mygtk3::rgb2color }
+sub gtkset_background { &mygtk3::set_root_window_background }
 
 sub gtkset_text {
     my ($w, $s) = @_;
@@ -360,7 +360,7 @@ sub create_box_with_title {
          my ($txt) = @_;
          ref($txt) ? $txt : gtknew('WrappedLabel', text_markup => $txt,
                                    # workaround infamous 6 years old gnome bug #101968:
-                                   width => mygtk2::get_label_width());
+                                   width => mygtk3::get_label_width());
      };
 	    gtkpack__($box,
 		      if_($::isWizard, gtknew('Label', height => 10)),
@@ -635,13 +635,13 @@ sub may_set_icon {
     }
 }
 
-sub gtktext_insert { &mygtk2::_text_insert }
-sub icon_paths { &mygtk2::_icon_paths }
-sub add_icon_path { &mygtk2::add_icon_path }
+sub gtktext_insert { &mygtk3::_text_insert }
+sub icon_paths { &mygtk3::_icon_paths }
+sub add_icon_path { &mygtk3::add_icon_path }
 
 sub set_main_window_size { 
     my ($o) = @_;
-    mygtk2::set_main_window_size($o->{rwindow});
+    mygtk3::set_main_window_size($o->{rwindow});
 }
 
 # extracts interesting font metrics for a given widget
@@ -748,7 +748,7 @@ sub new {
 	if_(!$::isInstall, icon_no_error => wm_icon()),
 	if_($o->{transient}, transient_for => $o->{transient}), 
     );
-    mygtk2::register_main_window($window->{real_window}) if !$opts{do_not_track_main_window};
+    mygtk3::register_main_window($window->{real_window}) if !$opts{do_not_track_main_window};
     $window->set_border_width(10) if !$window->{pop_it} && !$::noborderWhenEmbedded;
 
     $o->{rwindow} = $o->{window} = $window;
@@ -763,7 +763,7 @@ sub main {
     gtkset_mousecursor_normal();
 
     $o->show;
-    mygtk2::main($o->{rwindow},
+    mygtk3::main($o->{rwindow},
 		 sub { $o->{retval} ? !$o_completed || $o_completed->() : !$o_canceled || $o_canceled->() });
     $o->{retval};
 }
@@ -807,11 +807,11 @@ END { &exit() }
 # Full UI managed functions that will return to you the value that the
 # user chose.
 
-sub ask_warn       { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_warn(@_); main($w) }
-sub ask_yesorno    { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Yes"), N("No")); main($w) }
-sub ask_okcancel   { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Is this correct?"), N("Ok"), N("Cancel")); main($w) }
-sub ask_from_entry { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_from_entry(@_); main($w) }
-sub ask_dir        { my $w = ugtk2->new(shift @_, grab => 1); $w->_ask_dir(@_); main($w) }
+sub ask_warn       { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_warn(@_); main($w) }
+sub ask_yesorno    { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Yes"), N("No")); main($w) }
+sub ask_okcancel   { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_okcancel(@_, N("Is this correct?"), N("Ok"), N("Cancel")); main($w) }
+sub ask_from_entry { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_from_entry(@_); main($w) }
+sub ask_dir        { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_dir(@_); main($w) }
 
 sub _ask_from_entry($$@) {
     my ($o, @msgs) = @_;
@@ -852,7 +852,7 @@ sub _ask_okcancel($@) {
 
 sub create_file_selector {
     my (%opts) = @_;
-    my $w = ugtk2->new(delete $opts{title}, modal => 1);
+    my $w = ugtk3->new(delete $opts{title}, modal => 1);
     my ($message, $save, $want_a_dir) = (delete $opts{message}, delete $opts{save}, delete $opts{want_a_dir});
     my $action = $want_a_dir ? ($save ? 'create_folder' : 'select_folder') : ($save ? 'save' : 'open');
     add2hash(\%opts, { width => 480, height => 250 });
@@ -901,7 +901,7 @@ sub _ask_dir {
 sub ask_browse_tree_info {
     my ($common) = @_;
 
-    my $w = ugtk2->new($common->{title});
+    my $w = ugtk3->new($common->{title});
 
     my $tree_model = Gtk2::TreeStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String");
     my $tree = Gtk2::TreeView->new_with_model($tree_model);
@@ -918,7 +918,7 @@ sub ask_browse_tree_info {
 	   gtknew('VBox', spacing => 5, children => [
 		    0, gtknew('Title2', label => $common->{message},
                               # workaround infamous 6 years old gnome bug #101968:
-                              width => mygtk2::get_label_width()),
+                              width => mygtk3::get_label_width()),
 		    1, gtknew('VBox', children => [
 			       1, gtknew('ScrolledWindow', child => $tree),
 			       0, gtknew('Frame', text => N("Info"), child =>
@@ -1163,7 +1163,7 @@ sub ask_browse_tree_info_given_widgets {
 	    $curr = $iter;
 	}
 	#- the following test for equality is because we can have a button_press_event first, then
-	#- two changed events, the first being on a different row :/ (is it a bug in gtk2?) - that
+	#- two changed events, the first being on a different row :/ (is it a bug in gtk3?) - that
 	#- happens in rpmdrake when doing a "search" and directly trying to select a found package
 	if ($mouse_toggle_pending eq $model->get($iter, 0)) {
 	    $toggle->(1);
@@ -1318,8 +1318,8 @@ sub set_popdown_strings {
     my $menu = Gtk2::Menu->new;
     # keep string list around for ->set_text compatibilty helper
     $w->{strings} = \@strs;
-    #$w->set_menu((ugtk2::create_factory_menu($window, [ "File", (undef) x 3, '<Branch>' ], map { [ "File/" . $_, (undef) x 3, '<Item>' ] } @strs))[0]);
-    $menu->append(ugtk2::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs;
+    #$w->set_menu((ugtk3::create_factory_menu($window, [ "File", (undef) x 3, '<Branch>' ], map { [ "File/" . $_, (undef) x 3, '<Item>' ] } @strs))[0]);
+    $menu->append(ugtk3::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs;
     $w->set_menu($menu);
     $w;
 }
@@ -1399,34 +1399,34 @@ sub set_text {
 package Gtk2::Label;
 sub set {
     my ($label, $text) = @_;
-    mygtk2::gtkset($label, text => $text);
+    mygtk3::gtkset($label, text => $text);
 }
 
 
 package Gtk2::WrappedLabel;
 sub new {
     my ($_type, $o_text, $o_align) = @_;
-    mygtk2::gtknew('WrappedLabel', text => $o_text || '', alignment => [ $o_align || 0, 0.5 ]);
+    mygtk3::gtknew('WrappedLabel', text => $o_text || '', alignment => [ $o_align || 0, 0.5 ]);
 }
 
 
 package Gtk2::Entry;
 sub new_with_text {
     my ($_class, $o_text) = @_;
-    mygtk2::gtknew('Entry', text => $o_text);
+    mygtk3::gtknew('Entry', text => $o_text);
 }
 
 
 package Gtk2::Banner;
 
 use MDK::Common;
-use mygtk2 qw(gtknew);
-use ugtk2 qw(:helpers :wrappers);
+use mygtk3 qw(gtknew);
+use ugtk3 qw(:helpers :wrappers);
 
 sub set_pixmap {
     my ($darea) = @_;
     return if !$darea->realized;
-    ugtk2::set_back_pixbuf($darea, $darea->{back_pixbuf});
+    ugtk3::set_back_pixbuf($darea, $darea->{back_pixbuf});
     update_text($darea);
 }
 
@@ -1441,15 +1441,15 @@ sub update_text {
 sub new {
     my ($_class, $icon, $text, $o_options) = @_;
 
-    mygtk2::import_style_ressources();
+    mygtk3::import_style_ressources();
     my $darea = gtknew('DrawingArea', widget_name => 'Banner');
     $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background');
     my $d_height = $darea->{back_pixbuf}->get_height;
     $darea->set_size_request(-1, $d_height);
     $darea->modify_font(Gtk2::Pango::FontDescription->from_string("13"));
-    eval { $darea->{icon} = ugtk2::gtkcreate_pixbuf($icon) };
-    $darea->{icon} ||= ugtk2::gtkcreate_pixbuf(ugtk2::wm_icon());
-    my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk2::text_direction_rtl()) };
+    eval { $darea->{icon} = ugtk3::gtkcreate_pixbuf($icon) };
+    $darea->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon());
+    my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk3::text_direction_rtl()) };
     my $blue_width = $blue_part->get_width;
     $darea->{text} = $text;
     require lang;
@@ -1633,13 +1633,13 @@ sub show {
 package Gtk2::GUI_Update_Guard;
 
 use MDK::Common::Func qw(before_leaving);
-use ugtk2;
+use ugtk3;
 
 sub new {
     my ($_class) = @_; # prevent a perl_checker warning in callers
     my $old_signal = $SIG{ALRM};
     $SIG{ALRM} = sub {
-        ugtk2::gtkflush();
+        ugtk3::gtkflush();
         alarm(1);
     };
     alarm(1);
-- 
cgit v1.2.1


From 602108d3f37701dcecdeb9697c05c3b9d76eb67a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 1 Aug 2012 17:26:31 +0200
Subject: Gtk2::Pango -> Pango

---
 perl-install/ugtk3.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index d1db5ed79..9ad1cc2cb 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -310,9 +310,9 @@ sub markup_to_TextView_format {
     foreach (@$l) {
 	my ($_txt, $attrs) = @$_;
 	if ($attrs) {
-         $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Gtk2::Pango; Gtk2::Pango->PANGO_WEIGHT_BOLD };
+         $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Pango; Pango->PANGO_WEIGHT_BOLD };
          $attrs->{size} eq 'larger' and do {
-             $attrs->{scale} = Gtk2::Pango->scale_x_large; # equivalent to Label's size => 'larger'
+             $attrs->{scale} = Pango->scale_x_large; # equivalent to Label's size => 'larger'
              delete $attrs->{size};
          };
      }
@@ -349,7 +349,7 @@ sub create_box_with_title {
 	my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200);
 	$scroll->signal_connect(realize => sub {
                                 my $layout = $wtext->create_pango_layout($text);
-                                $layout->set_width(($width - 10) * Gtk2::Pango->scale);
+                                $layout->set_width(($width - 10) * Pango->scale);
                                 $wtext->set_size_request($width,  min(200, second($layout->get_pixel_size) + 10));
                                 $scroll->set_size_request($width, min(200, second($layout->get_pixel_size) + 10));
                                 $o->{rwindow}->queue_resize;
@@ -653,14 +653,14 @@ sub gtkfontinfo {
     foreach (qw(ascent descent approximate_char_width approximate_digit_width)) {
 	no strict;
 	my $func = "get_$_";
-	$fontinfo{$_} = Gtk2::Pango->pixels($metrics->$func);
+	$fontinfo{$_} = Pango->pixels($metrics->$func);
     }
     %fontinfo;
 }
 
 sub gtkmodify_font {
     my ($w, $arg) = @_;
-    $w->modify_font(ref($arg) ? $arg : Gtk2::Pango::FontDescription->from_string($arg));
+    $w->modify_font(ref($arg) ? $arg : Pango::FontDescription->from_string($arg));
     $w;
 }
 
@@ -1446,7 +1446,7 @@ sub new {
     $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background');
     my $d_height = $darea->{back_pixbuf}->get_height;
     $darea->set_size_request(-1, $d_height);
-    $darea->modify_font(Gtk2::Pango::FontDescription->from_string("13"));
+    $darea->modify_font(Pango::FontDescription->from_string("13"));
     eval { $darea->{icon} = ugtk3::gtkcreate_pixbuf($icon) };
     $darea->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon());
     my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk3::text_direction_rtl()) };
-- 
cgit v1.2.1


From b9e700aea8f8dfae031d9ff923f00393b052fd3d Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 1 Aug 2012 17:16:30 +0200
Subject: use Gtk3 namespace instead of Gtk2

---
 perl-install/ugtk3.pm | 116 +++++++++++++++++++++++++-------------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 9ad1cc2cb..d9c2b783c 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -38,7 +38,7 @@ use log;
 use common;
 use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version
 
-use Gtk2;
+use Gtk3;
 
 
 $border = 5;
@@ -146,7 +146,7 @@ sub gtkradio {
     my $def = shift;
     my $radio;
     map {
-        my $w = gtkset_active($radio = Gtk2::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def);
+        my $w = gtkset_active($radio = Gtk3::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def);
         $w->get_child->set_line_wrap(1);
         $w;
       } @_;
@@ -170,7 +170,7 @@ sub gtkcombo_setpopdown_strings {
 
 sub gtkset_mousecursor {
     my ($type, $w) = @_;
-    ($w || gtkroot())->set_cursor(Gtk2::Gdk::Cursor->new($type));
+    ($w || gtkroot())->set_cursor(Gtk3::Gdk::Cursor->new($type));
     $w;
 }
 
@@ -268,7 +268,7 @@ sub create_pixbutton {
 
 sub create_adjustment {
     my ($val, $min, $max) = @_;
-    Gtk2::Adjustment->new($val, $min, $max + 1, 1, ($max - $min + 1) / 10, 1);
+    Gtk3::Adjustment->new($val, $min, $max + 1, 1, ($max - $min + 1) / 10, 1);
 }
 
 sub create_scrolled_window {
@@ -286,7 +286,7 @@ sub n_line_size {
 
 # Glib::Markup::escape_text() if no use for us because it'll do extra
 # s/X/&foobar;/ (such as s/'/&apos;/) that are suitable for
-# Gtk2::Labels but are not for Gtk2::TextViews, resulting in
+# Gtk3::Labels but are not for Gtk3::TextViews, resulting in
 # displaying the raw enriched text instead...
 #
 sub escape_text_for_TextView_markup_format {
@@ -403,7 +403,7 @@ sub create_dialog {
     gtkpack($dialog->vbox,
             gtknew('HBox', children => [
                      if_($o_options->{stock},
-                         0, Gtk2::Image->new_from_stock($o_options->{stock}, 'dialog'),
+                         0, Gtk3::Image->new_from_stock($o_options->{stock}, 'dialog'),
                          0, gtknew('Label', text => "   "),
                         ),
                      1, $o_options->{scroll} ? create_scrolled_window($text, [ 'never', 'automatic' ]) : $text,
@@ -413,19 +413,19 @@ sub create_dialog {
     if ($o_options->{cancel}) {
 	$dialog->action_area->pack_start(
 	    gtknew('Button', text => N("Cancel"),
-		   clicked => sub { $ret = 0; $dialog->destroy; Gtk2->main_quit },
+		   clicked => sub { $ret = 0; $dialog->destroy; Gtk3->main_quit },
 		   can_default => 1), 
 	    1, 1, 0);
     }
 
     my $button = gtknew('Button', text => N("Ok"), can_default => 1,
-			clicked => sub { $ret = 1; $dialog->destroy; Gtk2->main_quit });
+			clicked => sub { $ret = 1; $dialog->destroy; Gtk3->main_quit });
     $dialog->action_area->pack_start($button, 1, 1, 0);
     $button->grab_default;
 
     $dialog->set_has_separator(0);
     $dialog->show_all;
-    Gtk2->main;
+    Gtk3->main;
     $ret;
 }
 
@@ -455,19 +455,19 @@ sub create_vbox { gtknew('VButtonBox', layout => $_[0]) }
 
 sub create_factory_menu_ {
     my ($type, $name, $window, @menu_items) = @_;
-    my $widget = Gtk2::ItemFactory->new($type, $name, my $accel_group = Gtk2::AccelGroup->new);
+    my $widget = Gtk3::ItemFactory->new($type, $name, my $accel_group = Gtk3::AccelGroup->new);
     $widget->create_items($window, @menu_items);
     $window->add_accel_group($accel_group);
     ($widget->get_widget($name), $widget);
 }
 
-sub create_factory_popup_menu { create_factory_menu_("Gtk2::Menu", '<main>', @_) }
-sub create_factory_menu { create_factory_menu_("Gtk2::MenuBar", '<main>', @_) }
+sub create_factory_popup_menu { create_factory_menu_("Gtk3::Menu", '<main>', @_) }
+sub create_factory_menu { create_factory_menu_("Gtk3::MenuBar", '<main>', @_) }
 
 sub create_menu {
     my $title = shift;
-    my $w = Gtk2::MenuItem->new($title);
-    $w->set_submenu(gtkshow(gtkappend(Gtk2::Menu->new, @_)));
+    my $w = Gtk3::MenuItem->new($title);
+    $w->set_submenu(gtkshow(gtkappend(Gtk3::Menu->new, @_)));
     $w;
 }
 
@@ -482,7 +482,7 @@ sub create_notebook {
 
 sub create_packtable {
     my ($options, @l) = @_;
-    my $w = Gtk2::Table->new(0, 0, $options->{homogeneous} || 0);
+    my $w = Gtk3::Table->new(0, 0, $options->{homogeneous} || 0);
     add2hash_($options, { xpadding => 5, ypadding => 0 });
     each_index {
 	my ($i, $l) = ($::i, $_);
@@ -494,7 +494,7 @@ sub create_packtable {
 		  $w->attach($_, $j, $j + 1, $i, $i + 1,
 			     'fill', 'fill', $options->{xpadding}, $options->{ypadding}) :
 		  $w->attach($_, $j, $j + 1, $i, $i + 1,
-			     ['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? ['expand', 'fill'] : [], 0, 0);
+			     ['expand', 'fill'], ref($_) eq 'Gtk3::ScrolledWindow' || $_->get_data('must_grow') ? ['expand', 'fill'] : [], 0, 0);
 		$_->show;
 	    }
 	} @$l;
@@ -517,11 +517,11 @@ sub create_okcancel {
         $cancel = $::isWizard ? N("Previous") : N("Cancel");
     }
     my $ok = defined $o_ok ? $o_ok : $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok");
-    my $bok = $ok && ($w->{ok} = gtknew('Button', text => $ok, clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk2->main_quit }));
+    my $bok = $ok && ($w->{ok} = gtknew('Button', text => $ok, clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk3->main_quit }));
     my $bprev;
     if ($cancel) {
         $bprev = $w->{cancel} = gtknew('Button', text => $cancel, clicked => $w->{cancel_clicked} || 
-                                   sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk2->main_quit });
+                                   sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk3->main_quit });
     }
     $w->{wizcancel} = gtknew('Button', text =>  ($::Wizard_skip ? N("Skip") : N("Cancel")), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall && !$::Wizard_no_cancel;
     if (!defined $wm_is_kde) {
@@ -529,7 +529,7 @@ sub create_okcancel {
         my $wm = any::running_window_manager();
         $wm_is_kde = !$::isInstall && ($wm eq "kwin" || $wm eq "compiz" && fuzzy_pidofs(qr/\bkde-window-decorator\b/)) || 0;
     }
-    my $f = sub { $w->{buttons}{$_[0][0]} = ref($_[0][0]) =~ /Gtk2::Button/ ?
+    my $f = sub { $w->{buttons}{$_[0][0]} = ref($_[0][0]) =~ /Gtk3::Button/ ?
                     $_[0][0] :
                     gtknew('Button', text => $_[0][0], clicked => $_[0][1]) };
     my @left  = ((map { $f->($_) } grep {  $_->[2] && !$_->[3] } @other),
@@ -580,11 +580,11 @@ sub _setup_paned {
 }
 
 sub create_vpaned {
-    _setup_paned(Gtk2::VPaned->new, @_);
+    _setup_paned(Gtk3::VPaned->new, @_);
 }
 
 sub create_hpaned {
-    _setup_paned(Gtk2::HPaned->new, @_);
+    _setup_paned(Gtk3::HPaned->new, @_);
 }
 
 sub gtkcreate_frame {
@@ -674,7 +674,7 @@ sub set_back_pixbuf {
     my ($widget, $pixbuf) = @_;
     my $window = $widget->window;
     my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height);
-    my $pixmap = Gtk2::Gdk::Pixmap->new($window, $width, $height, $window->get_depth);
+    my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth);
     $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0);
     $window->set_back_pixmap($pixmap, 0);
 }
@@ -683,7 +683,7 @@ sub set_back_pixmap {
     my ($w) = @_;
     return if !$w->realized;
     my $window = $w->window;
-    my $pixmap = $w->{back_pixmap} ||= Gtk2::Gdk::Pixmap->new($window, 1, 2, $window->get_depth);
+    my $pixmap = $w->{back_pixmap} ||= Gtk3::Gdk::Pixmap->new($window, 1, 2, $window->get_depth);
 
     my $style = $w->get_style;
     $pixmap->draw_points($style->bg_gc('normal'), 0, 0);
@@ -741,7 +741,7 @@ sub new {
 	title => $title || '',
 	pop_it => $o->{pop_it},
 	$::isInstall ? (banner => gtknew('Install_Title', text => $title || get_default_step_items())) : (),
-	$::isStandalone && $banner_title && $icon ? (banner => Gtk2::Banner->new($icon, $banner_title)) : (),
+	$::isStandalone && $banner_title && $icon ? (banner => Gtk3::Banner->new($icon, $banner_title)) : (),
 	width => $opts{width}, height => $opts{height}, default_width => $opts{default_width}, default_height => $opts{default_height}, 
 	modal => (!$o->{pop_it} && !$::isInstall) && ($opts{modal} || $grab || $o->{grab}) || $o->{modal},
 	no_Window_Manager => exists $opts{no_Window_Manager} ? $opts{no_Window_Manager} : !$::isStandalone,
@@ -785,7 +785,7 @@ sub sync {
 sub flush() { gtkflush() }
 sub shrink_topwindow {
     my ($o) = @_;
-    $o->{real_window}->signal_emit('size_allocate', Gtk2::Gdk::Rectangle->new(-1, -1, -1, -1));
+    $o->{real_window}->signal_emit('size_allocate', Gtk3::Gdk::Rectangle->new(-1, -1, -1, -1));
 }
 sub exit {
     gtkset_mousecursor_normal(); #- for restoring a normal in any case
@@ -816,9 +816,9 @@ sub ask_dir        { my $w = ugtk3->new(shift @_, grab => 1); $w->_ask_dir(@_);
 sub _ask_from_entry($$@) {
     my ($o, @msgs) = @_;
     my $entry = gtknew('Entry');
-    my $f = sub { $o->{retval} = $entry->get_text; Gtk2->main_quit };
+    my $f = sub { $o->{retval} = $entry->get_text; Gtk3->main_quit };
     $o->{ok_clicked} = $f;
-    $o->{cancel_clicked} = sub { undef $o->{retval}; Gtk2->main_quit };
+    $o->{cancel_clicked} = sub { undef $o->{retval}; Gtk3->main_quit };
 
     gtkadd($o->{window},
 	  gtkpack($o->create_box_with_title(@msgs),
@@ -832,7 +832,7 @@ sub _ask_warn($@) {
     my ($o, @msgs) = @_;
     gtkadd($o->{window},
 	  gtkpack($o->create_box_with_title(@msgs),
-		  my $w = gtknew('Button', text => N("Ok"), clicked => sub { Gtk2->main_quit }),
+		  my $w = gtknew('Button', text => N("Ok"), clicked => sub { Gtk3->main_quit }),
 		 ),
 	  );
     $w->grab_focus;
@@ -903,12 +903,12 @@ sub ask_browse_tree_info {
 
     my $w = ugtk3->new($common->{title});
 
-    my $tree_model = Gtk2::TreeStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::String");
-    my $tree = Gtk2::TreeView->new_with_model($tree_model);
+    my $tree_model = Gtk3::TreeStore->new("Glib::String", "Gtk3::Gdk::Pixbuf", "Glib::String");
+    my $tree = Gtk3::TreeView->new_with_model($tree_model);
     $tree->get_selection->set_mode('browse');
-    $tree->append_column(my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0));
-    $tree->append_column(my $pixcolumn  = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererPixbuf->new, 'pixbuf' => 1));
-    $tree->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 2));
+    $tree->append_column(my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0));
+    $tree->append_column(my $pixcolumn  = Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererPixbuf->new, 'pixbuf' => 1));
+    $tree->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 2));
     $tree->set_headers_visible(0);
     $tree->set_rules_hint(1);
     $textcolumn->set_min_width(200);
@@ -924,20 +924,20 @@ sub ask_browse_tree_info {
 			       0, gtknew('Frame', text => N("Info"), child =>
 				      gtknew('ScrolledWindow', child => my $info = gtknew('TextView', editable => 0, height => 100)),
 				     ) ]),
-		    0, Gtk2::HSeparator->new,
+		    0, Gtk3::HSeparator->new,
 		    0, my $status = gtknew('Label'),
 		    if_($common->{auto_deps},
 		        0, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps})
 		    ),
-		    0, Gtk2::HSeparator->new,
+		    0, Gtk3::HSeparator->new,
 		    0, my $box2 = gtknew('HBox', spacing => 10),
 		   ]));
 
     gtkpack__($box2, gtknew(($::isInstall ? 'Install_Button' : 'Button'), text => N("Help"),
                             clicked => $common->{interactive_help})) if $common->{interactive_help};
 
-    #gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new('horizontal', 'icons'));
-    gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new);
+    #gtkpack__($box2, my $toolbar = Gtk3::Toolbar->new('horizontal', 'icons'));
+    gtkpack__($box2, my $toolbar = Gtk3::Toolbar->new);
 
     my @l = ([ $common->{ok}, 1 ], if_($common->{cancel}, [ $common->{cancel}, 0 ]));
     @l = reverse @l if !$::isInstall;
@@ -945,7 +945,7 @@ sub ask_browse_tree_info {
 	my ($t, $val) = @$_;
 	$box2->pack_end(my $w = gtknew('Button', text => $t, clicked => sub {
 					   $w->{retval} = $val;
-					   Gtk2->main_quit;
+					   Gtk3->main_quit;
 				       }), 0, 1, 20);
 	$w->show;
 	$w;
@@ -1239,7 +1239,7 @@ sub gtk_new_TextView_get_log {
 
 # misc helpers:
 
-package Gtk2::TreeStore;
+package Gtk3::TreeStore;
 sub append_set {
     my ($model, $parent, @values) = @_;
     # compatibility:
@@ -1250,7 +1250,7 @@ sub append_set {
 }
 
 
-package Gtk2::ListStore;
+package Gtk3::ListStore;
 # Append a new row, set the values, return the TreeIter
 sub append_set {
     my ($model, @values) = @_;
@@ -1262,7 +1262,7 @@ sub append_set {
 }
 
 
-package Gtk2::TreeModel;
+package Gtk3::TreeModel;
 # gets the string representation of a TreeIter
 sub get_path_str {
     my ($self, $iter) = @_;
@@ -1278,7 +1278,7 @@ sub iter_each_children {
     }
 }
 
-package Gtk2::TreeView;
+package Gtk3::TreeView;
 # likewise gtk-1.2 function
 sub toggle_expansion {
     my ($self, $path, $b_open_all) = @_;
@@ -1309,17 +1309,17 @@ sub toggle_expansion {
 # This layer try to make OptionMenu and ComboBox look being api
 # compatible with Combo since its API is quite nice.
 
-package Gtk2::OptionMenu;
+package Gtk3::OptionMenu;
 use MDK::Common;
 
 # try to get combox <==> option menu mapping
 sub set_popdown_strings {
     my ($w, @strs) = @_;
-    my $menu = Gtk2::Menu->new;
+    my $menu = Gtk3::Menu->new;
     # keep string list around for ->set_text compatibilty helper
     $w->{strings} = \@strs;
     #$w->set_menu((ugtk3::create_factory_menu($window, [ "File", (undef) x 3, '<Branch>' ], map { [ "File/" . $_, (undef) x 3, '<Item>' ] } @strs))[0]);
-    $menu->append(ugtk3::gtkshow(Gtk2::MenuItem->new_with_label($_))) foreach @strs;
+    $menu->append(ugtk3::gtkshow(Gtk3::MenuItem->new_with_label($_))) foreach @strs;
     $w->set_menu($menu);
     $w;
 }
@@ -1355,7 +1355,7 @@ sub set_text {
 
 
 
-package Gtk2::ComboBox;
+package Gtk3::ComboBox;
 use MDK::Common;
 
 # try to get combox <==> option menu mapping
@@ -1396,28 +1396,28 @@ sub set_text {
 }
 
 
-package Gtk2::Label;
+package Gtk3::Label;
 sub set {
     my ($label, $text) = @_;
     mygtk3::gtkset($label, text => $text);
 }
 
 
-package Gtk2::WrappedLabel;
+package Gtk3::WrappedLabel;
 sub new {
     my ($_type, $o_text, $o_align) = @_;
     mygtk3::gtknew('WrappedLabel', text => $o_text || '', alignment => [ $o_align || 0, 0.5 ]);
 }
 
 
-package Gtk2::Entry;
+package Gtk3::Entry;
 sub new_with_text {
     my ($_class, $o_text) = @_;
     mygtk3::gtknew('Entry', text => $o_text);
 }
 
 
-package Gtk2::Banner;
+package Gtk3::Banner;
 
 use MDK::Common;
 use mygtk3 qw(gtknew);
@@ -1484,13 +1484,13 @@ sub new {
 }
 
 
-package Gtk2::MDV::CellRendererPixWithLabel;
+package Gtk3::MDV::CellRendererPixWithLabel;
 
 use MDK::Common;
-use Glib::Object::Subclass "Gtk2::CellRenderer",
+use Glib::Object::Subclass "Gtk3::CellRenderer",
   properties => [
       Glib::ParamSpec->string("label", "Label", "A meaningfull label", "", [qw(readable writable)]),
-      Glib::ParamSpec->object("pixbuf", "Pixbuf file", "Something nice to display", 'Gtk2::Gdk::Pixbuf', [qw(readable writable)]),
+      Glib::ParamSpec->object("pixbuf", "Pixbuf file", "Something nice to display", 'Gtk3::Gdk::Pixbuf', [qw(readable writable)]),
   ];
 
 my $x_padding = 2;
@@ -1574,12 +1574,12 @@ sub RENDER { # not that efficient...
 1;
 
 
-package Gtk2::Notify::Queue;
+package Gtk3::Notify::Queue;
 
 sub new {
     my ($class, $statusicon) = @_;
 
-    require Gtk2::Notify;
+    require Gtk3::Notify;
 
     my $self = bless {
         queue => [],
@@ -1604,9 +1604,9 @@ sub add {
 }
 
 sub show {
-    my ($self) = @_; # perl_checker: $self = Gtk2::Notify->new
+    my ($self) = @_; # perl_checker: $self = Gtk3::Notify->new
     my $info = $self->{queue}[0];
-    my $notification = Gtk2::Notify->new($info->{title}, $info->{message}, $self->{statusicon});
+    my $notification = Gtk3::Notify->new($info->{title}, $info->{message}, $self->{statusicon});
     $notification->set_icon_from_pixbuf($info->{pixbuf}) if $info->{pixbuf};
     $notification->set_urgency($info->{urgency}) if $info->{urgency};
     foreach my $a (@{$info->{actions} || []}) {
@@ -1630,7 +1630,7 @@ sub show {
 1;
 
 
-package Gtk2::GUI_Update_Guard;
+package Gtk3::GUI_Update_Guard;
 
 use MDK::Common::Func qw(before_leaving);
 use ugtk3;
-- 
cgit v1.2.1


From 64b9097f5cdb64ac0018bd4390b6da4b4246cb01 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 1 Aug 2012 18:26:54 +0200
Subject: perlish can_default() is no more: use set_/get_can_default() instead

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index d9c2b783c..a19356490 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -558,7 +558,7 @@ sub create_okcancel {
 		       gtknew('HButtonBox', spacing => 5, layout => $_->[1],
 			      children_loose => [
 				  map {
-				      $_->can_default($::isWizard);
+				      $_->set_can_default($::isWizard);
 				      $_;
 				  } grep { $_ } @{$_->[0]} 
 			      ]);
-- 
cgit v1.2.1


From 57cc6e6e43ea687e8b9d55346698338d7d9d9dce Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 1 Aug 2012 18:49:47 +0200
Subject: perlish realized() => get_realized()

---
 perl-install/ugtk3.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index a19356490..b092b5da3 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -681,7 +681,7 @@ sub set_back_pixbuf {
 
 sub set_back_pixmap {
     my ($w) = @_;
-    return if !$w->realized;
+    return if !$w->get_realized;
     my $window = $w->window;
     my $pixmap = $w->{back_pixmap} ||= Gtk3::Gdk::Pixmap->new($window, 1, 2, $window->get_depth);
 
@@ -1425,7 +1425,7 @@ use ugtk3 qw(:helpers :wrappers);
 
 sub set_pixmap {
     my ($darea) = @_;
-    return if !$darea->realized;
+    return if !$darea->get_realized;
     ugtk3::set_back_pixbuf($darea, $darea->{back_pixbuf});
     update_text($darea);
 }
-- 
cgit v1.2.1


From e5d2e80a09845619e90d736ac9c0f5fb3665574d Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 1 Aug 2012 18:56:16 +0200
Subject: perlish ->window => ->get_window

---
 perl-install/ugtk3.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index b092b5da3..56c954b38 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -56,7 +56,7 @@ sub wm_icon() { $wm_icon || $::Wizard_pix_up || "wiz_default_up.png" }
 sub gtkdestroy                { mygtk3::may_destroy($_[0]) }
 sub gtkflush()                { mygtk3::flush() }
 sub gtkhide                   { $_[0]->hide; $_[0] }
-sub gtkmove                   { $_[0]->window->move($_[1], $_[2]); $_[0] }
+sub gtkmove                   { $_[0]->get_window->move($_[1], $_[2]); $_[0] }
 sub gtkpack                   { gtkpowerpack(1, 1, @_) }
 sub gtkpack_                  { gtkpowerpack('arg', 1, @_) }
 sub gtkpack__                 { gtkpowerpack(0, 1, @_) }
@@ -64,7 +64,7 @@ sub gtkpack2                  { gtkpowerpack(1, 0, @_) }
 sub gtkpack2_                 { gtkpowerpack('arg', 0, @_) }
 sub gtkpack2__                { gtkpowerpack(0, 0, @_) }
 sub gtkput                    { $_[0]->put(gtkshow($_[1]), $_[2], $_[3]); $_[0] }
-sub gtkresize                 { $_[0]->window->resize($_[1], $_[2]); $_[0] }
+sub gtkresize                 { $_[0]->get_window->resize($_[1], $_[2]); $_[0] }
 sub gtkset_active             { $_[0]->set_active($_[1]); $_[0] }
 sub gtkset_border_width       { $_[0]->set_border_width($_[1]); $_[0] }
 sub gtkset_editable           { $_[0]->set_editable($_[1]); $_[0] }
@@ -672,7 +672,7 @@ sub gtkset_property {
 
 sub set_back_pixbuf {
     my ($widget, $pixbuf) = @_;
-    my $window = $widget->window;
+    my $window = $widget->get_window;
     my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height);
     my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth);
     $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0);
@@ -682,7 +682,7 @@ sub set_back_pixbuf {
 sub set_back_pixmap {
     my ($w) = @_;
     return if !$w->get_realized;
-    my $window = $w->window;
+    my $window = $w->get_window;
     my $pixmap = $w->{back_pixmap} ||= Gtk3::Gdk::Pixmap->new($window, 1, 2, $window->get_depth);
 
     my $style = $w->get_style;
@@ -1462,7 +1462,7 @@ sub new {
                                my $height = $darea->{icon}->get_height;
                                my $width = $darea->{icon}->get_width;
                                # fix icon position when not using the default height:
-                               (undef, undef, undef, $d_height) = $darea->window->get_geometry;
+                               (undef, undef, undef, $d_height) = $darea->get_window->get_geometry;
                                my $padding = int(($d_height - $height)/2);
                                my $d_width = $darea->allocation->width;
                                my $x_blue = $is_rtl ? $d_width - $blue_width : 0;
@@ -1470,11 +1470,11 @@ sub new {
                                # here: 48 is the amount of white background in the blue background we wish to ignore:
                                my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $darea->{txt_width} : $blue_width - 48;
                                $darea->{layout_height} ||= second($darea->{layout}->get_pixel_size);
-                               $blue_part->render_to_drawable($darea->window, $style->bg_gc('normal'),
+                               $blue_part->render_to_drawable($darea->get_window, $style->bg_gc('normal'),
                                                                   0, 0, $x_blue, 0, -1, -1, 'none', 0, 0);
-                               $darea->{icon}->render_to_drawable($darea->window, $style->bg_gc('normal'),
+                               $darea->{icon}->render_to_drawable($darea->get_window, $style->bg_gc('normal'),
                                                                   0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0);
-                               $darea->window->draw_layout($style->fg_gc('normal'), $x_text,
+                               $darea->get_window->draw_layout($style->fg_gc('normal'), $x_text,
                                                            $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2,
                                                            $darea->{layout});
                                1;
-- 
cgit v1.2.1


From 7b90281fb2e73c5e70488b35312c2faa51f2d9ce Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 1 Aug 2012 18:56:42 +0200
Subject: perlish ->allocation => ->get_allocation

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 56c954b38..ac116a761 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1464,7 +1464,7 @@ sub new {
                                # fix icon position when not using the default height:
                                (undef, undef, undef, $d_height) = $darea->get_window->get_geometry;
                                my $padding = int(($d_height - $height)/2);
-                               my $d_width = $darea->allocation->width;
+                               my $d_width = $darea->get_allocation->width;
                                my $x_blue = $is_rtl ? $d_width - $blue_width : 0;
                                my $x_icon = $is_rtl ? $d_width - 12 - $width : 12;
                                # here: 48 is the amount of white background in the blue background we wish to ignore:
-- 
cgit v1.2.1


From 49671c053c9f4f8c9d7bf9f02e60ab7491a2fcc9 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 10 Feb 2013 19:45:14 +0000
Subject: s/can_focus()/set_can_focus()/

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index ac116a761..7e356c8e0 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -344,7 +344,7 @@ sub create_box_with_title {
 	$wtext->set_justification('fill');
 	$wtext->set_left_margin(12);
 	$wtext->set_right_margin(12);
-	$wtext->can_focus($has_scroll);
+	$wtext->set_can_focus($has_scroll);
 	my $width = 400;
 	my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200);
 	$scroll->signal_connect(realize => sub {
-- 
cgit v1.2.1


From a90c75de317ece497ecd0da553c3a0666ae4fd16 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 10 Feb 2013 19:37:06 +0000
Subject: (create_boxradio,create_widgets) adapt to new tooltips API

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 7e356c8e0..192d7a6a9 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -78,7 +78,7 @@ sub gtkset_mousecursor_wait   { gtkset_mousecursor('watch', @_) }
 sub gtkset_relief             { $_[0]->set_relief($_[1]); $_[0] }
 sub gtkset_sensitive          { $_[0]->set_sensitive($_[1]); $_[0] }
 sub gtkset_visibility         { $_[0]->set_visibility($_[1]); $_[0] }
-sub gtkset_tip                { $_[0]->set_tip($_[1], $_[2]) if $_[2]; $_[1] }
+sub gtkset_tip                { $_[0]->set_tooltip_text($_[1]) if $_[1]; $_[0] }
 sub gtkset_shadow_type        { $_[0]->set_shadow_type($_[1]); $_[0] }
 sub gtkset_style              { $_[0]->set_style($_[1]); $_[0] }
 sub gtkset_size_request       { $_[0]->set_size_request($_[1], $_[2]); $_[0] }
-- 
cgit v1.2.1


From 99b1943996623b48db883434aaa9f82a6650403a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 6 Sep 2013 12:51:32 +0200
Subject: use Pango as binded by Gtk3

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 192d7a6a9..99c4ce5a8 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -310,7 +310,7 @@ sub markup_to_TextView_format {
     foreach (@$l) {
 	my ($_txt, $attrs) = @$_;
 	if ($attrs) {
-         $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Pango; Pango->PANGO_WEIGHT_BOLD };
+         $attrs->{weight} eq 'bold' and $attrs->{weight} = Pango->PANGO_WEIGHT_BOLD;
          $attrs->{size} eq 'larger' and do {
              $attrs->{scale} = Pango->scale_x_large; # equivalent to Label's size => 'larger'
              delete $attrs->{size};
-- 
cgit v1.2.1


From bfd9b7229992f38240b4bd020cb45bbf5128d396 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 30 Aug 2013 16:41:54 +0200
Subject: get_height() => get_allocated_height()

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 99c4ce5a8..74fc1f21f 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1444,7 +1444,7 @@ sub new {
     mygtk3::import_style_ressources();
     my $darea = gtknew('DrawingArea', widget_name => 'Banner');
     $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background');
-    my $d_height = $darea->{back_pixbuf}->get_height;
+    my $d_height = $darea->{back_pixbuf}->get_allocated_height;
     $darea->set_size_request(-1, $d_height);
     $darea->modify_font(Pango::FontDescription->from_string("13"));
     eval { $darea->{icon} = ugtk3::gtkcreate_pixbuf($icon) };
-- 
cgit v1.2.1


From 452a6077f9356526be17355e008362fbf46309f8 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 1 Sep 2013 03:45:11 +0200
Subject: (gtkradio) workaround gtk+ issue

else we got: "object 36b6540 is not really a GObject at
(...)/Glib/Object/Introspection.pm line 61."

See also bgo#679563
---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 74fc1f21f..07c0ee725 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -146,7 +146,7 @@ sub gtkradio {
     my $def = shift;
     my $radio;
     map {
-        my $w = gtkset_active($radio = Gtk3::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def);
+        my $w = gtkset_active($radio = Gtk3::RadioButton->new_with_label_from_widget($radio, $_), $_ eq $def);
         $w->get_child->set_line_wrap(1);
         $w;
       } @_;
-- 
cgit v1.2.1


From 6996f879c683210337d0fbcdc5c0e24ef9ef0055 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 1 Sep 2013 04:04:30 +0200
Subject: (new_with_strings) guard against too early calls by gtk+

---
 perl-install/ugtk3.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 07c0ee725..6480330e7 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1361,6 +1361,8 @@ use MDK::Common;
 # try to get combox <==> option menu mapping
 sub set_popdown_strings {
     my ($w, @strs) = @_;
+    my $model = $w->get_model;
+    return if !$model;
     $w->get_model->clear;
     # keep string list around for ->set_text compatibilty helper
     $w->{strings} = \@strs;
-- 
cgit v1.2.1


From c6b68a4baeb51c14d5f6825e396b1ede42c941ae Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 6 Sep 2013 13:35:56 +0200
Subject: ->modify_font() => ->override_font()

the former is deprecated in gtk+3
---
 perl-install/ugtk3.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 6480330e7..1c12c0965 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -8,7 +8,7 @@ use locale;
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
     wrappers => [ qw(gtkadd gtkadd_widget gtkappend gtkappend_page gtkappenditems gtkcombo_setpopdown_strings gtkdestroy
-                     gtkentry gtkflush gtkhide gtkmodify_font gtkmove gtkpack gtkpack2 gtkpack2_
+                     gtkentry gtkflush gtkhide gtkoverride_font gtkmove gtkpack gtkpack2 gtkpack2_
                      gtkpack2__ gtkpack_ gtkpack__ gtkpowerpack gtkput gtkradio gtkresize gtkroot
                      gtkset_active gtkset_border_width gtkset_editable gtkset_justify gtkset_alignment gtkset_layout gtkset_line_wrap
                      gtkset_markup gtkset_modal gtkset_mousecursor gtkset_mousecursor_normal gtkset_mousecursor_wait gtkset_name
@@ -658,9 +658,9 @@ sub gtkfontinfo {
     %fontinfo;
 }
 
-sub gtkmodify_font {
+sub gtkoverride_font {
     my ($w, $arg) = @_;
-    $w->modify_font(ref($arg) ? $arg : Pango::FontDescription->from_string($arg));
+    $w->override_font(ref($arg) ? $arg : Pango::FontDescription->from_string($arg));
     $w;
 }
 
-- 
cgit v1.2.1


From 35f9c81c361e8f1856a457d087d26670878c2c6e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 6 Nov 2013 14:26:40 +0100
Subject: adapt to new Pango binding

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 1c12c0965..6b3c6a1e0 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -349,7 +349,7 @@ sub create_box_with_title {
 	my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200);
 	$scroll->signal_connect(realize => sub {
                                 my $layout = $wtext->create_pango_layout($text);
-                                $layout->set_width(($width - 10) * Pango->scale);
+                                $layout->set_width(($width - 10) * Pango::SCALE);
                                 $wtext->set_size_request($width,  min(200, second($layout->get_pixel_size) + 10));
                                 $scroll->set_size_request($width, min(200, second($layout->get_pixel_size) + 10));
                                 $o->{rwindow}->queue_resize;
-- 
cgit v1.2.1


From 04a9d2b3139a6709aee4b9bc2debf047308a408c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 6 Nov 2013 14:26:59 +0100
Subject: we no longuer have access to PANGO_SCALE_* with introspection

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 6b3c6a1e0..4be3b3c15 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -312,7 +312,7 @@ sub markup_to_TextView_format {
 	if ($attrs) {
          $attrs->{weight} eq 'bold' and $attrs->{weight} = Pango->PANGO_WEIGHT_BOLD;
          $attrs->{size} eq 'larger' and do {
-             $attrs->{scale} = Pango->scale_x_large; # equivalent to Label's size => 'larger'
+             $attrs->{scale} = 1.4399999999999; # PANGO_SCALE_X_LARGE: equivalent to Label's size => 'larger'
              delete $attrs->{size};
          };
      }
-- 
cgit v1.2.1


From 53e3518613d628d347ddd8e0b7fc2094458a9864 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 6 Nov 2013 14:49:42 +0100
Subject: use the proper Pango API instead of using Pango::SCALE directly

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 4be3b3c15..f442445e6 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -349,7 +349,7 @@ sub create_box_with_title {
 	my $scroll = gtknew('ScrolledWindow', child => $wtext, width => $width, height => 200);
 	$scroll->signal_connect(realize => sub {
                                 my $layout = $wtext->create_pango_layout($text);
-                                $layout->set_width(($width - 10) * Pango::SCALE);
+                                $layout->set_width(Pango::units_from_double($width - 10));
                                 $wtext->set_size_request($width,  min(200, second($layout->get_pixel_size) + 10));
                                 $scroll->set_size_request($width, min(200, second($layout->get_pixel_size) + 10));
                                 $o->{rwindow}->queue_resize;
-- 
cgit v1.2.1


From bfeb73548c5dbbc05bc2f0cc0621104921b6b094 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 6 Sep 2013 12:57:13 +0200
Subject: we no longuer have access to PANGO_PIXELS() with introspection

=> let's use the proper API instead
we could alternatively have divide by Pango::SCALE, but this is cleaner
---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index f442445e6..9499e8c56 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -653,7 +653,7 @@ sub gtkfontinfo {
     foreach (qw(ascent descent approximate_char_width approximate_digit_width)) {
 	no strict;
 	my $func = "get_$_";
-	$fontinfo{$_} = Pango->pixels($metrics->$func);
+	$fontinfo{$_} = Pango::units_to_double($metrics->$func);
     }
     %fontinfo;
 }
-- 
cgit v1.2.1


From a1bbe9f424c406f745173ae6ebfe6f9d03f0093b Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 8 Nov 2013 02:22:24 +0100
Subject: fix $model->iter_next($iter) usage with Gtk3

---
 perl-install/ugtk3.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 9499e8c56..20e19bac7 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -241,8 +241,9 @@ sub gtktreeview_children {
     my ($model, $iter) = @_;
     my @l;
     $model or return;
-    for (my $p = $model->iter_children($iter); $p; $p = $model->iter_next($p)) {
-	push @l, $p;
+    my $p = $model->iter_children($iter);
+    while ($model->iter_next($p)) {
+	push @l, $p->copy;
     }
     @l;
 }
@@ -1273,7 +1274,8 @@ sub get_path_str {
 
 sub iter_each_children {
     my ($model, $iter, $f) = @_;
-    for (my $child = $model->iter_children($iter); $child; $child = $model->iter_next($child)) {
+    my $child = $model->iter_children($iter);
+    while ($child = $model->iter_next($child)) {
 	$f->($child);
     }
 }
-- 
cgit v1.2.1


From 0f6353aec7c82e1777483ad8c3b5cc903fba151c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 8 Nov 2013 02:24:06 +0100
Subject: use a variable for clarity

(needed for next commit)
---
 perl-install/ugtk3.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 20e19bac7..e9952b79e 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1173,7 +1173,8 @@ sub ask_browse_tree_info_given_widgets {
 	0;
     });
     $w->{tree}->signal_connect(button_press_event => sub {  #- not too good, but CellRendererPixbuf does not have the needed signals :(
-	my ($path, $column) = $w->{tree}->get_path_at_pos($_[1]->x, $_[1]->y);
+	my (undef, $event) = @_;
+	my ($path, $column) = $w->{tree}->get_path_at_pos($event->x, $event->y);
 	if ($path && $column) {
 	    $column->{is_pix} and $mouse_toggle_pending = $w->{tree_model}->get($w->{tree_model}->get_iter($path), 0);
 	}
-- 
cgit v1.2.1


From b9dcdd9e3db2bd26f501f7edfd94a54ec778829d Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 8 Nov 2013 02:24:59 +0100
Subject: ignore events who lack ->x & ->y

---
 perl-install/ugtk3.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index e9952b79e..6f931a801 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1174,6 +1174,7 @@ sub ask_browse_tree_info_given_widgets {
     });
     $w->{tree}->signal_connect(button_press_event => sub {  #- not too good, but CellRendererPixbuf does not have the needed signals :(
 	my (undef, $event) = @_;
+	return if $event =~ /Gtk3::Gdk::Event=/;
 	my ($path, $column) = $w->{tree}->get_path_at_pos($event->x, $event->y);
 	if ($path && $column) {
 	    $column->{is_pix} and $mouse_toggle_pending = $w->{tree_model}->get($w->{tree_model}->get_iter($path), 0);
-- 
cgit v1.2.1


From a45c4e4ca33cc642f3dfac9d9b6652a0cb40485f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 8 Nov 2013 03:29:08 +0100
Subject: those setters no more accept undef

---
 perl-install/ugtk3.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 6f931a801..675c774db 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -559,7 +559,7 @@ sub create_okcancel {
 		       gtknew('HButtonBox', spacing => 5, layout => $_->[1],
 			      children_loose => [
 				  map {
-				      $_->set_can_default($::isWizard);
+				      $_->set_can_default(to_bool($::isWizard));
 				      $_;
 				  } grep { $_ } @{$_->[0]} 
 			      ]);
@@ -907,9 +907,9 @@ sub ask_browse_tree_info {
     my $tree_model = Gtk3::TreeStore->new("Glib::String", "Gtk3::Gdk::Pixbuf", "Glib::String");
     my $tree = Gtk3::TreeView->new_with_model($tree_model);
     $tree->get_selection->set_mode('browse');
-    $tree->append_column(my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 0));
-    $tree->append_column(my $pixcolumn  = Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererPixbuf->new, 'pixbuf' => 1));
-    $tree->append_column(Gtk3::TreeViewColumn->new_with_attributes(undef, Gtk3::CellRendererText->new, 'text' => 2));
+    $tree->append_column(my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes("", Gtk3::CellRendererText->new, 'text' => 0));
+    $tree->append_column(my $pixcolumn  = Gtk3::TreeViewColumn->new_with_attributes("", Gtk3::CellRendererPixbuf->new, 'pixbuf' => 1));
+    $tree->append_column(Gtk3::TreeViewColumn->new_with_attributes("", Gtk3::CellRendererText->new, 'text' => 2));
     $tree->set_headers_visible(0);
     $tree->set_rules_hint(1);
     $textcolumn->set_min_width(200);
-- 
cgit v1.2.1


From a7f8805575a700e5ca8dfc962e8049eff33b71b4 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 8 Nov 2013 03:42:45 +0100
Subject: perlish $dialog->vbox => $dialog->get_child

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 675c774db..14a2ae337 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -401,7 +401,7 @@ sub create_dialog {
     my $dialog =  gtkset_border_width(_create_dialog($title, $o_options), 10);
     $dialog->set_border_width(10);
     my $text = ref($label) ? $label : $o_options->{use_markup} ? gtknew('WrappedLabel', text_markup => $label) : gtknew('WrappedLabel', text => $label);
-    gtkpack($dialog->vbox,
+    gtkpack($dialog->get_child,
             gtknew('HBox', children => [
                      if_($o_options->{stock},
                          0, Gtk3::Image->new_from_stock($o_options->{stock}, 'dialog'),
-- 
cgit v1.2.1


From 395e1a77a683369614b6fa1ab37f9d33a6cc790b Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 8 Nov 2013 03:47:53 +0100
Subject: perlish $dialog->action_area => $dialog->get_action_area

---
 perl-install/ugtk3.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 14a2ae337..aa5a30042 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -412,7 +412,7 @@ sub create_dialog {
            );
 
     if ($o_options->{cancel}) {
-	$dialog->action_area->pack_start(
+	$dialog->get_action_area->pack_start(
 	    gtknew('Button', text => N("Cancel"),
 		   clicked => sub { $ret = 0; $dialog->destroy; Gtk3->main_quit },
 		   can_default => 1), 
@@ -421,7 +421,7 @@ sub create_dialog {
 
     my $button = gtknew('Button', text => N("Ok"), can_default => 1,
 			clicked => sub { $ret = 1; $dialog->destroy; Gtk3->main_quit });
-    $dialog->action_area->pack_start($button, 1, 1, 0);
+    $dialog->get_action_area->pack_start($button, 1, 1, 0);
     $button->grab_default;
 
     $dialog->set_has_separator(0);
-- 
cgit v1.2.1


From bb299753dadf4f2aabfb86c993d622bfe8c0d98f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 12 Nov 2013 00:57:50 +0100
Subject: perlish ->state() => ->get_state()

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index aa5a30042..c628b7cb3 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1542,7 +1542,7 @@ sub RENDER { # not that efficient...
       ? 'selected'
       : 'active';
   } else {
-    $state = $widget->state eq 'insensitive'
+    $state = $widget->get_state eq 'insensitive'
       ? 'insensitive'
       : 'normal';
   }
-- 
cgit v1.2.1


From 10f8d025bf555201fd3051893c47aa1c0655790c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 12 Nov 2013 01:01:51 +0100
Subject: fix "Can't call method "x" on unblessed reference"

---
 perl-install/ugtk3.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index c628b7cb3..3cc54b5f7 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1556,13 +1556,13 @@ sub RENDER { # not that efficient...
   my ($x_offset, $y_offset, $_width, $_height) = calc_size($cell, $layout);
   my $pixbuf = $cell->get('pixbuf');
   my ($pwidth, $pheight) = pixbuf_size($cell);
-  my $txt_offset = $cell_area->x + $x_offset + $x_padding * 2 + $pwidth;
+  my $txt_offset = $cell_area->{x} + $x_offset + $x_padding * 2 + $pwidth;
 
   if ($pixbuf) {
       $pixbuf->render_to_drawable($window, $widget->style->fg_gc('normal'), 
                                   0, 0,
-                                  $is_rtl ? $cell_area->width - $cell_area->x - $pwidth : $cell_area->x ,#+ $x_padding,
-                                  $cell_area->y, #+ $y_padding,
+                                  $is_rtl ? $cell_area->{width} - $cell_area->{x} - $pwidth : $cell_area->{x} ,#+ $x_padding,
+                                  $cell_area->{y}, #+ $y_padding,
                                   $pwidth, $pheight, 'none', 0, 0);
   }
   $widget->get_style->paint_layout($window,
@@ -1571,8 +1571,8 @@ sub RENDER { # not that efficient...
                                        $cell_area,
                                        $widget,
                                        "cellrenderertext",
-                                       $is_rtl ? $cell_area->width - $txt_width - $txt_offset : $txt_offset,
-                                       $cell_area->y + $y_offset + $y_padding,
+                                       $is_rtl ? $cell_area->{width} - $txt_width - $txt_offset : $txt_offset,
+                                       $cell_area->{y} + $y_offset + $y_padding,
                                        $layout);
 
 }
-- 
cgit v1.2.1


From a4e805c7d8de129537fce0f966bc303f58a37ad3 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 12 Nov 2013 03:15:40 +0100
Subject: drop our now unused cellrenderer implementation

---
 perl-install/ugtk3.pm | 90 ---------------------------------------------------
 1 file changed, 90 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 3cc54b5f7..725097ba1 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1490,96 +1490,6 @@ sub new {
 }
 
 
-package Gtk3::MDV::CellRendererPixWithLabel;
-
-use MDK::Common;
-use Glib::Object::Subclass "Gtk3::CellRenderer",
-  properties => [
-      Glib::ParamSpec->string("label", "Label", "A meaningfull label", "", [qw(readable writable)]),
-      Glib::ParamSpec->object("pixbuf", "Pixbuf file", "Something nice to display", 'Gtk3::Gdk::Pixbuf', [qw(readable writable)]),
-  ];
-
-my $x_padding = 2;
-my $y_padding = 2;
-
-sub INIT_INSTANCE {}
-
-sub pixbuf_size {
-    my ($cell) = @_;
-    my $pixbuf = $cell->get('pixbuf');
-    $pixbuf ? ($pixbuf->get_width, $pixbuf->get_height) : (0, 0);
-}
-
-sub calc_size {
-    my ($cell, $layout) = @_;
-    my ($width, $height) = $layout->get_pixel_size;
-    my ($pwidth, $pheight) = pixbuf_size($cell);
-    
-    return 0, 0,
-            $width + $x_padding * 3 + $pwidth,
-            max($pheight, $height + $y_padding * 2);
-}
-
-sub GET_SIZE {
-  my ($cell, $widget, $_cell_area) = @_;
-
-  my $layout = get_layout($cell, $widget);
-  $layout->set_text($cell->get('label'));
-
-  return calc_size($cell, $layout);
-}
-
-sub get_layout {
-  my ($_cell, $widget) = @_;
-  return $widget->create_pango_layout("");
-}
-
-sub RENDER { # not that efficient...
-  my ($cell, $window, $widget, $_background_area, $cell_area, $_expose_area, $flags) = @_;
-  my $state;
-  if ($flags & 'selected') {
-    $state = $widget->has_focus
-      ? 'selected'
-      : 'active';
-  } else {
-    $state = $widget->get_state eq 'insensitive'
-      ? 'insensitive'
-      : 'normal';
-  }
-
-  my $layout = get_layout($cell, $widget);
-  $layout->set_text($cell->get('label'));
-
-  my $is_rtl = lang::text_direction_rtl();
-  my $txt_width = first($layout->get_pixel_size);
-
-  my ($x_offset, $y_offset, $_width, $_height) = calc_size($cell, $layout);
-  my $pixbuf = $cell->get('pixbuf');
-  my ($pwidth, $pheight) = pixbuf_size($cell);
-  my $txt_offset = $cell_area->{x} + $x_offset + $x_padding * 2 + $pwidth;
-
-  if ($pixbuf) {
-      $pixbuf->render_to_drawable($window, $widget->style->fg_gc('normal'), 
-                                  0, 0,
-                                  $is_rtl ? $cell_area->{width} - $cell_area->{x} - $pwidth : $cell_area->{x} ,#+ $x_padding,
-                                  $cell_area->{y}, #+ $y_padding,
-                                  $pwidth, $pheight, 'none', 0, 0);
-  }
-  $widget->get_style->paint_layout($window,
-                                       $state,
-                                       1,
-                                       $cell_area,
-                                       $widget,
-                                       "cellrenderertext",
-                                       $is_rtl ? $cell_area->{width} - $txt_width - $txt_offset : $txt_offset,
-                                       $cell_area->{y} + $y_offset + $y_padding,
-                                       $layout);
-
-}
-
-1;
-
-
 package Gtk3::Notify::Queue;
 
 sub new {
-- 
cgit v1.2.1


From fa5f6f057d6e7960adbac97a824bc94b025ad00f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 12 Nov 2013 16:15:00 +0100
Subject: fix "Can't locate object method "new_text" via package
 "Gtk3::ComboBox""

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 725097ba1..630d25807 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1376,7 +1376,7 @@ sub set_popdown_strings {
 
 sub new_with_strings {
     my ($class, $strs, $o_val) = @_;
-    my $w = $class->new_text;
+    my $w = $class->new;
     $w->set_popdown_strings(@$strs);
     $w->set_text($o_val) if $o_val;
     $w;
-- 
cgit v1.2.1


From d985ce0894028d2497ab840789877929d92f18a1 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 13 Nov 2013 12:39:03 +0100
Subject: prevent calling CheckButton->set_label() on undef value

---
 perl-install/ugtk3.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 630d25807..ea275e5ce 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -927,8 +927,8 @@ sub ask_browse_tree_info {
 				     ) ]),
 		    0, Gtk3::HSeparator->new,
 		    0, my $status = gtknew('Label'),
-		    if_($common->{auto_deps},
-		        0, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps})
+		    ($common->{auto_deps} ?
+		        (0, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps})) : ()
 		    ),
 		    0, Gtk3::HSeparator->new,
 		    0, my $box2 = gtknew('HBox', spacing => 10),
-- 
cgit v1.2.1


From ef918297c8f6ca912fb61028b59f4a049c08683c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 12 Nov 2013 01:04:08 +0100
Subject: perlish ->style() => ->get_style()

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index ea275e5ce..47b91b510 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -676,7 +676,7 @@ sub set_back_pixbuf {
     my $window = $widget->get_window;
     my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height);
     my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth);
-    $pixbuf->render_to_drawable($pixmap, $widget->style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0);
+    $pixbuf->render_to_drawable($pixmap, $widget->get_style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0);
     $window->set_back_pixmap($pixmap, 0);
 }
 
-- 
cgit v1.2.1


From c9349d3f46f2f01cd286f6121c749e83192b6817 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 18 Nov 2013 01:17:13 +0100
Subject: lang package is not needed here

also compute language direction only once
---
 perl-install/ugtk3.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 47b91b510..ee2f8fe3a 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1455,11 +1455,10 @@ sub new {
     $darea->modify_font(Pango::FontDescription->from_string("13"));
     eval { $darea->{icon} = ugtk3::gtkcreate_pixbuf($icon) };
     $darea->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon());
-    my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => mygtk3::text_direction_rtl()) };
+    my $is_rtl = mygtk3::text_direction_rtl();
+    my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => $is_rtl) };
     my $blue_width = $blue_part->get_width;
     $darea->{text} = $text;
-    require lang;
-    my $is_rtl = lang::text_direction_rtl();
 
     $darea->signal_connect(realize => \&set_pixmap);
     $darea->signal_connect("style-set" => \&set_pixmap);
-- 
cgit v1.2.1


From 47280b6bce184eef49ad813ad83d29f9d76dc32f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 18 Nov 2013 01:21:53 +0100
Subject: rename a variable

(makes next commit more readable)
---
 perl-install/ugtk3.pm | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index ee2f8fe3a..0ce17fced 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1448,44 +1448,44 @@ sub new {
     my ($_class, $icon, $text, $o_options) = @_;
 
     mygtk3::import_style_ressources();
-    my $darea = gtknew('DrawingArea', widget_name => 'Banner');
-    $darea->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background');
-    my $d_height = $darea->{back_pixbuf}->get_allocated_height;
-    $darea->set_size_request(-1, $d_height);
-    $darea->modify_font(Pango::FontDescription->from_string("13"));
-    eval { $darea->{icon} = ugtk3::gtkcreate_pixbuf($icon) };
-    $darea->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon());
+    my $w = gtknew('DrawingArea', widget_name => 'Banner');
+    $w->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background');
+    my $d_height = $w->{back_pixbuf}->get_allocated_height;
+    $w->set_size_request(-1, $d_height);
+    $w->modify_font(Pango::FontDescription->from_string("13"));
+    eval { $w->{icon} = ugtk3::gtkcreate_pixbuf($icon) };
+    $w->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon());
     my $is_rtl = mygtk3::text_direction_rtl();
     my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => $is_rtl) };
     my $blue_width = $blue_part->get_width;
-    $darea->{text} = $text;
-
-    $darea->signal_connect(realize => \&set_pixmap);
-    $darea->signal_connect("style-set" => \&set_pixmap);
-    $darea->signal_connect(expose_event => sub {
-                               my $style = $darea->get_style;
-                               my $height = $darea->{icon}->get_height;
-                               my $width = $darea->{icon}->get_width;
+    $w->{text} = $text;
+
+    $w->signal_connect(realize => \&set_pixmap);
+    $w->signal_connect("style-set" => \&set_pixmap);
+    $w->signal_connect(expose_event => sub {
+                               my $style = $w->get_style;
+                               my $height = $w->{icon}->get_height;
+                               my $width = $w->{icon}->get_width;
                                # fix icon position when not using the default height:
-                               (undef, undef, undef, $d_height) = $darea->get_window->get_geometry;
+                               (undef, undef, undef, $d_height) = $w->get_window->get_geometry;
                                my $padding = int(($d_height - $height)/2);
-                               my $d_width = $darea->get_allocation->width;
+                               my $d_width = $w->get_allocation->width;
                                my $x_blue = $is_rtl ? $d_width - $blue_width : 0;
                                my $x_icon = $is_rtl ? $d_width - 12 - $width : 12;
                                # here: 48 is the amount of white background in the blue background we wish to ignore:
-                               my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $darea->{txt_width} : $blue_width - 48;
-                               $darea->{layout_height} ||= second($darea->{layout}->get_pixel_size);
-                               $blue_part->render_to_drawable($darea->get_window, $style->bg_gc('normal'),
+                               my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $w->{txt_width} : $blue_width - 48;
+                               $w->{layout_height} ||= second($w->{layout}->get_pixel_size);
+                               $blue_part->render_to_drawable($w->get_window, $style->bg_gc('normal'),
                                                                   0, 0, $x_blue, 0, -1, -1, 'none', 0, 0);
-                               $darea->{icon}->render_to_drawable($darea->get_window, $style->bg_gc('normal'),
+                               $w->{icon}->render_to_drawable($w->get_window, $style->bg_gc('normal'),
                                                                   0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0);
-                               $darea->get_window->draw_layout($style->fg_gc('normal'), $x_text,
-                                                           $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2,
-                                                           $darea->{layout});
+                               $w->get_window->draw_layout($style->fg_gc('normal'), $x_text,
+                                                           $o_options->{txt_ypos} || ($d_height - $w->{layout_height})/2,
+                                                           $w->{layout});
                                1;
                            });
                                
-    return $darea;
+    return $w;
 }
 
 
-- 
cgit v1.2.1


From f5ed08a589bc9081c68188c464a5a978557d0b2a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Thu, 23 May 2013 17:53:00 +0200
Subject: convert Banner widget to Gtk+3

- Parsing of custom resources: RC -> CSS
- signal: 'style-set' => 'style-updated'
- Drop our custom draw code
- widget is much simpler, using Overlays
  (due to that(?), we must remove -4 from the vertical padding)

Also fix "Unit is missing" fatal error with newer gtk+3.10

Most themes work OK but Oxygen-gtk3...
---
 perl-install/ugtk3.pm | 79 +++++++++++++++++++++++----------------------------
 1 file changed, 36 insertions(+), 43 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 0ce17fced..fe0b0f89e 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1429,62 +1429,55 @@ use MDK::Common;
 use mygtk3 qw(gtknew);
 use ugtk3 qw(:helpers :wrappers);
 
-sub set_pixmap {
-    my ($darea) = @_;
-    return if !$darea->get_realized;
-    ugtk3::set_back_pixbuf($darea, $darea->{back_pixbuf});
-    update_text($darea);
+sub set_style {
+   my ($w) = @_;
+   my $pl = Gtk3::CssProvider->new;
+   $pl->load_from_data("Layout, GtkLabel {font: 15px; background-color: #ffffff }");
+   $w->{label}->get_style_context->add_provider($pl, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION);
+   my $p = Gtk3::CssProvider->new;
+   $w->get_style_context->add_provider($p, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION);
 }
 
 sub update_text {
     my ($darea) = @_;
-    $darea->{layout} = $darea->create_pango_layout($darea->{text});
-    $darea->{txt_width} = first($darea->{layout}->get_pixel_size);
     $darea->queue_draw;
 }
 
-
 sub new {
     my ($_class, $icon, $text, $o_options) = @_;
 
     mygtk3::import_style_ressources();
-    my $w = gtknew('DrawingArea', widget_name => 'Banner');
-    $w->{back_pixbuf} = gtknew('Pixbuf', file => 'banner-background');
-    my $d_height = $w->{back_pixbuf}->get_allocated_height;
-    $w->set_size_request(-1, $d_height);
-    $w->modify_font(Pango::FontDescription->from_string("13"));
-    eval { $w->{icon} = ugtk3::gtkcreate_pixbuf($icon) };
-    $w->{icon} ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon());
+    my $icon = eval { ugtk3::gtkcreate_pixbuf($icon) };
+    $icon ||= ugtk3::gtkcreate_pixbuf(ugtk3::wm_icon());
     my $is_rtl = mygtk3::text_direction_rtl();
     my $blue_part = eval { gtknew('Pixbuf', file => 'banner-blue-part', flip => $is_rtl) };
-    my $blue_width = $blue_part->get_width;
-    $w->{text} = $text;
-
-    $w->signal_connect(realize => \&set_pixmap);
-    $w->signal_connect("style-set" => \&set_pixmap);
-    $w->signal_connect(expose_event => sub {
-                               my $style = $w->get_style;
-                               my $height = $w->{icon}->get_height;
-                               my $width = $w->{icon}->get_width;
-                               # fix icon position when not using the default height:
-                               (undef, undef, undef, $d_height) = $w->get_window->get_geometry;
-                               my $padding = int(($d_height - $height)/2);
-                               my $d_width = $w->get_allocation->width;
-                               my $x_blue = $is_rtl ? $d_width - $blue_width : 0;
-                               my $x_icon = $is_rtl ? $d_width - 12 - $width : 12;
-                               # here: 48 is the amount of white background in the blue background we wish to ignore:
-                               my $x_text = $is_rtl ? $d_width - $blue_width + 48 - $w->{txt_width} : $blue_width - 48;
-                               $w->{layout_height} ||= second($w->{layout}->get_pixel_size);
-                               $blue_part->render_to_drawable($w->get_window, $style->bg_gc('normal'),
-                                                                  0, 0, $x_blue, 0, -1, -1, 'none', 0, 0);
-                               $w->{icon}->render_to_drawable($w->get_window, $style->bg_gc('normal'),
-                                                                  0, 0, $x_icon, $padding, -1, -1, 'none', 0, 0);
-                               $w->get_window->draw_layout($style->fg_gc('normal'), $x_text,
-                                                           $o_options->{txt_ypos} || ($d_height - $w->{layout_height})/2,
-                                                           $w->{layout});
-                               1;
-                           });
-                               
+
+    my $d_height = $blue_part->get_height;
+    
+
+    my $img = gtknew('Image', pixbuf => $blue_part, alignment => [ 0, 0 ]);
+
+    my $label = gtknew('Label', text => $text); # for update_text()
+    my $w = gtknew('Overlay', height => $d_height, main_child => $label, children => [
+		       gtknew('Overlay', main_child => $img, children => [
+				  my $icon_img = gtknew('Image', pixbuf => $icon, alignment => [ 0, 0 ]),
+			      ])
+		   ]);
+
+    # fix Icon position:
+    if ($is_rtl) {
+	$icon_img->set_margin_right(12);
+    } else {
+	$icon_img->set_margin_left(12);
+    }
+    $icon_img->set_margin_top(($blue_part->get_height-$icon->get_height)/2-4);
+
+    $w->{label} = $label;
+    $w->set_size_request(-1, $d_height);
+
+    $w->signal_connect(realize => \&set_style);
+    $w->signal_connect("style-updated" => \&set_style);
+    $w->show_all;
     return $w;
 }
 
-- 
cgit v1.2.1


From 678a27d018858a21727a5fe66c904b30dbad0ea3 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 17 Nov 2013 12:23:02 +0100
Subject: explain who uses it

---
 perl-install/ugtk3.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index fe0b0f89e..70718c5d7 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1438,6 +1438,7 @@ sub set_style {
    $w->get_style_context->add_provider($p, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION);
 }
 
+# used by install::steps_gtk::installPackages()
 sub update_text {
     my ($darea) = @_;
     $darea->queue_draw;
-- 
cgit v1.2.1


From ad02d01dbed0bc2717eb1bf057455e95255d2d32 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 17 Nov 2013 12:28:29 +0100
Subject: rename a variable

---
 perl-install/ugtk3.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 70718c5d7..24df06e95 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1440,8 +1440,8 @@ sub set_style {
 
 # used by install::steps_gtk::installPackages()
 sub update_text {
-    my ($darea) = @_;
-    $darea->queue_draw;
+    my ($banner) = @_;
+    $banner->queue_draw;
 }
 
 sub new {
-- 
cgit v1.2.1


From 3cfaca7fb9efac159556e25a53940dcd341b5dad Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 17 Nov 2013 12:30:08 +0100
Subject: update API for installer

---
 perl-install/ugtk3.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 24df06e95..a262d1b6e 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1440,8 +1440,9 @@ sub set_style {
 
 # used by install::steps_gtk::installPackages()
 sub update_text {
-    my ($banner) = @_;
-    $banner->queue_draw;
+    my ($banner, $new_text) = @_;
+    $banner->{label}->set_text($new_text);
+    $banner->{label}->queue_draw;
 }
 
 sub new {
-- 
cgit v1.2.1


From b803e12977379121da8f49f288337ab18a57e1e3 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 18 Nov 2013 01:15:01 +0100
Subject: (set_back_pixbuf) drop it (now unused)

---
 perl-install/ugtk3.pm | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index a262d1b6e..2ec521eee 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -671,15 +671,6 @@ sub gtkset_property {
     $w;
 }
 
-sub set_back_pixbuf {
-    my ($widget, $pixbuf) = @_;
-    my $window = $widget->get_window;
-    my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height);
-    my $pixmap = Gtk3::Gdk::Pixmap->new($window, $width, $height, $window->get_depth);
-    $pixbuf->render_to_drawable($pixmap, $widget->get_style->fg_gc('normal'), 0, 0, 0, 0, $width, $height, 'max', 0, 0);
-    $window->set_back_pixmap($pixmap, 0);
-}
-
 sub set_back_pixmap {
     my ($w) = @_;
     return if !$w->get_realized;
-- 
cgit v1.2.1


From 0f769bdd74f0d06553642f36e019748178fcc803 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 18 Nov 2013 02:59:31 +0100
Subject: Dialog->set_has_separator() no more exists in Gtk3

---
 perl-install/ugtk3.pm | 1 -
 1 file changed, 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 2ec521eee..67b0b6880 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -424,7 +424,6 @@ sub create_dialog {
     $dialog->get_action_area->pack_start($button, 1, 1, 0);
     $button->grab_default;
 
-    $dialog->set_has_separator(0);
     $dialog->show_all;
     Gtk3->main;
     $ret;
-- 
cgit v1.2.1


From 15768bb58de861fab57e8053d1b810fb50b469ff Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 22 Nov 2013 15:20:44 +0100
Subject: fix calling Gtk3::Image->new_from_stock()

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 67b0b6880..59d8fae49 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -404,7 +404,7 @@ sub create_dialog {
     gtkpack($dialog->get_child,
             gtknew('HBox', children => [
                      if_($o_options->{stock},
-                         0, Gtk3::Image->new_from_stock($o_options->{stock}, 'dialog'),
+                         0, Gtk3::Image->new_from_stock($o_options->{stock} || '', 'dialog'),
                          0, gtknew('Label', text => "   "),
                         ),
                      1, $o_options->{scroll} ? create_scrolled_window($text, [ 'never', 'automatic' ]) : $text,
-- 
cgit v1.2.1


From 32dfc90e18b52dc5bc3928a46c5e946158d7aee1 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 22 Nov 2013 16:24:42 +0100
Subject: Pango->PANGO_WEIGHT_BOLD is not available through introspection

---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 59d8fae49..e136d6701 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -311,7 +311,7 @@ sub markup_to_TextView_format {
     foreach (@$l) {
 	my ($_txt, $attrs) = @$_;
 	if ($attrs) {
-         $attrs->{weight} eq 'bold' and $attrs->{weight} = Pango->PANGO_WEIGHT_BOLD;
+         $attrs->{weight} eq 'bold' and $attrs->{weight} = 'bold';
          $attrs->{size} eq 'larger' and do {
              $attrs->{scale} = 1.4399999999999; # PANGO_SCALE_X_LARGE: equivalent to Label's size => 'larger'
              delete $attrs->{size};
-- 
cgit v1.2.1


From 07272233bbe52eaa714d1764d172b5553d7f8a34 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 22 Nov 2013 19:06:38 +0100
Subject: OptionMenu has been deprecated prior to Gtk3

---
 perl-install/ugtk3.pm | 66 ---------------------------------------------------
 1 file changed, 66 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index e136d6701..ec24d92bc 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1283,72 +1283,6 @@ sub toggle_expansion {
     }
 }
 
-
-# With GTK+, for more GUIes coherency, GtkOptionMenu is recommended instead of a
-# combo if the user is selecting from a fixed set of options.
-#
-# That is, non-editable combo boxes are not encouraged. GtkOptionMenu is much
-# easier to use than GtkCombo as well. Use GtkCombo only when you need the
-# editable text entry.
-#
-# GtkOptionMenu is a much better-implemented widget and also the right UI for
-# noneditable sets of choices.)
-#
-# GtkCombo is deprecated in 2.4.x because it still uses deprecated
-# GtkList. GtkOption menu is deprecated in order to have an unified widget.
-#
-# GtkComBox widget replaces GtkOption menu whereas GtkComBoxEntry replaces GtkCombo.
-#
-#
-# This layer try to make OptionMenu and ComboBox look being api
-# compatible with Combo since its API is quite nice.
-
-package Gtk3::OptionMenu;
-use MDK::Common;
-
-# try to get combox <==> option menu mapping
-sub set_popdown_strings {
-    my ($w, @strs) = @_;
-    my $menu = Gtk3::Menu->new;
-    # keep string list around for ->set_text compatibilty helper
-    $w->{strings} = \@strs;
-    #$w->set_menu((ugtk3::create_factory_menu($window, [ "File", (undef) x 3, '<Branch>' ], map { [ "File/" . $_, (undef) x 3, '<Item>' ] } @strs))[0]);
-    $menu->append(ugtk3::gtkshow(Gtk3::MenuItem->new_with_label($_))) foreach @strs;
-    $w->set_menu($menu);
-    $w;
-}
-
-sub new_with_strings {
-    my ($class, $strs, $o_val) = @_;
-    my $w = $class->new;
-    $w->set_popdown_strings(@$strs);
-    $w->set_text($o_val) if $o_val;
-    $w;
-}
-
-sub entry {
-    my ($w) = @_;
-    return $w;
-}
-
-sub get_text {
-    my ($w) = @_;
-    $w->get_history == -1 ? '' : $w->{strings}[$w->get_history];
-}
-
-sub set_text {
-    my ($w, $val) = @_;
-    each_index {
-        if ($_ eq $val) {
-            $w->set_history($::i);
-            return;
-        }
-    } @{$w->{strings}};
-}
-
-
-
-
 package Gtk3::ComboBox;
 use MDK::Common;
 
-- 
cgit v1.2.1


From 4c69b2e8d998d594564508ce31d69b720b02ed00 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sat, 23 Nov 2013 01:01:14 +0100
Subject: (shrink_topwindow) temporary disable due to Gtk3 regression

---
 perl-install/ugtk3.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index ec24d92bc..0fab42f84 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -776,6 +776,7 @@ sub sync {
 sub flush() { gtkflush() }
 sub shrink_topwindow {
     my ($o) = @_;
+    warn "NOT IMPLEMENTED !!!!\n"; return;
     $o->{real_window}->signal_emit('size_allocate', Gtk3::Gdk::Rectangle->new(-1, -1, -1, -1));
 }
 sub exit {
-- 
cgit v1.2.1


From 78397d458e73613f1440c0aeb0e87e0c5b31ebc9 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sat, 23 Nov 2013 01:17:48 +0100
Subject: create_factory_*: drop them

rationale: ItemFactory was deprecated prior to Gtk3 and we must
migrate to UIManager or Builder anyway...
---
 perl-install/ugtk3.pm | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 0fab42f84..75d6ca5c7 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -21,7 +21,7 @@ use locale;
                     get_default_step_items set_default_step_items
                     string_size string_width) ],
 
-    create => [ qw(create_adjustment create_box_with_title create_dialog create_factory_menu create_factory_popup_menu
+    create => [ qw(create_adjustment create_box_with_title create_dialog 
                    create_hbox create_hpaned create_menu create_notebook create_okcancel create_packtable
                    create_scrolled_window create_vbox create_vpaned _create_dialog gtkcreate_frame) ],
 
@@ -453,17 +453,6 @@ sub err_dialog {
 sub create_hbox { gtknew('HButtonBox', layout => $_[0]) }
 sub create_vbox { gtknew('VButtonBox', layout => $_[0]) }
 
-sub create_factory_menu_ {
-    my ($type, $name, $window, @menu_items) = @_;
-    my $widget = Gtk3::ItemFactory->new($type, $name, my $accel_group = Gtk3::AccelGroup->new);
-    $widget->create_items($window, @menu_items);
-    $window->add_accel_group($accel_group);
-    ($widget->get_widget($name), $widget);
-}
-
-sub create_factory_popup_menu { create_factory_menu_("Gtk3::Menu", '<main>', @_) }
-sub create_factory_menu { create_factory_menu_("Gtk3::MenuBar", '<main>', @_) }
-
 sub create_menu {
     my $title = shift;
     my $w = Gtk3::MenuItem->new($title);
-- 
cgit v1.2.1


From 2adc55159b0394bbf55f468e684fc13ebb524ee4 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sat, 23 Nov 2013 01:26:06 +0100
Subject: Gtk3::Notify->new => Gtk3::Notify::Notification->new

---
 perl-install/ugtk3.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 75d6ca5c7..6bf71bd05 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1428,9 +1428,9 @@ sub add {
 }
 
 sub show {
-    my ($self) = @_; # perl_checker: $self = Gtk3::Notify->new
+    my ($self) = @_; # perl_checker: $self = Gtk3::Notify::Notification->new
     my $info = $self->{queue}[0];
-    my $notification = Gtk3::Notify->new($info->{title}, $info->{message}, $self->{statusicon});
+    my $notification = Gtk3::Notify::Notification->new($info->{title}, $info->{message}, $self->{statusicon});
     $notification->set_icon_from_pixbuf($info->{pixbuf}) if $info->{pixbuf};
     $notification->set_urgency($info->{urgency}) if $info->{urgency};
     foreach my $a (@{$info->{actions} || []}) {
-- 
cgit v1.2.1


From bd184e045143f7b8cdfa4fe518478cb4b2543194 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sat, 23 Nov 2013 01:55:02 +0100
Subject: notifications work again

---
 perl-install/ugtk3.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 6bf71bd05..b6992bdcf 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1447,8 +1447,7 @@ sub show {
                                         $info->{timeout}->() if $info->{timeout};
                                         $self->process_next;
                                     });
-    # this makes net_applet to segfault (mga#9102):
-    #eval { $notification->show };
+    eval { $notification->show };
 }
 
 1;
-- 
cgit v1.2.1


From 9cd2aac40e4703fcd7143dfc7af3e97bd47222b9 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sat, 23 Nov 2013 02:04:10 +0100
Subject: workaround only first notification being displayed

it looks like we only got the 'closed' signal if the user clicks on it
(which is a spec violation:
http://www.galago-project.org/specs/notification/0.9/x408.html#signal-notification-closed)
---
 perl-install/ugtk3.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index b6992bdcf..ce2411820 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1424,7 +1424,10 @@ sub process_next {
 sub add {
     my ($self, $info) = @_;
     push @{$self->{queue}}, $info;
-    @{$self->{queue}} == 1 and $self->show;
+    # We don't always receive the 'closed' signal (especially when not clicked)
+    # and in those case we'll never show the next notifications:
+    #@{$self->{queue}} == 1 and
+    $self->show;
 }
 
 sub show {
-- 
cgit v1.2.1


From 149cccfbd12c2820c55bda4343ff305831a177a6 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sat, 23 Nov 2013 04:36:36 +0100
Subject: add set_popdown_strings API to Gtk3::ComboBoxText

---
 perl-install/ugtk3.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index ce2411820..dad860cb8 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1316,6 +1316,15 @@ sub set_text {
 }
 
 
+package Gtk3::ComboBoxText;
+
+# try to get combox <==> option menu mapping
+*new_with_strings    = *Gtk3::ComboBox::new_with_strings;
+*set_popdown_strings = *Gtk3::ComboBox::set_popdown_strings;
+*get_text = *Gtk3::ComboBox::get_text;
+*set_text = *Gtk3::ComboBox::set_text;
+
+
 package Gtk3::Label;
 sub set {
     my ($label, $text) = @_;
-- 
cgit v1.2.1


From 2f8ee0ef2b920ad8125b34339bce7b4f241e2812 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Thu, 28 Nov 2013 13:21:02 +0100
Subject: use new Toolbar API (mga#11791)

old toolbar API is no more available:
Can't locate object method "append_item" via package Gtk3:Toolbar" at
ugtk3.pm line 954
---
 perl-install/ugtk3.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index dad860cb8..ce3db3e31 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -951,7 +951,8 @@ sub ask_browse_tree_info {
     }
     my %toolbar = @toolbar;
     foreach (grep_index { $::i % 2 == 0 } @toolbar) {
-	$toolbar->append_item(undef, $toolbar{$_}[0], undef, gtkcreate_img("$_.png"), $toolbar{$_}[1]);
+	my $t = gtknew('ToolButton', tooltip => $toolbar{$_}[0], file => "$_.png", clicked => $toolbar{$_}[1]);
+	$toolbar->insert($t, -1);
     }
 
     $pixcolumn->{is_pix} = 1;
-- 
cgit v1.2.1


From f13a8c6e1a5b9ea7bbc0e8c824ff73279359a7a3 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Thu, 28 Nov 2013 13:40:24 +0100
Subject: align banner text to left instead of centering it

This was though better when reinventing banners in gtk3. However:
- mcc is still gtk2 and it display a left aligned banner for embedded
  tools
- it can be seen as a regression
---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index ce3db3e31..bbca18213 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1383,7 +1383,7 @@ sub new {
 
     my $img = gtknew('Image', pixbuf => $blue_part, alignment => [ 0, 0 ]);
 
-    my $label = gtknew('Label', text => $text); # for update_text()
+    my $label = gtknew('Label', text => $text, padding => [ 100, 0 ], alignment => [ 0, 0.5 ]); # for update_text()
     my $w = gtknew('Overlay', height => $d_height, main_child => $label, children => [
 		       gtknew('Overlay', main_child => $img, children => [
 				  my $icon_img = gtknew('Image', pixbuf => $icon, alignment => [ 0, 0 ]),
-- 
cgit v1.2.1


From ac770b60cddb20587a87bafb35b61c6810a0bf42 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Thu, 28 Nov 2013 14:03:26 +0100
Subject: banners text is rendered as blue again

in commit f5ed08a589bc9081c68188c464a5a978557d0b2a, we mistakely removed
the widget name...
---
 perl-install/ugtk3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index bbca18213..8f8fdcc21 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -1384,7 +1384,7 @@ sub new {
     my $img = gtknew('Image', pixbuf => $blue_part, alignment => [ 0, 0 ]);
 
     my $label = gtknew('Label', text => $text, padding => [ 100, 0 ], alignment => [ 0, 0.5 ]); # for update_text()
-    my $w = gtknew('Overlay', height => $d_height, main_child => $label, children => [
+    my $w = gtknew('Overlay', height => $d_height, widget_name => 'Banner', main_child => $label, children => [
 		       gtknew('Overlay', main_child => $img, children => [
 				  my $icon_img = gtknew('Image', pixbuf => $icon, alignment => [ 0, 0 ]),
 			      ])
-- 
cgit v1.2.1


From 265ce1285a10e4da33853758197a5fb7b02778dd Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 29 Nov 2013 12:41:58 +0100
Subject: make shrinking window work again (eg: draknfs)

---
 perl-install/ugtk3.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 8f8fdcc21..445c50780 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -765,8 +765,7 @@ sub sync {
 sub flush() { gtkflush() }
 sub shrink_topwindow {
     my ($o) = @_;
-    warn "NOT IMPLEMENTED !!!!\n"; return;
-    $o->{real_window}->signal_emit('size_allocate', Gtk3::Gdk::Rectangle->new(-1, -1, -1, -1));
+    $o->{real_window}->resize(1, 1);
 }
 sub exit {
     gtkset_mousecursor_normal(); #- for restoring a normal in any case
-- 
cgit v1.2.1


From 04cc12c27f9aabca5af41ca25d6d082831bd8ec1 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 6 Dec 2013 15:05:00 +0100
Subject: fix a crash in rpmdrake when package list is empty (mga#11901)

---
 perl-install/ugtk3.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'perl-install/ugtk3.pm')

diff --git a/perl-install/ugtk3.pm b/perl-install/ugtk3.pm
index 445c50780..24447d236 100644
--- a/perl-install/ugtk3.pm
+++ b/perl-install/ugtk3.pm
@@ -242,6 +242,7 @@ sub gtktreeview_children {
     my @l;
     $model or return;
     my $p = $model->iter_children($iter);
+    $p or return;
     while ($model->iter_next($p)) {
 	push @l, $p->copy;
     }
-- 
cgit v1.2.1