From 224d5dc603bce22bc8ff0f78faff9560daabdc37 Mon Sep 17 00:00:00 2001 From: Oliver Ruiz Dorantes Date: Sun, 8 Mar 2009 15:15:05 +0000 Subject: [PATCH] - Fixed jamfile and added second version of the icons by Raynald Lesieur git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29441 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/bluetooth/Jamfile | 2 +- src/preferences/bluetooth/bluetooth-pref.rdef | 41 +++++- src/servers/bluetooth/server-bluetooth.rdef | 128 +++++++++++++++++- 3 files changed, 157 insertions(+), 14 deletions(-) diff --git a/src/preferences/bluetooth/Jamfile b/src/preferences/bluetooth/Jamfile index ccce235b2a..68d7857d86 100644 --- a/src/preferences/bluetooth/Jamfile +++ b/src/preferences/bluetooth/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences bluetooth ; UsePrivateHeaders shared ; -AddResources bluetooth-pref : bluetooth-pref.rdef ; +AddResources Bluetooth : bluetooth-pref.rdef ; Preference Bluetooth : BluetoothDeviceView.cpp diff --git a/src/preferences/bluetooth/bluetooth-pref.rdef b/src/preferences/bluetooth/bluetooth-pref.rdef index 01920b803a..8a7f0c333c 100644 --- a/src/preferences/bluetooth/bluetooth-pref.rdef +++ b/src/preferences/bluetooth/bluetooth-pref.rdef @@ -19,10 +19,39 @@ resource app_version { }; resource vector_icon array { - $"6E636966040304489C05FF05FF03000101060A0C3C2450344140504C3C5C3C44" - $"30502C4C39402C3430303C3B0A0C382252364242524F3862384A2C55254F3342" - $"25362C2F383A0A03402D403947330A03402D403947330A0340524047474C0A03" - $"40524047474C060A030101023FAAAA0000000000003FDB6D448000BF6DB60A00" - $"0100000A0301030240DB6D000000000000410000C7ADB6C660000A010102000A" - $"0301050240DB6D000000000000411745C7ADB6C908BA0A02010400" + $"6E6369660D04002B050002000602B4CF7FB1F7E3B1F7E334CF7F4829E74913E4" + $"00345E7EFF18334E02000602B47ACEB14E5DB14E5D347ACE48343A4B0D900034" + $"5E7EFF18334E02000602B9B4FE3411A43411A439B4FE455A904AADAC00D5E0E6" + $"FF4977950200060833CD1D3EEADABEEADA33CD1DC9E2794B99A700FFFFFF1FFA" + $"FBFC46EBF0F36FD3DEE59BB1C5D2C985A4B8F8517D99FF497795020006023A1C" + $"893A7DC23A7DC2BA1C894A67B94610BF00497795FF18334E02000602398A253A" + $"168E3A168EB98A254A57F14A318200345E7EFF18334E02000602B4CFB92CA5D4" + $"2CA5D434CFB949B79149E07500345E7EFF18334E02000602B425ED3250213250" + $"213425ED4968314B78F400345E7EFF18334E020006053B8592B7E9BA37E9BA3B" + $"8592496E6C484DAE00AAC7D62BA2C0D0708BADC1C5668FA8FF49779502000602" + $"B6C5E5B7D554B7D55436C5E5452F84482BB500608DACFF345E7E0317324E110A" + $"08C087C092C8A4BDB3C90BC350C4CDC53CC86BC70EC43BCAC1B92FCC45C346C5" + $"F40612BAAEEBBA0ABD08B305B737B57EB737B652B737B61EB6F6B668B4D4B728" + $"20B856B6B7BF8BB68DBF38B66CBFBBB322C1DBB4F6C566B736C451B6C0C48AB7" + $"36C4EAB737C9F6B92FCC4ABEE3C937BEE3C937BEE7C935C39CC62DC3C5C613C0" + $"3CBF0CC065BF5EC085BEDCC3DFBCACBF02B338BD15200203B99DB97DB99DBA9D" + $"BA85BB3DBB9FBD60BB22BC6EBB5CBD8BB99DBEACBA7EBE1BB99DBC350203B99D" + $"C353B99DC59FBA6CC4E4BB83C700BB44C687BB0AC74EB99DC83ABA7BC7ABB99D" + $"C729060EAEEBE90AB80EB60CB80EBD74B80EB9F9B6BEBAE8B533B7EBB418B8A1" + $"B7D0BFD6B5F6BC3FB60AC0FBB43BC226B556C449B80EC287B6D4C352B80EC5D3" + $"C9A7B963CB39BDB8C86DBA05C142BB86C42CBB98C03EBDD4BECDB963B6320203" + $"B99DB97DB99DBA9DBA85BB3DBB9FBD60BB22BC6EBB5CBD8BB99DBEACBA7EBE1B" + $"B99DBC350203B99DC353B99DC59FBA6CC4E4BB83C700BB44C687BB0AC74EB99D" + $"C83ABA7BC7ABB99DC729060EBEEFEF0FB87FBF39B50AB886B567B93AB4DCB8A3" + $"B4A5B8C7B4CEB8ACB4F6B964B85DBFFBB4C8C24BB550C1F3B4F9C2AAB57FC3AE" + $"B546C340B611C350B87AC1C2B87AC97FB87AC934B89DC9A9B978CAACB92DCA53" + $"B9F6CA5ABD2BC848BCA9C89BBCDAC7AAB979C11DBD47BEA7BCBEBF0039BE0BB9" + $"1EB697B94EB6F5B8F0B692B87AB685B8C4B68DB87AB7570A03B932B7D7BC2BBD" + $"85B932BF710A03B938C194BC0FC726B932C9000A04B963B632BE77B401C2C7BC" + $"62BDD4BECD0A04BA05C142BF25BEC1C2AEC5C6BDB8C86D0A04BA05C142BDD4BE" + $"CDC2C7BC62BF25BEC10A04B963CB39BDB8C86DC2AEC5C6BE77C87C0A04B80EB6" + $"0CB963B632BE77B401BD35B3DC0A03B533B7EBB80EBD74B80EB6EA0A03B556C4" + $"49B80DC2FBB80EC2870D0A000100000A010101000A020102000A030103000A04" + $"03040506000A0503070809000A06010A000A07010B000A08010C000A09010D00" + $"0A0A010E000A0B010F000A0C011000" }; diff --git a/src/servers/bluetooth/server-bluetooth.rdef b/src/servers/bluetooth/server-bluetooth.rdef index a59dec8bf3..9ef93f1093 100644 --- a/src/servers/bluetooth/server-bluetooth.rdef +++ b/src/servers/bluetooth/server-bluetooth.rdef @@ -15,14 +15,128 @@ resource app_version { internal = 0, short_info = "bluetooth_server", - long_info = "bluetooth_server ©2008-2009 Haiku" + long_info = "bluetooth_server ©2007-2009 Haiku" }; resource vector_icon array { - $"6E636966040304489C05FF05FF03000101060A0C3C2450344140504C3C5C3C44" - $"30502C4C39402C3430303C3B0A0C382252364242524F3862384A2C55254F3342" - $"25362C2F383A0A03402D403947330A03402D403947330A0340524047474C0A03" - $"40524047474C060A030101023FAAAA0000000000003FDB6D448000BF6DB60A00" - $"0100000A0301030240DB6D000000000000410000C7ADB6C660000A010102000A" - $"0301050240DB6D000000000000411745C7ADB6C908BA0A02010400" + $"6E6369661E04004C03FFCD9A01CD9966B201CD9966B201CD9966B201CD9966B2" + $"01CD9966B201CD9966B201CD9966B201CD9966B204FFF204FFF204FFF204FFF2" + $"050004FFB201CD9966B204002B050002000602B4144BB0EF93B0EF9334144B49" + $"218A4846E500345E7EFF18334E02000602B3AB2EB07229B0722933AB2E492931" + $"4A423200345E7EFF18334E02000602B8BE0B330FA0330FA038BE0B48269249F6" + $"8200D5E0E6FF4977950200060832CFE93E2883BE288332CFE9C6AFCD4AA9D400" + $"FFFFFF1FFAFBFC46EBF0F36FD3DEE59BB1C5D2C985A4B8F8517D99FF49779502" + $"000602391FC739AF9F39AF9FB91FC74A8B67450E4B00497795FF18334E020006" + $"02389E5D3916ED3916EDB89E5D4A7FB9493ED000345E7EFF18334E02000602B4" + $"14732BEB2D2BEB2D3414734A23DF48DE3500345E7EFF18334E02000602B32DAD" + $"316C1A316C1A332DAD4A06834A91A300345E7EFF18334E020006053A9AF6B6E5" + $"0F36E50F3A9AF64A08D247688500AAC7D62BA2C0D0708BADC1C5668FA8FF4977" + $"9502000602B60D2DB6D5FBB6D5FB360D2D481E9B47363800608DACFF345E7E03" + $"17324E23021CCAD8BDFCCAEDBDBDCAD8BDFCCA54BEE5CA54BEE5CA54BEE5CA25" + $"BF73CA25BF73CA3CBFE4CA18C065CA18C027CA18C0B3C9C5C159CA0043C95CC2" + $"11C56AC615C67CC502C56AC615BFFBCB62BFFBCB62BF29CC43BDA5CC43BE36CC" + $"68BD52CC2FBD08CBCABD17CC02BCF7CB8ABCC3CAC7BC6ECB1ABC23CB8BBA7ACB" + $"8BBB25CBAAB9EDCB71B8C4CA83B8DFCAD4B8BFCA74B8BBCA50B8BBCA50B7A4CB" + $"41B5DECA8AB657CB0DB5BCCA66B52BC9E9B52BCA13B52BC9B4B603C8ABB603C8" + $"ABB59AC914BCA5BF6EBCA5BF6EBCA5BF6EBD12BE3FBD12BE3FBD12BD6EBBC9BD" + $"55BC34BD5DBBC9BD55B813BE34B813BE34B7BFBE34B757BDF2B780BE1EB72A3B" + $"B721BD57B721BD83B721BCB7B834BC05B796BC05B834BC05C4FBBAD8C4FBBAD8" + $"C4FBBAD8C502BAD2C502BAD2C508BACCC67BBA87C58FBA5557BB0ACADBBC8ACA" + $"63BBB8CAFABCC1CB05BD2ACB05BCF7CB05BD760617EBFFBEFFBE3FC5DEB918CB" + $"B1BA52C4C9B8DDC429B973C2DDBA19C1B3B9B6C23CB9B0C1B3B9B6B7BCB9B6B7" + $"BCB9B6B64FB9B6B79BBC6DB5AABC6DB79BBC6DBB19BC6DBB19BC6DBBA2BC78BC" + $"22BD13BC22BC8EBC22BD13BBBFBE1CB3B9C5E0B3B9C5E0B24CC74DB588C7B0B4" + $"90C8A8B588C7B0B58EC7B1B525C813B525C813B3B9C980B841C953B650CB02B8" + $"41C953B897C8FAB897C8FAB7B0CA8CBC48C9CCBAEECB75BC48C9CCBC8FC987BC" + $"96C989BC96C989BAF0CB25BF80CA68BDB0CC59BF80CA68C4EFC519C956C04FC8" + $"D1C137C9DABF67C977BDDAC9B9BF25C977BDDACA5FBD13CA5FBD13CAA5BC3006" + $"09DFFB03C2D1BA5DC2D1BA5DC30ABA68C447BB85C447BAFAC447BB85BBD2C493" + $"BBCAC493BBCAC61ABBA1C885BD7FC885BC25C885BD7FC85ABC67C8B8BC65C8B8" + $"BC65C812BB65C49EBB71C62935C458BA95C2E9B9D5C30EB9DCC2E9B9D50608BE" + $"BFB736BBE1BC6CBB99BC6CBB99BD5DBD12BFE8BCCEBDE6BD79C191BC40C2B9BC" + $"22C02DBDE0C162BD57BEF8BE69BB7CBEAEBD7FBE8CBB99BDBFBBE3BC89BCADBC" + $"A4B96FBC34B79BBC6D0609FEBF03BFC6C3C6C04FC4B6C094C44FC00BC51DBE08" + $"C6B8BE2AC62FBD3AC742BC28C8DDBC6CC854BBE3C967B9E1C9ABBA6AC9ABB957" + $"C9ABB9BECA9BB935CA9BBA47CA9BBC48C9CCBB9BCA76BC48C9CCC0FBC51DC20D" + $"C4B6C1A6C471C162C4710609FEBF03BBC1C2F8BC4AC3E8BC8FC381BC06C44FBA" + $"03C5EBBA25C561B935C674B823C80FB867C786B7DEC899B5DBC8DDB665C8DDB5" + $"52C8DDB5B9C9CDB53BC997B686CA27B843C8FEB795C9A8B843C8FE39C44FBE08" + $"C3E8BDA1C3A3BD5DC3A30609FEBF03BA03C0F5BA8CC1E5BAD1C17EBA48C24CB8" + $"45C3E8B867C35FB777C471B665C60DB6A9C584B620C696B41DC6DBB518C754B3" + $"A2C69FB3FBC7CBB372C7CBB484C7CBB685C6FCB5D7C7A6B685C6FCBB38C24CBC" + $"4AC1E5BBE3C1A1BB9FC1A10205BCB1BF15BCB1BF15BDA1BF37C02DC06CBFA4C0" + $"05C0B6C0D3C320C1A1C2DBC0D3C252C118C072C118C166C173BF5FC0B1BDE6C0" + $"27BE6FC06CBD5DBFE30202BD7FBE8CBEF8BF7CBEB4BE8CC320BD9BC252BE47C1" + $"EBBED00203C02DC1C3C094C1E5C162C208C2B9C22AC252C1E5C320C26FC342C3" + $"1AC342C31AC274C2B30608FFAAB3FDC6A9B3C6C655B46DC671B583C544B54BC5" + $"B3B5BBC4D4B67FC42CB5F3C480B70AC3D9B8ADC251B876C2C1B8E5C1E2B9A9C1" + $"1EBA4EC0CCBB0EBF19B418C5B40608FFAAB5B3C8A1B57BC84DB622C869B738C7" + $"3BB700C7ABB770C6CCB834C624B7A8C678B8C0C5D0BA63C449BA2BC4B9BA9BC3" + $"D935C315BC5BC2E6BB96C21AB5CDC7AB0608FFEAB91AC994B89EC923B98AC95C" + $"BAA0C82FBA68C89EBAD7C7BFBB9BC717BB0FC76BBC04C6D8BD6FC5AABCEAC62C" + $"BD9BC57FBD29C5AABB94C6DCBB06C6D8B934C89FB934C89FB934C89E0606FF0E" + $"BCCECA7BBBDBCA48BD3ECA43BE54C915BE1CC985BE8CC8A6BF4FC7FEBEC4C852" + $"BFACC7C6C0F1C6BFC06BC739C135C681BFE1C6A0BCE8C985BCE8C985BCE9C985" + $"021ECAE4BBFECAE4BC60CAE4BBB6CAA7BB1ACAD4BB6ACA19BA21C5ECB8D5C88D" + $"B963C4D1B899C404B939C425B91DC3FBB93EC2E0B9CBC315B9B1C2A4B9AAC1B0" + $"B971C226B96CC1B0B971B7BCB971B7BCB971B6C9B971B61FBB4CB61FBA6BB61F" + $"BBAFB67BBC45B63FBC05B6A9BC77B79BBCB2B701BCB2B79BBCB2BB19BCB2BB19" + $"BCB2BBB5BCBEBBDCBD0BBBD8BCDABBD2BD26BB84BDF5BB8DBDDDBB6EBE0BB389" + $"C5AFB389C5AFB325C61220C6CF20C67620C730B368C7C0B32CC785B3B9C811B4" + $"A9C84623C843B45FC8C6B4CEC9BCB46A58B57DCA78B82FC9B5B6F6CA98B832C9" + $"C2B838C9DAB835C9CFB865CA5EB9B6CAE6B8F3CAC2BA4FCB02BBD1CA8BBB20CA" + $"F3BBD1CAA0BBD9CAC2BBD5CAB3BBF5CB2CBCD8CB9DBC53CB7BBD8ECBCABFB2CA" + $"97BEBACBA0BFB0CA99C51FC54AC51FC54AC548C521C991C071C90AC15FC9DBBF" + $"F1C9F5BF39C9F5BF9AC9F5BEECC9CCBE25C9E4BE98C9CCBE25CA9ABD3BCA9ABD" + $"3BCA9ABD3B0635FBFFBFFABFAFFEBFEAEFFFBFFE03CA2DBCD0CA42BC92CA2DBC" + $"D0C92CBDC0C946BE41C946BE41C95DBEB2C96DBF3AC96DBEFBC96DBF88C91AC0" + $"2DC955BFC6C8B1C0E5C4BFC4E9C5D1C3D6C4BFC4E9BF50CA37BF50CA37BE7ECB" + $"17BCFACB18BD8BCB3CBCA6CB03BC5DCA9EBC6CCAD6BC4BCA5EBCC6C9BABC71CA" + $"0DBCC6C9BABCC1C9B5BCC1C9B5BDCEC8B0C1A7C4F0C0A9C4C1C0DEC4F5BC18C9" + $"9BBC18C99BBB78CA5FB9CFCA5FBA7ACA7EB942CA45B8BBC9AEB8D6CA00B8B6C9" + $"A0B8B3C982B8B3C991B8B3C961B8CFC923B8BFC941B918C8D5B971C878B96CC8" + $"72B96CC872BA5CC788BD6BC490BCCCC52BBD83C479BE02C440BCF5C3CDBD0AC4" + $"2FB8A9C871B8A9C871B88BC891B863C8CDB875C8AFB863C8CDB810C924B810C9" + $"24B6F9CA16B533C95FB5ACC9E1B511C93BB501C8EBB501C913B501C8B5B556C8" + $"44B51DC87CB556C844BB8AC272BB01C1B3BADBC273B55CC784B558C780B558C7" + $"80B4EFC7E8B3C9C760B42FC7C5B369C6FFB3E9C611B375C685B3E9C611BBFABE" + $"43BC67BD13BC67BD13BC67BC42BB1EBC29BB89BC31BB1EBC29B79BBC29B79BBC" + $"29B747BC29B6DFBBE7B708BC13B6B2BBB7B6A9BB4CB6A9BB78B6A9BAACB7BCB9" + $"FAB71EB9FAB7BCB9FAC1B3B9FAC1B3B9FAC214B9F6C2B8BA53C290BA39C2B8BA" + $"53C2D9BA68C450B9ACC457B9A6C457B9A6C45DB9A1C5D0B95BC4E4B929C83FB9" + $"DECA3035C9B8BA8CCA4FBB95CA5ABBFECA5ABBCBCA5ABC4B0207C314BD34C3B9" + $"BC52C38CBCCAC46EBBF8C3BABC16C523BBD9C7E7BC7FC714BBACC741BC7FC5F6" + $"BDD9C605BD52C5E7BE61C55FBE16C59BBE43C523BDE9C4F6BD16C4F6BD61C4F6" + $"BCCAC5C9BC52C55FBC61C4B9BC700610FFABBAFFC977BDDAC977BDDACA5FBD13" + $"C94ABA64CB6FBB32C9B1BB32C85ABC67C8E3BC67C85ABCF0C76AC005C8E3BE47" + $"C71AC064C68BC109C6D0C0BAC533C13DC347C0E549C2D0C32CC2BDC32BC432BF" + $"A5C6A5C1BAC6B8C1BAC6B8C0DFC7A2BFE9C899BDA1CA9BBE2BCA9BBD18CA9BBD" + $"18CB47BC6DCB47BDC4CB47C140C899BEF8CAE0C387C651C9B1BF37C98FC0D3C9" + $"D3BD9B0A08C20DBD13C8EEBAA4C96FBEAFC536C086C886C20BC50BC4C0BC7EC5" + $"83C415C10E0612BAAEEBBA0ABF4DB304BAFFB4D8BAFFB574BAFFB54EBACFB585" + $"B93BB613B7E0B6F3BAA0BC47BA81BC0ABA69BC6BB7FABDFDB954C09CBAFEBFD0" + $"BAA7BFF9BAFEC040BAFFC3FCBC74C5B5C0ACC36FC0ACC36FC0AFC36EC42BC12F" + $"C449C11CC1ABBBE9C1C9BC26C1E1BBC6C45CBA27C0C3B32ABF56200203BCC5B7" + $"CDBCC5B8A2BD70B918BE41BAADBDE5B9FABE10BACCBCC5BBA2BD6BBB37BCC5B9" + $"D00203BCC5BF14BCC5C0C6BD5EC03CBE2DC1CCBDFEC172BDD3C206BCC5C2B4BD" + $"69C24ABCC5C1EA060EAEEBE90ABB9EB541BB9EBABBBB9EB828BAA5B8D9B981B6" + $"A3B8B0B72ABB70BC7EBA12B9D7BA20BD57B8CABE35B99BBFC9BB9EBE7DBAB6BF" + $"13BB9EC0EDC3C2BC9AC4ECBFCEC2DABD12BD8CBE2FBFB4BE3CBCCCBFE3BBBBBC" + $"9AB55D0203BCC5B7CDBCC5B8A2BD70B918BE41BAADBDE5B9FABE10BACCBCC5BB" + $"A2BD6BBB37BCC5B9D00203BCC5BF14BCC5C0C6BD5EC03CBE2DC1CCBDFEC172BD" + $"D3C206BCC5C2B4BD69C24ABCC5C1EA060EBEEFEF0FBBF2BC0AB963B716B9A8B7" + $"9BB941B72CB918B746B937B732B954B7BABBD8BC9AB932BE50B997BE0FB956BE" + $"96B9B9BF57B98FBF05BA26BF11BBEEBDEABBEEC3A4BBEEC36DBC08C3C3BCAAC4" + $"83BC72C441BD07C446BF67C2BEBF06C2FCBF2AC249BCAABD71BF7BBB9FBF15BB" + $"E1BF40BB2BBC67B5A8BC8BB5EDBC45B5A4BBEEB59ABC25B5A0BBEEB6360A03BC" + $"76B694BEA9BAC8BC76BC340A03BC7BBDC9BE94C1E7BC76C3460A04BC9AB55DC0" + $"5CB3BEC38CB9F1BFE3BBBB0A04BD12BD8CC0DDBBB2C37AC0E4BFCEC2DA0A04BD" + $"12BD8CBFE3BBBBC38CB9F1C0DDBBB20A04BC9AC4ECBFCEC2DAC37AC0E4C05CC2" + $"E50A04BB9EB541BC9AB55DC05CB3BEBF6EB3A30A03B981B6A3BB9EBABBBB9EB5" + $"E50A03B99BBFC9BB9DBED2BB9EBE7D1E0A000100000A010101000A020102000A" + $"030103000A040104000A050105000A060106000A070107000A080108000A0901" + $"09000A0A010A000A0B010B000A0C010C000A0D010D000A0E020E0F000A0F0110" + $"000A100111000A110112000A120113000A130114000A140115000A1503161718" + $"000A1603191A1B000A17011C000A18011D000A19011E000A1A011F000A1B0120" + $"000A1C0121000A1D012200" };