[PC-BSD Commits] r136 - in pcbsd/trunk: ethernetconfig/src wificonfig

svn at pcbsd.org svn at pcbsd.org
Wed Mar 14 10:38:01 PST 2007


Author: kris
Date: 2007-03-14 19:38:00 +0100 (Wed, 14 Mar 2007)
New Revision: 136

Modified:
   pcbsd/trunk/ethernetconfig/src/Makefile
   pcbsd/trunk/ethernetconfig/src/Makefile.in
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui
   pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui
   pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h
Log:
Update ethernetconfig and wificonfig to add IPv6 info and default gateway info

Modified: pcbsd/trunk/ethernetconfig/src/Makefile
===================================================================
--- pcbsd/trunk/ethernetconfig/src/Makefile	2007-03-14 18:06:05 UTC (rev 135)
+++ pcbsd/trunk/ethernetconfig/src/Makefile	2007-03-14 18:38:00 UTC (rev 136)
@@ -717,10 +717,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-
-
-
-
 #>+ 3
 ethernetconfigwidget.moc: $(srcdir)/ethernetconfigwidget.h
 	$(MOC) $(srcdir)/ethernetconfigwidget.h -o ethernetconfigwidget.moc
@@ -740,7 +736,7 @@
 	-rm -f  ethernetconfigwidget.moc ethernetconfig.moc
 
 #>+ 2
-KDE_DIST=ethernetconfigwidget.h ethernetconfig Makefile.in hi16-app-ethernetconfig.png ethernetconfigui.rc ethernetconfigwidgetbase.h ethernetconfig.desktop ethernetconfig.lsm network_local.png hi32-app-ethernetconfig.png Makefile.am ethernetconfigwidgetbase.ui 
+KDE_DIST=ethernetconfigwidget.h Makefile.in hi16-app-ethernetconfig.png ethernetconfigui.rc ethernetconfig.desktop ethernetconfig.lsm network_local.png hi32-app-ethernetconfig.png Makefile.am ethernetconfigwidgetbase.ui 
 
 #>+ 4
 clean-ui:
@@ -800,7 +796,7 @@
 
 
 #>+ 11
-ethernetconfig.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/ethernetconfig.cpp $(srcdir)/ethernetconfigwidget.cpp $(srcdir)/ethernetconfigwidgetbase.cpp  ethernetconfigwidget.moc ethernetconfigwidgetbase.moc ethernetconfig.moc
+ethernetconfig.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/ethernetconfig.cpp $(srcdir)/ethernetconfigwidget.cpp ethernetconfigwidgetbase.cpp  ethernetconfigwidget.moc ethernetconfigwidgetbase.moc ethernetconfig.moc
 	@echo 'creating ethernetconfig.all_cpp.cpp ...'; \
 	rm -f ethernetconfig.all_cpp.files ethernetconfig.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> ethernetconfig.all_cpp.final; \

Modified: pcbsd/trunk/ethernetconfig/src/Makefile.in
===================================================================
--- pcbsd/trunk/ethernetconfig/src/Makefile.in	2007-03-14 18:06:05 UTC (rev 135)
+++ pcbsd/trunk/ethernetconfig/src/Makefile.in	2007-03-14 18:38:00 UTC (rev 136)
@@ -717,10 +717,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-
-
-
-
 #>+ 3
 ethernetconfigwidget.moc: $(srcdir)/ethernetconfigwidget.h
 	$(MOC) $(srcdir)/ethernetconfigwidget.h -o ethernetconfigwidget.moc
@@ -740,7 +736,7 @@
 	-rm -f  ethernetconfigwidget.moc ethernetconfig.moc
 
 #>+ 2
-KDE_DIST=ethernetconfigwidget.h ethernetconfig Makefile.in hi16-app-ethernetconfig.png ethernetconfigui.rc ethernetconfigwidgetbase.h ethernetconfig.desktop ethernetconfig.lsm network_local.png hi32-app-ethernetconfig.png Makefile.am ethernetconfigwidgetbase.ui 
+KDE_DIST=ethernetconfigwidget.h Makefile.in hi16-app-ethernetconfig.png ethernetconfigui.rc ethernetconfig.desktop ethernetconfig.lsm network_local.png hi32-app-ethernetconfig.png Makefile.am ethernetconfigwidgetbase.ui 
 
 #>+ 4
 clean-ui:
@@ -800,7 +796,7 @@
 
 
 #>+ 11
-ethernetconfig.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/ethernetconfig.cpp $(srcdir)/ethernetconfigwidget.cpp $(srcdir)/ethernetconfigwidgetbase.cpp  ethernetconfigwidget.moc ethernetconfigwidgetbase.moc ethernetconfig.moc
+ethernetconfig.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/ethernetconfig.cpp $(srcdir)/ethernetconfigwidget.cpp ethernetconfigwidgetbase.cpp  ethernetconfigwidget.moc ethernetconfigwidgetbase.moc ethernetconfig.moc
 	@echo 'creating ethernetconfig.all_cpp.cpp ...'; \
 	rm -f ethernetconfig.all_cpp.files ethernetconfig.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> ethernetconfig.all_cpp.final; \

Modified: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp
===================================================================
--- pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp	2007-03-14 18:06:05 UTC (rev 135)
+++ pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp	2007-03-14 18:38:00 UTC (rev 136)
@@ -408,6 +408,8 @@
   textNetmask->setText(getNetmaskForIdent( DeviceName ) );
   textMac->setText(getMacForIdent( DeviceName ) );
   textStatus->setText(getStatusForIdent( DeviceName ) );
+  textIPv6->setText(getIPv6ForIdent( DeviceName) );
+  textGateway->setText(getGatewayForIdent(DeviceName) );
 
   // Get the packet status for this device
   textPacketsIn->setText(getInPacketsForIdent( DeviceName) );
@@ -690,6 +692,39 @@
 
 }
 
+QString ethernetconfigWidget::getIPv6ForIdent(QString ident)
+{
+	QString command = "ifconfig " +ident + " | grep \"inet6 \"";
+	QString inputLine = getLineFromCommandOutput(command);
+	QString ip= "";
+	
+	if (inputLine != "" && inputLine.find("inet6 ") != -1){
+		
+		ip = inputLine.remove(0, inputLine.find("inet6 ") + 5);
+		ip.truncate(ip.find("%"));
+		
+		
+	}
+	
+	return ip;
+}
 
