|
|
|
@ -161,7 +161,7 @@ Tray* Tray::getInstance()
|
|
|
|
|
|
|
|
|
|
void Tray::slotEditConnections()
|
|
|
|
|
{
|
|
|
|
|
TDEGlobalNetworkManager* nm = KGlobal::networkManager();
|
|
|
|
|
TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
|
|
|
|
|
if (!nm) return;
|
|
|
|
|
if (tdenetworkmanager_editor_dialog_count == 0) nm->loadConnectionInformation();
|
|
|
|
|
|
|
|
|
@ -172,28 +172,28 @@ void Tray::slotEditConnections()
|
|
|
|
|
|
|
|
|
|
void Tray::slotEnableWireless()
|
|
|
|
|
{
|
|
|
|
|
TDEGlobalNetworkManager* nm = KGlobal::networkManager();
|
|
|
|
|
TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
|
|
|
|
|
if (!nm) return;
|
|
|
|
|
nm->enableWiFi(true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Tray::slotDisableWireless()
|
|
|
|
|
{
|
|
|
|
|
TDEGlobalNetworkManager* nm = KGlobal::networkManager();
|
|
|
|
|
TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
|
|
|
|
|
if (!nm) return;
|
|
|
|
|
nm->enableWiFi(false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Tray::slotOfflineMode()
|
|
|
|
|
{
|
|
|
|
|
TDEGlobalNetworkManager* nm = KGlobal::networkManager();
|
|
|
|
|
TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
|
|
|
|
|
if (!nm) return;
|
|
|
|
|
nm->enableNetworking(false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Tray::slotOnlineMode()
|
|
|
|
|
{
|
|
|
|
|
TDEGlobalNetworkManager* nm = KGlobal::networkManager();
|
|
|
|
|
TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
|
|
|
|
|
if (!nm) return;
|
|
|
|
|
nm->enableNetworking(true);
|
|
|
|
|
}
|
|
|
|
@ -217,7 +217,7 @@ void Tray::slotVPNBannerShow(const TQString& vpnbanner)
|
|
|
|
|
|
|
|
|
|
void Tray::contextMenuAboutToShow (KPopupMenu* menu)
|
|
|
|
|
{
|
|
|
|
|
TDEGlobalNetworkManager* nm = KGlobal::networkManager();
|
|
|
|
|
TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
|
|
|
|
|
|
|
|
|
|
if (tdenetworkmanager_editor_dialog_count == 0) nm->loadConnectionInformation();
|
|
|
|
|
|
|
|
|
@ -582,7 +582,7 @@ void Tray::mousePressEvent( TQMouseEvent *e )
|
|
|
|
|
|
|
|
|
|
void Tray::slotDeactivateConnection(int index)
|
|
|
|
|
{
|
|
|
|
|
TDEGlobalNetworkManager* nm = KGlobal::networkManager();
|
|
|
|
|
TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
|
|
|
|
|
if (!nm) return;
|
|
|
|
|
|
|
|
|
|
TDENetworkConnection* conn = nm->findConnectionByUUID(d->act_conn_map[index]);
|
|
|
|
@ -631,7 +631,7 @@ void Tray::updateTrayDeviceManagerState() {
|
|
|
|
|
|
|
|
|
|
void Tray::trayComponentNeedsCenterStage(TrayComponent *component, bool needsIt)
|
|
|
|
|
{
|
|
|
|
|
TDEGlobalNetworkManager* nm = KGlobal::networkManager();
|
|
|
|
|
TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
|
|
|
|
|
|
|
|
|
|
DeviceTrayComponent * dtc = dynamic_cast<DeviceTrayComponent*>(component);
|
|
|
|
|
if (dtc) {
|
|
|
|
@ -758,7 +758,7 @@ void Tray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus
|
|
|
|
|
char active_vpn=0;
|
|
|
|
|
char found_any_active_connection=0;
|
|
|
|
|
|
|
|
|
|
TDEGlobalNetworkManager* nm = KGlobal::networkManager();
|
|
|
|
|
TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
|
|
|
|
|
|
|
|
|
|
// Make sure the current state will be displayed
|
|
|
|
|
if (d->foregroundTrayComponent) {
|
|
|
|
@ -790,7 +790,7 @@ void Tray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus
|
|
|
|
|
// }
|
|
|
|
|
#endif // DEBUG_STATE
|
|
|
|
|
|
|
|
|
|
TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags current_vpn_state = (KGlobal::networkManager()->backendStatus() & TDENetworkGlobalManagerFlags::VPNMask);
|
|
|
|
|
TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags current_vpn_state = (TDEGlobal::networkManager()->backendStatus() & TDENetworkGlobalManagerFlags::VPNMask);
|
|
|
|
|
if ((current_vpn_state & TDENetworkGlobalManagerFlags::VPNFailed) || (current_vpn_state & TDENetworkGlobalManagerFlags::VPNDisconnected)) {
|
|
|
|
|
active_vpn = 0;
|
|
|
|
|
}
|
|
|
|
@ -838,7 +838,7 @@ void Tray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags current_vpn_state = (KGlobal::networkManager()->backendStatus() & TDENetworkGlobalManagerFlags::VPNMask);
|
|
|
|
|
TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags current_vpn_state = (TDEGlobal::networkManager()->backendStatus() & TDENetworkGlobalManagerFlags::VPNMask);
|
|
|
|
|
#ifdef DEBUG_STATE
|
|
|
|
|
printf("VPN state: 0x%08x\n\r", current_vpn_state);
|
|
|
|
|
//printf("Activated is: %d\n\r", TDENetworkConnectionStatus::Connected);
|
|
|
|
@ -981,7 +981,7 @@ TQPixmap Tray::pixmapForName(TQString pixmapPath)
|
|
|
|
|
TQMovie Tray::movieForName(TQString moviePath)
|
|
|
|
|
{
|
|
|
|
|
if (moviePath != "") {
|
|
|
|
|
return TQMovie(KGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel, width()));
|
|
|
|
|
return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel, width()));
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
return TQMovie();
|
|
|
|
@ -990,7 +990,7 @@ TQMovie Tray::movieForName(TQString moviePath)
|
|
|
|
|
|
|
|
|
|
TQByteArray Tray::movieFileData(TQString movieName) {
|
|
|
|
|
TQByteArray ret;
|
|
|
|
|
TQString fileName = KGlobal::iconLoader()->moviePath(movieName, KIcon::Panel, width());
|
|
|
|
|
TQString fileName = TDEGlobal::iconLoader()->moviePath(movieName, KIcon::Panel, width());
|
|
|
|
|
if (fileName != "") {
|
|
|
|
|
TQFile file(fileName);
|
|
|
|
|
if (file.exists()) {
|
|
|
|
@ -1028,7 +1028,7 @@ void Tray::resizeEvent(TQResizeEvent *) {
|
|
|
|
|
|
|
|
|
|
Tray::Tray() : KSystemTray()
|
|
|
|
|
{
|
|
|
|
|
hwdevices = KGlobal::hardwareDevices();
|
|
|
|
|
hwdevices = TDEGlobal::hardwareDevices();
|
|
|
|
|
|
|
|
|
|
updateGraphicsCache();
|
|
|
|
|
|
|
|
|
@ -1078,7 +1078,7 @@ Tray::Tray() : KSystemTray()
|
|
|
|
|
actionCollection (), "deactivate_menu");
|
|
|
|
|
|
|
|
|
|
// get notified when NM's state changes
|
|
|
|
|
connect(KGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
|
|
|
|
|
connect(TDEGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
|
|
|
|
|
|
|
|
|
|
// get notified about new/removed devices
|
|
|
|
|
connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceAdded(TDEGenericDevice*)));
|
|
|
|
@ -1086,11 +1086,11 @@ Tray::Tray() : KSystemTray()
|
|
|
|
|
connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)));
|
|
|
|
|
|
|
|
|
|
// Notifications
|
|
|
|
|
connect(KGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
|
|
|
|
|
connect(KGlobal::networkManager(), TQT_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQT_SLOT(slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)));
|
|
|
|
|
connect(TDEGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
|
|
|
|
|
connect(TDEGlobal::networkManager(), TQT_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQT_SLOT(slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)));
|
|
|
|
|
|
|
|
|
|
// Get connection list
|
|
|
|
|
TDEGlobalNetworkManager* nm = KGlobal::networkManager();
|
|
|
|
|
TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
|
|
|
|
|
if (nm) {
|
|
|
|
|
if (tdenetworkmanager_editor_dialog_count == 0) nm->loadConnectionInformation();
|
|
|
|
|
}
|
|
|
|
@ -1098,7 +1098,7 @@ Tray::Tray() : KSystemTray()
|
|
|
|
|
// initial setup of the device-trays
|
|
|
|
|
updateDeviceTrays();
|
|
|
|
|
|
|
|
|
|
slotStateChanged(KGlobal::networkManager()->backendStatus(), TDENetworkGlobalManagerFlags::Unknown);
|
|
|
|
|
slotStateChanged(TDEGlobal::networkManager()->backendStatus(), TDENetworkGlobalManagerFlags::Unknown);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Tray::~Tray ()
|
|
|
|
|