From 11cc8e0276f3442e61e8044592c28ec2652182ce Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 24 Jan 2005 10:53:18 +0000
Subject: reorder categories by usage frequency

---
 control-center | 192 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 100 insertions(+), 92 deletions(-)

diff --git a/control-center b/control-center
index 41d9ccb1..8c85e6d2 100755
--- a/control-center
+++ b/control-center
@@ -601,98 +601,7 @@ my %programs =
 
 # [ [ class_label, class icon name, [ program_label, ... ] ]
 my @tree =
-    ([ N("Boot"), 'boot-mdk',
-       [
-        if_(0 && detect_devices::floppies, "Boot Disk"),
-        "Auto login Config",
-        "Boot Config",
-        "Boot Theme",
-        if_(0, "Auto Install"),
-        ]
-       ],
-     [ N("Hardware"), 'drakhard-mdk',
-       [
-        "Hardware List",,
-        "Monitor",
-        "Resolution",
-        if_(0, "Graphical server configuration"),
-        if_(-x "$bindir/drakfax","Fax"),
-        "TV Cards",
-        "Keyboard",
-        "Mouse",
-        "Printer",
-        "Scanner",
-        "UPS",
-        ]
-       ],
-     [ N("Mount Points"), 'partition-mdk',
-       [
-        "Hard Drives",
-        (map {
-            my ($type, $scan, $text) = @$_;
-            map_index {
-                my $full_name = $text . ($::i ? $::i + 1 : '');
-                $programs{$full_name} =
-                  {
-                   binary => "$sbindir/diskdrake --removable=$_->{device}",
-                   embedded => 1,
-                   description => $text,
-                   icon => "diskdrake_$type",
-                  };
-                $full_name,
-            } $scan->();
-        } do {
-            my %cdroms_by_type;
-            foreach (detect_devices::cdroms()) {
-                my $type = detect_devices::isBurner($_) ? 'burner' : detect_devices::isDvdDrive($_) ? 'DVD' : 'cdrom';
-                push @{$cdroms_by_type{$type}}, $_;
-            } ([ 'cdrom', sub { @{$cdroms_by_type{cdrom} || []} }, N("CD-ROM") ],
-               [ 'dvd', sub { @{$cdroms_by_type{DVD} || []} }, N("DVD-ROM") ],
-               [ 'cdwriter', sub { @{$cdroms_by_type{burner} || []} }, N("CD/DVD burner") ],
-               [ 'floppy', \&detect_devices::floppies, N("Floppy drive") ],
-               [ 'zip', \&detect_devices::zips, N("ZIP drive") ],
-               ),
-        }),
-        "NFS mount points",,
-        "Samba mount points",
-        "WebDAV mount points",
-        "Partition Sharing",
-        ]
-       ],
-     [ N("Network & Internet"), 'net-mdk',
-       [
-        "Add Connection",
-        "Configure Internet",
-        "Manage Connection",
-        "Monitor Connection",
-        "Remove Interface",
-        "Proxy Configuration",
-        "Connection Sharing",
-        ],
-       ],
-     [ N("Security"), 'security-mdk',
-       [
-        "Security Level",
-        "Security Permissions",
-        "Firewall",
-        ]
-       ],
-     [ N("System"), 'system-mdk',
-       [
-        "Authentication",
-        "Menus",
-        "Display Manager chooser",
-        "Services",
-        "Fonts",
-        "Date & Time",
-        "Logs",
-        if_($ENV{LANGUAGE} !~ /^zh/, "Console"),
-        "Users",
-        if_(-x "/usr/X11R6/bin/drakcronat", "Programs scheduling"),
-        "Backups",
-        ]
-       ],
-     if_($isRpmDrake || $isParkRpmDrake,
+    (if_($isRpmDrake || $isParkRpmDrake,
          [ N("Software Management"), 'software',
            [
             if_($isRpmDrake,
@@ -705,6 +614,7 @@ my @tree =
             if_($isParkRpmDrake, "Manage park"),
            ]
          ]),
+
      if_($isWiz,
          [ N("Server wizards"), 'wizard-mdk',
            [
@@ -738,6 +648,7 @@ my @tree =
             )
            ]
          ]),
+
      if_($isWebAdmin || $isRfbDrake,
          [ N("Online Administration"), 'online-administration-mdk',
            [
@@ -763,6 +674,103 @@ my @tree =
 	       )
 	   ]
 	 ]),
+
+     [ N("Hardware"), 'drakhard-mdk',
+       [
+        "Hardware List",,
+        "Monitor",
+        "Resolution",
+        if_(0, "Graphical server configuration"),
+        if_(-x "$bindir/drakfax","Fax"),
+        "TV Cards",
+        "Keyboard",
+        "Mouse",
+        "Printer",
+        "Scanner",
+        "UPS",
+        ]
+       ],
+
+     [ N("Network & Internet"), 'net-mdk',
+       [
+        "Add Connection",
+        "Configure Internet",
+        "Manage Connection",
+        "Monitor Connection",
+        "Remove Interface",
+        "Proxy Configuration",
+        "Connection Sharing",
+        ],
+       ],
+
+     [ N("System"), 'system-mdk',
+       [
+        "Authentication",
+        "Menus",
+        "Display Manager chooser",
+        "Services",
+        "Fonts",
+        "Date & Time",
+        "Logs",
+        if_($ENV{LANGUAGE} !~ /^zh/, "Console"),
+        "Users",
+        if_(-x "/usr/X11R6/bin/drakcronat", "Programs scheduling"),
+        "Backups",
+        ]
+       ],
+
+     [ N("Mount Points"), 'partition-mdk',
+       [
+        "Hard Drives",
+        (map {
+            my ($type, $scan, $text) = @$_;
+            map_index {
+                my $full_name = $text . ($::i ? $::i + 1 : '');
+                $programs{$full_name} =
+                  {
+                   binary => "$sbindir/diskdrake --removable=$_->{device}",
+                   embedded => 1,
+                   description => $text,
+                   icon => "diskdrake_$type",
+                  };
+                $full_name,
+            } $scan->();
+        } do {
+            my %cdroms_by_type;
+            foreach (detect_devices::cdroms()) {
+                my $type = detect_devices::isBurner($_) ? 'burner' : detect_devices::isDvdDrive($_) ? 'DVD' : 'cdrom';
+                push @{$cdroms_by_type{$type}}, $_;
+            } ([ 'cdrom', sub { @{$cdroms_by_type{cdrom} || []} }, N("CD-ROM") ],
+               [ 'dvd', sub { @{$cdroms_by_type{DVD} || []} }, N("DVD-ROM") ],
+               [ 'cdwriter', sub { @{$cdroms_by_type{burner} || []} }, N("CD/DVD burner") ],
+               [ 'floppy', \&detect_devices::floppies, N("Floppy drive") ],
+               [ 'zip', \&detect_devices::zips, N("ZIP drive") ],
+               ),
+        }),
+        "NFS mount points",,
+        "Samba mount points",
+        "WebDAV mount points",
+        "Partition Sharing",
+        ]
+       ],
+
+     [ N("Security"), 'security-mdk',
+       [
+        "Security Level",
+        "Security Permissions",
+        "Firewall",
+        ]
+       ],
+
+     [ N("Boot"), 'boot-mdk',
+       [
+        if_(0 && detect_devices::floppies, "Boot Disk"),
+        "Auto login Config",
+        "Boot Config",
+        "Boot Theme",
+        if_(0, "Auto Install"),
+        ]
+       ],
      );
 
 
-- 
cgit v1.2.1