TDE
/
tdenetworkmanager
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetworkmanager
0
0
Fork 0
Code Issues Releases Wiki Activity

Add connection editing support and clean up the code

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 69038478eb
commit 323fad1f89
31 changed files with 312 additions and 143 deletions
Show Stats Download Patch File Download Diff File

6
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <tqwidgetstack.h> #include <tqwidgetstack.h>
#include <kuser.h> #include <kuser.h>
// knm headers // tdenm headers
#include "tdenetman-connection_setting_cdma_widget.h" #include "tdenetman-connection_setting_cdma_widget.h"
// ui headers // ui headers
@ -44,6 +44,8 @@ using namespace ConnectionSettings;
CDMAWidgetImpl::CDMAWidgetImpl(TDENetworkConnection* conn, TQWidget* parent, const char* name, WFlags fl) CDMAWidgetImpl::CDMAWidgetImpl(TDENetworkConnection* conn, TQWidget* parent, const char* name, WFlags fl)
: WidgetInterface(parent, name, fl) : WidgetInterface(parent, name, fl)
{ {
_parentdialog = dynamic_cast<ConnectionSettingsDialogImpl*>(parent);
_cdmasetting = dynamic_cast<TDEModemConnection*>(conn); _cdmasetting = dynamic_cast<TDEModemConnection*>(conn);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
@ -87,6 +89,8 @@ CDMAWidgetImpl::dirty()
_cdmasetting->cdmaConfig.providerDataNumber = _mainWid->mNumber->text(); _cdmasetting->cdmaConfig.providerDataNumber = _mainWid->mNumber->text();
_cdmasetting->cdmaConfig.valid = true; _cdmasetting->cdmaConfig.valid = true;
_cdmasetting->cdmaConfig.secretsValid = true; _cdmasetting->cdmaConfig.secretsValid = true;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }

6
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.h
Unescape View File

@ -34,7 +34,8 @@
#include <tdehardwaredevices.h> #include <tdehardwaredevices.h>
#include <tdenetworkconnections.h> #include <tdenetworkconnections.h>
// knm headers // tdenm headers
#include "tdenetman-connection_settings_dialog.h"
#include "tdenetman-connection_setting_widget_interface.h" #include "tdenetman-connection_setting_widget_interface.h"
//class VPNService; //class VPNService;
@ -58,9 +59,10 @@ class CDMAWidgetImpl : public WidgetInterface
void Init(); void Init();
//VPNConfigWidget* getVPNConfigWidget(VPNService* service); //VPNConfigWidget* getVPNConfigWidget(VPNService* service);
TDEModemConnection* _cdmasetting; TDEModemConnection* _cdmasetting;
ConnectionSettingCdmaWidget* _mainWid; ConnectionSettingCdmaWidget* _mainWid;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
} }

6
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.cpp
Unescape View File

@ -34,7 +34,7 @@
#include <tqwidgetstack.h> #include <tqwidgetstack.h>
#include <kuser.h> #include <kuser.h>
// knm headers // tdenm headers
#include "tdenetman-connection_setting_gsm_widget.h" #include "tdenetman-connection_setting_gsm_widget.h"
#include "connection_setting_gsm.h" #include "connection_setting_gsm.h"
@ -44,6 +44,8 @@ using namespace ConnectionSettings;
GSMWidgetImpl::GSMWidgetImpl(TDENetworkConnection* conn, TQWidget* parent, const char* name, WFlags fl) GSMWidgetImpl::GSMWidgetImpl(TDENetworkConnection* conn, TQWidget* parent, const char* name, WFlags fl)
: WidgetInterface(parent, name, fl) : WidgetInterface(parent, name, fl)
{ {
_parentdialog = dynamic_cast<ConnectionSettingsDialogImpl*>(parent);
_gsmsetting = dynamic_cast<TDEModemConnection*>(conn); _gsmsetting = dynamic_cast<TDEModemConnection*>(conn);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
@ -104,6 +106,8 @@ GSMWidgetImpl::dirty()
_gsmsetting->gsmConfig.valid = true; _gsmsetting->gsmConfig.valid = true;
_gsmsetting->gsmConfig.secretsValid = true; _gsmsetting->gsmConfig.secretsValid = true;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void

5
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.h
Unescape View File

@ -34,7 +34,8 @@
#include <tdehardwaredevices.h> #include <tdehardwaredevices.h>
#include <tdenetworkconnections.h> #include <tdenetworkconnections.h>
// knm headers // tdenm headers
#include "tdenetman-connection_settings_dialog.h"
#include "tdenetman-connection_setting_widget_interface.h" #include "tdenetman-connection_setting_widget_interface.h"
//class VPNService; //class VPNService;
@ -65,6 +66,8 @@ class GSMWidgetImpl : public WidgetInterface
TDEModemConnection* _gsmsetting; TDEModemConnection* _gsmsetting;
ConnectionSettingGsmWidget* _mainWid; ConnectionSettingGsmWidget* _mainWid;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
} }

6
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqlayout.h> #include <tqlayout.h>
// knm headers // tdenm headers
#include "tdenetman-connection_setting_info_widget.h" #include "tdenetman-connection_setting_info_widget.h"
using namespace ConnectionSettings; using namespace ConnectionSettings;
@ -38,7 +38,7 @@ InfoWidgetImpl::InfoWidgetImpl(TDENetworkConnection* conn, TQWidget* parent, con
: WidgetInterface(parent, name, fl) : WidgetInterface(parent, name, fl)
{ {
_infosetting = conn; _infosetting = conn;
_parentdialog = dynamic_cast<ConnectionSettingsDialogImpl*>(parent);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingInfoWidget(this); _mainWid = new ConnectionSettingInfoWidget(this);
@ -65,12 +65,14 @@ void
InfoWidgetImpl::slotNameChanged(const TQString& name) InfoWidgetImpl::slotNameChanged(const TQString& name)
{ {
_infosetting->friendlyName = name; _infosetting->friendlyName = name;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
InfoWidgetImpl::slotAutoconnectChanged(bool autoconnect) InfoWidgetImpl::slotAutoconnectChanged(bool autoconnect)
{ {
_infosetting->autoConnect = autoconnect; _infosetting->autoConnect = autoconnect;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
#include "tdenetman-connection_setting_info_widget.moc" #include "tdenetman-connection_setting_info_widget.moc"

4
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.h
Unescape View File

@ -35,8 +35,9 @@
#include <tdehardwaredevices.h> #include <tdehardwaredevices.h>
#include <tdenetworkconnections.h> #include <tdenetworkconnections.h>
// knm headers // tdenm headers
#include "connection_setting_info.h" #include "connection_setting_info.h"
#include "tdenetman-connection_settings_dialog.h"
#include "tdenetman-connection_setting_widget_interface.h" #include "tdenetman-connection_setting_widget_interface.h"
namespace ConnectionSettings namespace ConnectionSettings
@ -61,6 +62,7 @@ class InfoWidgetImpl : public WidgetInterface
void Init(); void Init();
TDENetworkConnection* _infosetting; TDENetworkConnection* _infosetting;
ConnectionSettingsDialogImpl* _parentdialog;
ConnectionSettingInfoWidget* _mainWid; ConnectionSettingInfoWidget* _mainWid;
}; };

13
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.cpp
Unescape View File

@ -39,6 +39,7 @@ IPv4WidgetImpl::IPv4WidgetImpl(TDENetworkConnection* conn, TQWidget* parent, con
: WidgetInterface(parent, name, fl) : WidgetInterface(parent, name, fl)
{ {
_ipv4_setting = conn; _ipv4_setting = conn;
_parentdialog = dynamic_cast<ConnectionSettingsDialogImpl*>(parent);
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingIPv4Widget(this); _mainWid = new ConnectionSettingIPv4Widget(this);
@ -116,6 +117,8 @@ IPv4WidgetImpl::slotDNSAddressesChanged(const TQString& adr)
} }
} }
_ipv4_setting->ipConfig.resolvers = hosts; _ipv4_setting->ipConfig.resolvers = hosts;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
@ -134,6 +137,8 @@ IPv4WidgetImpl::slotDNSSearchChanged(const TQString& search)
} }
} }
_ipv4_setting->ipConfig.searchDomains = domains; _ipv4_setting->ipConfig.searchDomains = domains;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -147,6 +152,8 @@ IPv4WidgetImpl::slotIPConfigEnabled(bool enabled)
{ {
_ipv4_setting->ipConfig.connectionFlags |= TDENetworkIPConfigurationFlags::IPV4DHCPIP; _ipv4_setting->ipConfig.connectionFlags |= TDENetworkIPConfigurationFlags::IPV4DHCPIP;
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -186,6 +193,8 @@ IPv4WidgetImpl::slotIPAddressChanged(const TQString& ip)
} }
} }
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -196,6 +205,8 @@ IPv4WidgetImpl::slotNetmaskChanged(const TQString& ip)
mask.fromString(ip); mask.fromString(ip);
addrs[0].networkMask = mask; addrs[0].networkMask = mask;
_ipv4_setting->ipConfig.ipConfigurations = addrs; _ipv4_setting->ipConfig.ipConfigurations = addrs;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -204,6 +215,8 @@ IPv4WidgetImpl::slotGatewayChanged(const TQString& ip)
TDENetworkSingleIPConfigurationList addrs = _ipv4_setting->ipConfig.ipConfigurations; TDENetworkSingleIPConfigurationList addrs = _ipv4_setting->ipConfig.ipConfigurations;
addrs[0].gateway = TQHostAddress(ip); addrs[0].gateway = TQHostAddress(ip);
_ipv4_setting->ipConfig.ipConfigurations = addrs; _ipv4_setting->ipConfig.ipConfigurations = addrs;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
#include "tdenetman-connection_setting_ipv4_widget.moc" #include "tdenetman-connection_setting_ipv4_widget.moc"

2
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.h
Unescape View File

@ -33,6 +33,7 @@
#include "connection_setting_ipv4.h" #include "connection_setting_ipv4.h"
// tdenetman headers // tdenetman headers
#include "tdenetman-connection_settings_dialog.h"
#include "tdenetman-connection_setting_widget_interface.h" #include "tdenetman-connection_setting_widget_interface.h"
namespace ConnectionSettings namespace ConnectionSettings
@ -60,6 +61,7 @@ namespace ConnectionSettings
void Init(); void Init();
TDENetworkConnection* _ipv4_setting; TDENetworkConnection* _ipv4_setting;
ConnectionSettingsDialogImpl* _parentdialog;
ConnectionSettingIPv4Widget* _mainWid; ConnectionSettingIPv4Widget* _mainWid;
}; };

