Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

3 files changed, 691 insertions, 19 deletions

diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp
index af16249ba..653f0c244 100644
--- a/kcontrol/hwmanager/devicepropsdlg.cpp
+++ b/kcontrol/hwmanager/devicepropsdlg.cpp
@@ -23,6 +23,7 @@
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqtabwidget.h>
+#include <tqgroupbox.h>
 #include <tqlayout.h>
 #undef Unsorted // Required for --enable-final (tqdir.h)
 #include <tqfiledialog.h>
@@ -35,6 +36,30 @@
 
 #include "devicepropsdlg.h"
 
+SensorDisplayWidget::SensorDisplayWidget(TQWidget *parent)
+	: TQWidget(parent)
+{
+	m_nameLabel = new TQLabel(this);
+	m_valueLabel = new TQLabel(this);
+
+	TQGridLayout *mainGrid = new TQGridLayout(this, 1, 2, 0, 1);
+	mainGrid->setRowStretch(1, 0);
+	mainGrid->addWidget(m_nameLabel, 0, 0);
+	mainGrid->addWidget(m_valueLabel, 0, 1);
+}
+
+SensorDisplayWidget::~SensorDisplayWidget()
+{
+}
+
+void SensorDisplayWidget::setSensorName(TQString name) {
+	m_nameLabel->setText(name);
+}
+
+void SensorDisplayWidget::setSensorValue(TQString value) {
+	m_valueLabel->setText(value);
+}
+
 DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidget *parent)
 	: KDialogBase(Plain, TQString::null, Ok|Cancel, Ok, parent, 0L, true, true)
 {
@@ -54,10 +79,27 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge
 		if ((m_device->type() != TDEGenericDeviceType::OtherSensor) && (m_device->type() != TDEGenericDeviceType::ThermalSensor)) {
 			base->tabBarWidget->removePage(base->tabSensor);
 		}
+		if (m_device->type() != TDEGenericDeviceType::Battery) {
+			base->tabBarWidget->removePage(base->tabBattery);
+		}
+		if (m_device->type() != TDEGenericDeviceType::PowerSupply) {
+			base->tabBarWidget->removePage(base->tabPowerSupply);
+		}
+		if (m_device->type() != TDEGenericDeviceType::Network) {
+			base->tabBarWidget->removePage(base->tabNetwork);
+		}
+
+		if ((m_device->type() == TDEGenericDeviceType::OtherSensor) || (m_device->type() == TDEGenericDeviceType::ThermalSensor)) {
+			base->groupSensors->setColumnLayout(0, TQt::Vertical );
+			base->groupSensors->layout()->setSpacing( KDialog::spacingHint() );
+			base->groupSensors->layout()->setMargin( KDialog::marginHint() );
+			m_sensorDataGrid = new TQGridLayout( base->groupSensors->layout() );
+			m_sensorDataGrid->setAlignment( TQt::AlignTop );
+			m_sensorDataGridWidgets.setAutoDelete(true);
+		}
 
 		TQGridLayout *mainGrid = new TQGridLayout(plainPage(), 1, 1, 0, spacingHint());
 		mainGrid->setRowStretch(1, 1);
-		mainGrid->setRowStretch(1, 1);
 		mainGrid->addWidget(base, 0, 0);
 	}
 
