switch from old data structures to new ones and add default titles

according to specs

1 files changed, 67 insertions, 0 deletions

diff --git a/control-center b/control-center
index bba60472..22c7734a 100755
--- a/control-center
+++ b/control-center
@@ -755,6 +755,9 @@ my @tree =
     (if_($isRpmDrake || $isParkRpmDrake,
          [ N("Software Management"), 'software',
            [
+               {
+                   title => N("Software Management"),
+                   list => [
             if_($isRpmDrake,
                 "Install Software",
                 "Mandriva Update",
@@ -763,12 +766,17 @@ my @tree =
             if_($isParkRpmDrake, "Manage park"),
 	    if_($isDrakStats, "Package stats"),
             "Mandriva Online"
+                   ]
+               },
            ]
          ]),
 
          if_(0, [ N("Server wizards"), 'wizard-mdk' ]),
          [ N("Sharing"), 'file-sharing-mdk',
            [
+               {
+                   title => N("Sharing"),
+                   list => [
             (wizard_format(# [ id, wizard file name, icon, description ]
                [ "FTP wizard",        "proftpd", 'ftp-mdk', N("Configure FTP"),
                  N("Set up an FTP server"), 'Proftpd.pm',
@@ -787,10 +795,15 @@ my @tree =
                ],
                ),
             ),
+                   ]
+               },
            ]
          ],
          [ N("Network Services"), 'network-services-mdk',
            [
+               {
+                   title => N("Network Services"),
+                   list => [
             (wizard_format(# [ id, wizard file name, icon, description ]
                [ "DHCP wizard",       "dhcp", 'dhcp_server-mdk', N("Configure DHCP"),
                  N("Set up a DHCP server"), 'Dhcp.pm',
@@ -809,10 +822,16 @@ my @tree =
                ],
                ),
             ),
+                   ]
+               },
            ]
          ],
+
          [ N("Authentication"), 'drakauth-mdk',
            [
+               {
+                   title => N("Authentication"),
+                   list => [
             if_($is_auth_wizard_installed, "Authentication"),
             (wizard_format(# [ id, wizard file name, icon, description ]
                [ 'Nis+autofs wizard',        "nisautofs",  'nisautofs', N("Configure NIS and Autofs"),
@@ -823,10 +842,16 @@ my @tree =
                ],
                ),
             ),
+                   ]
+               },
            ]
          ],
+
          [ N("Groupware"), 'groupware-mdk',
            [
+               {
+                   title => N("Groupware"),
+                   list => [
             (wizard_format(# [ id, wizard file name, icon, description ]
                if_(0, [ "News wizard",       "inn", 'news-mdk', N("Configure news"),
                  N("Configure a newsgroup server"), 'Inn.pm',
@@ -839,12 +864,17 @@ my @tree =
                ],
                ),
             ),
+                   ]
+               },
            ]
          ],
 
      if_($isWebAdmin || $isRfbDrake,
          [ N("Online Administration"), 'online-administration-mdk',
            [
+               {
+                   title => N("Online Administration"),
+                   list => [
 	    if_($isWebAdmin,
 		(map {
 		    my ($id, $icon, $op, $description, $long_description) = @$_;
@@ -870,11 +900,16 @@ my @tree =
 	    if_($isRfbDrake, 
 		"Remote Control",
 	       )
+                   ]
+               },
 	   ]
 	 ]),
 
      [ N("Hardware"), 'drakhard-mdk',
        [
+           {
+               title => N("Hardware"),
+               list => [
         "Hardware List",,
         "3D",
         "Graphical server configuration",
@@ -884,11 +919,16 @@ my @tree =
         "Printer",
         "Scanner",
         "UPS",
+                   ]
+               },
         ]
        ],
 
      [ N("Network & Internet"), 'net-mdk',
        [
+           {
+               title => N("Network & Internet"),
+               list => [
         "Network Center",
         if_(!-x "$sbindir/draknetcenter",
         "Add Connection",
@@ -903,11 +943,16 @@ my @tree =
         "Roaming",
         "VPN",
         "Hosts",
+                   ]
+               },
         ],
        ],
 
      [ N("System"), 'system-mdk',
        [
+             {
+                 title => N("System"),
+                 list => [
         if_(!$is_auth_wizard_installed, "Authentication"),
         "Menus",
         "Services",
@@ -920,22 +965,32 @@ my @tree =
         if_(-x "/usr/X11R6/bin/drakcronat", "Programs scheduling"),
         "Backups",
         "Virtualization",
+                   ]
+               },
         ]
        ],
 
      [
          N("Network Sharing"), 'partition-mdk',
          [
+             {
+                 title => N("Network Sharing"),
+                 list => [
              "NFS mount points",
              "NFS exports",
              "Samba mount points",
              "Samba configuration",
              "WebDAV mount points",
+                   ]
+               },
          ],
      ],
 
      [ N("Local disks"), 'partition-mdk',
        [
+             {
+                 title => N("Local disks"),
+                 list => [
         "Hard Drives",
         (map {
             my ($type, $scan, $text, $long_text) = @$_;
@@ -975,26 +1030,38 @@ my @tree =
 	      );
         }),
         "Partition Sharing",
+                   ]
+               },
         ]
        ],
 
      [ N("Security"), 'security-mdk',
        [
+             {
+                 title => N("Security"),
+                 list => [
         "Security Level",
         "Security Permissions",
         "Firewall",
         "Invictus Firewall",
+                   ]
+               },
         ]
        ],
 
      [ N("Boot"), 'boot-mdk',
        [
+             {
+                 title => N("Boot"),
+                 list => [
         #if_(detect_devices::floppies, "Boot Disk"), # kernel is too big
         "Auto login Config",
         "Boot Config",
         "Boot Theme",
         "Display Manager chooser",
         if_(0, "Auto Install"),
+                   ]
+               },
         ]
        ],
      );