updated

5 files changed, 37 insertions, 36 deletions

diff --git a/control-center b/control-center
index 475541e4..785ad327 100755
--- a/control-center
+++ b/control-center
@@ -43,6 +43,15 @@ $window_global->border_width(0);
 $vbox_global = new Gtk::VBox(0, 0);
 $window_global->add($vbox_global);
 
+######### tree
+
+my @tree = (
+	    group1 => ( appli1 => 'drakfont',
+			appli2 => 'drakfloppy'),
+	    group2 => ( appli1 => 'drakxservices',
+			appli2 => 'drakboot'),
+	   );
+
 ######### menus
 my @item_factory_entries = (
 			    ["/_File",	undef,	0,	"<Branch>"],
diff --git a/controlcenter.html b/controlcenter.html
index b1ed8e81..92ca6360 100644
--- a/controlcenter.html
+++ b/controlcenter.html
@@ -23,8 +23,7 @@
 <TR>
      <TD>
            Note : The previous document is adapted from <A
-           HREF=http://intranet.mandrakesoft.com/products/works-8.0/controlcenter.html>http://intranet.mandrakesoft.com/products/works-8.0/controlcenter.html</A>
-           which was ugly.
+           HREF=http://intranet.mandrakesoft.com/products/works-8.0/controlcenter.html>http://intranet.mandrakesoft.com/products/works-8.0/controlcenter.html</A>.
      </TD>
 </TR>
 </TABLE>
@@ -47,22 +46,16 @@ according to the product</li>
 </li>
 <li>
 </ul>
-DrakConf will still exist. But the number of item will be reduced. The tools
-will be grouped in 6 groups, described here. Here is a screenshot of what it
-could be. Some work is still neede to clearly define what will be the look of
-this DrakConf. Question : do we want to keep its name 'DrakConf'? It seems that no. It will be named 'Control Center'.
-Here is a first screenshot : <br>
-<A HREF=screenshot1.png> futur of DrakConf </A>
+DrakConf is replaced by a gnomecc like interface.
+Left, a tree, right, the applications. By default, an about page.
+All applications can be launched in single mode or embedded.
 </li>
 <li>
-Each group will launch a new window with configurations tools called here
-'control window'. Here are some
-screenshots of what this window will be : <br>
+screenshots of the global tool<br>
 <A HREF=screenshot2.png> screenshot a </A> <br> <A HREF=screenshot3.png> screenshot b </A>
 </li>
-<li>Having a newbie and an expert mode for this tools would be useful.</li>
-<li>Having a wizard mode for this tools would be required for some of them, and
-useful for the others.</li>
+<li>The tools that come from the install and have an expert mode are displayed with an 'expert mode button'.</li>
+<li>FIXEME: Draknet and drakegw will have a wizard mode. which other tools?. </li>
 <li>In 8.0 UTF-8 locales will be available, and migration to UTF-8 will start.
 Gtk+ toolkits seem to allow on the fly charset conversion of text used
 by gettext in po files.
@@ -75,10 +68,10 @@ Note : every names are here for reference, The names will be replaced by their
 functions, like before (ex: 'startup services' instead of drakexservices)
 <H3>Menu customization</H3>
 <ul>
-<li> <H2>Content</H2>
+<li> <H4>Content</H4>
 <ul> <li><B>menudrake</B></li>
 </ul>
-<li>This group will just launch <B>menudrake</B> without control window.
+<li><B>menudrake</B> in control window.
 </li>
 <li>The idea is to transfer the existing <B>menudrake</B> application to the
 new Control center. Details are given in the Desktop project.
@@ -87,20 +80,19 @@ new Control center. Details are given in the Desktop project.
 
 <H3>Boot Configuration</H3>
 <UL>
-<li> <H2>Content</H2>
+<li> <H4>Content</H4>
 <ul> <li><B>drakboot</B> </li>
 <li> <B>drakfloppy</B> </li>
 <li> <B>drakelogo</B> </li>
 <li> <B>drakxservices</B> </li>
 <li> <B>a new tool</B> to enable/disable the graphical boot </li>
 </ul>
-<li> <H2>Additional improvements </H2>
+<li> <H4>Additional improvements </H4>
 <ul> <li>Adapt <B>drakboot</B> to the new model to easily edit the entries of the
 boot loader. </li>
 <li> : <B>drakexservices</B>
 This tool should also be part of the Boot configuration tool. It replaces
-the current <B>drakxservices</B> with an interface similar to the
-service tool on Windows NT, as shown in the picture below.
+the current <B>drakxservices</B> with an interface as shown in the picture below.
 Each service needs to be documented, so that the user can understand what
 it does. <A HREF="services.png"> The screenshot.</A></li>
 <li>New tool : Integrate a simple check-box that enable or disables the graphical boot, which
@@ -110,21 +102,21 @@ give the choice to the user between classical boot or graphical <B>Aurora</B> bo
 </ul>
 <H3>Font Management</H3>
 <ul>
-<li> <H2>Content</H2>
-<ul> <li><B>drakfont</B> </li>
+<li> <H4>Content</H4>
+<ul> <li><B>drakfont</B> in the control center </li>
 </ul>
 <li>Just
 adapt the current <B>drakfont</B> program to the new interface
 guidelines.</li>
 </ul>
-<H2>Network and Internet Connection</H2>
+<H3>Network and Internet Connection</H3>
 <UL>
-<li> <H2>Content</H2>
+<li> <H4>Content</H4>
 <ul> <li><B>draknet</B> </li>
 <li> <B>drakgw</B> </li>
 <li> <B>new tool : </B>firewall conf </li>
 </ul>
-<li> <H2>Additional improvements </H2>
+<li> <H4>Additional improvements </H4>
 <ul> <li> Adapt <B>drakprofile</B> to be
 able to select a network profile at boot time (related to <B>draknet</B>)</li>
 <li>Adapt
@@ -133,36 +125,36 @@ able to select a network profile at boot time (related to <B>draknet</B>)</li>
 <li>Separate
 	as discussed front-end and back-end to isolate the administration part.</li>
 <li>Minimal firewall : firewall configuration tool.
-This tool is described in the Security project.</li>
+This tool is described in (and has to be provided by ) the Security project.</li>
 </UL>
 </ul>
-<H2>Hardware configuration</H2>
+<H3>Hardware configuration</H3>
 <ul>
-<li> <H2>Content</H2>
+<li> <H4>Content</H4>
 <ul> <li><B>XFDrake</B> </li>
+<li> <B>harddrake</B> </li>
 <li> <B>mousedrake</B> </li>
 <li> <B>printerdrake</B> </li>
 <li> <B>keyboarddrake</B> </li>
 </ul>
-<li> <H2>Additional improvements </H2>
+<li> <H4>Additional improvements </H4>
 <ul>
-<li> IMHO, a merge of all hardware related configuration tool in a harddrake like
-application is not possible for the deadline, so this need to be discuss, but
-by default, I remove it from here. </li>
-<li> Decisions about harddrake an its integrations are opened. </li>
+<li> A merge of all hardware related configuration tool in a harddrake like
+application is not possible for the deadline, so it's kept separated. </li>
 </ul>
 </ul>
-<H2>Users and groups management</H2>
+<H3>Users and groups management</H3>
 <ul>
-<li> <H2>Content</H2>
+<li> <H4>Content</H4>
 <ul> <li><B>userdrake</B> </li>
 </ul>
-<li> <H2>Additional improvements </H2>
+<li> <H4>Additional improvements </H4>
 <li>Port the current <B>userdrake</B> in
 the Control Center, with the following functions to add:
 <UL>
 	<LI>Delete user &amp; Archive /home/$user folder</li>
 	<LI>Add	user specific properties (like menus)</li>
+	<LI>Add	user language selection</li>
 </UL> </li>
 <ul>
 </ul>
diff --git a/screenshot1.png b/screenshot1.png
index 472d93c9..613e1433 100644
--- a/screenshot1.png
+++ b/screenshot1.png
diff --git a/screenshot2.png b/screenshot2.png
index 737c9a59..a2ceca35 100644
--- a/screenshot2.png
+++ b/screenshot2.png
diff --git a/screenshot3.png b/screenshot3.png
index 8db685d7..6dda8bf8 100644
--- a/screenshot3.png
+++ b/screenshot3.png