[PC-BSD Commits] r133 - in pcbsd/trunk: NetworkManager NetworkTray ethernetconfig/src system-overlay/PCBSD/networkmanager/pics

svn at pcbsd.org svn at pcbsd.org
Tue Mar 13 11:18:01 PST 2007


Author: kris
Date: 2007-03-13 20:18:01 +0100 (Tue, 13 Mar 2007)
New Revision: 133

Added:
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/defaulticon.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/info.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_local.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_local_dis.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_wifi.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_wifi_dis.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_local.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_local_dis.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi30.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi60.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi85.png
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi_dis.png
Modified:
   pcbsd/trunk/NetworkManager/networkman.ui
   pcbsd/trunk/NetworkManager/networkman.ui.h
   pcbsd/trunk/NetworkTray/NetworkTray.cpp
   pcbsd/trunk/NetworkTray/NetworkTray.h
   pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp
Log:
Updated network tools to properly display UP / DOWN status

Modified: pcbsd/trunk/NetworkManager/networkman.ui
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui	2007-03-13 18:06:45 UTC (rev 132)
+++ pcbsd/trunk/NetworkManager/networkman.ui	2007-03-13 19:18:01 UTC (rev 133)
@@ -772,7 +772,7 @@
 </widget>
 <images>
     <image name="image0">
-        <data format="PNG" length="4770">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000126949444154789ced5b7f505cd775fe909fe44782320f17a5bb8d14b34d240b759d00c189207202546964505206a2c8165664839544102551213fdc5db5d6ec6a269a85246a77db2a6513d3ee260d06328376718786558acb2a83027191000df28006a9ac066b76a94c9617f49caf7fdcf76059830d24929c69cecc9bc3d9dd77dffbce39f7fcb8f702fc3fa7943bfd0039db9121c3be5bd5ecbb64c83b55a80fca923343d5ec902519aaa64286f3860afb2bb224f7ab9afa3315ce9fe252cacc9d7eb73b4a4a36f728565b20b390b7abbed64ace911ce4d2744bb04088e41899bfcf3dab64f3df64ab6dd7bdc6b16a92adb642c5ea78b9fca88f24198feb20e796e6f1653e1f1a8d928d64e62ec73925db9677af71bd2599ac4c93adb6e7e39d240774300678ddc28c26818d2ec36f2de68e46decedcc906643ae47b8d734952acdc6eca73bcc266323a25501b3cae83989c8cea3cfea6b271df64d238bd7d632c7a8217646bdde67b8d77112956ee32e5395e23494ee9969b5cc6b2632be453cbc8a364513b23b2d5b6fd5ee30620c02bd9b6d7165b72690b4e4e08de3f38f9a67c6c22bae8fee471fa0727995ff636508292cd4cd!
 96a8b304a7242b790c10d0f302c372cd890ced927586fdf32b261f9c9246e8c1f224d3b79457ebf23e3dea02fa4245b6dbf283fa2476b926363495cb7b82177f708548190c1879694bbc3429ef724639c89c5e3d71c6fa562b59dbd27f865abedb9a1dd646b7b926546932cd823586be790ce5726cf5b5ccf2643c6b83a373cc994e7a092cda7ee36f84c25db315bf36c4060d53d606850e7ba6c58b6a9a57f55dcf094377a8e505262cca8fa1a295b6daf2ad90ee5ae2940b1f2f9a27d4de430d91b4eb29431c77b48c64977732f798b743753e72b90c985d831617888182fd095303e49b7b79ffd85a462b5fded5af1dcb79a1f9bf21ca619adeb9f3fb0b55eba783d84434f5a103e1fc196473622747e1c1fce4947f842045b2e6e44c360089af631842f85f1556d0b1a2e87a1cd152cc89792bed765f30331a4bf2715e3d76248df928af12b31147c2415039723f878fe4631bece2ba6b6a1fe761bae4c7cc9aa6ed0fe1eb75ed2d6aa8815916275d42bd964ce1e37394c06f439eb6eee25274847a3901d8ddd0bf2842e4f25c9c9df4fe8bd40620c184bf22cbd97e8363ce00cc951d2b4d341c5cac7d7826955dda062e57fa9b07f549664286932c69fae47c8328ef08805d042b0cbc568db328c8ac776c0feed109c6a31ea1104500a252d04fb8c2e6ba5801444034ae7b!
 fb798c2a8ad2a40e4d5599837a5627c3c068b251dc35762d8b1351d031723c!
 87dd88cf
