diff options
| -rw-r--r-- | DrakConf.spec | 1 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | control-center | 9 | ||||
| -rwxr-xr-x | menus.pm (renamed from menu.pm) | 13 |
4 files changed, 15 insertions, 9 deletions
diff --git a/DrakConf.spec b/DrakConf.spec index 6d82d5a1..cae21829 100644 --- a/DrakConf.spec +++ b/DrakConf.spec @@ -86,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT %{_iconsdir}/*.png %{_liconsdir}/*.xpm %{_sbindir}/clock.pm +%{_sbindir}/menus.pm %config(noreplace) %{_sysconfdir}/pam.d/drakconf %config(noreplace) %{_sysconfdir}/security/console.apps/DrakConf @@ -22,6 +22,7 @@ install: all install -d $(RPM_BUILD_ROOT)/usr/sbin install -s -m755 $(NAME) $(RPM_BUILD_ROOT)/usr/X11R6/bin/ install -m755 clock.pm $(RPM_BUILD_ROOT)/usr/sbin/ + install -m755 menus.pm $(RPM_BUILD_ROOT)/usr/sbin/ # install -m644 pixmaps/*.xpm $(RPM_BUILD_ROOT)/usr/share/icons/ install -m644 pixmaps/*.png $(RPM_BUILD_ROOT)/usr/share/icons/ # for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done diff --git a/control-center b/control-center index 23fc1d67..b1a343b2 100755 --- a/control-center +++ b/control-center @@ -138,13 +138,13 @@ map { map { create_tree_item($treeitem_sub[int($_->[2])],$_->[0], "$xpm_path_l/$_->[1]",0); -} ([_("Boot Disk"), 'drakfloppy-mdk.png',3] , [_("Boot Config"),'drakboot-mdk.png',4] , +} ([_("Boot Disk"), 'drakfloppy-mdk.png',4] , [_("Boot Config"),'drakboot-mdk.png',4] , [_("Display"),'XFdrake-mdk.png',3] , [_("Hardware"),'harddrake-mdk.png',3] , [_("Mouse"), 'mousedrake-mdk.png',3] , [_("Printer"),'printer-mdk.png',3] , [_("Keyboard"), 'keyboard-mdk.png',3], # [_("Users Config"),'item.png',3] , [_("Connection") , 'draknet-mdk.png',2] , [_("Connection Sharing"),'drakgw-mdk.png',2], [_("Security Level"), 'draksec-mdk.png',1], [_("Firewalling"), 'firewall-mdk.png',1], - [_("System Menus") , 'menudrake-mdk.png',0], [_("Root Menus") , 'menudrake-mdk.png',0] , [_("Services") , 'service-mdk.png' , 0], + [_("Menus") , 'menudrake-mdk.png',0], [_("Services") , 'service-mdk.png' , 0], [_("Fonts"), 'drakfont-mdk.png',0], [_("Date & Time") , 'time-mdk.png',0], [_("Software Manager"), 'harddrake-mdk.png',0] # [_("Root Password") , 'passwd-mdk.png',0] @@ -160,8 +160,9 @@ my %tree_exec = (_("Boot Disk") => "$_xbindir/drakfloppy", _("Boot Config") => " _("Firewalling") => "$_sbindir/tinyfirewall" , _("Security Level") => "$_sbindir/draksec" , _("Date & Time") => "$_sbindir/clock.pm", - _("Root Menus") => "$_bindir/menudrake --usermenu" , _("Services") => "$_sbindir/drakxservices", - _("System Menus") => "$_bindir/menudrake --systemmenu", _("Fonts") => "$_xbindir/drakfont", + _("Menus") => "$_sbindir/menus.pm", + _("Services") => "$_sbindir/drakxservices", + _("Fonts") => "$_xbindir/drakfont", _("Software Manager") => "$_bindir/rpmdrake", _("Root Password") => "$_sbindir/drakpasswd", # _("Fonts") => "$_xbindir/drakfont" @@ -21,13 +21,15 @@ my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel; $window->signal_connect ( delete_event => \&quit_global ); my $vbox = new Gtk::VBox(0,0); $window->add($vbox); -$vbox->pack_start(new Gtk::Label(_("Menu Configuration Center\n\nChoose which menu you want to configure")),1,1,0); -$vbox->pack_start(new Gtk::HSeparator,1,1,5); +$vbox->pack_start(new Gtk::Label(_("Menu Configuration Center\n\nChoose which menu you want to configure")),0,0,5); +$vbox->pack_start(new Gtk::HSeparator,0,0,5); my $table = new Gtk::Table (3,2, 0); $table->set_border_width(5); $table->set_row_spacings(5); $table->set_col_spacings(5); -$vbox->pack_start($table,1,1,5); +my $hbox = new Gtk::HBox(0,0); +$vbox->pack_start($hbox,1,1,1); +$hbox->pack_start($table,0,0,5); $table->attach (new Gtk::Label(_("System menu")), 0, 1, 0, 1, 'fill', 'fill', 0, 0); my $b1 = new Gtk::Button(_("Configure...")); $b1->signal_connect( clicked => sub { system("$_bindir/menudrake --systemmenu & "); } ); @@ -49,12 +51,13 @@ $b2->signal_connect( clicked => sub { my $a = $combo->entry->get_text(); system(" su $a -c \"$_bindir/menudrake &\""); } ); $table->attach ($b2, 1, 2, 1, 2, 'fill', 'fill', 0, 0); -$vbox->pack_start(new Gtk::HSeparator,1,1,5); +$vbox->pack_start(new Gtk::HSeparator,0,0,5); my $bbox = new Gtk::HButtonBox; -$vbox->pack_start($bbox,0,0,0); +$vbox->pack_start($bbox,0,0,5); $bbox->set_layout(-end); my $button_ok = new Gtk::Button _("OK"); $button_ok->signal_connect ( clicked => sub { $::isEmbedded ? kill(USR1, $::CCPID) : Gtk->exit(0); }); +$button_ok->can_default(1); $bbox->add($button_ok); $window->show_all; |