From bc22c8bc6804ae56833e14a6447f04ed6d05dcf7 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 19 Aug 2008 13:40:12 +0000 Subject: (acceptLicense,get_release_notes_button) (- use new style popup button for 'release notes' button too --- perl-install/any.pm | 12 +++++++++++- perl-install/install/NEWS | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index 4fea033cb..76011c0b7 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -889,6 +889,13 @@ sub display_release_notes { return; } +sub get_release_notes_button { + my ($callback) = @_; + require mygtk2; + mygtk2->import('gtknew'); + gtknew('Install_Button', text => N("Release Notes"), clicked => $callback); +} + sub acceptLicense { my ($o) = @_; require messages; @@ -911,13 +918,16 @@ sub acceptLicense { my $r = $::testing ? 'Accept' : 'Refuse'; + my $callback = sub { display_release_notes($o) }; $o->ask_from_({ title => N("License agreement"), focus_first => 1, 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 { display_release_notes($o) }, 1 ] ]), + more_buttons => [ [ + ($o->isa('install::steps_gtk') ? get_release_notes_button($callback) : N("Release Notes")), + $callback, 1 ] ]), callbacks => { ok_disabled => sub { $r eq 'Refuse' } }, }, diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 9ad556580..a0728aa99 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,7 +1,7 @@ - drakx-in-chroot: o enable to choose resolution of Xvfb o enable to use a package repository different from installer one -- use new style popup button for help +- use new style popup button for 'help' & 'release notes' buttons Version 11.15 - 19 August 2008 -- cgit v1.2.1