Diffstat (limited to 'noncore/settings/networksettings/wlan') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/wlan/wlan.ui | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 23 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.h | 2 |
3 files changed, 14 insertions, 15 deletions
diff --git a/noncore/settings/networksettings/wlan/wlan.ui b/noncore/settings/networksettings/wlan/wlan.ui index dcacbe8..9f33559 100644 --- a/noncore/settings/networksettings/wlan/wlan.ui +++ b/noncore/settings/networksettings/wlan/wlan.ui | |||
@@ -8,13 +8,13 @@ | |||
8 | </property> | 8 | </property> |
9 | <property stdset="1"> | 9 | <property stdset="1"> |
10 | <name>geometry</name> | 10 | <name>geometry</name> |
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>254</width> | 14 | <width>250</width> |
15 | <height>286</height> | 15 | <height>286</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
18 | <property stdset="1"> | 18 | <property stdset="1"> |
19 | <name>caption</name> | 19 | <name>caption</name> |
20 | <string>Wireless LAN Setting</string> | 20 | <string>Wireless LAN Setting</string> |
@@ -50,13 +50,13 @@ | |||
50 | <property stdset="1"> | 50 | <property stdset="1"> |
51 | <name>name</name> | 51 | <name>name</name> |
52 | <cstring>ConfigPage</cstring> | 52 | <cstring>ConfigPage</cstring> |
53 | </property> | 53 | </property> |
54 | <attribute> | 54 | <attribute> |
55 | <name>title</name> | 55 | <name>title</name> |
56 | <string>Config</string> | 56 | <string>WLAN General</string> |
57 | </attribute> | 57 | </attribute> |
58 | <vbox> | 58 | <vbox> |
59 | <property stdset="1"> | 59 | <property stdset="1"> |
60 | <name>margin</name> | 60 | <name>margin</name> |
61 | <number>11</number> | 61 | <number>11</number> |
62 | </property> | 62 | </property> |
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 632f7e4..70b1f7a 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -17,12 +17,13 @@ WLANModule::WLANModule() : Module() { | |||
17 | QString WLANModule::getPixmapName(Interface* ){ | 17 | QString WLANModule::getPixmapName(Interface* ){ |
18 | return "wlan"; | 18 | return "wlan"; |
19 | } | 19 | } |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * Check to see if the interface i is owned by this module. | 22 | * Check to see if the interface i is owned by this module. |
23 | * @param Interface* interface to check against | ||
23 | * @return bool true if i is owned by this module, false otherwise. | 24 | * @return bool true if i is owned by this module, false otherwise. |
24 | */ | 25 | */ |
25 | bool WLANModule::isOwner(Interface *i){ | 26 | bool WLANModule::isOwner(Interface *i){ |
26 | if(i->getInterfaceName() == "eth0") | 27 | if(i->getInterfaceName() == "eth0") |
27 | return true; | 28 | return true; |
28 | return false; | 29 | return false; |
@@ -47,39 +48,37 @@ QWidget *WLANModule::configure(QTabWidget **tabWidget){ | |||
47 | */ | 48 | */ |
48 | QWidget *WLANModule::information(QTabWidget **tabWidget){ | 49 | QWidget *WLANModule::information(QTabWidget **tabWidget){ |
49 | return NULL; | 50 | return NULL; |
50 | } | 51 | } |
51 | 52 | ||
52 | /** | 53 | /** |
53 | * | 54 | * Get all active (up or down) interfaces |
54 | */ | 55 | * @return QList<Interface> A list of interfaces that exsist that havn't |
56 | * been called by isOwner() | ||
57 | */ | ||
55 | QList<Interface> WLANModule::getInterfaces(){ | 58 | QList<Interface> WLANModule::getInterfaces(){ |
56 | return list | 59 | return list; |
57 | } | ||
58 | |||
59 | /** | ||
60 | * Return a list of possible new interfaces | ||
61 | */ | ||
62 | QMap<QString, QString> WLANModule::possibleNewInterfaces(){ | ||
63 | //return list; | ||
64 | } | 60 | } |
65 | 61 | ||
66 | /** | 62 | /** |
67 | * Attempt to add a new interface as defined by name | 63 | * Attempt to add a new interface as defined by name |
68 | * @param name the name of the type of interface that should be created given | 64 | * @param name the name of the type of interface that should be created given |
69 | * by possibleNewInterfaces(); | 65 | * by possibleNewInterfaces(); |
70 | * @return Interface* NULL if it was unable to be created. | 66 | * @return Interface* NULL if it was unable to be created. |
71 | */ | 67 | */ |
72 | Interface *WLANModule::addNewInterface(QString name){ | 68 | Interface *WLANModule::addNewInterface(QString ){ |
69 | // We can't add a 802.11 interface, either the hardware will be there | ||
70 | // or it wont. | ||
73 | return NULL; | 71 | return NULL; |
74 | } | 72 | } |
75 | 73 | ||
76 | /** | 74 | /** |
77 | * Attempts to remove the interface, doesn't delete i | 75 | * Attempts to remove the interface, doesn't delete i |
78 | * @return bool true if successfull, false otherwise. | 76 | * @return bool true if successfull, false otherwise. |
79 | */ | 77 | */ |
80 | bool WLANModule::remove(Interface* i){ | 78 | bool WLANModule::remove(Interface*){ |
79 | // Can't remove a hardware device, you can stop it though. | ||
81 | return false; | 80 | return false; |
82 | } | 81 | } |
83 | 82 | ||
84 | // wlanmodule.cpp | 83 | // wlanmodule.cpp |
85 | 84 | ||
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.h b/noncore/settings/networksettings/wlan/wlanmodule.h index 1fbf6a9..7ebe129 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.h +++ b/noncore/settings/networksettings/wlan/wlanmodule.h | |||
@@ -12,13 +12,13 @@ public: | |||
12 | WLANModule(); | 12 | WLANModule(); |
13 | 13 | ||
14 | virtual bool isOwner(Interface *); | 14 | virtual bool isOwner(Interface *); |
15 | virtual QWidget *configure(QTabWidget **tabWidget); | 15 | virtual QWidget *configure(QTabWidget **tabWidget); |
16 | virtual QWidget *information(QTabWidget **tabWidget); | 16 | virtual QWidget *information(QTabWidget **tabWidget); |
17 | virtual QList<Interface> getInterfaces(); | 17 | virtual QList<Interface> getInterfaces(); |
18 | virtual QMap<QString, QString> possibleNewInterfaces(); | 18 | virtual void possibleNewInterfaces(QMap<QString, QString> &list){}; |
19 | virtual Interface *addNewInterface(QString name); | 19 | virtual Interface *addNewInterface(QString name); |
20 | virtual bool remove(Interface* i); | 20 | virtual bool remove(Interface* i); |
21 | virtual QString getPixmapName(Interface* i); | 21 | virtual QString getPixmapName(Interface* i); |
22 | 22 | ||
23 | private: | 23 | private: |
24 | QList<Interface> list; | 24 | QList<Interface> list; |