new packages, bugfixes, themes pb, timeout issue fixed

2 files changed, 74 insertions, 52 deletions

diff --git a/control-center b/control-center
index 3af9b9ba..0aa5b379 100755
--- a/control-center
+++ b/control-center
@@ -34,7 +34,7 @@ use interactive;
 use detect_devices;
 use standalone;
 use my_gtk qw(:helpers :wrappers);
-use strict;
+#use strict;
 
 # set the locale, needed for proper fontset and charset selection
 Gtk->set_locale;
@@ -101,7 +101,7 @@ my $exec_hash =
    _("Connection Sharing") => [ "drakgw", "$_sbindir/drakgw", 1 ],
    _("Proxy Configuration") => [ "drakproxy", "$_sbindir/drakproxy", 1 ],
    _("Security Level") => [ "draksec", "$_sbindir/draksec", 1 ],
-   _("Firewall") => [ "tinyfirewall", "$_sbindir/tinyfirewall", 1 ],
+#   _("Firewall") => [ "tinyfirewall", "$_sbindir/tinyfirewall", 1 ],
    _("Menus") => [ "menudrake", "$_sbindir/menus_launcher.pl", 1, "$_bindir/menudrake" ],
    _("Services") => [ "drakxservices", "$_sbindir/drakxservices", 1 ],
    _("Fonts") => [ "drakfont", "$_sbindir/drakfont", 1 ],
@@ -109,7 +109,9 @@ my $exec_hash =
    _("Software Manager") => [ "rpmdrake", "$_bindir/rpmdrake", -1 ],
    _("Logs") => [ "logdrake", "$_sbindir/logdrake", 1 ],
    _("Console") => [ "rxvt", "", 0, ["$_xbindir/rxvt", "rxvt", 1] ],
-   _("Users") => [ "userdrake", "$_bindir/userdrake", 1 ],
+#   _("Users") => [ "userdrake", "$_bindir/userdrake", 1 ],
+   _("TV Cards") => [ "drakxtv", "$_sbindir/drakxtv", 1 ],
+#   _("RFBDrake") => [ "rfbdrake", "$_xbindir/rfbdrake", 1 ],
 
    _("DNS Client") => ["Client wizard", "wiz $_wizdir/client_wizard/client.wiz", -1 ],
    _("DHCP") => ["DHCP wizard", "wiz $_wizdir/dhcp_wizard/dhcp.wiz",  -1 ],
@@ -153,6 +155,7 @@ my @tree =
       [_("Mouse"), 'mousedrake-mdk'],
       [_("Printer"),'printer-mdk'],
       [_("Scanner"),'scanner-mdk'],
+      [_("TV Cards"), 'unknown-mdk' ],
      ]
     ],
     [_("Mount Points"),'partition-mdk',
@@ -194,7 +197,7 @@ my @tree =
     [_("Security"),'security-mdk',
      [
       [_("Security Level"), 'draksec-mdk'],
-      [_("Firewalling"), 'firewall-mdk'],
+#      [_("Firewall"), 'firewall-mdk'],
      ]
     ],
     [_("System"),'system-mdk',
@@ -206,7 +209,8 @@ my @tree =
       [_("Software Manager"), 'rpmdrake-mdk'],
       [_("Logs"), 'logdrake-mdk'],
       [_("Console"), 'console-mdk'],
-      [_("Users"), 'user-mdk'],
+#      [_("Users"), 'user-mdk'],
+#      [_("RFBDrake"), 'unknown-mdk'],
      ]
     ],
     if_($::isWiz,
@@ -224,7 +228,7 @@ my @tree =
 my $nb_pages=0;
 my $window_global = new Gtk::Window -toplevel;
 $window_global->signal_connect ( delete_event => \&quit_global );
-$window_global->set_title( _("Mandrake Control Center %s", 'beta' )); #$_version));
+$window_global->set_title( _("Mandrake Control Center %s", $_version));
 $window_global->set_policy(0, 1, 1);
 my $notebook_global;
 
@@ -329,26 +333,29 @@ $window_global->add(
 			 0, my $fixed_left = new Gtk::Fixed,
 			 1, gtkpack_(my $right_box = new Gtk::VBox(0, 0), 
 				     1, gtkpack_($emb_box = new Gtk::VBox(0, 0),
-						 1, $emb_wait = gtkpack_(new Gtk::VBox(0, 0),
-								 1, new Gtk::HBox(0, 0),
-								 0, gtkpack_(new Gtk::HBox(0, 0),
-									     1, new Gtk::VBox(0, 0),
-									     0, gtkadd(gtkset_shadow_type(new Gtk::Frame, 'etched_out'),
-										       gtkpng_('hourglass'),
-										      ),
-									     1, new Gtk::VBox(0, 0),
-									    ),
-								 0, new Gtk::Label(_("Please wait...")),
-								 1, new Gtk::HBox(0, 0),
+					 1, $emb_wait = gtkpack_(new Gtk::VBox(0, 0),
+						 1, new Gtk::HBox(0, 0),
+						 0, gtkpack_(new Gtk::HBox(0, 0),
+							     1, new Gtk::VBox(0, 0),
+							     0, gtkadd(gtkset_shadow_type(new Gtk::Frame, 'etched_out'),
+								       gtkpng_('hourglass'),
+								      ),
+							     1, new Gtk::VBox(0, 0),
+							    ),
+						 0, new Gtk::Label(_("Please wait...")),
+						 1, new Gtk::HBox(0, 0),
+						 0, gtkadd(gtkset_layout(gtkset_border_width(new Gtk::HButtonBox, 10), 'end'),
+							   gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub {kill(USR1, $$)}),
+							  )
 								)
-						),
-				     1, $notebook_global = new Gtk::Widget ('Gtk::Notebook',
-									    show_border => 0,
-									    show_tabs => 0),
-				    )
+					),
+			     1, $notebook_global = new Gtk::Widget ('Gtk::Notebook',
+								    show_border => 0,
+								    show_tabs => 0),
+			    )
 			)
 	    )
