--- Begin Message ---
SVN commit 1003865 by sebas:
Big cleanup, remove about 200 LOC and move another 790 LOC to deprecated
I think I've extracted most of the useful bits, but would like to keep the
deprecated code around for a bit for reference. (will delete it later)
The following stuff is now gone:
* connectionlist, interfacegroup: merged into activatablelistwidget
* all networkmanager includes that I could spot (Yay!)
* handling of extenders for different connection types (we don't do
separate extenders anymore)
* generalextender: those buttons are now in nmextenderitem
* wirelessinterfaceconnectionitem: merged into wirelessnetworkitem
The structure is now (roughly):
networkmanager: paint icon, initialize the extenderitem inside it
nmextenderitem: holds interfaceitems and the tab-thing for activatables
activatablelist: scrollwidget holding the list of activatables, used as tabs
activatableitem: base class for painting activatable
(wireless)interfaceitem: paint an interface, in the left column
wirelessnetworkitem: specialised activatableitem for wifi
There are many grave and easy bugs left if you want to get your hands dirty:
- hiddenwirelessitem needs to be added
- interfaceconnectionitem can probably be merged into activatableitem
- the wiredinterfaceitem doesn't update its state
- tabs shouldn't be created per interface, but per interface type
- the scrollwidget doesn't show scrollbars but clips instead
- I haven't tested GSM or VPN widgets at all
- the config needs the "how many wifi networks to show" option removed
- more testing, fixing up, cleaning up
CCMAIL:[email protected]
CCMAIL:[email protected]
M +0 -5 CMakeLists.txt
D connectionlist.cpp
D connectionlist.h
A deprecated/connectionlist.cpp connectionlist.cpp#1003835
[License: GPL (v2/3)]
A deprecated/connectionlist.h connectionlist.h#1003835 [License:
GPL (v2/3)]
A deprecated/generalextender.cpp generalextender.cpp#1003835
[License: GPL (v2+)]
A deprecated/generalextender.h generalextender.h#1003835
[License: GPL (v2+)]
A deprecated/interfacegroup.cpp interfacegroup.cpp#1003835
[License: GPL (v2/3)]
A deprecated/interfacegroup.h interfacegroup.h#1003835 [License:
GPL (v2/3)]
D generalextender.cpp
D generalextender.h
M +3 -0 interfaceconnectionitem.cpp
D interfacegroup.cpp
D interfacegroup.h
M +8 -156 networkmanager.cpp
M +3 -30 nmextenderitem.cpp
--- trunk/playground/base/plasma/applets/networkmanager/applet/CMakeLists.txt
#1003864:1003865
@@ -5,15 +5,10 @@
add_subdirectory(pics)
set(networkmanager_SRCS
- connectionlist.cpp
activatableitem.cpp
interfaceconnectionitem.cpp
- interfacegroup.cpp
-
- generalextender.cpp
-
networkmanager.cpp
interfaceitem.cpp
---
trunk/playground/base/plasma/applets/networkmanager/applet/interfaceconnectionitem.cpp
#1003864:1003865
@@ -61,6 +61,9 @@
m_connectButton->setMinimumWidth(160);
m_connectButton->setMaximumHeight(rowHeight);
m_connectButton->setOrientation(Qt::Horizontal);
+#if KDE_IS_VERSION(4,2,60)
+ m_connectButton->setTextBackgroundColor(QColor());
+#endif
//m_connectButton->setToolTip(i18nc("button to connect to wired network",
// "Connect to wired network %1",
m_connection->id()));
---
trunk/playground/base/plasma/applets/networkmanager/applet/networkmanager.cpp
#1003864:1003865
@@ -40,29 +40,15 @@
#include <solid/control/networkinterface.h>
#include <solid/control/networkmanager.h>
-
-#include <NetworkManager.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-wireless.h>
-
#include <Plasma/CheckBox>
#include <Plasma/Extender>
#include <Plasma/ExtenderItem>
#include "remoteactivatablelist.h"
-#include "interfacegroup.h"
#include "../libs/types.h"
-//#include "vpnconnectiongroup.h"
-//#include "networkmanagersettings.h"
#include "interfaceitem.h"
#include "nmextenderitem.h"
-#include "events.h"
@@ -134,25 +120,12 @@
QObject::connect(Solid::Control::NetworkManager::notifier(),
SIGNAL(networkInterfaceRemoved(const QString&)),
this, SLOT(networkInterfaceRemoved(const QString&)));
- // add VPN and General Settings last
- //loadExtender();
- //initExtenderItem(0);
-
QObject::connect(Solid::Control::NetworkManager::notifier(),
SIGNAL(statusChanged(Solid::Networking::Status)),
this,
SLOT(managerStatusChanged(Solid::Networking::Status)));
m_activatableList->init();
- kDebug() << "???";
- //if (!extender()->hasItem("nmextenderitem")) {
- kDebug() << "!!";
- //Plasma::ExtenderItem *eItem = new Plasma::ExtenderItem(extender());
- NMExtenderItem* eItem = new NMExtenderItem(m_activatableList,
extender());
- //initExtenderItem(eItem);
- //extender()->setSizePolicy(QSizePolicy::MinimumExpanding,
QSizePolicy::Fixed);
- //} else {
- //kDebug() << "no other extender found";
- //}
+ NMExtenderItem* eItem = new NMExtenderItem(m_activatableList, extender());
}
@@ -200,16 +173,6 @@
{
KConfigGroup cg = config();
- int numberWirelessShown = ui.numberOfWlans->value();
- if (m_numberWirelessShown != numberWirelessShown) {
- m_numberWirelessShown = numberWirelessShown;
- if (m_wifiGroup) {
- m_wifiGroup->setNetworksLimit( m_numberWirelessShown );
- }
- cg.writeEntry("numberOfWlans", m_numberWirelessShown);
- kDebug() << "No of Wifis Changed:" << m_numberWirelessShown;
- }
-
if (m_showWired != ui.showWired->isChecked()) {
showWired(!m_showWired);
cg.writeEntry("showWired", m_showWired);
@@ -274,7 +237,7 @@
{
Q_UNUSED(option);
Q_UNUSED(interface);
- //kDebug() << " ============== Default Interface";
+ //kDebug() << " ============== Default Interface" << m_elementName;
m_svg->paint(p, contentsRect, m_elementName);
}
@@ -355,16 +318,6 @@
QObject::connect(interface, SIGNAL(connectionStateChanged(int)), this,
SLOT(interfaceConnectionStateChanged()));
}
- // update extender visibility
- KConfigGroup cg = config();
- //showWired(cg.readEntry("showWired", true));
- //showWireless(cg.readEntry("showWireless", true));
- showVpn(cg.readEntry("showVpn", true));
- //showPppoe(cg.readEntry("showPppoe", true));
- showCellular(cg.readEntry("showCellular", true));
- //showCdma(cg.readEntry("showCdma", true));
- //showGeneral(true);
-
interfaceConnectionStateChanged();
update();
}
@@ -381,11 +334,6 @@
// update extender visibility
KConfigGroup cg = config();
- //showWired(cg.readEntry("showWired", true));
- //showWireless(cg.readEntry("showWireless", true));
- //showPppoe(cg.readEntry("showPppoe", true));
- //showCellular(cg.readEntry("showCellular", true));
- //showCdma(cg.readEntry("showCdma", true));
interfaceConnectionStateChanged();
update();
@@ -731,100 +679,25 @@
void NetworkManagerApplet::showWired(bool show)
{
m_showWired = show;
- Plasma::ExtenderItem *eItem = extender()->item("wired");
- if (show &&
hasInterfaceOfType(Solid::Control::NetworkInterface::Ieee8023)) {
- if (eItem) {
- eItem->destroy();
- }
- kDebug() << "SHOWING";
- InterfaceGroup * eItem = new
InterfaceGroup(Solid::Control::NetworkInterface::Ieee8023, m_activatableList,
extender());
- eItem->setName("wired");
- eItem->setIcon("network-wired");
- eItem->setTitle(i18nc("Label for ethernet group in popup","Wired
Networking"));
- } else {
- if (eItem) {
- kDebug() << "HIDING";
- eItem->destroy();
- }
- }
+ // TODO
}
void NetworkManagerApplet::showWireless(bool show)
{
m_showWireless = show;
- Plasma::ExtenderItem *eItem = extender()->item("wireless");
- if (show &&
hasInterfaceOfType(Solid::Control::NetworkInterface::Ieee80211)) {
- if (eItem) {
- eItem->destroy();
- }
- kDebug() << "Showing wireless";
- InterfaceGroup *eItem = new
InterfaceGroup(Solid::Control::NetworkInterface::Ieee80211, m_activatableList,
extender());
- eItem->setName("wireless");
- eItem->setIcon("network-wireless");
- eItem->setTitle(i18nc("Label for wifi networks in popup","Wireless
Networking"));
- } else {
- if (eItem) {
- kDebug() << "Hiding wireless";
- eItem->destroy();
- }
- }
+ // TODO
}
void NetworkManagerApplet::showVpn(bool show)
{
-#if 0
m_showVpn = show;
- Plasma::ExtenderItem *eItem = extender()->item("vpn");
- if (show) {
- if (eItem) {
- eItem->destroy();
- }
- kDebug() << "SHOWING";
- VpnConnectionGroup * eItem = new VpnConnectionGroup(m_userSettings,
m_systemSettings, extender());
- eItem->setName("vpn");
- eItem->setIcon("network-server");
- eItem->setTitle(i18nc("Label for vpn connections in popup","VPN
Connections"));
- connect(eItem, SIGNAL(hideClicked()), SLOT(hideVpnGroup()));
- } else {
- if (eItem) {
- kDebug() << "HIDING";
- eItem->destroy();
- }
- }
-#endif
+ // TODO
}
void NetworkManagerApplet::showCellular(bool show)
{
m_showCellular = show;
- Plasma::ExtenderItem *gsmItem = extender()->item("gsm");
- if (show && hasInterfaceOfType(Solid::Control::NetworkInterface::Gsm)) {
- if (!gsmItem) {
- InterfaceGroup * gsmItem = new
InterfaceGroup(Solid::Control::NetworkInterface::Gsm, m_activatableList,
extender());
- gsmItem->setName("gsm");
- gsmItem->setIcon("phone");
- gsmItem->setTitle(i18nc("Label for mobile broadband
(GSM/CDMA/UMTS/HDSPA etc)","Mobile Broadband"));
- initExtenderItem(gsmItem);
- }
- } else {
- if (gsmItem) {
- gsmItem->destroy();
- }
- }
- Plasma::ExtenderItem *cdmaItem = extender()->item("cdma");
- if (show && hasInterfaceOfType(Solid::Control::NetworkInterface::Cdma)) {
- if (!cdmaItem) {
- InterfaceGroup * cdmaItem = new
InterfaceGroup(Solid::Control::NetworkInterface::Cdma, m_activatableList,
extender());
- cdmaItem->setName("cdma");
- cdmaItem->setIcon("phone");
- cdmaItem->setTitle(i18nc("Label for mobile broadband
(GSM/CDMA/UMTS/HDSPA etc)","Mobile Broadband"));
- initExtenderItem(cdmaItem);
- }
- } else {
- if (cdmaItem) {
- cdmaItem->destroy();
- }
- }
+ // TODO
}
void NetworkManagerApplet::managerWirelessEnabledChanged(bool )
@@ -833,13 +706,8 @@
void NetworkManagerApplet::managerWirelessHardwareEnabledChanged(bool enabled)
{
- if (enabled) {
- KNotification::event(Event::RfOn, i18nc("Notification for radio kill
switch turned on", "Wireless hardware enabled"), QPixmap(), 0,
KNotification::CloseOnTimeout, KComponentData("networkmanagement",
"networkmanagement", KComponentData::SkipMainComponentRegistration));
- //m_lblRfkill->setText(i18nc("Label text when hardware wireless is
enabled", "Wireless hardware is enabled"));
- } else {
- //m_lblRfkill->setText(i18nc("Label text when hardware wireless is not
enabled", "Wireless hardware is disabled"));
- KNotification::event(Event::RfOff, i18nc("Notification for radio kill
switch turned on", "Wireless hardware disabled"), QPixmap(), 0,
KNotification::CloseOnTimeout, KComponentData("networkmanagement",
"networkmanagement", KComponentData::SkipMainComponentRegistration));
- }
+ // TODO: in theory, this shouldn't be necessary since all interfaceitems
+ // should react to changes by themselves
}
void NetworkManagerApplet::userNetworkingEnabledChanged(bool enabled)
@@ -854,17 +722,6 @@
Solid::Control::NetworkManager::setWirelessEnabled(enabled);
}
-/*
-void NetworkManagerApplet::activateConnection(const QString& connection)
-{
- kDebug() << connection;
-}
-
-void NetworkManagerApplet::deactivateConnection(const QString& connection)
-{
- kDebug() << connection;
-}
-*/
void NetworkManagerApplet::managerStatusChanged(Solid::Networking::Status
status)
{
if (Solid::Networking::Unknown == status ) {
@@ -898,11 +755,6 @@
// Notify the wireless extender of popup events so it can revert its
hidden wireless network
// item to button mode
return;
- Plasma::ExtenderItem *eItem = extender()->item("wireless");
- if (eItem) {
- InterfaceGroup * wireless =
static_cast<InterfaceGroup*>(eItem->widget());
- wireless->popupEvent(show);
- }
}
#include "networkmanager.moc"
---
trunk/playground/base/plasma/applets/networkmanager/applet/nmextenderitem.cpp
#1003864:1003865
@@ -84,31 +84,6 @@
SLOT(interfaceAdded(const QString&)));
connect(Solid::Control::NetworkManager::notifier(),
SIGNAL(networkInterfaceRemoved(const QString&)),
SLOT(interfaceRemoved(const QString&)));
-
- /*
- m_widget = new QGraphicsWidget(this);
- m_layout = new QGraphicsLinearLayout(Qt::Vertical, m_widget);
- m_layout->addItem(m_connectionLayout);
- m_widget->setLayout(m_layout);
- setWidget(m_widget);
-
- // adds items from subclasses above our layout
- setupHeader();
-
- connect(m_activatables, SIGNAL(activatableAdded(RemoteActivatable*)),
- SLOT(activatableAdded(RemoteActivatable *)));
- connect(m_activatables, SIGNAL(activatableRemoved(RemoteActivatable*)),
- SLOT(activatableRemoved(RemoteActivatable *)));
-
- connect(m_activatables, SIGNAL(appeared()), SLOT(getList()));
- connect(m_activatables, SIGNAL(disappeared()), SLOT(listDisappeared()));
-
- getList();
-
- // adds items from subclasses below our layout
- setupFooter();
- m_layout->addStretch(5);
- */
}
QGraphicsItem * NMExtenderItem::widget()
@@ -116,7 +91,7 @@
if (!m_widget) {
kDebug() << "Creating widget";
m_widget = new QGraphicsWidget(this);
- m_widget->setMinimumWidth(600);
+ m_widget->setMinimumWidth(500);
m_widget->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
//m_mainLayout = new QGraphicsGridLayout(m_widget);
@@ -222,7 +197,7 @@
case Solid::Control::NetworkInterface::Ieee80211:
{
// Create the wireless interface item
- WirelessInterfaceItem * wifiItem = 0;
+ WirelessInterfaceItem* wifiItem = 0;
wifiItem = new
WirelessInterfaceItem(static_cast<Solid::Control::WirelessNetworkInterface
*>(iface), InterfaceItem::InterfaceName, this);
ifaceItem = wifiItem;
//connect(wirelessinterface, SIGNAL(stateChanged()), this,
SLOT(updateNetworks()));
@@ -242,7 +217,7 @@
default:
{
// Create the interfaceitem
- WiredInterfaceItem * wiredItem = 0;
+ WiredInterfaceItem* wiredItem = 0;
ifaceItem = wiredItem = new
WiredInterfaceItem(static_cast<Solid::Control::WiredNetworkInterface *>(iface),
InterfaceItem::InterfaceName, this);
// Add a wired tab
@@ -257,8 +232,6 @@
//m_interfaceLayout->updateGeometry();
//updateNetworks();
}
- //show();
- //emit updateLayout();
}
void NMExtenderItem::createTab(InterfaceItem * item,
Solid::Control::NetworkInterface* iface, const QString &name, const QString
&icon)
--- End Message ---
