diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-05-12 03:38:49 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-05-12 03:38:49 +0000 |
commit | 2326d0271be94e2906b28dd3344ab3888a49c2f2 (patch) | |
tree | 8e992fac7ca14d00c0490e3c1e8a9a1ba15e32f6 /perl-install | |
parent | 47bf79f5745b04cb6b9ddf11a4f220784ac4f8fc (diff) | |
download | drakx-backup-do-not-use-2326d0271be94e2906b28dd3344ab3888a49c2f2.tar drakx-backup-do-not-use-2326d0271be94e2906b28dd3344ab3888a49c2f2.tar.gz drakx-backup-do-not-use-2326d0271be94e2906b28dd3344ab3888a49c2f2.tar.bz2 drakx-backup-do-not-use-2326d0271be94e2906b28dd3344ab3888a49c2f2.tar.xz drakx-backup-do-not-use-2326d0271be94e2906b28dd3344ab3888a49c2f2.zip |
- clean embedding stuff
- center wait message on parent
Diffstat (limited to 'perl-install')
-rwxr-xr-x | perl-install/standalone/harddrake2 | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 6125dfb8c..e0c3a6d47 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -233,23 +233,19 @@ my @menu_items = $ugtk2::wm_icon = "harddrake"; $in = 'interactive'->vnew('su'); #require_root_capability(); -my $wait = $in->wait_message(N("Please wait"), N("Detection in progress")); -gtkflush(); - %options = getVarsFromSh($conffile); # Build the gui add_icon_path('/usr/share/pixmaps/harddrake2/'); $w = ugtk2->new(N("Harddrake2")); -local $::main_window; # fake diagnostics pragma -my ($menubar, $factory); -if ($::isEmbedded) { - ($menubar, $factory) = create_factory_menu($::Plug, @menu_items); -} else { - $::main_window = $w->{real_window}; - ($menubar, $factory) = create_factory_menu($w->{rwindow}, @menu_items); - $w->{window}->set_size_request(805, 550); -} +# fake diagnostics pragma: +local $::main_window = $w->{real_window}; + +my $wait = $in->wait_message(N("Please wait"), N("Detection in progress")); +gtkflush() if !$::isEmbedded; + +my ($menubar, $factory) = create_factory_menu($w->{real_window}, @menu_items); +$w->{window}->set_size_request(805, 550) if !$::isEmbedded; my $tree_model = Gtk2::TreeStore->new("Gtk2::Gdk::Pixbuf", "Glib::String", "Glib::Int"); $w->{window}->add(gtkpack_(0, Gtk2::VBox->new(0, 0), |