summaryrefslogtreecommitdiffstats
path: root/perl-install/mygtk2.pm
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/mygtk2.pm')
-rw-r--r--perl-install/mygtk2.pm928
1 files changed, 808 insertions, 120 deletions
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm
index 2dee5daca..6633decf3 100644
--- a/perl-install/mygtk2.pm
+++ b/perl-install/mygtk2.pm
@@ -2,6 +2,7 @@ package mygtk2;
use diagnostics;
use strict;
+use feature 'state';
our @ISA = qw(Exporter);
our @EXPORT = qw(gtknew gtkset gtkadd gtkval_register gtkval_modify);
@@ -11,17 +12,20 @@ use log;
use common;
use Gtk2;
-use Gtk2::Gdk::Keysyms;
-unless ($::no_ugtk_init) {
+sub init() {
!check_for_xserver() and print("Cannot be run in console mode.\n"), c::_exit(0);
$::one_message_has_been_translated and warn("N() was called from $::one_message_has_been_translated BEFORE gtk2 initialisation, replace it with a N_() AND a translate() later.\n"), c::_exit(1);
Gtk2->init;
- c::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', @::textdomains;
- $::need_utf8_i18n = 1;
+ Locale::gettext::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', if_(!$::isInstall, 'libDrakX-standalone'),
+ if_($::isRestore, 'draksnapshot'), if_($::isInstall, 'urpmi'),
+ 'drakx-net', 'drakx-kbd-mouse-x11', # shared translation
+ @::textdomains;
+ Glib->enable_exceptions2;
}
-Gtk2->croak_execeptions if (!$::no_ugtk_init || $::isInstall) && 0.95 < $Gtk2::VERSION;
+init() unless $::no_ugtk_init;
+Glib->enable_exceptions2 if $::isInstall;
@@ -112,41 +116,73 @@ sub _gtk {
$w->can_focus(delete $opts->{can_focus}) if exists $opts->{can_focus};
$w->can_default(delete $opts->{can_default}) if exists $opts->{can_default};
$w->grab_focus if delete $opts->{grab_focus};
+ $w->set_padding(@{delete $opts->{padding}}) if exists $opts->{padding};
+ $w->set_sensitive(delete $opts->{sensitive}) if exists $opts->{sensitive};
+ $w->signal_connect(expose_event => delete $opts->{expose_event}) if exists $opts->{expose_event};
+ $w->signal_connect(realize => delete $opts->{realize}) if exists $opts->{realize};
(delete $opts->{size_group})->add_widget($w) if $opts->{size_group};
if (my $tip = delete $opts->{tip}) {
$global_tooltips ||= Gtk2::Tooltips->new;
$global_tooltips->set_tip($w, $tip);
}
+ #- WARNING: hide_ref and show_ref are not effective until you gtkval_modify the ref
+ if (my $hide_ref = delete $opts->{hide_ref}) {
+ gtkval_register($w, $hide_ref, sub { $$hide_ref ? $w->hide : $w->show });
+ } elsif (my $show_ref = delete $opts->{show_ref}) {
+ gtkval_register($w, $show_ref, sub { $$show_ref ? $w->show : $w->hide });
+ }
+
+ if (my $sensitive_ref = delete $opts->{sensitive_ref}) {
+ my $set = sub { $w->set_sensitive($$sensitive_ref) };
+ gtkval_register($w, $sensitive_ref, $set);
+ $set->();
+ }
+
if (%$opts && !$opts->{allow_unknown_options}) {
internal_error("$action $class: unknown option(s) " . join(', ', keys %$opts));
}
$w;
}
+sub _gtk__Install_Button {
+ my ($w, $opts, $_class) = @_;
+ $opts->{child} = gtknew('HBox', spacing => 5,
+ children_tight => [
+ # FIXME: not RTL compliant (lang::text_direction_rtl() ? ...)
+ gtknew('Image', file => 'advanced_expander'),
+ gtknew('Label', text => delete $opts->{text}),
+ ],
+ );
+ $opts->{relief} = 'none';
+ _gtk__Button($w, $opts, 'Button');
+}
sub _gtk__Button { &_gtk_any_Button }
sub _gtk__ToggleButton { &_gtk_any_Button }
sub _gtk__CheckButton { &_gtk_any_Button }
+sub _gtk__RadioButton { &_gtk_any_Button }
sub _gtk_any_Button {
my ($w, $opts, $class) = @_;
if (!$w) {
- if (!$opts->{image}) {
- add2hash_($opts, { mnemonic => 1 });
+ my @radio_options;
+ if ($class eq 'RadioButton') {
+ @radio_options = delete $opts->{group};
}
- $w = $opts->{image} ? "Gtk2::$class"->new :
- delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_mnemonic(delete $opts->{text} || '') :
- "Gtk2::$class"->new_with_label(delete $opts->{text} || '');
+ $w = $opts->{child} ? "Gtk2::$class"->new(@radio_options) :
+ delete $opts->{mnemonic} ? "Gtk2::$class"->new_with_mnemonic(@radio_options, delete $opts->{text} || '') :
+ $opts->{text} ? "Gtk2::$class"->new_with_label(@radio_options, delete $opts->{text} || '') :
+ "Gtk2::$class"->new(@radio_options);
$w->{format} = delete $opts->{format} if exists $opts->{format};
}
- if (my $image = delete $opts->{image}) {
- $w->add($image);
- $image->show;
+ if (my $widget = delete $opts->{child}) {
+ $w->add($widget);
+ $widget->show;
}
- $w->set_sensitive(delete $opts->{sensitive}) if exists $opts->{sensitive};
+ $w->set_image(delete $opts->{image}) if exists $opts->{image};
$w->set_relief(delete $opts->{relief}) if exists $opts->{relief};
if (my $text_ref = delete $opts->{text_ref}) {
@@ -157,6 +193,9 @@ sub _gtk_any_Button {
$set->();
} elsif (exists $opts->{text}) {
$w->set_label(delete $opts->{text});
+ } elsif (exists $opts->{stock}) {
+ $w->set_label(delete $opts->{stock});
+ $w->set_use_stock(1);
}
if ($class eq 'Button') {
@@ -194,7 +233,7 @@ sub _gtk__CheckMenuItem {
$w;
}
-sub _gtk___SpinButton {
+sub _gtk__SpinButton {
my ($w, $opts) = @_;
if (!$w) {
@@ -214,27 +253,54 @@ sub _gtk__HScale {
if (!$w) {
$opts->{adjustment} ||= do {
- add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1, value => delete $opts->{lower} });
+ add2hash_($opts, { step_increment => 1, page_increment => 5, page_size => 1 });
+ add2hash_($opts, { value => $opts->{lower} }) if !exists $opts->{value};
Gtk2::Adjustment->new(delete $opts->{value}, delete $opts->{lower}, (delete $opts->{upper}) + 1, delete $opts->{step_increment}, delete $opts->{page_increment}, delete $opts->{page_size});
};
$w = Gtk2::HScale->new(delete $opts->{adjustment});
}
+ $w->set_digits(delete $opts->{digits}) if exists $opts->{digits};
+ if (my $value_ref = delete $opts->{value_ref}) {
+ my $set = sub { $w->set_value($$value_ref) };
+ gtkval_register($w, $value_ref, $set);
+ $set->();
+ $w->signal_connect(value_changed => sub {
+ gtkval_modify($value_ref, $w->get_value, $set);
+ });
+ }
$w->signal_connect(value_changed => delete $opts->{value_changed}) if exists $opts->{value_changed};
$w;
}
+sub _gtk__ProgressBar {
+ my ($w, $opts) = @_;
+
+ if (!$w) {
+ $w = Gtk2::ProgressBar->new;
+ }
+
+ if (my $fraction_ref = delete $opts->{fraction_ref}) {
+ my $set = sub { $w->set_fraction($$fraction_ref) };
+ gtkval_register($w, $fraction_ref, $set);
+ $set->();
+ } elsif (exists $opts->{fraction}) {
+ $w->set_fraction(delete $opts->{fraction});
+ }
+
+ $w;
+}
+
sub _gtk__VSeparator { &_gtk_any_simple }
sub _gtk__HSeparator { &_gtk_any_simple }
sub _gtk__Calendar { &_gtk_any_simple }
sub _gtk__DrawingArea {
- my ($w, $opts) = @_;
+ my ($w, $_opts) = @_;
if (!$w) {
$w = Gtk2::DrawingArea->new;
}
- $w->signal_connect(expose_event => delete $opts->{expose_event}) if exists $opts->{expose_event};
$w;
}
@@ -243,30 +309,78 @@ sub _gtk__Pixbuf {
if (!$w) {
my $name = delete $opts->{file} or internal_error("missing file");
- my $file = _find_imgfile($name) or internal_error("can not find $name");
- $w = Gtk2::Gdk::Pixbuf->new_from_file($file);
+ my $file = _find_imgfile($name) or internal_error("cannot find image $name");
+ if (my $size = delete $opts->{size}) {
+ $w = Gtk2::Gdk::Pixbuf->new_from_file_at_scale($file, $size, $size, 1);
+ } else {
+ $w = Gtk2::Gdk::Pixbuf->new_from_file($file);
+ }
+ $w = $w->flip(1) if delete $opts->{flip};
}
$w;
}
+# Image_using_pixmap is rendered using DITHER_MAX which is much better on 16bpp displays
+sub _gtk__Image_using_pixmap { &_gtk__Image }
+# Image_using_pixbuf is rendered using DITHER_MAX & transparency which is much better on 16bpp displays
+sub _gtk__Image_using_pixbuf { &_gtk__Image }
sub _gtk__Image {
my ($w, $opts, $class) = @_;
if (!$w) {
- $w = "Gtk2::$class"->new;
+ $w = Gtk2::Image->new;
$w->{format} = delete $opts->{format} if exists $opts->{format};
+
+ $w->set_from_stock(delete $opts->{stock}, 'button') if exists $opts->{stock};
+
+ $w->{options} = { flip => delete $opts->{flip} };
+
+ $w->{set_from_file} = $class =~ /using_pixmap/ ? sub {
+ my ($w, $file) = @_;
+ my $pixmap = mygtk2::pixmap_from_pixbuf($w, gtknew('Pixbuf', file => $file));
+ $w->set_from_pixmap($pixmap, undef);
+ } : $class =~ /using_pixbuf/ ? sub {
+ my ($w, $file) = @_;
+ my $pixbuf = _pixbuf_render_alpha(gtknew('Pixbuf', file => $file, %{$w->{options}}), 255);
+ my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height);
+ $w->set_size_request($width, $height);
+ $w->{pixbuf} = $pixbuf;
+ $w->signal_connect(expose_event => sub {
+ my (undef, $event) = @_;
+ if (!$w->{x}) {
+ my $alloc = $w->allocation;
+ $w->{x} = $alloc->x;
+ $w->{y} = $alloc->y;
+ }
+ # workaround Gtk+ bug: in installer, first event is not complete and rectables are bogus:
+ if ($::isInstall) {
+ $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'),
+ 0, 0, $w->{x}, $w->{y}, $width, $height, 'max', 0, 0);
+ return;
+ }
+ foreach my $rect ($event->region->get_rectangles) {
+ my @values = $rect->values;
+ $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'),
+ @values[0..1], $w->{x}+$values[0], $w->{y}+$values[1], @values[2..3], 'max', 0, 0);
+ }
+ });
+ } : sub {
+ my ($w, $file, $o_size) = @_;
+ my $pixbuf = gtknew('Pixbuf', file => $file, if_($o_size, size => $o_size), %{$w->{options}});
+ $w->set_from_pixbuf($pixbuf);
+ };
}
if (my $name = delete $opts->{file}) {
- my $file = _find_imgfile(may_apply($w->{format}, $name)) or internal_error("can not find $name");
- $w->set_from_file($file);
+ my $file = _find_imgfile(may_apply($w->{format}, $name)) or internal_error("cannot find image $name");
+ $w->{set_from_file}->($w, $file, delete $opts->{size});
} elsif (my $file_ref = delete $opts->{file_ref}) {
my $set = sub {
- my $file = _find_imgfile(may_apply($w->{format}, $$file_ref)) or internal_error("can not find $$file_ref");
- $w->set_from_file($file);
+ my $file = _find_imgfile(may_apply($w->{format}, $$file_ref)) or internal_error("cannot find image $$file_ref");
+ $w->{set_from_file}->($w, $file, delete $opts->{size});
};
gtkval_register($w, $file_ref, $set);
- $set->();
+ $set->() if $$file_ref;
}
$w;
}
@@ -274,10 +388,26 @@ sub _gtk__Image {
sub _gtk__WrappedLabel {
my ($w, $opts) = @_;
- $opts->{line_wrap} = 1;
+ $opts->{line_wrap} = 1 if !defined $opts->{line_wrap};
+ _gtk__Label($w, $opts);
+}
+
+our $left_padding = 20;
+
+sub _gtk__Label_Left {
+ my ($w, $opts) = @_;
+ $opts->{alignment} ||= [ 0, 0 ];
+ $opts->{padding} ||= [ $left_padding, 0 ];
+ _gtk__WrappedLabel($w, $opts);
+}
+
+sub _gtk__Label_Right {
+ my ($w, $opts) = @_;
+ $opts->{alignment} ||= [ 1, 0.5 ];
_gtk__Label($w, $opts);
}
+
sub _gtk__Label {
my ($w, $opts) = @_;
@@ -285,16 +415,108 @@ sub _gtk__Label {
$w->set_text(delete $opts->{text}) if exists $opts->{text};
} else {
$w = exists $opts->{text} ? Gtk2::Label->new(delete $opts->{text}) : Gtk2::Label->new;
+ $w->set_selectable(delete $opts->{selectable}) if exists $opts->{selectable};
+ $w->set_ellipsize(delete $opts->{ellipsize}) if exists $opts->{ellipsize};
$w->set_justify(delete $opts->{justify}) if exists $opts->{justify};
$w->set_line_wrap(delete $opts->{line_wrap}) if exists $opts->{line_wrap};
$w->set_alignment(@{delete $opts->{alignment}}) if exists $opts->{alignment};
$w->modify_font(Gtk2::Pango::FontDescription->from_string(delete $opts->{font})) if exists $opts->{font};
}
- $w->set_markup(delete $opts->{text_markup}) if exists $opts->{text_markup};
+ if (my $text_ref = delete $opts->{text_ref}) {
+ my $set = sub { $w->set_text($$text_ref) };
+ gtkval_register($w, $text_ref, $set);
+ $set->();
+ }
+
+ if (my $t = delete $opts->{text_markup}) {
+ $w->set_markup($t);
+ if ($w->get_text eq '') {
+ log::l("invalid markup in $t. not using the markup");
+ $w->set_text($t);
+ }
+ }
+ $w;
+}
+
+
+sub _gtk__Alignment {
+ my ($w, $_opts) = @_;
+
+ if (!$w) {
+ $w = Gtk2::Alignment->new(0, 0, 0, 0);
+ }
$w;
}
+
+sub title1_to_markup {
+ my ($label) = @_;
+ if ($::isInstall) {
+ my $font = lang::l2pango_font($::o->{locale}{lang});
+ if (my ($font_size) = $font =~ /(\d+)/) {
+ $font_size++;
+ $font =~ s/\d+/$font_size/;
+ }
+ qq(<span foreground="#5A8AD6" font="$font">$label</span>);
+ } else {
+ qq(<b><big>$label</big></b>);
+ }
+}
+
+sub _gtk__Install_Title {
+ my ($w, $opts) = @_;
+ local $opts->{widget_name} = 'Banner';
+ $opts->{text} = uc($opts->{text}) if $::isInstall;
+ gtknew('HBox', widget_name => 'Banner', children => [
+ 0, gtknew('Label', padding => [ 6, 0 ]),
+ 1, gtknew('VBox', widget_name => 'Banner', children_tight => [
+ _gtk__Title2($w, $opts),
+ if_($::isInstall, Gtk2::HSeparator->new),
+ ]),
+ 0, gtknew('Label', padding => [ 6, 0 ]),
+ ]);
+}
+
+sub _gtk__Title1 {
+ my ($w, $opts) = @_;
+ $opts ||= {};
+ $opts->{text_markup} = title1_to_markup(delete($opts->{label})) if $opts->{label};
+ _gtk__WrappedLabel($w, $opts);
+}
+
+sub _gtk__Title2 {
+ my ($w, $opts) = @_;
+ $opts ||= {};
+ $opts->{alignment} = [ 0, 0 ];
+ _gtk__Title1($w, $opts);
+}
+
+sub _gtk__Sexy_IconEntry {
+ my ($w, $opts) = @_;
+
+ require Gtk2::Sexy;
+ if (!$w) {
+ $w = Gtk2::Sexy::IconEntry->new;
+ $w->set_editable(delete $opts->{editable}) if exists $opts->{editable};
+ }
+
+ $w->add_clear_button if delete $opts->{clear_button};
+ if (my $icon = delete $opts->{primary_icon}) {
+ $w->set_icon('primary', $icon);
+ $w->set_icon_highlight('primary', $icon);
+ }
+ if (my $icon = delete $opts->{secondary_icon}) {
+ $w->set_icon('secondary', $icon);
+ $w->set_icon_highlight('secondary', $icon);
+ }
+
+ $w->signal_connect('icon-released' => delete $opts->{'icon-released'}) if exists $opts->{'icon-released'};
+ $w->signal_connect('icon-pressed' => delete $opts->{'icon-pressed'}) if exists $opts->{'icon-pressed'};
+
+ _gtk__Entry($w, $opts);
+}
+
sub _gtk__Entry {
my ($w, $opts) = @_;
@@ -303,13 +525,52 @@ sub _gtk__Entry {
$w->set_editable(delete $opts->{editable}) if exists $opts->{editable};
}
+ if (my $icon = delete $opts->{primary_icon}) {
+ $w->set_icon_from_stock('primary', $icon);
+ #$w->set_icon_highlight('primary', $icon);
+ }
+ if (my $icon = delete $opts->{secondary_icon}) {
+ $w->set_icon_from_stock('secondary', $icon);
+ #$w->set_icon_highlight('secondary', $icon);
+ }
+
+ $w->signal_connect('icon-release' => delete $opts->{'icon-release'}) if exists $opts->{'icon-release'};
+ $w->signal_connect('icon-press' => delete $opts->{'icon-press'}) if exists $opts->{'icon-press'};
+
$w->set_text(delete $opts->{text}) if exists $opts->{text};
$w->signal_connect(key_press_event => delete $opts->{key_press_event}) if exists $opts->{key_press_event};
+
+ if (my $text_ref = delete $opts->{text_ref}) {
+ my $set = sub { $w->set_text($$text_ref) };
+ gtkval_register($w, $text_ref, $set);
+ $set->();
+ $w->signal_connect(changed => sub {
+ gtkval_modify($text_ref, $w->get_text, $set);
+ });
+ }
+
$w;
}
-sub _gtk__TextView {
+sub _gtk__WeaknessCheckEntry {
my ($w, $opts) = @_;
+
+ if (!$w) {
+ $w = _gtk__Entry($w, $opts);
+ }
+
+ $w->signal_connect('changed' => sub {
+ require authentication;
+ my $password_weakness = authentication::compute_password_weakness($w->get_text);
+ $w->set_icon_from_pixbuf('GTK_ENTRY_ICON_SECONDARY', _get_weakness_icon($password_weakness));
+ $w->set_icon_tooltip_text('GTK_ENTRY_ICON_SECONDARY', _get_weakness_tooltip($password_weakness));
+ });
+
+ $w;
+}
+
+sub _gtk__TextView {
+ my ($w, $opts, $_class, $action) = @_;
if (!$w) {
$w = Gtk2::TextView->new;
@@ -318,7 +579,25 @@ sub _gtk__TextView {
$w->set_cursor_visible(delete $opts->{cursor_visible}) if exists $opts->{cursor_visible};
}
- _text_insert($w, delete $opts->{text}) if exists $opts->{text};
+ _text_insert($w, delete $opts->{text}, append => $action eq 'gtkadd') if exists $opts->{text};
+ $w;
+}
+
+sub _gtk__WebKit_View {
+ my ($w, $opts, $_class, $_action) = @_;
+ if (!$w) {
+ $w = Gtk2::WebKit::WebView->new;
+ }
+
+ # disable contextual menu:
+ if (delete $opts->{no_popup_menu}) {
+ $w->signal_connect('populate-popup' => sub {
+ my (undef, $menu) = @_;
+ $menu->destroy if $menu;
+ 1;
+ });
+ }
+
$w;
}
@@ -333,6 +612,7 @@ sub _gtk__ComboBox {
my $set_list = sub {
$w->{formatted_list} = $w->{format} ? [ map { $w->{format}($_) } @{$w->{list}} ] : $w->{list};
$w->get_model->clear;
+ $w->{strings} = $w->{formatted_list}; # used by Gtk2::ComboBox wrappers such as get_text() in ugtk2
$w->append_text($_) foreach @{$w->{formatted_list}};
};
if (my $list_ref = delete $opts->{list_ref}) {
@@ -377,23 +657,29 @@ sub _gtk__ScrolledWindow {
$w->set_policy(delete $opts->{h_policy} || 'automatic', delete $opts->{v_policy} || 'automatic');
}
+ my $faked_w = $w;
+
if (my $child = delete $opts->{child}) {
- if (member(ref($child), qw(Gtk2::Layout Gtk2::Text Gtk2::TextView Gtk2::TreeView))) {
+ if (member(ref($child), qw(Gtk2::Layout Gtk2::Html2::View Gtk2::SimpleList Gtk2::SourceView::View Gtk2::Text Gtk2::TextView Gtk2::TreeView Gtk2::WebKit::WebView))) {
$w->add($child);
} else {
$w->add_with_viewport($child);
}
$child->set_focus_vadjustment($w->get_vadjustment) if $child->can('set_focus_vadjustment');
- $child->set_left_margin(6) if ref($child) =~ /Gtk2::TextView/;
+ $child->set_left_margin(6) if ref($child) =~ /Gtk2::TextView/ && $child->get_left_margin <= 6;
$child->show;
$w->child->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type};
- if ($action eq 'gtknew' && ref($child) =~ /Gtk2::TextView|Gtk2::TreeView/) {
- $w = gtknew('Frame', shadow_type => 'in', child => $w);
+ if (ref($child) eq 'Gtk2::TextView' && delete $opts->{to_bottom}) {
+ $child->{to_bottom} = _allow_scroll_TextView_to_bottom($w, $child);
+ }
+
+ if (!delete $opts->{no_shadow} && $action eq 'gtknew' && ref($child) =~ /Gtk2::(Html2|SimpleList|TextView|TreeView|WebKit::WebView)/) {
+ $faked_w = gtknew('Frame', shadow_type => 'in', child => $w);
}
}
- $w;
+ $faked_w;
}
sub _gtk__Frame {
@@ -414,6 +700,134 @@ sub _gtk__Frame {
$w;
}
+sub _gtk__Expander {
+ my ($w, $opts) = @_;
+
+ if ($w) {
+ $w->set_label(delete $opts->{text}) if exists $opts->{text};
+ } else {
+ $w = Gtk2::Expander->new(delete $opts->{text});
+ }
+
+ $w->signal_connect(activate => delete $opts->{activate}) if exists $opts->{activate};
+
+ if (my $child = delete $opts->{child}) {
+ $w->add($child);
+ $child->show;
+ }
+ $w;
+}
+
+
+
+sub _gtk__MDV_Notebook {
+ my ($w, $opts, $_class, $_action) = @_;
+ if (!$w) {
+ import_style_ressources();
+
+ my ($layout, $selection_arrow, $selection_bar);
+ my $parent_window = delete $opts->{parent_window} || root_window();
+ my $root_height = first($parent_window->get_size);
+ my $suffix = $root_height == 800 && !$::isStandalone ? '_600' : '_768';
+ # the white square is a little bit above the actual left sidepanel:
+ my $offset = 20;
+ my $is_flip_needed = text_direction_rtl();
+ my $filler = gtknew('Image', file => 'left-background-filler.png');
+ my $filler_height = $filler->get_pixbuf->get_height;
+ my $left_background = gtknew('Image_using_pixbuf', file => 'left-background.png');
+ my $lf_height = $left_background->{pixbuf}->get_height;
+ my @right_background = $::isInstall ?
+ gtknew('Image', file => "right-white-background_left_part$suffix", flip => $is_flip_needed)
+ : map {
+ gtknew('Image', file => "right-white-background_left_part-$_", flip => $is_flip_needed);
+ } 1, 2, 2, 3;
+ my $width1 = $left_background->{pixbuf}->get_width;
+ my $total_width = $width1 + $right_background[0]->get_pixbuf->get_width;
+ my $arrow_x = text_direction_rtl() ? $offset/2 - 4 : $width1 - $offset - 3;
+ $w = gtknew('HBox', spacing => 0, children => [
+ 0, $layout = gtknew('Layout', width => $total_width - $offset, children => [ #Layout Fixed
+ # stacking order is important for "Z-buffer":
+ [ $left_background, 0, 0 ],
+ if_($suffix ne '_600',
+ [ $filler, 0, $lf_height ],
+ [ gtknew('Image', file => 'left-background-filler.png'), 0, $lf_height + $filler_height ],
+ [ gtknew('Image', file => 'left-background-filler.png'), 0, $lf_height + $filler_height*2 ],
+ ),
+ [ $selection_bar = gtknew('Image', file => 'rollover.png'), 0, 0 ], # arbitrary vertical position
+ ($opts->{children} ? @{ delete $opts->{children} } : ()),
+ [ my $box = gtknew('VBox', spacing => 0, height => -1, children => [
+ 0, $right_background[0],
+ if_(!$::isInstall,
+ 1, $right_background[1],
+ 1, $right_background[2], # enought up to to XYZx1280 resolution
+ 0, $right_background[3],
+ ),
+ ]), (text_direction_rtl() ? 0 : $width1 - $offset), 0 ],
+ # stack on top (vertical position is arbitrary):
+ [ $selection_arrow = gtknew('Image', file => 'steps_on', flip => $is_flip_needed), $arrow_x, 0, ],
+ ]),
+ 1, delete $opts->{right_child} ||
+ gtknew('Image_using_pixbuf', file => "right-white-background_right_part$suffix", flip => $is_flip_needed),
+ ]);
+
+ $w->signal_connect('size-allocate' => sub {
+ my (undef, $requisition) = @_;
+ state $width ||= $right_background[0]->get_pixbuf->get_width;
+ $box->set_size_request($width, $requisition->height);
+ });
+ $_->set_property('no-show-all', 1) foreach $selection_bar, $selection_arrow;
+ bless($w, 'Gtk2::MDV_Notebook');
+ add2hash($w, {
+ arrow_x => $arrow_x,
+ layout => $layout,
+ selection_arrow => $selection_arrow,
+ selection_bar =>$selection_bar,
+ });
+ }
+ $w;
+}
+
+
+sub _gtk__Fixed {
+ my ($w, $opts, $_class, $_action) = @_;
+
+ if (!$w) {
+ $w = Gtk2::Fixed->new;
+ $w->set_has_window(delete $opts->{has_window}) if exists $opts->{has_window};
+ _gtknew_handle_layout_children($w, $opts);
+ }
+ $w;
+}
+
+sub _gtk__Layout {
+ my ($w, $opts, $_class, $_action) = @_;
+
+ if (!$w) {
+ $w = Gtk2::Layout->new;
+ _gtknew_handle_layout_children($w, $opts);
+ }
+ $w;
+}
+
+sub _gtknew_handle_layout_children {
+ my ($w, $opts) = @_;
+ $opts->{children} ||= [];
+ push @{$opts->{children}}, [ delete $opts->{child}, delete $opts->{x}, delete $opts->{y} ] if exists $opts->{child};
+ foreach (@{$opts->{children}}) {
+ $w->put(@$_);
+ }
+ delete $opts->{children};
+
+ if ($opts->{pixbuf_file}) {
+ my $pixbuf = if_($opts->{pixbuf_file}, gtknew('Pixbuf', file => delete $opts->{pixbuf_file}));
+ $w->signal_connect(
+ realize => sub {
+ ugtk2::set_back_pixbuf($w, $pixbuf);
+ });
+ }
+}
+
+
sub _gtk__Window { &_gtk_any_Window }
sub _gtk__Dialog { &_gtk_any_Window }
sub _gtk__Plug { &_gtk_any_Window }
@@ -424,13 +838,24 @@ sub _gtk_any_Window {
if ($class eq 'Window') {
$w = "Gtk2::$class"->new(delete $opts->{type} || 'toplevel');
} elsif ($class eq 'Plug') {
- $opts->{socket_id} or internal_error("can not create a Plug without a socket_id");
+ $opts->{socket_id} or internal_error("cannot create a Plug without a socket_id");
$w = "Gtk2::$class"->new(delete $opts->{socket_id});
+ } elsif ($class eq 'FileChooserDialog') {
+ my $action = delete $opts->{action} || internal_error("missing action for FileChooser");
+ $w = Gtk2::FileChooserDialog->new(delete $opts->{title}, delete $opts->{transient_for} || $::main_window,
+ $action, N("Cancel") => 'cancel', delete $opts->{button1} || N("Ok") => 'ok',
+ );
} else {
$w = "Gtk2::$class"->new;
}
+ if ($::isInstall || $::set_dialog_hint) {
+ $w->set_type_hint('dialog'); # for matchbox window manager
+ }
+
$w->set_modal(delete $opts->{modal}) if exists $opts->{modal};
+ $opts->{transient_for} ||= $::main_window if $::main_window;
+ $w->set_modal(1) if exists $opts->{transient_for};
$w->set_transient_for(delete $opts->{transient_for}) if exists $opts->{transient_for};
$w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width};
$w->set_shadow_type(delete $opts->{shadow_type}) if exists $opts->{shadow_type};
@@ -441,7 +866,7 @@ sub _gtk_any_Window {
if (my $f = _find_imgfile($name)) {
$w->set_icon(gtknew('Pixbuf', file => $f));
} elsif (!$icon_no_error) {
- internal_error("can not find $name");
+ internal_error("cannot find $name");
}
}
}
@@ -454,29 +879,58 @@ sub _gtk_any_Window {
$w;
}
+my $previous_popped_and_reuse_window;
+
+sub destroy_previous_popped_and_reuse_window() {
+ $previous_popped_and_reuse_window or return;
+
+ $previous_popped_and_reuse_window->destroy;
+ $previous_popped_and_reuse_window = undef;
+}
+
sub _gtk__MagicWindow {
my ($w, $opts) = @_;
my $pop_it = delete $opts->{pop_it} || !$::isWizard && !$::isEmbedded || $::WizardTable && do {
#- do not take into account the wizard banner
+ # FIXME!!!
any { !$_->isa('Gtk2::DrawingArea') && $_->visible } $::WizardTable->get_children;
};
- my $sub_child = delete $opts->{child} or internal_error("missing child");
+ my $pop_and_reuse = delete $opts->{pop_and_reuse} && $pop_it;
+ my $sub_child = delete $opts->{child};
+ my $provided_banner = delete $opts->{banner};
- if ($pop_it) {
- $opts->{child} = $::isInstall ?
- gtknew('Frame', shadow_type => 'out',
- child => gtknew('Frame', shadow_type => 'none', border_width => 3, child => $sub_child)) :
- $sub_child;
+ if ($pop_it && $provided_banner) {
+ $sub_child = gtknew('VBox', children => [ 0, $provided_banner, if_($sub_child, 1, $sub_child) ]);
+ } else {
+ $sub_child ||= gtknew('VBox');
+ }
+ if (!$pop_and_reuse) {
+ destroy_previous_popped_and_reuse_window();
+ }
+
+ if ($previous_popped_and_reuse_window && $pop_and_reuse) {
+ $w = $previous_popped_and_reuse_window;
+ $w->remove($w->child);
- $w = _create_Window($opts);
+ gtkadd($w, child => $sub_child);
+ %$opts = ();
+ } elsif ($pop_it) {
+ $opts->{child} = $sub_child;
+
+ $w = _create_Window($opts, '');
+ $previous_popped_and_reuse_window = $w if $pop_and_reuse;
} else {
if (!$::WizardWindow) {
my $banner;
if (!$::isEmbedded && !$::isInstall && $::Wizard_title) {
- $banner = Gtk2::Banner->new($opts->{icon_no_error}, $::Wizard_title) or log::l("ERROR: missing wizard banner");
+ if (_find_imgfile($opts->{icon_no_error})) {
+ $banner = Gtk2::Banner->new($opts->{icon_no_error}, $::Wizard_title);
+ } else {
+ log::l("ERROR: missing wizard banner $opts->{icon_no_error}");
+ }
}
$::WizardTable = gtknew('VBox', if_($banner, children_tight => [ $banner ]));
@@ -485,25 +939,74 @@ sub _gtk__MagicWindow {
socket_id => $::XID,
child => $::WizardTable,
});
+ delete $opts->{no_Window_Manager};
$::Plug = $::WizardWindow = _gtk(undef, 'Plug', 'gtknew', $opts);
sync($::WizardWindow);
} else {
add2hash($opts, {
- child => gtknew('Frame', shadow_type => 'out', child => $::WizardTable),
+ child => $::WizardTable,
});
- $::WizardWindow = _create_Window($opts);
+ $::WizardWindow = _create_Window($opts, 'special_center');
}
} else {
%$opts = ();
}
set_main_window_size($::WizardWindow);
- $sub_child->set_border_width(10);
$w = $::WizardWindow;
+
+ gtkadd($::WizardTable, children_tight => [ $provided_banner ]) if $provided_banner;
gtkadd($::WizardTable, children_loose => [ $sub_child ]);
}
- bless { real_window => $w, child => $sub_child, pop_it => $pop_it }, 'mygtk2::MagicWindow';
+ bless {
+ real_window => $w,
+ child => $sub_child, pop_it => $pop_it, pop_and_reuse => $pop_and_reuse,
+ if_($provided_banner, banner => $provided_banner),
+ }, 'mygtk2::MagicWindow';
+}
+
+# A standard About dialog. Used with:
+# my $w = gtknew('AboutDialog', ...);
+# $w->show_all;
+# $w->run;
+sub _gtk__AboutDialog {
+ my ($w, $opts) = @_;
+
+ if (!$w) {
+ $w = Gtk2::AboutDialog->new;
+ $w->signal_connect(response => sub { $_[0]->destroy });
+ $w->set_program_name(delete $opts->{name}) if exists $opts->{name};
+ $w->set_version(delete $opts->{version}) if exists $opts->{version};
+ $w->set_icon(gtknew('Pixbuf', file => delete $opts->{icon})) if exists $opts->{icon};
+ $w->set_logo(gtknew('Pixbuf', file => delete $opts->{logo})) if exists $opts->{logo};
+ $w->set_copyright(delete $opts->{copyright}) if exists $opts->{copyright};
+ $w->set_url_hook(sub {
+ my (undef, $url) = @_;
+ run_program::raw({ detach => 1 }, 'www-browser', $url);
+ });
+ $w->set_email_hook(sub {
+ my (undef, $url) = @_;
+ run_program::raw({ detach => 1 }, 'www-browser', $url);
+ });
+
+ if (my $url = delete $opts->{website}) {
+ $url =~ s/^https:/http:/; # Gtk2::About doesn't like "https://..." like URLs
+ $w->set_website($url);
+ }
+ $w->set_license(delete $opts->{license}) if exists $opts->{license};
+ $w->set_wrap_license(delete $opts->{wrap_license}) if exists $opts->{wrap_license};
+ $w->set_comments(delete $opts->{comments}) if exists $opts->{comments};
+ $w->set_website_label(delete $opts->{website_label}) if exists $opts->{website_label};
+ $w->set_authors(delete $opts->{authors}) if exists $opts->{authors};
+ $w->set_documenters(delete $opts->{documenters}) if exists $opts->{documenters};
+ $w->set_translator_credits(delete $opts->{translator_credits}) if exists $opts->{translator_credits};
+ $w->set_artists(delete $opts->{artists}) if exists $opts->{artists};
+ $w->set_modal(delete $opts->{modal}) if exists $opts->{modal};
+ $w->set_transient_for(delete $opts->{transient_for}) if exists $opts->{transient_for};
+ $w->set_position(delete $opts->{position_policy}) if exists $opts->{position_policy};
+ }
+ $w;
}
sub _gtk__FileSelection {
@@ -517,6 +1020,8 @@ sub _gtk__FileSelection {
$w;
}
+sub _gtk__FileChooserDialog { &_gtk_any_Window }
+
sub _gtk__FileChooser {
my ($w, $opts) = @_;
@@ -532,20 +1037,44 @@ sub _gtk__FileChooser {
$w->set_current_folder($dir);
}
if ($file) {
- my $meth = $action =~ /save|create/ ? 'set_current_name' : 'set_filename';
- $w->$meth($file);
+ if ($action =~ /save|create/) {
+ $w->set_current_name(basename($file));
+ } else {
+ $w->set_filename($file);
+ }
}
}
$w;
}
+sub _gtk__VPaned { &_gtk_any_Paned }
+sub _gtk__HPaned { &_gtk_any_Paned }
+sub _gtk_any_Paned {
+ my ($w, $opts, $class, $action) = @_;
+
+ if (!$w) {
+ $w = "Gtk2::$class"->new;
+ $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width};
+ $w->set_position(delete $opts->{position}) if exists $opts->{position};
+ } elsif ($action eq 'gtkset') {
+ $_->destroy foreach $w->get_children;
+ }
+
+ foreach my $opt (qw(resize1 shrink1 resize2 shrink2)) {
+ $opts->{$opt} = 1 if !defined $opts->{$opt};
+ }
+ $w->pack1(delete $opts->{child1}, delete $opts->{resize1}, delete $opts->{shrink1});
+ $w->pack2(delete $opts->{child2}, delete $opts->{resize2}, delete $opts->{shrink2});
+ $w;
+}
+
sub _gtk__VBox { &_gtk_any_Box }
sub _gtk__HBox { &_gtk_any_Box }
sub _gtk_any_Box {
my ($w, $opts, $class, $action) = @_;
if (!$w) {
- $w = "Gtk2::$class"->new(0,0);
+ $w = "Gtk2::$class"->new;
$w->set_homogeneous(delete $opts->{homogenous}) if exists $opts->{homogenous};
$w->set_spacing(delete $opts->{spacing}) if exists $opts->{spacing};
$w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width};
@@ -564,6 +1093,9 @@ sub _gtk_any_ButtonBox {
if (!$w) {
$w = "Gtk2::$class"->new;
+ $w->set_homogeneous(delete $opts->{homogenous}) if exists $opts->{homogenous};
+ $w->set_border_width(delete $opts->{border_width}) if exists $opts->{border_width};
+ $w->set_spacing(delete $opts->{spacing}) if exists $opts->{spacing};
$w->set_layout(delete $opts->{layout} || 'spread');
} elsif ($action eq 'gtkset') {
$_->destroy foreach $w->get_children;
@@ -612,11 +1144,11 @@ sub _gtk__Table {
my $j = $::i;
if ($_) {
ref $_ or $_ = Gtk2::WrappedLabel->new($_);
- $j != $#$l && !$w->{mcc} ?
- $w->attach($_, $j, $j + 1, $i, $i + 1,
- 'fill', 'fill', $w->{xpadding}, $w->{ypadding}) :
- $w->attach($_, $j, $j + 1, $i, $i + 1,
- ['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ? ['expand', 'fill'] : [], 0, 0);
+ $w->attach($_, $j, $j + 1, $i, $i + 1,
+ $j != $#$l && !$w->{mcc} ?
+ ('fill', 'fill', $w->{xpadding}, $w->{ypadding}) :
+ (['expand', 'fill'], ref($_) eq 'Gtk2::ScrolledWindow' || $_->get_data('must_grow') ?
+ ['expand', 'fill'] : [], 0, 0));
$_->show;
}
} @$l;
@@ -636,15 +1168,19 @@ sub _gtknew_handle_children {
my @child = exists $opts->{children_tight} ? map { [ 0, $_ ] } @{delete $opts->{children_tight}} :
exists $opts->{children_loose} ? map { [ 1, $_ ] } @{delete $opts->{children_loose}} :
- exists $opts->{children} ? group_by2(@{delete $opts->{children}}) : ();
+ exists $opts->{children} ? group_by2(@{delete $opts->{children}}) :
+ exists $opts->{children_centered} ?
+ ([ 1, gtknew('VBox') ], (map { [ 0, $_ ] } @{delete $opts->{children_centered}}), [ 1, gtknew('VBox') ]) :
+ ();
my $padding = delete $opts->{padding};
foreach (@child) {
my ($fill, $child) = @$_;
- $fill eq '0' || $fill eq '1' or internal_error("odd {children} parameter must be 0 or 1 (got $fill)");
+ member($fill, qw(0 1 fill expand)) or internal_error("odd {children} parameter must be 0 or 1 (got $fill)");
ref $child or $child = Gtk2::WrappedLabel->new($child);
- $w->pack_start($child, $fill, $fill, $padding || 0);
+ my $expand = $fill && $fill ne 'fill' ? 1 : 0;
+ $w->pack_start($child, $expand, $fill, $padding || 0);
$child->show;
}
}
@@ -660,96 +1196,107 @@ sub mygtk2::MagicWindow::AUTOLOAD {
my ($meth) = $mygtk2::MagicWindow::AUTOLOAD =~ /mygtk2::MagicWindow::(.*)/;
- my ($s1, $s2) = $meth eq 'show'
- ? ('real_window', 'child') :
+ my ($s1, @s2) = $meth eq 'show'
+ ? ('real_window', 'banner', 'child') :
+ member($meth, qw(destroy hide)) ?
+ ($w->{pop_it} ? 'real_window' : ('child', 'banner')) :
$meth eq 'get' && $args[0] eq 'window-position' ||
- $w->{pop_it} && ($meth eq 'destroy' || $meth eq 'hide') ||
$for_real_window{$meth} ||
!$w->{child}->can($meth)
? 'real_window'
: 'child';
-#- warn "mygtk2::MagicWindow::$meth", first($w =~ /HASH(.*)/), " on $s1 (@args)\n";
+#- warn "mygtk2::MagicWindow::$meth", first($w =~ /HASH(.*)/), " on $s1 @s2 (@args)\n";
- $w->{$s2}->$meth(@args) if $s2;
+ $w->{$_} && $w->{$_}->$meth(@args) foreach @s2;
$w->{$s1}->$meth(@args);
}
+my $enable_quit_popup;
+sub enable_quit_popup {
+ my ($bool) = @_;
+ $enable_quit_popup = $bool;
+}
+
+state $in_callback;
+sub quit_popup() {
+ return if !$enable_quit_popup;
+ if (!$in_callback) {
+ $in_callback = 1;
+ my $_guard = before_leaving { undef $in_callback };
+ require ugtk2;
+ my $w = ugtk2->new(N("Confirmation"), grab => 1);
+ ugtk2::_ask_okcancel($w, N("Are you sure you want to quit?"), N("Quit"), N("Cancel"));
+ my $ret = ugtk2::main($w);
+ return 1 if !$ret;
+ }
+}
+
+sub quit_callback {
+ my ($w) = @_;
+
+ return 1 if quit_popup();
+ if ($::isWizard) {
+ $w->destroy;
+ die 'wizcancel';
+ } else {
+ if (Gtk2->main_level) {
+ Gtk2->main_quit;
+ } else {
+ # block window deletion if not in main loop (eg: while starting the GUI)
+ return 1;
+ }
+ }
+}
+
sub _create_Window {
- my ($opts) = @_;
+ my ($opts, $special_center) = @_;
- my $no_Window_Manager = !$::isStandalone;
+ my $no_Window_Manager = exists $opts->{no_Window_Manager} ? delete $opts->{no_Window_Manager} : !$::isStandalone;
add2hash($opts, {
if_(!$::isInstall && !$::isWizard, border_width => 5),
#- policy: during install, we need a special code to handle the weird centering, see below
- position_policy => $::isInstall ? 'none' : $no_Window_Manager ? 'center-always' : 'center-on-parent',
+ position_policy => $special_center ? 'none' :
+ $no_Window_Manager ? 'center-always' : 'center-on-parent',
if_($::isInstall, position => [
- $::rootwidth - ($::windowwidth + $::real_windowwidth) / 2,
- $::logoheight + ($::windowheight - $::real_windowheight) / 2,
+ $::stepswidth + ($::o->{windowwidth} - $::real_windowwidth) / 2,
+ ($::o->{windowheight} - $::real_windowheight) / 2,
]),
});
my $w = _gtk(undef, 'Window', 'gtknew', $opts);
#- when the window is closed using the window manager "X" button (or alt-f4)
- $w->signal_connect(delete_event => sub {
- if ($::isWizard) {
- $w->destroy;
- die 'wizcancel';
- } else {
- Gtk2->main_quit;
- }
- });
-
- if ($no_Window_Manager) {
- _force_keyboard_focus($w);
- }
+ $w->signal_connect(delete_event => \&quit_callback);
- if ($::isInstall) {
- require install_gtk; #- for perl_checker
- install_gtk::handle_unsafe_mouse($::o, $w);
- $w->signal_connect(key_press_event => \&install_gtk::special_shortcuts);
+ if ($::isInstall && !$::isStandalone) {
+ require install::gtk; #- for perl_checker
+ install::gtk::handle_unsafe_mouse($::o, $w);
+ $w->signal_connect(key_press_event => \&install::gtk::special_shortcuts);
#- force center at a weird position, this can't be handled by position_policy
- #- because center-on-parent is a window manager hint, and we don't have a WM
+ #- because center-* really are window manager hints for centering, whereas we want
+ #- to center the main window in the right part of the screen
my ($wi, $he);
$w->signal_connect(size_allocate => sub {
my (undef, $event) = @_;
my @w_size = $event->values;
+
+ # ignore bogus sizing events:
+ return if $w_size[2] < 5;
return if $w_size[2] == $wi && $w_size[3] == $he; #BUG
(undef, undef, $wi, $he) = @w_size;
- $w->move(max(0, $::rootwidth - ($::windowwidth + $wi) / 2),
- max(0, $::logoheight + ($::windowheight - $he) / 2));
- });
- #- without this, the focus is broken during install, though this is not needed during X test, why??
- $w->show;
+ $w->move(max(0, $::rootwidth - ($::o->{windowwidth} + $wi) / 2),
+ max(0, ($::o->{windowheight} - $he) / 2));
+ }) if $special_center;
}
- $w;
-}
-
-my $current_window;
-sub _force_keyboard_focus {
- my ($w) = @_;
-
- sub _XSetInputFocus {
- my ($w) = @_;
- if ($current_window == $w) {
- $w->window->XSetInputFocus;
- } else {
- log::l("not XSetInputFocus since already done and not on top");
- }
- 0;
- }
+ $w->present if $no_Window_Manager;
- #- force keyboard focus instead of mouse focus
- my $previous_current_window = $current_window;
- $current_window = $w;
- $w->signal_connect(expose_event => \&_XSetInputFocus);
- $w->signal_connect(destroy => sub { $current_window = $previous_current_window });
+ $w;
}
sub _find_imgfile {
@@ -759,7 +1306,7 @@ sub _find_imgfile {
$name;
} else {
foreach my $path (_icon_paths()) {
- foreach ('', '.png', '.xpm') {
+ foreach ('', '.png', '.xpm', '.jpg') {
my $file = "$path/$name$_";
-f $file and return $file;
}
@@ -801,14 +1348,24 @@ sub _text_insert {
my $gtk_tags = $buffer->{gtk_tags};
my $tags = $buffer->{tags};
if (ref($t) eq 'ARRAY') {
- $opts{append} or $buffer->set_text('');
+ if (!$opts{append}) {
+ $buffer->set_text('');
+ $textview->{anchors} = [];
+ }
foreach my $token (@$t) {
my ($item, $tag) = @$token;
my $iter1 = $buffer->get_end_iter;
- if ($item =~ /^Gtk2::Gdk::Pixbuf/) {
+ if (ref($item) =~ /^Gtk2::Gdk::Pixbuf/) {
$buffer->insert_pixbuf($iter1, $item);
next;
}
+ if (ref($item) =~ /^Gtk2::/) {
+ my $anchor = $buffer->create_child_anchor($iter1);
+ $textview->add_child_at_anchor($item, $anchor);
+ $textview->{anchors} ||= [];
+ push @{$textview->{anchors}}, $anchor;
+ next;
+ }
if ($tag) {
if (ref($tag)) {
# use anonymous tags
@@ -828,9 +1385,12 @@ sub _text_insert {
if ($opts{append}) {
$buffer->insert($buffer->get_end_iter, $t);
} else {
+ $textview->{anchors} = [];
$buffer->set_text($t);
}
}
+ $textview->{to_bottom}->() if $textview->{to_bottom};
+
#- the following line is needed to move the cursor to the beginning, so that if the
#- textview has a scrollbar, it will not scroll to the bottom when focusing (#3633)
$buffer->place_cursor($buffer->get_start_iter);
@@ -840,9 +1400,37 @@ sub _text_insert {
$textview;
}
+sub _allow_scroll_TextView_to_bottom {
+ my ($scrolledWindow, $textView) = @_;
+
+ $textView->get_buffer->create_mark('end', $textView->get_buffer->get_end_iter, 0);
+ sub {
+ my ($o_force) = @_;
+ my $adjustment = $scrolledWindow->get_vadjustment;
+ if ($o_force || $adjustment->page_size + $adjustment->value == $adjustment->upper) {
+ flush(); #- one must flush before scrolling to end, otherwise the text just added *may* not be taken into account correctly, and so it doesn't really scroll to end
+ $textView->scroll_to_mark($textView->get_buffer->get_mark('end'), 0, 1, 0, 1);
+ }
+ };
+}
+
+sub asteriskize {
+ my ($label) = @_;
+ "\x{2022} " . $label;
+}
+
+sub get_main_window_size() {
+ $::real_windowwidth ? ($::real_windowwidth, $::real_windowheight) : $::isWizard ? (540, 360) : (600, 400);
+}
+
+# in order to workaround infamous 6 years old gnome bug #101968:
+sub get_label_width() {
+ first(mygtk2::get_main_window_size()) - 55 - $left_padding;
+}
+
sub set_main_window_size {
my ($window) = @_;
- my ($width, $height) = $::isInstall ? ($::real_windowwidth, $::real_windowheight) : $::isWizard ? (540, 360) : (600, 400);
+ my ($width, $height) = get_main_window_size();
$window->set_size_request($width, $height);
}
@@ -850,7 +1438,7 @@ my @icon_paths;
sub add_icon_path { push @icon_paths, @_ }
sub _icon_paths() {
(@icon_paths, (exists $ENV{SHARE_PATH} ? ($ENV{SHARE_PATH}, "$ENV{SHARE_PATH}/icons", "$ENV{SHARE_PATH}/libDrakX/pixmaps") : ()),
- "/usr/lib/libDrakX/icons", "pixmaps", 'standalone/icons', '/usr/share/rpmdrake/icons');
+ "/usr/lib/libDrakX/icons", "pixmaps", 'data/icons', 'data/pixmaps', 'standalone/icons', '/usr/share/rpmdrake/icons');
}
sub main {
@@ -873,13 +1461,36 @@ sub flush() {
Gtk2->main_iteration while Gtk2->events_pending;
}
+sub enable_sync_flush {
+ my ($w) = @_;
+ $w->signal_connect(expose_event => sub { $w->{displayed} = 1; 0 });
+}
+
+sub sync_flush {
+ my ($w) = @_;
+ # hackish :-(
+ mygtk2::sync($w) while !$w->{displayed};
+}
+
+
+sub register_main_window {
+ my ($w) = @_;
+ push @::main_windows, $::main_window = $w;
+}
+
sub may_destroy {
my ($w) = @_;
- $w->destroy if $w;
+ return if !$w;
+ @::main_windows = difference2(\@::main_windows, [ $w->{real_window} ]);
+ if ($::main_window eq $w->{real_window}) {
+ undef $::main_window;
+ $::main_window = $::main_windows[-1];
+ }
+ $w->destroy;
}
sub root_window() {
- my $root if 0;
+ state $root;
$root ||= Gtk2::Gdk->get_default_root_window;
}
@@ -907,4 +1518,81 @@ sub set_root_window_background_with_gc {
$root->draw_rectangle($gc, 1, 0, 0, $w, $h);
}
+sub _new_alpha_pixbuf {
+ my ($pixbuf) = @_;
+ my ($height, $width) = ($pixbuf->get_height, $pixbuf->get_width);
+ my $new_pixbuf = Gtk2::Gdk::Pixbuf->new('rgb', 1, 8, $width, $height);
+ $new_pixbuf->fill(0x00000000); # transparent white
+ $width, $height, $new_pixbuf;
+}
+
+sub _pixbuf_render_alpha {
+ my ($pixbuf, $alpha_threshold) = @_;
+ my ($width, $height, $new_pixbuf) = _new_alpha_pixbuf($pixbuf);
+ $pixbuf->composite($new_pixbuf, 0, 0, $width, $height, 0, 0, 1, 1, 'bilinear', $alpha_threshold);
+ $new_pixbuf;
+}
+
+sub pixmap_from_pixbuf {
+ my ($widget, $pixbuf) = @_;
+ my $window = $widget->window or internal_error("you can't use this function if the widget is not realised");
+ 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);
+ $pixmap;
+}
+
+sub import_style_ressources() {
+ if (!$::isInstall) {
+ Gtk2::Rc->parse_string(scalar cat_('/usr/share/libDrakX/themes-galaxy.rc')); # FIXME DEBUG
+ }
+}
+
+sub text_direction_rtl() {
+ Gtk2::Widget->get_default_direction eq 'rtl';
+}
+
+sub _get_weakness_icon {
+ my ($password_weakness) = @_;
+ my %weakness_icon = (
+ 1 => gtknew('Pixbuf', file => 'security-low'),
+ 2 => gtknew('Pixbuf', file => 'security-low'),
+ 3 => gtknew('Pixbuf', file => 'security-medium'),
+ 4 => gtknew('Pixbuf', file => 'security-strong'),
+ 5 => gtknew('Pixbuf', file => 'security-strong'));
+ my $weakness_icon = $weakness_icon{$password_weakness} || return undef;
+ $weakness_icon;
+}
+
+sub _get_weakness_tooltip {
+ my ($password_weakness) = @_;
+ my %weakness_tooltip = (
+ 1 => N("Password is trivial to guess"),
+ 2 => N("Password is trivial to guess"),
+ 3 => N("Password should be resistant to basic attacks"),
+ 4 => N("Password seems secure"),
+ 5 => N("Password seems secure"));
+ my $weakness_tooltip = $weakness_tooltip{$password_weakness} || return undef;
+ return $weakness_tooltip;
+}
+
+package Gtk2::MDV_Notebook; # helper functions for installer & mcc
+our @ISA = qw(Gtk2::Widget);
+
+sub hide_selection {
+ my ($w) = @_;
+ $_->hide foreach $w->{selection_bar}, $w->{selection_arrow};
+}
+
+sub move_selection {
+ my ($w, $label) = @_;
+ my $layout = $w->{layout};
+ $layout->{arrow_ydiff} ||=
+ ($w->{selection_arrow}->get_pixbuf->get_height - $w->{selection_bar}->get_pixbuf->get_height)/2;
+ my $bar_y = $label->allocation->y - ($w->{selection_bar}->get_pixbuf->get_height - $label->allocation->height)/2;
+ $layout->move($w->{selection_bar}, 0, $bar_y);
+ $layout->move($w->{selection_arrow}, $w->{arrow_x}, $bar_y - $layout->{arrow_ydiff}); # arrow is higer
+ $_->show foreach $w->{selection_bar}, $w->{selection_arrow};
+}
+
1;