@@ -96,6 +138,19 @@ void DevicePropertiesDialog::populateDeviceInformation() {
 		base->labelDeviceDriver->setText((m_device->deviceDriver().isNull())?i18n("<none>"):m_device->deviceDriver());
 		base->labelDeviceClass->setText((m_device->PCIClass().isNull())?i18n("<n/a>"):m_device->PCIClass());
 		base->labelModalias->setText((m_device->moduleAlias().isNull())?i18n("<none>"):m_device->moduleAlias());
+
+		// These might be redundant
+		#if 0
+		base->labelVendorName->setText((m_device->vendorName().isNull())?i18n("<unknown>"):m_device->vendorName());
+		base->labelVendorModel->setText((m_device->vendorModel().isNull())?i18n("<unknown>"):m_device->vendorModel());
+		#else
+		base->labelVendorName->hide();
+		base->stocklabelVendorName->hide();
+		base->labelVendorModel->hide();
+		base->stocklabelVendorModel->hide();
+		#endif
+		base->labelSerialNumber->setText((m_device->serialNumber().isNull())?i18n("<unknown>"):m_device->serialNumber());
+
 		if (m_device->subsystem() == "pci") {
 			base->labelBusID->setText(m_device->busID());
 			base->labelBusID->show();
@@ -183,13 +238,20 @@ void DevicePropertiesDialog::populateDeviceInformation() {
 		if ((m_device->type() == TDEGenericDeviceType::OtherSensor) || (m_device->type() == TDEGenericDeviceType::ThermalSensor)) {
 			TDESensorDevice* sdevice = static_cast<TDESensorDevice*>(m_device);
 
-			// FIXME
-			// This is rather ugly
-			// It should be handled via dynamic addition/update of new TQLabel objects, but that is somewhat complex
-			TQString sensorLabels = "<qt>";
-			TQString sensorDataPoints = "<qt>";
 			TDESensorClusterMap map = sdevice->values();
 			TDESensorClusterMap::Iterator it;
+			unsigned int i;
+
+			if (m_sensorDataGridWidgets.count() != map.count()) {
+				m_sensorDataGridWidgets.clear();
+				for (i=0;i<map.count();i++) {
+					SensorDisplayWidget* sensorWidget = new SensorDisplayWidget(base->groupSensors);
+					m_sensorDataGrid->addWidget(sensorWidget, i, 0);
+					m_sensorDataGridWidgets.append(sensorWidget);
+				}
+			}
+
+			i=0;
 			for ( it = map.begin(); it != map.end(); ++it ) {
 				TQString sensorlabel = it.key();
 				TQString sensordatastring;
@@ -220,14 +282,56 @@ void DevicePropertiesDialog::populateDeviceInformation() {
 					sensordatastring.truncate(sensordatastring.length()-2);
 				}
 
-				sensorLabels += sensorlabel + "<br>";
-				sensorDataPoints += sensordatastring + "<br>";
+				m_sensorDataGridWidgets.at(i)->setSensorName(sensorlabel);
+				m_sensorDataGridWidgets.at(i)->setSensorValue(sensordatastring);
+
+				i++;
 			}
-			sensorLabels += "</qt>";
-			sensorDataPoints += "</qt>";
+		}
+
+		if (m_device->type() == TDEGenericDeviceType::Battery) {
+			TDEBatteryDevice* bdevice = static_cast<TDEBatteryDevice*>(m_device);
+
+			base->labelCurrentBatteryEnergy->setText((bdevice->energy()<0)?i18n("<unknown>"):TQString("%1 Wh").arg(bdevice->energy()));
+			base->labelMaximumBatteryEnergy->setText((bdevice->maximumEnergy()<0)?i18n("<unknown>"):TQString("%1 Wh").arg(bdevice->maximumEnergy()));
+			base->labelMaximumBatteryDesignEnergy->setText((bdevice->maximumDesignEnergy()<0)?i18n("<unknown>"):TQString("%1 Wh").arg(bdevice->maximumDesignEnergy()));
+			base->labelMinimumBatteryVoltage->setText((bdevice->minimumVoltage()<0)?i18n("<unknown>"):TQString("%1 V").arg(bdevice->minimumVoltage()));
+			base->labelCurrentBatteryVoltage->setText((bdevice->voltage()<0)?i18n("<unknown>"):TQString("%1 V").arg(bdevice->voltage()));
+			base->labelCurrentBatteryDischargeRate->setText((bdevice->dischargeRate()<0)?i18n("<unknown>"):TQString("%1 Vh").arg(bdevice->dischargeRate()));
+			base->labelCurrentBatteryStatus->setText((bdevice->status().isNull())?i18n("<unknown>"):bdevice->status());
+			base->labelBatteryTechnology->setText((bdevice->technology().isNull())?i18n("<unknown>"):bdevice->technology());
+			base->labelBatteryInstalled->setText((bdevice->installed()==0)?i18n("No"):i18n("Yes"));
+			base->labelBatteryCharge->setText((bdevice->chargePercent()<0)?i18n("<unknown>"):TQString("%1 %").arg(bdevice->chargePercent()));
+		}
+
+		if (m_device->type() == TDEGenericDeviceType::PowerSupply) {
+			TDEMainsPowerDevice* pdevice = static_cast<TDEMainsPowerDevice*>(m_device);
+
+			base->labelPowerSupplyOnline->setText((pdevice->online()==0)?i18n("No"):i18n("Yes"));
+		}
+
+		if (m_device->type() == TDEGenericDeviceType::Network) {
+			TDENetworkDevice* ndevice = static_cast<TDENetworkDevice*>(m_device);
+
+			base->labelNetworkMAC->setText((ndevice->macAddress().isNull())?i18n("<unknown>"):ndevice->macAddress());
+			base->labelNetworkState->setText((ndevice->state().isNull())?i18n("<unknown>"):ndevice->state());
+			base->labelNetworkCarrierPresent->setText((ndevice->carrierPresent()==0)?i18n("No"):i18n("Yes"));
+			base->labelNetworkDormant->setText((ndevice->dormant()==0)?i18n("No"):i18n("Yes"));
+
+			base->labelNetworkIPV4Address->setText((ndevice->ipV4Address().isNull())?i18n("<none>"):ndevice->ipV4Address());
+			base->labelNetworkIPV4Netmask->setText((ndevice->ipV4Netmask().isNull())?i18n("<none>"):ndevice->ipV4Netmask());
+			base->labelNetworkIPV4Broadcast->setText((ndevice->ipV4Broadcast().isNull())?i18n("<none>"):ndevice->ipV4Broadcast());
+			base->labelNetworkIPV4Destination->setText((ndevice->ipV4Destination().isNull())?i18n("<none>"):ndevice->ipV4Destination());
+
+			base->labelNetworkIPV6Address->setText((ndevice->ipV6Address().isNull())?i18n("<none>"):ndevice->ipV6Address());
+			base->labelNetworkIPV6Netmask->setText((ndevice->ipV6Netmask().isNull())?i18n("<none>"):ndevice->ipV6Netmask());
+			base->labelNetworkIPV6Broadcast->setText((ndevice->ipV6Broadcast().isNull())?i18n("<none>"):ndevice->ipV6Broadcast());
+			base->labelNetworkIPV6Destination->setText((ndevice->ipV6Destination().isNull())?i18n("<none>"):ndevice->ipV6Destination());
 
-			base->labelSensorNames->setText(sensorLabels);
-			base->labelSensorValues->setText(sensorDataPoints);
+			base->labelNetworkRXBytes->setText((ndevice->rxBytes()<0)?i18n("<unknown>"):TDEHardwareDevices::bytesToFriendlySizeString(ndevice->rxBytes()));
+			base->labelNetworkTXBytes->setText((ndevice->txBytes()<0)?i18n("<unknown>"):TDEHardwareDevices::bytesToFriendlySizeString(ndevice->txBytes()));
+			base->labelNetworkRXPackets->setText((ndevice->rxPackets()<0)?i18n("<unknown>"):TQString("%1").arg(ndevice->rxPackets()));
+			base->labelNetworkTXPackets->setText((ndevice->txPackets()<0)?i18n("<unknown>"):TQString("%1").arg(ndevice->txPackets()));
 		}
 	}
 }
diff --git a/kcontrol/hwmanager/devicepropsdlg.h b/kcontrol/hwmanager/devicepropsdlg.h
index 870e57240..0e8a46b2c 100644
--- a/kcontrol/hwmanager/devicepropsdlg.h
+++ b/kcontrol/hwmanager/devicepropsdlg.h
@@ -27,6 +27,44 @@
 
 /**
  *
+ * Simple sensor name and value display widget
+ *
+ * @version 0.1
+ * @author Timothy Pearson <kb9vqf@pearsoncomputing.net>
+ */
+
+class TDEUI_EXPORT SensorDisplayWidget : public TQWidget
+{
+	Q_OBJECT
+public:
+	/**
+	* Create a simple sensor name and value display widget
+	* @param parent     Parent widget for the display widget
+	*/
+	SensorDisplayWidget(TQWidget* parent);
+	virtual ~SensorDisplayWidget();
+
+	/**
+	* Set sensor name
+	* @param name A TQString with the name of the sensor
+	*/
+	void setSensorName(TQString name);
+
+	/**
+	* Set sensor value
+	* @param value A TQString with the value of the sensor
+	*/
+	void setSensorValue(TQString value);
+
+private:
+	TQLabel* m_nameLabel;
+	TQLabel* m_valueLabel;
+};
+
+typedef TQPtrList<SensorDisplayWidget> SensorDisplayWidgetList;
+
+/**
+ *
  * Dialog to view and edit hardware device properties
  *
  * @version 0.1
@@ -39,7 +77,7 @@ class TDEUI_EXPORT DevicePropertiesDialog : public KDialogBase
 public:
 	/**
 	* Create a dialog that allows a user to view and edit hardware device properties
-	* @param parent     Parent widget for the line edit dialog
+	* @param parent     Parent widget
 	*/
 	DevicePropertiesDialog(TDEGenericDevice* device, TQWidget *parent);
 	virtual ~DevicePropertiesDialog();
@@ -58,6 +96,9 @@ private:
 
 	class DevicePropertiesDialogPrivate;
 	DevicePropertiesDialogPrivate* d;
+
+	TQGridLayout* m_sensorDataGrid;
+	SensorDisplayWidgetList m_sensorDataGridWidgets;
 };
 
 #endif
diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui
index 62570223f..2e13ff9e1 100644
--- a/kcontrol/hwmanager/devicepropsdlgbase.ui
+++ b/kcontrol/hwmanager/devicepropsdlgbase.ui
@@ -160,18 +160,57 @@
                     		</widget>
 				<widget class="TQLabel" row="7" column="0" colspan="1">
 					<property name="name">
+						<cstring>stocklabelVendorName</cstring>
+					</property>
+					<property name="text">
+						<string>Manufacturer:</string>
+					</property>
+				</widget>
+				<widget class="TQLabel" row="7" column="1" colspan="3">
+					<property name="name">
+						<cstring>labelVendorName</cstring>
+					</property>
+                    		</widget>
+				<widget class="TQLabel" row="8" column="0" colspan="1">
+					<property name="name">
+						<cstring>stocklabelVendorModel</cstring>
+					</property>
+					<property name="text">
+						<string>Model:</string>
+					</property>
+				</widget>
+				<widget class="TQLabel" row="8" column="1" colspan="3">
+					<property name="name">
+						<cstring>labelVendorModel</cstring>
+					</property>
+                    		</widget>
+				<widget class="TQLabel" row="9" column="0" colspan="1">
+					<property name="name">
+						<cstring>stocklabelSerialNumber</cstring>
+					</property>
+					<property name="text">
+						<string>Serial Number:</string>
+					</property>
+				</widget>
+				<widget class="TQLabel" row="9" column="1" colspan="3">
+					<property name="name">
+						<cstring>labelSerialNumber</cstring>
+					</property>
+                    		</widget>
+				<widget class="TQLabel" row="10" column="0" colspan="1">
+					<property name="name">
 						<cstring>stocklabelBusID</cstring>
 					</property>
 					<property name="text">
 						<string>Bus ID:</string>
 					</property>
 				</widget>
