diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | clock.pm | 9 | ||||
| -rwxr-xr-x | control-center3 | 20 | ||||
| -rw-r--r-- | pixmaps/XFdrake-mdk.png | bin | 837 -> 2162 bytes | |||
| -rw-r--r-- | pixmaps/drakboot-mdk.png | bin | 837 -> 1797 bytes | |||
| -rw-r--r-- | pixmaps/drakfont-mdk.png | bin | 837 -> 2010 bytes | |||
| -rw-r--r-- | pixmaps/drakgw-mdk.png | bin | 837 -> 1818 bytes | |||
| -rw-r--r-- | pixmaps/draknet-mdk.png | bin | 837 -> 2400 bytes | |||
| -rw-r--r-- | pixmaps/harddrake-mdk.png | bin | 837 -> 2158 bytes | |||
| -rw-r--r-- | pixmaps/keyboard-mdk.png | bin | 836 -> 2106 bytes | |||
| -rw-r--r-- | pixmaps/menudrake-mdk.png | bin | 836 -> 1736 bytes | |||
| -rw-r--r-- | pixmaps/printer-mdk.png | bin | 836 -> 2325 bytes | |||
| -rw-r--r-- | pixmaps/splash.png | bin | 40650 -> 28354 bytes |
13 files changed, 14 insertions, 19 deletions
@@ -21,8 +21,8 @@ install: all install -d $(RPM_BUILD_ROOT)/usr/{X11R6/bin/,share/icons} install -d $(RPM_BUILD_ROOT)/usr/sbin install -s -m755 $(NAME) $(RPM_BUILD_ROOT)/usr/X11R6/bin/ - install -m644 clock.pm $(RPM_BUILD_ROOT)/usr/sbin/ - install -m644 pixmaps/*.xpm $(RPM_BUILD_ROOT)/usr/share/icons/ + install -m755 clock.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 @@ -29,13 +29,8 @@ my $hbox = new Gtk::HBox(0,0); $vbox->pack_start($hbox, 1, 1, 0); my $calendar = new Gtk::Calendar; $hbox->pack_start($calendar, 1, 1, 0); -$calendar->signal_connect ( 'month-changed' => \&cal_changed ); -$calendar->signal_connect ( 'day-selected' => \&cal_changed ); -$calendar->signal_connect ( 'day-selected-double-click' => \&cal_changed ); -$calendar->signal_connect ( 'prev-month' => \&cal_changed ); -$calendar->signal_connect ( 'next-month' => \&cal_changed ); -$calendar->signal_connect ( 'prev-year' => \&cal_changed ); -$calendar->signal_connect ( 'next-year' => \&cal_changed ); +$calendar->signal_connect ( $_ => \&cal_changed ) + foreach ('month-changed', 'day-selected', 'day-selected-double-click', 'prev-month', 'next-month', 'prev-year', 'next-year'); my $vbox2 = new Gtk::VBox(0,0); $hbox->pack_start($vbox2, 1, 1, 0); diff --git a/control-center3 b/control-center3 index af7903ba..6825520d 100755 --- a/control-center3 +++ b/control-center3 @@ -130,19 +130,19 @@ $window_global->realize; my $tree= new Gtk::Tree; $tree->set_selection_mode('browse'); - $vbox_global_left->pack_start($tree,1,1,0); map { create_tree_item($tree, $_->[0] , "$xpm_path_l/$_->[1]",1); -} ([_("Boot"), 'drakboot-mdk.png'] , [_("Hardware"), 'logo.png'] , [_("User and Groups"),'adduserdrake-mdk.png'], - [_("Network & Internet"),'draknet-mdk.png'] , [_("System"),'menudrake-mdk.png'] , [_("Font Management"),'drakfont-mdk.png']); +} ([_("Boot"), 'boot-mdk.png'] , [_("Hardware"), 'drakhard-mdk.png'] , +#[_("User and Groups"),'adduserdrake-mdk.png'], + [_("Network & Internet"),'net-mdk.png'] , [_("System"),'menudrake-mdk.png'] , [_("Font Management"),'font-mdk.png']); map { create_tree_item($treeitem_sub[int($_->[2])],$_->[0], "$xpm_path_l/$_->[1]",0); -} ([_("Boot Config"),'drakboot-mdk.png',5] , [_("Boot Disk"), 'drakboot-mdk.png',5] , [_("Boot Logo"), 'drakboot-mdk.png',5], - [_("Display"),'item.png',4] , [_("Hardware"),'item.png',4] , [_("Mouse"), 'item.png',4] , - [_("Printer"),'printer-mdk.png',4] , [_("Keyboard"), 'keyboard-mdk.png',4], - [_("Users Config"),'item.png',3] , +} ([_("Boot Config"),'drakboot-mdk.png',4] , [_("Boot Disk"), 'drakfloppy-mdk.png',4] , [_("Boot Logo"), 'draklogo-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] , [_("Internet & Network") , 'draknet-mdk.png',2] , [_("Gateway Config"),'drakgw-mdk.png',2], [_("Date & Time") , 'item.png',1], [_("System Menus") , 'item.png',1], [_("User Menus") , 'item.png',1] , [_("Services & Daemons") , 'item.png' , 1], [_("Fonts"), 'drakfont-mdk.png',0] @@ -152,7 +152,7 @@ my %tree_exec = (_("Boot Config") => "$_sbindir/drakboot", _("Boot Disk") => "$_ _("Boot Logo") => "$_xbindir/DrakeLogo" , _("Display") => "$_sbindir/XFdrake" , _("Hardware") => "$_bindir/harddrake-auth" , _("Mouse") => "$_sbindir/mousedrake" , _("Printer") => "$_sbindir/printerdrake" , _("Keyboard") => "$_sbindir/keyboarddrake" , - _("Users Config") => "$_bindir/userdrake" , _("Internet & Network") => "$_sbindir/draknet" , +# _("Users Config") => "$_bindir/userdrake" , _("Internet & Network") => "$_sbindir/draknet" , _("Gateway Config") => "$_sbindir/drakgw" , _("Date & Time") => "$_sbindir/clock.pm", _("User Menus") => "$_bindir/menudrake" , _("Services & Daemons") => "$_sbindir/drakxservices", _("System Menus") => "$_bindir/menudrake", _("Fonts") => "$_xbindir/drakfont" @@ -202,13 +202,13 @@ sub draw_exposed { my @info_tree = split / /, $revtree[0]; my ($sysname, $nodename, $release, $version, $machine ) = POSIX::uname(); - my $username= POSIX::cuserid(); +# my $username= POSIX::cuserid(); my $style1 = new Gtk::Style; $style1->font(Gtk::Gdk::Font->fontset_load(_("-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"))); my $i=0; - foreach( [_("User:"), $username], + foreach( #[_("User:"), $username], [_("System:"), "$info_tree[0] $info_tree[1] $info_tree[3] $info_tree[4]"], [_("Hostname:"), $nodename], [_("Kernel Version:"), "$release $version"], diff --git a/pixmaps/XFdrake-mdk.png b/pixmaps/XFdrake-mdk.png Binary files differindex 351560c1..80b08c97 100644 --- a/pixmaps/XFdrake-mdk.png +++ b/pixmaps/XFdrake-mdk.png diff --git a/pixmaps/drakboot-mdk.png b/pixmaps/drakboot-mdk.png Binary files differindex 351560c1..c5fdfaeb 100644 --- a/pixmaps/drakboot-mdk.png +++ b/pixmaps/drakboot-mdk.png diff --git a/pixmaps/drakfont-mdk.png b/pixmaps/drakfont-mdk.png Binary files differindex 351560c1..873dae13 100644 --- a/pixmaps/drakfont-mdk.png +++ b/pixmaps/drakfont-mdk.png diff --git a/pixmaps/drakgw-mdk.png b/pixmaps/drakgw-mdk.png Binary files differindex 351560c1..16fea754 100644 --- a/pixmaps/drakgw-mdk.png +++ b/pixmaps/drakgw-mdk.png diff --git a/pixmaps/draknet-mdk.png b/pixmaps/draknet-mdk.png Binary files differindex 351560c1..a0346c15 100644 --- a/pixmaps/draknet-mdk.png +++ b/pixmaps/draknet-mdk.png diff --git a/pixmaps/harddrake-mdk.png b/pixmaps/harddrake-mdk.png Binary files differindex 351560c1..d29e86e5 100644 --- a/pixmaps/harddrake-mdk.png +++ b/pixmaps/harddrake-mdk.png diff --git a/pixmaps/keyboard-mdk.png b/pixmaps/keyboard-mdk.png Binary files differindex 197b8342..57666794 100644 --- a/pixmaps/keyboard-mdk.png +++ b/pixmaps/keyboard-mdk.png diff --git a/pixmaps/menudrake-mdk.png b/pixmaps/menudrake-mdk.png Binary files differindex 197b8342..9d4c3647 100644 --- a/pixmaps/menudrake-mdk.png +++ b/pixmaps/menudrake-mdk.png diff --git a/pixmaps/printer-mdk.png b/pixmaps/printer-mdk.png Binary files differindex 197b8342..c83f3a8f 100644 --- a/pixmaps/printer-mdk.png +++ b/pixmaps/printer-mdk.png diff --git a/pixmaps/splash.png b/pixmaps/splash.png Binary files differindex 3f9447a6..1e960f44 100644 --- a/pixmaps/splash.png +++ b/pixmaps/splash.png |