085080a1e31c3ff9361545edb01fb4c08e14bc5387fd1deaa5e3ab96f2d4a5819f86c2a8ad546259b54ac0e2ad964d66e9708505d8627f493a364935fc82e6f2f19256b9e0d900364cdb33e3244561d75e972abce03a23f302ac6240f30ea88f93aa147fcd676b29b1c25ab8e05a86433b6165c2bf600d96adb2b4bf2595553214b4e18fd7ccec36684b657c32e85e0fc7a319cff10c6f8d502c86941a833a500da0054205df620361d818a2cc8722554cd0f59aa84aab541962a50903d80ea03b988446661362778c0480c3bb2d2e72d1f7a691cc58f5ae0f9de00c2977261d91cc6f8f502b49fb3031a1e562f9fbcb41645bc2529d9fcaa61f9444f30e59125877d8c7791ad1d099e407d4e4f91b6132eb28b2c3f227e97c819d2f94082c593ea8a7ea3bbd4b38eaf65889c22eb8e93ec223377b9a86493b2d551b15a5c2bcf0219dae392f4dc4e55b3439264a85a1724e939ccccd9119b9e41d7d52b78e56a2e6ec60650fbb95c0cfc52446d8fd7836fa67d15f56341dc98aa40f3cb5ea4fce6109a5ff62275c3215c8806214b15f87e8f1ffb6f7e00e31931a45b52317c25864d5b5331f0cb087273368a6c93bf51ccfd5fed40c3cb03784e36c37e3d8c8ba3d7301def848ce7fad4a913e757ab84159162e5f3c93120d91372f6ba85d50c4b35fb444ed7e770c9611f27fd64!
 febe2616b590e5877de42879e0a81e0b8e8b5871e0682ba31d64d5d75ac58dfadc6fed203947babdc2b31ca77bc99e45efb3ea7a60e51ef06ead4c92e46cc3f24b79c2cc8c0629434241d91604cf06317ebd02310e60db47cc885c9bc5179eccc589b341bc7a733fa6cf37409dfb223c2f7ab07efd21787bbc787d6e3f4e9df5404b398496412f7e3d570979dd3076146d42dbd961547c6a13bc3f1ec617b44d68180ce3e268019ef1d88185f7f9997ae3dc7fae56092b22e101baa6b31dcb7a02a3646b4bb788051e61c17e632d30b1ef1f20330b5dcc2a147c68aff0889cbd0b1e905fd6448617ea0d5f0b4585e9ed272712dfc3b6660f58b7d21faab0df846417d15f0654cd0e438624cfcba5755e54ec2b86ff877ed4ca15089d8f20f76160e0620cb000c35704af7da10daa5a8fd88c13aaaae299542fa0554296bc989ea9c0932ff8919e5e8d82ef7851ba1b62ee97019e1706508b5c387f120660872c3b179e0fe7f46a15b06252acfc92a1e9cc42d71b2c6fc8937e313f39413635772f8ade8627b47690f965a2a21cda2378bc932c39e863b49d2c7a42f092833eb287f4e95d67937f48f40c6744ad60dae9e258596216b0fde56a71ad2606bc4392e4a754ad0b5b1eb0e3c6f4e21860c48491db7dd8ff78013c7e2fbeb0a102c1e838b63d9a2ea2f90737627824868f!
 f7a7c2f38a0758578bf6751e581eac45e7441b9477ed47c7e536bcaeed87ff!
 9217ebd7
1d42381ac4376bb6c1fbc361546b3be0797900b59a19b53f0d429d790aeac7c3b87a7d3f6e4cdb01e0b836f55274b54a581199ac4c53acb6db4a3699b5c745d3ce65628091b3493679f50a2ea96b2c3fece35899c81a457eb2ea582b194ee25dc213e25d7ade8f2744ffc65e9af2c8f2a77d89b120b2165cabed05fe43857db7294341aa04446ed663d10e8fe444714e03dabe5f8f482402b3d98ce0b971941659103a1f4171be19955ff66364bc128007402d000f2c5b6aa1c86d8054315f19ca521b3c52056ae187677b25fc08a112c5f0a8a2f2f3bc60c7814f38a16a6de87c6904aaa6fad44b270fae45092b26d96a7b46c9162b31452d4b6783a13d0bd17e68505ff6d27b05dba96e4eb690f9656e1103cadc1c2b238b9e682207494763abd80b30ba42635dc0d84730f6198649de226b8efb98b94b7fbe95a56bc1b43a0fc87628aaa65e9325679a25d30368b518b96a5fd41b002a62c79cc0e7c43de3e3e3b0582c687b2184f323c500fc989da904642f2c19d5309b83a8dc578af12be3b06cb500b3005201dc06b07e81cfcece223535f50defe4ff61109e1f955e3f1f28b000e7efec7a805002bfab586decdf2d2c9755985411ee244b0ebab8880c0b26ef172453b2a527167bd27c1d718b8ba8bfafff36c9cfac05cfaa7787e56c5b86acc9572041c9d96a870a0f229!
 159dc989e862c39a1a4396136db51becb8ffa2f57cedf177b3586f44de9f37c9e740bc72231a49bd3113c1b44e9b552d45f6f40e4663da65527a001d05404dfef84dfda86ca0315885c8bc0bcc53c3f4cf87c582bc82ff8544a4acabfaf4511ab22c56afba2510f4cb6084fc82c24953c0787f69045079bc849d2714ad4f8aded6201b5b7475ff3d3b3426b4bab88ea2745c577e0a89bec224b9e6ed2eb81264eb6883ac1785eb45d5f4f48f4089d7a7b7a5f25b9aabd82359f0f90adb6176549de63d99c0e65632d2079a1be560d5515513d3f6f00f5522e8acfdaa1aa4ec8723dd253654002002764b901aa560f485e00d580e601a45aa8aac80eb39a9e25340fa6676b013440d9580f15fa7366ec187eda89f147458c316244f06cb069efa7f71e5e2bae159392c70cc56abb62ca13968a77eadd5d883c7054e467c7699221b2e40907a3656451998dd11621c7dbc9f2832ec63bc8f2a70dee66bc832c3998c03bc9f2c34d8c7608cfcaf7cf679f0b75c76c4f2d8a0962fd6036d01158b117fc562744142bb743729e5314d9b4c3920e45ae06243fcca64ab10698568cdaab620d707ac60b75ba1aaa6a872cebbbdc921d40c3fc78b2540f55f70459f64291aba14a7e4cdfac84aa7931ab5663e48a13aa86cbaa3a5da45e6ebcd174a6e962f5e7abadc618c11783287dacf48!
 b292929677e1b6c2ba6cc5ddc9eb9cb752d67afbeb213d6fbfa09d2715a5f0!
 d3e2d22b