+QString ethernetconfigWidget::getGatewayForIdent(QString ident)
+{
+        QString command = "netstat -n -r | grep \"default\" | grep " + ident;
+	QString inputLine = getLineFromCommandOutput(command);
+	QString packets = "";
+	
+	if (inputLine != "" ){
+		inputLine = inputLine.simplifyWhiteSpace();
+		packets = inputLine.section(' ', 1, 1 );
+	}
+	
+	return packets;
+}
+
+
+
+
 #include "ethernetconfigwidget.moc"
 

Modified: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h
===================================================================
--- pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h	2007-03-14 18:06:05 UTC (rev 135)
+++ pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.h	2007-03-14 18:38:00 UTC (rev 136)
@@ -86,6 +86,10 @@
     virtual void loadInfo();
 private slots:
     virtual void slotFinishLoad();
+private:
+    virtual QString getGatewayForIdent(QString ident);
+private:
+    virtual QString getIPv6ForIdent(QString ident);
 };
 
 #endif

Modified: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui
===================================================================
--- pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui	2007-03-14 18:06:05 UTC (rev 135)
+++ pcbsd/trunk/ethernetconfig/src/ethernetconfigwidgetbase.ui	2007-03-14 18:38:00 UTC (rev 136)
@@ -9,7 +9,7 @@
             <x>0</x>
             <y>0</y>
             <width>285</width>
-            <height>383</height>
+            <height>419</height>
         </rect>
     </property>
     <property name="caption">
@@ -486,77 +486,115 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="0" column="1">
+                            <widget class="QLabel" row="5" column="0">
                                 <property name="name">
-                                    <cstring>textIP</cstring>
+                                    <cstring>textLabel3_2_2</cstring>
                                 </property>
                                 <property name="text">
+                                    <string>Status:</string>
+                                </property>
+                                <property name="alignment">
+                                    <set>AlignVCenter|AlignRight</set>
+                                </property>
+                            </widget>
+                            <widget class="QLabel" row="5" column="1">
+                                <property name="name">
+                                    <cstring>textStatus</cstring>
+                                </property>
+                                <property name="text">
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="QLabel" row="4" column="0">
                                 <property name="name">
-                                    <cstring>textLabel3</cstring>
+                                    <cstring>textLabel3_2_2_2</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>IP:</string>
+                                    <string>Mac:</string>
                                 </property>
                                 <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="QLabel" row="4" column="1">
                                 <property name="name">
-                                    <cstring>textLabel3_2</cstring>
+                                    <cstring>textMac</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Netmask:</string>
+                                    <string></string>
                                 </property>
+                            </widget>
+                            <widget class="QLabel" row="0" column="0">
+                                <property name="name">
+                                    <cstring>textLabel3</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>IP:</string>
+                                </property>
                                 <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="1">
+                            <widget class="QLabel" row="0" column="1">
                                 <property name="name">
-                                    <cstring>textNetmask</cstring>
+                                    <cstring>textIP</cstring>
                                 </property>
                                 <property name="text">
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="QLabel" row="1" column="0">
                                 <property name="name">
-                                    <cstring>textLabel3_2_2</cstring>
+                                    <cstring>textLabel3_2</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Status:</string>
+                                    <string>Netmask:</string>
                                 </property>
                                 <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="QLabel" row="3" column="0">
                                 <property name="name">
-                                    <cstring>textLabel3_2_2_2</cstring>
+                                    <cstring>textLabel3_2_3_2</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Mac:</string>
+                                    <string>IPv6:</string>
                                 </property>
                                 <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
+                            <widget class="QLabel" row="1" column="1">
+                                <property name="name">
+                                    <cstring>textNetmask</cstring>
+                                </property>
+                                <property name="text">
+                                    <string></string>
+                                </property>
+                            </widget>
                             <widget class="QLabel" row="3" column="1">
                                 <property name="name">
-                                    <cstring>textStatus</cstring>
+                                    <cstring>textIPv6</cstring>
                                 </property>
                                 <property name="text">
                                     <string></string>
                                 </property>
                             </widget>
+                            <widget class="QLabel" row="2" column="0">
+                                <property name="name">
+                                    <cstring>textLabel3_2_3</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Gateway:</string>
+                                </property>
+                                <property name="alignment">
+                                    <set>AlignVCenter|AlignRight</set>
+                                </property>
+                            </widget>
                             <widget class="QLabel" row="2" column="1">
                                 <property name="name">
-                                    <cstring>textMac</cstring>
+                                    <cstring>textGateway</cstring>
                                 </property>
                                 <property name="text">
                                     <string></string>
@@ -571,7 +609,7 @@
 </widget>
 <images>
     <image name="image0">
-        <data format="PNG" length="5008">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000135749444154789ce59b5f685b597ec73f29315cc10424d880040d480f819599c0c84c207233509b2d6c933eb4367da84d176ad3426da6b095dbb275e6a1b5f330b55dd8c55a98622d845af3306b7b21285e08b5a63891129cb1b2242bb938455a9c220567918c53a48b6df8f6e11cc97f1227dee90ed3662f5cbe3abadcab737ebfefeffbfb9d738f4e49e237f9f8adafbb035ff7f17619a086a8a0f80fe2e2214afc3021d6d0e43f4d1e4bf3b7cb003eb875ff16c37bc3c4efc4196490c4e709d83bfe96b7cb0015b87af92af1d371862f0c331f9867f0834138fd9a7b24bd4da7523753525c9ab83e2125a5d9c4acf4b174dc3d5f77877fbde786a4aa34939891d6ede0d7a5e9ef4f1f6b80536f591a54faa769ba2bdd244f27e9a79ff9d3f3f4feb217fe8a53afbee3ebf6daaff1cce7f2d2b6349b9c9536a4b9e49cb4214dc78f67c0d7dee9ffedc977111f22e7bb48dbd2d2ed252929cd7d362795a5d482d184ff9306e0bb8805e4fd183959e4ff04f90bc89f44fe0d14bc898255145c44c13a0aa75178c7e0ec0e0a2fa388506419058b687a7142aa4b730b73d2a61dfca634f3c9ccb106f8d21a70eaaf4f89d3e0f7837b1ab!
 c5e70019f0fb80ccecfc0bd0cce1740149c8740049cc7c005f0ac0161e00934ce83a7896bd008038fc1bd60ee7323c003702f8263917be046c1b903ee25e0c750f87d91fd5996ce773bb975ff16572f5f257d3f4df7d36ef88b136840348be684a22ba84ba8ab803242578a6855a8af8cf2427d5554161ada4645a1812656edf54d8b65735fcfc63e66847a8af6b9eb28234757d61d8305afc1475e750945732865fb13156af62f92ddf7fcac65448b0192528b29a92a2d2d2e194d48ccbe9901dd6ba7d4110607880153188f023400cf2e34dac0d3f032ea81eb0d07c7e3c00b0fa36760ea85837b069c175e62675ce2351faeaf01350fd77c0dc69f7be02cf0dc2176b6c654c5c356a0014fa1716e0b4a0e6e680b9ec0d6f906b5c7cf702fb8841e8799b91061aae440c8c1f7d4c7f0b918c9caa7f4078699af24e80d0c927c10a7ffbd61b25f1806a4efa7e9bedc6db0d40d036f60c092d0d8c280ba2e7729180ccaffdb7e0d7ddc23495ad5ac0e1e79a5ec2783f99d25d3dcb15fef648eb4570fb5c7ca5754d792621b5daa2aaaa1625445cd69603da2bcc2ea2b04b52447d115241595dfb6cfdb36b07ab45db5ed65034bb797a4baa4b4f9cdd91b2760c0d5b553ba1516c91f25f9f4c79f02702b3a47e14f4bb487da811ae0a3410dcf2bb1828700352af80e61091fa116e!
 61a69163c53f01462e76a5c2f39345a9e77610ddc7083dac3676c455c7a4a0!
 35c0b254
