diff options
Diffstat (limited to 'perl-install/ugtk2.pm')
| -rw-r--r-- | perl-install/ugtk2.pm | 195 |
1 files changed, 115 insertions, 80 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index e88282175..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 = ( @@ -38,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; @@ -145,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() } @@ -208,7 +212,7 @@ 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 internal_error "error in packing definition\n"; @@ -308,8 +312,7 @@ sub markup_to_TextView_format { if ($attrs) { $attrs->{weight} eq 'bold' and $attrs->{weight} = do { require Gtk2::Pango; Gtk2::Pango->PANGO_WEIGHT_BOLD }; $attrs->{size} eq 'larger' and do { - require Gtk2::Pango; - $attrs->{scale} = Gtk2::Pango->PANGO_SCALE_X_LARGE; # equivalent to Label's size => 'larger' + $attrs->{scale} = Gtk2::Pango->scale_x_large; # equivalent to Label's size => 'larger' delete $attrs->{size}; }; } @@ -338,22 +341,26 @@ sub create_box_with_title { chomp(my $text = join("\n", @l)); my $wtext = gtknew('TextView', text => markup_to_TextView_format($text)); - $wtext->set_left_margin(3); + $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, ($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 $new_label = sub { my ($txt) = @_; - ref($txt) ? $txt : gtknew('WrappedLabel', text_markup => $txt, width=> 490); + 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)), @@ -516,12 +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; + $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; - $wm_is_kde = !$::isInstall && any::running_window_manager() eq "kwin" || 0; + 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]} = gtknew('Button', text => $_[0][0], clicked => $_[0][1]) }; + 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), @@ -529,9 +539,9 @@ 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 @@ -545,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); @@ -613,7 +623,7 @@ sub gtkcreate_img { # use it if you want to draw an image onto a drawingarea sub gtkcreate_pixbuf { my ($file, $o_size) = @_; - gtknew('Pixbuf', file => $_[0], if_($o_size, size => $o_size)); + gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size)); } sub gtktext_append { gtktext_insert(@_, append => 1) } @@ -665,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); } @@ -701,12 +711,12 @@ sub string_width { } -my ($def_step_icon, $def_step_title); +my ($def_step_title); sub set_default_step_items { - ($def_step_icon, $def_step_title) = @_; + $def_step_title = translate($_[0]); } -sub get_default_step_items { ($def_step_icon, $def_step_title) } +sub get_default_step_items { ($def_step_title) } # -=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=---=-=--- # toplevel window creation helper @@ -723,20 +733,22 @@ sub new { my $o = bless { %opts }, $type; while (my $e = shift @tempory::objects) { $e->destroy } - my $icon = find { _find_imgfile($_) } $opts{icon}, (get_default_step_items())[0], 'banner-generic-ad'; + 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 => Gtk2::Banner->new($icon, $title || (get_default_step_items())[1])) : (), + $::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 => $opts{modal} || $grab || $o->{grab} || $o->{modal} || $o->{transient}, + 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; @@ -748,7 +760,6 @@ sub new { sub main { my ($o, $o_completed, $o_canceled) = @_; - gtkset_mousecursor_normal(); $o->show; mygtk2::main($o->{rwindow}, @@ -776,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; @@ -904,18 +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', editable => 0)), + 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); @@ -932,19 +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}; - $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 = (ftout => [ N("Expand Tree"), sub { $tree->expand_all } ], - 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}) { @@ -1131,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; @@ -1140,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); @@ -1296,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 { @@ -1342,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 { @@ -1405,14 +1420,21 @@ 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; } @@ -1420,12 +1442,16 @@ sub set_pixmap { sub new { my ($_class, $icon, $text, $o_options) = @_; - my $darea = Gtk2::DrawingArea->new; - $darea->set_name('Banner') if $::isInstall; - my $d_height = $::isInstall ? 45 : 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("Sans Bold 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(); @@ -1440,11 +1466,17 @@ sub new { (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 - $width : $padding; - my $x_text = $is_rtl ? $x_icon - $padding - $darea->{txt_width} : $width + $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->fg_gc('normal'), $x_text, $o_options->{txt_ypos} || $::isInstall && 13 || $d_height/3, + $darea->window->draw_layout($style->fg_gc('normal'), $x_text, + $o_options->{txt_ypos} || ($d_height - $darea->{layout_height})/2, $darea->{layout}); 1; }); @@ -1478,15 +1510,15 @@ sub calc_size { my ($width, $height) = $layout->get_pixel_size; my ($pwidth, $pheight) = pixbuf_size($cell); - return (0, 0, + return 0, 0, $width + $x_padding * 3 + $pwidth, - max($pheight, $height + $y_padding * 2)); + max($pheight, $height + $y_padding * 2); } sub GET_SIZE { my ($cell, $widget, $_cell_area) = @_; - my $layout = $cell->get_layout($widget); + my $layout = get_layout($cell, $widget); $layout->set_text($cell->get('label')); return calc_size($cell, $layout); @@ -1510,11 +1542,11 @@ sub RENDER { # not that efficient... : 'normal'; } - my $layout = $cell->get_layout($widget); + my $layout = get_layout($cell, $widget); $layout->set_text($cell->get('label')); my $is_rtl = lang::text_direction_rtl(); - my $txt_width = ($layout->get_pixel_size)[0]; + my $txt_width = first($layout->get_pixel_size); my ($x_offset, $y_offset, $_width, $_height) = calc_size($cell, $layout); my $pixbuf = $cell->get('pixbuf'); @@ -1543,41 +1575,26 @@ sub RENDER { # not that efficient... 1; -package Gtk2::NotificationBubble::Queue; +package Gtk2::Notify::Queue; sub new { - my ($class) = @_; + my ($class, $statusicon) = @_; - require Gtk2::NotificationBubble; + require Gtk2::Notify; my $self = bless { - bubble => Gtk2::NotificationBubble->new, queue => [], + statusicon => $statusicon, display => 5000, delay => 500, }, $class; - $self->{bubble}->signal_connect(timeout => sub { - my $info = $self->{queue}[0]; - $info->{timeout}->() if $info->{timeout}; - $self->process_next; - }); - $self->{bubble}->signal_connect(clicked => sub { - $self->{bubble}->hide; - my $info = $self->{queue}[0]; - if ($info->{clicked}) { - #- has to call process_next when done - $info->{clicked}->(); - } else { - $self->process_next; - } - }); $self; } sub process_next { my ($self) = @_; shift @{$self->{queue}}; - #- wait for some time so that the new bubble is noticeable + #- wait for some time so that the new notification is noticeable @{$self->{queue}} and Glib::Timeout->add($self->{delay}, sub { $self->show; 0 }); } @@ -1588,10 +1605,27 @@ sub add { } sub show { - my ($self) = @_; # perl_checker: $self = Gtk2::NotificationBubble->new + my ($self) = @_; # perl_checker: $self = Gtk2::Notify->new my $info = $self->{queue}[0]; - $self->{bubble}->set($info->{title}, Gtk2::Image->new_from_pixbuf($info->{pixbuf}), $info->{message}); - $self->{bubble}->show($self->{display}); + 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; @@ -1602,7 +1636,8 @@ package Gtk2::GUI_Update_Guard; use MDK::Common::Func qw(before_leaving); use ugtk2; -sub new() { +sub new { + my ($_class) = @_; # prevent a perl_checker warning in callers my $old_signal = $SIG{ALRM}; $SIG{ALRM} = sub { ugtk2::gtkflush(); |