aadb19b1c24ab8e35094f392c568aaa8eb8c91efdf33eb2eeb84f5f1f10bd40f961111332773998b99323f27687c9783e47f9dde4ecd0dad2faa395beffefe48c50d62e9a2137bca0a4d57fd46cf6c3945189d4b4204c69a5801446bd54000fc2a8950ae0c1006aa55c7834d1d579d4306a5180062d04a018aa16821dc5b06b41a86a296237fdb871b312e3910640432072437d62faf2f1f9f343ae93ae6fd5ff75fd370c39f86210a5b1d25fa454a63cf2bbc066508a7edd0760038077005000bc1bc06600ef9365e5e19c42dbf78a5aa8951ff189caeeb4c8f9eee67e32beb05a6cacebfb5a44ee6ff2f7eb3b49c28aae33629fa1e6d900e39d647e99fb57fd853c09e0410026000f00d8084066943f9faf18f5fac2d7ec1bbfd3c04d00de0b601b800f00f8308047017cc29499f3f9a27daebef2233ed2a3839b23035da298493e4730bf97a87f6fc835c7032c3f4c2d7fafa35b31653d0ea0084001803cfd99db6b8ed43c19e80c2c4a8581ce00d9ccdf7a5dd000be4e077f1f44612a03782716acff5e00ef076005f0215d099f045096b9bde82b25071d418679cb764a58d6d7ae5774a1c59e60f40aae33bde4305975d4178dfa19306dcef90a80cf00f83480c700fcb9fe8c8fe4e7e5eff6797dff9308dea8187d7e5ff36a80be951212ff36e444a548fab51ec24bdea95f!
 a900364092e5fc9de50f99b766fd99c564df2acb6def76a6556cb46b41c85229542d08a75afabfd5d3dea9e91be3632317c397472e9d9b0040fd599a7edd063007602ec79a93567bacf6747555f5834625695486e17361145c2b783ce5504a3b80d701fc66ad0a48a4e4a533c33b922f430972c2950ae07efdeff509cabb4fbf2751b16f45b7e365f1873a0f74fe55c5be8a857afa55009b005c00f008aea66f4acf9fbe397d0b4261bfc19b28415ae183971ac0f8cc504e8afe4015c0afb000d6881d321614b121811bca78532598369bd222472287c245e1bfa8c85fd8ff88c5446f31706100b98fe4c2fe37f6e3d337a75f5f21aebb4246105d0fe10d1b21a2b809402680ed10412d0f403e808f01d80d600f804f298af2d9ba63753f20199bef260d4a3a49d274a6e91f21328502a16cc3c3de56b40e4ba7520b808720026a8e69b3a9d071dcf177818e409424e3c69153bd651e1b13d54fff807ec2c4dbf4224456fa637d6c638abd3da87f929b4bfc7c8ae4f3b61083d1316e039086056fd802c0c216ee7137ba7f40f2d6fc1e613c891be70574cbbb3d6e3f802c007f02e161ebb1b4f5ef9e37288d54723c2c2bf1d36d23475af5970ee81b9edd637c8d643d804d39d939db1c271c5fa79f3fefef13168ddf8a2fe2d129e32cd250a2e555c709874307ff1e00ef82f02e!
 232827d31d54c02065a591854353741635f3e7246fbb8cbedfb058f2c16951!
 bbbf12e8
a29a20bf91cf9f14d1eb8830c93847cacbcacb21a68d19c2f2cb814f4ee3bf5b521a9951d2ccd70e90acea20ab4856759236920103fc3214d59532a49f078c478d4a513f393a3ab6087ca023708b27f86d59963f04e07d1031240d6feef6770e3c00984ef119926cd57771fbf5b9ebd37782fa93a3b741c99f1b6b8086a58d7381c2ed7fed6a74fd386b7b5611801d1031e30188cc22ad00fc9d5340793303ad9d62eeda428b2d3b96b4006a28a37f7869ad4cea6edf1bee9db7b8eba4eb5f72f2721e8348977f0a11e93742a4bac4826a29d046d17667c834c68db60ece7280749fac118dcfe8625086dc64ec1a19dfcf2dfe9d21bbfd2427f8df7547eb1c8aa23c0a201ba2e7780f80742cb6fa3d016f143792e964fc2992ac395647ce95d3e7af214f93ad03c205baf500d6ad9f247d03689d7a27e79514cbd959f469008f00c8812894b600f823881e630316bbfc9b81bf6394021174ee8f4779d6dd1c10bd788f8324e96a71313e4abaf53343bdcbfdafd0d4620fd1792b800feac0df0b2043077eff32c0ef3a78e381f701b83fab317ab4e4147b867a1cd32419edb3917431d069233d25b41d174bd8469f6ffc8fd0bc6724f1f2677d9f8528913320a27b22f0e59aa7bb063c918ceeef7e00ef24799da33502c580f084fe76073946bacee88b1649e7fe0dd00931620c22a!
 d19016ea979feb6a2f9a9e07e36671359fe230e56a9243919769074d071c2419e26bbfb2697046d1449ee30fbeae6f818de98d6de96c013c988b4eb01dc4f463fc7e103b7493d260c904dedfa8e501278df206f930c5479873e09630165f932f6f78652c8124b7ca0fc1c59355b77aa294692ddc3f1448bcfbac2fc4e15f9107ecfacbd62228bd278a62883e43f19e7fcdc7d8c90fc465507efde3f38dc6b3ad0ce4c92ff5ad7c5434527b8d215a83fd01fe82ed1ff01f3939a0d5db0b5f70000000049454e44ae426082</data>
