kill expert mode

1 files changed, 3 insertions, 33 deletions

diff --git a/control-center b/control-center
index 56d9ed5e..e9809eb6 100755
--- a/control-center
+++ b/control-center
@@ -60,7 +60,6 @@ my %class = getVarsFromSh($class_install);
 $h{THEME} ||= 'default';
 $h{LOGS} ||= bool2text($class{CLASS} eq 'expert' ? 1 : 0);
 $h{EXPERT_WIZARD} ||= 0;
-$h{EXPERT_MODE} ||= bool2text(0);
 $h{HEIGTH} ||= $default_heigth;
 $h{WIDTH}  ||= $default_width;
 $h{USE_LONG_DESCRIPTIONS} ||= 'yes';
@@ -68,7 +67,6 @@ $h{USE_LONG_DESCRIPTIONS} ||= 'yes';
 my %option_values;
 $option_values{use_long_dscr} = text2bool($h{USE_LONG_DESCRIPTIONS});
 $option_values{show_log} = text2bool($h{LOGS});
-$option_values{expert_mode} = text2bool($h{EXPERT_MODE});
 my $theme = $h{THEME};
 $theme = $1 if "@ARGV" =~ /--theme (\w+)/;
 my $program;
@@ -154,7 +152,6 @@ my %programs =
     N("Authentication"),
     long_description => N("Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"),
     icon => 'drakauth-mdk',
-    expert_mode => 1,
    },
 
 
@@ -165,7 +162,6 @@ my %programs =
     description => N("Auto Install floppy"),
     long_description => N("Generate an Auto Install floppy"),
     icon => 'drakautoinst-mdk',
-    expert_mode => 1,
    },
 
 
@@ -400,7 +396,6 @@ my %programs =
     embedded => 1,
     description => N("Kolab"),
     long_description => N("Set up a groupware server"),
-    expert_mode => 1,
    },
 
 
@@ -445,7 +440,6 @@ my %programs =
     description => N("Mandriva Online"),
     long_description => N("Upload your configuration in order to keep you informed about security updates and useful upgrades"),
     icon => 'mdkonline-mdk',
-    expert_mode => 1,
    },
 
 
@@ -456,7 +450,6 @@ my %programs =
     description => N("Manage computer group"),
     long_description => N("Manage installed software packages on a group of computers"),
     icon => 'drakpark-mdk',
-    expert_mode => 1,
    },
 
 
@@ -690,7 +683,6 @@ my %programs =
     description => N("Level and checks"),
     long_description => N("Set the system security level and the periodic security audit"),
     icon => 'draksec-mdk',
-    expert_mode => 1,
    },
 
 
@@ -701,7 +693,6 @@ my %programs =
     description => N("Permissions"),
     long_description => N("Fine-tune the security permissions of the system"),
     icon => 'drakperm-mdk',
-    expert_mode => 1,
    },
 
 
@@ -788,7 +779,7 @@ my $is_auth_wizard_installed = is_wizard_installed('Nisautofs.pm');
 
 sub wizard_format {
     map {
-        my ($id, $wizard, $icon, $description, $long_description, $file, $expert_mode) = @$_;
+        my ($id, $wizard, $icon, $description, $long_description, $file) = @$_;
         $programs{$id} =
           {
            binary => "$sbindir/drakwizard $wizard",
@@ -796,7 +787,6 @@ sub wizard_format {
            description => $description,
            long_description => $long_description,
            icon => $icon,
-           expert_mode => $expert_mode,
           };
          if_(is_wizard_installed($file), $id);
     } @_;
@@ -1062,8 +1052,6 @@ if (scalar glob_("$more_wizard_dir/*.conf")) {
             description => $tmp{DESCRIPTION},
             icon => $tmp{ICON} || 'wizard-mdk',
             long_description => $tmp{LONG_DESCRIPTION},
-            # expert mode by default, as they are provided by 3rd parties
-            expert_mode => 1
         };
         push(@{$leaf[2]}, $tmp{NAME});
     }
@@ -1107,7 +1095,6 @@ my %options = (
     'show_log' => [ N("/_Options"), N("/Display _Logs") ],
     'embedded_mode' => [ N("/_Options"), N("/_Embedded Mode") ],
     'wiz_expert' => [ N("/_Options"), N("/Expert mode in _wizards") ],
-    'expert_mode' => [ N("/_Options"), N("/_Expert mode") ],
 );
 
 my $mdk_rel = common::mandrake_release();
@@ -1132,22 +1119,7 @@ my @menu_items = (
                     },
                     undef, '<CheckItem>'
                   ],
-                  [ join('', @{$options{expert_mode}}), undef,
-                    sub  {
-                        $option_values{expert_mode} = $check_boxes{expert_mode}->get_active;
-                        $saved_pos_while_in_menu = $notebook_global && $notebook_global->get_current_page;
-                        refresh_tree(1);
-                        if ($notebook_global) {
-                            if (!$emb_socket) {
-                                $notebook_global->show_all;
-                                $notebook_global->queue_draw;
-                            }
-                           # restore previous position:
-                           $notebook_global->set_current_page($saved_pos_while_in_menu) if $saved_pos_while_in_menu && $saved_pos_while_in_menu != -1;
-                        }
-                    },
-                    undef, '<CheckItem>'
-                  ],
+
                   if_(0 && $isWiz,
                       [ join('', @{$options{wiz_expert}}), undef,
                         sub { $option_values{expert_wizard} = $check_boxes{wiz_expert}->get_active },
@@ -1194,7 +1166,7 @@ sub get_path { join('', map { my $i = $_; $i =~ s/_//g; $i } @_) }
 
 %check_boxes = map {
     $_ => $factory->get_widget("<main>" . get_path(@{$options{$_}}));
-} ('show_log', 'expert_mode', if_(0 && $isWiz, "wiz_expert"));
+} ('show_log', if_(0 && $isWiz, "wiz_expert"));
 
 
 gtkadd($window_global,
@@ -1317,7 +1289,6 @@ foreach (@tree) {
     foreach my $stuff (@$subtree) {
         my $exec = first(split /\s+/, $programs{$stuff}{binary});
         next if $programs{$stuff}{hidden};
-        next if !$option_values{expert_mode} && $programs{$stuff}{expert_mode};
         # do not complain about missing entries in move:
         if (-x $exec) {
             push @subtree, $stuff;
@@ -1767,7 +1738,6 @@ sub quit_global() {
     setVarsInSh($conffile, {
         LOGS          => bool2text($option_values{show_log}),
         EXPERT_WIZARD => bool2text($option_values{expert_wizard}),
-        EXPERT_MODE   => bool2text($option_values{expert_mode}),
         HEIGTH => $y,
         WIDTH => $x,
         THEME         => $theme,