-				<widget class="TQLabel" row="7" column="1" colspan="3">
+				<widget class="TQLabel" row="10" column="1" colspan="3">
 					<property name="name">
 						<cstring>labelBusID</cstring>
 					</property>
                     		</widget>
-				<widget class="TQLabel" row="8" column="0" colspan="1">
+				<widget class="TQLabel" row="11" column="0" colspan="1">
 					<property name="name">
 						<cstring>unnamed</cstring>
 					</property>
@@ -179,7 +218,7 @@
 						<string>Technical Details:</string>
 					</property>
 				</widget>
-				<widget class="TQLabel" row="8" column="1" colspan="3">
+				<widget class="TQLabel" row="11" column="1" colspan="3">
 					<property name="name">
 						<cstring>labelModalias</cstring>
 					</property>
@@ -435,21 +474,509 @@
 				    <property name="title">
 					    <string>Sensor Readings</string>
 				    </property>
+			    </widget>
+			    <spacer row="8" column="0">
+				    <property name="name" stdset="0">
+					    <cstring>Spacer4</cstring>
+				    </property>
+				    <property name="orientation">
+					    <enum>Vertical</enum>
+				    </property>
+				    <property name="sizeType">
+					    <enum>Expanding</enum>
+				    </property>
+				    <property name="sizeHint">
+					    <size>
+						    <width>20</width>
+						    <height>20</height>
+					    </size>
+				    </property>
+			    </spacer>
+		    </grid>
+            </widget>
+	    <widget class="TQWidget">
+		    <property name="name">
+			    <cstring>tabBattery</cstring>
+		    </property>
+		    <attribute name="title">
+			    <string>Battery</string>
+		    </attribute>
+		    <grid>
+			    <property name="name">
+				    <cstring>unnamed</cstring>
+			    </property>
+			    <widget class="TQGroupBox" row="0" column="0">
+				    <property name="name">
+					    <cstring>groupBattery</cstring>
+				    </property>
+				    <property name="title">
+					    <string>Battery Status</string>
+				    </property>
 				    <grid>
 					    <property name="name">
 						    <cstring>unnamed</cstring>
 					    </property>
 					    <widget class="TQLabel" row="0" column="0" colspan="1">
 						    <property name="name">