+        <data format="PNG" length="4723">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000123a49444154789ced5b7f505cd775feb09fec478d3a0f17a5bb8d94b04d640b759d2e042782c82950a59141492944892d22cb062b894494581549eaeeaab5665733d12c2451b3db56099b9866d76a319089b48b3a4a59b9b8ac3c286c5c24c02379763dc86535b286a598c00b7aced73fee7bcbb2021b482439d39c999dc3d91ff7beef9c73cf3de7dc0bf0ff9cb26ef604b2cd9927c3b145d51c9b65c89b54a8ef9725579eaa39204b32544d850cd715158e5765491e5035f50515aeffc085aca99bfd6c3795141bb72a567b30bf8cd7ebbfd64192e42017a649c1826192a364c976cf8c62e3bfca56fbe6db8d63d9245bed658ad5f972cd3e3f49727a5a0739bb309f5ee4fda18be3640b99bfd97946b1d98b6f37ae7724939539b2d5fe2c4f938cea600cf0ba85399e01767c113e399f3b5b783d7f139b91ef946f37ce0549b17283a9d8f92adbc8f1ab02b5c1a775106363e33a9f7e5bd9f8dd58c6387dfd31963fca73b2f5c0dadb8d771e29566e36153bdf24495ed52d37b68865634be45717912f92e5279890adf60db71b3700015eb1d9df9c6fc9852d38362af8c0e0d8dbf2d8e8f8bcdf678e333038c692ea778112141bf!
 365ab3dc14992a3ba850c6e788061b961c18674ce7ec1fafa17910dcb8f657063fc3069dac44bf2079d79b7077d1925d96aff59cd1e3d5a938cc532b86e7143eee915a88261830f2d28f744849cf224639cd1f9e3ef3dd841c56a3f795bf0cb56fb33b12d64475786652e6658b057b08eee219d2f4d4e595cdf4d868c71756e7892a9d849c5c6c76f35f87cc5e69cd9fb745060d53d606850e7ba6c58b6b57d6059dcf0941b3d4728293d66d47f8d94adf637149b53b9650a50ac7cb67c7b2b7991ec8b6458ca58e3bd2467494f5b1f394d7adaa8f325c8e45cec18353c448c173c9d363e498f6f804365a462b5fffd4af1dcb99c2f9b8a9da629edf4f73fb4be493a3f1ac6aecf5b10399bc0ba0757237c368e8f14e622722e8175e757a3f9e53034ede3880c46f094b60ecdc31168b3a573f260c6e7ba6cbe3789dcf766237e3989dc75d9885f4aa2f4a3d9880e27f06725abc5f83aafbd7a1f9ebade894ba35fb6aa7769dfc5e48bda4a15b12452acce26c546166ef59017c9a0be663d6d7de418e96c11b2b3a5674e1ed3e5f10c39f3f331bd16488f01b10ccfd26b891ec3038e89ef983639a958f9c84a302dab1a54acfc2f158e8fc9920c254746fc8926842d7144462c80168643ae40e7ba61d43ebc118e6f85e1522bd08410802a28396138a67459ab02a4109a5195fad!
 c628aa0b1be14893766605e938d783c098b2517c39792d8b83e17d1f309143!
 d6046e45
