hrev53350 adds 1 changeset to branch 'master'
old head: 68378c326ef507c6de668046bd16c093203f7e51
new head: f932d9902fc93599c1c28db6b5a2e64b60b64684
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=f932d9902fc9+%5E68378c326ef5
----------------------------------------------------------------------------
f932d9902fc9: preferences/network: Add dedicated VPN icon
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53350
Commit: f932d9902fc93599c1c28db6b5a2e64b60b64684
URL: https://git.haiku-os.org/haiku/commit/?id=f932d9902fc9
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Aug 7 00:32:18 2019 UTC
----------------------------------------------------------------------------
3 files changed, 144 insertions(+), 3 deletions(-)
data/artwork/icons/Device_VPN | Bin 0 -> 27757 bytes
src/preferences/network/InterfaceIcons.rdef | 143 +++++++++++++++++++++-
src/preferences/network/InterfaceListItem.cpp | 4 +
----------------------------------------------------------------------------
diff --git a/data/artwork/icons/Device_VPN b/data/artwork/icons/Device_VPN
new file mode 100644
index 0000000000..cfaa2ba056
Binary files /dev/null and b/data/artwork/icons/Device_VPN differ
diff --git a/src/preferences/network/InterfaceIcons.rdef
b/src/preferences/network/InterfaceIcons.rdef
index f8d799dbfe..d5710034ae 100644
--- a/src/preferences/network/InterfaceIcons.rdef
+++ b/src/preferences/network/InterfaceIcons.rdef
@@ -56,18 +56,155 @@ resource(1, "wifi") #'VICN' array {
$"22040A000200021001178622040A020201031001178222040A01020002100117"
$"8222040A0001041001178400040A03010400"
};
-resource(2, "online") #'VICN' array {
+
+resource(2, "vpn") #'VICN' array {
+ $"6E6369660A0500020106033D0AFE000000000000BD0AFE48F10748A0783133FF"
+ $"FFC80066FFFF0034CC020106033D0AFE000000000000BD0AFE48F10748A07854"
+ $"09B4B6D8033784FF051D61020106043D950B0000000000003D950B494FBC479B"
+ $"EC00FFFFFF4C00FF008F00B200FF00800003010000020006023C2EB03BD68FBA"
+ $"CE763B310A4B00BB4A4D3172F6ED5AFFFF3E3E020116033A7FFF000000000000"
+ $"3A80004B30004AB0006AA89627FAD00202000200FFF006FFFFFF0000AD030100"
+ $"0004FF82130204BFC2B55BBBC5B55BC3BFB55BC6FABC93C6FAB896C6FAC090BF"
+ $"C2C3CBC3BFC3CBBBC5C3CBB88ABC93B88AC090B88AB896026EC5DCB8B6C713BA"
+ $"A0C4CAB706C110B579C307B5D5C0A2B565BFC2B55BC032B55BBDBCB55BBA69B7"
+ $"BABBC5B63AB8F9B94FB89DBD9CB84FBB7EB8C7BE9AB924BF77B8E0BEE7B9DEC1"
+ $"1FBCE0C332BB38C279BEC5C405C2D8C31AC0FBC3FCC2C6C2C1C22FC2B7C27AC2"
+ $"BEC22FC2B7C227C2B7C227C2B7C227C2B7C241C2BDC241C2BDC206C2B0C199C2"
+ $"DBC1D0C2CBC159C2EEC0D4C2DDC115C2E5C051C2CEBF43C313BFB0C2B4BF3DC3"
+ $"13BF36C313BF36C313BF36C313BF20C313BF20C313BF20C313BDEDC313BE23C3"
+ $"13BDB9C2EDBD57C2DFBD87C2E3BD54C2DCBD3EC2C3BD3EC2C3BD31C2B4BD13C2"
+ $"A5BD26C2ABBD13C2A5BCA4C27EBCA4C27EBCA4C27EBC31C254BC31C254BC27C2"
+ $"51BC12C24FBC1DC250BC10C24BBC0FC242BC11C246BC0FC242BBF5C219BBF5C2"
+ $"19BBD3C1DEBB68C195BBAEC1A4BB71C16EBB58C129BB63C14EBB4BC101BB4BC0"
+ $"ADBB48C0D7BB4BC0ADBB4EC087BB4EC087BB52C054BB4DBFEEBB55C021BB9EBF"
+ $"93BBA9BEBFBBB0BF36BBA9BEBFBBA7BE93BBA7BE93BBA7BE53BBBCBE2FBBA8BE"
+ $"4BBBBCBE2FBBC7BE21BBC7BE21BC00BDD5BBE3BCFCBC5BBD3DBBE3BCFCBAB7BC"
+ $"58BAB7BC58BAB7BC58BA8BBC44BA90BC46BA8BBC44BA8BBC42BA8BBC42BA89BB"
+ $"EABA23BB79BA6ABBADBA23BB79BA12BB6BBA12BB6BBA12BB6BB9F8BB49B9F8BB"
+ $"49B9F8BB49B9AEBAF0B9AEBAF0B97EBAC3B928BAB1B950BAB5B924BAA9B91BBA"
+ $"9AB920BAA1B984BA6EB9DEB997B9B5B9F9B9F6B95DBA36B8F0BA0BB91FBA5EB8"
+ $"C4BA78B85EBA83B89EBACCB83DBB61B7E7BB18B813BB61B7E7BB6BB7E1BB6BB7"
+ $"E1BB6BB7E1BBFEB787BBFEB787BC65B74ABCB6B684BC94B6F6BCF5B68ABD58B6"
+ $"65BD2DB67BBDA8B695BE6DB651BE29B697BE6FB650BE88B64FBE7CB64FBE62B6"
+ $"A0BEE1B72FBE88B70EBEE4B733BEE9B73EBEE5B73ABED8B744BEC6B74ABEC6B7"
+ $"4ABEC6B74ABE75B7A5BE75B7A5BE63B7DDBE90B849BE74B817BE91B84CBE92B8"
+ $"52BE92B852BE94B85CBE9DB87ABE97B86BBE94B884BE8CB88DBE8CB88DBE3AB8"
+ $"F0BD92B98FBDB7B906BD92B98FBD8DB9A1BD8DB9A1BD64B9D8BD7EBA55BD59BA"
+ $"19BD7BBA5CBD77BA63BD77BA63BD56BAA0BD4DBB2CBD39BAE6BD60BB70BDCCBB"
+ $"CEBD98BBA2BDFFBBFABE73BC3FBE33BC27BEBEBC5CBF5EBC42BF12BC56BF5EBC"
+ $"42BFAC37BFAC37BFD0BC1EC01CBC0FBFF5BC0BC046BC14C083BC4EC066BC35C0"
+ $"4DBCD9C0F4BDDAC0B6BD63C0F4BDDAC107BDF9C102BDF2C0BABE84C127BF91C0"
+ $"B2BF1DC127BF91C133BF9DC133BF9DC131C00FC1C5C0F9C135C0D6C259C11CC3"
+ $"48C059C2EEC0C9C348C059C36BC02FC36BC02FC36BC02FC388C019C388C019C3"
+ $"A8C003C3DBBFC5C3C9BFE8C3EEBFA0C409BF52C3F0BF73C409BF52C409BF53C4"
+ $"09BF53C40DBF9AC495BFC1C450BFCEC4EBBFB3C542BF10C51FBF56C542BF10C5"
+ $"51BEF2C551BEF2C551BEF2C555BEEBC555BEEBC57FBEA3C568BDFCC59EBE47C5"
+ $"3ABDBBC4A3BDDFC4E1BDAAC4A3BDCAC4A3BDB5C4A3BDB5C4A3BDB5C4A5BD31C4"
+ $"A5BD31C4A8BD1EC4E8BCDFC4D2BCF5C4E8BCDFC4FEBCC9C4FEBCC9C4FEBCC9C5"
+ $"16BCB3C516BCB3C545BC8BC582BC20C571BC5EC58CBC05C588BBBCC586BBD9C5"
+ $"88BBBCC587BBA8C587BBA8C587BBA8C588BB9DC588BB9DC58DBB614EBAFAC584"
+ $"BB24C58ABADAC5C2BA5DC5B0BAA2C5C4BA62C5CBBA70C5CBBA70C5D9BA8EC60F"
+ $"BAD4C5EDBAB3C60ABB1FC648BBAAC627BB67C669BBEBC66FBC7BC670BC33C66F"
+ $"BC7BC672BCC4C672BCC4C674BCEAC66EBD37C678BD11C664BD5AC649BD9CC652"
+ $"BD79C633BDECC62CBE92C62DBE3FC621BED5C67FBF2CC648BF16C750BD0F0006"
+ $"BC12B6E4BC12B6E4BC32B6B0BC55B638BC47B674BB81B6ABBA2BB802BAC4B747"
+ $"BA88B7E3BB30B77EBADDB7B0BB59B765BBAAB733BB82B74DBBCBB71DBC12B6E4"
+ $"BBFCB707BC12B6E4001DBACDBFD1BACDBFD1BAEBBFAABB29BF5CBB13BF89BB43"
+ $"BF24BB34BE93BB34BED0BB34BE4DBB60BDEABB34BE25BB80BDBEBBABBD60BBA1"
+ $"BD98BB48BD2ABA81BCBEBAE5BCF3BA67BCB1BA20BC83BA2DBCA0BA0FBC5BBA0D"
+ $"BC02BA1FBC28B9FEBBE5B9BABBB6B9D0BBD0B99BBB91B95FBB44B983BB66B93D"
+ $"BB24B8F0BB2DB91CBB16B8C0BB48B8BEBADFB8C3BAFFB8B1BB14B89FBB7EB8A7"
+ $"BB49B8C9BB7EB8C5BBB2B8C3BB8AB8C6BBDBB8C9BC2EB8C7BC05B8D0BC40B8BA"
+ $"BC49B8CBBC49B8B4BC4BB8AABC4EB8AFBC4DB8A0BC57B893BC4BB898BC56B882"
+ $"BC4AB88FBD10B88EBD00B893BD49B8E1BDE7B88DBE03B90DBE04B923BE75B906"
+ $"BE4BB946BEA8B985BF00B973BEC1B997BF3EB9A3BFC1B998BF81B9B0C011BA17"
+ $"C05FB9DBC02EBA25C0B3BA75C127BA3DC0E7BA8FC144BAC0C17FBAA9C160BAD8"
+ $"C19FBAFCC17CBAE4C19DBADDC13ABAD7C0A6BAD3C0EFBADBC061BACDBFD1BAEA"
+ $"C013BACDBFD10009BD5EB5D7BD5EB5D7BD81B5EEBDB1B60EBD84B605BDD0B613"
+ $"BE19B601BE01B61ABE55B5C3BEF6B5C4BEB0B5EFBF2DB5A2BFA3B55EBF5BB55E"
+ $"BFCEB55DC00CB58CBFE9B578C03CB5A7C090B566C064B575BF3AB541BCA7B60E"
+ $"BDDDB57ABCECB623BD5EB5D7BD29B601BD5EB5D70005BF35B6EABF35B6EABF55"
+ $"B6ECBF9AB6F5BF7BB702BFCEB6E0BF87B67DBF9CB693BF78B66DBF3CB664BF2F"
+ $"B623BF45B690BF35B6EABF6BB6CCBF35B6EA0004BA07B87FBA07B87FBA0CB868"
+ $"B9EFB850B9FEB85FB982B8E4B8F0BA35B92CB988B97E31BA07B87FB974B8F0BA"
+ $"07B87F0066C6F7BC24C6F7BC24C6DCBB0AC6002FC68BB9F2C5B9B87CC4FFB79C"
+ $"C563B805C4CEB768C463B709C49AB737C452B6FBC428B6EFC440B6E2C412B6FA"
+ $"C407B6C1C401B6D1C316B60FC0D0B56FC1F9B59AC0FBB58BC15FB59CC131B589"
+ $"C170B5A2C179B5C9C19FB5BDC12DB5E2C08AB5C9C0D7B5C4C05AB5CDC03FB60E"
+ $"C043B5DDC03DB629C040B676C036B65DC04BB694C0B6B65FC0A8B66FC0CDB643"
+ $"C0F1B61AC0B1B608C108B64BC0D0B6B1C13AB6D6C0B5B6A7C066B689C083B67C"
+ $"C064B68AC05DB6AFC05FB6ABC053B6C0C031B6D0C044B6CBBFE6B6E5BF94B741"
+ $"BFB0B6EFBF87B769BF5DB791BF88B781BF3BB79DBEF7B7B2BF17B7A4BECCB7C7"
+ $"BEFAB81CBEEAB7FFBF06B830BF19B86CBF03B860BF59B891BFBEB7E0BFA3B802"
+ $"BFE1B7B3C038B7ADC008B7BDC04FB7A6C084B777C06CB76EC0D3B795C0F8B83E"
+ $"C0EBB7F4C110B83FC135B810C100B802C10DB7E5C0ECB77043B7ABC125B795C1"
+ $"5FB7FDC14DB7BDC170B83DC1C2B820C18EB860C1CFB813C1FDB7D5C1E2B7BDC2"
+ $"14B7EAC1F1B838C215B82FC206B84BC23AB83DC222B843C25AB834C28BB842C2"
+ $"6CB836C2AFB850C2FAB857C2D5B854C320B859C347B898C335B87BC377B8E7C2"
+ $"4AB8C5C259B8C6C228B8C3C1E2B8D0C202B8C2C1C9B8DAC199B8F0C1B62FC179"
+ $"B8E5C13FB8B6C15BB8C8C118B89CC0C5B872C0EFB885C07FB853BFE3B84FC02F"
+ $"B83FBFBFB856BF7FB87CBF9CB866BF5CB897BF11B8A4BF35B87FBEDCB8DCBE6E"
+ $"B942BEB6B91FBE51B950BE19B976BE2EB95CBE04B990BDF6B9D1BE04B9B4BDE9"
+ $"B9EEBDE2BA1DBDCAB9FCBDF8BA3CBDEFBA76BDFEBA53BDD9BAA9BDC9BB27BD9F"
+ $"BAEFBDF235BE71BBBCBE3ABB94BEAFBBE9BF41BBD2BEFBBBE5BF83BBC1C009BB"
+ $"9CBFC5BBA1C05FBB96C0DDBC03C0A1BBCDC104BC26C0F5BC67C114BC34C0D3BC"
+ $"9FC103BD00C0E8BCC8C11FBD37C159BDA3C13CBD6DC166BDBAC182BDE8C177BD"
+ $"D0C18EBE04C16DBE2DC17BBE15C152BE5EC13FBECFC13FBE97C13FBF0EC185BF"
+ $"4CC15DBF24C1AABF71C1A4BFE3C1A8BFB3C1A0C025C1DBC087C1B3C053C216C0"
+ $"8AC289C06CC253C086C2CBC04DC319BFDEC2E8C00FC347BFB0C386BF66C378BF"
+ $"ABC396BF13C3FEBEBFC3C2BEF2C435BE90C430BE0CC42EBE4DC432BDC0C433BD"
+ $"22C429BD6DC43CBCDEC4ABBC78C47EBCA7C4CDBC56C512BC03C505BC34C519BB"
+ $"E7C513BBA8C51336C513BB93C51135C51ABB71C4F8BB29C47EBB2CC48ABB5DC4"
+ $"76BB0EC48BBB01C477BB14C4A1BAEDC478BACDC48BBAD8C442BAADC3F1BA66C4"
+ $"18BA9AC3CCBA36C391B9CBC3AEBA00C389B9BEC36CB93BC342B92EC39AB94AC3"
+ $"E2B9A3C3C4B981C419B9DFC46DBA6AC44ABA20C46EBA73C496BA8AC48FBA85C4"
+ $"AFBA9CC4EABAA8C4CABAABC533BAA2C55ABA20C555BA61C562B9C7C4E8B9AFC5"
+ $"1DB9DAC4CAB997C49EB958C4B6B975C48FB946C474B90EC466B92AC493B8F9C4"
+ $"BDB91DC49FB90BC4E0B932C52CB951C505B944C555B95EC5B4B96CC592B952C5"
+ $"C9B97CC5E7B9B8C5D9B9A2C5FEB9DCC627BA26C614BA00C645BA61C694BA9FC6"
+ $"4DBA89C667BAE8C6B6BB83C693BB3FC6DFBBD4C6E3BC7CC6E4BC23C6E2BCCEC6"
+ $"D0BD79C6F5BD2CC6A7BDCCC69FBE9AC69FBE3EC6A1BE95C6A5BE88C6A3BE8DC6"
+ $"A2BE8FC6A1BEC0C696BEBEC6B2BEC4C6D6BE02C6D2BE15C6F6BD65C6F7BC24C7"
+ $"00BCC4C6F7BC240008C301B7D8C301B7D8C2E6B7DCC2D4B7A4C2E8B7AEC2B1B7"
+ $"92C269B7B8C288B7A7C204B7EFC236B743C221B77BC239B73AC285B744C27AB7"
+ $"46C2A7B740C2F3B74FC2D8B731C30CB76BC33CB7A1C31FB787C360B7C2C301B7"
+ $"D8C31CB7D4C301B7D80004BB53C203BB53C203BB45C20DBB26C221BB38C21DBB"
+ $"55C249BBBAC291BB87C26EBB92C265BB53C203BB84C227BB53C2030005C4F4BE"
+ $"2EC4F4BE2EC4D3BE57C48CBEA4C4A6BE76C46EBEDAC47DBF53C47DBF18C4B6BF"
+ $"38C4EDBEB9C4D0BEECC502BE93C4F4BE2EC531BE48C4F4BE2E0009C213C327C2"
+ $"13C327C17FC390BFF7C345C09DC332BFD0C349BF8EC36ABFACC350BF67C38CBF"
+ $"20C386BF56C386BEAFC386BDCDC386BE3EC386BEC1C3CBC0C0C3BABFC4C3DDC1"
+ $"37C3AAC221C367C1AFC38EC22AC364C262C32BC280C337C249C322C213C327C2"
+ $"2AC331C213C3270604C748584C5C44544C5C5C586054585C0605B6014C504852"
+ $"444C445844584850020652515351515150535052505451555054515752585158"
+ $"53585355535754545453545454520802484C5C4C0606BE0A324A3449BAC4C3CF"
+ $"BB1CC2FFBA8DC25ABA74C281BC17C002452B422A304402044030C34530BC3A30"
+ $"304030BC3A30C3454050BC3A50C34550504050C34550BC3A0A04314031493B49"
+ $"3B40100A00010030202201178400040A0101002020220A0201012020220A030A"
+ $"0304050607080A0B02092020220A090112000A08011002BF9E79000000000000"
+ $"3F45F34C03CF44514D0A07011002BF9E790000000000003F45F34C130C44514D"
+ $"0A07011102BB50910000000000003AFF7D4A8D6A46063E0A09010D1240C6ED00"
+ $"000000000040AD53CAED40C8899001178800040A09010C1240B5E60000000000"
+ $"0040915CCACEE5C82A1F01178400040A04010C1240608700000000000040407C"
+ $"CA4D40C66BA701178400040A04010D12406087000000000000406087CA4D40C7"
+ $"5FEF01178800040A06010D12406087000000000000406087CA4D40C75FEF0117"
+ $"8400040A05010C02406087000000000000406087CA4D40C75FEF0A04010E0240"
+ $"6087000000000000406087CA4D40C75FEF0A04010F1240608700000000000040"
+ $"6087CA4D40C75FEF0117810004"
+};
+
+resource(3, "online") #'VICN' array {
$"6E63696603050004016E020006023959B6382F60BA2F603B59B64B80504AE1D3"
$"0056FF22FF05D005010204554FC96F4FC6CC4F4F554FC6CC4FC96F555BC6CC5B"
$"C96F5B5B555BC96F5BC6CC020A0001001001178800040A02010000"
};
-resource(3, "pending") #'VICN' array {
+resource(4, "pending") #'VICN' array {
$"6E6369660205000200060238DB5A38CCBABACCBA3ADB5A4B8BE14AD7C900FFF3"
$"75FFFFA406010A034F4F555B5B4F020A0001001001178802040A01010000"
};
-resource(4, "offline") #'VICN' array {
+resource(5, "offline") #'VICN' array {
$"6E6369660205000200060238DB5A38CCBABACCBA3ADB5A4BBBE14B07C900FF88"
$"75FFFF0505010A044F4F4F5B5B5B5B4F020A0001001001178802040A01010000"
};
diff --git a/src/preferences/network/InterfaceListItem.cpp
b/src/preferences/network/InterfaceListItem.cpp
index 02b62d304f..20c8593456 100644
--- a/src/preferences/network/InterfaceListItem.cpp
+++ b/src/preferences/network/InterfaceListItem.cpp
@@ -175,6 +175,9 @@ InterfaceListItem::_Init()
case B_NETWORK_INTERFACE_TYPE_ETHERNET:
_PopulateBitmaps("ether");
break;
+ case B_NETWORK_INTERFACE_TYPE_VPN:
+ _PopulateBitmaps("vpn");
+ break;
}
}
@@ -269,6 +272,7 @@ InterfaceListItem::_UpdateState()
break;
case B_NETWORK_INTERFACE_TYPE_VPN:
fSubtitle = B_TRANSLATE("VPN connection");
+ fDisabled = false;
break;
default:
fSubtitle = "";
