[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdereview/networkmanagement/applet
From:       Sebastian Kügler <sebas () kde ! org>
Date:       2009-11-13 20:14:58
Message-ID: 1258143298.947246.24678.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1048711 by sebas:

remove strengthmeter in wirelessinterfaceitem

 M  +4 -29     interfaceitem.cpp  
 M  +1 -2      interfaceitem.h  
 M  +2 -2      networkmanager.cpp  
 M  +1 -7      wirelessinterfaceitem.cpp  


--- trunk/kdereview/networkmanagement/applet/interfaceitem.cpp #1048710:1048711
@@ -1,6 +1,6 @@
 /*
 Copyright 2008,2009 Will Stephenson <wstephenson@kde.org>
-Copyright 2008, 2009 Sebastian Kügler <sebas@kde.org>
+Copyright 2008, 2009 Sebastian K?gler <sebas@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -49,7 +49,6 @@
     m_iface(iface),
     m_connectionNameLabel(0),
     m_connectionInfoLabel(0),
-    m_strengthMeter(0),
     m_nameMode(mode),
     m_enabled(false),
     m_unavailableText(i18nc("Label for network interfaces that cannot be activated", "Unavailable"))
@@ -94,9 +93,9 @@
     m_connectButton = new Plasma::IconWidget(this);
     m_connectButton->setMaximumHeight(22);
     m_connectButton->setMaximumWidth(22);
-    m_connectButton->setIcon("dialog-ok");
+    m_connectButton->setIcon("dialog-cancel");
     m_connectButton->setToolTip(i18n("Disconnect"));
-    //m_connectButton->hide(); // Shown when hovered
+    m_connectButton->hide(); // Shown when hovered
 
     connect(m_connectButton, SIGNAL(clicked()), this, SLOT(connectButtonClicked()));
 
@@ -116,24 +115,6 @@
     m_connectionInfoLabel->setText(i18n("<b>IP Address:</b> dum.my.ip.addr"));
     m_layout->addItem(m_connectionInfoLabel, 2, 1, 1, 2, Qt::AlignCenter);
 
-    if (m_iface->type() == Solid::Control::NetworkInterface::Ieee80211 ||
-            m_iface->type() == Solid::Control::NetworkInterface::Cdma ||
-            m_iface->type() == Solid::Control::NetworkInterface::Gsm ) {
-        // Signal strength meter
-        int meterHeight = 12;
-        m_strengthMeter = new Plasma::Meter(this);
-        m_strengthMeter->setMinimum(0);
-        m_strengthMeter->setMaximum(100);
-        m_strengthMeter->setValue(0);
-        m_strengthMeter->setMeterType(Plasma::Meter::BarMeterHorizontal);
-        m_strengthMeter->setPreferredSize(QSizeF(48, meterHeight));
-        m_strengthMeter->setMaximumWidth(48);
-        m_strengthMeter->setMaximumHeight(meterHeight);
-        m_strengthMeter->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-        m_strengthMeter->hide();
-        m_layout->addItem(m_strengthMeter, 2, 0, 1, 1, Qt::AlignCenter);
-    }
-
     //       security
     m_connectionInfoIcon = new Plasma::IconWidget(this);
     m_connectionInfoIcon->setMinimumHeight(22);
@@ -194,13 +175,6 @@
     m_ifaceNameLabel->setEnabled(enable);
     m_connectButton->setEnabled(enable);
     m_connectionInfoIcon->setEnabled(enable);
-    if (m_strengthMeter) {
-        if (enable) {
-            m_strengthMeter->show();
-        } else {
-            m_strengthMeter->hide();
-        }
-    }
 }
 
 InterfaceItem::~InterfaceItem()
@@ -318,6 +292,7 @@
             setEnabled(true);
             break;
         case Solid::Control::NetworkInterface::Unmanaged:
+        case Solid::Control::NetworkInterface::Failed:
         case Solid::Control::NetworkInterface::UnknownState:
             setEnabled(false);
             break;
--- trunk/kdereview/networkmanagement/applet/interfaceitem.h #1048710:1048711
@@ -1,6 +1,6 @@
 /*
 Copyright 2008,2009 Will Stephenson <wstephenson@kde.org>
-Copyright 2008, 2009 Sebastian Kügler <sebas@kde.org>
+Copyright 2008, 2009 Sebastian K?gler <sebas@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -115,7 +115,6 @@
     Plasma::Label * m_connectionNameLabel;
     QGraphicsLinearLayout * m_connectionInfoLayout;
     Plasma::Label * m_connectionInfoLabel;
-    Plasma::Meter * m_strengthMeter;
     Plasma::Label * m_connectionInfoStrengthLabel;
     Plasma::IconWidget * m_connectionInfoIcon;
     NameDisplayMode m_nameMode;
--- trunk/kdereview/networkmanagement/applet/networkmanager.cpp #1048710:1048711
@@ -1,6 +1,6 @@
 /*
-Copyright 2008,2009 Will Stephenson <wstephenson@kde.org>
-Copyright 2008, 2009 Sebastian Kügler <sebas@kde.org>
+Copyright 2008, 2009 Will Stephenson <wstephenson@kde.org>
+Copyright 2008, 2009 Sebastian K?gler <sebas@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
--- trunk/kdereview/networkmanagement/applet/wirelessinterfaceitem.cpp #1048710:1048711
@@ -97,17 +97,12 @@
         case Solid::Control::NetworkInterface::Unavailable:
         case Solid::Control::NetworkInterface::Disconnected:
         case Solid::Control::NetworkInterface::Failed:
-            m_strengthMeter->hide();
             m_connectionInfoIcon->hide();
             break;
         default:
         {
             if (m_activeAccessPoint) {
-                if (m_strengthMeter) {
-                    m_strengthMeter->setValue(m_activeAccessPoint->signalStrength());
-                    m_strengthMeter->show();
-                    m_connectionInfoIcon->show();
-                }
+                m_connectionInfoIcon->show();
             }
             break;
         }
@@ -130,7 +125,6 @@
 
 void WirelessInterfaceItem::setEnabled(bool enable)
 {
-    m_strengthMeter->setEnabled(enable);
     InterfaceItem::setEnabled(enable);
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]