summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-11-20 15:26:52 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-11-20 15:26:52 +0000
commiteaf0112e5189bc96daa3d8a8ae9a78e76f580873 (patch)
tree7b993b0823584003276e1d7a417ea1a01b7c6125
parentcb997adfe9fbe9921a582a4fac99ff0a0aae53b8 (diff)
downloaddrakx-backup-do-not-use-eaf0112e5189bc96daa3d8a8ae9a78e76f580873.tar
drakx-backup-do-not-use-eaf0112e5189bc96daa3d8a8ae9a78e76f580873.tar.gz
drakx-backup-do-not-use-eaf0112e5189bc96daa3d8a8ae9a78e76f580873.tar.bz2
drakx-backup-do-not-use-eaf0112e5189bc96daa3d8a8ae9a78e76f580873.tar.xz
drakx-backup-do-not-use-eaf0112e5189bc96daa3d8a8ae9a78e76f580873.zip
message_noselect_box() and message_noselect_what_box() were just
identical (but for their label). let consolidate this
-rwxr-xr-xperl-install/standalone/drakbackup50
1 files changed, 23 insertions, 27 deletions
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 3e935af10..050ef9590 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -4278,22 +4278,32 @@ sub message_norestore_box {
$up_box->show_all();
}
-sub message_noselect_box {
+
+sub message_common_box {
$box2->destroy();
+ my ($label) = @_;
my ($pix_warn_map, $pix_warn_mask) = gtkcreate_png('warning');
gtkadd($advanced_box,
- $box2 = gtkpack_(new Gtk::HBox(0, 15),
- 1, new Gtk::VBox(0, 5),
- 1, gtkpack(new Gtk::HBox(0, 15),
- new Gtk::VBox(0, 5),
- new Gtk::Pixmap($pix_warn_map, $pix_warn_mask),
- N("Please select media for backup..."),
- new Gtk::VBox(0, 5),
- ),
- 1, new Gtk::VBox(0, 5),
- ),
- );
+ $box2 = gtkpack_(new Gtk::HBox(0, 15),
+ 1, new Gtk::VBox(0, 5),
+ 1, gtkpack(new Gtk::HBox(0, 15),
+ new Gtk::VBox(0, 5),
+ new Gtk::Pixmap($pix_warn_map, $pix_warn_mask),
+ $label,
+ new Gtk::VBox(0, 5),
+ ),
+ 1, new Gtk::VBox(0, 5),
+ ),
+ );
+ $previous_widget = \&wizard;
+ $next_widget = \&wizard;
+ $central_widget = \$box2;
+ $up_box->show_all();
+}
+
+sub message_noselect_box {
+ message_common_box(N("Please select media for backup..."));
$previous_widget = \&wizard_step2;
$next_widget = \&wizard_step2;
$central_widget = \$box2;
@@ -4301,21 +4311,7 @@ sub message_noselect_box {
}
sub message_noselect_what_box {
- $box2->destroy();
- my ($pix_warn_map, $pix_warn_mask) = gtkcreate_png('warning');
-
- gtkadd($advanced_box,
- $box2 = gtkpack_(new Gtk::HBox(0, 15),
- 1, new Gtk::VBox(0, 5),
- 1, gtkpack(new Gtk::HBox(0, 15),
- new Gtk::VBox(0, 5),
- new Gtk::Pixmap($pix_warn_map, $pix_warn_mask),
- N("Please select data to backup..."),
- new Gtk::VBox(0, 5),
- ),
- 1, new Gtk::VBox(0, 5),
- ),
- );
+ message_common_box(N("Please select data to backup..."));
$previous_widget = \&wizard;
$next_widget = \&wizard;
$central_widget = \$box2;