-							    <cstring>labelSensorNames</cstring>
+							    <cstring>unnamed</cstring>
 						    </property>
 						    <property name="text">
-							    <string></string>
+							    <string>Current Energy</string>
 						    </property>
 					    </widget>
 					    <widget class="TQLabel" row="0" column="1" colspan="1">
 						    <property name="name">
-							    <cstring>labelSensorValues</cstring>
+							    <cstring>labelCurrentBatteryEnergy</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="1" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Maximum Energy</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="1" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelMaximumBatteryEnergy</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="2" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Maximum Design Energy</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="2" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelMaximumBatteryDesignEnergy</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="3" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Minimum Voltage</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="3" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelMinimumBatteryVoltage</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="4" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Current Voltage</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="4" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelCurrentBatteryVoltage</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="5" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Current Discharge Rate</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="5" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelCurrentBatteryDischargeRate</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="6" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Status</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="6" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelCurrentBatteryStatus</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="7" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Technology</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="7" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelBatteryTechnology</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="8" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Installed</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="8" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelBatteryInstalled</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="9" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Current Charge</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="9" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelBatteryCharge</cstring>
+						    </property>
+					    </widget>
+				    </grid>
+			    </widget>
+			    <spacer row="8" column="0">
+				    <property name="name" stdset="0">
+					    <cstring>Spacer4</cstring>
+				    </property>
+				    <property name="orientation">
+					    <enum>Vertical</enum>
+				    </property>
+				    <property name="sizeType">
+					    <enum>Expanding</enum>
+				    </property>
+				    <property name="sizeHint">
+					    <size>
+						    <width>20</width>
+						    <height>20</height>
+					    </size>
+				    </property>
+			    </spacer>
+		    </grid>
+            </widget>
+	    <widget class="TQWidget">
+		    <property name="name">
+			    <cstring>tabPowerSupply</cstring>
+		    </property>
+		    <attribute name="title">
+			    <string>Power Supply</string>
+		    </attribute>
+		    <grid>
+			    <property name="name">
+				    <cstring>unnamed</cstring>
+			    </property>
+			    <widget class="TQGroupBox" row="0" column="0">
+				    <property name="name">
+					    <cstring>groupPowerSupply</cstring>
+				    </property>
+				    <property name="title">
+					    <string>Power Supply Status</string>
+				    </property>
+				    <grid>
+					    <property name="name">
+						    <cstring>unnamed</cstring>
+					    </property>
+					    <widget class="TQLabel" row="0" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Online</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="0" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelPowerSupplyOnline</cstring>
+						    </property>
+					    </widget>
+				    </grid>
+			    </widget>
+			    <spacer row="8" column="0">
+				    <property name="name" stdset="0">
+					    <cstring>Spacer4</cstring>
+				    </property>
+				    <property name="orientation">
+					    <enum>Vertical</enum>
+				    </property>
+				    <property name="sizeType">
+					    <enum>Expanding</enum>
+				    </property>
+				    <property name="sizeHint">
+					    <size>
+						    <width>20</width>
+						    <height>20</height>
+					    </size>
+				    </property>
+			    </spacer>
+		    </grid>
+            </widget>
+	    <widget class="TQWidget">
+		    <property name="name">
+			    <cstring>tabNetwork</cstring>
+		    </property>
+		    <attribute name="title">
+			    <string>Network</string>
+		    </attribute>
+		    <grid>
+			    <property name="name">
+				    <cstring>unnamed</cstring>
+			    </property>
+			    <widget class="TQGroupBox" row="0" column="0">
+				    <property name="name">
+					    <cstring>groupNetwork</cstring>
+				    </property>
+				    <property name="title">
+					    <string>Network Device Information</string>
+				    </property>
+				    <grid>
+					    <property name="name">
+						    <cstring>unnamed</cstring>
+					    </property>
+					    <widget class="TQLabel" row="0" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>MAC Address</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="0" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkMAC</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="1" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Link State</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="1" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkState</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="2" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Carrier Detected</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="2" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkCarrierPresent</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="3" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Dormant</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="3" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkDormant</cstring>
+						    </property>
+					    </widget>
+				    </grid>
+			    </widget>
+			    <widget class="TQGroupBox" row="1" column="0">
+				    <property name="name">
+					    <cstring>groupNetworkAddresses</cstring>
+				    </property>
+				    <property name="title">
+					    <string>Network Addresses</string>
+				    </property>
+				    <grid>
+					    <property name="name">
+						    <cstring>unnamed</cstring>
+					    </property>
+					    <widget class="TQLabel" row="0" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>IPv4 Address</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="0" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkIPV4Address</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="1" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>IPv4 Netmask</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="1" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkIPV4Netmask</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="2" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>IPv4 Broadcast</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="2" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkIPV4Broadcast</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="3" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>IPv4 Destination</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="3" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkIPV4Destination</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="4" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>IPv6 Address</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="4" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkIPV6Address</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="5" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>IPv6 Netmask</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="5" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkIPV6Netmask</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="6" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>IPv6 Broadcast</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="6" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkIPV6Broadcast</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="7" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>IPv6 Destination</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="7" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkIPV6Destination</cstring>
+						    </property>
+					    </widget>
+				    </grid>
+			    </widget>
+			    <widget class="TQGroupBox" row="3" column="0">
+				    <property name="name">
+					    <cstring>groupNetworkStatistics</cstring>
+				    </property>
+				    <property name="title">
+					    <string>Network Statistics</string>
+				    </property>
+				    <grid>
+					    <property name="name">
+						    <cstring>unnamed</cstring>
+					    </property>
+					    <widget class="TQLabel" row="0" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Received Bytes</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="0" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkRXBytes</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="1" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Transmitted Bytes</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="1" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkTXBytes</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="2" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Received Packets</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="2" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkRXPackets</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="3" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Transmitted Packets</string>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="3" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelNetworkTXPackets</cstring>
 						    </property>
 					    </widget>
 				    </grid>