6
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <tqwidgetstack.h> #include <tqwidgetstack.h>
#include <kuser.h> #include <kuser.h>
// knm headers // tdenm headers
#include "tdenetman-connection_setting_ppp_widget.h" #include "tdenetman-connection_setting_ppp_widget.h"
#include "connection_setting_ppp.h" #include "connection_setting_ppp.h"
@ -45,6 +45,8 @@ using namespace ConnectionSettings;
PPPWidgetImpl::PPPWidgetImpl(TDENetworkConnection* conn, TQWidget* parent, const char* name, WFlags fl) PPPWidgetImpl::PPPWidgetImpl(TDENetworkConnection* conn, TQWidget* parent, const char* name, WFlags fl)
: WidgetInterface(parent, name, fl) : WidgetInterface(parent, name, fl)
{ {
_parentdialog = dynamic_cast<ConnectionSettingsDialogImpl*>(parent);
_pppsetting = conn; _pppsetting = conn;
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
@ -138,6 +140,8 @@ PPPWidgetImpl::dirty()
_pppsetting->pppConfig.lcpEchoPingInterval = _mainWid->mLcpEchoInterval->value(); _pppsetting->pppConfig.lcpEchoPingInterval = _mainWid->mLcpEchoInterval->value();
_pppsetting->pppConfig.valid = true; _pppsetting->pppConfig.valid = true;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
#include "tdenetman-connection_setting_ppp_widget.moc" #include "tdenetman-connection_setting_ppp_widget.moc"

5
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.h
Unescape View File

@ -34,7 +34,8 @@
#include <tdehardwaredevices.h> #include <tdehardwaredevices.h>
#include <tdenetworkconnections.h> #include <tdenetworkconnections.h>
// knm headers // tdenm headers
#include "tdenetman-connection_settings_dialog.h"
#include "tdenetman-connection_setting_widget_interface.h" #include "tdenetman-connection_setting_widget_interface.h"
//class VPNService; //class VPNService;
@ -61,6 +62,8 @@ class PPPWidgetImpl : public WidgetInterface
TDENetworkConnection* _pppsetting; TDENetworkConnection* _pppsetting;
ConnectionSettingPppWidget* _mainWid; ConnectionSettingPppWidget* _mainWid;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
} }

6
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.cpp
Unescape View File

@ -35,7 +35,7 @@
#include <tqwidgetstack.h> #include <tqwidgetstack.h>
#include <kuser.h> #include <kuser.h>
// knm headers // tdenm headers
#include "tdenetman-connection_setting_serial_widget.h" #include "tdenetman-connection_setting_serial_widget.h"
#include "connection_setting_serial.h" #include "connection_setting_serial.h"
@ -45,6 +45,8 @@ using namespace ConnectionSettings;
SerialWidgetImpl::SerialWidgetImpl(TDENetworkConnection* conn, TQWidget* parent, const char* name, WFlags fl) SerialWidgetImpl::SerialWidgetImpl(TDENetworkConnection* conn, TQWidget* parent, const char* name, WFlags fl)
: WidgetInterface(parent, name, fl) : WidgetInterface(parent, name, fl)
{ {
_parentdialog = dynamic_cast<ConnectionSettingsDialogImpl*>(parent);
_serialsetting = conn; _serialsetting = conn;
TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1); TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
@ -93,6 +95,8 @@ SerialWidgetImpl::dirty()
_serialsetting->serialConfig.txDelay = _mainWid->mSendDelay->value(); _serialsetting->serialConfig.txDelay = _mainWid->mSendDelay->value();
_serialsetting->serialConfig.valid = true; _serialsetting->serialConfig.valid = true;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void

5
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.h
Unescape View File

@ -34,8 +34,9 @@
#include <tdehardwaredevices.h> #include <tdehardwaredevices.h>
#include <tdenetworkconnections.h> #include <tdenetworkconnections.h>
// knm headers // tdenm headers
#include "tdenetman-connection_setting_widget_interface.h" #include "tdenetman-connection_setting_widget_interface.h"
#include "tdenetman-connection_settings_dialog.h"
//class VPNService; //class VPNService;
class ConnectionSettingSerialWidget; class ConnectionSettingSerialWidget;
@ -64,6 +65,8 @@ class SerialWidgetImpl : public WidgetInterface
TDENetworkConnection* _serialsetting; TDENetworkConnection* _serialsetting;
ConnectionSettingSerialWidget* _mainWid; ConnectionSettingSerialWidget* _mainWid;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
} }

4
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.cpp
Unescape View File

@ -23,7 +23,7 @@
* *
**************************************************************************/ **************************************************************************/
// qt headers // tqt headers
#include <tqwidget.h> #include <tqwidget.h>
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
@ -34,7 +34,7 @@
#include <tqwidgetstack.h> #include <tqwidgetstack.h>
#include <kuser.h> #include <kuser.h>
// knm headers // tdenm headers
#include "tdenetman-connection.h" #include "tdenetman-connection.h"
#include "tdenetman-connection_setting_vpn.h" #include "tdenetman-connection_setting_vpn.h"
#include "tdenetman-connection_setting_vpn_widget.h" #include "tdenetman-connection_setting_vpn_widget.h"

8
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.h
Unescape View File

@ -26,14 +26,14 @@
#define KNETWORKMANAGER_CONNECTION_SETTING_VPN_WIDGET_H #define KNETWORKMANAGER_CONNECTION_SETTING_VPN_WIDGET_H
// qt headers // tqt headers
#include <tqwidget.h> #include <tqwidget.h>
#include <tqlineedit.h> #include <tqlineedit.h>
// knm headers // tdenm headers
#include "connection_setting_vpn.h" #include "connection_setting_vpn.h"
#include "tdenetman-connection_setting_widget_interface.h" #include "tdenetman-connection_setting_widget_interface.h"
#include "tdenetman-device.h" #include "tdenetman-connection_settings_dialog.h"
class VPNService; class VPNService;
class VPNConfigWidget; class VPNConfigWidget;
@ -63,6 +63,8 @@ class VPNWidgetImpl : public WidgetInterface
ConnectionSettingVPNWidget* _mainWid; ConnectionSettingVPNWidget* _mainWid;
TQMap<int, VPNService*> _mapServiceCombo; TQMap<int, VPNService*> _mapServiceCombo;
TQMap<VPNService*, VPNConfigWidget*> _mapServiceWidget; TQMap<VPNService*, VPNConfigWidget*> _mapServiceWidget;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
} }

135
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp
Unescape View File

