From 4b36ef9c549535bacaf4682818b39f1a7d9eeae2 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Fri, 18 Sep 2009 02:05:29 +0000 Subject: [PATCH] Now showing icons, as advertized long ago in the screenshot taken in 2004 :-) Vector icons welcomed ! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33162 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kits/net/preflet/NetworkSetupAddOn.cpp | 7 +- .../kits/net/preflet/StatusAddOn/Icons.rdef | 70 ++++++++++++++++++ .../StatusAddOn/InterfaceStatusItem.cpp | 8 +- .../kits/net/preflet/StatusAddOn/Jamfile | 12 ++- .../net/preflet/StatusAddOn/Resource.rsrc | Bin 4077 -> 0 bytes 5 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 src/tests/kits/net/preflet/StatusAddOn/Icons.rdef delete mode 100644 src/tests/kits/net/preflet/StatusAddOn/Resource.rsrc diff --git a/src/tests/kits/net/preflet/NetworkSetupAddOn.cpp b/src/tests/kits/net/preflet/NetworkSetupAddOn.cpp index 2f195be903..ce30d3678a 100644 --- a/src/tests/kits/net/preflet/NetworkSetupAddOn.cpp +++ b/src/tests/kits/net/preflet/NetworkSetupAddOn.cpp @@ -1,9 +1,12 @@ -#include + +#include "NetworkSetupAddOn.h" #include #include -#include "NetworkSetupAddOn.h" +#include +#include + NetworkSetupAddOn::NetworkSetupAddOn(image_id image) : diff --git a/src/tests/kits/net/preflet/StatusAddOn/Icons.rdef b/src/tests/kits/net/preflet/StatusAddOn/Icons.rdef new file mode 100644 index 0000000000..244469d65e --- /dev/null +++ b/src/tests/kits/net/preflet/StatusAddOn/Icons.rdef @@ -0,0 +1,70 @@ + +resource(0, "loop") #'ICON' array { + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFF008C8C8C00FFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFF008C8C8C8CD3000EFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFF008C8C8C8CD3D3000E0EFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFF008C8C8C8CD3D3D3000E0EFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFF008C8C8C8CD3D3D3000E0EFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFF008C8C8C8CD3D3D3000E0EFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFF008C8C8C8CD3D3D3000E0EFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFF008C8C8C8CD3D3D3000E0EFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFF008C8C8C8CD3D3D3000E0EFFFF0000000000000000000002FFFF" + $"FFFFFFFFFF008C8C8C8CD3D3D3000E0EFFFFFF003F8C8C8C8C8C8C8C8C00FFFF" + $"FFFFFFFF008C8C8C8CD3D3D3000E0EFFFFFFFF00663F8C8C8C8C8C8C8C000E0E" + $"FFFFFF008C8C8C8CD3D3D5000E0EFFFFFFFFFF006666008C8C8C8C8C8C000E0E" + $"FFFF008C8C8C8C00D5D5000E0EFFFFFFFFFFFFFF00008C8C8C8C3F8C8C000E0E" + $"FFFF003F8C8C8C8C00000E0EFFFFFFFFFFFFFFFF008C8C8C8CD3663F8C000E0E" + $"FFFF00663F8C8C8C8C000EFFFFFFFFFFFFFFFF008C8C8C8CD3D366663F000E0E" + $"FFFF0066663F8C8C8C8C00FFFFFFFFFFFFFF008C8C8C8CD3D3D3006666290E0E" + $"FFFFFF0066663F8C8C8C8C00FFFFFFFFFF008C8C8C8CD3D3D3000E0066290E0E" + $"FFFFFFFF0066663F8C8C8C8C00FFFFFF008C8C8C8CD3D3D3000E0EFF00000E0E" + $"FFFFFFFFFF0066663F8C8C8C8C00FF008C8C8C8CD3D3D3000E0EFFFFFFFFFFFF" + $"FFFFFFFFFFFF0066663F8C8C8C8C008C8C8C8CD3D3D3000E0EFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFF0066663F8C8C8C8C8C8C8CD3D3D3000E0EFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFF0066663F8C8C8C8C8CD3D3D3000E0EFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFF0066663F8C8C8CD3D3D3000E0EFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFF0066663F8CD3D3D3000E0EFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFF006666D3D3D3000E0EFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFF0066D3D3000E0EFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFF0000000E0EFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" +}; + +resource(1, "generic_device") #'ICON' array { + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF00370000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF003737370000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF0037FA3737370000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF0037FA37FA3737370000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF00370037FA37733737370000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF003700000037FAFA373737370000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF0037FA370037FA37FAFA373737370000FFFFFFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF0037FA37FA37FA0037FA3700373737370000FFFFFFFFFFFFFFFFFFFFFF" + $"FFFFFF003721FAFA37FA0000FA370000FA373737370000FFFFFFFFFFFFFFFFFF" + $"FFFFFF003737FA3737FA3700FA373700FA37FAFA37373700000908FFFFFFFFFF" + $"FFFFFF0037FAFA37FAFA2137FA37FAFAFA37FA37FAFA3737091B1B08FFFFFFFF" + $"FFFFFF0037FA37FA37373721FA37FA37FA37FA3737FA37091B1B08FFFFFFFFFF" + $"FFFFFF003737C4C437FAFA373737FA37C437FA373721081B1B0929FFFFFFFFFF" + $"FFFFFF0037FA37C4FAFA0037FA37FA37C4C4FAFA37370808081601FFFFFFFFFF" + $"FFFFFF0037FA37FA37FA37FA373737FA37C43737FAFA0816161600FFFFFFFFFF" + $"FFFFFF00377373FA37FA37FAC437FA37FAFA3737373709160B1601FFFFFFFFFF" + $"FFFFFF0037FA37FA372137FA37C437373737FAFA733709160B1601FFFFFFFFFF" + $"FFFFFF00003737FA37FA21FA3737FA370D373737FAFA0916161601FFFFFFFFFF" + $"FFFFFF0D0D00003737FA37FAFA37FAFA0D0D3737373708160B1601FFFFFFFFFF" + $"FFFFFFFFFF0D0D0100373737FA73FA37370DFAFA373707160B1601FFFFFFFFFF" + $"FFFFFFFFFFFFFF0D0D010038FA37FA373737FA37FAFA0816161600FFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFF0D0D010038FA37FA37FA3737370916161601FFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFF0D0D010037FA37FA37C4370716161600FFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFF0D0D000037FA0000370816161600FFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0D0D00000DFF000816161600FFFFFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0D0D0DFFFF00161616010D0DFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00161616010D0D0D0DFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0D0016010D0D0D0DFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0D010D0D0D0DFFFFFF" + $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0D0D0DFFFFFFFFFF" +}; diff --git a/src/tests/kits/net/preflet/StatusAddOn/InterfaceStatusItem.cpp b/src/tests/kits/net/preflet/StatusAddOn/InterfaceStatusItem.cpp index 748353942b..c676bd1cee 100644 --- a/src/tests/kits/net/preflet/StatusAddOn/InterfaceStatusItem.cpp +++ b/src/tests/kits/net/preflet/StatusAddOn/InterfaceStatusItem.cpp @@ -134,11 +134,9 @@ InterfaceStatusItem::_InitIcon() BResources *resources = fAddon->Resources(); if (resources) { size_t size; -// printf("Name = %s\n", Name()); -// const void *data = resources->LoadResource('ICON', Name(), &size); -// if (!data) - - const void *data = resources->LoadResource('ICON', "generic_device", &size); + const void *data = resources->LoadResource('ICON', Name(), &size); + if (!data) + data = resources->LoadResource('ICON', "generic_device", &size); if (data) { // Now build the bitmap diff --git a/src/tests/kits/net/preflet/StatusAddOn/Jamfile b/src/tests/kits/net/preflet/StatusAddOn/Jamfile index 682d2e5487..aa4699c2fc 100644 --- a/src/tests/kits/net/preflet/StatusAddOn/Jamfile +++ b/src/tests/kits/net/preflet/StatusAddOn/Jamfile @@ -5,14 +5,20 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ; UsePrivateHeaders shared ; +AddResources Overview : + Icons.rdef +; + Addon Overview : NetworkStatusAddOn.cpp InterfaceStatusItem.cpp Setting.cpp NetworkWindow.cpp EthernetSettingsView.cpp - - : be NetworkSetup $(HAIKU_NETWORK_LIBS) $(TARGET_LIBSTDC++) + : + be + NetworkSetup + $(HAIKU_NETWORK_LIBS) + $(TARGET_LIBSTDC++) ; -AddResources Overview : Resource.rsrc ; diff --git a/src/tests/kits/net/preflet/StatusAddOn/Resource.rsrc b/src/tests/kits/net/preflet/StatusAddOn/Resource.rsrc deleted file mode 100644 index a56d3c97a8b63822c65be8b4bba59c38675987ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4077 zcmeHKyKWOf6ul0J>?)dsY8zK6qcn7r2Bjbk1w?`mpa@#GBNUGaH=kG~kq73BVUW*WCM zi#c6maDE^0`b6Y4gsHziMDSc~WPQ}doY`j$lm7npck1ob+vyBUXJ9%5b_V!=>>m!a zbxciGtJMgB@MLN4-+Ds!v7nXN6*GVT+Ju#8z#?wUiCPIuYT=rY};K zI)!|8N@IC!Va(_hL=0CoX|hq03Btv2v+H)n;7wUxMm!RB7gLsJx>KmfER+zlu}czh zET|)N@GOJLVFo2N&hAtc~VVKBRAF(htfB|v;htArw|V!kiqkW zf%Rh+AU^SEAtHI!>>GqRdkRWmq>Ow%ZwTh^;X({Ayn8VE@2g6a03ZM}o6qyJp1!Yw z)(;$!_gR(|vpyb$RRB_1Q55apY4OXY;?&maeO?^x=Ck~Yiw|MBgKGl<$_K?MBZq$L z?;N(rq(g8d_^hvA*Urtr@Bw9b#|jR&absL)Z&YZjep@Fsl!0{A*Yj`spf1#?px;}6 zgVTiv3D1Cj<09f}N#fLS_{q?pL1IKa$#BB-Bn+2vIFCtFCOl07VU|6_w)BTaQOozv!$T`