85626e90f0c32fe6404f73cb0e652096fe13c8467911addf77a188e8e907b9023fd799a803f40ff77faa9942a04ee04e03b6f604097d06c7a42ca4a63ff3026ddae6b363973c8f3aae70d6e58063cb2d76f8f49db75696148525da9ba89c5b9ed314955cd548724155b0c18ddb8a2aaba142b76a9ac9486d6232a2aa2be4258ab0aaae7515051398a660d03b42de5153914f3e13a0adf36d921b888a4ba96960d1347bf37aac87b110dfcd980e9c7c2dcb10cd8374001334695254965195a35e9beaa39e9468ff40748dfe6582c7f1c913464073da0e9cd01497d9ad8ec33cfa9a75455974637ba34a4a886d6a31a50440385887a1456cfa3a0aec8afe88aa388d058d10ca22f1769a5c06073f0db16ab68223b66fa9bcb4bc91ecd7de855f45254996ca6192aaf37c092905ab1dd3c0e0c5e3206f836af3f97c39aa9c62495ede0f39a28f7495add6740f18aaa5ad2d07a54453bf8bc66d5f7c830e04a2ed8527ba9a8d5ed8c5635f74acf07b7f719d0d4805462404a78157d3f2a3db29a70922c900eab15cb25b284e8a4409a76bac9314fc7f345f8bb34787de038669eed38e0f591f8b94be24e0e4e3b6c39e00ffa98ff9730f1ff72210254e05a609edc8b5b7c7a660a4a500b6de13c71d83abfd58a7d1e422de2b275ef196e14fa9e0c70ed7c82de071de4de7d88e72e342e!
 81e73e34de07ee9b3a20f61f638c44af51785ca0fdc175e2771749ae8599f9e10ceddf6c07cf093420dff474ebc8e84447d5c0c4c7134a5d4a297a29aae8fb518dde185255198d6df418066c98188dad77a96ce95fd49cf57c583db9a032f2ab6bc5dbcaf375ab01ab8abcd2f3fe2af2dfb41a9035cf1ffb684cd14b51c5be1b338c58489d80018f4f297de12003d284e86ea97c53c52b1408d04e851c013a28ec66696feba4f0b8c0e24f1759fbf91aee9ea92042df7620bcc5e845f8d14397e1bf58a4e042fc71049e7871ade7b7c2aeadfc1af0006a179f11fe7137ec4277a887fee820d77e3042e29753f83e38ec79e7ae65c07f1a0694d64a841e84489f4dd3fdfbddd42a357ca77d70f60d0c4809e92506340f9bc7eb46f597ead3929a2a2fcd6e8faa5e2c6af49321a958d5d88d51a92c4d2f8faaae55cb8025e97da46fa2d8725445a56cec47f6637f25a82ef9d595f64bcb361ba58daa176f14e5ffdecb9ef76f22ff82d580aced6ec1e2ba81d4cd5f8101cdfcdd8cfd2603b2bb093adb064937e2747b1adc6ac055cf08f32fc6e93de392acb9f4fb1a249ec3e0590f95dd61026d21c69ff6e39e73f13ea83132f4392517928f7ba0e4251672992a0121074a100bb95c7fe2503bbf45fb3f77d3f7ac8f91672338ef38784e7b48bc3385f783c39ec7e2e82f0c032aa5!
 0a815080d29312a1f3212a4f2b04de0980ef0d0c888a7db5b7c7d10a2f539f!
 3dcc846d
