diff options
Diffstat (limited to 'tdenetworkmanager/src/devicetraycomponent.cpp')
| -rw-r--r-- | tdenetworkmanager/src/devicetraycomponent.cpp | 84 |
1 files changed, 41 insertions, 43 deletions
diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp index d0b0929..648ffa8 100644 --- a/tdenetworkmanager/src/devicetraycomponent.cpp +++ b/tdenetworkmanager/src/devicetraycomponent.cpp @@ -24,10 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <klocale.h> #include <ksystemtray.h> -#include "knetworkmanager-device.h" -#include "knetworkmanager-nm_proxy.h" - -TQString pixmapForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { +TQString DeviceTrayComponent::pixmapForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000; while (flag > 0) { if (state & flag) { @@ -40,7 +37,7 @@ TQString pixmapForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStat return TQString::null; } -TQString movieForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { +TQString DeviceTrayComponent::movieForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000; while (flag > 0) { if (state & flag) { @@ -53,7 +50,7 @@ TQString movieForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatu return TQString::null; } -TQString tooltipForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { +TQString DeviceTrayComponent::tooltipForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000; while (flag > 0) { if (state & flag) { @@ -66,7 +63,7 @@ TQString tooltipForConnState(TDENetworkConnectionStatus::TDENetworkConnectionSta return TQString::null; } -DeviceTrayComponent::DeviceTrayComponent(Device * device, KSystemTray * parent, const char * name ) +DeviceTrayComponent::DeviceTrayComponent(TDENetworkDevice * device, KSystemTray * parent, const char * name ) : TrayComponent(parent, name), m_device(device) { connect( m_device, TQT_SIGNAL(StateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus))); @@ -107,9 +104,10 @@ TDENetworkDevice* DeviceTrayComponent::device() const TQStringList DeviceTrayComponent::getToolTipText() { TQStringList list; - TDENetworkConnectionStatus::TDENetworkConnectionStatus state = m_device->getState(); + TDENetworkConnectionManager* deviceConnMan = m_device->connectionManager(); + TDENetworkConnectionStatus::TDENetworkConnectionStatus state = deviceConnMan->deviceInformation().statusFlags; if (tooltipForConnState(state) != "") { - list.append(i18n("Device: %1").arg(m_device->getInterface())); + list.append(i18n("Device: %1").arg(m_device->deviceNode())); list.append(i18n("State: %1").arg(tooltipForConnState(state))); } return list; @@ -118,55 +116,55 @@ TQStringList DeviceTrayComponent::getToolTipText() TQPixmap DeviceTrayComponent::pixmapForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { - if (pixmapForConnState(state) != "") { - return KSystemTray::loadIcon(pixmapForConnState(state)); - } else { - return TQPixmap(); - } + if (pixmapForConnState(state) != "") { + return KSystemTray::loadIcon(pixmapForConnState(state)); + } + else { + return TQPixmap(); + } } TQMovie DeviceTrayComponent::movieForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { - if (movieForConnState(state) != "") { - return TQMovie( KGlobal::iconLoader()->moviePath(movieForConnState(state), KIcon::Panel)); - } else { - return TQMovie(); - } + if (movieForConnState(state) != "") { + return TQMovie( KGlobal::iconLoader()->moviePath(movieForConnState(state), KIcon::Panel)); + } + else { + return TQMovie(); + } } void DeviceTrayComponent::setMovieForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state, TQString movie) { - m_movies[state] = movie; + m_movies[state] = movie; } void DeviceTrayComponent::setPixmapForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state, TQString pixmap) { - m_pixmaps[state] = pixmap; + m_pixmaps[state] = pixmap; } void DeviceTrayComponent::deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) { - //check if our device now holds the default active connection - // if it is the default active connection - // or if it is activating. what if 2 devices are activating simultaneously? - NMProxy * nm = 0; - switch (state) { - case TDENetworkConnectionStatus::EstablishingLink: - emit needsCenterStage(this, true); - break; - case TDENetworkConnectionStatus::Connected: - nm = NMProxy::getInstance(); - if ( m_device == nm->getDefaultDevice() ) { - emit needsCenterStage(this, true); - } - break; - case TDENetworkConnectionStatus::LinkUnavailable: - case TDENetworkConnectionStatus::Disconnected: - case TDENetworkConnectionStatus::Failed: - emit needsCenterStage(this, false); - break; - default: - break; - } + //check if our device now holds the default active connection + // if it is the default active connection + // or if it is activating. what if 2 devices are activating simultaneously? + switch (state) { + case TDENetworkConnectionStatus::EstablishingLink: + emit needsCenterStage(this, true); + break; + case TDENetworkConnectionStatus::Connected: +// if ( m_device == nm->getDefaultDevice() ) { + emit needsCenterStage(this, true); +// } + break; + case TDENetworkConnectionStatus::LinkUnavailable: + case TDENetworkConnectionStatus::Disconnected: + case TDENetworkConnectionStatus::Failed: + emit needsCenterStage(this, false); + break; + default: + break; + } } #include "devicetraycomponent.moc" |