diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-09-26 21:32:54 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-09-26 21:32:54 +0000 |
| commit | d28ea91b400223c404babda38e19250576518cff (patch) | |
| tree | c0edddb7690ac3263cc32b9d87b97988d1186166 | |
| parent | 60981943a984a29d43931ee819a913d6a7ee5938 (diff) | |
| download | drakx-d28ea91b400223c404babda38e19250576518cff.tar drakx-d28ea91b400223c404babda38e19250576518cff.tar.gz drakx-d28ea91b400223c404babda38e19250576518cff.tar.bz2 drakx-d28ea91b400223c404babda38e19250576518cff.tar.xz drakx-d28ea91b400223c404babda38e19250576518cff.zip | |
(acceptLicense) display nicer HTML release notes rather than raw text version
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/any.pm | 42 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 44 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index bc55125ca..61d12816a 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- finish-install: + o display nicer HTML release notes rather than raw text version + Version 10.4.213 - 26 September 2007, by Thierry Vignaud - drakbug diff --git a/perl-install/any.pm b/perl-install/any.pm index 1562df6bd..7ca204b1f 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -856,8 +856,10 @@ sub acceptLicense { my $d = find { -e "$_/$file" } glob_("/usr/share/doc/*-release-*"); $d && cat_("$d/$file"); } - } 'release-notes.txt', 'release-notes.' . arch() . '.txt'); + } 'release-notes.html', 'release-notes.' . arch() . '.html'); + # we do not handle links: + $o->{release_notes} =~ s!<a href=".*?">(.*?)</a>!\1!g; return if $o->{useless_thing_accepted}; @@ -869,7 +871,43 @@ sub acceptLicense { cancel => N("Quit"), messages => formatAlaTeX(messages::main_license() . "\n\n\n" . messages::warning_about_patents()), interactive_help_id => 'acceptLicense', - if_($o->{release_notes}, more_buttons => [ [ N("Release Notes"), sub { $o->ask_warn(N("Release Notes"), $o->{release_notes}) }, 1 ] ]), + if_($o->{release_notes}, + more_buttons => [ + [ + N("Release Notes"), sub { + require Gtk2::Html2; + 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 $w = ugtk2->new(N("Release Notes"), transient => $mainw->{real_window}, modal => 1); + gtkadd($w->{rwindow}, + gtkpack_(Gtk2::VBox->new, + 1, create_scrolled_window(ugtk2::gtkset_border_width($view, 5), + [ 'never', 'automatic' ], + ), + 0, gtkpack(create_hbox('edge'), + gtknew('Button', text => N("Close"), + clicked => sub { Gtk2->main_quit }) + ), + ), + ); + # make parent visible still visible: + local ($::real_windowwidth, $::real_windowheight) = ($::real_windowwidth - 50, $::real_windowheight - 50); + mygtk2::set_main_window_size($w->{rwindow}); + $w->{real_window}->grab_focus; + $w->{real_window}->show_all; + $w->main; + return; + }, 1 ] ]), callbacks => { ok_disabled => sub { $r eq 'Refuse' } }, }, [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', format => sub { translate($_[0]) } } ]) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index d9b65d19f..25ad36fe2 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- display nicer HTML release notes rather than raw text version - fix using iso CD2 on disk (#33022): o remove " from medium name when reading media.cfg o handle "Volume id" ending with -CD[123] instead of -Disc[123] |