c02a50f9a11f8f130ea2e6f84632a8cc8850a9c3defe8502f1cdebe12252c0dbc8d8a62b553b1918ad549c546166c718b0075daf084013246b60684ecf6f59193e4dea783e420b9f7693fd94bd6ef73eb7287ce45404d658c191e60e411a93ca197e424693fdc43c6c8fafd412a362657826bc91e205beddb64493ea96a2a64c905a39e2f7cc08cf0860638a4305c5faf80eb1f2388bf560a39270475aa0a4027805ae4ca5e24271250510059ae83aa05204b7550b54ec8522d4a6d5134ec2842223103b339cd034692d858909bb27cf8c5382a1eb2c0fbbd2822178a60591b41fcf552749d71001a1e505f397c61258a7847526c7ccab07cba27988ac9cadd7e324c769c48f304ea6b7a9cb41f729361b2668fff46deabf3c1348b67e415034675a9ef3afef621729c3c70906498ccdfeca6622365abb376b9b896be0be4698f48d2339b54cd014992a16aa72149cf606ad681e4c414ba6397f0ea6b45b8968ca2f1b122447f2ea2b6f7fb5efc4dce53687a35842b576be18bfa90f5ab5df0457dc8be6b17ce5d0b41966af1831702f8dcb50f219e9744ae251bc3979258b33e1bd19f275054b85aec3625abc5daffc5463447a3784636c3311ac1f98b973131dd0d19cff4ab570f9d5dae1296448a95cf66c6804c4f28dce61156342cd5e617eb5a5fc395bbfd1c6f274bb6b7b2!
 bc8bacd9ed2763e48e7d7a2c382862c58e7d1d9cee26539d247deda73ccc273ccb79b48f8ccc7b9e65e7034bf780f768d59224db0ccb2fe40953531aa47b259456af43e86408f1d76b917c2b8afb3e6a46e2f20cbef8f9221cfc49086f5cfb1c26fa9aa1ce7e09de9017ab56ed82ef051fde9afd1c8efcc40b2d6b179e7bd9875fced641be63181bcbd7a0f3e4306a3fb506bee786f1456d0d9a5f8ee0fcc5523cf95d0730f73c2fa857cefce77295b024121ea06bdae65cd413384976b4f7084b798505078c5e607add3f48e697b9595026786c9bf088c26d731e5052dd4af6cfe51bfe768a0cd337408ea53f877dc51e70c752bfa8c2710d9243447f195035070c19929c92abbeea43edf60a049e0ba051ae45f86c02450f00d1f349c0020c5f12bcf1782754b509c929175455455db60fd0ea204b3e4c4cd5e233c703c8cd6d40a9db87aa8721d6fe76c07b3c8a4614c1f57c048003b2ec9a9b1fae89e52a60c9a458f96543d3f965ee1b2c6fc8e3ed14b9fc18d9dad6332f7a1b9ed071822ca91619656cab9e599e262b77fa397d822c7f54f0ca9d7e3242faf5aab33530246a8663620ed32637c7aad37701fb5f2e17d7723ce082a1e95cb9e906cb1bf2933f6d06d600de1ffbd0800a84cec481128868fe00303c92446d1c50352f2035a256f2c2626944dda94e984c7578!
 f25427b2a53a541df701a843e3a910eafe0af03d378c066d23bc3f8aa25103!
 1abf1d82
25af09be8722c8cdd19f07185aae02964c262b7314abfdba62230bb6ba69dab4480c48ebfdb7faf40c2ea36aacd9ede758b5d835cadbc9fafd1d647f060f0b4f6058dff767d3a27f4b1f4dc564cd13fef458905809aee5d6023f55e1d862ca53902d01896b4d9877c223b95051d88cce1f34219148c06c362374268eaa720bc26713a82831a3ee2b018cc4eb0078013402f0c2b2ae118adc0948b5a9cc50963ae1956ad18800bc1bea10401875a8805715999ff77907767cc20555eb44f78b235035d5af5e38bc73254a5832c956fb938a4d7462cabb16de0d625be7a2fdd0a0def6d26b05fb911e8e779125d51e1103aa3d1cab26cb1f6d258749674b87384b30aa42a32f609c2318e70cc3e2efbd07fdccdfaccf6f65d54a302dcf036c4e45d5d4cbb2e4cab1e47b01ad1123af39e6d506808ae47e17f098f84d3c1e87c56241e7f3619c1da90010c0cc541d20fb60c96b80d91c42ddf62ac42fc561596f0166006403b80e60d51c9f9999417676f60dcf14782e04eff1aad7cf064b2dc0d99bdb0f104ae07714ab9d435b84e50aca3232c24d64e54e37e79161c1ccf3824ccab4f4e87c4f4ae511939c4703fd03d7497e662578967d3a2cdbec79b2265f8204a570bd032abc48246670656202b2e48292e382d9ec40cde6009abe5297fa5df28d2472d7e4a6788a740b271349e!
 49a73113a1942d5e52a34bdde8cc4b5264ca82e4003a0a9087dd08580b513753b6a91b89c80799d39354ce46c442b2d29fd545656d6bfaf4411cb22c56aff92910f8c77094fc82f23956227635bc9f29dade455d27944e4f81d5da2deefebd57b7efaaed0d1de21a2fa6191f1edd8e721c364e513ad7a3ed0caf12e912718f34d9fd0fb09e91ea1535f6fdf1b24977556b0e2fb01b2d57e4a96e4ad96b5b950563702920fea9b0d505511d54b8aa368928a5071d201557541969b909b2d031200b820cbcd50b52640f2016800f4bc4055c5ee30a3e9bb84e6c5c44c23806628ab9ba0429f67ca81e1275c883f24628c1123422743addb3ebd6df74a712d999462e62956fb2553b11ec54febd55d2fb9639fd89f9d4749f692958f3a395d4d9657db39dd25649e206b76bac96eb2e609837bc86eb272671a3f4dd6ec6ee574b7f0ac92f6d4ee73eec07efbe3f36282e81fcc044f0497ec05bfd60d11c5ca0d905c671445366db4e442911b002900b3a94ef400732ad0f89ae8014e4cf9a04e3440551d9065fd945b7200684e8d274b4da90c51967d50e406a8520013d7eaa06a3ecca80d18b9e482aae115559d28575f69b9d27aacf57cc3171aacc618a15321543d5cf5a5acacac63bf0eb62553fe666ec8dfecbe5cb84defecf4eb75fd18e93caa77838f8a1dc0ded2430e93f5f!
 b5b85a7ec169da2fa3d1e32a2bf1f250f1cf4ebfd01510bd4ec1631217fb39!
 3f99b382
