new gfx

17 files changed, 40 insertions, 36 deletions

diff --git a/control-center b/control-center
index 05734889..bf9a010d 100755
--- a/control-center
+++ b/control-center
@@ -91,56 +91,56 @@ my $exec_hash =
 my @tree =
   ( [_("Boot"), 'boot-mdk',  
      [
-      [_("Boot Disk"), 'drakfloppy-mdk.png'],
-      [_("Boot Config"),'drakboot-mdk.png'],
-      [_("Auto Install"), 'drakfloppy-mdk.png'],
+      [_("Boot Disk"), 'drakfloppy-mdk'],
+      [_("Boot Config"),'drakboot-mdk'],
+      [_("Auto Install"), 'drakfloppy-mdk'],
      ]
     ],
     [_("Hardware"), 'drakhard-mdk',
      [
-      [_("Display"),'XFdrake-mdk.png', "$_sbindir/XFdrake"],
-      [_("Hardware"),'harddrake-mdk.png', "$_sbindir/harddrake"],
-      [_("Mouse"), 'mousedrake-mdk.png', "$_sbindir/mousedrake"],
-      [_("Printer"),'printer-mdk.png', "$_sbindir/print.pm"],
-      [_("Keyboard"), 'keyboard-mdk.png', "$_sbindir/keyboarddrake"],
+      [_("Display"),'XFdrake-mdk', "$_sbindir/XFdrake"],
+      [_("Hardware"),'harddrake-mdk', "$_sbindir/harddrake"],
+      [_("Mouse"), 'mousedrake-mdk', "$_sbindir/mousedrake"],
+      [_("Printer"),'printer-mdk', "$_sbindir/print.pm"],
+      [_("Keyboard"), 'keyboard-mdk', "$_sbindir/keyboarddrake"],
      ]
     ],
     [_("Mount Points"),'partition-mdk',
      [
-      [_("Hard Drives"), 'hd-mdk.png', "$_sbindir/diskdrake --hd"],
-      [_("Removable disks"), 'removables-mdk.png',"$_sbindir/diskdrake --removable"],
-      [_("NFS mount points"), 'nfs-mdk.png', "$_sbindir/diskdrake --nfs"],
-      [_("Samba mount points"), 'smb-mdk.png', "$_sbindir/diskdrake --smb"],
+      [_("Hard Drives"), 'diskdrake_hd', "$_sbindir/diskdrake --hd"],
+      [_("Removable disks"), 'diskdrake_other',"$_sbindir/diskdrake --removable"],
+      [_("NFS mount points"), 'diskdrake_nfs', "$_sbindir/diskdrake --nfs"],
+      [_("Samba mount points"), 'diskdrake_samba', "$_sbindir/diskdrake --smb"],
      ]
     ],
     [_("Network & Internet"),'net-mdk',
      [
-      [_("Connection"), 'draknet-mdk.png', "$_sbindir/draknet"],
-      [_("Connection Sharing"),'drakgw-mdk.png', "$_sbindir/drakgw"],
-      #[_("Proxy"), 'drakgw-mdk.png', "$_sbindir/drakproxy"],
+      [_("Connection"), 'draknet-mdk', "$_sbindir/draknet"],
+      [_("Connection Sharing"),'drakgw-mdk', "$_sbindir/drakgw"],
+      #[_("Proxy"), 'drakgw-mdk', "$_sbindir/drakproxy"],
      ],
     ],
     [_("Security"),'security-mdk',
      [
-      [_("Security Level"), 'draksec-mdk.png', "$_sbindir/draksec"],
-      [_("Firewalling"), 'firewall-mdk.png', "$_sbindir/tinyfirewall"],
+      [_("Security Level"), 'draksec-mdk', "$_sbindir/draksec"],
+      [_("Firewalling"), 'firewall-mdk', "$_sbindir/tinyfirewall"],
      ]
     ],
     [_("System"),'system-mdk',
      [
-      [_("Menus") , 'menudrake-mdk.png', "$_sbindir/menus.pm"],
-      [_("Services") , 'service-mdk.png', "$_sbindir/drakxservices"],
-      [_("Fonts"), 'drakfont-mdk.png', "$_sbindir/drakfont"],
-      [_("Date & Time") , 'time-mdk.png', "$_sbindir/clock.pm"],
-      [_("Software Manager"), 'harddrake-mdk.png', "$_bindir/rpmdrake"],
-      [_("Logs"), 'logdrake-mdk.png', "$_sbindir/logdrake"],
-      [_("Console"), 'drakboot-mdk.png', "$_xbindir/rxvt"],
+      [_("Menus") , 'menudrake-mdk', "$_sbindir/menus.pm"],
+      [_("Services") , 'service-mdk', "$_sbindir/drakxservices"],
+      [_("Fonts"), 'drakfont-mdk', "$_sbindir/drakfont"],
+      [_("Date & Time") , 'time-mdk', "$_sbindir/clock.pm"],
+      [_("Software Manager"), 'harddrake-mdk', "$_bindir/rpmdrake"],
+      [_("Logs"), 'logdrake-mdk', "$_sbindir/logdrake"],
+      [_("Console"), 'drakboot-mdk', "$_xbindir/rxvt"],
      ]
     ],
     if_($::isWiz,
 	[_("Configuration Wizards"), 'wizard-mdk',
 	 [
-	  [_("Servers"),'draknet-mdk.png', "$_sbindir/wizdrake"],
+	  [_("Servers"),'draknet-mdk', "$_sbindir/wizdrake"],
 	 ]
 	]),
   );
