restore step with correct help button & code cleanning.

1 files changed, 5 insertions, 80 deletions

diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 4589c6cd7..837ec5a17 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -394,7 +394,6 @@ sub build_backup_files {
     }
 }
 
-
 sub list_remove {
     my($widget, $list) = @_;
     my @to_remove;
@@ -469,10 +468,6 @@ sub wizard_old {
 		  ) or goto step_2;
 }
 
-
-
-
-
 sub advanced_what_sys {
     my $box_what_sys;
     
@@ -559,8 +554,6 @@ sub advanced_what_other {
     $up_box->show_all();
 }
 
-
-
 sub advanced_what{
     my $box_what;
     
@@ -680,7 +673,6 @@ sub advanced_where_net_ssh {
     $up_box->show_all();
 }
 
-
 sub advanced_where_net {
     my $box_where_net;
     
@@ -1231,8 +1223,6 @@ sub restore_step2 {
     $up_box->show_all();
 }
 
-
-
 sub restore_box {
     my $retore_box;
     my $retore_box3;
@@ -1241,7 +1231,7 @@ sub restore_box {
     my $check_restore_other;
 
     find_backup_to_restore();
-
+    restore_button_box();
     @user_list_to_restore = @user_backuped;
     if ($other_backuped || $sys_backuped || @user_backuped) {
 	gtkpack($advanced_box,
@@ -1276,67 +1266,12 @@ sub restore_box {
 			   )
 		);
     }
+    $custom_help = "retore";
+    $current_widget = \&restore_box;
     $central_widget = \$retore_box;
     $up_box->show_all();
 }
 
-# sub restore_box {
-#     my $retore_box;
-#     my $retore_box3;
-#     my $check_restore_sys;
-#     my $check_restore_user;
-#     my $check_restore_other;
-
-#     find_backup_to_restore();
-
-#     @user_list_to_restore = @user_backuped;
-#     if ($other_backuped || $sys_backuped || @user_backuped) {
-# 	gtkpack($advanced_box,
-# 		$retore_box = gtkpack(new Gtk::VBox(0,1),
-# 			       $retore_box2 = gtkpack(new Gtk::VBox(0,10),
-# 				   $retore_box3 = gtkpack_(new Gtk::VBox(0,10),
-# 				     0, gtkpack_(new Gtk::HBox(0,10),
-# 						 1, new Gtk::HBox(0,10),
-# 						 1, gtkpack_(new Gtk::VBox(0,10),
-# 							     0, gtksignal_connect(new Gtk::Button(_("Restore all backups (last)")), 
-# 								 clicked => sub { $retore_box3->destroy(); 
-# 										  $restore_sys = 1;
-# 										  $restore_other = 1;
-# 										  $restore_user = 1;
-# 										  do_restore(); }),
-# 							     0, gtksignal_connect(new Gtk::Button(_("Custom Restore")), 
-# 								 clicked => sub { $retore_box3->destroy(); restore_step2(); }),
-# 							     ),
-# 						 1, new Gtk::HBox(0,10),
-# 						 ),
-# 				      1, new Gtk::HBox(0,10),
-# 						       ),),),
-# 	    );
-#     } else {
-# 	gtkpack($advanced_box,
-# 		$retore_box = gtkpack_(new Gtk::VBox(0,1),
-# 		1, gtkpack_(new Gtk::HBox(0, 0),
-# 		     1, gtkadd(new Gtk::Frame(_("Restoration Step.")),
-# 			       $retore_box2 = gtkpack(new Gtk::VBox(0,10),
-# 				   $retore_box3 = gtkpack_(new Gtk::VBox(0,10),
-# 				     1, _("Please Build backup before to restore it..."),
-# 				     0, gtkpack_(new Gtk::HBox(0,10),
-# 						 1, new Gtk::HBox(0,10),
-# 						 ),
-# 				      1, new Gtk::HBox(0,10),
-# 						       ),),),),
-# 			   )
-# 		);
-#     }
-#     $central_widget = \$retore_box;
-#     $up_box->show_all();
-# }
-
-
-
-
-
-
 sub adv_button_box {
 
     $button_box_tmp->destroy();
@@ -1355,8 +1290,7 @@ sub adv_button_box {
 	    );
 }
 
-
-sub adv_button_box {
+sub restore_button_box {
 
     $button_box_tmp->destroy();
     gtkpack($button_box,
@@ -1367,14 +1301,11 @@ sub adv_button_box {
 						  ${$central_widget}->destroy(); restore_help();}),
 					      1, new Gtk::HBox(0, 0),
 					      1, gtksignal_connect(new Gtk::Button(_("     Next      ")), clicked => sub {
-						  ${$central_widget}->destroy(); restore_help();}),
+						  ${$central_widget}->destroy(); adv_help(\&$current_widget,$custom_help);}),
 					      ),
 	    );
 }
 
-
-
-
 sub main_button_box {
 
     $button_box_tmp->destroy();
@@ -1414,8 +1345,6 @@ sub interactive_mode_box {
     $up_box->show_all();    
 }
 
-
-
 sub interactive_mode {
     $interactive = 1;
     my $box;
@@ -1464,7 +1393,6 @@ sub interactive_mode {
     Gtk->exit(0);
 }
 
-
 sub about {
     my $text = new Gtk::Text(undef, undef);
     my $about_box;
@@ -1544,7 +1472,6 @@ configuration file:
     $up_box->show_all();
 }
 
-
 sub adv_help {
     my ($function, $custom_help) = @_,
     my $text = new Gtk::Text(undef, undef);
@@ -1621,8 +1548,6 @@ configuration file:
 }
 
 
-
-
 sub restore_help {
     my $text = new Gtk::Text(undef, undef);
     my $about_box;