83a96dc388994da3fe06a554754675ad6ab4d823a9cb30e05d5a9e69d51575fb7bdb966965492bc6f3f9785e431f0ea99c2ccbffd1cb9ef79691f73393c29b1a20b302a44cce6ad8a28e65c0be0172e62155150f0dbe6e15ae6aeb8366bb592f540fe190a63787240da9bc639e33b6d1a3aaae6862c518a0fcaeed6cd5187b69d31835657176635a525dd353d38afd4d4c037f3aa0a1bf1c52ecc398bcdf3353e48383f77f86bcc9fd3aa05c2c4b1f4be5b419fc583676b23a2025a49dc335ff4bb57debfbd523d70d98c117355d6e3260da32c0e4fde99b11a91cd6402eaabce6d49333ea7f6525a825f9d5b5ec5778074517bd525a1afa7048f9785eb10f632ade28cafbd1cb9ef7968d0124ed6bc08645e31b2da54f5007743e3ca56c442db52fecdea2bdedea812c60b4e1d68b49ae9e7199af41af2f46b2769d7edfb8bd7e8d78c561380095dd11026d21ae957a71432e3c81daf91aac39b8e12dabfaae55fd06dc83adf7b770ff7d8bc62518f9d769869d61b2a12c9d954e46be1821717a0a277a4003768136836321ab014f2b04ce058cfa077c346a0d3c8ee7cd75405428738401f99dd42b3d3d57b5ea5f1d95546dc5f074b9c98021c380cd695595516cfd8acaead250a14b79a5d4f728a25545d4b3125646417565838acaaf48da3994e7c337bd9aabfa155d082b520!
 cca9f78d9f3de8d7d062cad2c1df2bc362da67502063c38a5ecc57d06e4766fd1718801e6fbf91793f49e1961be364eafcf25f1dc65f0ec24b5dd0a89b66bf01446ce392d068c3cb94ae37cc3567a26df6f5d70e121b8911adc835ad4853b5079efd94b15de51b53fea790770f7602c3cc1c8c59196e76bcf6bf8cefa68bcb00c687b0303e684b47374f6d79cef1f9edf1b06d435b3691890af9beb131bb6f6df300c68ced73355cba496f0194c950de3e6ca0705701f678a4770dd606a63ee103a37ac06ace830036c859a59ce1ccb80fd1058399c055677ccc3f7b340d10e7e42d2a866ede09b29cfa87e9fc6360634a181561628db54573c82f9ba11d266ea6b2e6abc11375f46278126b2660a5e2ddbfe6eda6cb55d6f3aeef50688082dd50f3360d532a019e32d2dd8361e6be6fde6f599e53169479ab9bdbf36974fae6a343ba0ba8a1a5d1f9054d6d8fa9069170654555e43b91e1595d1c0ca15e595515ff6082eefe3ea4e463d69837345d30f27619c9759b14c3dc2003b4b7cbd0674dc3ba55c54ad5abff1b71d78de8dd0f8cea4d180dd12beb6d0fe4acf6e055fdb14f10a0c072699fca74946be3162dec86cf533e94ee2ba2ef19f4cd1793b84f79997ad0b5b7675d735b1ff7e03eeba54de7bf62bc7bc03d4be23b2cfb3fcce4f7e87890b138c447f750d68bd1d1!
 e8d028d3801da01f03c7e083f5fc3838f42238daf2d040df011805df0b505e!
 ce063642
b6906c3838cfc7c844eb793fefbfdf4ff763fbe777c04fc01b8ef10bb10830710b34bdab16803ee9ad4d71c3c775f81976d072fd9c1474dd38d427c2d4ee7d94e0046a223f0007c011f54c077d60735f09cf190bd9b7da5fe1d32c0f57b806798ca6ec17c615f2937a8d1eee966be36099e06c9e7e3d006b5dd0ac38106f1a7e37406ba893f8c33f98d49267f3609c0f8fd7186f78609f8fcf87f37c0a76b0bcc5c0cb1f0384c301a22f9a01de73278bff0e2bbec27f0851fdfef1ec68045efef1964cfc1b9835987b803c3e161b2cfb3b007930f26e122549e562000b5e735f041e34583cecb9dc71ae0b006d89a5e9259ddf99ba8d500a305b39b46fd5b797fc3aef5955352dabc922edf28abef4ffa544e9635f1f184f289bcf4c8669366ad7f7435b77aa46df37753e89aedccd176d9b4f9e4481dd0ac044f5007ec6f90b807dd675ecd003c57997f3e49ff5997c4f3ebe0310c689c83c9a79310b8caf89d715c5cc6ef8f0330757f0a808fee7e0417ae927e3e4ffb990eb2b5349c8174659e0e5f27b72af36667876de76a59380bb9e7593ace76927bbedfee3cdb693c7e16b2cfb374063a0f31a0fb62b761c039a8556a70d632e1d2f10468596256b466754719b0ba6d3c68f27efd40de370cc89453aadfaebf9201d1ef47746521a28ce6746539ace84e50c145476c4824!
 256e4bfe64f0d80acf2922e70672d6913fe9957fc32f7fd22f7fd12fff0d834d06b4ea80a2c5e65ce0246b821d774e29f781a8ec1608b4b553f9512f813ff253f38de3c3c7ad5a82abbe3e1295eb0c06c66d16b8c67809ae85128cffe338b1bd18d7f7ae53fbef1a9ed31e464f8fd271af9dd0673e3cbf70a8bd5f63ebdf9e51bbe4f2eca7f69de47f823718c2f1fce258b577ed1e1f770f9cd3e0ba96a17bfb38119d602432b2bf0e60d7056a951abe777c70e60d95607807a5aa07182069c9e6fb66fe9f29dbdadfc6f05871a8b566a79c7d2f5fde7f353df7d99cfceff9d5b5105697c20a2e3aadf9fc4106786f045feb79278128203e391ea503eb01cdf58626135eb31eb0af01f7e1aaaf4169370740ba96a0fb4c3f8546b6a5fa830197f8d3eb70062abb1508b94c3d1937ed6f96e8efeba7e42dd0fdc70b0cff572fe93ffc94cebf0fe17eab46e9a725dc4b2ece5d4c4cded9d71e174ccac37cefee7148eddd3d70eeedb75f85f18771baa3dd94d64a701e4a4f4a10824aa972420dd8c196b9fbc7dce684d50013f3d31bb6f6b7edb1f501d59557a66a2c3f5b360c8a3dea535e29f564a38ad4fdaf5cc37b89015fd2f30719d05c0fc83fca1f62c289d604db3f3fa5429728ede608b57550a37620f6076dcc3bc49f5e67f8dc2495dd12deb66b5c7fe2307e3e41a55122!
 e009516a1498f47cc4b37b2572efaec15d97d0b7c2847e1662eb6203f77333!
 df77ef0e