@ -62,11 +62,13 @@ using namespace ConnectionSettings;
/* /*
class WirelessSecurityWEPImpl class WirelessSecurityWEPImpl
*/ */
WirelessSecurityWEPImpl::WirelessSecurityWEPImpl(TDEWiFiConnection* sec, TQWidget* parent, const char* name, WFlags fl) WirelessSecurityWEPImpl::WirelessSecurityWEPImpl(TDEWiFiConnection* sec, TQWidget* parent, ConnectionSettingsDialogImpl* connsettings, const char* name, WFlags fl)
: ConnectionSettingWirelessSecurityWEP(parent, name, fl) : ConnectionSettingWirelessSecurityWEP(parent, name, fl)
, _security_setting(sec) , _security_setting(sec)
, _wepKeyType( WEPKEY_TYPE_HEX ) , _wepKeyType( WEPKEY_TYPE_HEX )
{ {
_parentdialog = connsettings;
cboAuthentication->insertItem(i18n("Open System"), 0); cboAuthentication->insertItem(i18n("Open System"), 0);
cboAuthentication->insertItem(i18n("Shared Key"), 1); cboAuthentication->insertItem(i18n("Shared Key"), 1);
if (_security_setting->securitySettings.authType == TDENetworkWiFiAuthType::Open) { if (_security_setting->securitySettings.authType == TDENetworkWiFiAuthType::Open) {
@ -75,11 +77,22 @@ WirelessSecurityWEPImpl::WirelessSecurityWEPImpl(TDEWiFiConnection* sec, TQWidge
else if (_security_setting->securitySettings.authType == TDENetworkWiFiAuthType::Shared) { else if (_security_setting->securitySettings.authType == TDENetworkWiFiAuthType::Shared) {
cboAuthentication->setCurrentItem(1); cboAuthentication->setCurrentItem(1);
} }
else {
// Set up defaults
_security_setting->securitySettings.authType = TDENetworkWiFiAuthType::Open;
cboAuthentication->setCurrentItem(0);
}
cbKeyType->insertItem(i18n("WEP 40/128-bit ASCII"), WEPKEY_TYPE_ASCII); cbKeyType->insertItem(i18n("WEP 40/128-bit ASCII"), WEPKEY_TYPE_ASCII);
cbKeyType->insertItem(i18n("WEP 40/128-bit Hexadecimal"), WEPKEY_TYPE_HEX); cbKeyType->insertItem(i18n("WEP 40/128-bit Hexadecimal"), WEPKEY_TYPE_HEX);
cbKeyType->insertItem(i18n("WEP 128-bit passphrase"), WEPKEY_TYPE_PASSPHRASE); cbKeyType->insertItem(i18n("WEP 128-bit passphrase"), WEPKEY_TYPE_PASSPHRASE);
cbKeyType->setCurrentItem(_wepKeyType ); cbKeyType->setCurrentItem( _wepKeyType );
if (_security_setting->securitySettings.authType == TDENetworkWiFiAuthType::Other) {
// Set up defaults
_security_setting->securitySettings.wepKeyType = TDENetworkWepKeyType::Hexadecimal;
cbKeyType->setCurrentItem(WEPKEY_TYPE_HEX);
}
txtWEPKey0->setText(_security_setting->securitySettings.wepKey0); txtWEPKey0->setText(_security_setting->securitySettings.wepKey0);
txtWEPKey1->setText(_security_setting->securitySettings.wepKey1); txtWEPKey1->setText(_security_setting->securitySettings.wepKey1);
@ -126,37 +139,64 @@ void WirelessSecurityWEPImpl::slotAuthAlgChanged(int index)
else if (index == 1) { else if (index == 1) {
_security_setting->securitySettings.authType = TDENetworkWiFiAuthType::Shared; _security_setting->securitySettings.authType = TDENetworkWiFiAuthType::Shared;
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityWEPImpl::slotKeyTypeChanged(int index) void WirelessSecurityWEPImpl::slotKeyTypeChanged(int index)
{ {
_wepKeyType = (WEPKEY_TYPE)index; _wepKeyType = (WEPKEY_TYPE)index;
if (index == WEPKEY_TYPE_ASCII) {
_security_setting->securitySettings.wepKeyType = TDENetworkWepKeyType::Ascii;
}
else if (index == WEPKEY_TYPE_HEX) {
_security_setting->securitySettings.wepKeyType = TDENetworkWepKeyType::Hexadecimal;
}
else if (index == WEPKEY_TYPE_PASSPHRASE) {
_security_setting->securitySettings.wepKeyType = TDENetworkWepKeyType::Passphrase;
}
_security_setting->securitySettings.secretsValid = true;
// update all WEP-Keys here due to the new key_type // update all WEP-Keys here due to the new key_type
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityWEPImpl::slotWepKey0Changed(const TQString &key) void WirelessSecurityWEPImpl::slotWepKey0Changed(const TQString &key)
{ {
TQCString hashed = getHashedWEPKey(key, _wepKeyType); TQCString hashed = getHashedWEPKey(key, _wepKeyType);
_security_setting->securitySettings.wepKey0 = hashed; _security_setting->securitySettings.wepKey0 = hashed;
_security_setting->securitySettings.secretsValid = true;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityWEPImpl::slotWepKey1Changed(const TQString &key) void WirelessSecurityWEPImpl::slotWepKey1Changed(const TQString &key)
{ {
TQCString hashed = getHashedWEPKey(key, _wepKeyType); TQCString hashed = getHashedWEPKey(key, _wepKeyType);
_security_setting->securitySettings.wepKey1 = hashed; _security_setting->securitySettings.wepKey1 = hashed;
_security_setting->securitySettings.secretsValid = true;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityWEPImpl::slotWepKey2Changed(const TQString &key) void WirelessSecurityWEPImpl::slotWepKey2Changed(const TQString &key)
{ {
TQCString hashed = getHashedWEPKey(key, _wepKeyType); TQCString hashed = getHashedWEPKey(key, _wepKeyType);
_security_setting->securitySettings.wepKey2 = hashed; _security_setting->securitySettings.wepKey2 = hashed;
_security_setting->securitySettings.secretsValid = true;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityWEPImpl::slotWepKey3Changed(const TQString& key) void WirelessSecurityWEPImpl::slotWepKey3Changed(const TQString& key)
{ {
TQCString hashed = getHashedWEPKey(key, _wepKeyType); TQCString hashed = getHashedWEPKey(key, _wepKeyType);
_security_setting->securitySettings.wepKey3 = hashed; _security_setting->securitySettings.wepKey3 = hashed;
_security_setting->securitySettings.secretsValid = true;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityWEPImpl::slotWepIdx0Checked(bool check) void WirelessSecurityWEPImpl::slotWepIdx0Checked(bool check)
@ -164,6 +204,8 @@ void WirelessSecurityWEPImpl::slotWepIdx0Checked(bool check)
if (check) { if (check) {
_security_setting->securitySettings.wepKeyIndex = 0; _security_setting->securitySettings.wepKeyIndex = 0;
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityWEPImpl::slotWepIdx1Checked(bool check) void WirelessSecurityWEPImpl::slotWepIdx1Checked(bool check)
@ -171,6 +213,8 @@ void WirelessSecurityWEPImpl::slotWepIdx1Checked(bool check)
if (check) { if (check) {
_security_setting->securitySettings.wepKeyIndex = 1; _security_setting->securitySettings.wepKeyIndex = 1;
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityWEPImpl::slotWepIdx2Checked(bool check) void WirelessSecurityWEPImpl::slotWepIdx2Checked(bool check)
@ -178,6 +222,8 @@ void WirelessSecurityWEPImpl::slotWepIdx2Checked(bool check)
if (check) { if (check) {
_security_setting->securitySettings.wepKeyIndex = 2; _security_setting->securitySettings.wepKeyIndex = 2;
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityWEPImpl::slotWepIdx3Checked(bool check) void WirelessSecurityWEPImpl::slotWepIdx3Checked(bool check)
@ -185,6 +231,8 @@ void WirelessSecurityWEPImpl::slotWepIdx3Checked(bool check)
if (check) { if (check) {
_security_setting->securitySettings.wepKeyIndex = 3; _security_setting->securitySettings.wepKeyIndex = 3;
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
TQCString TQCString
@ -201,7 +249,7 @@ WirelessSecurityWEPImpl::getHashedWEPKey(TQString key, WEPKEY_TYPE type) const
return hashed; return hashed;
break; break;
case WEPKEY_TYPE_PASSPHRASE: case WEPKEY_TYPE_PASSPHRASE:
return getWEP128PassphraseHash(TQCString(key)); return TQCString(key);
break; break;
} }
return hashed; return hashed;
@ -253,10 +301,12 @@ WirelessSecurityWEPImpl::String2Hex(TQByteArray bytes, int final_len) const
/* /*
class WirelessSecurityWEPEncryptionImpl class WirelessSecurityWEPEncryptionImpl
*/ */
WirelessSecurityWEPEncryptionImpl::WirelessSecurityWEPEncryptionImpl(TDEWiFiConnection* security_setting, TQWidget* parent, const char* name, WFlags fl) WirelessSecurityWEPEncryptionImpl::WirelessSecurityWEPEncryptionImpl(TDEWiFiConnection* security_setting, TQWidget* parent, ConnectionSettingsDialogImpl* connsettings, const char* name, WFlags fl)
: ConnectionSettingWirelessSecurityWEPEncryption(parent, name, fl) : ConnectionSettingWirelessSecurityWEPEncryption(parent, name, fl)
, _security_setting(security_setting) , _security_setting(security_setting)
{ {
_parentdialog = connsettings;
cboEncryption->insertItem(i18n("None")); cboEncryption->insertItem(i18n("None"));
cboEncryption->insertItem(i18n("Dynamic WEP")); cboEncryption->insertItem(i18n("Dynamic WEP"));
} }
@ -265,10 +315,12 @@ WirelessSecurityWEPEncryptionImpl::WirelessSecurityWEPEncryptionImpl(TDEWiFiConn
/* /*
class WirelessSecurityWPAVersionImpl class WirelessSecurityWPAVersionImpl
*/ */
WirelessSecurityWPAVersionImpl::WirelessSecurityWPAVersionImpl(TDEWiFiConnection* security_setting, TQWidget* parent, const char* name, WFlags fl) WirelessSecurityWPAVersionImpl::WirelessSecurityWPAVersionImpl(TDEWiFiConnection* security_setting, TQWidget* parent, ConnectionSettingsDialogImpl* connsettings, const char* name, WFlags fl)
: ConnectionSettingWirelessSecurityWPAVersion(parent, name, fl) : ConnectionSettingWirelessSecurityWPAVersion(parent, name, fl)
, _security_setting(security_setting) , _security_setting(security_setting)
{ {
_parentdialog = connsettings;
cbWPA->setChecked(_security_setting->securitySettings.wpaVersion & TDENetworkWiFiWPAVersionFlags::WPA); cbWPA->setChecked(_security_setting->securitySettings.wpaVersion & TDENetworkWiFiWPAVersionFlags::WPA);
cbRSN->setChecked(_security_setting->securitySettings.wpaVersion & TDENetworkWiFiWPAVersionFlags::RSN); cbRSN->setChecked(_security_setting->securitySettings.wpaVersion & TDENetworkWiFiWPAVersionFlags::RSN);
@ -296,27 +348,35 @@ WirelessSecurityWPAVersionImpl::slotAuto(bool on)
} }
_security_setting->securitySettings.wpaVersion = proto; _security_setting->securitySettings.wpaVersion = proto;
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
WirelessSecurityWPAVersionImpl::slotWPA1(bool on) WirelessSecurityWPAVersionImpl::slotWPA1(bool on)
{ {
SET_FLAG_IF_TRUE_CLEAR_IF_FALSE(_security_setting->securitySettings.wpaVersion, TDENetworkWiFiWPAVersionFlags::WPA, on); SET_FLAG_IF_TRUE_CLEAR_IF_FALSE(_security_setting->securitySettings.wpaVersion, TDENetworkWiFiWPAVersionFlags::WPA, on);
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
WirelessSecurityWPAVersionImpl::slotWPA2(bool on) WirelessSecurityWPAVersionImpl::slotWPA2(bool on)
{ {
SET_FLAG_IF_TRUE_CLEAR_IF_FALSE(_security_setting->securitySettings.wpaVersion, TDENetworkWiFiWPAVersionFlags::RSN, on); SET_FLAG_IF_TRUE_CLEAR_IF_FALSE(_security_setting->securitySettings.wpaVersion, TDENetworkWiFiWPAVersionFlags::RSN, on);
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
/* /*
class WirelessSecurityWPACipherImpl class WirelessSecurityWPACipherImpl
*/ */
WirelessSecurityWPACipherImpl::WirelessSecurityWPACipherImpl(TDEWiFiConnection* security_setting, TQWidget* parent, const char* name, WFlags fl) WirelessSecurityWPACipherImpl::WirelessSecurityWPACipherImpl(TDEWiFiConnection* security_setting, TQWidget* parent, ConnectionSettingsDialogImpl* connsettings, const char* name, WFlags fl)
: ConnectionSettingWirelessSecurityWPACipher(parent, name, fl) : ConnectionSettingWirelessSecurityWPACipher(parent, name, fl)
, _security_setting(security_setting) , _security_setting(security_setting)
{ {
_parentdialog = connsettings;
connect(grpUseCipher, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCipherChangedAuto(bool))); connect(grpUseCipher, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCipherChangedAuto(bool)));
connect(chkGroupCipherTKIP, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotGroupCipherChangedTKIP(bool))); connect(chkGroupCipherTKIP, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotGroupCipherChangedTKIP(bool)));
@ -334,7 +394,6 @@ WirelessSecurityWPACipherImpl::WirelessSecurityWPACipherImpl(TDEWiFiConnection*
chkGroupCipherTKIP->setChecked(_security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::Any) || _security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::CipherTKIP)); chkGroupCipherTKIP->setChecked(_security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::Any) || _security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::CipherTKIP));
chkGroupCipherWEP40->setChecked(_security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::Any) || _security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::CipherWEP40)); chkGroupCipherWEP40->setChecked(_security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::Any) || _security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::CipherWEP40));
chkGroupCipherWEP104->setChecked(_security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::Any) || _security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::CipherWEP104)); chkGroupCipherWEP104->setChecked(_security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::Any) || _security_setting->securitySettings.allowedGroupWiseCiphers.contains(TDENetworkWiFiConnectionCipher::CipherWEP104));
} }
void void
@ -377,8 +436,9 @@ WirelessSecurityWPACipherImpl::slotCipherChangedAuto(bool checked)
cipher.append(TDENetworkWiFiConnectionCipher::CipherCCMP); cipher.append(TDENetworkWiFiConnectionCipher::CipherCCMP);
} }
_security_setting->securitySettings.allowedPairWiseCiphers = cipher; _security_setting->securitySettings.allowedPairWiseCiphers = cipher;
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -390,6 +450,8 @@ WirelessSecurityWPACipherImpl::slotGroupCipherChangedTKIP(bool checked)
else { else {
_security_setting->securitySettings.allowedGroupWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherTKIP); _security_setting->securitySettings.allowedGroupWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherTKIP);
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -401,6 +463,8 @@ WirelessSecurityWPACipherImpl::slotGroupCipherChangedCCMP(bool checked)
else { else {
_security_setting->securitySettings.allowedGroupWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherCCMP); _security_setting->securitySettings.allowedGroupWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherCCMP);
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -412,6 +476,8 @@ WirelessSecurityWPACipherImpl::slotGroupCipherChangedWEP40(bool checked)
else { else {
_security_setting->securitySettings.allowedPairWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherWEP40); _security_setting->securitySettings.allowedPairWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherWEP40);
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -423,6 +489,8 @@ WirelessSecurityWPACipherImpl::slotGroupCipherChangedWEP104(bool checked)
else { else {
_security_setting->securitySettings.allowedPairWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherWEP104); _security_setting->securitySettings.allowedPairWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherWEP104);
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -434,6 +502,8 @@ WirelessSecurityWPACipherImpl::slotPairwiseCipherChangedTKIP(bool checked)
else { else {
_security_setting->securitySettings.allowedPairWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherTKIP); _security_setting->securitySettings.allowedPairWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherTKIP);
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -445,16 +515,20 @@ WirelessSecurityWPACipherImpl::slotPairwiseCipherChangedCCMP(bool checked)
else { else {
_security_setting->securitySettings.allowedPairWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherCCMP); _security_setting->securitySettings.allowedPairWiseCiphers.remove(TDENetworkWiFiConnectionCipher::CipherCCMP);
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
/* /*
class WirelessSecurityWPAPSK class WirelessSecurityWPAPSK
*/ */
WirelessSecurityWPAPSKImpl::WirelessSecurityWPAPSKImpl(TDEWiFiConnection* security_setting, TDEWiFiConnection* wireless_setting, TQWidget* parent, const char* name, WFlags fl) WirelessSecurityWPAPSKImpl::WirelessSecurityWPAPSKImpl(TDEWiFiConnection* security_setting, TDEWiFiConnection* wireless_setting, TQWidget* parent, ConnectionSettingsDialogImpl* connsettings, const char* name, WFlags fl)
: ConnectionSettingWirelessSecurityWPAPSK(parent, name, fl) : ConnectionSettingWirelessSecurityWPAPSK(parent, name, fl)
, _security_setting(security_setting) , _security_setting(security_setting)
, _wireless_setting(wireless_setting) , _wireless_setting(wireless_setting)
{ {
_parentdialog = connsettings;
if (_security_setting->securitySettings.secretsValid) { if (_security_setting->securitySettings.secretsValid) {
txtPSK->setText(_security_setting->securitySettings.psk); txtPSK->setText(_security_setting->securitySettings.psk);
} }
@ -469,6 +543,8 @@ WirelessSecurityWPAPSKImpl::slotPSKChanged(const TQString& psk)
_security_setting->securitySettings.psk = psk; _security_setting->securitySettings.psk = psk;
_security_setting->securitySettings.secretsValid = true; _security_setting->securitySettings.secretsValid = true;
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
TQCString TQCString
@ -491,11 +567,13 @@ WirelessSecurityWPAPSKImpl::String2Hex(TQByteArray bytes, int final_len) const
/* /*
class WirelessSecurityEAPImpl class WirelessSecurityEAPImpl
*/ */
WirelessSecurityEAPImpl::WirelessSecurityEAPImpl(TDEWiFiConnection* security_setting, WirelessSecurityPhase2Impl* phase2_widget, TQWidget* parent, const char* name, WFlags fl) WirelessSecurityEAPImpl::WirelessSecurityEAPImpl(TDEWiFiConnection* security_setting, WirelessSecurityPhase2Impl* phase2_widget, TQWidget* parent, ConnectionSettingsDialogImpl* connsettings, const char* name, WFlags fl)
: ConnectionSettingWirelessSecurityEAP(parent, name, fl) : ConnectionSettingWirelessSecurityEAP(parent, name, fl)
, _security_setting(security_setting) , _security_setting(security_setting)
, _phase2_widget(phase2_widget) , _phase2_widget(phase2_widget)
{ {
_parentdialog = connsettings;
// insert all EAP-Methods // insert all EAP-Methods
int index = 0; int index = 0;
cboMethod->insertItem(i18n("None"), index); cboMethod->insertItem(i18n("None"), index);
@ -550,6 +628,8 @@ void WirelessSecurityEAPImpl::slotUseSystemCaCertChanged(bool on)
{ {
_security_setting->eapConfig.forceSystemCaCertificates = on; _security_setting->eapConfig.forceSystemCaCertificates = on;
kURLCACert->setEnabled(!on); kURLCACert->setEnabled(!on);
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityEAPImpl::slotMethodChanged(int index) void WirelessSecurityEAPImpl::slotMethodChanged(int index)
@ -559,31 +639,41 @@ void WirelessSecurityEAPImpl::slotMethodChanged(int index)
_security_setting->eapConfig.type = eap; _security_setting->eapConfig.type = eap;
_phase2_widget->setAllowedPhase2Methods(_security_setting->eapConfig.allowedPhase2EAPMethods); _phase2_widget->setAllowedPhase2Methods(_security_setting->eapConfig.allowedPhase2EAPMethods);
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityEAPImpl::slotIdentityChanged(const TQString& identity) void WirelessSecurityEAPImpl::slotIdentityChanged(const TQString& identity)
{ {
_security_setting->eapConfig.userName = identity; _security_setting->eapConfig.userName = identity;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityEAPImpl::slotAnonIdentityChanged(const TQString& identity) void WirelessSecurityEAPImpl::slotAnonIdentityChanged(const TQString& identity)
{ {
_security_setting->eapConfig.anonymousUserName = identity; _security_setting->eapConfig.anonymousUserName = identity;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void WirelessSecurityEAPImpl::slotPasswordChanged(const TQString& pwd) void WirelessSecurityEAPImpl::slotPasswordChanged(const TQString& pwd)
{ {
_security_setting->eapConfig.password = TQString(txtPassword->password()); _security_setting->eapConfig.password = TQString(txtPassword->password());
_security_setting->eapConfig.secretsValid = true; _security_setting->eapConfig.secretsValid = true;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
/* /*
class WirelessSecurityPhase2Impl class WirelessSecurityPhase2Impl
*/ */
WirelessSecurityPhase2Impl::WirelessSecurityPhase2Impl(TDEWiFiConnection* security_setting, TQWidget* parent, const char* name, WFlags fl) WirelessSecurityPhase2Impl::WirelessSecurityPhase2Impl(TDEWiFiConnection* security_setting, TQWidget* parent, ConnectionSettingsDialogImpl* connsettings, const char* name, WFlags fl)
: ConnectionSettingWirelessSecurityPhase2(parent, name, fl) : ConnectionSettingWirelessSecurityPhase2(parent, name, fl)
, _security_setting(security_setting) , _security_setting(security_setting)
{ {
_parentdialog = connsettings;
_allowed_methods.append(TDENetworkIEEE8021xType::None); _allowed_methods.append(TDENetworkIEEE8021xType::None);
updateMethodComboBox(); updateMethodComboBox();
@ -680,6 +770,8 @@ void WirelessSecurityPhase2Impl::slotPhase2MethodChanged(int index)
// new method choosen // new method choosen
TDENetworkIEEE8021xType::TDENetworkIEEE8021xType eap = _eapIndexMap[index]; TDENetworkIEEE8021xType::TDENetworkIEEE8021xType eap = _eapIndexMap[index];
_security_setting->eapConfig.phase2EAPAuthMethod = eap; _security_setting->eapConfig.phase2EAPAuthMethod = eap;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
/* /*
@ -689,6 +781,7 @@ void WirelessSecurityPhase2Impl::slotPhase2MethodChanged(int index)
WirelessSecurityWidgetImpl::WirelessSecurityWidgetImpl(TDENetworkConnection* conn, bool new_conn, TQWidget* parent, const char* name, WFlags fl) WirelessSecurityWidgetImpl::WirelessSecurityWidgetImpl(TDENetworkConnection* conn, bool new_conn, TQWidget* parent, const char* name, WFlags fl)
: WidgetInterface(parent, name, fl) : WidgetInterface(parent, name, fl)
{ {
_parentdialog = dynamic_cast<ConnectionSettingsDialogImpl*>(parent);
_security_setting = dynamic_cast<TDEWiFiConnection*> (conn); _security_setting = dynamic_cast<TDEWiFiConnection*> (conn);
_wireless_setting = dynamic_cast<TDEWiFiConnection*> (conn); _wireless_setting = dynamic_cast<TDEWiFiConnection*> (conn);
_ieee8021x_setting = dynamic_cast<TDEWiFiConnection*> (conn); _ieee8021x_setting = dynamic_cast<TDEWiFiConnection*> (conn);
@ -705,13 +798,13 @@ void
WirelessSecurityWidgetImpl::slotInit() WirelessSecurityWidgetImpl::slotInit()
{ {
// create all security widgets... // create all security widgets...
TQWidget* wep = new WirelessSecurityWEPImpl(_security_setting, _mainWid->groupUseEncryption); TQWidget* wep = new WirelessSecurityWEPImpl(_security_setting, _mainWid->groupUseEncryption, _parentdialog);
TQWidget* phase2 = new WirelessSecurityPhase2Impl(_ieee8021x_setting, _mainWid->groupUseEncryption); TQWidget* phase2 = new WirelessSecurityPhase2Impl(_ieee8021x_setting, _mainWid->groupUseEncryption, _parentdialog);
TQWidget* eap = new WirelessSecurityEAPImpl(_ieee8021x_setting, (WirelessSecurityPhase2Impl*)phase2, _mainWid->groupUseEncryption); TQWidget* eap = new WirelessSecurityEAPImpl(_ieee8021x_setting, (WirelessSecurityPhase2Impl*)phase2, _mainWid->groupUseEncryption, _parentdialog);
TQWidget* wpaversion = new WirelessSecurityWPAVersionImpl(_security_setting, _mainWid->groupUseEncryption); TQWidget* wpaversion = new WirelessSecurityWPAVersionImpl(_security_setting, _mainWid->groupUseEncryption, _parentdialog);
TQWidget* wpacipher = new WirelessSecurityWPACipherImpl(_security_setting, _mainWid->groupUseEncryption); TQWidget* wpacipher = new WirelessSecurityWPACipherImpl(_security_setting, _mainWid->groupUseEncryption, _parentdialog);
TQWidget* wpapsk = new WirelessSecurityWPAPSKImpl(_security_setting, _wireless_setting, _mainWid->groupUseEncryption); TQWidget* wpapsk = new WirelessSecurityWPAPSKImpl(_security_setting, _wireless_setting, _mainWid->groupUseEncryption, _parentdialog);
TQWidget* wepencryption = new WirelessSecurityWEPEncryptionImpl(_security_setting, _mainWid->groupUseEncryption); TQWidget* wepencryption = new WirelessSecurityWEPEncryptionImpl(_security_setting, _mainWid->groupUseEncryption, _parentdialog);
wep->setHidden(true); wep->setHidden(true);
eap->setHidden(true); eap->setHidden(true);
@ -903,6 +996,8 @@ void
WirelessSecurityWidgetImpl::slotUseEncryptionToggled(bool on) WirelessSecurityWidgetImpl::slotUseEncryptionToggled(bool on)
{ {
_wireless_setting->securityRequired = on; _wireless_setting->securityRequired = on;
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -933,6 +1028,8 @@ WirelessSecurityWidgetImpl::slotComboSecurityActivated(int index)
// should not happen, something is broken... // should not happen, something is broken...
break; break;
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -993,6 +1090,8 @@ WirelessSecurityWidgetImpl::slotExtraSettingsToggled(bool on)
_mainWid->groupUseEncryption->layout()->remove(*it); _mainWid->groupUseEncryption->layout()->remove(*it);
(*it)->hide(); (*it)->hide();
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void

33
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.h
Unescape View File

@ -41,6 +41,7 @@
/* tdenetman headers */ /* tdenetman headers */
#include "qbidirectionalmap.h" #include "qbidirectionalmap.h"
#include "tdenetman-connection_settings_dialog.h"
#include "tdenetman-connection_setting_widget_interface.h" #include "tdenetman-connection_setting_widget_interface.h"
namespace ConnectionSettings namespace ConnectionSettings
@ -62,7 +63,7 @@ namespace ConnectionSettings
, WEPKEY_TYPE_PASSPHRASE , WEPKEY_TYPE_PASSPHRASE
}; };
WirelessSecurityWEPImpl(TDEWiFiConnection* security, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); WirelessSecurityWEPImpl(TDEWiFiConnection* security, TQWidget* parent = 0, ConnectionSettingsDialogImpl* connsettings = 0, const char* name = 0, WFlags fl = 0);
TQCString getHashedWEPKey(TQString key, WEPKEY_TYPE type) const; TQCString getHashedWEPKey(TQString key, WEPKEY_TYPE type) const;
TQCString getWEP128PassphraseHash(TQCString input) const; TQCString getWEP128PassphraseHash(TQCString input) const;
TQCString String2Hex(TQByteArray bytes, int final_len) const; TQCString String2Hex(TQByteArray bytes, int final_len) const;
@ -78,9 +79,12 @@ namespace ConnectionSettings
void slotWepIdx1Checked(bool); void slotWepIdx1Checked(bool);
void slotWepIdx2Checked(bool); void slotWepIdx2Checked(bool);
void slotWepIdx3Checked(bool); void slotWepIdx3Checked(bool);
private: private:
TDEWiFiConnection* _security_setting; TDEWiFiConnection* _security_setting;
WEPKEY_TYPE _wepKeyType; WEPKEY_TYPE _wepKeyType;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
class WirelessSecurityWEPEncryptionImpl : public ConnectionSettingWirelessSecurityWEPEncryption class WirelessSecurityWEPEncryptionImpl : public ConnectionSettingWirelessSecurityWEPEncryption
@ -88,9 +92,12 @@ namespace ConnectionSettings
Q_OBJECT Q_OBJECT
public: public:
WirelessSecurityWEPEncryptionImpl(TDEWiFiConnection* security_setting, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); WirelessSecurityWEPEncryptionImpl(TDEWiFiConnection* security_setting, TQWidget* parent = 0, ConnectionSettingsDialogImpl* connsettings = 0, const char* name = 0, WFlags fl = 0);
private: private:
TDEWiFiConnection* _security_setting; TDEWiFiConnection* _security_setting;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
class WirelessSecurityWPAVersionImpl : public ConnectionSettingWirelessSecurityWPAVersion class WirelessSecurityWPAVersionImpl : public ConnectionSettingWirelessSecurityWPAVersion
@ -98,7 +105,7 @@ namespace ConnectionSettings
Q_OBJECT Q_OBJECT
public: public:
WirelessSecurityWPAVersionImpl(TDEWiFiConnection* security_setting, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); WirelessSecurityWPAVersionImpl(TDEWiFiConnection* security_setting, TQWidget* parent = 0, ConnectionSettingsDialogImpl* connsettings = 0, const char* name = 0, WFlags fl = 0);
public slots: public slots:
void slotAuto(bool); void slotAuto(bool);
@ -108,6 +115,8 @@ namespace ConnectionSettings
private: private:
TDEWiFiConnection* _security_setting; TDEWiFiConnection* _security_setting;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
class WirelessSecurityWPACipherImpl : public ConnectionSettingWirelessSecurityWPACipher class WirelessSecurityWPACipherImpl : public ConnectionSettingWirelessSecurityWPACipher
@ -123,7 +132,7 @@ namespace ConnectionSettings
, WPA_CIPHER_LAST , WPA_CIPHER_LAST
}; };
public: public:
WirelessSecurityWPACipherImpl(TDEWiFiConnection* security_setting, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); WirelessSecurityWPACipherImpl(TDEWiFiConnection* security_setting, TQWidget* parent = 0, ConnectionSettingsDialogImpl* connsettings = 0, const char* name = 0, WFlags fl = 0);
public slots: public slots:
void slotCipherChangedAuto(bool); void slotCipherChangedAuto(bool);
@ -136,6 +145,8 @@ namespace ConnectionSettings
private: private:
TDEWiFiConnection* _security_setting; TDEWiFiConnection* _security_setting;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
class WirelessSecurityWPAPSKImpl : public ConnectionSettingWirelessSecurityWPAPSK class WirelessSecurityWPAPSKImpl : public ConnectionSettingWirelessSecurityWPAPSK
@ -143,7 +154,7 @@ namespace ConnectionSettings
Q_OBJECT Q_OBJECT
public: public:
WirelessSecurityWPAPSKImpl(TDEWiFiConnection* security_setting, TDEWiFiConnection* wireless_setting, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); WirelessSecurityWPAPSKImpl(TDEWiFiConnection* security_setting, TDEWiFiConnection* wireless_setting, TQWidget* parent = 0, ConnectionSettingsDialogImpl* connsettings = 0, const char* name = 0, WFlags fl = 0);
TQCString String2Hex(TQByteArray bytes, int final_len) const; TQCString String2Hex(TQByteArray bytes, int final_len) const;
public slots: public slots:
@ -152,6 +163,8 @@ namespace ConnectionSettings
private: private:
TDEWiFiConnection* _security_setting; TDEWiFiConnection* _security_setting;
TDEWiFiConnection* _wireless_setting; TDEWiFiConnection* _wireless_setting;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
class WirelessSecurityEAPImpl : public ConnectionSettingWirelessSecurityEAP class WirelessSecurityEAPImpl : public ConnectionSettingWirelessSecurityEAP
@ -159,7 +172,7 @@ namespace ConnectionSettings
Q_OBJECT Q_OBJECT
public: public:
WirelessSecurityEAPImpl(TDEWiFiConnection* security_setting, WirelessSecurityPhase2Impl* phase2_widget, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); WirelessSecurityEAPImpl(TDEWiFiConnection* security_setting, WirelessSecurityPhase2Impl* phase2_widget, TQWidget* parent = 0, ConnectionSettingsDialogImpl* connsettings = 0, const char* name = 0, WFlags fl = 0);
public slots: public slots:
void slotMethodChanged(int index); void slotMethodChanged(int index);
@ -172,6 +185,8 @@ namespace ConnectionSettings
TDEWiFiConnection* _security_setting; TDEWiFiConnection* _security_setting;
TQBiDirectionalMap<int, TDENetworkIEEE8021xType::TDENetworkIEEE8021xType> _eapIndexMap; TQBiDirectionalMap<int, TDENetworkIEEE8021xType::TDENetworkIEEE8021xType> _eapIndexMap;
WirelessSecurityPhase2Impl* _phase2_widget; WirelessSecurityPhase2Impl* _phase2_widget;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
class WirelessSecurityPhase2Impl : public ConnectionSettingWirelessSecurityPhase2 class WirelessSecurityPhase2Impl : public ConnectionSettingWirelessSecurityPhase2
@ -179,7 +194,7 @@ namespace ConnectionSettings
Q_OBJECT Q_OBJECT
public: public:
WirelessSecurityPhase2Impl(TDEWiFiConnection* security_setting, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); WirelessSecurityPhase2Impl(TDEWiFiConnection* security_setting, TQWidget* parent = 0, ConnectionSettingsDialogImpl* connsettings = 0, const char* name = 0, WFlags fl = 0);
public slots: public slots:
void setAllowedPhase2Methods(const TQValueList<TDENetworkIEEE8021xType::TDENetworkIEEE8021xType>&); void setAllowedPhase2Methods(const TQValueList<TDENetworkIEEE8021xType::TDENetworkIEEE8021xType>&);
void slotPhase2MethodChanged(int index); void slotPhase2MethodChanged(int index);
@ -189,6 +204,8 @@ namespace ConnectionSettings
TDEWiFiConnection* _security_setting; TDEWiFiConnection* _security_setting;
TQBiDirectionalMap<int, TDENetworkIEEE8021xType::TDENetworkIEEE8021xType> _eapIndexMap; TQBiDirectionalMap<int, TDENetworkIEEE8021xType::TDENetworkIEEE8021xType> _eapIndexMap;
TQValueList<TDENetworkIEEE8021xType::TDENetworkIEEE8021xType> _allowed_methods; TQValueList<TDENetworkIEEE8021xType::TDENetworkIEEE8021xType> _allowed_methods;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
class WirelessSecurityWidgetImpl : public WidgetInterface class WirelessSecurityWidgetImpl : public WidgetInterface
@ -234,6 +251,8 @@ namespace ConnectionSettings
ConnectionSettingWirelessSecurityWidget* _mainWid; ConnectionSettingWirelessSecurityWidget* _mainWid;
bool _new_conn; bool _new_conn;
TQMap<int, SecurityMethods> _securityComboMap; TQMap<int, SecurityMethods> _securityComboMap;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
} }

10
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
Unescape View File

@ -72,6 +72,8 @@ class NetworkListViewItem : public KListViewItem
WirelessWidgetImpl::WirelessWidgetImpl(TDENetworkConnection* conn, bool new_conn, TQByteArray preselect_ssid, TQWidget* parent, const char* name, WFlags fl) WirelessWidgetImpl::WirelessWidgetImpl(TDENetworkConnection* conn, bool new_conn, TQByteArray preselect_ssid, TQWidget* parent, const char* name, WFlags fl)
: WidgetInterface(parent, name, fl) : WidgetInterface(parent, name, fl)
{ {
_parentdialog = dynamic_cast<ConnectionSettingsDialogImpl*>(parent);
_wireless_setting = dynamic_cast<TDEWiFiConnection*>(conn); _wireless_setting = dynamic_cast<TDEWiFiConnection*>(conn);
_info_setting = dynamic_cast<TDEWiFiConnection*>(conn); _info_setting = dynamic_cast<TDEWiFiConnection*>(conn);
_security_setting = dynamic_cast<TDEWiFiConnection*>(conn); _security_setting = dynamic_cast<TDEWiFiConnection*>(conn);
@ -153,6 +155,8 @@ void WirelessWidgetImpl::slotEssidChanged(TQListViewItem* item)
// update the textbox to match the selected essid // update the textbox to match the selected essid
_mainWid->txtEssid->setText(net_item->_net.getDisplaySsid()); _mainWid->txtEssid->setText(net_item->_net.getDisplaySsid());
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -165,6 +169,8 @@ WirelessWidgetImpl::slotEssidDoubleClicked(TQListViewItem* item, const TQPoint&
// essid selected with double click -> goto the next setting // essid selected with double click -> goto the next setting
emit next(); emit next();
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
@ -182,6 +188,8 @@ WirelessWidgetImpl::slotEssidChanged(const TQString& new_essid)
essid.resize(essid.size() - 1); essid.resize(essid.size() - 1);
updateEssid(essid); updateEssid(essid);
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
void void
@ -197,6 +205,8 @@ WirelessWidgetImpl::updateEssid(const TQByteArray& essid)
_info_setting->friendlyName = "<" + i18n("hidden") + ">"; _info_setting->friendlyName = "<" + i18n("hidden") + ">";
} }
} }
if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts
} }
TQByteArray WirelessWidgetImpl::byteArrayFromHexString(const TQCString& str) TQByteArray WirelessWidgetImpl::byteArrayFromHexString(const TQCString& str)

3
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.h
Unescape View File

@ -31,6 +31,7 @@
#include <tdenetworkconnections.h> #include <tdenetworkconnections.h>
#include "tdenetman-connection_setting_widget_interface.h" #include "tdenetman-connection_setting_widget_interface.h"
#include "tdenetman-connection_settings_dialog.h"
#include "connection_setting_wireless.h" #include "connection_setting_wireless.h"
class KListViewSearchLineWidget; class KListViewSearchLineWidget;
@ -70,6 +71,8 @@ namespace ConnectionSettings
KListViewSearchLineWidget* _searchLine; KListViewSearchLineWidget* _searchLine;
bool _new_conn; bool _new_conn;
TQByteArray _preselect_ssid; TQByteArray _preselect_ssid;
ConnectionSettingsDialogImpl* _parentdialog;
}; };
} }
#endif /* KNETWORKMANAGER_CONNECTION_SETTING_WIRELESS_WIDGET_H*/ #endif /* KNETWORKMANAGER_CONNECTION_SETTING_WIRELESS_WIDGET_H*/

85
tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp
Unescape View File

@ -32,17 +32,14 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <tqlabel.h> #include <tqlabel.h>
// kde headers // tde headers
#include <kiconloader.h> #include <kiconloader.h>
#include <kdebug.h> #include <kdebug.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h>
// TQt DBus headers // tdenm headers
#include <tqdbuserror.h>
#include <tqdbusobjectpath.h>
// knm headers
#include "tdenetman-connection_setting_widget_interface.h" #include "tdenetman-connection_setting_widget_interface.h"
#include "tdenetman-connection_settings_dialog.h" #include "tdenetman-connection_settings_dialog.h"
#include "tdenetman-connection_setting_cdma_widget.h" #include "tdenetman-connection_setting_cdma_widget.h"
@ -95,10 +92,10 @@ ConnectionSettingsDialogImpl::createWidgetsForWireless(TDENetworkConnection* con
TQValueList<WidgetInterface*> ret; TQValueList<WidgetInterface*> ret;
// widgetlist for wireless connection // widgetlist for wireless connection
ret.append(new ConnectionSettings::WirelessWidgetImpl(conn, new_conn)); ret.append(new ConnectionSettings::WirelessWidgetImpl(conn, new_conn, TQByteArray(), this));
ret.append(new ConnectionSettings::WirelessSecurityWidgetImpl(conn, new_conn)); ret.append(new ConnectionSettings::WirelessSecurityWidgetImpl(conn, new_conn, this));
ret.append(new ConnectionSettings::IPv4WidgetImpl(conn)); ret.append(new ConnectionSettings::IPv4WidgetImpl(conn, this));
ret.append(new ConnectionSettings::InfoWidgetImpl(conn)); ret.append(new ConnectionSettings::InfoWidgetImpl(conn, this));
if (ret.isEmpty()) if (ret.isEmpty())
{ {
@ -114,20 +111,11 @@ ConnectionSettingsDialogImpl::createWidgetsForWirelessKnownESSID(TDENetworkConne
{ {
TQValueList<WidgetInterface*> ret; TQValueList<WidgetInterface*> ret;
// // Set ESSID
// TDEWiFiConnection* _wireless_setting = dynamic_cast<TDEWiFiConnection*>(conn);
// _wireless_setting->SSID = essid;
// // The connection has no name yet -> just take the essid for it
// _wireless_setting->friendlyName = TQString(essid);
// if (_wireless_setting->friendlyName == "") {
// _wireless_setting->friendlyName = "<" + i18n("hidden") + ">";
// }
// widgetlist for wireless connection // widgetlist for wireless connection
ret.append(new ConnectionSettings::WirelessWidgetImpl(conn, new_conn, essid)); ret.append(new ConnectionSettings::WirelessWidgetImpl(conn, new_conn, essid, this));
ret.append(new ConnectionSettings::WirelessSecurityWidgetImpl(conn, new_conn)); ret.append(new ConnectionSettings::WirelessSecurityWidgetImpl(conn, new_conn, this));
ret.append(new ConnectionSettings::IPv4WidgetImpl(conn)); ret.append(new ConnectionSettings::IPv4WidgetImpl(conn, this));
ret.append(new ConnectionSettings::InfoWidgetImpl(conn)); ret.append(new ConnectionSettings::InfoWidgetImpl(conn, this));
if (ret.isEmpty()) if (ret.isEmpty())
{ {
@ -144,8 +132,8 @@ ConnectionSettingsDialogImpl::createWidgetsForWired(TDENetworkConnection* conn,
TQValueList<WidgetInterface*> ret; TQValueList<WidgetInterface*> ret;
// widgetlist for wired connection // widgetlist for wired connection
ret.append(new ConnectionSettings::IPv4WidgetImpl(conn)); ret.append(new ConnectionSettings::IPv4WidgetImpl(conn, this));
ret.append(new ConnectionSettings::InfoWidgetImpl(conn)); ret.append(new ConnectionSettings::InfoWidgetImpl(conn, this));
return ret; return ret;
} }
@ -156,8 +144,8 @@ ConnectionSettingsDialogImpl::createWidgetsForVPN(TDENetworkConnection* conn, bo
TQValueList<WidgetInterface*> ret; TQValueList<WidgetInterface*> ret;
// widgetlist for wired connection // widgetlist for wired connection
// ret.append(new ConnectionSettings::VPNWidgetImpl(conn, new_conn)); // ret.append(new ConnectionSettings::VPNWidgetImpl(conn, new_conn, this));
ret.append(new ConnectionSettings::InfoWidgetImpl(conn)); ret.append(new ConnectionSettings::InfoWidgetImpl(conn, this));
return ret; return ret;
} }
@ -168,11 +156,11 @@ ConnectionSettingsDialogImpl::createWidgetsForCDMA(TDENetworkConnection* conn, b
TQValueList<WidgetInterface*> ret; TQValueList<WidgetInterface*> ret;
// widgetlist for wired connection // widgetlist for wired connection
ret.append(new ConnectionSettings::CDMAWidgetImpl(conn)); ret.append(new ConnectionSettings::CDMAWidgetImpl(conn, this));
ret.append(new ConnectionSettings::SerialWidgetImpl(conn)); ret.append(new ConnectionSettings::SerialWidgetImpl(conn, this));
ret.append(new ConnectionSettings::PPPWidgetImpl(conn)); ret.append(new ConnectionSettings::PPPWidgetImpl(conn, this));
ret.append(new ConnectionSettings::IPv4WidgetImpl(conn)); ret.append(new ConnectionSettings::IPv4WidgetImpl(conn, this));
ret.append(new ConnectionSettings::InfoWidgetImpl(conn)); ret.append(new ConnectionSettings::InfoWidgetImpl(conn, this));
return ret; return ret;
} }
@ -183,11 +171,11 @@ ConnectionSettingsDialogImpl::createWidgetsForGSM(TDENetworkConnection* conn, bo
TQValueList<WidgetInterface*> ret; TQValueList<WidgetInterface*> ret;
// widgetlist for wired connection // widgetlist for wired connection
ret.append(new ConnectionSettings::GSMWidgetImpl(conn)); ret.append(new ConnectionSettings::GSMWidgetImpl(conn, this));
ret.append(new ConnectionSettings::PPPWidgetImpl(conn)); ret.append(new ConnectionSettings::PPPWidgetImpl(conn, this));
ret.append(new ConnectionSettings::SerialWidgetImpl(conn)); ret.append(new ConnectionSettings::SerialWidgetImpl(conn, this));
ret.append(new ConnectionSettings::IPv4WidgetImpl(conn)); ret.append(new ConnectionSettings::IPv4WidgetImpl(conn, this));
ret.append(new ConnectionSettings::InfoWidgetImpl(conn)); ret.append(new ConnectionSettings::InfoWidgetImpl(conn, this));
return ret; return ret;
} }
@ -358,16 +346,18 @@ ConnectionSettingsDialogImpl::slotNext()
// let the widget know about it being the active one // let the widget know about it being the active one
widget = dynamic_cast<WidgetInterface*>(wstackSettings->widget(*current)); widget = dynamic_cast<WidgetInterface*>(wstackSettings->widget(*current));
if (widget) if (widget) {
deactivateWidget(widget); deactivateWidget(widget);
}
// next widget // next widget
current++; current++;
// let the widget know about it being the active one // let the widget know about it being the active one
widget = dynamic_cast<WidgetInterface*>(wstackSettings->widget(*current)); widget = dynamic_cast<WidgetInterface*>(wstackSettings->widget(*current));
if (widget) if (widget) {
activateWidget(widget); activateWidget(widget);
}
} }
slotEnableButtons(); slotEnableButtons();
} }
@ -382,16 +372,18 @@ ConnectionSettingsDialogImpl::slotBack()
// let the widget know about it being the active one // let the widget know about it being the active one
widget = dynamic_cast<WidgetInterface*>(wstackSettings->widget(*current)); widget = dynamic_cast<WidgetInterface*>(wstackSettings->widget(*current));
if (widget) if (widget) {
deactivateWidget(widget); deactivateWidget(widget);
}
// one back // one back
current--; current--;
// let the widget know about it being the active one // let the widget know about it being the active one
widget = dynamic_cast<WidgetInterface*>(wstackSettings->widget(*current)); widget = dynamic_cast<WidgetInterface*>(wstackSettings->widget(*current));
if (widget) if (widget) {
activateWidget(widget); activateWidget(widget);
}
} }
slotEnableButtons(); slotEnableButtons();
} }
@ -451,7 +443,16 @@ ConnectionSettingsDialogImpl::slotEnableButtons()
*/ */
if (_conn) { if (_conn) {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
btnConnect->setEnabled(nm->verifyConnectionSettings(_conn)); TDENetworkErrorStringMap errorStringMap;
TDENetworkConnectionErrorFlags::TDENetworkConnectionErrorFlags errorFlags;
bool ret;
ret = nm->verifyConnectionSettings(_conn, &errorFlags, &errorStringMap);
btnConnect->setEnabled(ret);
if (!ret) {
// FIXME
// Check the error flags and the current dialog type to determine if an error message is warranted
// KMessageBox::error(this, errorString, i18n("Invalid Settings Detected"));
}
pbSave->setEnabled(nm->verifyConnectionSettings(_conn)); pbSave->setEnabled(nm->verifyConnectionSettings(_conn));
} }
} }

5
tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
// KNM includes // TDENM includes
#include "tdenetman-cellular_device_tray.h" #include "tdenetman-cellular_device_tray.h"
#include "tdenetman-menuitem.h" #include "tdenetman-menuitem.h"
#include "tdenetman-menu_subhead.h" #include "tdenetman-menu_subhead.h"
@ -51,7 +51,6 @@ class CellularDeviceTrayPrivate
void CellularDeviceTray::newConnection() void CellularDeviceTray::newConnection()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
// create an appropriate connection // create an appropriate connection
@ -75,7 +74,6 @@ void CellularDeviceTray::newConnection()
void CellularDeviceTray::addMenuItems(KPopupMenu* menu) void CellularDeviceTray::addMenuItems(KPopupMenu* menu)
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
// device title // device title
@ -123,6 +121,7 @@ void CellularDeviceTray::addMenuItems(KPopupMenu* menu)
CellularDeviceTray::CellularDeviceTray (TQString dev, KSystemTray * parent, const char * name) CellularDeviceTray::CellularDeviceTray (TQString dev, KSystemTray * parent, const char * name)
: DeviceTrayComponent (dev, parent, name) : DeviceTrayComponent (dev, parent, name)
{ {
hwdevices = KGlobal::hardwareDevices();
d = new CellularDeviceTrayPrivate(); d = new CellularDeviceTrayPrivate();
d->dev = dev; d->dev = dev;

1
tdenetworkmanager/src/tdenetman-cellular_device_tray.h
Unescape View File

@ -50,6 +50,7 @@ class CellularDeviceTray : public DeviceTrayComponent
private: private:
CellularDeviceTrayPrivate* d; CellularDeviceTrayPrivate* d;
TDEHardwareDevices* hwdevices;
}; };
#endif /* KNETWORKMANAGER_CELLULAR_DEVICE_TRAY_H */ #endif /* KNETWORKMANAGER_CELLULAR_DEVICE_TRAY_H */

3
tdenetworkmanager/src/tdenetman-connection_editor.cpp
Unescape View File

@ -191,9 +191,6 @@ void ConnectionEditorImpl::slotEditCurrentConnection()
ConnectionSettingsDialogImpl* dlg = new ConnectionSettingsDialogImpl(conn, false, TQByteArray(), this, "connect_something", false, TQt::WDestructiveClose); ConnectionSettingsDialogImpl* dlg = new ConnectionSettingsDialogImpl(conn, false, TQByteArray(), this, "connect_something", false, TQt::WDestructiveClose);
dlg->show(); dlg->show();
// save all connections (if not done already)
nm->saveConnection(conn);
} }

12
tdenetworkmanager/src/tdenetman-tray.cpp
Unescape View File

@ -669,13 +669,13 @@ void Tray::updateActiveConnection(TDENetworkConnectionStatus::TDENetworkConnecti
void Tray::slotDeviceAddedNotify(TDENetworkDevice* dev) void Tray::slotDeviceAddedNotify(TDENetworkDevice* dev)
{ {
kdDebug() << "Tray::slotDeviceAddedNotify" << endl; kdDebug() << "Tray::slotDeviceAddedNotify" << endl;
KNotifyClient::event( winId(), "knm-nm-device-added", i18n("New network device %1 found").arg(dev->deviceNode()) ); KNotifyClient::event( winId(), "tdenm-nm-device-added", i18n("New network device %1 found").arg(dev->deviceNode()) );
} }
void Tray::slotDeviceRemovedNotify(TDENetworkDevice* dev) void Tray::slotDeviceRemovedNotify(TDENetworkDevice* dev)
{ {
kdDebug() << "Tray::slotDeviceRemovedNotify" << endl; kdDebug() << "Tray::slotDeviceRemovedNotify" << endl;
KNotifyClient::event( winId(), "knm-nm-device-removed", i18n("Network device %1 removed").arg(dev->deviceNode()) ); KNotifyClient::event( winId(), "tdenm-nm-device-removed", i18n("Network device %1 removed").arg(dev->deviceNode()) );
} }
void Tray::slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags newState, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags prevState) void Tray::slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags newState, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags prevState)
@ -684,16 +684,16 @@ void Tray::slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobal
// change tray icon according to NM's state // change tray icon according to NM's state
if (nm_state & TDENetworkGlobalManagerFlags::EstablishingLink) { if (nm_state & TDENetworkGlobalManagerFlags::EstablishingLink) {
KNotifyClient::event( winId(), "knm-nm-connecting", i18n("NetworkManager is connecting") ); KNotifyClient::event( winId(), "tdenm-nm-connecting", i18n("NetworkManager is connecting") );
} }
else if (nm_state & TDENetworkGlobalManagerFlags::Disconnected) { else if (nm_state & TDENetworkGlobalManagerFlags::Disconnected) {
KNotifyClient::event( winId(), "knm-nm-disconnected", i18n("NetworkManager is now disconnected") ); KNotifyClient::event( winId(), "tdenm-nm-disconnected", i18n("NetworkManager is now disconnected") );
} }
else if (nm_state & TDENetworkGlobalManagerFlags::Connected) { else if (nm_state & TDENetworkGlobalManagerFlags::Connected) {
KNotifyClient::event( winId(), "knm-nm-connected", i18n("NetworkManager is now connected") ); KNotifyClient::event( winId(), "tdenm-nm-connected", i18n("NetworkManager is now connected") );
} }
else if (nm_state & TDENetworkGlobalManagerFlags::Sleeping) { else if (nm_state & TDENetworkGlobalManagerFlags::Sleeping) {
KNotifyClient::event( winId(), "knm-nm-sleeping", i18n("TDENetworkManager Offline") ); KNotifyClient::event( winId(), "tdenm-nm-sleeping", i18n("TDENetworkManager Offline") );
} }
else if (nm_state & TDENetworkGlobalManagerFlags::Unknown) { else if (nm_state & TDENetworkGlobalManagerFlags::Unknown) {
// //

4
tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
Unescape View File

@ -44,7 +44,7 @@
#include <tqdbusobjectpath.h> #include <tqdbusobjectpath.h>
// KNM includes // TDENM includes
#include "tdenetman-wired_device_tray.h" #include "tdenetman-wired_device_tray.h"
#include "tdenetman-menuitem.h" #include "tdenetman-menuitem.h"
#include "tdenetman-menu_subhead.h" #include "tdenetman-menu_subhead.h"
@ -78,7 +78,6 @@ void WiredDeviceTray::newConnection()
void WiredDeviceTray::addMenuItems(KPopupMenu* menu) void WiredDeviceTray::addMenuItems(KPopupMenu* menu)
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
// device title // device title
@ -141,6 +140,7 @@ void WiredDeviceTray::addMenuItems(KPopupMenu* menu)
WiredDeviceTray::WiredDeviceTray (TQString dev, KSystemTray * parent, const char * name ) WiredDeviceTray::WiredDeviceTray (TQString dev, KSystemTray * parent, const char * name )
: DeviceTrayComponent (dev, parent, name) : DeviceTrayComponent (dev, parent, name)
{ {
hwdevices = KGlobal::hardwareDevices();
d = new WiredDeviceTrayPrivate(); d = new WiredDeviceTrayPrivate();
d->dev = dev; d->dev = dev;

1
tdenetworkmanager/src/tdenetman-wired_device_tray.h
Unescape View File

@ -52,6 +52,7 @@ class WiredDeviceTray : public DeviceTrayComponent
private: private:
WiredDeviceTrayPrivate* d; WiredDeviceTrayPrivate* d;
TDEHardwareDevices* hwdevices;
}; };
#endif /* KNETWORKMANAGER_WIRED_DEVICE_TRAY_H */ #endif /* KNETWORKMANAGER_WIRED_DEVICE_TRAY_H */

17
tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
Unescape View File

@ -42,7 +42,7 @@
#include <klocale.h> #include <klocale.h>
#include <knotifyclient.h> #include <knotifyclient.h>
// KNM includes // TDENM includes
#include "tdenetman-wireless_device_tray.h" #include "tdenetman-wireless_device_tray.h"
#include "tdenetman-wireless_menuitem.h" #include "tdenetman-wireless_menuitem.h"
#include "tdenetman-wireless_network.h" #include "tdenetman-wireless_network.h"
@ -64,7 +64,6 @@ class WirelessDeviceTrayPrivate
TQStringList WirelessDeviceTray::getToolTipText() TQStringList WirelessDeviceTray::getToolTipText()
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
TQStringList tooltip = DeviceTrayComponent::getToolTipText(); TQStringList tooltip = DeviceTrayComponent::getToolTipText();
@ -139,7 +138,6 @@ TDEWiFiConnection* WirelessDeviceTray::findMatchingConnection(const WirelessNetw
void WirelessDeviceTray::addWirelessNetworks(KPopupMenu* menu) void WirelessDeviceTray::addWirelessNetworks(KPopupMenu* menu)
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
printf("Updating wireless network list\n\r"); printf("Updating wireless network list\n\r");
@ -251,7 +249,6 @@ void WirelessDeviceTray::addWirelessNetworks(KPopupMenu* menu)
void WirelessDeviceTray::addMenuItems(KPopupMenu* menu) void WirelessDeviceTray::addMenuItems(KPopupMenu* menu)
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
// get the currently active connection // get the currently active connection
@ -302,7 +299,6 @@ void WirelessDeviceTray::setPixmapForStates(TDENetworkConnectionStatus::TDENetwo
void WirelessDeviceTray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString hwAddress) void WirelessDeviceTray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString hwAddress)
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
if (dev->macAddress() != hwAddress) { if (dev->macAddress() != hwAddress) {
@ -342,7 +338,6 @@ void WirelessDeviceTray::slotCheckActiveAccessPoint()
// the active AP changed, if a connection is already active we have roamed // the active AP changed, if a connection is already active we have roamed
// thus add the bssid to the list of seen bssids // thus add the bssid to the list of seen bssids
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
// get the currently active connection // get the currently active connection
@ -372,7 +367,6 @@ void WirelessDeviceTray::slotCheckActiveAccessPoint()
void WirelessDeviceTray::apPropertyChanged(TDEMACAddress BSSID, TDENetworkAPEventType::TDENetworkAPEventType event) void WirelessDeviceTray::apPropertyChanged(TDEMACAddress BSSID, TDENetworkAPEventType::TDENetworkAPEventType event)
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
if (event == TDENetworkAPEventType::SignalStrengthChanged) { if (event == TDENetworkAPEventType::SignalStrengthChanged) {
@ -404,18 +398,17 @@ void WirelessDeviceTray::apPropertyChanged(TDEMACAddress BSSID, TDENetworkAPEven
void WirelessDeviceTray::slotAccessPointAdded(TDENetworkWiFiAPInfo* ap) void WirelessDeviceTray::slotAccessPointAdded(TDENetworkWiFiAPInfo* ap)
{ {
KNotifyClient::event( tray()->winId(), "knm-nm-network-found", i18n("TDENetworkManager New Wireless Network Found") ); KNotifyClient::event( tray()->winId(), "tdenm-nm-network-found", i18n("TDENetworkManager New Wireless Network Found") );
} }
void WirelessDeviceTray::slotAccessPointRemoved(TDEMACAddress) void WirelessDeviceTray::slotAccessPointRemoved(TDEMACAddress)
{ {
KNotifyClient::event( tray()->winId(), "knm-nm-network-gone", i18n("TDENetworkManager Wireless Network Disappeared") ); KNotifyClient::event( tray()->winId(), "tdenm-nm-network-gone", i18n("TDENetworkManager Wireless Network Disappeared") );
} }
void WirelessDeviceTray::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString) void WirelessDeviceTray::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString)
{ {
if (event == TDEHardwareEvent::HardwareListModified) { if (event == TDEHardwareEvent::HardwareListModified) {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
@ -428,7 +421,6 @@ void WirelessDeviceTray::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEv
} }
void WirelessDeviceTray::tdeAccessPointStatusChangedHandler(TDEMACAddress BSSID, TDENetworkAPEventType::TDENetworkAPEventType event) { void WirelessDeviceTray::tdeAccessPointStatusChangedHandler(TDEMACAddress BSSID, TDENetworkAPEventType::TDENetworkAPEventType event) {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
@ -452,11 +444,10 @@ void WirelessDeviceTray::tdeAccessPointStatusChangedHandler(TDEMACAddress BSSID,
WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, const char * name) WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, const char * name)
: DeviceTrayComponent (dev, parent, name) : DeviceTrayComponent (dev, parent, name)
{ {
hwdevices = KGlobal::hardwareDevices();
d = new WirelessDeviceTrayPrivate(); d = new WirelessDeviceTrayPrivate();
d->dev = dev; d->dev = dev;
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
// we want other icons for wireless devices // we want other icons for wireless devices
setPixmapForState(TDENetworkConnectionStatus::Invalid, "wireless_off"); setPixmapForState(TDENetworkConnectionStatus::Invalid, "wireless_off");
setPixmapForState(TDENetworkConnectionStatus::LinkUnavailable, "wireless_off"); setPixmapForState(TDENetworkConnectionStatus::LinkUnavailable, "wireless_off");

3
tdenetworkmanager/src/tdenetman-wireless_device_tray.h
Unescape View File

@ -27,7 +27,7 @@
#ifndef KNETWORKMANAGER_WIRELESS_DEVICE_TRAY_H #ifndef KNETWORKMANAGER_WIRELESS_DEVICE_TRAY_H
#define KNETWORKMANAGER_WIRELESS_DEVICE_TRAY_H #define KNETWORKMANAGER_WIRELESS_DEVICE_TRAY_H
// KNM includes // TDENM includes
#include "tdenetman.h" #include "tdenetman.h"
#include "devicetraycomponent.h" #include "devicetraycomponent.h"
#include "tdenetman-wireless_network.h" #include "tdenetman-wireless_network.h"
@ -78,6 +78,7 @@ class WirelessDeviceTray : public DeviceTrayComponent
TQMap<int, TQByteArray> newWirelessPopupSSIDMap; TQMap<int, TQByteArray> newWirelessPopupSSIDMap;
WirelessDeviceTrayPrivate* d; WirelessDeviceTrayPrivate* d;
TDEHardwareDevices* hwdevices;
}; };

3
tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
Unescape View File

@ -53,7 +53,6 @@ using namespace ConnectionSettings;
void WirelessNetworkItem::slotActivate() void WirelessNetworkItem::slotActivate()
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(_dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(_dev));
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
@ -189,6 +188,8 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TQString dev, WirelessNet
WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TQString dev, WirelessNetwork& net, bool adhoc) WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TQString dev, WirelessNetwork& net, bool adhoc)
: NetworkMenuItem(dev, NULL, 0, 0 ), TQCustomMenuItem () : NetworkMenuItem(dev, NULL, 0, 0 ), TQCustomMenuItem ()
{ {
hwdevices = KGlobal::hardwareDevices();
parent = p; parent = p;
_adhoc = adhoc; _adhoc = adhoc;
_net = net; _net = net;

34
tdenetworkmanager/src/tdenetman-wireless_menuitem.h
Unescape View File

@ -51,15 +51,15 @@ class WirelessNetworkItem : public NetworkMenuItem, public TQCustomMenuItem
Q_OBJECT Q_OBJECT
public: public:
WirelessNetworkItem (TQWidget*, TQString dev, WirelessNetwork& net, TQString conn, bool adhoc); WirelessNetworkItem (TQWidget*, TQString dev, WirelessNetwork& net, TQString conn, bool adhoc);
WirelessNetworkItem (TQWidget*, TQString dev, WirelessNetwork& net, bool adhoc); WirelessNetworkItem (TQWidget*, TQString dev, WirelessNetwork& net, bool adhoc);
~WirelessNetworkItem (); ~WirelessNetworkItem ();
TQWidget* parent; TQWidget* parent;
TQProgressBar* pbarStrength; TQProgressBar* pbarStrength;
void paint (TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); void paint (TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int);
TQSize sizeHint (); TQSize sizeHint ();
public slots: public slots:
void slotActivate(); void slotActivate();
@ -67,21 +67,23 @@ class WirelessNetworkItem : public NetworkMenuItem, public TQCustomMenuItem
private: private:
TQString getDisplayText(); TQString getDisplayText();
bool _adhoc; bool _adhoc;
WirelessNetwork _net; WirelessNetwork _net;
TQString _dev; TQString _dev;
TQString _conn; TQString _conn;
/* menu item */ /* menu item */
int _width; int _width;
int _height; int _height;
int _border; int _border;
/* elements */ /* elements */
int _textHeight; int _textHeight;
int _widgetHeight; int _widgetHeight;
int _space; int _space;
TDEHardwareDevices* hwdevices;
}; };
#endif /* KNETWORKMANAGER_WIRELESSMENUITEM_H */ #endif /* KNETWORKMANAGER_WIRELESSMENUITEM_H */

9
tdenetworkmanager/src/tdenetman-wireless_network.cpp
Unescape View File

@ -53,11 +53,13 @@ class WirelessNetworkPrivate
WirelessNetwork::WirelessNetwork(const WirelessNetwork& other) WirelessNetwork::WirelessNetwork(const WirelessNetwork& other)
{ {
hwdevices = KGlobal::hardwareDevices();
d = new WirelessNetworkPrivate(*other.d); d = new WirelessNetworkPrivate(*other.d);
} }
WirelessNetwork::WirelessNetwork(TQ_UINT32 match) WirelessNetwork::WirelessNetwork(TQ_UINT32 match)
{ {
hwdevices = KGlobal::hardwareDevices();
d = new WirelessNetworkPrivate(); d = new WirelessNetworkPrivate();
// which attributes have to match // which attributes have to match
@ -80,7 +82,6 @@ WirelessNetwork& WirelessNetwork::operator= (const WirelessNetwork& other)
bool WirelessNetwork::contains(const TDEMACAddress ap) bool WirelessNetwork::contains(const TDEMACAddress ap)
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->aps[ap])); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->aps[ap]));
@ -118,7 +119,6 @@ bool WirelessNetwork::addAP(const TDEMACAddress ap, const TQString dev)
const TQByteArray WirelessNetwork::getSsid() const const TQByteArray WirelessNetwork::getSsid() const
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
if ( !d->aps.isEmpty() ) { if ( !d->aps.isEmpty() ) {
@ -146,7 +146,6 @@ const TQByteArray WirelessNetwork::getSsid() const
TQString WirelessNetwork::getDisplaySsid() const TQString WirelessNetwork::getDisplaySsid() const
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
if (!d->aps.isEmpty()) { if (!d->aps.isEmpty()) {
@ -174,7 +173,6 @@ TQString WirelessNetwork::getDisplaySsid() const
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getFlags() const TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getFlags() const
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None; TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None;
@ -199,7 +197,6 @@ TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getFlags() const
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getWpaFlags() const TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getWpaFlags() const
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None; TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None;
@ -224,7 +221,6 @@ TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getWpaFlags() cons
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getRsnFlags() const TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getRsnFlags() const
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None; TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None;
@ -254,7 +250,6 @@ bool WirelessNetwork::isEncrypted() const
TQ_UINT8 WirelessNetwork::getStrength() const TQ_UINT8 WirelessNetwork::getStrength() const
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
TQ_UINT8 strength = 0; TQ_UINT8 strength = 0;

3
tdenetworkmanager/src/tdenetman-wireless_network.h
Unescape View File

@ -86,7 +86,8 @@ class WirelessNetwork
bool operator==(const WirelessNetwork&); bool operator==(const WirelessNetwork&);
private: private:
WirelessNetworkPrivate * d; WirelessNetworkPrivate * d;
TDEHardwareDevices* hwdevices;
}; };
#endif /* KNETWORKMANAGER_WIRELESS_NETWORK_H */ #endif /* KNETWORKMANAGER_WIRELESS_NETWORK_H */

Write Preview
Loading…
Cancel
Save