- new background under main text

- don't display log on first notebook page
- tinyfirewall is now drakfirewall
- update translations

1 files changed, 10 insertions, 4 deletions

diff --git a/control-center b/control-center
index e0ac69ed..6b0fe036 100755
--- a/control-center
+++ b/control-center
@@ -48,6 +48,7 @@ my ($_version, $conffile, $class_install) = ("9.0", "/etc/mcc.conf","/etc/syscon
 
 #we'll show log only once and don't restart it with new embedded process
 my $show_log = 1;
+my $still_in_splash_screen=1;
 
 my %h = getVarsFromSh($conffile);
 my %class = getVarsFromSh($class_install);
@@ -66,7 +67,7 @@ $window_splash->set_policy(0, 0, 1);
 $window_splash->set_position(1);
 $window_splash->add(
 		    gtkadd(gtkset_shadow_type(new Gtk::Frame(), 'etched_out'),
-			   -r "$themes_dir/$theme/splash_screen.png" ? gtkpng("splash_screen") : new Gtk::Label(_("Loading... Please wait")))
+                           new Gtk::Label(_("Loading... Please wait")))
 		   );
 $window_splash->show_all;
 Gtk->main_iteration while Gtk->events_pending;
@@ -340,6 +341,10 @@ foreach (@tree) {
 	   }
 	   $darea_left->window->set_cursor($cursor_normal);
 	   $darea_left->{state} = 2, $darea_left->draw(undef);
+	   if ($still_in_splash_screen) {
+		  $still_in_splash_screen = 0;
+		  update_exp();
+	   }
 	   $notebook_global->set_page($index);
 	   $darea_left_sav = $darea_left;
     });
@@ -395,6 +400,7 @@ $window_global->add(
    );
 
 sub update_exp {
+    return if $still_in_splash_screen;
     if($logs && !$exp_frame) {
 	gtkpack__($right_box,
 		gtkadd($exp_frame = gtkset_shadow_type(gtkset_usize(gtkset_border_width(new Gtk::Frame(_("Logs")), 5), 0, 120), 'etched_out'),
@@ -457,7 +463,6 @@ $darea_title->signal_connect(expose_event => sub {
 							   $dbl_area, $dim[0], $dim[1], $dim[0], $dim[1], $dim[2], $dim[3]);
 });
 
-my ($pixmap_back_right, undef) = gtkcreate_png('mcc-core-back');
 my $right_back_pixbuf = gtkcreate_png_pixbuf('mcc-core-back');
 
 my $pix_dbl;
@@ -467,8 +472,8 @@ $darea1->signal_connect(expose_event => sub {
      my ($dx, $dy) = ($darea1->allocation->[2], $darea1->allocation->[3]);
      if (!defined($pix_dbl)) {
 	 $pix_dbl = new Gtk::Gdk::Pixmap($darea1->window, $dx, $dy);
-
-	 fill_tiled($darea1, $pix_dbl, $pixmap_back_right, 540, 460, $dx, $dy);
+	 my ($splash_pix, undef) = gtkcreate_png("mcc-splash");
+	 fill_tiled($darea1, $pix_dbl, $splash_pix, 540, 460, $dx, $dy);
 	 my $style = $darea1->style->copy();
 	 $style->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-20-*-100-100-p-*-iso8859-1,*-r-*")));
 	 $pix_dbl->draw_string($style->font, $darea1->style->black_gc, 80, 115, _("Welcome to the Mandrake Control Center"));
@@ -493,6 +498,7 @@ $darea1->signal_connect(expose_event => sub {
  });
 
 
+my ($pixmap_back_right, undef) = gtkcreate_png('mcc-core-back');
 my $left_back_pixbuf_unaltered_50 = gtkcreate_png_pixbuf('mcc-left-back2');
 foreach (@tree) {
     $notebook_global->append_page(gtkicons_labels_widget($_->[2], $window_global, "#0#0#0", $darea1,