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

Fix default device handling and clean up code

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 323fad1f89
commit 2ac42d4b7a
10 changed files with 223 additions and 130 deletions
Show Stats Download Patch File Download Diff File

54
tdenetworkmanager/src/devicetraycomponent.cpp
Unescape View File

@ -26,39 +26,39 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
TQString DeviceTrayComponent::pixmapForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { TQString DeviceTrayComponent::pixmapForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) {
TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000; TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000;
while (flag > 0) { while (flag != 0) {
if (state & flag) { if (state & flag) {
if (m_pixmaps.contains(flag)) { if (m_pixmaps.contains(flag)) {
return m_pixmaps[flag]; return m_pixmaps[flag];
} }
} }
flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)(flag >> 1); flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)((TQ_UINT32)flag >> 1);
} }
return TQString::null; return TQString::null;
} }
TQString DeviceTrayComponent::movieForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { TQString DeviceTrayComponent::movieForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) {
TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000; TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000;
while (flag > 0) { while (flag != 0) {
if (state & flag) { if (state & flag) {
if (m_movies.contains(flag)) { if (m_movies.contains(flag)) {
return m_movies[flag]; return m_movies[flag];
} }
} }
flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)(flag >> 1); flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)((TQ_UINT32)flag >> 1);
} }
return TQString::null; return TQString::null;
} }
TQString DeviceTrayComponent::tooltipForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { TQString DeviceTrayComponent::tooltipForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) {
TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000; TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000;
while (flag > 0) { while (flag != 0) {
if (state & flag) { if (state & flag) {
if (m_tooltips.contains(flag)) { if (m_tooltips.contains(flag)) {
return m_tooltips[flag]; return m_tooltips[flag];
} }
} }
flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)(flag >> 1); flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)((TQ_UINT32)flag >> 1);
} }
return TQString::null; return TQString::null;
} }
@ -136,7 +136,13 @@ TQStringList DeviceTrayComponent::getToolTipText()
TQPixmap DeviceTrayComponent::pixmapForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) TQPixmap DeviceTrayComponent::pixmapForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state)
{ {
if (pixmapForConnState(state) != "") { if (pixmapForConnState(state) != "") {
return KSystemTray::loadIcon(pixmapForConnState(state)); TQString pixmapPath = pixmapForConnState(state);
if (pixmapPath != "") {
return KSystemTray::loadIcon(pixmapPath);
}
else {
return TQPixmap();
}
} }
else { else {
return TQPixmap(); return TQPixmap();
@ -146,7 +152,13 @@ TQPixmap DeviceTrayComponent::pixmapForState(TDENetworkConnectionStatus::TDENetw
TQMovie DeviceTrayComponent::movieForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) TQMovie DeviceTrayComponent::movieForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state)
{ {
if (movieForConnState(state) != "") { if (movieForConnState(state) != "") {
return TQMovie( KGlobal::iconLoader()->moviePath(movieForConnState(state), KIcon::Panel)); TQString moviePath = movieForConnState(state);
if (moviePath != "") {
return TQMovie(KGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel));
}
else {
return TQMovie();
}
} }
else { else {
return TQMovie(); return TQMovie();
@ -166,31 +178,31 @@ void DeviceTrayComponent::setPixmapForState(TDENetworkConnectionStatus::TDENetwo
void DeviceTrayComponent::deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString hwAddress) void DeviceTrayComponent::deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString hwAddress)
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices(); TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDEGlobalNetworkManager* nm = KGlobal::networkManager();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
if (dev->macAddress() != hwAddress) { if (dev->macAddress() != hwAddress) {
printf("[WARNING] Got networkDeviceStateChanged signal for HW address '%s', but my HW address is '%s'! Ignoring...\n\r", hwAddress.ascii(), dev->macAddress().ascii()); printf("[WARNING] Got networkDeviceStateChanged signal for HW address '%s', but my HW address is '%s'! Ignoring...\n\r", hwAddress.ascii(), dev->macAddress().ascii());
return;
} }
printf("Device tray state: %d\n\r", newState);
//check if our device now holds the default active connection //check if our device now holds the default active connection
// if it is the default active connection // if it is the default active connection
// or if it is activating. what if 2 devices are activating simultaneously? // or if it is activating. what if 2 devices are activating simultaneously?
switch (newState) { if (newState & TDENetworkConnectionStatus::EstablishingLink) {
case TDENetworkConnectionStatus::EstablishingLink:
emit needsCenterStage(this, true); emit needsCenterStage(this, true);
break; }
case TDENetworkConnectionStatus::Connected: else if (newState & TDENetworkConnectionStatus::Connected) {
// if ( m_device == nm->getDefaultDevice() ) { if (nm->defaultNetworkDevices().contains(m_device)) {
emit needsCenterStage(this, true); emit needsCenterStage(this, true);
// } }
break; }
case TDENetworkConnectionStatus::LinkUnavailable: else if ((newState & TDENetworkConnectionStatus::LinkUnavailable)
case TDENetworkConnectionStatus::Disconnected: || (newState & TDENetworkConnectionStatus::Disconnected)
case TDENetworkConnectionStatus::Failed: || (newState & TDENetworkConnectionStatus::Failed)) {
emit needsCenterStage(this, false); emit needsCenterStage(this, false);
break;
default:
break;
} }
} }
#include "devicetraycomponent.moc" #include "devicetraycomponent.moc"

11
tdenetworkmanager/src/main.cpp
Unescape View File

@ -23,6 +23,7 @@
**************************************************************************/ **************************************************************************/
// TDE includes // TDE includes
#include <kglobal.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <dcopclient.h> #include <dcopclient.h>
@ -59,6 +60,16 @@ kdemain (int argc, char* argv[])
if (TDENetworkManager::start()) { if (TDENetworkManager::start()) {
TDENetworkManager app; TDENetworkManager app;
app.disableSessionManagement(); app.disableSessionManagement();
if (!KGlobal::hardwareDevices()) {
printf("[ERROR] Unable to load tdenetworkmanager due to invalid KGlobal::hardwareDevices() object\n\r"); fflush(stdout);
return -1;
}
if (!KGlobal::networkManager()) {
printf("[ERROR] Unable to load tdenetworkmanager due to invalid KGlobal::hardwareDevices() object\n\r"); fflush(stdout);
return -1;
}
return app.exec(); return app.exec();
} }
return 0; return 0;

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

@ -112,8 +112,9 @@ void CellularDeviceTray::addMenuItems(KPopupMenu* menu)
// bring the device down // bring the device down
KAction* deactivate = tray()->actionCollection()->action("deactivate_device"); KAction* deactivate = tray()->actionCollection()->action("deactivate_device");
if (deactivate) if (deactivate) {
deactivate->plug(menu); deactivate->plug(menu);
}
menu->insertSeparator(); menu->insertSeparator();
} }

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

@ -95,39 +95,39 @@ class DeviceTrayPrivate
TQPixmap DeviceTrayPrivate::pixmapForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { TQPixmap DeviceTrayPrivate::pixmapForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) {
TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000; TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000;
while (flag > 0) { while (flag != 0) {
if (state & flag) { if (state & flag) {
if (pixmaps.contains(flag)) { if (pixmaps.contains(flag)) {
return pixmaps[flag]; return pixmaps[flag];
} }
} }
flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)(flag >> 1); flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)((TQ_UINT32)flag >> 1);
} }
return TQPixmap(); return TQPixmap();
} }
TQMovie DeviceTrayPrivate::movieForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { TQMovie DeviceTrayPrivate::movieForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) {
TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000; TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000;
while (flag > 0) { while (flag != 0) {
if (state & flag) { if (state & flag) {
if (movies.contains(flag)) { if (movies.contains(flag)) {
return movies[flag]; return movies[flag];
} }
} }
flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)(flag >> 1); flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)((TQ_UINT32)flag >> 1);
} }
return TQMovie(); return TQMovie();
} }
TQString DeviceTrayPrivate::tooltipForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { TQString DeviceTrayPrivate::tooltipForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) {
TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000; TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000;
while (flag > 0) { while (flag != 0) {
if (state & flag) { if (state & flag) {
if (tooltips.contains(flag)) { if (tooltips.contains(flag)) {
return tooltips[flag]; return tooltips[flag];
} }
} }
flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)(flag >> 1); flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)((TQ_UINT32)flag >> 1);
} }
return TQString::null; return TQString::null;
} }

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