e25e1aa6f6936bf07b493cf75d6a8d2ddc3df744317f14a73f9866f8c230858705da23ede6fdc08576b34afc8dd09b5785c3755a1e3f3aff6fc6fcf486adfd6d7b74ddd4f2cd3cde9cc55d590e9bd5db9bc6f3138551c3a45f31cf2fd9f708734533319b5d379a34fdc8fcce446e4275d535ba629edfd280dc61269ce8dd60cfb223694275bbd059af9a1f2b6e5a61aca624c5b46497bbaad594a43ecdac9b777ee56a46d29056375387681fb42f2d9a836f4e6d8f4e699bc6c87c59b445d1ea8a9d65e6f2fb68d2e1eb0d9017927dab2bbbeeaf8db1035895b66d1628da0ab03a20a94bca05a51da4478eb4e34845af24afb46131e7971454ea91b715ebc7c5bc77dd3994e723e588220b11cd95e7d475b34b99ed8cae2c5e51663ba381e50115778a1a581e505555cd2c1ae7ad666dc569eb82b9cf8e67404b03faef7894fca001bb09681b84da24f846e0c5249cd9821210aac08b2d3853820715b8e8da6d03667647947dac39e0e3a5eba19f383c7bb16562bbb987f74bc4fcab70c819a23fd44fe7079de4eee5e88876907b90a3e34907f4bd4103f242da0e4a0a4adb114961291736ed477e498eb46d3dfac879757bdd6b1e57b6df37af17ecf50daf52dbb3e2cf79a547f83ee211e2fb881c226edb07f1a0fa270ee35072e8d0ce10bb1264ea933785405fd6319daddb4e1!
 7ed6036bda6f32b07af1fd73e80cde71cb91e5d8c886fbdda00ffebf3c6fef6984c3ab36f841b27d5801ddbe91ddbe99c73c08307ae1fd7deb083af1e7c8e572a3a2d6346b723e2db5f8d016693b3fb9b25eb926e4baabf7e8f50eb43d76dd3f9997533f854d1b4f39601d5a23586ac71d68fb49b61d0c4d6b5c3d7a38b5f9d0174c3163d07b6c82ddd5e92122760c09b4ea7809c4f90771d4517506413f5dd76b45a47b1aca3b21c8de5cc2067adf132cdf0293735c3afd9cde057337889d91bb36687a83542136712c7ef14fd4a3a72ec8fc5bf22cf37cf842d7acafbdb64533753d227bf0606fc7f38671376977873366a8df195ec15fe3f79fc0b9a7f679edebd5ef33f017a996f9ba7b772fcff05deaaff0c2548d07bb19724497aa316dfef254efcd87bde2e06fc10259c04837b83ad7f8c34df53fcc63060f08341c67f394efff97e269f4dd21fea27bef79bc2801fa0a4d7787cfc97e3c48831757a0af6c079c761e46f475e66c1d7addcbff6b3b936d9fcc74855cd35c1c3b344bb6de6ebeff05774ce7c3223c56d0a4cd83f4d343169ff50f5d6a5c12f71bc5522f8658eff011c14b95c7d72d0e30000000049454e44ae426082</data>
+        <data format="PNG" length="4887">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de000012de49444154789ce55b5f685b579efebcd87005354830010936202d0456a681ca34d0eb49a032f3d0dab32f36fbb0365358991d58a91de8da33305879d895fa90b1b230833d90c5ea62b0fa90ca1ec8ca2e6490529c4819ec4a0167242ff6200df27265eca22b9c45bad8866f1fceb992e5d8b1db69c86ce6c2e5d3d1e15e9df3fb7de7fbfdce1f7590c45ff2f557afba01affa7abd0ca083d803677e35433c05a3bf8e125b60e417913369fe7a19c0062c3d5a42e0288099073318c318a2bf8d0247673ff27a19a0020cbe3b8899ce19043c012c381630e61d033a5ff00cc9d7e966e25e829c21a73e992263e47c749ebc459ef5ccab6ef0777b9749ee93b3d159b2283b5f24a77f397da6013a5eb330c8d41729f457fa11eb8c6114a358e85cc0f0d7c3c04fd071fa13afda6bdfe19dcfe5c93a391f9b2735321e8b931a393d7336035e79a3ffd41b1f83f808543e06592793f793648c8cdf8d93bb64625168c29fa501f031887ba0f516a8ac82f63ba07d13b4c740bb063aef81ce7dd0b90c3a0f40770a7453609ca07b05f410f4ac80ce3238bd3c451e90f1c53859959daf92b37766cf34c0b7d6808e7fe9203a01bb1d303a01a!
 b153000d86c00de0594af00c30b288f01a880f2048007509e02b80a583600b8016c018d2b80c5c40da0e106f01430ae8ae70c0f8035c0b8062812f11830544079081837007c0614fe8ec87c9541df5b7d587ab484c17707917a9442ff763ff0e30b68809a011304d555d04bd05b00b304078a609ee0880616098e54c12a41ff3ea811f4995895f5bb1235f1dc50b98559824345f9de4d304b85039b8ac08255e0ba955e826a0e4ccaf6a804cdf679322dcfc725239a0c2099584e90fb6472392934213a7f3e03fa373ad8eb06140093003e81f028003400580e81461760695811b200371b0a148b023cb320dc0d849f2930ba01e59915c16e0311dd06c3d600740b82b606c27b16e012803d05c14b3ac2150b6a8e06b00d342ed7809202c35503b680da9506f4a73b30ae1a703d752376d5837049015c0a6cdb36042e4f2256f914a38e00162a510c3bc6105b9bc1e8b500328f0503528f52e87fb75f60a91ff09dc38034c1d0a28fdeeb5e3a9d4edaffda4effad21926496f33c7ee599909f04e60f92a27820bf3e489f2867dbca216d80649ae3652feb54e92faad498a06fd3c322dd1c293899a64275152435e6f7e5fbf605644f96abb2bc2220793f297e2b25caf3731760c0e0460797dc44ecd3183efbfc3300c092ba84c28f0ae871f500d001d8d0800ecba95881050ee8a!
 8c0d68625d8e06a62ae91c2a2e536b00d4c5ed671b3a4a0d1f4bc016c0086b!
 b01fdc90
