Diffstat (limited to 'noncore/settings/networksettings/wlan') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.h | 1 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index a466020..74bf390 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp | |||
@@ -24,24 +24,28 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W | |||
24 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);//, Qt::WDestructiveClose); | 24 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);//, Qt::WDestructiveClose); |
25 | //configure->setProfile(currentProfile); | 25 | //configure->setProfile(currentProfile); |
26 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); | 26 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); |
27 | 27 | ||
28 | readConfig(); | 28 | readConfig(); |
29 | 29 | ||
30 | } | 30 | } |
31 | 31 | ||
32 | WLANImp::~WLANImp( ){ | 32 | WLANImp::~WLANImp( ){ |
33 | delete config; | 33 | delete config; |
34 | } | 34 | } |
35 | 35 | ||
36 | void WLANImp::setProfile(QString &profile){ | ||
37 | interfaceSetup->setProfile(profile); | ||
38 | } | ||
39 | |||
36 | void WLANImp::readConfig() | 40 | void WLANImp::readConfig() |
37 | { | 41 | { |
38 | qWarning( "WLANImp::readConfig() called." ); | 42 | qWarning( "WLANImp::readConfig() called." ); |
39 | config->setGroup( "Properties" ); | 43 | config->setGroup( "Properties" ); |
40 | QString ssid = config->readEntry( "SSID", "any" ); | 44 | QString ssid = config->readEntry( "SSID", "any" ); |
41 | if( ssid == "any" || ssid == "ANY" ){ | 45 | if( ssid == "any" || ssid == "ANY" ){ |
42 | essNon->setChecked( true ); | 46 | essNon->setChecked( true ); |
43 | } else { | 47 | } else { |
44 | essSpecific->setChecked( true ); | 48 | essSpecific->setChecked( true ); |
45 | essSpecificLineEdit->setText( ssid ); | 49 | essSpecificLineEdit->setText( ssid ); |
46 | } | 50 | } |
47 | QString mode = config->readEntry( "Mode", "Managed" ); | 51 | QString mode = config->readEntry( "Mode", "Managed" ); |
diff --git a/noncore/settings/networksettings/wlan/wlanimp.h b/noncore/settings/networksettings/wlan/wlanimp.h index 608d681..faa1674 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.h +++ b/noncore/settings/networksettings/wlan/wlanimp.h | |||
@@ -4,24 +4,25 @@ | |||
4 | #include "wlan.h" | 4 | #include "wlan.h" |
5 | 5 | ||
6 | class InterfaceSetupImp; | 6 | class InterfaceSetupImp; |
7 | class Interface; | 7 | class Interface; |
8 | class Config; | 8 | class Config; |
9 | 9 | ||
10 | class WLANImp : public WLAN { | 10 | class WLANImp : public WLAN { |
11 | Q_OBJECT | 11 | Q_OBJECT |
12 | 12 | ||
13 | public: | 13 | public: |
14 | WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 ); | 14 | WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 ); |
15 | ~WLANImp( ); | 15 | ~WLANImp( ); |
16 | void setProfile(QString &profile); | ||
16 | 17 | ||
17 | protected: | 18 | protected: |
18 | void accept(); | 19 | void accept(); |
19 | 20 | ||
20 | private: | 21 | private: |
21 | void readConfig(); | 22 | void readConfig(); |
22 | bool writeConfig(); | 23 | bool writeConfig(); |
23 | bool writeWirelessOpts( QString scheme = "*" ); | 24 | bool writeWirelessOpts( QString scheme = "*" ); |
24 | bool writeWlanngOpts( QString scheme = "*" ); | 25 | bool writeWlanngOpts( QString scheme = "*" ); |
25 | Config* config; | 26 | Config* config; |
26 | InterfaceSetupImp *interfaceSetup; | 27 | InterfaceSetupImp *interfaceSetup; |
27 | 28 | ||
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index c8becb0..b14fc0a 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -51,24 +51,25 @@ bool WLANModule::isOwner(Interface *i){ | |||
51 | 51 | ||
52 | i->setHardwareName("802.11b"); | 52 | i->setHardwareName("802.11b"); |
53 | list.append(i); | 53 | list.append(i); |
54 | return true; | 54 | return true; |
55 | } | 55 | } |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * Create, and return the WLANConfigure Module | 58 | * Create, and return the WLANConfigure Module |
59 | * @return QWidget* pointer to this modules configure. | 59 | * @return QWidget* pointer to this modules configure. |
60 | */ | 60 | */ |
61 | QWidget *WLANModule::configure(Interface *i){ | 61 | QWidget *WLANModule::configure(Interface *i){ |
62 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false, Qt::WDestructiveClose); | 62 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false, Qt::WDestructiveClose); |
63 | wlanconfig->setProfile(profile); | ||
63 | return wlanconfig; | 64 | return wlanconfig; |
64 | } | 65 | } |
65 | 66 | ||
66 | /** | 67 | /** |
67 | * Create, and return the Information Module | 68 | * Create, and return the Information Module |
68 | * @return QWidget* pointer to this modules info. | 69 | * @return QWidget* pointer to this modules info. |
69 | */ | 70 | */ |
70 | QWidget *WLANModule::information(Interface *i){ | 71 | QWidget *WLANModule::information(Interface *i){ |
71 | WExtensions we(i->getInterfaceName()); | 72 | WExtensions we(i->getInterfaceName()); |
72 | if(!we.doesHaveWirelessExtensions()) | 73 | if(!we.doesHaveWirelessExtensions()) |
73 | return NULL; | 74 | return NULL; |
74 | 75 | ||