@ -191,7 +191,6 @@ void Tray::slotOnlineMode()
void Tray::contextMenuAboutToShow (KPopupMenu* menu) void Tray::contextMenuAboutToShow (KPopupMenu* menu)
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
nm->loadConnectionInformation(); nm->loadConnectionInformation();
@ -388,8 +387,6 @@ void Tray::slotAddDeviceTrayComponent(TQString dev)
void Tray::slotRemoveDeviceTrayComponent(TQString dev) void Tray::slotRemoveDeviceTrayComponent(TQString dev)
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
for (TQValueList<TrayComponent*>::Iterator it = d->trayComponents.begin(); it != d->trayComponents.end(); ++it) for (TQValueList<TrayComponent*>::Iterator it = d->trayComponents.begin(); it != d->trayComponents.end(); ++it)
{ {
DeviceTrayComponent* dev_comp = dynamic_cast<DeviceTrayComponent*>(*it); DeviceTrayComponent* dev_comp = dynamic_cast<DeviceTrayComponent*>(*it);
@ -430,8 +427,6 @@ void Tray::createDeviceTrayComponent(TQString dev)
{ {
bool trayExists = false; bool trayExists = false;
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
// check if we have already a trayicon for this device // check if we have already a trayicon for this device
for (TQValueList<TrayComponent*>::Iterator it = d->trayComponents.begin(); it != d->trayComponents.end(); ++it) for (TQValueList<TrayComponent*>::Iterator it = d->trayComponents.begin(); it != d->trayComponents.end(); ++it)
{ {
@ -477,9 +472,6 @@ void Tray::createDeviceTrayComponent(TQString dev)
void Tray::updateDeviceTrays() void Tray::updateDeviceTrays()
{ {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
if (!hwdevices) return;
// create one tray-icon for each device // create one tray-icon for each device
TDEGenericHardwareList devices = hwdevices->listByDeviceClass(TDEGenericDeviceType::Network); TDEGenericHardwareList devices = hwdevices->listByDeviceClass(TDEGenericDeviceType::Network);
@ -523,10 +515,48 @@ void Tray::slotDeactivateConnection(int index)
} }
} }
void Tray::connectTrayDeviceManager() {
if (d->foregroundTrayComponent) {
TDENetworkDevice* foreground_tray_dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->foregroundTrayComponent->device()));
if (foreground_tray_dev) {
TDENetworkConnectionManager* deviceConnMan = foreground_tray_dev->connectionManager();
if (deviceConnMan) {
slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, TQString());
connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)));
}
}
}
}
void Tray::disconnectTrayDeviceManager() {
if (d->foregroundTrayComponent) {
TDENetworkDevice* foreground_tray_dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->foregroundTrayComponent->device()));
if (foreground_tray_dev) {
TDENetworkConnectionManager* deviceConnMan = foreground_tray_dev->connectionManager();
if (deviceConnMan) {
slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, TQString());
disconnect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, 0);
}
}
}
}
void Tray::updateTrayDeviceManagerState() {
if (d->foregroundTrayComponent) {
TDENetworkDevice* foreground_tray_dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->foregroundTrayComponent->device()));
if (foreground_tray_dev) {
TDENetworkConnectionManager* deviceConnMan = foreground_tray_dev->connectionManager();
if (deviceConnMan) {
slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, TQString());
slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, TQString());
}
}
}
}
void Tray::trayComponentNeedsCenterStage(TrayComponent *component, bool needsIt) void Tray::trayComponentNeedsCenterStage(TrayComponent *component, bool needsIt)
{ {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); TDEGlobalNetworkManager* nm = KGlobal::networkManager();
if (!hwdevices) return;
DeviceTrayComponent * dtc = dynamic_cast<DeviceTrayComponent*>(component); DeviceTrayComponent * dtc = dynamic_cast<DeviceTrayComponent*>(component);
if (dtc) { if (dtc) {
@ -535,35 +565,29 @@ void Tray::trayComponentNeedsCenterStage(TrayComponent *component, bool needsIt)
TDENetworkDevice * device = dtc_comp_dev; TDENetworkDevice * device = dtc_comp_dev;
if (needsIt) { if (needsIt) {
if (d->foregroundTrayComponent) { if (d->foregroundTrayComponent) {
TDENetworkDevice* foreground_tray_dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->foregroundTrayComponent->device())); disconnectTrayDeviceManager();
disconnect(foreground_tray_dev, TQT_SIGNAL(StateChanged(NMDeviceState)), this, 0 );
} }
d->foregroundTrayComponent = dtc; d->foregroundTrayComponent = dtc;
connect(device, TQT_SIGNAL(StateChanged(NMDeviceState)), TQT_SLOT(slotUpdateDeviceState(NMDeviceState))); connectTrayDeviceManager();
} else { }
disconnect(device, TQT_SIGNAL(StateChanged(NMDeviceState)), this, 0 ); else {
disconnectTrayDeviceManager();
// use active default // use active default
#if 0 TQStringList defaultDevices = nm->defaultNetworkDevices();
// FIXME if (defaultDevices.count() > 0) {
// The TDE network backend has no concept of a default device
// Should it?
device = nm->getDefaultDevice();
if ( device ) {
// identify the new foreground // identify the new foreground
for (TQValueList<TrayComponent*>::Iterator it = d->trayComponents.begin(); it != d->trayComponents.end(); ++it) for (TQValueList<TrayComponent*>::Iterator it = d->trayComponents.begin(); it != d->trayComponents.end(); ++it) {
{
DeviceTrayComponent* newDtc = dynamic_cast<DeviceTrayComponent*> (*it); DeviceTrayComponent* newDtc = dynamic_cast<DeviceTrayComponent*> (*it);
if ( newDtc && newDtc->device() == device ) { if ( newDtc && newDtc->device() == defaultDevices[0] ) {
d->foregroundTrayComponent = newDtc; d->foregroundTrayComponent = newDtc;
break; break;
} }
} }
kdDebug() << " Device " << dtc_comp_dev->deviceNode() << " background, new foreground device: " << device->deviceNode() << endl; kdDebug() << " Device " << dtc_comp_dev->deviceNode() << " background, new foreground device: " << device->deviceNode() << endl;
connect(device, TQT_SIGNAL(StateChanged(NMDeviceState)), connectTrayDeviceManager();
TQT_SLOT(slotUpdateDeviceState(NMDeviceState))); updateTrayDeviceManagerState();
slotUpdateDeviceState(device->getState());
} }
#endif
} }
} }
} }
@ -573,17 +597,16 @@ void Tray::slotUpdateDeviceState()
// FIXME // FIXME
} }
void Tray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) void Tray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString hwAddress)
{ {
updateTrayIcon(state); printf("Device state: %d\n\r", newState);
updateActiveConnection(state);
updateTrayIcon(newState);
updateActiveConnection(newState);
} }
void Tray::trayUiChanged() void Tray::trayUiChanged()
{ {
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices();
if (!hwdevices) return;
DeviceTrayComponent * dtc = d->foregroundTrayComponent; DeviceTrayComponent * dtc = d->foregroundTrayComponent;
if (dtc) { if (dtc) {
TDENetworkDevice* dtc_comp_dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(dtc->device())); TDENetworkDevice* dtc_comp_dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(dtc->device()));
@ -591,6 +614,7 @@ void Tray::trayUiChanged()
updateTrayIcon(deviceConnMan->deviceInformation().statusFlags); updateTrayIcon(deviceConnMan->deviceInformation().statusFlags);
} }
} }
void Tray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) void Tray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus state)
{ {
// Get all active connections // Get all active connections
@ -624,33 +648,37 @@ void Tray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus
// stop the old movie to avoid unnecessary wakups // stop the old movie to avoid unnecessary wakups
DeviceTrayComponent * dtc = d->foregroundTrayComponent; DeviceTrayComponent * dtc = d->foregroundTrayComponent;
if (movie()) if (movie()) {
movie()->pause(); movie()->pause();
}
if ((dtc) && (found_any_active_connection == 1)) { if ((dtc) && (found_any_active_connection == 1)) {
if (!dtc->movieForState(state).isNull()) if (!dtc->movieForState(state).isNull())
{ {
// animation desired // animation desired
int frame = -1; int frame = -1;
if (movie()) if (movie()) {
frame = movie()->frameNumber(); frame = movie()->frameNumber();
}
// set the movie // set the movie
setMovie(dtc->movieForState(state)); setMovie(dtc->movieForState(state));
// start at the same frame as the movie before // start at the same frame as the movie before
if (frame > 0) if (frame > 0) {
movie()->step(frame); movie()->step(frame);
}
// start the animation // start the animation
movie()->unpause(); movie()->unpause();
} }
else if (!dtc->pixmapForState(state).isNull()) else if (!dtc->pixmapForState(state).isNull()) {
setPixmap(dtc->pixmapForState(state)); setPixmap(dtc->pixmapForState(state));
else }
else {
setPixmap(loadIcon("tdenetworkmanager")); setPixmap(loadIcon("tdenetworkmanager"));
} }
}
else { else {
setPixmap(loadIcon("tdenetworkmanager")); setPixmap(loadIcon("tdenetworkmanager"));
} }
@ -705,8 +733,36 @@ void Tray::slotEditNotifications()
KNotifyDialog::configure(this); KNotifyDialog::configure(this);
} }
void Tray::slotGenericDeviceAdded(TDEGenericDevice *dev)
{
TDENetworkDevice* netdev = dynamic_cast<TDENetworkDevice*>(dev);
if (netdev) {
slotAddDeviceTrayComponent(netdev->uniqueID());
slotDeviceAddedNotify(netdev);
}
}
void Tray::slotGenericDeviceRemoved(TDEGenericDevice *dev)
{
TDENetworkDevice* netdev = dynamic_cast<TDENetworkDevice*>(dev);
if (netdev) {
slotRemoveDeviceTrayComponent(netdev->uniqueID());
slotDeviceRemovedNotify(netdev);
}
}
void Tray::slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent event, TQString)
{
if (event == TDEHardwareEvent::HardwareListModified) {
updateDeviceTrays();
connectTrayDeviceManager();
}
}
Tray::Tray() : KSystemTray() Tray::Tray() : KSystemTray()
{ {
hwdevices = KGlobal::hardwareDevices();
d = new TrayPrivate(TQT_TQOBJECT(this)); d = new TrayPrivate(TQT_TQOBJECT(this));
connect(&d->signalMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotDeactivateConnection(int))); connect(&d->signalMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotDeactivateConnection(int)));
@ -756,16 +812,12 @@ Tray::Tray () : KSystemTray ()
connect(KGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); connect(KGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
// get notified about new/removed devices // get notified about new/removed devices
// FIXME connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceAdded(TDEGenericDevice*)));
// DeviceStore* store = DeviceStore::getInstance(); connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceRemoved(TDEGenericDevice*)));
// connect(store, TQT_SIGNAL(DeviceStoreChanged()), this, TQT_SLOT(updateDeviceTrays())); connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)));
// connect(store, TQT_SIGNAL(DeviceAdded(TDENetworkDevice*)), this, TQT_SLOT(slotAddDeviceTrayComponent(TDENetworkDevice*)));
// connect(store, TQT_SIGNAL(DeviceRemoved(TDENetworkDevice*)), this, TQT_SLOT(slotRemoveDeviceTrayComponent(TDENetworkDevice*)));
// Notifications // Notifications
connect(KGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); connect(KGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
// connect(store, TQT_SIGNAL(DeviceAdded(TDENetworkDevice*)), this, TQT_SLOT(slotDeviceAddedNotify(TDENetworkDevice*)));
// connect(store, TQT_SIGNAL(DeviceRemoved(TDENetworkDevice*)), this, TQT_SLOT(slotDeviceRemovedNotify(TDENetworkDevice*)));
// initial setup of the device-trays // initial setup of the device-trays

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

@ -92,7 +92,7 @@ class Tray : public KSystemTray
void slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags newState, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags prevState); void slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags newState, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags prevState);
void slotUpdateDeviceState(); void slotUpdateDeviceState();
void slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus); void slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString hwAddress);
protected slots: protected slots:
void updateDeviceTrays(); void updateDeviceTrays();
@ -103,15 +103,23 @@ class Tray : public KSystemTray
void trayUiChanged(); void trayUiChanged();
void slotEditNotifications(); void slotEditNotifications();
private slots:
void slotGenericDeviceAdded(TDEGenericDevice*);
void slotGenericDeviceRemoved(TDEGenericDevice*);
void slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString);
private: private:
void updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus); void updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus);
void updateActiveConnection(TDENetworkConnectionStatus::TDENetworkConnectionStatus); void updateActiveConnection(TDENetworkConnectionStatus::TDENetworkConnectionStatus);
void mousePressEvent(TQMouseEvent *e); void mousePressEvent(TQMouseEvent *e);
void createDeviceTrayComponent(TQString); void createDeviceTrayComponent(TQString);
void enterEvent(TQEvent*); void enterEvent(TQEvent*);
void connectTrayDeviceManager();
void disconnectTrayDeviceManager();
void updateTrayDeviceManagerState();
TrayPrivate* d; TrayPrivate* d;
TDEHardwareDevices* hwdevices;
}; };
class NewSecretsDialog : public TQDialog class NewSecretsDialog : public TQDialog

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