e6a1e0343251f82ae28629508461d0184b73e847105c086818abb06e509b0e3d1d1ff7808017502b9b51c520f5270d81d18fd60149552058e870ee0837318e025389f9a2257c9d0bf86c814391f9b6df33ceb798165c98075597f3f44d6492efa052fea622cc6f74324eb9cadfa496a4d064c960758a797e3452fab4cd2bfe9a1460f470a6ee6e9e4d0ba932a15aa19c100ee93457adac6bcfb0074df17d1c1b90ce1f915c1c4c99f4fd2f39687be7ff489762cc6cf6440cb0005f1923a3592a446412b93ee59c6c9b921f28720dfc399a8ddf290f4cb4efb38bdeb2339c2a9dd11f19e7a82757a3959f6d24f95fe4d953e7ae82b7838443787d69d1ca09deaaa420fc15051746224e7698640a7d9f9bac47d702a1312edcde5c9d810e31f59a9bea3329d490be79c6780344136c7b6791deb3c290cf01e5e7c67dc9cad8e93accace1739a58d90ccb718501c609d69fa37556ab2f345c639b22e1830907336d59ed498dd4f33cfc4a99e77d65b0c30352011f5917356aa6fab64416ac245a240cacde6582e210317fa50400a3de8470e0be8d59781f11460b5018a22e6d98a02586d88fede40f4610ee854505300bbd386a54fddb8fd4703f000a80041c70272cf96f059f76da004e8ae1a942d05b52bb5e6d8c71340f718a83dde81a102235b3e04af4431bcd68bdc5b4f60f912!
 685c072c8f80c63b001e01c67560fcf7214ca841149e16d0b3f609661e2d23b6e1c6ecaf67d1f3660fd075010dc89b9e6e5e695ee8aa0a98ba35c5e43b49aaefa854df563939e7679d5986ca438201653146c737bdac4afa6b4c48cfbb399473324b3bbdabd6669c3735204fcfa99eb7ef83f67b520332e2fda19b21aaefa81cff785c3062317101063ced60eaea7106a4e0427f53e54d15afa000077a50410e0ef4a27098414f571f0a4f0b58fe62191bbfdf8071243208d77b0ae0ae217c0d98796220f0e365140c60e6a907d8b2c2909eafb90d99f935803540bfb603f7e7fdc021d0ef1ac2a83a86e0af2610fdfa366c37da3daf7c2919f0df8201a58d125c6b2ea42ea5d0ff7e3ff48a0e9b62036ce730204990cf31c0bc641caf0bd54fd6a7499a2a4fceef4f92658d9377fc64b9ced0dc24b94b4eaf4c92cc4b06a4c9b741fe2d38bea25263528e7d4f6becaf3ae9a59dde949dccc868b422545d8b69b4fffc79cfdbaba07d516a404636b720715340e2de37608019bfcdb16f32207318455fd718528d19f45b1a586a008396092c3c0b63b8db404c37306a6b20ba078c5db2a0721880a3cb85f0f6288ccb06ac6b3a26fc0f503280d8d321a06445d065205c02e0528012107419086e29d0afd4d0f3effdf0edf8f0e1ce8750de5060e9b420fac66d586fb47b1e1227ff!
 2018502955e0703950da2ac175c585ca76050eab03e83e87012ad1527b799d!
 ccf0d2f5
f97626ec0b4cec0b46ccee0af5174826aab324f39c2c0e91f40a06bc89a6679a79455dfedebe649a4632273c5fbc53a4ff233fab77abb4df7cdef3d65dd07ab75d0328568098ce490d5be6990c681920275e5265b1adf375a97055991f9865335fa8b6a19fd3bb7e927e6a07e23da1f210eb1ce0d4aa3080f6a66c6c55183bb92b8c9a90385f168d9fbe3dcdf19f8ed3f7231ffdffece7f847e3b4fe5c4c918f77de7e17b4c65a798056d4c85ba496129d0f65c62f96072409f2a03de77f2eb76f7e9f3d512f40745ee3b46632609a820122ee4fdff390bb6efa722a8b4c702827d47f60d5c934edf4aed8e926a82e5bc915d2ff919fc53b458e7f344e2da6d17af379cf5b77850148b634a02c51f886c9d405f280be271dcc78d854fbc2e1127aba068f4501a10d4bcf2218ec36b0a003c3b620627a10a3b6b0ac0f62a6a220e0002a87137074b9102c0dc37019c016a05fd1810d0586bb2655df90aadf001e0335b506e3b73534ae0313ff398d801240c695415fa50f135f4d20da791b8a7a4c030e0174090cb9a4066c57e0b8ec10eaefb0a1a1376079c3727e1ea0124c9f6040fe2071aaa7e355a9fed54992f5e6189ed64c06c839c1ee34ebcc727c7380557ae92f7859649223eb1ee6e9e1d0aa9b593ae9cd38a9d24e4f4a698bf3ee7b5626f6ed5417ddf4949db4479ff7b!
 c556b3120b99a6cf33c77258a59e1390c58eb60e65a8b01b9c325f4b631407cbff02c82e1ee092ce8610cdb0c44f70c8c5d8a403fac20da1504b68189cb4a9301135b83685c69c84c4fc4fbda55037802181e1d780ce8aa013c042a6fef3c97e19d54fb939e5700184740c83d85896b134dcfeb7b3a6c976c683c6bc0d26d01700e031204797072f667cef7dbe7f7260366770503f275513f5596b97f5930c09cafa7ab92494de11398d004e3e25abb009a385b3c819b0213e5781b2a73520356d9ce0099a1a657d26732a0350456dba340f640bcbc15058ab2f3532427392f3b6f863ca1fa230c957d9ca2af19053419ea8a27305f17426a863e7351e35cdc7d1e952838951153f0aa26dbbb2ba3d5be1c9fe719c04330596f67405632c01ce34d2dd8171e33e3be593fbb229971bfb53657bc9be764c64752e3e4a68f6495a14da11593051feb2cd29f1ba2c62c7dab032c32cb91cc095c69619e590ea504c68ba21d4a54382fbd2a997a82017296f8620de87ddcc19cca66aedff8592f2c6f7ad0f8202234e0b0045b97abb5d2735881adeb36662a40c01141e417114c7c6f42ecc8d446113122300c0333bfb98dbe940bd6ffb1a276b52657770d39f61bc0030395b777bef1985700e81f1099bd0cbeff9bef63eaea1426d43f5503648e4f52cced7faa9224f3f5e4a94c10f!
 1becab496647db9cef18fc7a945358efcc308ab77ab9cbe3d4dcf7b6e0edd5!
 35964924