26f709a8cf919e3773277878ef68ee34b7dfedfc81da182cd34436e7e5ec969fa98d91c8029af0ed939219872aa00298226a9145e44d02895c28b281aa522783551d579d5081a518a662d0ca002aa16860315706821a86a1592d702b872ad0ef14433a02198b8a23e3af1cac1d4fd21f761f7379bfeb6e91b861c3a154255b2ea675975590ffe26b01994a5bfee04701780df03a000780f80b5003e20cbca038565f6ef957751abd9e31799dd5161154fdb00393bd72d36fafafe76c15b0303fa4992c801dcc7c439c3dea783e469b2a4daf38ba1321e06f07e002600f702580d40e6245f4a658c7a7ee16ff3c76f36701380f701b80fc087007c04c043003e61ca2ffc42f976777fcd1e3fe9d5c1910c9e16c94ce63d82d459a2feb921ef3d1864cd6e6a25db9c3d8aa9e01100e5004a0114eb736ed8bb67efe783ddc1795b61b03b48b6f1d7ee0b1ac0efd0c1df099198ca00eec19cf5df07e08300ac003eac2be19300aaf337947fb572a733c47e4eda8f08cbfabbf48c2e3cdf138c5ac17dac8fbc48d6eff38f4fb733685a5bf855009f01f069000f03f8737d8e8f9614976cf1fbfcff930edec818fd017fdb7280be9312d2ff36e474a548fa6b158497dca3bfb201dc0549964b36d5dc6f5e5ff027169363bd2c77bec79553bbdaa185204b5550b5105c6ad5ff364cf8ae4e!
 5c89c746ce475e19b970661400f5b934fd751dc02c80d9426b614ee3fec6a30df50def37324923338c9c89a0f472e92359bbb2ba00bc05e0572b55403a65364e0cefc87c194a90d35ed900eed6ff5e95a6bc3bf5dfa42bf69de83aab797fe78ecebfaedd5e3b974fbf01600d8073001ec46bb96b724b26ae4d4c4228ec57781b25484b9c78a1018cf70ce564e913aa007e8139b046ec9031a788bbd2b8a18cb7558269ad2927b127b12b521ef98bda92b9f38f6452d416d17351143d5804c7df390e4e5c9b786b89b86e09194174158437ac8688e22600f900364004b5620025003e0e600b80ad003ea528ca670fec3ff04392c954356950c64d92d663adff04b1532810ca363cec5d457760e1add402e07e88805a685a6b2a731e74fe43f044709c24a78d2ba77ac91c8b89ec6720aadf30f1b59e82d895fe501fdb5862ef0e1abacab595013e4ef2597b98a1e951de07200773deb00e80855ddcea69f1fc90e464ea8c703a831bf70574cb7bbc9e008002007f04e161abb0b0f56f9d37282d540abdacae0cd06327473af4870eea079e3d31be49b209c09a425be17dce43ceaf33c09706fa8545a727a7e7f1f1abc65da4a174cbabce434ea70efebd007e1fc2bb8ca09c49375101c394951696c5c6e92a6fe34b24afbb8dbadfb058e6c56991bbbf1a3c4d354dbe91a76e8ae8!
 794484e42c476aaa6b6a20968d19c2f28b81cfdcc67fb3a4b430afb28d6fee!
 20597f82
ac2759df4dda49060df08bd0b8ae9421fd3ee0f4b89129ea37472fc6e6810f9e084ef210bf25cbf287017c002286e4e0edddfee6810700d3113e49921dfa29ee80be76fdfa19c14066f43628f37da3076858dab81728dcfe97ee16f7bf156c282807b0112266dc0bb1b3484b007ff31450d3c66047b758bbf6f07ccbc6321aa08632068617d6ca98eef67d91be94c5dd87ddff52585cf830c476f9c710917e35c456979e502d04da48da6e0e9946b9da7e82331c243d87f78a87be381f9421b71a373d8ccf67e77fcf903d019263fcef03fb0e3815457908800da2e6782f805cccb7fa6d016f243792e9f0f4e324b977ff019235f407f69247c98ea870811e3d80f5e837496f00ad53df584a49c9c24de59f06f02080428844691d803f80a831eec27c977f3bf0378db22082cedd9ce4494f5b5044ec5e2749d2ddee2663a447bfd1d1b7d8ff0a5d9def213aef00f0a73af0f701c8d381dfbd08f05b0ede98f04e007717b48cefab3cc2dea15ee704498ef7db49ba19ecb693de4ada0f8a16b651e71bff2394f28c0c5ef3b4ffb31029721e44744f07be58f174cb80a79351fddd0de01e92aff3a288018c0a4f18e87292a3a4fb98deb4c8b8f76f804e8b1131886dcd08700badf37715a59682e7e9c23564cd710ed6ab243916719274d279c8491e257bfac716046d24499e08fb0!
 f900fe3c66ded5d093c9d8c482b6202a71fe3f08eeba41e1306c9d62efd442803bc7f90d74906eb7d439f84d140593c8dfdada12cb2d2321dad3943d6cf1c38d29a24c99ee1e9748bcfb823fc763d793f7ecbacbd6422cb7378ac3c8fe43f1bf7fc3cfd4c90fc46fd09deba7f70b8ddb4a38bf9247f74e03477951fe2523b50bfa3dfd12da2ff03f24d90541ff67f080000000049454e44ae426082</data>
     </image>
 </images>
 <connections>
