summaryrefslogtreecommitdiffstats
path: root/perl-install/bootlook.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-09-09 07:19:19 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-09-09 07:19:19 +0000
commit038acd20992b4994ba357f3ca56ad9510941217c (patch)
treeea6bc2947214b516511d0e9356c1c32ce29d1be2 /perl-install/bootlook.pm
parentfaf855d915c28d459cf99d77fbcba2150b93bfd1 (diff)
downloaddrakx-backup-do-not-use-038acd20992b4994ba357f3ca56ad9510941217c.tar
drakx-backup-do-not-use-038acd20992b4994ba357f3ca56ad9510941217c.tar.gz
drakx-backup-do-not-use-038acd20992b4994ba357f3ca56ad9510941217c.tar.bz2
drakx-backup-do-not-use-038acd20992b4994ba357f3ca56ad9510941217c.tar.xz
drakx-backup-do-not-use-038acd20992b4994ba357f3ca56ad9510941217c.zip
- drakfloppy / logdrake: destroy_window and create_dialog were
gratuitously duplicated; move them in ugtk - drakfloppy / logdrake / bootlook.pm: get_main_menu was gratuitously duplicated; common code which was moved from harddrake::ui to ugtk::create_factory_menu just do the job
Diffstat (limited to 'perl-install/bootlook.pm')
-rw-r--r--perl-install/bootlook.pm13
1 files changed, 1 insertions, 12 deletions
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index 2182c8f2a..fc507969e 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -79,7 +79,7 @@ $window->border_width(2);
my @menu_items = ( { path => _("/_File"), type => '<Branch>' },
{ path => _("/File/_Quit"), accelerator => _("<control>Q"), callback => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) } },
);
-my $menubar = get_main_menu($window);
+my $menubar = ugtk::create_factory_menu($window, @menu_items);
######### menus end
my $user_combo = new Gtk::Combo;
@@ -393,16 +393,6 @@ sub print_hello {
print("mcdtg !\n");
}
-sub get_main_menu {
- my ($window) = @_;
-
- my $accel_group = new Gtk::AccelGroup();
- my $item_factory = new Gtk::ItemFactory('Gtk::MenuBar', '<main>', $accel_group);
- $item_factory->create_items(@menu_items);
- $window->add_accel_group($accel_group);
- return $item_factory->get_widget('<main>');
-}
-
#-------------------------------------------------------------
# launch X functions
#-------------------------------------------------------------
@@ -501,4 +491,3 @@ sub set_autologin {
# log::l("cat $prefix/etc/sysconfig/autologin: ", cat_("$prefix/etc/sysconfig/autologin"));
}
-