From 038acd20992b4994ba357f3ca56ad9510941217c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 9 Sep 2002 07:19:19 +0000 Subject: - 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 --- perl-install/bootlook.pm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'perl-install/bootlook.pm') 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 => '' }, { path => _("/File/_Quit"), accelerator => _("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', '
', $accel_group); - $item_factory->create_items(@menu_items); - $window->add_accel_group($accel_group); - return $item_factory->get_widget('
'); -} - #------------------------------------------------------------- # launch X functions #------------------------------------------------------------- @@ -501,4 +491,3 @@ sub set_autologin { # log::l("cat $prefix/etc/sysconfig/autologin: ", cat_("$prefix/etc/sysconfig/autologin")); } - -- cgit v1.2.1