summaryrefslogtreecommitdiffstats
path: root/perl-install/ugtk2.pm
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/ugtk2.pm')
-rw-r--r--perl-install/ugtk2.pm37
1 files changed, 20 insertions, 17 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 05e361253..09f877c9f 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -212,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";
@@ -523,11 +523,11 @@ 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 => ($::Wizard_skip ? N("Skip") : N("Cancel")), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall && !$::Wizard_no_cancel;;
+ $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;
+ $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] :
@@ -748,7 +748,7 @@ sub new {
if_(!$::isInstall, icon_no_error => wm_icon()),
if_($o->{transient}, transient_for => $o->{transient}),
);
- push @::main_windows, $::main_window = $window->{real_window} if !$opts{do_not_track_main_window};
+ 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;
@@ -760,7 +760,6 @@ sub new {
sub main {
my ($o, $o_completed, $o_canceled) = @_;
- gtkset_mousecursor_normal();
$o->show;
mygtk2::main($o->{rwindow},
@@ -788,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;
@@ -1145,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;
@@ -1154,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);
@@ -1310,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 {
@@ -1356,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 {
@@ -1448,6 +1449,7 @@ sub new {
$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;
@@ -1466,8 +1468,8 @@ sub new {
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;
+ # 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);
@@ -1516,7 +1518,7 @@ sub calc_size {
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);
@@ -1540,7 +1542,7 @@ 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();
@@ -1605,8 +1607,8 @@ sub add {
sub show {
my ($self) = @_; # perl_checker: $self = Gtk2::Notify->new
my $info = $self->{queue}[0];
- my $notification = Gtk2::Notify->new_with_status_icon($info->{title}, $info->{message}, undef, $self->{statusicon});
- $notification->set_icon_from_pixbuf($info->{pixbuf});
+ 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(
@@ -1622,7 +1624,8 @@ sub show {
$info->{timeout}->() if $info->{timeout};
$self->process_next;
});
- eval { $notification->show };
+ # this makes net_applet to segfault (mga#9102):
+ #eval { $notification->show };
}
1;
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-31 12:18:31 +0000