@ -129,10 +129,12 @@ void WiredDeviceTray::addMenuItems(KPopupMenu* menu)
// menu->insertSeparator(); // menu->insertSeparator();
menu->insertItem(SmallIcon("filenew", TQIconSet::Automatic), i18n("Create new wired connection"), this, TQT_SLOT(newConnection())); menu->insertItem(SmallIcon("filenew", TQIconSet::Automatic), i18n("Create new wired connection"), this, TQT_SLOT(newConnection()));
} }
// bring the device down // bring the device down
KAction* deactivate = tray()->actionCollection()->action("deactivate_device"); KAction* deactivate = tray()->actionCollection()->action("deactivate_device");
if (deactivate) if (deactivate) {
deactivate->plug(menu); deactivate->plug(menu);
}
} }
} }

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

@ -213,7 +213,7 @@ void WirelessDeviceTray::addWirelessNetworks(KPopupMenu* menu)
menu->insertItem(i18n("Connect to saved network"), popup); menu->insertItem(i18n("Connect to saved network"), popup);
} }
// // List available unsaved networks // List available unsaved networks
TQPopupMenu* newpopup = new TQPopupMenu(menu); TQPopupMenu* newpopup = new TQPopupMenu(menu);
uint newnetworkItemsAdded = 0; uint newnetworkItemsAdded = 0;
TQValueList<WirelessNetwork> newnets = WirelessManager::getWirelessNetworks(0, WirelessNetwork::MATCH_SSID); TQValueList<WirelessNetwork> newnets = WirelessManager::getWirelessNetworks(0, WirelessNetwork::MATCH_SSID);
@ -303,8 +303,11 @@ void WirelessDeviceTray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENe
if (dev->macAddress() != hwAddress) { if (dev->macAddress() != hwAddress) {
printf("[WARNING] Got networkDeviceStateChanged signal for HW address '%s', but my HW address is '%s'! Ignoring...\n\r", hwAddress.ascii(), dev->macAddress().ascii()); printf("[WARNING] Got networkDeviceStateChanged signal for HW address '%s', but my HW address is '%s'! Ignoring...\n\r", hwAddress.ascii(), dev->macAddress().ascii());
return;
} }
printf("Wireless state: %d\n\r", newState);
slotCheckActiveAccessPoint(); slotCheckActiveAccessPoint();
if (newState == TDENetworkConnectionStatus::Connected) { if (newState == TDENetworkConnectionStatus::Connected) {
@ -457,6 +460,7 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons
// Listen for hardware change events // Listen for hardware change events
connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString))); connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString)));
// Trigger an initial hardware information update // Trigger an initial hardware information update
tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null); tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null);
} }

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