@@ -868,6 +868,7 @@
     <variable access="private">QString username;</variable>
     <variable access="private">int firstUpdate;</variable>
     <variable access="private">KPopupMenu *popup;</variable>
+    <variable access="private">QString DevsUp[100];</variable>
 </variables>
 <signals>
     <signal>changed(bool)</signal>
@@ -912,6 +913,7 @@
     <function access="private">updatePPPconf()</function>
     <function access="private">disablePPPOEConfig()</function>
     <function>setNotRoot()</function>
+    <function access="private" returnType="QString">getUpStatusForIdent( QString ident )</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

Modified: pcbsd/trunk/NetworkManager/networkman.ui.h
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui.h	2007-03-13 18:06:45 UTC (rev 132)
+++ pcbsd/trunk/NetworkManager/networkman.ui.h	2007-03-13 19:18:01 UTC (rev 133)
@@ -674,6 +674,7 @@
 	
 	              DevsIP[i] = getIpForIdent(Devs[i]);
 		DevsStatus[i] = getStatusForIdent(Devs[i]);
+		DevsUp[i] = getUpStatusForIdent(Devs[i]);
 		DevsNetmask[i] = getNetmaskForIdent(Devs[i]);
 		
 		if ( firstUpdate == 0) {
@@ -686,7 +687,7 @@
 		    
 		    
 		    // If we are using a Wireless device
-		    if ( DevsStatus[i] == "associated" )
+		    if ( DevsStatus[i] == "associated" && DevsUp[i] == "UP" )
 		    {
 		       QImage *Icon = new QImage("/PCBSD/networkmanager/pics/network_wifi.png");
 		       QPixmap PixmapIcon;
@@ -719,7 +720,7 @@
 		 } else {
 		   // If we are looking at a regular Ethernet device  
 		     
-		      if ( DevsStatus[i] == "active" || DevsStatus[i] == "" )
+		      if ( (DevsStatus[i] == "active" || DevsStatus[i] == "") && DevsUp[i] == "UP" )
 		    {
 		       QImage *Icon = new QImage("/PCBSD/networkmanager/pics/network_local.png");
 		       QPixmap PixmapIcon;
@@ -1100,9 +1101,12 @@
 	  // If we are running as root
 	  if ( getuid() == 0 )
 	  {
-	  //popup->insertSeparator();
-	  //popup->insertItem( tr("Enable device"), this, SLOT(slotEnableDevice()));
-	  //popup->insertItem( tr("Disable device"), this, SLOT(slotDisableDevice()));
+	  popup->insertSeparator();
+	  if ( DevsUp[currentItem] == "DOWN" ) {
+	    popup->insertItem( tr("Enable device"), this, SLOT(slotEnableDevice()));
+                } else {
+	    popup->insertItem( tr("Disable device"), this, SLOT(slotDisableDevice()));
+                }
                 popup->insertSeparator();
                 popup->insertItem( tr("Restart the Network"), this, SLOT(restartNetwork()));
 	  }
@@ -1208,3 +1212,20 @@
     
     
 }
+
+
+QString NetworkMan::getUpStatusForIdent( QString ident )
+{
+        	QString command = "ifconfig " +ident + " | grep \"flags=\"";
+	QString inputLine = getLineFromCommandOutput(command);
+	QString status = "";
+	
+	if (inputLine != "" && inputLine.find("<UP") != -1){
+	    status = "UP";
+	} else {
+	    status = "DOWN";  
+	}
+	
+	return status;
+    
+}

Modified: pcbsd/trunk/NetworkTray/NetworkTray.cpp
===================================================================
--- pcbsd/trunk/NetworkTray/NetworkTray.cpp	2007-03-13 18:06:45 UTC (rev 132)
+++ pcbsd/trunk/NetworkTray/NetworkTray.cpp	2007-03-13 19:18:01 UTC (rev 133)
@@ -29,6 +29,7 @@
 int 	DeviceSavedStrength = 0;
 QString DeviceWirelessSpeed = "";
 QString DeviceStatus;
+QString DeviceUpStatus;
 QString DeviceIdent;
 QString DeviceNetmask;
 QString username;
@@ -54,20 +55,21 @@
     DeviceStatus = getStatusForIdent( DeviceName );
     DeviceIdent = getNameForIdent( DeviceName );
     DeviceNetmask = getNetmaskForIdent( DeviceName );
+    DeviceUpStatus = getUpStatusForIdent( DeviceName );
 
 //QMessageBox::information( this, "Application name",  "IP: " );
 
 
     if ( Type == "Ethernet" )
     {
-        if ( DeviceStatus == "active" || DeviceStatus == "" )
+        if ( (DeviceStatus == "active" || DeviceStatus == "") && DeviceUpStatus == "UP" )
         {
 	   Icon.load("/PCBSD/networkmanager/pics/tray_local.png");
 	} else {
     	   Icon.load("/PCBSD/networkmanager/pics/tray_local_dis.png");
         }
     } else {
-        if ( DeviceStatus == "associated" )
+        if ( DeviceStatus == "associated" && DeviceUpStatus == "UP" )
         {
 	   Icon.load("/PCBSD/networkmanager/pics/tray_wifi.png");
 	} else {
@@ -362,7 +364,7 @@
    		tooltipStr += "<br>" + tr("IP:") + " " + DeviceIP;
 		tooltipStr += "<br>" + tr("Netmask:") + " " + DeviceNetmask;
 		tooltipStr += "<br>" + tr("MAC:") + " " + DeviceMAC;
-   		tooltipStr += "<br>" + tr("Status:") + " " + DeviceStatus;
+   		tooltipStr += "<br>" + tr("Status:") + " " + DeviceUpStatus;
 	    } else {
    		tooltipStr += "<br>" + tr("MAC:") + " " + DeviceMAC;
    		tooltipStr += "<br>" + tr("Status:") + " " + DeviceStatus;
@@ -409,8 +411,42 @@
     close(0);
   }
 
+  // Get the device up status
+  tmp = getUpStatusForIdent( DeviceName );
+  if ( DeviceUpStatus != tmp )
+  {
+     NotifyText+="Link status changed to: " + tmp + "<br>";
 
+     if ( DeviceType == "Ethernet" )
+     {
+         if ( (DeviceStatus == "active" || DeviceStatus == "")  && tmp == "UP") {
+            Icon.load("/PCBSD/networkmanager/pics/tray_local.png");
+         } else {
+            Icon.load("/PCBSD/networkmanager/pics/tray_local_dis.png");
+	 }
 
+     } else {
+         if ( DeviceStatus == "associated" && tmp == "UP" ) {
+          Icon.load("/PCBSD/networkmanager/pics/tray_wifi.png");
+	 } else {
+          Icon.load("/PCBSD/networkmanager/pics/tray_wifi_dis.png");
+
+         }
+     }
+
+     
+     QPixmap PixmapIcon;
+     PixmapIcon.convertFromImage(Icon.scale(22,22));
+     setPixmap(PixmapIcon);
+
+
+     // Save the status as the new status now
+     DeviceUpStatus = tmp;
+     updateTooltip = 1;
+     displayPassivePopup = 1;
+  }
+
+
   // First check the status of the device
   tmp = getStatusForIdent(DeviceName);
   if ( DeviceStatus != tmp )
@@ -419,14 +455,14 @@
 
        if ( DeviceType == "Ethernet" )
        {
-            if ( tmp == "active" || tmp == "" ) {
+            if ( (tmp == "active" || tmp == "")  && DeviceUpStatus == "UP") {
              Icon.load("/PCBSD/networkmanager/pics/tray_local.png");
 	    } else {
              Icon.load("/PCBSD/networkmanager/pics/tray_local_dis.png");
 	    }
 
        } else {
-            if ( tmp == "associated" ) {
+            if ( tmp == "associated" && DeviceUpStatus == "UP" ) {
              Icon.load("/PCBSD/networkmanager/pics/tray_wifi.png");
 	    } else {
              Icon.load("/PCBSD/networkmanager/pics/tray_wifi_dis.png");
@@ -651,3 +687,19 @@
 
 }
 
+QString NetworkTray::getUpStatusForIdent( QString ident )
+{
+        	QString command = "ifconfig " +ident + " | grep \"flags=\"";
+	QString inputLine = getLineFromCommandOutput(command);
+	QString status = "";
+	
+	if (inputLine != "" && inputLine.find("<UP") != -1){
+	    status = "UP";
+	} else {
+	    status = "DOWN";  
+	}
+	
+	return status;
+    
+}
+

Modified: pcbsd/trunk/NetworkTray/NetworkTray.h
===================================================================
--- pcbsd/trunk/NetworkTray/NetworkTray.h	2007-03-13 18:06:45 UTC (rev 132)
+++ pcbsd/trunk/NetworkTray/NetworkTray.h	2007-03-13 19:18:01 UTC (rev 133)
@@ -40,5 +40,6 @@
    QString getSignalStrengthForIdent( QString ident );
    QString getWirelessSpeedForIdent( QString ident );
    QString getValue( QString File, QString Key, int occur );
+   QString getUpStatusForIdent( QString ident );
 
 };

Modified: pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp
===================================================================
--- pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp	2007-03-13 18:06:45 UTC (rev 132)
+++ pcbsd/trunk/ethernetconfig/src/ethernetconfigwidget.cpp	2007-03-13 19:18:01 UTC (rev 133)
@@ -160,6 +160,10 @@
 
     runCommand("/etc/rc.d/netif restart &");
     runCommand("/etc/rc.d/routing restart &");
+     if ( checkDHCP->isChecked() )
+    {
+         runCommand("dhclient " + DeviceName + " &");
+    }
 
 }
 

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/defaulticon.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/defaulticon.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/info.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/info.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_local.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_local.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_local_dis.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_local_dis.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_wifi.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_wifi.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_wifi_dis.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/network_wifi_dis.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_local.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_local.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_local_dis.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_local_dis.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi30.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi30.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi60.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi60.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi85.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi85.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi_dis.png


Property changes on: pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/tray_wifi_dis.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream



More information about the Commits mailing list