3ab1e66e9e140c6cd349d54534ebaebcaa9b9fd596aaf9441650e548ae07441b41777ced180d4d91ad0dc1ebff918802580ca61417c21b7941bd0d163e9c7821e012c406c2f0c7401fa610501470333db41f439fa717bed3622df8b20fc551800107c1844e0280087cd0efb0f1c886ec4307fcd85cf9ebae1545d88aef540f102d6df59617bd70ec7efecb0fda01d1d12adef0bc49102e501c43ac40320e00e20b397018e80c85a04b80654b62b8003d0f774c006349e35d0e7ed3bd5f96d0cf0104cee9fce00331accef86da98305d966b7d5a825c115bd2d558b5c980a95b532cce15c975194dcc5cffe46a6ef54459c66f53e8cc72fa64594bb731a099079899e005f280d60189c7407ff7e90c8065100b7b118c5e3210dd0b0216c180c66520b21d061c83083f08c38081e0a32000e093879f000026be9c00ae0e22b5b7809eee5e64f414d00da42a0be8b5f561a9b2204e76c8724ecf009780dc5e06bd97fa90db6b95fb2ef5098f5f02327b19f439fada18d07fad5f30e032a05774e09264c2f5b309d0b4449c68ceea4e3220bb2f3c28e23e8fc57dc180b4962053a733409df17060d1c32c131c587153a593ce6585d048c448a4487bcc79a1316f8f5969d7ecb4c7ecb497edb4cf097c4e038a12cdb9c045d6047b1f76307783a81c16e0e8ea41e5d36138fede0ebd3b0c!
 1b6c58d2a318b48d215a0962cc1196512088700908baa208ff5b18c1a320824741e8ffabc3d26941a833849ec77f03d7a20d963f28d0551db52f76a05f37b0f35f724ff20f80d5e98262f9e3996a6fc8333ec611a074028621197ad4c229750a139e89d63a805c17d02b3a6c561b6039270ab809397b6b5d4919ef4dd59fd564ee2fc770a82835609fe4badc97df6d6d4dc7efc6697fcb4eefa29b5ebae95c569a6a7f9c01d639e70b3daf44416c82b8733692c7d603ccf50693092f580f6832a0e761070b37a6503aec87abab17293d8a7edb180a8d0c7a2c7dadb8bf0d042e47503173ff2d2078258a4aa30487c58552a300bbe5134cac19c03560e7f30a2a3f2ca1f2650dc675a319e777be68314039c6806fea7913a7d569043c01b126e876b533e17b1758118a1332cd6d5df1dd29a90162cc4f9765ee2fcba14d91fba7abc2f2f39a60d0f8fa8888fb19959e03fba971fe39067c4bcf1f6780b91e905fcfb731e1426b823d0f3a58f012a5c31c5c5dbdd0a1b78d7dc1002b66b66f4a0694e0e80a22b8a5207c820111cb4dec3c2e21f7d606f0a501d7fb6eb8d65ca85d6bc07820e6fbc6976330ae07a07f1e04de8fc1f2c880dea8c13832be91e79b0cb8318dc0d5000a4f0ae8f1f488fd81ab3d821176d7f9abc2ee03343d7e72fe6f8ef9e9b2ccfd65797253e4f2661c!
 376771032b6eb17a7b4f787eaa20a2c7378df349b98f102f8a89d9fca6d0a4!
 e975f13b
5339d1dec955f1fea606e4da9970a1bdc1a11585e414eb72a1b35e153f56dc95c2584d901c67522e7755ab0992239cdd147b7e5a354dd2cfec6ea28df64eb9696176de9cda9e9cd29ac6487f5b9449517655ce3273f9160a83bed800458294bbbacd394139740cebe4be8c02a6fa577d24bd64ce295eb3ae9054c8a295a4952c4bccd9493a9958b736c7fa5963de5a54dae2bc67d743cfa28789dd04bdf7bcccd6b31c581e60b69ea56fc5478d1a7d2b3ed659e7ecb2705e3623334e9917c4ef9ecd80a6068c3eb43076a3011c4681ae31408f00b609e05904e8ae012500ae0af0ac06749780b50a70cd90c706c4ec0e2a5aa82b800dcfd5bb7ea360e7594d8c6df30cefb718f3a7a15ff163d4358abe1b7dc83dcea157ed456e2d87dead5e60e41c0d2812e4be93a493dcf790749339b728afdb8567f7a5474d4f9f2c6f5ac5eb34f9bd595f90f5652b93f538f14f38d523f8258802885f8258073123cbc7f1b8fa47dbd11ff3b79d0c912b41223f396f088c6414d1d8ba6c74517666d72a1abf7abcfeacf23134df73a25e5df6103f38dd007ff23dd73a1e23a7c0c2087317d58003d9e803d9e89c72cc83c7eacf2a9765e7abc7df63258b4ad3986add43bcf7720c301f9b6f1d963c20799fe4c18bcf08353f78ef8bc6cf6e8ace278aa29c970ca816a531288db379a26c0e031!
 39b75edf5eaf2cb3300e764d273ec885cf27e928c5e8001e7ddca26a8dc01ad45505d043d5570e4bec2fc01389e5158a5c2504e74725e1a2f6d0e1fcdd40c3be355e7cbe93c89f9b9797142541ac1c4d9e8d927455f4a43cefcb19997e479f38ecaa467b7754c36712f41def90e18f0ffe19e8fca53e2e66c541ae3a59c15feb3bcfe035c786301c347c3e27f0218c642d702862b67ff5fe0b5facf5014510cabc3882186e11b12df19c60c66ce7ce6f562c0afc1a812c5d8d158f31f23e63ec55f0c03c6bc63087f1dc6a87b14919d0846af8c62e6e82f8501bf026356e1f1f0d761041144b8330c1c01ca1b0a267e36f13c0b5eb5727fe7b7b93669fe63649fe69a60fb2c511e9b79f50d7e49f7ec9d59724686c0a8fcd3848931f987aad72e0c7e8bebb512c16f73fd1f5d984e33dbafdc840000000049454e44ae426082</data>
     </image>
 </images>
 <connections>
@@ -638,6 +676,8 @@
     <function access="private" returnType="QString">getOutPacketsForIdent(QString ident)</function>
     <function access="private" returnType="QString">getOutErrorsForIdent(QString ident)</function>
     <function access="private" returnType="QString">getLineFromCommandOutput( QString command )</function>
+    <function access="private" returnType="QString">getIPv6ForIdent(QString ident)</function>
+    <function access="private" returnType="QString">getGatewayForIdent(QString ident)</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

Modified: pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui
===================================================================
--- pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui	2007-03-14 18:06:05 UTC (rev 135)
+++ pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui	2007-03-14 18:38:00 UTC (rev 136)
@@ -9,7 +9,7 @@
             <x>0</x>
             <y>0</y>
             <width>338</width>
-            <height>407</height>
+            <height>441</height>
         </rect>
     </property>
     <property name="caption">
@@ -552,25 +552,28 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel" row="0" column="1">
+                            <widget class="QLabel" row="0" column="0">
                                 <property name="name">
-                                    <cstring>textIP</cstring>
+                                    <cstring>textLabel3_3</cstring>
                                 </property>
                                 <property name="sizePolicy">
                                     <sizepolicy>
