From e5ebe7dc672b6f3858c0cfa2e20d1c2180fba109 Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni@mandriva.org>
Date: Wed, 27 May 2009 19:35:37 +0000
Subject: Simplified wireless configuration for Mandriva 2010

---
 lib/network/connection/wireless.pm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/network/connection/wireless.pm')

diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index 7f46176..0ca26dd 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -446,10 +446,12 @@ sub get_network_access_settings {
         { label => N("Operating Mode"), val => \$self->{access}{network}{mode},
           list => [ N_("Ad-hoc"), N_("Managed"), N_("Master"), N_("Repeater"), N_("Secondary"), N_("Auto") ],
           format => \&translate,
+          advanced => 1,
         },
         { label => N("Network name (ESSID)"), val => \$self->{access}{network}{essid},
           disabled => sub { my $network = $self->get_selected_network; $network && $network->{essid} } },
         { label => N("Encryption mode"), val => \$self->{access}{network}{encryption}, list => [ keys %wireless_enc_modes ],
+          advanced => 1,
           sort => 1, format => sub { translate($wireless_enc_modes{$_[0]}) } },
         { label => N("Encryption key"), val => \$self->{access}{network}{key},
           hidden => sub { $self->{hide_passwords} },
@@ -458,18 +460,21 @@ sub get_network_access_settings {
           type => "bool", val => \$self->{hide_passwords} },
         { text => N("Force using this key as ASCII string (e.g. for Livebox)"),
           type => "bool", val => \$self->{access}{network}{force_ascii_key},
+          advanced => 1,
           disabled => sub {
               #- only for WEP keys looking like hexadecimal
               !member($self->{access}{network}{encryption}, qw(open restricted)) ||
               !get_hex_key($self->{access}{network}{key});
           } },
         { label => N("EAP Login/Username"), val => \$self->{access}{network}{eap_identity},
+          advanced => 1,
           disabled => sub { $self->{access}{network}{encryption} ne 'wpa-eap' },
 	  help => N("The login or username. Format is plain text. If you
 need to specify domain then try the untested syntax
   DOMAIN\\username") },
         { label => N("EAP Password"), val => \$self->{access}{network}{eap_password},
           hidden => sub { $self->{hide_passwords} },
+          advanced => 1,
           disabled => sub { $self->{access}{network}{encryption} ne 'wpa-eap' },
 	  help => N(" Password: A string.
 Note that this is not the same thing as a psk.
@@ -486,6 +491,7 @@ automatically PEAP and TTLS modes.
   TLS mode is completely certificate based and may ignore
 the username and password values specified here.") },
         { label => N("EAP client certificate"), val => \$self->{access}{network}{eap_client_cert},
+          advanced => 1,
           disabled => sub { $self->{access}{network}{encryption} ne 'wpa-eap' },
           help => N("The complete path and filename of client certificate. This is
 only used for EAP certificate based authentication. It could be
-- 
cgit v1.2.1