Gnome icon order. Drop an unused button box.

1 files changed, 28 insertions, 53 deletions

diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index a1363da47..b13cb4067 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -4278,12 +4278,12 @@ sub button_box_adv() {
     $button_box_tmp->destroy;
     gtkpack($button_box,
 		$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
-				adv_help();
-			}),
 			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				interactive_mode_box();
 			}),
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
+				adv_help();
+			}),
 			1, new Gtk2::HBox(0, 1),	
 			0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub { 
 				destroy_widget();
@@ -4305,13 +4305,13 @@ sub button_box_restore_main() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(gtkpack_(new Gtk2::HButtonBox, 
-			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
-				adv_help();
-			}),
 			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box();
 			}),
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
+				adv_help();
+			}),
 			1, new Gtk2::HBox(0, 1),	
 			0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub { 
 				destroy_widget(); 
@@ -4330,13 +4330,13 @@ sub button_box_file_restore() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(gtkpack_(new Gtk2::HButtonBox, 
-			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
-				adv_help();
-			}),
 			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget(); 
 				restore_box();
 			}),
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
+				adv_help();
+			}),
 			1, new Gtk2::HBox(0, 1),	
 			),
 		),
@@ -4363,13 +4363,13 @@ sub button_box_backup_end() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
-				adv_help() 
-			}),
 			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box() 
 			}),
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
+				adv_help() 
+			}),
 			1, new Gtk2::HBox(0, 1),	
 			0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub { 
 				destroy_widget(); 
@@ -4389,13 +4389,13 @@ sub button_box_wizard_end() {
 
     gtkpack($button_box,
 		$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
-				adv_help();
-			}),
 			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget();
 				interactive_mode_box();
 			}),
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
+				adv_help();
+			}),
 			1, new Gtk2::HBox(0, 1),	
 			0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub { 
 				destroy_widget(); 
@@ -4415,13 +4415,13 @@ sub button_box_restore_end() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
-				adv_help();
-			}),
 			0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget();
 				interactive_mode_box();
 			}),
+			0, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { 
+				adv_help();
+			}),
 			1, new Gtk2::HBox(0, 1),	
 			0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub { 
 				destroy_widget();
@@ -4467,44 +4467,19 @@ sub button_box_restore_pbs_end() {
 	);
 }
 
-sub button_box_build_backup() {
-    $button_box_tmp->destroy;
-
-	gtkpack($button_box,
-		$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
-				adv_help(); 
-			}),
-			1, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
-				destroy_widget(); 
-				interactive_mode_box();
-			}),
-			1, new Gtk2::HBox(0, 0),
-			0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub { 
-				destroy_widget();
-				$previous_widget->();
-			}),
-			1, gtksignal_connect(Gtk2::Button->new(N("Next")), clicked => sub {
-				destroy_widget();
-				$next_widget->();
-			}),
-		),
-	);
-}
-
 sub button_box_restore() {
 
     $button_box_tmp->destroy;
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
-				adv_help();
-			}),
 			1, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box();  
 			}),
+			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
+				adv_help();
+			}),
 			1, new Gtk2::HBox(0, 0),
 			0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub { 
 				destroy_widget(); 
@@ -4527,14 +4502,14 @@ sub button_box_find_media {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
-				$central_widget = \$box2; 
-				adv_help();
-			}),
 			1, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				$central_widget = \$box2;
 				interactive_mode_box();  
 			}),
+			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
+				$central_widget = \$box2; 
+				adv_help();
+			}),
 			1, new Gtk2::HBox(0, 0),
 			0, gtksignal_connect(Gtk2::Button->new(N("Previous")), clicked => sub {
 				$central_widget = \$box2;
@@ -4552,13 +4527,13 @@ sub button_box_wizard() {
 
     gtkpack($button_box,
 	    $button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
-			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
-				adv_help() 
-			}),
 			1, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { 
 				destroy_widget(); 
 				interactive_mode_box() 
 			}),
+			1, gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub {
+				adv_help() 
+			}),
 			1, new Gtk2::HBox(0, 0),
 			0, gtksignal_connect(Gtk2::Button->new($previous_widget ? N("Previous") : N("Ok")), clicked => sub { 
 				destroy_widget();