- new background under main text

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

3 files changed, 41 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index cd5be52e..53f22f5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2002-09-02 12:29  daouda
+
+	* control-center: - s/tinyfirewall/drakfirewall/
+
+2002-09-02 12:15  pablo
+
+	* po/: af.po, ar.po, az.po, be.po, bg.po, br.po, bs.po, ca.po,
+	cs.po, cy.po, da.po, de.po, drakconf.pot, el.po, eo.po, es.po,
+	et.po, eu.po, fi.po, fr.po, ga.po, gl.po, hr.po, hu.po, id.po,
+	it.po, ja.po, ka.po, ko.po, lt.po, lv.po, ms.po, mt.po, nl.po,
+	no.po, pl.po, pt.po, pt_BR.po, ro.po, ru.po, sk.po, sl.po, sp.po,
+	sq.po, sr.po, sv.po, ta.po, tg.po, th.po, tr.po, uk.po, vi.po,
+	wa.po, zh_CN.po, zh_TW.po: updated po files
+
+2002-09-02 10:41  tvignaud
+
+	* drakconf.spec: 18 mdk since 17mdk didn't make it in changelog
+
+2002-09-02 10:19  tvignaud
+
+	* ChangeLog, control-center, drakconf.spec: 17mdk: -
+	s/Display/Graphical server configuration/ - use more various icons
+	for wizards - add mcc link
+
 2002-09-02 10:10  tvignaud
 
 	* po/fr.po: update french traduction
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,
diff --git a/drakconf.spec b/drakconf.spec
index 3fcacc83..52e7ba4c 100644
--- a/drakconf.spec
+++ b/drakconf.spec
@@ -6,7 +6,7 @@
 Summary:	The Mandrake Control Center 
 Name:		drakconf
 Version:	%version
-Release:	0.18mdk
+Release:	0.19mdk
 # get the source from our cvs repository (see
 # http://www.linuxmandrake.com/en/cvs.php3)
 Source0:	%name-%version.tar.bz2
@@ -105,6 +105,12 @@ rm -rf $RPM_BUILD_ROOT
 %_datadir/mcc/themes/kde
 
 %changelog
+* Mon Sep  2 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.0-0.19mdk
+- new background under main text
+- don't display log on first notebook page
+- tinyfirewall is now drakfirewall
+- update translations
+
 * Mon Sep  2 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.0-0.18mdk
 - update translations (fr, pl)
 - add mcc link