From 6bbc3926697d8cecc2b732adbd9ec17c3f94d8eb Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 20 Aug 2008 13:09:36 +0000
Subject: (get_release_notes_button,acceptLicense) move "release notes" button
 according to specs

---
 perl-install/any.pm | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'perl-install/any.pm')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 7ffa03be2..9517186dd 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -887,13 +887,6 @@ 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;
@@ -916,22 +909,21 @@ 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 => [ [ 
-                       ($o->isa('install::steps_gtk') ? get_release_notes_button($callback) : N("Release Notes")), 
-                       $callback, 1 ] ]),
 		     callbacks => { ok_disabled => sub { $r eq 'Refuse' } },
 		   },
 
 		   [
                        { label => N("Do you accept this license ?") },
                        { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', format => sub { translate($_[0]) } },
+                       if_($o->{release_notes},
+                           { clicked => sub { display_release_notes($o) },
+                             val => \ (my $_t1 = N("Release Notes")), install_button => 1, no_indent => 1 }
+                       ), 
                    ])
       or reboot($o);
 }
-- 
cgit v1.2.1