@ -147,6 +147,8 @@ WirelessNetworkItem::sizeHint ()
WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TQString dev, WirelessNetwork& net, TQString conn, bool adhoc) WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TQString dev, WirelessNetwork& net, TQString conn, bool adhoc)
: NetworkMenuItem(dev, conn, 0, 0 ), TQCustomMenuItem () : NetworkMenuItem(dev, conn, 0, 0 ), TQCustomMenuItem ()
{ {
hwdevices = KGlobal::hardwareDevices();
parent = p; parent = p;
_adhoc = adhoc; _adhoc = adhoc;
_net = net; _net = net;

5
tdenetworkmanager/src/tdenetman.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <tdehardwaredevices.h> #include <tdehardwaredevices.h>
#include <tdenetworkconnections.h> #include <tdenetworkconnections.h>
// TDENM includes // KNM includes
#include "tdenetman.h" #include "tdenetman.h"
#include "tdenetman-tray.h" #include "tdenetman-tray.h"
@ -49,6 +49,7 @@ class TDENetworkManagerPrivate
public: public:
TDENetworkManagerPrivate() {} TDENetworkManagerPrivate() {}
~TDENetworkManagerPrivate() {} ~TDENetworkManagerPrivate() {}
static TDENetworkManager* _ctx; static TDENetworkManager* _ctx;
}; };
@ -68,7 +69,7 @@ TDENetworkManager::slotShutDown()
void TDENetworkManager::timerEvent( TQTimerEvent *e ) void TDENetworkManager::timerEvent( TQTimerEvent *e )
{ {
Tray* tray = Tray::getInstance(); Tray* tray = Tray::getInstance();
tray->slotUpdateDeviceState(nm_device_state_global); tray->slotUpdateDeviceState(nm_device_state_global, TDENetworkConnectionStatus::Invalid, TQString());
} }
TDENetworkManager::TDENetworkManager() : KUniqueApplication() TDENetworkManager::TDENetworkManager() : KUniqueApplication()

Write Preview
Loading…
Cancel
Save