-                                        <hsizetype>7</hsizetype>
+                                        <hsizetype>1</hsizetype>
                                         <vsizetype>5</vsizetype>
                                         <horstretch>0</horstretch>
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
                                 <property name="text">
-                                    <string></string>
+                                    <string>IP:</string>
                                 </property>
+                                <property name="alignment">
+                                    <set>AlignVCenter|AlignRight</set>
+                                </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="QLabel" row="5" column="0">
                                 <property name="name">
-                                    <cstring>textLabel3_3</cstring>
+                                    <cstring>textLabel3_2_2_2</cstring>
                                 </property>
                                 <property name="sizePolicy">
                                     <sizepolicy>
@@ -581,15 +584,15 @@
                                     </sizepolicy>
                                 </property>
                                 <property name="text">
-                                    <string>IP:</string>
+                                    <string>Status:</string>
                                 </property>
                                 <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="QLabel" row="4" column="0">
                                 <property name="name">
-                                    <cstring>textLabel3_2_2</cstring>
+                                    <cstring>textLabel3_2_2_2_2</cstring>
                                 </property>
                                 <property name="sizePolicy">
                                     <sizepolicy>
@@ -600,31 +603,31 @@
                                     </sizepolicy>
                                 </property>
                                 <property name="text">
-                                    <string>Netmask:</string>
+                                    <string>Mac:</string>
                                 </property>
                                 <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="1">
+                            <widget class="QLabel" row="5" column="1">
                                 <property name="name">
-                                    <cstring>textNetmask</cstring>
+                                    <cstring>textStatus</cstring>
                                 </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>7</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
+                                <property name="text">
+                                    <string></string>
                                 </property>
+                            </widget>
+                            <widget class="QLabel" row="4" column="1">
+                                <property name="name">
+                                    <cstring>textMac</cstring>
+                                </property>
                                 <property name="text">
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="QLabel" row="1" column="0">
                                 <property name="name">
-                                    <cstring>textLabel3_2_2_2</cstring>
+                                    <cstring>textLabel3_2_2</cstring>
                                 </property>
                                 <property name="sizePolicy">
                                     <sizepolicy>
@@ -635,7 +638,7 @@
                                     </sizepolicy>
                                 </property>
                                 <property name="text">
-                                    <string>Status:</string>
+                                    <string>Netmask:</string>
                                 </property>
                                 <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
@@ -643,18 +646,21 @@
                             </widget>
                             <widget class="QLabel" row="2" column="0">
                                 <property name="name">
-                                    <cstring>textLabel3_2_2_2_2</cstring>
+                                    <cstring>textLabel3_2_3</cstring>
                                 </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>1</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
+                                <property name="text">
+                                    <string>Gateway:</string>
                                 </property>
+                                <property name="alignment">
+                                    <set>AlignVCenter|AlignRight</set>
+                                </property>
+                            </widget>
+                            <widget class="QLabel" row="3" column="0">
+                                <property name="name">
+                                    <cstring>textLabel3_2_3_2</cstring>
+                                </property>
                                 <property name="text">
-                                    <string>Mac:</string>
+                                    <string>IPv6:</string>
                                 </property>
                                 <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
@@ -662,7 +668,7 @@
                             </widget>
                             <widget class="QLabel" row="3" column="1">
                                 <property name="name">
-                                    <cstring>textStatus</cstring>
+                                    <cstring>textIPv6</cstring>
                                 </property>
                                 <property name="text">
                                     <string></string>
@@ -670,12 +676,44 @@
                             </widget>
                             <widget class="QLabel" row="2" column="1">
                                 <property name="name">
-                                    <cstring>textMac</cstring>
+                                    <cstring>textGateway</cstring>
                                 </property>
                                 <property name="text">
                                     <string></string>
                                 </property>
                             </widget>
+                            <widget class="QLabel" row="1" column="1">
+                                <property name="name">
+                                    <cstring>textNetmask</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>5</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                                <property name="text">
+                                    <string></string>
+                                </property>
+                            </widget>
+                            <widget class="QLabel" row="0" column="1">
+                                <property name="name">
+                                    <cstring>textIP</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>5</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                                <property name="text">
+                                    <string></string>
+                                </property>
+                            </widget>
                         </grid>
                     </widget>
                 </grid>
@@ -896,6 +934,8 @@
     <function access="private" returnType="QString">getIpForIdent( QString ident )</function>
     <function access="private" returnType="QString">getNameForIdent( QString ident )</function>
     <function>showInfo()</function>
+    <function access="private" returnType="QString">getIPv6ForIdent( QString ident )</function>
+    <function access="private" returnType="QString">getGatewayForIdent( QString ident )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

Modified: pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h
===================================================================
--- pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h	2007-03-14 18:06:05 UTC (rev 135)
+++ pcbsd/trunk/wificonfig/wificonfigwidgetbase.ui.h	2007-03-14 18:38:00 UTC (rev 136)
@@ -801,6 +801,8 @@
   textNetmask->setText(getNetmaskForIdent( DeviceName ) );
   textMac->setText(getMacForIdent( DeviceName ) );
   textStatus->setText(getStatusForIdent( DeviceName ) );
+  textIPv6->setText(getIPv6ForIdent( DeviceName) );
+  textGateway->setText(getGatewayForIdent(DeviceName) );
 
   // Get the packet status for this device
   textPacketsIn->setText(getInPacketsForIdent( DeviceName) );
@@ -1034,3 +1036,36 @@
    loadInfo();
 
 }
+
+
+QString wificonfigWidgetBase::getIPv6ForIdent( QString ident )
+{
+	QString command = "ifconfig " +ident + " | grep \"inet6 \"";
+	QString inputLine = getLineFromCommandOutput(command);
+	QString ip= "";
+	
+	if (inputLine != "" && inputLine.find("inet6 ") != -1){
+		
+		ip = inputLine.remove(0, inputLine.find("inet6 ") + 5);
+		ip.truncate(ip.find("%"));
+		
+		
+	}
+	
+	return ip;
+}
+
+
+QString wificonfigWidgetBase::getGatewayForIdent( QString ident )
+{
+        QString command = "netstat -n -r | grep \"default\" | grep " + ident;
+	QString inputLine = getLineFromCommandOutput(command);
+	QString packets = "";
+	
+	if (inputLine != "" ){
+		inputLine = inputLine.simplifyWhiteSpace();
+		packets = inputLine.section(' ', 1, 1 );
+	}
+	
+	return packets;
+}



More information about the Commits mailing list