@@ -345,7 +345,7 @@ $darea1->signal_connect( expose_event => sub {
 	 my $style_dflt = new Gtk::Style;
 	 my $style = new Gtk::Style;
 #	 $style_dflt->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-*-100-*-*-p-*-iso8859-1,*-r-*")));
-	 $style->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-*-190-*-*-p-*-iso8859-1,*-r-*")));
+	 $style->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-20-*-100-100-p-*-iso8859-1,*-r-*")));
 		      #_("-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*")));
 	 $pix_dbl->draw_string($style->font, $darea1->style->black_gc, 80, 115, _("Welcome to the Mandrake Control Center") );
 	 my @revtree;
@@ -354,7 +354,7 @@ $darea1->signal_connect( expose_event => sub {
 	 my @info_tree = split / /, $revtree[0];
 	 my ($sysname, $nodename, $release, $version, $machine) = POSIX::uname();
 	 my $style1 = new Gtk::Style;
-	 $style1->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-*-90-*-*-p-*-iso8859-1,*-r-*")));
+	 $style1->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-20-*-100-100-p-*-iso8859-1,*-r-*")));
 		      #_("-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*")));
 	 my $i=0;
 	 foreach(
@@ -395,13 +395,13 @@ $notebook_global->signal_connect( switch_page => sub {
 				      $tab_number > 0 or return;
 				      $tab_widget->child->child->child->{redraw_function}->();
 				  });
-#foreach (0..$#tree) {
-#  $notebook_global->set_page($_);
-#  Gtk->main_iteration while Gtk->events_pending;
-#}
-$notebook_global->set_page(0);
 $window_global->show_all;
 $emb_box->hide;
+foreach (0..$#tree) {
+  $notebook_global->set_page($_);
+  Gtk->main_iteration while Gtk->events_pending;
+}
+$notebook_global->set_page(0);
 my @anim;
 ($anim[$_]->[0], $anim[$_]->[1]) = gtkcreate_png("$png_path/anim_" . ($_ + 1) . ".png") foreach (0..9);
 
@@ -596,21 +596,25 @@ sub splash_warning {
 sub about_mdk_cc {
     my $window_about = new Gtk::Dialog();
     $window_about->set_position(1);
+    $window_about->set_border_width(10);
     $window_about->set_title( _("About - Mandrake Control Center"));
 
     my $bbox1 = new Gtk::HButtonBox;
     $window_about->action_area->pack_start($bbox1,0,0,0);
 
     my $button = new Gtk::Button(_("Close"));
-    $button->signal_connect_object("clicked",$window_about => 'destroy');
+    $button->signal_connect_object("clicked", $window_about => 'destroy');
     $bbox1->add($button);
 
-    my $label = new Gtk::Label( _("Mandrake Control Center %s \n \n Copyright (C) 2001 Mandrakesoft SA\n", $_version) );
+    my $label = new Gtk::Label( _("Mandrake Control Center %s\n", $_version) );
     my $style1 = new Gtk::Style;
-    $style1->font(Gtk::Gdk::Font->fontset_load(_("-*-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*")));
+    $style1->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-20-*-100-100-p-*-iso8859-1,*-r-*")));
     $label->set_style($style1); 
     $window_about->vbox->pack_start( $label, 1, 1, 0 );
-    $window_about->vbox->pack_start( new Gtk::Label( _("Authors: ") . "\n\n Yves Duret <yduret\@mandrakesoft.com \n Daouda Lo <daouda\@mandrakesoft.com> \n Damien Krotkine <damien\@mandrakesoft.com> \n"), 1, 1, 0 );
+    $window_about->vbox->pack_start( new Gtk::Label( _("Copyright (C) 2001 Mandrakesoft SA")), 1, 1, 0);
+    $window_about->vbox->pack_start( new Gtk::Label( ''), 1, 1, 0 );
+    $window_about->vbox->pack_start( new Gtk::Label( _("Author : ") . "Damien Krotkine <damien\@mandrakesoft.com>\n"), 1, 1, 0 );
+    $window_about->vbox->pack_start( new Gtk::Label( _("Contributors : ") . "- Yves Duret <yduret\@mandrakesoft.com>\n                     - Daouda Lo <daouda\@mandrakesoft.com>"), 1, 1, 0 );
 
     $window_about->show_all();
     $window_about->set_modal(1);
diff --git a/pixmaps/XFdrake-mdk_highlight.png b/pixmaps/XFdrake-mdk_highlight.png
index 3293196f..4227952f 100644
--- a/pixmaps/XFdrake-mdk_highlight.png
+++ b/pixmaps/XFdrake-mdk_highlight.png
diff --git a/pixmaps/drakboot-mdk_highlight.png b/pixmaps/drakboot-mdk_highlight.png
index fb7204a9..be5fcc15 100644
--- a/pixmaps/drakboot-mdk_highlight.png
+++ b/pixmaps/drakboot-mdk_highlight.png
diff --git a/pixmaps/drakfloppy-mdk_highlight.png b/pixmaps/drakfloppy-mdk_highlight.png
index df097fb5..35f699b9 100644
--- a/pixmaps/drakfloppy-mdk_highlight.png
+++ b/pixmaps/drakfloppy-mdk_highlight.png
diff --git a/pixmaps/drakfont-mdk_highlight.png b/pixmaps/drakfont-mdk_highlight.png
index 7f449a1d..edfa1206 100644
--- a/pixmaps/drakfont-mdk_highlight.png
+++ b/pixmaps/drakfont-mdk_highlight.png
diff --git a/pixmaps/drakgw-mdk_highlight.png b/pixmaps/drakgw-mdk_highlight.png
index fa3373db..599ff078 100644
--- a/pixmaps/drakgw-mdk_highlight.png
+++ b/pixmaps/drakgw-mdk_highlight.png
diff --git a/pixmaps/draknet-mdk_highlight.png b/pixmaps/draknet-mdk_highlight.png
index 5ac9f7fd..3d4e0aa2 100644
--- a/pixmaps/draknet-mdk_highlight.png
+++ b/pixmaps/draknet-mdk_highlight.png
diff --git a/pixmaps/draksec-mdk_highlight.png b/pixmaps/draksec-mdk_highlight.png
index bbaeb194..16b3823c 100644
--- a/pixmaps/draksec-mdk_highlight.png
+++ b/pixmaps/draksec-mdk_highlight.png
diff --git a/pixmaps/firewall-mdk_highlight.png b/pixmaps/firewall-mdk_highlight.png
index aaff0b16..b35fcff6 100644
--- a/pixmaps/firewall-mdk_highlight.png
+++ b/pixmaps/firewall-mdk_highlight.png
diff --git a/pixmaps/harddrake-mdk_highlight.png b/pixmaps/harddrake-mdk_highlight.png
index 71ab8f2e..e03ce949 100644
--- a/pixmaps/harddrake-mdk_highlight.png
+++ b/pixmaps/harddrake-mdk_highlight.png
diff --git a/pixmaps/keyboard-mdk_highlight.png b/pixmaps/keyboard-mdk_highlight.png
index b8986047..5251284b 100644
--- a/pixmaps/keyboard-mdk_highlight.png
+++ b/pixmaps/keyboard-mdk_highlight.png
diff --git a/pixmaps/menudrake-mdk_highlight.png b/pixmaps/menudrake-mdk_highlight.png
index 5ea07b54..31327f99 100644
--- a/pixmaps/menudrake-mdk_highlight.png
+++ b/pixmaps/menudrake-mdk_highlight.png
diff --git a/pixmaps/mousedrake-mdk_highlight.png b/pixmaps/mousedrake-mdk_highlight.png
index 44f236a2..8ae87afe 100644
--- a/pixmaps/mousedrake-mdk_highlight.png
+++ b/pixmaps/mousedrake-mdk_highlight.png
diff --git a/pixmaps/printer-mdk_highlight.png b/pixmaps/printer-mdk_highlight.png
index e62e60be..8c3249ed 100644
--- a/pixmaps/printer-mdk_highlight.png
+++ b/pixmaps/printer-mdk_highlight.png
diff --git a/pixmaps/service-mdk_highlight.png b/pixmaps/service-mdk_highlight.png
index fe870bef..9cfc4bd2 100644
--- a/pixmaps/service-mdk_highlight.png
+++ b/pixmaps/service-mdk_highlight.png
diff --git a/pixmaps/time-mdk2.png b/pixmaps/time-mdk2.png
deleted file mode 100644
index 2033134f..00000000
--- a/pixmaps/time-mdk2.png
+++ /dev/null
diff --git a/pixmaps/time-mdk_highlight.png b/pixmaps/time-mdk_highlight.png
index e09c1a66..5b3924b5 100644
--- a/pixmaps/time-mdk_highlight.png
+++ b/pixmaps/time-mdk_highlight.png