diff options
Diffstat (limited to 'perl-install/ugtk2.pm')
| -rw-r--r-- | perl-install/ugtk2.pm | 576 |
1 files changed, 332 insertions, 244 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 115203dbf..09f877c9f 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -3,6 +3,7 @@ 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 = ( @@ -15,16 +16,17 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @icon_paths $wm_icon $grab $border); #- gtkset_text gtkset_tip gtkset_visibility gtksetstyle gtkshow gtksignal_connect gtksize gtktext_append gtktext_insert ) ], - helpers => [ qw(add2notebook add_icon_path fill_tiled fill_tiled_coords gtkcolor gtkcreate_img - gtkcreate_pixbuf gtkfontinfo gtkset_background n_line_size set_back_pixbuf set_back_pixmap - string_size string_width string_height wrap_paragraph) ], + 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 ) ], + ask_yesorno) ], dialogs => [ qw(err_dialog info_dialog warn_dialog) ], ); @@ -37,7 +39,6 @@ use common; use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version use Gtk2; -use Gtk2::Gdk::Keysyms; $border = 5; @@ -129,9 +130,9 @@ sub gtkappend_page { } sub gtkentry { - my ($text) = @_; + my ($o_text) = @_; my $e = gtknew('Entry'); - $text and $e->set_text($text); + $o_text and $e->set_text($o_text); $e; } @@ -144,7 +145,11 @@ sub gtksetstyle { sub gtkradio { my $def = shift; my $radio; - map { gtkset_active($radio = Gtk2::RadioButton->new_with_label($radio ? $radio->get_group : undef, $_), $_ eq $def) } @_; + 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() } @@ -207,10 +212,10 @@ sub gtkpowerpack { #- 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; + member(ref($_[0]), qw(HASH ARRAY)) and $attrs = shift; foreach (@attributes_list) { if (($default_attrs->{$_} || '') eq 'arg') { - ref($_[0]) and die "error in packing definition\n"; + 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->{$_})) { @@ -235,7 +240,7 @@ sub gtkpowerpack { sub gtktreeview_children { my ($model, $iter) = @_; my @l; - $model && $iter or return; + $model or return; for (my $p = $model->iter_children($iter); $p; $p = $model->iter_next($p)) { push @l, $p; } @@ -268,22 +273,8 @@ sub create_adjustment { sub create_scrolled_window { my ($W, $o_policy, $o_viewport_shadow) = @_; - my $w = Gtk2::ScrolledWindow->new(undef, undef); - $w->set_policy($o_policy ? @$o_policy : ('automatic', 'automatic')); - if (member(ref($W), qw(Gtk2::Layout Gtk2::Html2::View Gtk2::Text Gtk2::TextView Gtk2::TreeView))) { - $w->add($W); - } else { - $w->add_with_viewport($W); - } - $o_viewport_shadow and gtkset_shadow_type($w->child, $o_viewport_shadow); - $W->can('set_focus_vadjustment') and $W->set_focus_vadjustment($w->get_vadjustment); - $W->set_left_margin(6) if ref($W) =~ /Gtk2::TextView/; - $W->show; - if (ref($W) =~ /Gtk2::TextView|Gtk2::TreeView/) { - gtknew('Frame', shadow_type => 'in', child => $w); - } else { - $w; - } + 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 { @@ -293,6 +284,44 @@ sub n_line_size { 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/'/'/) 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 = ('&' => '&', + '<' => '<', + '>' => '>', + ); + 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) = @_; @@ -311,46 +340,28 @@ sub create_box_with_title { my $has_scroll = $o->{box_size} < $wanted; chomp(my $text = join("\n", @l)); - my $wtext = gtknew('TextView', text => $text); - $wtext->set_left_margin(3); + 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); - $wtext->signal_connect(button_press_event => sub { 1 }); #- disable selecting text and popping the contextual menu (GUI team says it's *horrible* to be able to do select text!) 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, ($layout->get_pixel_size)[1] + 10)); - $scroll->set_size_request($width, min(200, ($layout->get_pixel_size)[1] + 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; }); gtkpack_($box, $o->{box_allow_grow} || 0, $scroll); } else { - my $a = !$::no_separator; - undef $::no_separator; my $new_label = sub { my ($txt) = @_; - ref($txt) ? $txt : gtknew('WrappedLabel', text => $txt); + ref($txt) ? $txt : gtknew('WrappedLabel', text_markup => $txt, + # workaround infamous 6 years old gnome bug #101968: + width => mygtk2::get_label_width()); }; - if ($o->{icon} && (!$::isWizard || $::isInstall)) { - gtkpack__($box, - gtknew('HBox', children => [ - 0, gtknew('VBox', width => 15), - 0, eval { gtkcreate_img($o->{icon}) }, - 0, gtknew('VBox', width => 15), - 1, $o->{box_title} = gtknew('VBox', children_loose => [ - gtknew('HBox', children => [ - (map { - my $w = $new_label->($_); - $::isWizard and $w->set_justify("left"); - (0, $w); - } @l), - 1, gtknew('HBox'), - ]) ]) - ]), - if_($a, gtknew('HSeparator')) - ); - } else { gtkpack__($box, if_($::isWizard, gtknew('Label', height => 10)), (map { @@ -359,9 +370,7 @@ sub create_box_with_title { : $w; } @l), if_($::isWizard, gtknew('Label', height => 15)), - if_($a, gtknew('HSeparator')), ); - } } } @@ -385,6 +394,9 @@ sub _create_dialog { 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); @@ -492,6 +504,7 @@ sub create_packtable { 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) @@ -510,8 +523,15 @@ sub create_okcancel { $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 => N("Cancel"), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall; - my $f = sub { $w->{buttons}{$_[0][0]} = gtknew('Button', text => $_[0][0], clicked => $_[0][1]) }; + $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 && (member($wm, qw(kwin 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), @@ -519,15 +539,15 @@ sub create_okcancel { # 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) { + if ($::isWizard || $w->{pop_it}) { # wizard mode: order is cancel/left_extras/white/right_extras/prev/next - unshift @left, $w->{wizcancel} if !$::isInstall; + unshift @left, $w->{wizcancel} if $w->{wizcancel}; push @right, $bprev, $bok; } else { # normal mode: cancel/ok button follow GNOME's HIG - unshift @left, $bprev; + 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, $bok; + push @right, ($wm_is_kde ? $bprev : $bok); } gtknew('VBox', spacing => 5, children_loose => [ @@ -535,7 +555,7 @@ sub create_okcancel { gtknew('HSeparator'), gtknew('HBox', children_loose => [ map { - gtknew('HButtonBox', layout => $_->[1], + gtknew('HButtonBox', spacing => 5, layout => $_->[1], children_loose => [ map { $_->can_default($::isWizard); @@ -596,12 +616,14 @@ sub _find_imgfile { # use it if you want to display an icon/image in your app sub gtkcreate_img { - gtknew('Image', file => $_[0]); + 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 { - gtknew('Pixbuf', file => $_[0]); + my ($file, $o_size) = @_; + gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size)); } sub gtktext_append { gtktext_insert(@_, append => 1) } @@ -653,7 +675,7 @@ sub set_back_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, 'none', 0, 0); + $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); } @@ -669,28 +691,6 @@ sub set_back_pixmap { $window->set_back_pixmap($pixmap); } -sub fill_tiled_coords { - my ($widget, $pixbuf, $x_back, $y_back, $width, $height) = @_; - my ($x2, $y2) = (0, 0); - while (1) { - $x2 = 0; - while (1) { - $pixbuf->render_to_drawable($widget->window, $widget->style->fg_gc('normal'), - 0, 0, $x2, $y2, $x_back, $y_back, 'none', 0, 0); - $x2 += $x_back; - $x2 >= $width and last; - } - $y2 += $y_back; - $y2 >= $height and last; - } -} - -sub fill_tiled { - my ($widget, $pixbuf) = @_; - my ($window_width, $window_height) = $widget->window->get_size; - fill_tiled_coords($widget, $pixbuf, $pixbuf->get_width, $pixbuf->get_height, $window_width, $window_height); -} - sub add2notebook { my ($n, $title, $book) = @_; $n->append_page($book, gtkshow(gtknew('Label', text => $title))); @@ -710,117 +710,13 @@ sub string_width { $width; } -sub string_height { - my ($widget, $text) = @_; - my (undef, $height) = string_size($widget, $text); - $height; -} - -sub get_text_coord { - my ($text, $widget4style, $max_width, $currentx, $currenty) = @_; - my $wrap_char = ' '; - my @lines; - my $current_text; - my @t = split($wrap_char, $text); - my @t2; - if ($::isInstall && $::o->{locale}{lang} =~ /ja|zh/) { - use locale; - @t = map { $_ . $wrap_char } @t; - $wrap_char = ''; - foreach (@t) { - my @c = split(/\b/); - my $i = 0; - my $el = ''; - while (1) { - $i >= @c and last; - $el .= $c[$i]; - if (ord($c[$i]) >= 128) { $el .= $c[$i+1]; $i++; push @t2, $el; $el = '' } - $i++; - } - $el ne '' and push @t2, $el; - } - } else { - @t2 = @t; - } - my $add_line = sub { - my ($w, $h) = string_size($widget4style, $current_text); - push @lines, { text => $current_text, width => $w, height => $h + 1, 'x' => $currentx, 'y' => $currenty }; - }; - my $width; - foreach my $word (@t2) { - my $w = string_width($widget4style, $word . $wrap_char); - if ($currentx + $width + $w > $max_width) { - $add_line->(); - $current_text = $word; - $width = $w; - $currentx = 0; - $currenty += $lines[-1]{height}; - } else { - $current_text .= ($current_text ne '' ? $wrap_char : '') . $word; - $width += $w; - } - } - #- if wrap_char was at the end, do not forget it, for cases when bold/nonbold text follows - $text =~ /$wrap_char$/ and $current_text .= $wrap_char; - $add_line->(); - - return @lines; -} - -sub wrap_paragraph { - my ($text, $widget4style, $border, $max_width) = @_; - - $max_width -= 2*$border; - my @lines; - my $ydec; - - foreach my $paragraph (@$text) { - my @paragraph_lines; - my $center; - if (ref($paragraph) eq 'ARRAY') { - my ($text, %options) = @$paragraph; - $center = $options{center}; - $paragraph = $text; - } - if ($paragraph ne '') { - my @elements; - while ($paragraph =~ m|(.*?)<b>(.*?)</b>(.*)|) { - $1 ne '' and push @elements, [ $1, bold => 0 ]; - push @elements, [ $2, bold => 1 ]; - $paragraph = $3; - } - $paragraph ne '' and push @elements, [ $paragraph, bold => 0 ]; - - my $currentx; - foreach (@elements) { - my ($text, %options) = @$_; - #- hack :( if ' ' is at the beginning, do not forget it, substitute - #- with an unbreakable space because gtk allocates too much space otherwise - if ($text =~ /^ (.*)/) { - use utf8; - $text = ' ' . $1; - } - my @newlines = get_text_coord($text, $widget4style, $max_width, $currentx, $ydec); - $currentx = $newlines[-1]{'x'} + $newlines[-1]{width}; - $ydec = $newlines[-1]{'y'}; - $options{bold} and $currentx++; - $_->{options} = \%options foreach @newlines; - push @paragraph_lines, @newlines; - } - $ydec = $paragraph_lines[-1]{'y'} + $paragraph_lines[-1]{height}; - } - if ($center) { - my %widths; - $widths{$_->{'y'}} ||= $_->{x} + $_->{width} foreach reverse @paragraph_lines; - $_->{x} += ($max_width - $widths{$_->{'y'}})/2 foreach @paragraph_lines; - } - $_->{x} += $border foreach @paragraph_lines; - push @lines, @paragraph_lines; - } - return @lines; +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 @@ -837,15 +733,23 @@ sub new { 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}, - child => gtknew('VBox'), - modal => $grab || $o->{grab} || $o->{modal}, + $::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} && $o->{transient} =~ /Gtk2::Window/, transient_for => $o->{transient}), + 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}; @@ -856,7 +760,6 @@ sub new { sub main { my ($o, $o_completed, $o_canceled) = @_; - gtkset_mousecursor_normal(); $o->show; mygtk2::main($o->{rwindow}, @@ -884,7 +787,6 @@ sub shrink_topwindow { $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; @@ -1012,15 +914,26 @@ sub ask_browse_tree_info { gtkadd($w->{window}, gtknew('VBox', spacing => 5, children => [ - 0, $common->{message}, - 1, gtknew('HBox', children_loose => [ - gtknew('ScrolledWindow', child => $tree), - gtknew('Frame', text => N("Info"), child => - gtknew('ScrolledWindow', child => my $info = gtknew('TextView')), + 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, my $box1 = gtknew('HBox', spacing => 15), + 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); @@ -1037,24 +950,13 @@ sub ask_browse_tree_info { } @l; @buttons = reverse @buttons if !$::isInstall; - gtkpack__($box2, gtknew('Button', text => N("Help"), clicked => sub { - ask_warn(N("Help"), $common->{interactive_help}->()); - })) if $common->{interactive_help}; - - if ($common->{auto_deps}) { - gtkpack__($box1, gtknew('CheckButton', text => $common->{auto_deps}, active_ref => \$common->{state}{auto_deps})); - } - $box1->pack_end(my $status = gtknew('Label'), 0, 1, 20); $status->show; - $w->{window}->set_size_request(map { $_ - 2 * $border - 4 } $::windowwidth, $::windowheight) if !$::isInstall; + $w->{window}->set_size_request(map { $_ - 2 * $border - 4 } $w->{windowwidth}, $w->{windowheight}) if !$::isInstall; $buttons[0]->grab_focus; $w->{rwindow}->show; - #- TODO: $tree->queue_draw is a workaround to a bug in gtk-2.2.1; submit it in their bugzilla - my @toolbar = (ftout => [ N("Expand Tree"), sub { $tree->expand_all; $tree->queue_draw } ], - ftin => [ N("Collapse Tree"), sub { $tree->collapse_all } ], - reload => [ N("Toggle between flat and group sorted"), sub { invbool(\$common->{state}{flat}); $common->{rebuild_tree}->() } ]); + my @toolbar; foreach my $ic (@{$common->{icons} || []}) { push @toolbar, ($ic->{icon} => [ $ic->{help}, sub { if ($ic->{code}) { @@ -1070,7 +972,7 @@ sub ask_browse_tree_info { } $pixcolumn->{is_pix} = 1; - $common->{widgets} = { w => $w, tree => $tree, tree_model => $tree_model, textcolumn => $textcolumn, pixcolumn => $pixcolumn, + $common->{widgets} = { w => $w, tree => $tree, tree_model => $tree_model, info => $info, status => $status }; ask_browse_tree_info_given_widgets($common); } @@ -1218,7 +1120,7 @@ sub ask_browse_tree_info_given_widgets { }; $common->{display_info} = sub { gtktext_insert($w->{info}, $common->{get_info}($curr)); 0 }; - my $children = sub { map { my $v = $w->{tree_model}->get($_, 0); $v } gtktreeview_children($w->{tree_model}, $_[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)); @@ -1241,7 +1143,7 @@ sub ask_browse_tree_info_given_widgets { $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 ' ') { + if ($_[1]->keyval >= 0x100 ? member($c, "\r", "\x8d") : $c eq ' ') { $toggle->(0); } 0; @@ -1250,7 +1152,10 @@ sub ask_browse_tree_info_given_widgets { $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 ($idle) { + Glib::Source->remove($idle); + undef $idle; + } if (!$model->iter_has_child($iter)) { $curr = $model->get($iter, 0); @@ -1292,10 +1197,10 @@ sub gtk_set_treelist { sub gtk_TextView_get_log { - my ($log_w, $log_scroll, $command, $filter_output, $when_command_is_over) = @_; + my ($log_w, $command, $filter_output, $when_command_is_over) = @_; my $pid = open(my $F, "$command |") or return; - fcntl($F, c::F_SETFL(), c::O_NONBLOCK()) or die "can not fcntl F_SETFL: $!"; + common::nonblock($F); my $gtk_buffer = $log_w->get_buffer; $log_w->signal_connect(destroy => sub { @@ -1303,17 +1208,13 @@ sub gtk_TextView_get_log { $pid = $gtk_buffer = ''; #- ensure $gtk_buffer is valid when its value is non-null }); - my ($prev_scroll, $want_scroll_down) = (0, 1); 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)); } - my $new_scroll = $log_scroll->get_vadjustment->get_value; - $want_scroll_down &&= $new_scroll >= $prev_scroll; - $prev_scroll = $new_scroll; - $log_w->scroll_to_iter($end, 0, 0, 0, 0) if $want_scroll_down; + $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 @@ -1332,8 +1233,8 @@ 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); #- $log_scroll is a frame, not a ScrolledWindow, so giving $log_scroll->child - my $pid = gtk_TextView_get_log($log_w, $log_scroll->child, $command, $filter_output, $when_command_is_over) or return; + 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; } @@ -1410,7 +1311,7 @@ sub toggle_expansion { # compatible with Combo since its API is quite nice. package Gtk2::OptionMenu; -use common; +use MDK::Common; # try to get combox <==> option menu mapping sub set_popdown_strings { @@ -1456,7 +1357,7 @@ sub set_text { package Gtk2::ComboBox; -use common; +use MDK::Common; # try to get combox <==> option menu mapping sub set_popdown_strings { @@ -1519,25 +1420,38 @@ sub new_with_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_pixmap($darea); + 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} = ($darea->{layout}->get_pixel_size)[0]; + $darea->{txt_width} = first($darea->{layout}->get_pixel_size); + $darea->queue_draw; } sub new { my ($_class, $icon, $text, $o_options) = @_; - my $darea = Gtk2::DrawingArea->new; - my $d_height = 75; + 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(common::N("_banner font:\nSans 14"))); - $darea->{icon} = ugtk2::gtkcreate_pixbuf($icon); + $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(); @@ -1547,13 +1461,22 @@ sub new { $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_icon = $is_rtl ? $d_width - $padding - $darea->{icon}->get_width : $padding; - my $x_text = $is_rtl ? $x_icon - $padding - $darea->{txt_width} : $height + $padding*2; + my $x_blue = $is_rtl ? $d_width - $blue_width : 0; + my $x_icon = $is_rtl ? $d_width - 12 - $width : 12; + # here: 10 is the amount of padding (white background) wish to add betwen text & blue background: + my $x_text = $is_rtl ? $d_width - $blue_width - 10 - $darea->{txt_width} : $blue_width + 10; + $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->text_gc('normal'), $x_text, $o_options->{txt_ypos} || 25, + $darea->window->draw_layout($style->fg_gc('normal'), $x_text, + $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2, $darea->{layout}); 1; }); @@ -1561,5 +1484,170 @@ sub new { 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; |