summaryrefslogtreecommitdiffstats
path: root/perl-install/interactive/gtk.pm
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/interactive/gtk.pm')
-rw-r--r--perl-install/interactive/gtk.pm1034
1 files changed, 610 insertions, 424 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index e024fc54f..c37143fc3 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -1,4 +1,4 @@
-package interactive::gtk; # $Id$
+package interactive::gtk;
use diagnostics;
use strict;
@@ -8,54 +8,57 @@ use vars qw(@ISA);
use interactive;
use common;
-use mygtk2;
-use ugtk2 qw(:helpers :wrappers :create);
-use Gtk2::Gdk::Keysyms;
+use mygtk3;
+use ugtk3 qw(:helpers :wrappers :create);
my $forgetTime = 1000; #- in milli-seconds
sub new {
- ($::windowwidth, $::windowheight) = gtkroot()->get_size if !$::isInstall;
- goto &interactive::new;
+ my $w = &interactive::new;
+ ($w->{windowwidth}, $w->{windowheight}) = mygtk3::root_window_size() if !$::isInstall;
+ $w;
}
sub enter_console { my ($o) = @_; $o->{suspended} = common::setVirtual(1) }
sub leave_console { my ($o) = @_; common::setVirtual(delete $o->{suspended}) }
+sub adapt_markup {
+ #- nothing needed, the default markup is gtk3's
+ my ($_o, $s) = @_; return $s;
+}
-sub exit { ugtk2::exit(@_) }
+sub exit { ugtk3::exit(@_) }
sub ask_fileW {
my ($in, $common) = @_;
- my $w = ugtk2::create_file_selector(%$common);
+ my $w = ugtk3::create_file_selector(%$common);
my $file;
$w->main(sub {
$file = $w->{chooser}->get_filename;
- my $err = ugtk2::file_selected_check($common->{save}, $common->{want_a_dir}, $file);
+ my $err = ugtk3::file_selected_check($common->{save}, $common->{want_a_dir}, $file);
$err and $in->ask_warn('', $err);
!$err;
}) && $file;
}
sub create_boxradio {
- my ($e, $may_go_to_next, $changed, $double_click) = @_;
+ my ($e, $onchange_f, $double_click) = @_;
- my $boxradio = gtkpack2__(Gtk2::VBox->new(0, 0),
+ my $boxradio = gtkpack2__(Gtk3::VBox->new,
my @radios = gtkradio('', @{$e->{formatted_list}}));
- my $tips = Gtk2::Tooltips->new;
mapn {
my ($txt, $w) = @_;
+ # workaround infamous 6 years old gnome bug #101968:
+ $w->get_child->set_size_request(mygtk3::get_label_width(), -1) if $e->{alignment} ne 'right' && !$e->{label};
$w->signal_connect(button_press_event => $double_click) if $double_click;
- $w->signal_connect(key_press_event => sub {
- &$may_go_to_next;
+ $w->signal_connect(key_press_event => $e->{may_go_to_next});
+ $w->signal_connect(clicked => sub {
+ ${$e->{val}} ne $txt or return;
+ $onchange_f->(sub { $txt });
});
- $w->signal_connect(clicked => sub {
- ${$e->{val}} = $txt;
- &$changed;
- });
if ($e->{help}) {
- gtkset_tip($tips, $w,
+ $w->set_tooltip_text(
ref($e->{help}) eq 'HASH' ? $e->{help}{$txt} :
ref($e->{help}) eq 'CODE' ? $e->{help}($txt) : $e->{help});
}
@@ -71,18 +74,20 @@ sub create_boxradio {
}
sub create_treeview_list {
- my ($e, $may_go_to_next, $changed, $double_click) = @_;
+ my ($e, $onchange_f, $double_click) = @_;
my $curr;
- my $list = Gtk2::ListStore->new("Glib::String");
- my $list_tv = Gtk2::TreeView->new_with_model($list);
+ my $list = Gtk3::ListStore->new("Glib::String");
+ my $list_tv = Gtk3::TreeView->new_with_model($list);
$list_tv->set_headers_visible(0);
$list_tv->get_selection->set_mode('browse');
- my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => 0);
+ my $textcolumn = Gtk3::TreeViewColumn->new_with_attributes("", my $renderer = Gtk3::CellRendererText->new, 'text' => 0);
$list_tv->append_column($textcolumn);
+ $renderer->set_property('ellipsize', 'end');
my $select = sub {
my ($path) = @_;
+ return if !$list_tv->get_model;
$list_tv->set_cursor($path, undef, 0);
Glib::Timeout->add(100, sub { $list_tv->scroll_to_cell($path, undef, 1, 0.5, 0); 0 });
};
@@ -97,17 +102,17 @@ sub create_treeview_list {
Glib::Source->remove($timeout) if $timeout; $timeout = '';
if ($event->keyval >= 0x100) {
- &$may_go_to_next if member($event->keyval, ($Gtk2::Gdk::Keysyms{Return}, $Gtk2::Gdk::Keysyms{KP_Enter}));
- $starting_word = '' if !member($event->keyval, ($Gtk2::Gdk::Keysyms{Control_L}, $Gtk2::Gdk::Keysyms{Control_R}));
+ $e->{may_go_to_next}(), return 1 if member($event->keyval, (Gtk3::Gdk::KEY_Return, Gtk3::Gdk::KEY_KP_Enter));
+ $starting_word = '' if !member($event->keyval, (Gtk3::Gdk::KEY_Control_L, Gtk3::Gdk::KEY_Control_R));
} else {
if (member('control-mask', @{$event->state})) {
$c eq 's' or return 1;
$start_reg and $start_reg = '', return 1;
$curr++;
} else {
- &$may_go_to_next if $c eq ' ';
+ $e->{may_go_to_next}(), return 1 if $c eq ' ';
- $curr++ if $starting_word eq '' || $starting_word eq $c;
+ $curr++ if member($starting_word, '', $c);
$starting_word .= $c unless $starting_word eq $c;
}
my @l = @{$e->{formatted_list}};
@@ -118,7 +123,7 @@ sub create_treeview_list {
if ($j == @l) {
$starting_word = '';
} else {
- $select->(Gtk2::TreePath->new_from_string(($j + $curr) % @l));
+ $select->(Gtk3::TreePath->new_from_string(($j + $curr) % @l));
}
$timeout = Glib::Timeout->add($forgetTime, sub { $timeout = $starting_word = ''; 0 });
@@ -132,9 +137,10 @@ sub create_treeview_list {
$list_tv->get_selection->signal_connect(changed => sub {
my ($model, $iter) = $_[0]->get_selected;
$model && $iter or return;
- my $row = $model->get_path_str($iter);
- ${$e->{val}} = $e->{list}[$curr = $row];
- &$changed;
+ $onchange_f->(sub {
+ my $row = $model->get_path_str($iter);
+ $e->{list}[$curr = $row];
+ });
});
$list_tv->signal_connect(button_press_event => $double_click) if $double_click;
@@ -144,7 +150,7 @@ sub create_treeview_list {
my $nb = find_index { $_ eq $v } @{$e->{list}};
my ($old_path) = $list_tv->get_cursor;
if (!$old_path || $nb != $old_path->to_string) {
- $select->(Gtk2::TreePath->new_from_string($nb));
+ $select->(Gtk3::TreePath->new_from_string($nb));
}
undef $old_path if $old_path;
};
@@ -155,7 +161,7 @@ sub __create_tree_model {
my ($e) = @_;
my $sep = quotemeta $e->{separator};
- my $tree_model = Gtk2::TreeStore->new("Glib::String", if_($e->{image2f}, "Gtk2::Gdk::Pixbuf"));
+ my $tree_model = Gtk3::TreeStore->new("Glib::String", if_($e->{image2f}, "Gtk3::Gdk::Pixbuf"));
my $build_value = sub {
my ($v) = @_;
@@ -193,17 +199,17 @@ sub __create_tree_model {
}
sub create_treeview_tree {
- my ($e, $may_go_to_next, $changed, $double_click, $tree_expanded) = @_;
+ my ($e, $onchange_f, $double_click) = @_;
my $tree_model = __create_tree_model($e);
- my $tree = Gtk2::TreeView->new_with_model($tree_model);
+ my $tree = Gtk3::TreeView->new_with_model($tree_model);
$tree->get_selection->set_mode('browse');
{
- my $col = Gtk2::TreeViewColumn->new;
- $col->pack_start(my $texrender = Gtk2::CellRendererText->new, 0);
+ my $col = Gtk3::TreeViewColumn->new;
+ $col->pack_start(my $texrender = Gtk3::CellRendererText->new, 0);
$col->add_attribute($texrender, text => 0);
if ($e->{image2f}) {
- $col->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0);
+ $col->pack_start(my $pixrender = Gtk3::CellRendererPixbuf->new, 0);
$col->add_attribute($pixrender, pixbuf => 1);
}
$tree->append_column($col);
@@ -212,15 +218,15 @@ sub create_treeview_tree {
my $select = sub {
my ($path_str) = @_;
- my $path = Gtk2::TreePath->new_from_string($path_str);
+ my $path = Gtk3::TreePath->new_from_string($path_str);
$tree->expand_to_path($path);
$tree->set_cursor($path, undef, 0);
- gtkflush(); #- workaround gtk2 bug not honouring centering on the given row if node was closed
+ gtkflush(); #- workaround gtk3 bug not honouring centering on the given row if node was closed
$tree->scroll_to_cell($path, undef, 1, 0.5, 0);
};
my $curr = $tree_model->get_iter_first; #- default value
- $tree->expand_all if $tree_expanded;
+ $tree->expand_all if $e->{tree_expanded};
my $selected_via_click;
@@ -230,10 +236,11 @@ sub create_treeview_tree {
undef $curr if ref $curr;
my $path = $tree_model->get_path($curr = $iter);
if (!$tree_model->iter_has_child($iter)) {
- my $path_str = $path->to_string;
- my $i = find_index { $path_str eq $_ } @{$tree_model->{path_str_list}};
- ${$e->{val}} = $e->{list}[$i];
- &$changed;
+ $onchange_f->(sub {
+ my $path_str = $path->to_string;
+ my $i = find_index { $path_str eq $_ } @{$tree_model->{path_str_list}};
+ $e->{list}[$i];
+ });
} else {
$tree->expand_row($path, 0) if $selected_via_click;
}
@@ -246,7 +253,7 @@ sub create_treeview_tree {
$tree->toggle_expansion($tree_model->get_path($curr), 0);
} else {
- &$may_go_to_next;
+ &{$e->{may_go_to_next}};
}
};
@@ -259,8 +266,8 @@ sub create_treeview_tree {
Glib::Source->remove($timeout) if $timeout; $timeout = '';
if ($event->keyval >= 0x100) {
- &$toggle if member($event->keyval, ($Gtk2::Gdk::Keysyms{Return}, $Gtk2::Gdk::Keysyms{KP_Enter}));
- $starting_word = '' if !member($event->keyval, ($Gtk2::Gdk::Keysyms{Control_L}, $Gtk2::Gdk::Keysyms{Control_R}));
+ &$toggle and return 1 if member($event->keyval, (Gtk3::Gdk::KEY_Return, Gtk3::Gdk::KEY_KP_Enter));
+ $starting_word = '' if !member($event->keyval, (Gtk3::Gdk::KEY_Control_L, Gtk3::Gdk::KEY_Control_R));
} else {
my $next;
if (member('control-mask', @{$event->state})) {
@@ -268,8 +275,8 @@ sub create_treeview_tree {
$start_reg and $start_reg = '', return 0;
$next = 1;
} else {
- &$toggle if $c eq ' ';
- $next = 1 if $starting_word eq '' || $starting_word eq $c;
+ &$toggle and return 1 if $c eq ' ';
+ $next = 1 if member($starting_word, '', $c);
$starting_word .= $c unless $starting_word eq $c;
}
my $word = quotemeta $starting_word;
@@ -322,52 +329,8 @@ sub create_treeview_tree {
};
}
-sub create_list {
- my ($e, $may_go_to_next, $changed, $double_click) = @_;
- my $l = $e->{list};
- my $list = Gtk2::List->new;
- $list->set_selection_mode('browse');
-
- my $select = sub {
- $list->select_item($_[0]);
- };
-
- my $tips = Gtk2::Tooltips->new;
- each_index {
- my $item = Gtk2::ListItem->new(may_apply($e->{format}, $_));
- $item->signal_connect(key_press_event => sub {
- my ($_w, $event) = @_;
- my $c = chr($event->keyval & 0xff);
- &$may_go_to_next if $event->keyval < 0x100 ? $c eq ' ' : $c eq "\r" || $c eq "\x8d";
- 0;
- });
- $list->append_items(gtkshow($item));
- if ($e->{help}) {
- gtkset_tip($tips, $item,
- ref($e->{help}) eq 'HASH' ? $e->{help}{$_} :
- ref($e->{help}) eq 'CODE' ? $e->{help}($_) : $e->{help});
- }
- $item->grab_focus if ${$e->{val}} && $_ eq ${$e->{val}};
- } @$l;
-
- #- signal_connect'ed after append_items otherwise it is called and destroys the default value
- $list->signal_connect(select_child => sub {
- my ($_w, $row) = @_;
- ${$e->{val}} = $l->[$list->child_position($row)];
- &$changed;
- });
- $list->signal_connect(button_press_event => $double_click) if $double_click;
-
- $list, sub {
- my ($v) = @_;
- eval {
- $select->(find_index { $_ eq $v } @$l);
- };
- };
-}
-
#- $actions is a ref list of $action
-#- $action is a { kind => $kind, action => sub { ... }, button => Gtk2::Button->new(...) }
+#- $action is a { kind => $kind, action => sub { ... }, button => Gtk3::Button->new(...) }
#- where $kind is one of '', 'modify', 'remove', 'add'
sub add_modify_remove_action {
my ($button, $buttons, $e, $treelist) = @_;
@@ -383,378 +346,560 @@ sub add_modify_remove_action {
} elsif ($button->{kind} eq 'remove') {
${$e->{val}} = $e->{list}[0];
}
- ugtk2::gtk_set_treelist($treelist, [ map { may_apply($e->{format}, $_) } @{$e->{list}} ]);
+ ugtk3::gtk_set_treelist($treelist, [ map { may_apply($e->{format}, $_) } @{$e->{list}} ]);
add_modify_remove_sensitive($buttons, $e);
1;
}
-sub add_modify_remove_sensitive {
- my ($buttons, $e) = @_;
- $_->{button}->set_sensitive(@{$e->{list}} != ()) foreach
- grep { member($_->{kind}, 'modify', 'remove') } @$buttons;
-}
+sub add_padding {
+ my ($w) = @_;
+ gtknew('HBox', children => [
+ 0, gtknew('Alignment', width => $mygtk3::left_padding),
+ 1, $w
+ ]);
+}
-sub ask_fromW {
- my ($o, $common, $l, $l2) = @_;
- my $ignore = 0; #-to handle recursivity
+sub create_widget {
+ my ($o, $common, $e, $onchange_f, $update, $ignore_ref) = @_;
- my $mainw = ugtk2->new($common->{title}, %$o, modal => 1, if__($::main_window, transient => $::main_window), if_($common->{icon}, icon => $common->{icon}));
-
- #-the widgets
- my (@widgets, @widgets_always, @widgets_advanced, $advanced);
- my $tooltips = Gtk2::Tooltips->new;
- my $ok_clicked = sub {
- !$mainw->{ok} || $mainw->{ok}->get_property('sensitive') or return;
- $mainw->{retval} = 1;
- Gtk2->main_quit;
+ my $onchange = sub {
+ my ($f) = @_;
+ sub { $onchange_f->($f, @_) };
};
+
+ my ($w, $real_w, $focus_w, $set);
+ if ($e->{type} eq 'iconlist') {
+ $w = Gtk3::Button->new;
+ $set = sub {
+ gtkdestroy($e->{icon});
+ my $f = $e->{icon2f}->($_[0]);
+ $e->{icon} = -e $f ?
+ gtkcreate_img($f) :
+ Gtk3::WrappedLabel->new(may_apply($e->{format}, $_[0]));
+ $w->add(gtkshow($e->{icon}));
+ };
+ $w->signal_connect(clicked => sub {
+ $onchange_f->(sub { next_val_in_array(${$e->{val}}, $e->{list}) });
+ $set->(${$e->{val}});
+ });
+ if ($e->{alignment} eq 'right') {
+ $real_w = gtknew('HButtonBox', layout => 'start', children_tight => [ $w ]);
+ } else {
+ $real_w = gtkpack_(Gtk3::HBox->new(0,10), 1, Gtk3::HBox->new(0,0), 0, $w, 1, Gtk3::HBox->new(0,0));
+ }
+ } elsif ($e->{type} eq 'bool') {
+ if ($e->{image}) {
+ $w = ugtk3::gtkadd(Gtk3::CheckButton->new, gtkshow(gtkcreate_img($e->{image})));
+ } else {
+ #- warn "\"text\" member should have been used instead of \"label\" one at:\n", common::backtrace(), "\n" if $e->{label} && !$e->{text};
+ $w = Gtk3::CheckButton->new_with_label($e->{text} || '');
+ }
+ $w->signal_connect(clicked => $onchange->(sub { $w->get_active }));
+ ${$e->{val}} ||= 0;
+ $set = sub { $w->set_active($_[0] || 0) };
+ $real_w = add_padding($w);
+ } elsif ($e->{type} eq 'only_label') {
+ my @common = (
+ # workaround infamous 6 years old gnome bug #101968:
+ if_($e->{alignment} ne 'right', width => mygtk3::get_label_width())
+ );
+ $w = $e->{title} ?
+ gtknew('Title2', label => escape_text_for_TextView_markup_format(${$e->{val}}), @common) :
+ gtknew($e->{alignment} eq 'right' ? 'Label_Right' : 'Label_Left',
+ line_wrap => 1, text_markup => ${$e->{val}}, @common);
+ } elsif ($e->{type} eq 'label') {
+ $w = gtknew('WrappedLabel', text_markup => ${$e->{val}});
+ $set = sub { $w->set($_[0]) };
+ } elsif ($e->{type} eq 'empty') {
+ $w = gtknew('HBox', height => $e->{height});
+ } elsif ($e->{type} eq 'button') {
+ $w = gtknew(($e->{install_button} ? 'Install_Button' : 'Button'),
+ text => '', clicked => $e->{clicked_may_quit_cooked});
+ $set = sub {
+ my $w = $w->get_child;
+ # handle Install_Buttons:
+ if (ref($w) =~ /Gtk3::HBox/) {
+ ($w) = find { ref($_) =~ /Gtk3::Label/ } $w->get_children;
+ }
+ # guard against 'advanced' widgets that are now in their own dialog
+ # (instead of in another block child of an expander):
+ return if !$w;
+ $w->set_label(may_apply($e->{format}, $_[0])) };
+ } elsif ($e->{type} eq 'range') {
+ my $adj = Gtk3::Adjustment->new(${$e->{val}}, $e->{min}, $e->{max} + ($e->{SpinButton} ? 0 : 1), 1, ($e->{max} - $e->{min}) / 10, 1);
+ $w = $e->{SpinButton} ? Gtk3::SpinButton->new($adj, 10, 0) : Gtk3::HScale->new($adj);
+ $w->set_size_request($e->{SpinButton} ? 100 : 200, -1);
+ $w->set_digits(0);
+ $adj->signal_connect(value_changed => $onchange->(sub { $adj->get_value }));
+ $w->signal_connect(key_press_event => $e->{may_go_to_next});
+ $set = sub { $adj->set_value($_[0]) };
+ } elsif ($e->{type} eq 'expander') {
+ $e->{grow} = 'fill';
+ my $children = [ if_($e->{message}, { type => 'only_label', no_indent => 1, val => \$e->{message} }), @{$e->{children}} ];
+ create_widgets_block($o, $common, $children, $update, $ignore_ref);
+ $w = gtknew('HBox', children_tight => [
+ gtknew('Install_Button', text => $e->{text},
+ clicked => sub {
+ eval { ask_fromW($o, { title => $common->{advanced_title} || $common->{title} || N("Advanced") }, $children) };
+ if (my $err = $@) {
+ die $err if $err !~ /^wizcancel/;
+ }
+ }
+ )
+ ]);
+ } elsif ($e->{type} =~ /list/) {
+
+ $e->{formatted_list} = [ map { may_apply($e->{format}, $_) } @{$e->{list}} ];
+
+ if (my $actions = $e->{add_modify_remove}) {
+ my @buttons = (N_("Add"), N_("Modify"), N_("Remove"));
+ # Add Up/Down buttons if their actions are defined
+ push @buttons, map { if_($actions->{$_}, 'gtk-go-' . $_) } qw(Up Down);
+ @buttons = map {
+ my $button = /^gtk-/ ? gtknew('Button', image => gtknew('Image', stock => lc($_)))
+ : Gtk3::Button->new(translate($_));
+ my $kind = $_;
+ $kind =~ s/^gtk-go-//;
+ { kind => lc $kind, action => $actions->{$kind}, button => $button, real_kind => $_ };
+ } @buttons;
+ my $modify = find { $_->{kind} eq 'modify' } @buttons;
+
+ my $do_action = sub {
+ my ($button) = @_;
+ add_modify_remove_action($button, \@buttons, $e, $w) and $update->();
+ };
+
+ ($w, $set, $focus_w) = create_treeview_list($e, $onchange_f,
+ sub { $do_action->($modify) if $_[1]->type =~ /^2/ });
+
+ foreach my $button (@buttons) {
+ $button->{button}->signal_connect(clicked => sub { $do_action->($button) });
+ }
+ add_modify_remove_sensitive(\@buttons, $e);
+
+ my ($images, $real_buttons) = partition { $_->{real_kind} =~ /^gtk-/ } @buttons;
+ $real_w = gtkpack_(Gtk3::HBox->new(0,0),
+ 1, create_scrolled_window($w),
+ 0, gtkpack__(Gtk3::VBox->new(0,0),
+ (map { $_->{button} } @$real_buttons),
+ if_($images,
+ gtknew('HButtonBox',
+ layout => 'spread',
+ children_loose => [ map { $_->{button} } @$images ]
+ )
+ ),
+ ),
+ );
+ $e->{grow} = 'expand';
+ } else {
+ my $use_boxradio = exists $e->{gtk}{use_boxradio} ? $e->{gtk}{use_boxradio} : @{$e->{list}} <= 8;
+
+ if ($e->{help} || $use_boxradio && $e->{type} ne 'treelist') {
+ #- used only when needed, as key bindings are dropped by List (ListStore does not seems to accepts Tooltips).
+ ($w, $set, $focus_w) = create_boxradio($e, $onchange_f, $e->{quit_if_double_click_cooked});
+ $real_w = add_padding($w);
+ } elsif ($e->{type} eq 'treelist') {
+ ($w, $set) = create_treeview_tree($e, $onchange_f, $e->{quit_if_double_click_cooked});
+ } else {
+ ($w, $set, $focus_w) = create_treeview_list($e, $onchange_f, $e->{quit_if_double_click_cooked});
+ }
+ if (@{$e->{list}} > 10 || $e->{gtk}{use_scrolling}) {
+ $real_w = create_scrolled_window($w);
+ $e->{grow} = 'expand';
+ }
+ }
+ } else {
+ if ($e->{type} eq "combo") {
+ my $model;
+
+ my @formatted_list = map { may_apply($e->{format}, $_) } @{$e->{list}};
+ $e->{formatted_list} = \@formatted_list;
+
+ if (!$e->{separator}) {
+ if ($e->{not_edit}) {
+ $real_w = $w = Gtk3::ComboBoxText->new;
+ # FIXME: the following causes Gtk-CRITICAL but not solvable at realize time:
+ first($w->get_child->get_cells)->set_property('ellipsize', 'end') if !$e->{do_not_ellipsize};
+ $w->set_wrap_width($e->{gtk}{wrap_width}) if exists $e->{gtk}{wrap_width};
+ } else {
+ $w = Gtk3::ComboBoxText->new_with_entry;
+ ($real_w, $w) = ($w, $w->get_child);
+ }
+ $real_w->set_popdown_strings(@formatted_list);
+ } else {
+ $model = __create_tree_model($e);
+ $real_w = $w = Gtk3::ComboBox->new_with_model($model);
+
+ $w->pack_start(my $texrender = Gtk3::CellRendererText->new, 0);
+ $w->add_attribute($texrender, text => 0);
+ if ($e->{image2f}) {
+ $w->pack_start(my $pixrender = Gtk3::CellRendererPixbuf->new, 0);
+ $w->add_attribute($pixrender, pixbuf => 1);
+ }
+ }
+
+ my $get = sub {
+ my $i = $model ? do {
+ my (undef, $iter) = $w->get_active_iter;
+ my $s = $model->get_string_from_iter($iter);
+ eval { find_index { $s eq $_ } @{$model->{path_str_list}} };
+ } : do {
+ my $s = $w->get_text;
+ eval { find_index { $s eq $_ } @formatted_list };
+ };
+ defined $i ? $e->{list}[$i] : $w->get_text;
+ };
+ $w->signal_connect(changed => $onchange->($get));
+
+ $set = sub {
+ my $s = may_apply($e->{format}, $_[0]);
+ if ($model) {
+ eval {
+ my $i = find_index { $s eq $_ } @{$e->{formatted_list}};
+ my $path_str = $model->{path_str_list}[$i];
+ $w->set_active_iter($model->get_iter_from_string($path_str));
+ };
+ } else {
+ $w->set_text($s) if !member($w->get_text, $s, $_[0]);
+ }
+ };
+ } else {
+ if ($e->{weakness_check}) {
+ $w = gtknew('WeaknessCheckEntry');
+ }
+ else {
+ $w = Gtk3::Entry->new;
+ }
+ $w->signal_connect(changed => $onchange->(sub { $w->get_text }));
+ $w->signal_connect(focus_in_event => sub { $w->select_region(0, -1) });
+ $w->signal_connect(focus_out_event => sub { $w->select_region(0, 0) });
+ $set = sub { $w->set_text($_[0]) if $_[0] ne $w->get_text };
+ if ($e->{type} eq 'file') {
+ my $button = gtksignal_connect(Gtk3::Button->new_from_stock('gtk-open'), clicked => sub {
+ my $file = $o->ask_fileW({
+ title => $e->{label},
+ want_a_dir => to_bool($e->{want_a_dir}),
+ });
+ $set->($file) if $file;
+ });
+ $real_w = gtkpack_(Gtk3::HBox->new(0,0), 1, $w, 0, $button);
+ }
+ }
+ $w->signal_connect(key_press_event => $e->{may_go_to_next});
+ if ($e->{hidden}) {
+ $w->set_visibility(0);
+ $w->signal_connect(key_press_event => sub {
+ my (undef, $event) = @_;
+ if (!$o->{capslock_warned} && member('lock-mask', @{$event->state}) && !$w->get_text) {
+ $o->{capslock_warned} = 1;
+ $o->ask_warn('', N("Beware, Caps Lock is enabled"));
+ }
+ 0;
+ });
+ }
+ }
+
+ if (my $focus_out = $e->{focus_out}) {
+ $w->signal_connect(focus_out_event => sub { $update->($focus_out) });
+ }
+ $real_w ||= $w;
+
+ $e->{w} = $w;
+ $e->{real_w} = $real_w;
+ $e->{focus_w} = $focus_w || $w if $e->{type} ne 'empty';
+ $e->{set} = $set || sub {};
+}
+
+sub all_entries {
+ my ($l) = @_;
+ map { $_, if_($_->{children}, @{$_->{children}}) } @$l;
+}
+
+sub all_focusable_entries {
+ my ($l) = @_;
+ grep { $_->{focus_w} } @$l;
+}
+
+sub all_title_entries {
+ my ($l) = @_;
+ grep { $_->{title} } @$l;
+}
+
+sub create_widgets_block {
+ my ($o, $common, $l, $update, $ignore_ref) = @_;
+
+ my $label_sizegrp = Gtk3::SizeGroup->new('horizontal');
+ my $right_label_sizegrp = Gtk3::SizeGroup->new('horizontal');
+ my $realw_sizegrp = Gtk3::SizeGroup->new('horizontal');
+
+ @$l = map_index {
+ if ($::i && ($_->{type} eq 'expander' || $_->{title})) {
+ ({ type => 'empty', height => 4 }, $_);
+ } else {
+ $_;
+ }
+ } @$l;
+
+ foreach my $e (@$l) {
+ my $onchange_f = sub {
+ my ($f, @para) = @_;
+ return if $$ignore_ref;
+ ${$e->{val}} = $f->(@para);
+ $update->($e->{changed});
+ };
+
+ create_widget($o, $common, $e, $onchange_f, $update, $ignore_ref);
+
+ my $label_w;
+ if ($e->{label} || !$e->{no_indent}) {
+ $label_w = gtknew($e->{alignment} eq 'right' ? 'Label_Right' : 'Label_Left', text_markup => $e->{label} || '',
+ size_group => ($e->{alignment} eq 'right' ? $right_label_sizegrp : $label_sizegrp),
+ );
+ $realw_sizegrp->add_widget($e->{real_w});
+ }
+
+ if ($e->{do_not_expand}) {
+ $e->{real_w} = gtknew('HBox', children => [
+ 0, $e->{real_w},
+ 1, gtknew('Label'),
+ ]);
+ }
+
+ my $eater = if_($e->{alignment} eq 'right' && !$label_w, gtknew('Label'));
+
+ $e->{real_w} = gtkpack_(Gtk3::HBox->new,
+ if_($e->{icon}, 0, eval { gtkcreate_img($e->{icon}) }),
+ if_($eater, 1, $eater),
+ if_($label_w, $e->{alignment} eq 'right', $label_w),
+ (!$eater, $e->{real_w}),
+ );
+ }
+ gtknew('VBox', children => [ map { $_->{grow} || 0, $_->{real_w} } @$l ]);
+}
+
+sub create_widgets {
+ my ($o, $common, $mainw, $l) = @_;
+
+ my $ignore = 0; #-to handle recursivity
my $set_all = sub {
$ignore = 1;
- $_->{set}->(${$_->{e}{val}}, $_) foreach @widgets_always, @widgets_advanced;
- $_->{real_w}->set_sensitive(!$_->{e}{disabled}()) foreach @widgets_always, @widgets_advanced;
- $mainw->{ok}->set_sensitive(!$common->{callbacks}{ok_disabled}()) if $common->{callbacks}{ok_disabled};
+ my @all = all_entries($l);
+ $_->{set}->(${$_->{val}}, $_) foreach @all; #- nb: the parameter "$_" is needed for create_boxradio
+ $_->{disabled} and $_->{real_w}->set_sensitive(!$_->{disabled}()) foreach @all;
+ $_->{hidden} and $_->{w}->set_visibility(!(ref($_->{hidden}) eq 'CODE' ? $_->{hidden}() : $_->{hidden})) foreach @all;
+ $mainw->{ok}->set_sensitive(!$common->{ok_disabled}()) if $common->{ok_disabled};
$ignore = 0;
};
- my $get_all = sub {
- ${$_->{e}{val}} = $_->{get}->() foreach @widgets_always, @widgets_advanced;
- };
my $update = sub {
my ($f) = @_;
return if $ignore;
- $get_all->();
- $f->();
+ $f->() if $f;
$set_all->();
};
- my @label_sizegrp = map { Gtk2::SizeGroup->new('horizontal') } 0 .. 1;
- my @realw_sizegrp = map { Gtk2::SizeGroup->new('horizontal') } 0 .. 1;
+ my $ok_clicked = sub {
+ !$mainw->{ok} || $mainw->{ok}->get_property('sensitive') or return;
+ $mainw->{retval} = 1;
+ Gtk3->main_quit;
+ };
- my $create_widget = sub {
- my ($e, $ind) = @_;
+ my @all = all_entries($l);
+ foreach (@all) {
+ my $e = $_; #- for closures
- my $may_go_to_next = sub {
+ # we only consider real widgets (aka ignoring labels and Help/Release Notes/... buttons):
+ if ((grep { !$_->{install_button} && $_->{type} ne 'only_label' } @all) == 1 || $e->{quit_if_double_click}) {
+ #- i'm the only one, double click means accepting
+ $e->{quit_if_double_click_cooked} = sub { $_[1]->type =~ /^2/ && $ok_clicked->() };
+ }
+
+ if ($e->{clicked_may_quit}) {
+ $e->{clicked_may_quit_cooked} = sub {
+ $mainw->{rwindow}->hide;
+ if (my $v = $e->{clicked_may_quit}()) {
+ $mainw->{retval} = $v;
+ Gtk3->main_quit;
+ }
+ $mainw->{rwindow}->show;
+ $update->();
+ };
+ }
+
+ $e->{may_go_to_next} = sub {
my (undef, $event) = @_;
if (!$event || ($event->keyval & 0x7f) == 0xd) {
- if ($ind == $#widgets) {
- @widgets == 1 ? $ok_clicked->() : $mainw->{ok}->grab_focus;
+ my @current_all = all_focusable_entries($l);
+ my $ind = eval { find_index { $_ == $e } @current_all };
+ if (my $e_ = $current_all[$ind+1]) {
+ $e_->{focus_w}->grab_focus;
} else {
- $widgets[$ind+1]{focus_w}->grab_focus;
+ @current_all == 1 ? $ok_clicked->() : $mainw->{ok}->grab_focus;
}
- return 1; #- prevent an action on the just grabbed focus
+ 1; #- prevent an action on the just grabbed focus
+ } else {
+ 0;
}
};
- my $changed = sub { $update->(sub { $common->{callbacks}{changed}($ind) }) };
+ }
- my ($w, $real_w, $focus_w, $set, $get, $grow);
- if ($e->{type} eq 'iconlist') {
- $w = Gtk2::Button->new;
- $set = sub {
- gtkdestroy($e->{icon});
- my $f = $e->{icon2f}->($_[0]);
- $e->{icon} = -e $f ?
- gtkcreate_img($f) :
- Gtk2::WrappedLabel->new(may_apply($e->{format}, $_[0]));
- $w->add(gtkshow($e->{icon}));
- };
- $w->signal_connect(clicked => sub {
- $set->(${$e->{val}} = next_val_in_array(${$e->{val}}, $e->{list}));
- $changed->();
- });
- $real_w = gtkpack_(Gtk2::HBox->new(0,10), 1, Gtk2::HBox->new(0,0), 0, $w, 1, Gtk2::HBox->new(0,0));
- } elsif ($e->{type} eq 'bool') {
- if ($e->{image}) {
- $w = ugtk2::gtkadd(Gtk2::CheckButton->new, gtkshow(gtkcreate_img($e->{image})));
- } else {
-#- warn "\"text\" member should have been used instead of \"label\" one at:\n", common::backtrace(), "\n" if $e->{label} && !$e->{text};
- $w = Gtk2::CheckButton->new_with_label($e->{text});
- }
- $w->signal_connect(clicked => $changed);
- $set = sub { $w->set_active($_[0]) };
- $get = sub { $w->get_active };
- } elsif ($e->{type} eq 'label') {
- $w = Gtk2::WrappedLabel->new(${$e->{val}});
- $set = sub { $w->set($_[0]) };
- } elsif ($e->{type} eq 'button') {
- $w = Gtk2::Button->new_with_label('');
- $w->signal_connect(clicked => sub {
- $get_all->();
- $mainw->{rwindow}->hide;
- if (my $v = $e->{clicked_may_quit}()) {
- $mainw->{retval} = $v;
- Gtk2->main_quit;
- }
- $mainw->{rwindow}->show;
- $set_all->();
- });
- $set = sub { $w->child->set_label(may_apply($e->{format}, $_[0])) };
- } elsif ($e->{type} eq 'range') {
- my $want_scale = !$::expert;
- my $adj = Gtk2::Adjustment->new(${$e->{val}}, $e->{min}, $e->{max} + ($want_scale ? 1 : 0), 1, ($e->{max} - $e->{min}) / 10, 1);
- $adj->signal_connect(value_changed => $changed);
- $w = $want_scale ? Gtk2::HScale->new($adj) : Gtk2::SpinButton->new($adj, 10, 0);
- $w->set_size_request($want_scale ? 200 : 100, -1);
- $w->set_digits(0);
- $w->signal_connect(key_press_event => $may_go_to_next);
- $set = sub { $adj->set_value($_[0]) };
- $get = sub { $adj->get_value };
- } elsif ($e->{type} =~ /list/) {
-
- $e->{formatted_list} = [ map { may_apply($e->{format}, $_) } @{$e->{list}} ];
-
- if (my $actions = $e->{add_modify_remove}) {
- my @buttons = map {
- { kind => lc $_, action => $actions->{$_}, button => Gtk2::Button->new(translate($_)) };
- } N_("Add"), N_("Modify"), N_("Remove");
- my $modify = find { $_->{kind} eq 'modify' } @buttons;
-
- my $do_action = sub {
- my ($button) = @_;
- add_modify_remove_action($button, \@buttons, $e, $w) and $changed->();
- };
+ # add asterisks before titles when there're more than one:
+ my @all_titles = all_title_entries($l);
+ if (2 <= @all_titles) {
+ ${$_->{val}} = mygtk3::asteriskize(${$_->{val}}) foreach @all_titles;
+ }
- ($w, $set, $focus_w) = create_treeview_list($e, $may_go_to_next, $changed,
- sub { $do_action->($modify) if $_[1]->type =~ /^2/ });
- $e->{saved_default_val} = ${$e->{val}};
+ my $box = create_widgets_block($o, $common, $l, $update, \$ignore);
- foreach my $button (@buttons) {
- $button->{button}->signal_connect(clicked => sub { $do_action->($button) });
- }
- add_modify_remove_sensitive(\@buttons, $e);
+ foreach my $e (@all) {
+ $e->{w}->set_tooltip_text($e->{help}) if $e->{help} && !ref($e->{help});
+ }
- $real_w = gtkpack_(Gtk2::HBox->new(0,0),
- 1, create_scrolled_window($w),
- 0, gtkpack__(Gtk2::VBox->new(0,0), map { $_->{button} } @buttons));
- $grow = 1;
- } else {
+ $box, $set_all;
+}
- my $quit_if_double_click =
- #- i'm the only one, double click means accepting
- @$l == 1 || $e->{quit_if_double_click} ?
- sub { $_[1]->type =~ /^2/ && $ok_clicked->() } : '';
+sub add_modify_remove_sensitive {
+ my ($buttons, $e) = @_;
+ $_->{button}->set_sensitive(@{$e->{list}} != ()) foreach
+ grep { member($_->{kind}, 'modify', 'remove') } @$buttons;
+}
- my @para = ($e, $may_go_to_next, $changed, $quit_if_double_click);
- my $use_boxradio = exists $e->{gtk}{use_boxradio} ? $e->{gtk}{use_boxradio} : @{$e->{list}} <= 8;
+sub filter_widgets {
+ my ($l) = @_;
- if ($e->{help}) {
- #- used only when needed, as key bindings are dropped by List (ListStore does not seems to accepts Tooltips).
- ($w, $set, $focus_w) = $use_boxradio ? create_boxradio(@para) : create_list(@para);
- } elsif ($e->{type} eq 'treelist') {
- ($w, $set) = create_treeview_tree(@para, $e->{tree_expanded});
- $e->{saved_default_val} = ${$e->{val}}; #- during realization, signals will mess up the default val :(
- } else {
- if ($use_boxradio) {
- ($w, $set, $focus_w) = create_boxradio(@para);
- } else {
- ($w, $set, $focus_w) = create_treeview_list(@para);
- $e->{saved_default_val} = ${$e->{val}};
- }
- }
- if (@{$e->{list}} > 10) {
- $real_w = create_scrolled_window($w);
- $grow = 1;
- }
- }
- } else {
- if ($e->{type} eq "combo") {
- my $model;
+ foreach my $e (all_entries($l)) {
+ $e->{no_indent} = 1 if member($e->{type}, 'list', 'treelist', 'expander', 'bool', 'only_label');
+ }
+}
- my @formatted_list = map { may_apply($e->{format}, $_) } @{$e->{list}};
- $e->{formatted_list} = \@formatted_list;
+my $help_path = "/usr/share/doc/installer-help";
- my @l = sort { $b <=> $a } map { length } @formatted_list;
- my $width = $l[@l / 16]; # take the third octile (think quartile)
+sub is_help_file_exist {
+ my ($_o, $id) = @_;
+ # just ignore anchors:
+ $id =~ s/#.*//;
+ -e "$help_path/$id.html";
+}
- if (!$e->{separator}) {
- if ($e->{not_edit} && $width < 160) { #- ComboBoxes do not have an horizontal scroll-bar. This can cause havoc for long strings (eg: diskdrake Create dialog box in expert mode)
- $w = Gtk2::ComboBox->new_text;
- } else {
- $w = Gtk2::Combo->new;
- $w->set_use_arrows_always(1);
- $w->entry->set_editable(!$e->{not_edit});
- $w->disable_activate;
- }
- $w->set_popdown_strings(@formatted_list);
- $w->set_text(ref($e->{val}) ? may_apply($e->{format}, ${$e->{val}}) : $formatted_list[0]) if $w->isa('Gtk2::ComboBox');
- } else {
- $model = __create_tree_model($e);
- $w = Gtk2::ComboBox->new_with_model($model);
-
- $w->pack_start(my $texrender = Gtk2::CellRendererText->new, 0);
- $w->add_attribute($texrender, text => 0);
- if ($e->{image2f}) {
- $w->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0);
- $w->add_attribute($pixrender, pixbuf => 1);
- }
- }
- ($real_w, $w) = ($w, $w->entry);
-
- #- FIXME workaround gtk suckiness (set_text generates two 'change' signals, one when removing the whole, one for inserting the replacement..)
- my $idle;
- $w->signal_connect(changed => sub {
- $idle ||= Glib::Idle->add(sub { undef $idle; $changed->(); 0 });
- });
-
- $set = sub {
- my $s = may_apply($e->{format}, $_[0]);
- if ($model) {
- eval {
- my $i = find_index { $s eq $_ } @{$e->{formatted_list}};
- my $path_str = $model->{path_str_list}[$i];
- $w->set_active_iter($model->get_iter_from_string($path_str));
- };
- } else {
- $w->set_text($s) if $s ne $w->get_text && $_[0] ne $w->get_text;
- }
- };
- $get = sub {
- my $i = $model ? do {
- my $s = $model->get_string_from_iter($w->get_active_iter);
- eval { find_index { $s eq $_ } @{$model->{path_str_list}} };
- } : do {
- my $s = $w->get_text;
- eval { find_index { $s eq $_ } @formatted_list };
- };
- defined $i ? $e->{list}[$i] : $w->get_text;
- };
- } else {
- $w = Gtk2::Entry->new;
- $w->signal_connect(changed => $changed);
- $w->signal_connect(focus_in_event => sub { $w->select_region(0, -1) });
- $w->signal_connect(focus_out_event => sub { $w->select_region(0, 0) });
- $set = sub { $w->set_text($_[0]) if $_[0] ne $w->get_text };
- $get = sub { $w->get_text };
- }
- $w->signal_connect(key_press_event => $may_go_to_next);
- $w->set_visibility(0) if $e->{hidden};
- }
- $w->signal_connect(focus_out_event => sub {
- $update->(sub { $common->{callbacks}{focus_out}($ind) });
- });
- $tooltips->set_tip($w, $e->{help}) if $e->{help} && !ref($e->{help});
+sub load_from_uri {
+ my ($view, $url) = @_;
+ $view->load_uri(get_html_file($::o, $url));
+}
- $real_w ||= $w;
- $real_w = gtkpack_(Gtk2::HBox->new,
- if_($e->{icon}, 0, eval { gtkcreate_img($e->{icon}) }),
- 0, gtkadd_widget($label_sizegrp[$e->{advanced} ? 1 : 0], $e->{label}),
- 1, gtkadd_widget($realw_sizegrp[$e->{advanced} ? 1 : 0], $real_w),
- ) if !$real_w->isa("Gtk2::CheckButton") || $e->{icon} || $e->{label};
+sub get_html_file {
+ my ($o, $url) = @_;
+ my $anchor;
+ ($url, $anchor) = $url =~ /(.*)#(.*)/ if $url =~ /#/;
+ $url .= '.html' if $url !~ /\.html$/;
+ $url = find { -e $_ } map { "$help_path/${_}" }
+ map {
+ my $id = $_;
+ require lang;
+ map { ("$_/$id") } map { $_, lc($_) } (split ':', lang::getLANGUAGE($o->{locale}{lang})), '';
+ } $url;
+ $url = "file://$url";
+ $anchor ? "$url#$anchor" : $url;
+}
- { e => $e, w => $w, real_w => $real_w, focus_w => $focus_w || $w,
- get => $get || sub { ${$e->{val}} }, set => $set || sub {}, grow => $grow };
- };
- @widgets_always = map_index { $create_widget->($_, $::i) } @$l;
- @widgets_advanced = map_index { $create_widget->($_, $::i + @$l) } @$l2;
+sub display_help_window {
+ my ($o, $common) = @_;
+ if (my $file = $common->{interactive_help_id}) {
+ require Gtk3::WebKit2;
+ my $view = gtknew('WebKit2_WebView');
+
+ load_from_uri($view, $file);
+
+ my $w = ugtk3->new(N("Help"), modal => 1);
+ gtkadd($w->{rwindow},
+ gtkpack_(Gtk3::VBox->new,
+ 1, create_scrolled_window(gtkset_border_width($view, 5),
+ [ 'never', 'automatic' ],
+ ),
+ 0, Gtk3::HSeparator->new,
+ 0, gtkpack(create_hbox('end'),
+ gtknew('Button', text => N("Close"), clicked => sub { Gtk3->main_quit })
+ ),
+ ),
+ );
+ mygtk3::set_main_window_size($w->{rwindow});
+ $w->{real_window}->grab_focus;
+ $w->{real_window}->show_all;
+ $w->main;
+ return;
+ } elsif (my $message = $common->{interactive_help}->()) {
+ $o->ask_warn(N("Help"), $message);
+ }
+}
+
+sub display_help {
+ my ($o, $common) = @_;
+ # not very safe but we run in a restricted environment anyway:
+ my $f = '/tmp/help.txt';
+ if ($common->{interactive_help}) {
+ output($f, $common->{interactive_help}->());
+ }
+ local $ENV{LC_ALL} = $::o->{locale}{lang} || 'C';
+ system('display_installer_help', $common->{interactive_help_id} || $f, $o->{locale}{lang});
+}
+
+sub ask_fromW {
+ my ($o, $common, $l) = @_;
+
+ filter_widgets($l);
+
+ my $mainw = ugtk3->new($common->{title}, %$o, if__($::main_window, transient => $::main_window),
+ if_($common->{icon}, icon => $common->{icon}), banner_title => $common->{banner_title},
+ );
+
+ my ($box, $set_all) = create_widgets($o, $common, $mainw, $l);
$mainw->{box_allow_grow} = 1;
my $pack = create_box_with_title($mainw, @{$common->{messages}});
- mygtk2::set_main_window_size($mainw->{rwindow}) if $mainw->{pop_it} && (@$l || $mainw->{box_size} == 200);
-
- my @before_widgets_advanced = (
- (map { { grow => 0, real_w => Gtk2::WrappedLabel->new($_) } } @{$common->{advanced_messages}}),
- { grow => 0, real_w => Gtk2::HSeparator->new },
- );
-
- my $first_time = 1;
- my $set_advanced = sub {
- ($advanced) = @_;
- $update->($common->{callbacks}{advanced}) if $advanced && !$first_time;
- foreach (@before_widgets_advanced, @widgets_advanced) {
- my $w = $_->{embed_scroll} || $_->{real_w};
- $advanced ? $w->show : $w->hide;
- }
- @widgets = (@widgets_always, if_($advanced, @widgets_advanced));
- $first_time = 0;
- $set_all->(); #- must be done when showing advanced lists (to center selected value)
- };
- if ($::expert && @$l2) {
- $common->{advanced_state} = 1;
- }
- my $advanced_button = [ $common->{advanced_state} ? $common->{advanced_label_close} : $common->{advanced_label},
- sub {
- my ($w) = @_;
- $set_advanced->(!$advanced);
- $w->child->set_label($advanced ? $common->{advanced_label_close} : $common->{advanced_label});
- } ];
+ mygtk3::set_main_window_size($mainw->{rwindow}) if $mainw->{pop_it} && !$common->{auto_window_size} && (@$l || $mainw->{box_size} == 200);
my @more_buttons = (
- if_($common->{interactive_help},
- [ N("Help"), sub {
- my $message = $common->{interactive_help}->() or return;
- $o->ask_warn(N("Help"), $message);
- }, 1 ]),
+ if_($common->{interactive_help} || $common->{interactive_help_id},
+ [ gtknew('Install_Button', text => N("Help"),
+ clicked => sub { display_help($o, $common) }), undef, 1 ]),
if_($common->{more_buttons}, @{$common->{more_buttons}}),
);
- my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', @more_buttons, if_(@$l2, $advanced_button));
-
- my @widgets_to_pack;
- foreach my $l (\@widgets_always, if_(@widgets_advanced, [ @before_widgets_advanced, @widgets_advanced ])) {
- my @grouped;
- my $add_grouped = sub {
- if (@grouped == 0) {
- } elsif (@grouped == 1) {
- push @widgets_to_pack, 0 => $grouped[0]{real_w};
- } else {
- my $scroll = create_scrolled_window(gtkpack__(Gtk2::VBox->new(0,0), map { $_->{real_w} } @grouped),
- [ 'automatic', 'automatic' ], 'none');
- $_->{embed_scroll} = $scroll foreach @grouped;
- push @widgets_to_pack, 1 => $scroll;
- }
- @grouped = ();
- };
- foreach (@$l) {
- if ($_->{grow}) {
- $add_grouped->();
- push @widgets_to_pack, 1 => $_->{real_w};
- } else {
- push @grouped, $_;
- }
- }
- $add_grouped->();
- }
+ my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', @more_buttons);
- gtkpack_($pack, @widgets_to_pack);
+ gtkpack_($pack, 1, gtknew('ScrolledWindow', shadow_type => 'none', child => $box)) if @$l;
if ($buttons_pack) {
$pack->pack_end(gtkshow($buttons_pack), 0, 0, 0);
}
- ugtk2::gtkadd($mainw->{window}, $pack);
- $set_advanced->($common->{advanced_state});
-
- my $widget_to_focus =
- $common->{focus_cancel} ? $mainw->{cancel} :
- @widgets && ($common->{focus_first} || !$mainw->{ok} || @widgets == 1 && member(ref($widgets[0]{focus_w}), "Gtk2::TreeView", "Gtk2::RadioButton")) ?
- $widgets[0]{focus_w} :
- $mainw->{ok};
+ ugtk3::gtkadd($mainw->{window}, $pack);
+ $set_all->();
+
+ my $entry_to_focus = find { $_->{focus} && $_->{focus}() } @$l;
+ my $widget_to_focus = $entry_to_focus ? $entry_to_focus->{focus_w} :
+ $common->{focus_cancel} ? $mainw->{cancel} :
+ @$l && (!$mainw->{ok} || @$l == 1 && member(ref($l->[0]{focus_w}), "Gtk3::TreeView", "Gtk3::RadioButton")) ?
+ $l->[0]{focus_w} :
+ $mainw->{ok};
$widget_to_focus->grab_focus if $widget_to_focus;
- my $check = sub {
- my ($f) = @_;
- sub {
- $get_all->();
- my ($error, $focus) = $f->();
-
- if ($error) {
- $set_all->();
- if (my $to_focus = $widgets[$focus || 0]) {
- $to_focus->{focus_w}->grab_focus;
- } else {
- log::l("ERROR: bad entry number given to focus " . backtrace());
- }
- }
- !$error;
- };
+ my $validate = sub {
+ my @all = all_entries($l);
+ my $e = find { $_->{validate} && !$_->{validate}->() } @all;
+ $e ||= $common->{validate} && !$common->{validate}() && $all[0];
+ if ($e) {
+ $set_all->();
+ $e->{focus_w}->grab_focus;
+ }
+ !$e;
};
- $_->{set}->($_->{e}{saved_default_val} || next) foreach @widgets_always, @widgets_advanced;
- $mainw->main(map { $check->($common->{callbacks}{$_}) } 'complete', 'canceled');
+ $mainw->main($validate);
}
sub ask_browse_tree_info_refW {
my ($o, $common) = @_;
add2hash($common, { wait_message => sub { $o->wait_message(@_) } });
- ugtk2::ask_browse_tree_info($common);
+ ugtk3::ask_browse_tree_info($common);
}
@@ -769,37 +914,78 @@ sub ask_from__add_modify_removeW {
$o->ask_from($title, $message, $l, %callback);
}
+my $reuse_timeout;
+
sub wait_messageW {
- my ($_o, $title, $messages) = @_;
+ my ($o, $title, $message, $message_modifiable) = @_;
+
+ my $to_modify = Gtk3::Label->new(scalar warp_text(ref $message_modifiable ? '' : $message_modifiable));
- my $to_modify;
- my @l = map { ref $_ ? (0, $_) : (1, $to_modify = Gtk2::Label->new(scalar warp_text($_))) } @$messages;
- $l[0] = 0; #- force first one
+ Glib::Source->remove($reuse_timeout) if $reuse_timeout; $reuse_timeout = '';
my $Window = gtknew('MagicWindow',
- title => $title,
- pop_it => !$::isInstall,
+ if_($title, title => $title),
+ pop_it => defined $o->{pop_wait_messages} ? $o->{pop_wait_messages} : 1,
+ pop_and_reuse => $::isInstall,
modal => 1,
- if__($::main_window, transient_for => $::main_window),
- child => gtknew('VBox', padding => 4, border_width => 10, children => \@l),
+ $::isInstall ? (banner => gtknew('Install_Title', text => $message)) : (),
+ no_Window_Manager => exists $o->{no_Window_Manager} ? $o->{no_Window_Manager} : !$::isStandalone,
+ child => gtknew('VBox', padding => 4, border_width => 10, children => [
+ 1, $to_modify,
+ if_(ref($message_modifiable), 0, $message_modifiable),
+ ]),
);
- $Window->signal_connect(expose_event => sub { $Window->{displayed} = 1; 0 });
+ mygtk3::enable_sync_flush($Window);
$Window->{wait_messageW} = $to_modify;
- mygtk2::sync($Window) while !$Window->{displayed};
+ mygtk3::sync_flush($Window);
$Window;
}
sub wait_message_nextW {
- my ($_o, $messages, $Window) = @_;
- my $msg = warp_text(join "\n", @$messages);
- return if $msg eq $Window->{wait_messageW}->get_text; #- needed otherwise no expose_event :(
+ my ($_o, $message, $Window) = @_;
+ return if $message eq $Window->{wait_messageW}->get_text; #- needed otherwise no draw :(
$Window->{displayed} = 0;
- $Window->{wait_messageW}->set($msg);
- mygtk2::sync($Window) while !$Window->{displayed};
+ $Window->{wait_messageW}->set($message);
+ mygtk3::sync($Window) while !$Window->{displayed};
}
sub wait_message_endW {
my ($_o, $Window) = @_;
- mygtk2::may_destroy($Window);
- mygtk2::flush();
+ if ($Window->{pop_and_reuse}) {
+ $reuse_timeout = Glib::Timeout->add(100, sub {
+ mygtk3::destroy_previous_popped_and_reuse_window();
+ });
+ } else {
+ mygtk3::may_destroy($Window);
+ mygtk3::flush();
+ }
+}
+
+sub wait_message_with_progress_bar {
+ my ($in, $o_title) = @_;
+
+ my $progress = gtknew('ProgressBar');
+ my $w = $in->wait_message($o_title, $progress);
+ my $displayed;
+ $progress->signal_connect(draw => sub { $displayed = 1; 0 });
+ $w, sub {
+ my ($msg, $current, $total) = @_;
+ if ($msg) {
+ $w->set($msg);
+ }
+
+ if ($total) {
+ $progress or internal_error('You must first give some text to display');
+ my $fraction = min(1, $current / $total);
+ if ($fraction != $progress->get_fraction) {
+ $progress->set_fraction($fraction);
+ $progress->show;
+ $displayed = 0;
+ mygtk3::flush() while !$displayed;
+ }
+ } else {
+ $progress->hide;
+ mygtk3::flush();
+ }
+ };
}
sub kill {
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-31 17:00:00 +0000