diff options
| -rw-r--r-- | perl-install/any.pm | 11 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/interactive/gtk.pm | 24 |
3 files changed, 12 insertions, 25 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index ac583bf54..593be7e04 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -900,18 +900,13 @@ sub display_release_notes { }, [ {} ]); return; } - require Gtk2::Html2; + require Gtk2::WebKit; require ugtk2; ugtk2->import(':all'); require mygtk2; mygtk2->import('gtknew'); - my $view = Gtk2::Html2::View->new; - my $document = Gtk2::Html2::Document->new; - $view->set_document($document); - - $document->clear; - $document->open_stream("text/html"); - $document->write_stream($o->{release_notes}); + my $view = Gtk2::WebKit::WebView->new; + $view->load_html_string($o->{release_notes}, '/'); my $w = ugtk2->new(N("Release Notes"), transient => $::main_window, modal => 1, pop_it => 1); gtkadd($w->{rwindow}, diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 9b1f0ca98..14b990083 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,6 @@ - allow to prefer kernel-server on x86_64 too +- switch from perl-Gtk2-Html2 to perl-Gtk2-WebKit in order to display release + notes & help - use HTML help for summary step Version 11.43 - 16 September 2008 diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 929083396..a1de96ead 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -754,17 +754,15 @@ sub filter_widgets { } } -my $help_path = "/usr/share/doc/installer-help"; +my $help_path = "/usr/share/doc/installer-help/"; sub load_from_uri { - my ($document, $url) = @_; + my ($view, $url) = @_; $url =~ s/#.*$//; # prevent segfaults on anchors $url = get_html_file($::o, $url); my $str = scalar(cat_($url)); c::set_tagged_utf8($str); - $document->clear; - $document->open_stream("text/html"); - $document->write_stream($str); + $view->load_html_string($str, $help_path); } sub get_html_file { @@ -780,18 +778,10 @@ sub get_html_file { sub display_help { my ($o, $common, $mainw) = @_; if (my $file = $common->{interactive_help_id}) { - require Gtk2::Html2; - my $view = Gtk2::Html2::View->new; - my $document = Gtk2::Html2::Document->new; - $document->signal_connect(request_url => sub { - my ($_document, $url, $stream) = @_; - $stream->write(join('', cat_("$help_path/$url"))); - $stream->close; - }); - $document->signal_connect('link-clicked' => \&load_from_uri); - $view->set_document($document); - - load_from_uri($document, "$file.html"); + require Gtk2::WebKit; + my $view = Gtk2::WebKit::WebView->new; + + load_from_uri($view, "$file.html"); my $w = ugtk2->new(N("Help"), transient => $mainw->{real_window}, modal => 1); gtkadd($w->{rwindow}, |