-		   );
+   );
 
 sub update_exp {
     if($logs && !$exp_frame) {
@@ -535,7 +542,7 @@ sub sig_usr1 { # embedded applications will send me that signal in order to "kil
 my $timer;
 sub sig_usr2 {
     $left_locked = 0;
-    Gtk->timeout_remove($timer);
+#    Gtk->timeout_remove($timer);
     $emb_wait->hide;
     $emb_socket->show;
 }
@@ -581,7 +588,7 @@ sub compute_exec_string {
 	    $emb_wait->show;
 	    $left_locked = 1;
 	    $pending_app = 1;
-	    $timer = Gtk->timeout_add(15000, sub { splash_warning(_("This tool seems to be broken, as it didn't show up.\n Try to reinstall it")); sig_usr1(); });
+#	    $timer = Gtk->timeout_add(15000, sub { splash_warning(_("This tool seems to be broken, as it didn't show up.\n Try to reinstall it")); sig_usr1(); });
 	    my $pid;
 	    unless ($pid = fork) {
 		splash_warning(_("cannot fork: %s", $~)) unless defined $pid;
@@ -715,27 +722,50 @@ sub splash_warning {
     $ret;
 }
 
+sub more_themes {
+    my $window_about = new Gtk::Dialog();
+    $window_about->set_position(1);
+    $window_about->set_border_width(10);
+#    $window_about->set_usize(400, 0);
+    $window_about->set_title( _("More themes"));
+    $window_about->action_area->pack_start(gtkadd(new Gtk::HButtonBox, 
+				  gtksignal_connect(new Gtk::Button(_("Close")), "clicked" => sub { $window_about->destroy()})),0,0,0);
+    my $style1 = $window_about->style->copy();
+    $style1->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-20-*-100-100-p-*-iso8859-1,*-r-*")));
+    gtkpack_($window_about->vbox,
+	     0, gtksetstyle(new Gtk::Label(_("Getting new themes")), $style1),
+	     0, gtkadd(gtkset_shadow_type(gtkset_border_width(new Gtk::Frame("Standard themes"), 10), 'etched_out'),
+		       gtkpack_(new Gtk::HBox(0, 10),
+				0, "", 1, _("Click here to install standard themes:"),
+				0, gtksignal_connect(gtkset_border_width(new Gtk::Button(_("Install")), 5), "clicked" => sub { 
+							 system ("urpmi --best-output drakconf-themes &"); })
+			       )
+		      ),
+	     0, gtkadd(gtkset_shadow_type(gtkset_border_width(new Gtk::Frame("Additional themes"), 10), 'etched_out'),
+		       gtkpack(new Gtk::HBox(0, 5),
+			       _("Get additional themes on www.damz.net"),
+			      )
+		      )
+	    );
+    $window_about->set_policy(0, 0, 1);
+    $window_about->show_all();
+    $window_about->set_modal(1);
+}
+
 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');
-    $bbox1->add($button);
+    $window_about->action_area->pack_start(gtkadd(new Gtk::HButtonBox, 
+				  gtksignal_connect(new Gtk::Button(_("Close")), "clicked" => sub { $window_about->destroy()})),0,0,0);
 
     my $label = new Gtk::Label();
     my $style1 = $label->style->copy();
-    my $style2 = $label->style->copy();
     $style1->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-normal-*-20-*-100-100-p-*-iso8859-1,*-r-*")));
-    $style2->font(Gtk::Gdk::Font->fontset_load(_("-*-helvetica-medium-r-bold-*-14-*-100-100-p-*-iso8859-1,*-r-*")));
     my $clist = new Gtk::CList(3);
     my $i = -1;
-    $i++, $clist->append(@$_) foreach ([ _("Author: "), 'Damien Krotkine', 'damien@mandrakesoft.com'],
+    $i++, $clist->append(@$_) foreach ([ _('Author: '), 'Damien "dams" Krotkine', 'damien@mandrakesoft.com'],
 				       [ '', 'Yves Duret', 'yduret@mandrakesoft.com'],
 				       [ '', ''],
 				       [ _("Artwork: "), _("Helene Durosini"), 'ln@mandrakesoft.com'],
@@ -749,8 +779,7 @@ sub about_mdk_cc {
 
     gtkpack_($window_about->vbox,
 	     -r "$mcc_dir/$theme/splash_screen_about.png" ?
-		 (0, gtkpng("splash_screen_about")) : (),
-#	     1, gtksetstyle(new Gtk::Label( _("Mandrake Control Center %s\n", $_version) ), $style1),
+	 (0, gtkpng("splash_screen_about")) : (1, gtksetstyle(new Gtk::Label( _("Mandrake Control Center %s\n", $_version) ), $style1),),
 	     0, new Gtk::Label( ''),
 	     0, new Gtk::Label( _("Copyright (C) 2001 Mandrakesoft SA")),
 	     0, new Gtk::Label( ''),
@@ -828,6 +857,8 @@ sub get_main_menu {
 						);
 				       \%h;
 				   } @theme_list ),
+				 { path => _("/_Themes")._("/_More themes"),
+				   callback => \&more_themes },
 				 { path => _("/_Help"),
 				   type => '<Branch>' },
 #				 { path => _("/Help")._("/_Help on line"), callback => sub { Gtk->exit(0) } },
diff --git a/drakconf.spec b/drakconf.spec
index fb8a4668..86be26d7 100644
--- a/drakconf.spec
+++ b/drakconf.spec
@@ -2,7 +2,7 @@
 # do not edit here, but in cvs/soft/control-center
 %define name 	drakconf
 %define version 0.96
-%define release 13mdk
+%define release 14mdk
 
 Summary:	The Mandrake Control Center 
 Name:		%{name}
@@ -19,24 +19,14 @@ Group:		System/Configuration/Other
 Url:		http://www.mandrakelinux.com/en/cvs.php3
 Obsoletes:	DrakConf
 Provides:	DrakConf
-Requires:	mandrake-release, drakxtools >= 1.1.7-89mdk, gtk+mdk, perl-GTK, perl-GTK-GdkImlib, usermode, drakfloppy >= 0.43-8mdk,
-Requires:	popt >= 1.6, harddrake >= 0.9.3-23mdk, XFree86-100dpi-fonts, menudrake >= 0.6.5
+Requires:	mandrake-release, drakxtools >= 1.1.7-93mdk, gtk+mdk >= 0.1.6-10mdk, perl-GTK, perl-GTK-GdkImlib, usermode
+Requires:	drakfloppy >= 0.43-10mdk, popt >= 1.6.3-9mdk, harddrake >= 0.9.3-26mdk, XFree86-100dpi-fonts, menudrake >= 0.6.5-2mdk
 Requires:	rxvt
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 %description
 drakconf includes the Mandrake Control Center which is an interface to 
-multiple utilities from DrakXtools. It allows you to launch :
-
-   * hardrake: detection of the hardware 
-   * keyboarddrake: configures your keyboard
-   * mousedrake: configures and autodetects your mouse
-   * printerdrake: detects and configures your printer
-   * xfdrake: configure your graphic card easily and change
-     the resolution
-   * draknet: configures your network
-
-and many other tools in an embedded way 
+multiple utilities from DrakXtools.
 
 %package themes
 Summary:	Mandrake Control Center Themes
@@ -115,7 +105,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mcc/kde
 
 %changelog
-* Mon Mar 11 2002 dams <damien@mandrakesoft.com> 0.96-13mdk
+* Tue Mar 12 2002 dams <damien@mandrakesoft.com> 0.96-14mdk
+- no more userdrake
 - coded appropriate dialog for additional themes
 - splited package to package and package-themes