diff --git a/build_scripts/Debian+Ubuntu/changelog b/build_scripts/Debian+Ubuntu/changelog index 72dfeb83b..3062d588c 100644 --- a/build_scripts/Debian+Ubuntu/changelog +++ b/build_scripts/Debian+Ubuntu/changelog @@ -1,5 +1,168 @@ retroshare (0.6.3-1.XXXXXX~YYYYYY) YYYYYY; urgency=low + 68b35f3 Phenom Tue, 15 Aug 2017 19:45:26 +0200 Fix CppCheck in notifytxt.cc + 0b8d684 Phenom Tue, 15 Aug 2017 19:11:32 +0200 Fix CppCheck in framecatcher.cpp + deb6693 Phenom Tue, 15 Aug 2017 19:00:17 +0200 Fix CppCheck in idle.cpp + 589e61f Phenom Sun, 13 Aug 2017 20:44:34 +0200 Fix CppCheck in rsettings.cpp + 5554f4a Phenom Sun, 13 Aug 2017 19:47:16 +0200 Fix CppCheck in MimeTextEdit.h + 8438d70 Phenom Sun, 13 Aug 2017 18:47:36 +0200 Fix CppCheck in GroupTreeWidget.h + f82ec64 Phenom Fri, 28 Jul 2017 09:38:24 +0200 Fix CppCheck in rsrttitems.h + 7e47be5 Phenom Thu, 27 Jul 2017 20:41:17 +0200 Fix CppCheck rsitem.h + 4780713 Phenom Thu, 27 Jul 2017 20:27:02 +0200 Fix CppCheck in rsgxsrecognitems.h + 732898a Phenom Thu, 27 Jul 2017 20:29:03 +0200 Fix CppCheck in rsgxsupdateitems.h + 942eba3 Phenom Thu, 27 Jul 2017 19:33:31 +0200 Fix CppCheck in rsconfigitems.h + a1fb8f7 Phenom Thu, 27 Jul 2017 16:56:10 +0200 Fix CppCheck in rswire.h + a248ee7 Phenom Thu, 27 Jul 2017 16:54:56 +0200 Fix CppCheck in rsservicecontrol.h + 1c862de Phenom Thu, 27 Jul 2017 12:56:12 +0200 Fix CppCheck in rsposted.h + ba75294 Phenom Thu, 27 Jul 2017 12:53:47 +0200 Fix CppChecker in rsidentity.h + fee7d45 Phenom Wed, 26 Jul 2017 11:43:11 +0200 Fix CppCheck in rsgxsforums.h + 10c46ee Phenom Thu, 27 Jul 2017 12:54:57 +0200 Fix CppChecker in rsphoto.h + dd4ed2a Phenom Wed, 26 Jul 2017 11:39:54 +0200 Fix CppCheck in rsgxschannels.h + 6219b31 Phenom Wed, 26 Jul 2017 10:52:40 +0200 Fix CppCheck in pqiqos.h + 87947b1 Phenom Wed, 26 Jul 2017 10:35:57 +0200 Fix CppCheck in pqiindic.h + 225058a csoler Sun, 5 Nov 2017 19:37:03 +0100 Merge pull request #1100 from hunbernd/feature/image-embed3 + 5d03ceb hunber Sun, 5 Nov 2017 18:58:07 +0100 Fixed resize bug + 2046249 Phenom Wed, 26 Jul 2017 10:33:55 +0200 Fix CppCheck in pqihandler.cc + b77d027 Phenom Wed, 26 Jul 2017 10:30:33 +0200 Fix CppCheck in p3linkmgr.cc + 73e1ddc Phenom Wed, 26 Jul 2017 10:29:17 +0200 Fix CppCheck in pqi_base.h + 50a9d8a Phenom Fri, 21 Jul 2017 19:08:38 +0200 Fix CppCheck in p3servicecontrol + d21b41f Phenom Fri, 21 Jul 2017 19:02:34 +0200 Fix CppCheck in p3netmgr.cc + 6a0fd11 Phenom Fri, 21 Jul 2017 18:59:59 +0200 Fix CppCheck in p3historymgr.cc + bd56035 Phenom Fri, 21 Jul 2017 18:42:42 +0200 Fix CppCheck in p3cfgmgr.h + 0a82ff0 Phenom Fri, 21 Jul 2017 18:40:43 +0200 Fix CppCheck in authssl.cc + 4fc7787 Phenom Fri, 21 Jul 2017 18:12:59 +0200 Fix CppCheck in authgpg + cd040f6 Phenom Fri, 21 Jul 2017 18:09:54 +0200 Fix CppCheck in pluginmanager.h + 60d4762 Phenom Fri, 21 Jul 2017 18:03:35 +0200 Fix CppCheck in rscertificate.h + f91756a Phenom Fri, 21 Jul 2017 17:57:15 +0200 Fix CppCheck in pgphandler.h + aeb7b33 csoler Sun, 5 Nov 2017 17:00:26 +0100 Merge pull request #1099 from csoler/v0.6-PRTest + 722d98e Phenom Fri, 21 Jul 2017 17:30:26 +0200 Fix CppCheck in rsgxstunnelitems.h + 4ed663a Phenom Fri, 21 Jul 2017 17:23:02 +0200 Fix CppCheck in p3gxstunnel.h + 242cc9d Phenom Fri, 21 Jul 2017 17:22:16 +0200 Fix CppCheck in p3gxstransitems.h + 3702cf2 Phenom Fri, 21 Jul 2017 17:20:11 +0200 Fix CppCheck in p3gxstrans.h + 77c1ab4 Phenom Fri, 21 Jul 2017 16:31:17 +0200 Fix CppCheck in rsgxsdataaccess.h + 718c09e Phenom Fri, 21 Jul 2017 16:29:49 +0200 Fix CppCheck in rsgixs.h + eb7655c Phenom Fri, 21 Jul 2017 16:18:09 +0200 Fix CppCheck in rsgenexchange.cc + 344bc27 Phenom Fri, 21 Jul 2017 15:55:40 +0200 Fix CppCheck in gxstokenqueue.h + f81c6ae Phenom Fri, 21 Jul 2017 15:54:29 +0200 Fix CppCheck in p3grouter + 1072194 Phenom Fri, 21 Jul 2017 14:01:20 +0200 Fix CppCheck in grouteritems.h + 10233ef Phenom Fri, 21 Jul 2017 13:53:44 +0200 Fix CppCheck in groutertypes.h + 5dbefc5 csoler Sun, 5 Nov 2017 16:36:49 +0100 Merge pull request #1098 from csoler/v0.6-PRTest + a622194 Phenom Fri, 21 Jul 2017 13:46:38 +0200 Fix CppCheck in ftturtlefiletransferitem.h + edfd2ad Phenom Fri, 21 Jul 2017 13:36:10 +0200 Fix CppCheck in fttransfermodule + c8548b2 Phenom Fri, 21 Jul 2017 13:33:11 +0200 Fix CppCheck in ftserver.cc + 51ed032 Phenom Fri, 21 Jul 2017 13:13:48 +0200 Fix CppCheck ftfilecreator.cc + 6893449 Phenom Fri, 21 Jul 2017 13:00:03 +0200 Fix CppCheck in ftchunkmap.h + f8d4d6c Phenom Fri, 21 Jul 2017 12:57:17 +0200 Fix CppCheck in p3filelists.h + 0d5b1ed Phenom Fri, 21 Jul 2017 12:47:04 +0200 Fix CppCheck in rsfilelistitems.h + 0e014d6 Phenom Fri, 21 Jul 2017 12:43:06 +0200 Fix CppCheck in p3filelists.cc + d9965ac Phenom Fri, 21 Jul 2017 12:39:05 +0200 Fix CppCheck in hash_cache.h + f18a842 Phenom Fri, 21 Jul 2017 12:27:45 +0200 Fix CppCheck in directory_storage.h and directory_storage.cc + 1456bdd Phenom Fri, 21 Jul 2017 12:18:42 +0200 Fix CppCheck in dir_hierarchy.h and dir_hierarchy.cc + b426941 csoler Sun, 5 Nov 2017 13:57:31 +0100 Merge pull request #1086 from PhenomRetroShare/Fix_SpeedQueuePositionSorting + 8a4c1bd csoler Sun, 5 Nov 2017 13:56:39 +0100 Merge pull request #1097 from PhenomRetroShare/Add_MoveFixedColorToQss + f27d312 Phenom Sat, 4 Nov 2017 23:37:02 +0100 Move some Fixed Color to Qss files + 8072d24 Phenom Sat, 4 Nov 2017 13:57:55 +0100 Use macro for priority values instead of constants. + c5c406b Phenom Sun, 29 Oct 2017 16:45:45 +0100 Fix Speed/Queue Position column sorting + 37f6e7e csoler Fri, 3 Nov 2017 23:49:30 +0100 Merge pull request #1064 from PhenomRetroShare/Fix_OpModeRestore + 1bcebb8 defnax Fri, 3 Nov 2017 13:26:51 +0100 attempt to fix + fc26ebc defnax Fri, 3 Nov 2017 13:04:38 +0100 Fixed one Emojione icon + eb6bc79 defnax Fri, 3 Nov 2017 03:02:40 +0100 reorder the main people emoticons + 48bd151 csoler Thu, 2 Nov 2017 23:16:30 +0100 removed useless root item in RsCollection dialog + 2d18335 csoler Thu, 2 Nov 2017 22:52:30 +0100 added tool button to choose DL directory in rscollection dialog + 6381608 csoler Thu, 2 Nov 2017 22:46:53 +0100 remove filename field in RsCollectionDialog when downloading a collection of links + aa4c209 csoler Thu, 2 Nov 2017 22:20:43 +0100 fixed formula to compute score based on up/dn votes in comments + 42c720f csoler Wed, 1 Nov 2017 20:36:57 +0100 Merge pull request #1082 from RetroPooh/forumoptsimagescb + 1a01181 csoler Wed, 1 Nov 2017 20:35:29 +0100 Merge pull request #1063 from PhenomRetroShare/Fix_BlankPageWhenClearLobbyInWebInterface + d8c4f88 csoler Wed, 1 Nov 2017 20:34:35 +0100 Merge pull request #1094 from PhenomRetroShare/Add_HideFileLabelInChannelPost + 2d8e9d5 csoler Wed, 1 Nov 2017 20:33:54 +0100 Merge pull request #1090 from csoler/v0.6-DHT + a9c4362 csoler Wed, 1 Nov 2017 20:31:49 +0100 removed debug info. Added explaination about the new method + fe5dd00 Gioacc Wed, 1 Nov 2017 14:34:01 +0100 Add context to debug message + 346d5c1 Gioacc Wed, 1 Nov 2017 14:13:04 +0100 Merge pull request #1087 from Emotyco/libresapilocal_debug + f409e8e defnax Wed, 1 Nov 2017 00:24:03 +0100 Update to Emojione 3.0 + a4eedf7 Phenom Mon, 30 Oct 2017 18:35:56 +0100 Hide zero File Label (size) in channel post. + 69278e6 csoler Mon, 30 Oct 2017 11:07:36 +0100 only print non empty buckets + 9f9c34c csoler Mon, 30 Oct 2017 10:58:48 +0100 tried to improve DHT size estimation code + b77e895 csoler Sun, 29 Oct 2017 21:31:10 +0100 Merge pull request #1084 from csoler/v0.6-Links2 + 337980e csoler Sun, 29 Oct 2017 21:28:12 +0100 Merge pull request #1088 from csoler/v0.6-FileLists + 3bb694f csoler Sun, 29 Oct 2017 21:24:34 +0100 added display of hashing speed. Changed hashing buffer size to 10MB to improve performance + 9ad635a csoler Sun, 29 Oct 2017 20:33:56 +0100 added post into forum menu entry in SharedFilesDialog + c41f6a2 Konrad Sun, 29 Oct 2017 19:40:37 +0100 Added: Debug output in Android app of callback functions + 0c97d5b csoler Fri, 27 Oct 2017 22:03:42 +0200 added sorting of channels to push to, and auto-fill of channel subject + 2e9f520 csoler Thu, 26 Oct 2017 19:41:13 +0200 fixed compilation + 299d0b6 csoler Thu, 26 Oct 2017 19:40:12 +0200 added missing test for subscribed channels in share-on-channel menu + 0c3fc05 Gioacc Thu, 26 Oct 2017 08:18:30 +0200 Merge pull request #1066 from Emotyco/libresapi_filesharing + 54d49f1 RetroP Thu, 26 Oct 2017 00:05:45 +0300 friendlist - hide id column by default + f8fca19 RetroP Wed, 25 Oct 2017 23:07:34 +0300 removed wrong tooltip for hidden node in options + 5296641 RetroP Wed, 25 Oct 2017 20:50:34 +0300 fix saving of forum options checkbox for load images + 0931779 csoler Wed, 25 Oct 2017 18:51:16 +0200 Merge pull request #1081 from Artistic-Cabbage/close-fd-after-blacklist + 3975999 Arthur Wed, 25 Oct 2017 17:42:09 +0200 Add missing close after blacklisted connection attempt. + 1c2d17b csoler Tue, 24 Oct 2017 18:47:34 +0200 Merge pull request #1077 from hunbernd/feature/image-embed3 + cd5eb5c hunber Tue, 24 Oct 2017 18:23:22 +0200 Got rid of QMath + 06f489e csoler Mon, 23 Oct 2017 22:14:06 +0200 Merge pull request #1065 from csoler/v0.6-Links2 + 603ea7e csoler Mon, 23 Oct 2017 22:12:52 +0200 removed debug info from RsCollection + f4fae15 csoler Mon, 23 Oct 2017 21:15:40 +0200 Merge pull request #1078 from RetroPooh/addfr-cb + ead8cb2 csoler Mon, 23 Oct 2017 21:13:56 +0200 Merge pull request #1076 from RetroPooh/chatsearchbut + 7af436d csoler Mon, 23 Oct 2017 21:12:26 +0200 Merge pull request #1075 from Kcchouette/patch-1 + e441cae csoler Mon, 23 Oct 2017 21:11:08 +0200 Merge pull request #1074 from RetroPooh/sett-nodiscocb + b275039 csoler Mon, 23 Oct 2017 21:09:54 +0200 Merge pull request #1073 from RetroPooh/hid1 + 1d7d53a csoler Mon, 23 Oct 2017 21:07:23 +0200 Merge pull request #1070 from RetroPooh/posted-descr + e2bbbad RetroP Mon, 23 Oct 2017 20:01:35 +0300 fix checkboxes state for already accepted/signed keys on add friend dialog + 64481de hunber Mon, 23 Oct 2017 17:04:20 +0200 Set the proper size limits + b968974 RetroP Mon, 23 Oct 2017 17:51:39 +0300 fix chat search button position + f434e65 hunber Sun, 11 Jun 2017 00:31:20 +0200 Use binary search to find the right file size + c17a8e7 hunber Sat, 10 Jun 2017 01:43:02 +0200 Optimalizations + af48173 hunber Fri, 9 Jun 2017 23:29:39 +0200 Convert image into 4 bit color table format + 9af2730 hunber Thu, 8 Jun 2017 23:00:33 +0200 Downscale image automatically + e24febf Kcchou Mon, 23 Oct 2017 14:52:10 +0200 Fix some markdown checkbox + 4a1ddcc RetroP Mon, 23 Oct 2017 12:24:56 +0300 removed show discovery checkbox from network options, it is in appearance now + 4594c1a Pooh Mon, 23 Oct 2017 11:51:22 +0300 Update MainWindow.cpp + 1cc6506 Pooh Mon, 23 Oct 2017 11:49:05 +0300 Update ServerPage.cpp + a0f6a74 Pooh Mon, 23 Oct 2017 11:46:39 +0300 Merge branch 'master' into hid1 + 78037a6 RetroP Mon, 23 Oct 2017 11:42:03 +0300 disable nat/dht indicators for hidden mode, hide irrelevant network options elements + 0359795 csoler Sun, 22 Oct 2017 20:08:22 +0200 fixed regression preventing context menu to open in destination directory for RsCollection + 01c82c3 csoler Sun, 22 Oct 2017 20:02:27 +0200 Merge pull request #1072 from hunbernd/fix/html-in-forum-title + a81956c csoler Sun, 22 Oct 2017 20:01:49 +0200 Merge pull request #1071 from hunbernd/fix/crash-at-startup-removed-buttons + 0c39b5c hunber Sun, 22 Oct 2017 19:44:14 +0200 Fix bug causing RS to crash at startup when some icons were removed from toolbar For example: disabled plugins + 4e16042 hunber Sun, 22 Oct 2017 19:11:52 +0200 Part of the forum title is not displayed when it is enclosed in < > + 723016e RetroP Sun, 22 Oct 2017 19:39:44 +0300 fix descriptions display in Posted + 6a0ccc4 csoler Sun, 22 Oct 2017 18:28:36 +0200 added means to select download directory in RsCollectionDialog + ee2120a csoler Sun, 22 Oct 2017 17:36:19 +0200 fixed bug causing FileTree links to open empty + f503510 csoler Sun, 22 Oct 2017 16:00:08 +0200 Merge pull request #1069 from RetroPooh/postbuttonlabels + 34eb971 csoler Sun, 22 Oct 2017 15:57:24 +0200 Merge pull request #1068 from RetroPooh/winsize + 9cc09d6 csoler Sun, 22 Oct 2017 15:55:48 +0200 Merge pull request #1067 from PhenomRetroShare/Fix_SecurityIpItemIsSame + 749a34d RetroP Sun, 22 Oct 2017 15:55:08 +0300 add text labels to post buttons in forums and channels; fix version selector placement + b48916c RetroP Sun, 22 Oct 2017 13:49:38 +0300 add windows size/pos saving + ef13e03 Phenom Sun, 22 Oct 2017 11:52:00 +0200 Fix SecurityIpItem isSame + b6aeacb csoler Sat, 21 Oct 2017 23:48:27 +0200 fixed share on channel code + 770add8 csoler Sat, 21 Oct 2017 21:23:40 +0200 added code to share a file/dir on channel + edffbc3 csoler Sat, 21 Oct 2017 18:09:26 +0200 fixed bug in removing top dirs when creating file hierarhies + cbcf402 csoler Sat, 21 Oct 2017 17:42:17 +0200 setup proper title in RsCollectionEditor when in download mode + 2cfa866 csoler Sat, 21 Oct 2017 17:35:06 +0200 merge of trees and single files before paste in DL queue so that all use the CollectionEditor + fe516c6 csoler Sat, 21 Oct 2017 16:16:23 +0200 fixed pasting of FileTree links in download queue + 6581fa0 csoler Sat, 21 Oct 2017 15:44:45 +0200 code cleaning + b6f102c Gioacc Sat, 21 Oct 2017 13:00:36 +0200 Fix TokenManager.qml JSON API request + fca10c2 Konrad Fri, 20 Oct 2017 21:24:52 +0200 Removed in libresapi unused code that caused compilation error + ef52e09 Konrad Fri, 20 Oct 2017 20:57:37 +0200 Added in Libresapi: Handlers to interact with shared files + 0ebe885 Konrad Fri, 20 Oct 2017 20:55:56 +0200 Added in Libresapi: Handler to get uploading files + 2293b60 Konrad Fri, 20 Oct 2017 20:49:59 +0200 Added in Libresapi: Handler to get search result + 0fbcf01 csoler Thu, 19 Oct 2017 22:20:23 +0200 code cleaning. Removed comments at end of conditional + 74d5069 csoler Thu, 19 Oct 2017 22:14:04 +0200 renamed RsCollectionEditor into RsCollection. Added download of FileTree links + 32be006 csoler Thu, 19 Oct 2017 10:19:56 +0200 various improvements to collection links + 9206dac csoler Wed, 18 Oct 2017 23:20:19 +0200 fixed up collection link display + e1d5014 csoler Wed, 18 Oct 2017 22:32:15 +0200 added copy links from file hierarchy + f98edd4 csoler Wed, 18 Oct 2017 00:04:04 +0200 added FileTree class to implement a compact representation of file hierarchies + 847c1b2 csoler Sun, 15 Oct 2017 21:10:29 +0200 renamed RsCollectionFile into RsCollectionEditor + 68763f5 csoler Sun, 15 Oct 2017 20:52:21 +0200 added links machinery to handle file hierarchies + e63217e Phenom Tue, 17 Oct 2017 15:39:25 +0200 Fix OpMode Restore + 130e3d6 Phenom Tue, 17 Oct 2017 14:57:09 +0200 Fix Blank Page When Clear Lobby in Web Interface + 034d88c Gioacc Mon, 16 Oct 2017 20:07:52 +0200 Fix android compilation with newer Qt + ebf99a4 csoler Sat, 14 Oct 2017 18:10:55 +0200 removed vivid in defautl ubuntu distr list + f161aa8 csoler Sat, 14 Oct 2017 14:57:20 +0200 updated changelog + + -- Retroshare Dev Team Thu, 07 Nov 2017 22:00:00 +0100 + +retroshare (0.6.3-1.20171014.1f624042~trusty) trusty; urgency=low + d61a5cd csoler Mon, 2 Oct 2017 22:23:26 +0200 attempt at fixing the re-hash bug. Now only using canonicalized filenames in hash cache 22942dc csoler Sun, 1 Oct 2017 20:20:26 +0200 fixed bug causing suffix/prefix lists to contain an empty string bc05aaa csoler Sat, 30 Sep 2017 18:58:31 +0200 switched tokenQueue speed to 10 calls/sec, thus improving loading speeds. Still need to test for CPU load diff --git a/libbitdht/src/bitdht/bdpeer.cc b/libbitdht/src/bitdht/bdpeer.cc index 9630fbdad..295ca083d 100644 --- a/libbitdht/src/bitdht/bdpeer.cc +++ b/libbitdht/src/bitdht/bdpeer.cc @@ -1024,6 +1024,11 @@ int bdSpace::getDhtBucket(const int idx, bdBucket &bucket) } uint32_t bdSpace::calcNetworkSize() +{ + return calcNetworkSizeWithFlag(~0u) ; +} + +uint32_t bdSpace::calcNetworkSizeWithFlag(uint32_t withFlag) { std::vector::iterator it; @@ -1031,76 +1036,66 @@ uint32_t bdSpace::calcNetworkSize() unsigned long long sum = 0; unsigned long long no_peers = 0; uint32_t count = 0; - bool doPrint = false; - bool doAvg = false; + +#ifdef BITDHT_DEBUG + std::cerr << "Estimating DHT network size. Flags=" << std::hex << withFlag << std::dec << std::endl; +#endif int i = 0; for(it = buckets.begin(); it != buckets.end(); it++, i++) { - int size = it->entries.size(); + int size = 0; + std::list::iterator lit; + for(lit = it->entries.begin(); lit != it->entries.end(); lit++) + if (withFlag & lit->mPeerFlags) + size++; + int shift = BITDHT_KEY_BITLEN - i; - bool toBig = false; if (shift > BITDHT_ULLONG_BITS - mFns->bdBucketBitSize() - 1) - { - toBig = true; - shift = BITDHT_ULLONG_BITS - mFns->bdBucketBitSize() - 1; - } + continue ; + unsigned long long no_nets = ((unsigned long long) 1 << shift); - /* use doPrint so it acts as a single switch */ - if (size && !doAvg && !doPrint) - { - doAvg = true; - } + no_peers = no_nets * size; - if (size && !doPrint) - { - doPrint = true; - } - - if (size == 0) + if(size < mFns->bdNodesPerBucket() && size > 0) { - /* reset counters - if empty slot - to discount outliers in average */ - sum = 0; - no_peers = 0; - count = 0; + sum += no_peers; + count++; } - if (!toBig) - { - no_peers = no_nets * size; - } - - if (doPrint && doAvg && !toBig) - { - if (size == mFns->bdNodesPerBucket()) - { - /* last average */ - doAvg = false; - } - if (no_peers != 0) - { - sum += no_peers; - count++; - } - } +#ifdef BITDHT_DEBUG + if(size > 0) + std::cerr << " Bucket " << shift << ": " << size << " / " << mFns->bdNodesPerBucket() << " peers. no_nets=" << no_nets << ". no_peers=" << no_peers << "." << std::endl; +#endif } uint32_t NetSize = 0; if (count != 0) - { NetSize = sum / count; - } - //std::cerr << "bdSpace::calcNetworkSize() : " << NetSize; - //std::cerr << std::endl; +#ifdef BITDHT_DEBUG + std::cerr << "Estimated net size: " << NetSize << ". Old style estimate: " << calcNetworkSizeWithFlag_old(withFlag) << std::endl; +#endif return NetSize; } -uint32_t bdSpace::calcNetworkSizeWithFlag(uint32_t withFlag) +/* (csoler) This is the old method for computing the DHT size estimate. The method is based on averaging the + * estimate given by each bucket: n 2^b where n is the bucket size and b is the number of similar bits + * in this bucket. The idea is that buckets that are not empty nor full give a estimate of the network + * size. + * + * The existing implementation of this method was not using all non empty/full buckets, in order to avoid + * outliers, but this method is also biased, and tends to give a lower value (because it skips the largest buckets) + * especially when the network is very sparse. + * + * The new implementation respects the original estimate without bias, but it still notoriously wrong. Only averaging + * the estimate over a large period of time would produce a reliable value. + */ +uint32_t bdSpace::calcNetworkSizeWithFlag_old(uint32_t withFlag) { std::vector::iterator it; @@ -1140,12 +1135,12 @@ uint32_t bdSpace::calcNetworkSizeWithFlag(uint32_t withFlag) /* use doPrint so it acts as a single switch */ if (size && !doAvg && !doPrint) - { + { doAvg = true; } if (size && !doPrint) - { + { doPrint = true; } @@ -1172,7 +1167,7 @@ uint32_t bdSpace::calcNetworkSizeWithFlag(uint32_t withFlag) if (no_peers != 0) { sum += no_peers; - count++; + count++; } } } @@ -1190,7 +1185,6 @@ uint32_t bdSpace::calcNetworkSizeWithFlag(uint32_t withFlag) return NetSize; } - uint32_t bdSpace::calcSpaceSize() { std::vector::iterator it; diff --git a/libbitdht/src/bitdht/bdpeer.h b/libbitdht/src/bitdht/bdpeer.h index 871f41121..59175c531 100644 --- a/libbitdht/src/bitdht/bdpeer.h +++ b/libbitdht/src/bitdht/bdpeer.h @@ -184,6 +184,7 @@ int getDhtBucket(const int idx, bdBucket &bucket); uint32_t calcNetworkSize(); uint32_t calcNetworkSizeWithFlag(uint32_t withFlag); +uint32_t calcNetworkSizeWithFlag_old(uint32_t withFlag); uint32_t calcSpaceSize(); uint32_t calcSpaceSizeWithFlag(uint32_t withFlag); diff --git a/libresapi/src/api/ApiServer.cpp b/libresapi/src/api/ApiServer.cpp index d4e1c9fe5..db642c020 100644 --- a/libresapi/src/api/ApiServer.cpp +++ b/libresapi/src/api/ApiServer.cpp @@ -236,7 +236,8 @@ public: mForumHandler(ifaces.mGxsForums), mServiceControlHandler(ifaces.mServiceControl), mFileSearchHandler(sts, ifaces.mNotify, ifaces.mTurtle, ifaces.mFiles), - mTransfersHandler(sts, ifaces.mFiles), + mFileSharingHandler(sts, ifaces.mFiles), + mTransfersHandler(sts, ifaces.mFiles, ifaces.mPeers), mChatHandler(sts, ifaces.mNotify, ifaces.mMsgs, ifaces.mPeers, ifaces.mIdentity, &mPeersHandler), mApiPluginHandler(sts, ifaces), mChannelsHandler(ifaces.mGxsChannels), @@ -259,6 +260,8 @@ public: &ServiceControlHandler::handleRequest); router.addResourceHandler("filesearch", dynamic_cast(&mFileSearchHandler), &FileSearchHandler::handleRequest); + router.addResourceHandler("filesharing", dynamic_cast(&mFileSharingHandler), + &FileSharingHandler::handleRequest); router.addResourceHandler("transfers", dynamic_cast(&mTransfersHandler), &TransfersHandler::handleRequest); router.addResourceHandler("chat", dynamic_cast(&mChatHandler), @@ -280,6 +283,7 @@ public: ForumHandler mForumHandler; ServiceControlHandler mServiceControlHandler; FileSearchHandler mFileSearchHandler; + FileSharingHandler mFileSharingHandler; TransfersHandler mTransfersHandler; ChatHandler mChatHandler; ApiPluginHandler mApiPluginHandler; diff --git a/libresapi/src/api/ApiServer.h b/libresapi/src/api/ApiServer.h index 10b4c92b0..807271eb5 100644 --- a/libresapi/src/api/ApiServer.h +++ b/libresapi/src/api/ApiServer.h @@ -9,6 +9,7 @@ #include "ServiceControlHandler.h" #include "StateTokenServer.h" #include "FileSearchHandler.h" +#include "FileSharingHandler.h" #include "TransfersHandler.h" #include "LivereloadHandler.h" #include "TmpBlobStore.h" diff --git a/libresapi/src/api/FileSearchHandler.cpp b/libresapi/src/api/FileSearchHandler.cpp index c159ad913..5d3d2a86d 100644 --- a/libresapi/src/api/FileSearchHandler.cpp +++ b/libresapi/src/api/FileSearchHandler.cpp @@ -2,6 +2,7 @@ #include "FileSearchHandler.h" +#include #include #include @@ -10,13 +11,14 @@ namespace resource_api { -FileSearchHandler::FileSearchHandler(StateTokenServer *sts, RsNotify *notify, RsTurtle *turtle, RsFiles */*files*/): - mStateTokenServer(sts), mNotify(notify), mTurtle(turtle),// mFiles(files), +FileSearchHandler::FileSearchHandler(StateTokenServer *sts, RsNotify *notify, RsTurtle *turtle, RsFiles *files): + mStateTokenServer(sts), mNotify(notify), mTurtle(turtle), mRsFiles(files), mMtx("FileSearchHandler") { mNotify->registerNotifyClient(this); addResourceHandler("*", this, &FileSearchHandler::handleWildcard); - addResourceHandler("create_search", this, &FileSearchHandler::handleCreateSearch); + addResourceHandler("create_search", this, &FileSearchHandler::handleCreateSearch); + addResourceHandler("get_search_result", this, &FileSearchHandler::handleGetSearchResult); mSearchesStateToken = mStateTokenServer->getNewToken(); } @@ -102,8 +104,11 @@ void FileSearchHandler::handleWildcard(Request &req, Response &resp) << makeKeyValueReference("id", fd.hash) << makeKeyValueReference("name", fd.name) << makeKeyValueReference("hash", fd.hash) + << makeKeyValueReference("path", fd.path) + << makeKeyValue("peer_id", fd.id.toStdString()) << makeKeyValueReference("size", size) - << makeKeyValueReference("rank", fd.rank); + << makeKeyValueReference("rank", fd.rank) + << makeKeyValueReference("age", fd.age); } } } @@ -194,7 +199,7 @@ void FileSearchHandler::handleCreateSearch(Request &req, Response &resp) if(local) { std::list local_results; - rsFiles->SearchBoolExp(&exprs, local_results, RS_FILE_HINTS_LOCAL); + mRsFiles->SearchBoolExp(&exprs, local_results, RS_FILE_HINTS_LOCAL); for(std::list::iterator lit = local_results.begin(); lit != local_results.end(); ++lit) { @@ -206,7 +211,7 @@ void FileSearchHandler::handleCreateSearch(Request &req, Response &resp) if(remote) { std::list remote_results; - rsFiles->SearchBoolExp(&exprs, remote_results, RS_FILE_HINTS_REMOTE); + mRsFiles->SearchBoolExp(&exprs, remote_results, RS_FILE_HINTS_REMOTE); for(std::list::iterator lit = remote_results.begin(); lit != remote_results.end(); ++lit) { FileDetail fd; @@ -239,4 +244,60 @@ void FileSearchHandler::handleCreateSearch(Request &req, Response &resp) resp.setOk(); } +void FileSearchHandler::handleGetSearchResult(Request& req, Response& resp) +{ + std::string search_id; + req.mStream << makeKeyValueReference("search_id", search_id); + + if(search_id.size() != 8) + { + resp.setFail("Error: id has wrong size, should be 8 characters"); + return; + } + + uint32_t id = 0; + for(uint8_t i = 0; i < 8; i++) + { + id += (uint32_t(search_id[i]-'A')) << (i*4); + } + + { + RsStackMutex stackMtx(mMtx); // ********** STACK LOCKED MTX ********** + std::map::iterator mit = mSearches.find(id); + if(mit == mSearches.end()) + { + resp.setFail("Error: search id invalid"); + return; + } + + Search& search = mit->second; + resp.mStateToken = search.mStateToken; + resp.mDataStream.getStreamToMember(); + + RsPgpId ownId = rsPeers->getGPGOwnId(); + for(std::list::iterator lit = search.mResults.begin(); lit != search.mResults.end(); ++lit) + { + FileDetail& fd = *lit; + bool isFriend = rsPeers->isFriend(fd.id); + bool isOwn = false; + if(ownId == rsPeers->getGPGId(fd.id)) + isOwn = true; + + double size = fd.size; + resp.mDataStream.getStreamToMember() + << makeKeyValueReference("id", fd.hash) + << makeKeyValueReference("name", fd.name) + << makeKeyValueReference("hash", fd.hash) + << makeKeyValueReference("path", fd.path) + << makeKeyValue("peer_id", fd.id.toStdString()) + << makeKeyValueReference("is_friends", isFriend) + << makeKeyValueReference("is_own", isOwn) + << makeKeyValueReference("size", size) + << makeKeyValueReference("rank", fd.rank) + << makeKeyValueReference("age", fd.age); + } + } + resp.setOk(); +} + } // namespace resource_api diff --git a/libresapi/src/api/FileSearchHandler.h b/libresapi/src/api/FileSearchHandler.h index a049c2207..5832577b5 100644 --- a/libresapi/src/api/FileSearchHandler.h +++ b/libresapi/src/api/FileSearchHandler.h @@ -19,12 +19,13 @@ public: virtual void notifyTurtleSearchResult(uint32_t search_id, const std::list& files); private: void handleWildcard(Request& req, Response& resp); - void handleCreateSearch(Request& req, Response& resp); + void handleCreateSearch(Request& req, Response& resp); + void handleGetSearchResult(Request& req, Response& resp); StateTokenServer* mStateTokenServer; RsNotify* mNotify; RsTurtle* mTurtle; - //RsFiles* mFiles; + RsFiles* mRsFiles; class Search{ public: diff --git a/libresapi/src/api/FileSharingHandler.cpp b/libresapi/src/api/FileSharingHandler.cpp new file mode 100644 index 000000000..d948a9511 --- /dev/null +++ b/libresapi/src/api/FileSharingHandler.cpp @@ -0,0 +1,474 @@ +/* + * libresapi + * + * Copyright (C) 2017, Konrad Dębiec + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +#include "FileSharingHandler.h" + +namespace resource_api +{ + +FileSharingHandler::FileSharingHandler(StateTokenServer *sts, RsFiles *files): + mStateTokenServer(sts), mRsFiles(files) +{ + addResourceHandler("*", this, &FileSharingHandler::handleWildcard); + addResourceHandler("force_check", this, &FileSharingHandler::handleForceCheck); + + addResourceHandler("get_shared_dirs", this, &FileSharingHandler::handleGetSharedDir); + addResourceHandler("set_shared_dir", this, &FileSharingHandler::handleSetSharedDir); + addResourceHandler("update_shared_dir", this, &FileSharingHandler::handleUpdateSharedDir); + addResourceHandler("remove_shared_dir", this, &FileSharingHandler::handleRemoveSharedDir); + + addResourceHandler("get_dir_parent", this, &FileSharingHandler::handleGetDirectoryParent); + addResourceHandler("get_dir_childs", this, &FileSharingHandler::handleGetDirectoryChilds); + + addResourceHandler("is_dl_dir_shared", this, &FileSharingHandler::handleIsDownloadDirShared); + addResourceHandler("share_dl_dir", this, &FileSharingHandler::handleShareDownloadDirectory); + + addResourceHandler("download", this, &FileSharingHandler::handleDownload); + + mStateToken = mStateTokenServer->getNewToken(); +} + +void FileSharingHandler::handleWildcard(Request & /*req*/, Response & /*resp*/) +{ + +} + +void FileSharingHandler::handleForceCheck(Request&, Response& resp) +{ + mRsFiles->ForceDirectoryCheck(); + resp.setOk(); +} + +void FileSharingHandler::handleGetSharedDir(Request& req, Response& resp) +{ + DirDetails dirDetails; + mRsFiles->RequestDirDetails(NULL, dirDetails, RS_FILE_HINTS_LOCAL); + + resp.mDataStream << makeKeyValue("parent_reference", *reinterpret_cast(&dirDetails.ref)); + resp.mDataStream << makeKeyValue("path", dirDetails.path); + StreamBase &childsStream = resp.mDataStream.getStreamToMember("childs"); + + for(std::vector::iterator it = dirDetails.children.begin(); it != dirDetails.children.end(); ++it) + { + DirDetails dirDetails; + mRsFiles->RequestDirDetails((*it).ref, dirDetails, RS_FILE_HINTS_LOCAL); + + for(std::vector::iterator vit = dirDetails.children.begin(); vit != dirDetails.children.end(); ++vit) + { + DirDetails dirDetails; + mRsFiles->RequestDirDetails((*vit).ref, dirDetails, RS_FILE_HINTS_LOCAL); + + std::string type; + switch(dirDetails.type) + { + case DIR_TYPE_PERSON: + type = "person"; + break; + case DIR_TYPE_DIR: + type = "folder"; + break; + case DIR_TYPE_FILE: + type = "file"; + break; + } + + bool browsable = false; + bool anon_dl = false; + bool anon_search = false; + + if(dirDetails.flags & DIR_FLAGS_BROWSABLE) + browsable = true; + + if(dirDetails.flags & DIR_FLAGS_ANONYMOUS_DOWNLOAD) + anon_dl = true; + + if(dirDetails.flags & DIR_FLAGS_ANONYMOUS_SEARCH) + anon_search = true; + + StreamBase &streamBase = childsStream.getStreamToMember() + << makeKeyValue("name", dirDetails.name) + << makeKeyValue("path", dirDetails.path) + << makeKeyValue("hash", dirDetails.hash.toStdString()) + << makeKeyValue("parent_reference", *reinterpret_cast(&dirDetails.parent)) + << makeKeyValue("reference", *reinterpret_cast(&dirDetails.ref)) + << makeKeyValue("count", static_cast(dirDetails.count)) + << makeKeyValueReference("type", type) + << makeKeyValueReference("browsable", browsable) + << makeKeyValueReference("anon_dl", anon_dl) + << makeKeyValueReference("anon_search", anon_search); + + + int contain_files = 0; + int contain_folders = 0; + + if(dirDetails.count != 0) + { + for(std::vector::iterator vit = dirDetails.children.begin(); vit != dirDetails.children.end(); ++vit) + { + DirDetails dirDetails; + mRsFiles->RequestDirDetails((*vit).ref, dirDetails, RS_FILE_HINTS_LOCAL); + + switch(dirDetails.type) + { + case DIR_TYPE_DIR: + contain_folders++; + break; + case DIR_TYPE_FILE: + contain_files++; + break; + } + } + } + + streamBase + << makeKeyValueReference("contain_files", contain_files) + << makeKeyValueReference("contain_folders", contain_folders); + } + } +} + +void FileSharingHandler::handleSetSharedDir(Request& req, Response& resp) +{ + std::string dir; + bool browsable = false; + bool anon_dl = false; + bool anon_search = false; + req.mStream << makeKeyValueReference("directory", dir); + req.mStream << makeKeyValueReference("browsable", browsable); + req.mStream << makeKeyValueReference("anon_dl", anon_dl); + req.mStream << makeKeyValueReference("anon_search", anon_search); + + SharedDirInfo sDI; + sDI.filename = dir; + sDI.virtualname.clear(); + sDI.shareflags.clear(); + + if(browsable) + sDI.shareflags |= DIR_FLAGS_BROWSABLE; + + if(anon_dl) + sDI.shareflags |= DIR_FLAGS_ANONYMOUS_DOWNLOAD; + + if(anon_search) + sDI.shareflags |= DIR_FLAGS_ANONYMOUS_SEARCH; + + if(mRsFiles->addSharedDirectory(sDI)) + resp.setOk(); + else + resp.setFail("Couldn't share folder"); +} + +void FileSharingHandler::handleUpdateSharedDir(Request& req, Response& resp) +{ + std::string dir; + std::string virtualname; + bool browsable = false; + bool anon_dl = false; + bool anon_search = false; + req.mStream << makeKeyValueReference("directory", dir); + req.mStream << makeKeyValueReference("virtualname", virtualname); + req.mStream << makeKeyValueReference("browsable", browsable); + req.mStream << makeKeyValueReference("anon_dl", anon_dl); + req.mStream << makeKeyValueReference("anon_search", anon_search); + + SharedDirInfo sDI; + sDI.filename = dir; + sDI.virtualname = virtualname; + sDI.shareflags.clear(); + + if(browsable) + sDI.shareflags |= DIR_FLAGS_BROWSABLE; + + if(anon_dl) + sDI.shareflags |= DIR_FLAGS_ANONYMOUS_DOWNLOAD; + + if(anon_search) + sDI.shareflags |= DIR_FLAGS_ANONYMOUS_SEARCH; + + if(mRsFiles->updateShareFlags(sDI)) + resp.setOk(); + else + resp.setFail("Couldn't update shared folder's flags"); +} + +void FileSharingHandler::handleRemoveSharedDir(Request& req, Response& resp) +{ + std::string dir; + req.mStream << makeKeyValueReference("directory", dir); + + if(mRsFiles->removeSharedDirectory(dir)) + resp.setOk(); + else + resp.setFail("Couldn't remove shared directory."); +} + +void FileSharingHandler::handleGetDirectoryParent(Request& req, Response& resp) +{ + int reference; + bool remote = false; + bool local = true; + + req.mStream << makeKeyValueReference("reference", reference); + req.mStream << makeKeyValueReference("remote", remote); + req.mStream << makeKeyValueReference("local", local); + + void *ref = reinterpret_cast(reference); + + FileSearchFlags flags; + if(remote) + flags |= RS_FILE_HINTS_REMOTE; + + if(local) + flags |= RS_FILE_HINTS_LOCAL; + + DirDetails dirDetails; + mRsFiles->RequestDirDetails(ref, dirDetails, flags); + mRsFiles->RequestDirDetails(dirDetails.parent, dirDetails, flags); + + resp.mDataStream << makeKeyValue("parent_reference", *reinterpret_cast(&dirDetails.ref)); + resp.mDataStream << makeKeyValue("path", dirDetails.path); + StreamBase &childsStream = resp.mDataStream.getStreamToMember("childs"); + + if(dirDetails.count != 0) + { + for(std::vector::iterator vit = dirDetails.children.begin(); vit != dirDetails.children.end(); ++vit) + { + DirDetails dirDetails; + mRsFiles->RequestDirDetails((*vit).ref, dirDetails, flags); + + std::string type; + switch(dirDetails.type) + { + case DIR_TYPE_PERSON: + type = "person"; + break; + case DIR_TYPE_DIR: + type = "folder"; + break; + case DIR_TYPE_FILE: + type = "file"; + break; + } + + bool browsable = false; + bool anon_dl = false; + bool anon_search = false; + + if(dirDetails.flags & DIR_FLAGS_BROWSABLE) + browsable = true; + + if(dirDetails.flags & DIR_FLAGS_ANONYMOUS_DOWNLOAD) + anon_dl = true; + + if(dirDetails.flags & DIR_FLAGS_ANONYMOUS_SEARCH) + anon_search = true; + + StreamBase &streamBase = childsStream.getStreamToMember() + << makeKeyValue("name", dirDetails.name) + << makeKeyValue("path", dirDetails.path) + << makeKeyValue("hash", dirDetails.hash.toStdString()) + << makeKeyValue("parent_reference", *reinterpret_cast(&dirDetails.parent)) + << makeKeyValue("reference", *reinterpret_cast(&dirDetails.ref)) + << makeKeyValue("count", static_cast(dirDetails.count)) + << makeKeyValueReference("type", type) + << makeKeyValueReference("browsable", browsable) + << makeKeyValueReference("anon_dl", anon_dl) + << makeKeyValueReference("anon_search", anon_search); + + + int contain_files = 0; + int contain_folders = 0; + + if(dirDetails.count != 0) + { + for(std::vector::iterator vit = dirDetails.children.begin(); vit != dirDetails.children.end(); ++vit) + { + DirDetails dirDetails; + mRsFiles->RequestDirDetails((*vit).ref, dirDetails, flags); + + switch(dirDetails.type) + { + case DIR_TYPE_DIR: + contain_folders++; + break; + case DIR_TYPE_FILE: + contain_files++; + break; + } + } + } + + streamBase + << makeKeyValueReference("contain_files", contain_files) + << makeKeyValueReference("contain_folders", contain_folders); + } + } +} + +void FileSharingHandler::handleGetDirectoryChilds(Request& req, Response& resp) +{ + int reference = 0; + bool remote = false; + bool local = true; + + req.mStream << makeKeyValueReference("reference", reference); + req.mStream << makeKeyValueReference("remote", remote); + req.mStream << makeKeyValueReference("local", local); + + void *ref = reinterpret_cast(reference); + + FileSearchFlags flags; + if(remote) + flags |= RS_FILE_HINTS_REMOTE; + + if(local) + flags |= RS_FILE_HINTS_LOCAL; + + DirDetails dirDetails; + mRsFiles->RequestDirDetails(ref, dirDetails, flags); + + resp.mDataStream << makeKeyValue("parent_reference", *reinterpret_cast(&dirDetails.ref)); + resp.mDataStream << makeKeyValue("path", dirDetails.path); + resp.mDataStream << makeKeyValue("hash", dirDetails.hash.toStdString()); + StreamBase &childsStream = resp.mDataStream.getStreamToMember("childs"); + + if(dirDetails.count != 0) + { + for(std::vector::iterator vit = dirDetails.children.begin(); vit != dirDetails.children.end(); ++vit) + { + DirDetails dirDetails; + mRsFiles->RequestDirDetails((*vit).ref, dirDetails, flags); + + std::string type; + switch(dirDetails.type) + { + case DIR_TYPE_PERSON: + type = "person"; + break; + case DIR_TYPE_DIR: + type = "folder"; + break; + case DIR_TYPE_FILE: + type = "file"; + break; + } + + bool browsable = false; + bool anon_dl = false; + bool anon_search = false; + + if(dirDetails.flags & DIR_FLAGS_BROWSABLE) + browsable = true; + + if(dirDetails.flags & DIR_FLAGS_ANONYMOUS_DOWNLOAD) + anon_dl = true; + + if(dirDetails.flags & DIR_FLAGS_ANONYMOUS_SEARCH) + anon_search = true; + + StreamBase &streamBase = childsStream.getStreamToMember() + << makeKeyValue("name", dirDetails.name) + << makeKeyValue("path", dirDetails.path) + << makeKeyValue("hash", dirDetails.hash.toStdString()) + << makeKeyValue("parent_reference", *reinterpret_cast(&dirDetails.parent)) + << makeKeyValue("reference", *reinterpret_cast(&dirDetails.ref)) + << makeKeyValue("count", static_cast(dirDetails.count)) + << makeKeyValueReference("type", type) + << makeKeyValueReference("browsable", browsable) + << makeKeyValueReference("anon_dl", anon_dl) + << makeKeyValueReference("anon_search", anon_search); + + + int contain_files = 0; + int contain_folders = 0; + + if(dirDetails.count != 0) + { + for(std::vector::iterator vit = dirDetails.children.begin(); vit != dirDetails.children.end(); ++vit) + { + DirDetails dirDetails; + mRsFiles->RequestDirDetails((*vit).ref, dirDetails, flags); + + switch(dirDetails.type) + { + case DIR_TYPE_DIR: + contain_folders++; + break; + case DIR_TYPE_FILE: + contain_files++; + break; + } + } + } + + streamBase + << makeKeyValueReference("contain_files", contain_files) + << makeKeyValueReference("contain_folders", contain_folders); + } + } +} + +void FileSharingHandler::handleIsDownloadDirShared(Request&, Response& resp) +{ + bool shared = mRsFiles->getShareDownloadDirectory(); + + resp.mDataStream.getStreamToMember() + << makeKeyValueReference("shared", shared); + + resp.setOk(); +} + +void FileSharingHandler::handleShareDownloadDirectory(Request& req, Response& resp) +{ + bool share; + req.mStream << makeKeyValueReference("share", share); + + if(mRsFiles->shareDownloadDirectory(share)) + resp.setOk(); + else + resp.setFail("Couldn't share/unshare download directory."); +} + +void FileSharingHandler::handleDownload(Request& req, Response& resp) +{ + int size; + std::string hashString; + std::string name; + req.mStream << makeKeyValueReference("hash", hashString); + req.mStream << makeKeyValueReference("name", name); + req.mStream << makeKeyValueReference("size", size); + + std::list srcIds; + RsFileHash hash(hashString); + FileInfo finfo; + mRsFiles->FileDetails(hash, RS_FILE_HINTS_REMOTE, finfo); + + for(std::list::const_iterator it(finfo.peers.begin());it!=finfo.peers.end();++it) + srcIds.push_back((*it).peerId); + + if(!mRsFiles->FileRequest(name, hash, static_cast(size), "", + RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds)) + { + resp.setOk(); + return; + } + + resp.setFail("Couldn't download file"); +} + +} // namespace resource_api diff --git a/libresapi/src/api/FileSharingHandler.h b/libresapi/src/api/FileSharingHandler.h new file mode 100644 index 000000000..8b741e80d --- /dev/null +++ b/libresapi/src/api/FileSharingHandler.h @@ -0,0 +1,57 @@ +/* + * libresapi + * + * Copyright (C) 2017, Konrad Dębiec + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +#pragma once + +#include "ResourceRouter.h" +#include "StateTokenServer.h" + +#include + +namespace resource_api +{ + +class FileSharingHandler: public ResourceRouter +{ +public: + FileSharingHandler(StateTokenServer* sts, RsFiles* files); + +private: + void handleWildcard(Request& req, Response& resp); + void handleForceCheck(Request& req, Response& resp); + + void handleGetSharedDir(Request& req, Response& resp); + void handleSetSharedDir(Request& req, Response& resp); + void handleUpdateSharedDir(Request& req, Response& resp); + void handleRemoveSharedDir(Request& req, Response& resp); + + void handleGetDirectoryParent(Request& req, Response& resp); + void handleGetDirectoryChilds(Request& req, Response& resp); + + void handleIsDownloadDirShared(Request& req, Response& resp); + void handleShareDownloadDirectory(Request& req, Response& resp); + + void handleDownload(Request& req, Response& resp); + + StateToken mStateToken; + StateTokenServer* mStateTokenServer; + + RsFiles* mRsFiles; +}; + +} // namespace resource_api diff --git a/libresapi/src/api/TransfersHandler.cpp b/libresapi/src/api/TransfersHandler.cpp index 2b936e032..5b6f43789 100644 --- a/libresapi/src/api/TransfersHandler.cpp +++ b/libresapi/src/api/TransfersHandler.cpp @@ -1,179 +1,278 @@ -#include "TransfersHandler.h" -#include "Operators.h" -#include -#include - -namespace resource_api -{ - -TransfersHandler::TransfersHandler(StateTokenServer *sts, RsFiles *files): - mStateTokenServer(sts), mFiles(files), mLastUpdateTS(0) -{ - addResourceHandler("*", this, &TransfersHandler::handleWildcard); - addResourceHandler("downloads", this, &TransfersHandler::handleDownloads); - addResourceHandler("control_download", this, &TransfersHandler::handleControlDownload); - mStateToken = mStateTokenServer->getNewToken(); - mStateTokenServer->registerTickClient(this); -} - -TransfersHandler::~TransfersHandler() -{ - mStateTokenServer->unregisterTickClient(this); -} - -const int UPDATE_PERIOD_SECONDS = 5; - -void TransfersHandler::tick() -{ - if(time(0) > (mLastUpdateTS + UPDATE_PERIOD_SECONDS)) - mStateTokenServer->replaceToken(mStateToken); - - // extra check: was the list of files changed? - // if yes, replace state token immediately - std::list dls; - mFiles->FileDownloads(dls); - // there is no guarantee of the order - // so have to sort before comparing the lists - dls.sort(); - if(!std::equal(dls.begin(), dls.end(), mDownloadsAtLastCheck.begin())) - { - mDownloadsAtLastCheck.swap(dls); - mStateTokenServer->replaceToken(mStateToken); - } -} - -void TransfersHandler::handleWildcard(Request & /*req*/, Response & /*resp*/) -{ - -} - -void TransfersHandler::handleControlDownload(Request &req, Response &resp) -{ - mStateTokenServer->replaceToken(mStateToken); - RsFileHash hash; - std::string action; - req.mStream << makeKeyValueReference("action", action); - if(action == "begin") - { - std::string fname; - double size; - req.mStream << makeKeyValueReference("name", fname); - req.mStream << makeKeyValueReference("size", size); - req.mStream << makeKeyValueReference("hash", hash); - std::list scrIds; - bool ok = req.mStream.isOK(); - if(ok) - ok = mFiles->FileRequest(fname, hash, size, "", RS_FILE_REQ_ANONYMOUS_ROUTING, scrIds); - if(ok) - resp.setOk(); - else - resp.setFail("something went wrong. are all fields filled in? is the file already downloaded?"); - return; - } - - req.mStream << makeKeyValueReference("id", hash); - if(!req.mStream.isOK()) - { - resp.setFail("error: could not deserialise the request"); - return; - } - bool ok = false; - bool handled = false; - if(action == "pause") - { - handled = true; - ok = mFiles->FileControl(hash, RS_FILE_CTRL_PAUSE); - } - if(action == "start") - { - handled = true; - ok = mFiles->FileControl(hash, RS_FILE_CTRL_START); - } - if(action == "check") - { - handled = true; - ok = mFiles->FileControl(hash, RS_FILE_CTRL_FORCE_CHECK); - } - if(action == "cancel") - { - handled = true; - ok = mFiles->FileCancel(hash); - } - if(ok) - resp.setOk(); - else - resp.setFail("something went wrong. not sure what or why."); - if(handled) - return; - resp.setFail("error: action not handled"); -} - -void TransfersHandler::handleDownloads(Request & /* req */, Response &resp) -{ - tick(); - resp.mStateToken = mStateToken; - resp.mDataStream.getStreamToMember(); - for(std::list::iterator lit = mDownloadsAtLastCheck.begin(); - lit != mDownloadsAtLastCheck.end(); ++lit) - { - FileInfo fi; - if(mFiles->FileDetails(*lit, RS_FILE_HINTS_DOWNLOAD, fi)) - { - StreamBase& stream = resp.mDataStream.getStreamToMember(); - stream << makeKeyValueReference("id", fi.hash) - << makeKeyValueReference("hash", fi.hash) - << makeKeyValueReference("name", fi.fname); - double size = fi.size; - double transfered = fi.transfered; - stream << makeKeyValueReference("size", size) - << makeKeyValueReference("transfered", transfered) - << makeKeyValue("transfer_rate", fi.tfRate); - - std::string dl_status; - /* - const uint32_t FT_STATE_FAILED = 0x0000 ; - const uint32_t FT_STATE_OKAY = 0x0001 ; - const uint32_t FT_STATE_WAITING = 0x0002 ; - const uint32_t FT_STATE_DOWNLOADING = 0x0003 ; - const uint32_t FT_STATE_COMPLETE = 0x0004 ; - const uint32_t FT_STATE_QUEUED = 0x0005 ; - const uint32_t FT_STATE_PAUSED = 0x0006 ; - const uint32_t FT_STATE_CHECKING_HASH = 0x0007 ; - */ - switch(fi.downloadStatus) - { - case FT_STATE_FAILED: - dl_status = "failed"; - break; - case FT_STATE_OKAY: - dl_status = "okay"; - break; - case FT_STATE_WAITING: - dl_status = "waiting"; - break; - case FT_STATE_DOWNLOADING: - dl_status = "downloading"; - break; - case FT_STATE_COMPLETE: - dl_status = "complete"; - break; - case FT_STATE_QUEUED: - dl_status = "queued"; - break; - case FT_STATE_PAUSED: - dl_status = "paused"; - break; - case FT_STATE_CHECKING_HASH: - dl_status = "checking"; - break; - default: - dl_status = "error_unknown"; - } - - stream << makeKeyValueReference("download_status", dl_status); - } - } - resp.setOk(); -} - -} // namespace resource_api +#include "TransfersHandler.h" +#include "Operators.h" +#include +#include + +namespace resource_api +{ + +TransfersHandler::TransfersHandler(StateTokenServer *sts, RsFiles *files, RsPeers *peers): + mStateTokenServer(sts), mFiles(files), mRsPeers(peers), mLastUpdateTS(0) +{ + addResourceHandler("*", this, &TransfersHandler::handleWildcard); + addResourceHandler("downloads", this, &TransfersHandler::handleDownloads); + addResourceHandler("uploads", this, &TransfersHandler::handleUploads); + addResourceHandler("control_download", this, &TransfersHandler::handleControlDownload); + mStateToken = mStateTokenServer->getNewToken(); + mStateTokenServer->registerTickClient(this); +} + +TransfersHandler::~TransfersHandler() +{ + mStateTokenServer->unregisterTickClient(this); +} + +const int UPDATE_PERIOD_SECONDS = 5; + +void TransfersHandler::tick() +{ + if(time(0) > (mLastUpdateTS + UPDATE_PERIOD_SECONDS)) + mStateTokenServer->replaceToken(mStateToken); + + bool replace = false; + // extra check: was the list of files changed? + // if yes, replace state token immediately + std::list dls; + mFiles->FileDownloads(dls); + // there is no guarantee of the order + // so have to sort before comparing the lists + dls.sort(); + if(!std::equal(dls.begin(), dls.end(), mDownloadsAtLastCheck.begin())) + mDownloadsAtLastCheck.swap(dls); + + std::list upls; + mFiles->FileUploads(upls); + + upls.sort(); + if(!std::equal(upls.begin(), upls.end(), mUploadsAtLastCheck.begin())) + mUploadsAtLastCheck.swap(upls); + + if(replace) + mStateTokenServer->replaceToken(mStateToken); +} + +void TransfersHandler::handleWildcard(Request & /*req*/, Response & /*resp*/) +{ + +} + +void TransfersHandler::handleControlDownload(Request &req, Response &resp) +{ + mStateTokenServer->replaceToken(mStateToken); + + std::string hashString; + std::string action; + req.mStream << makeKeyValueReference("action", action); + req.mStream << makeKeyValueReference("hash", hashString); + RsFileHash hash(hashString); + + if(action == "begin") + { + std::string fname; + double size; + req.mStream << makeKeyValueReference("name", fname); + req.mStream << makeKeyValueReference("size", size); + + std::list srcIds; + FileInfo finfo; + mFiles->FileDetails(hash, RS_FILE_HINTS_REMOTE, finfo); + + for(std::list::const_iterator it(finfo.peers.begin());it!=finfo.peers.end();++it) + srcIds.push_back((*it).peerId); + + bool ok = req.mStream.isOK(); + if(ok) + ok = mFiles->FileRequest(fname, hash, size, "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds); + if(ok) + resp.setOk(); + else + resp.setFail("something went wrong. are all fields filled in? is the file already downloaded?"); + return; + } + + if(!req.mStream.isOK()) + { + resp.setFail("error: could not deserialise the request"); + return; + } + bool ok = false; + bool handled = false; + if(action == "pause") + { + handled = true; + ok = mFiles->FileControl(hash, RS_FILE_CTRL_PAUSE); + } + if(action == "start") + { + handled = true; + ok = mFiles->FileControl(hash, RS_FILE_CTRL_START); + } + if(action == "check") + { + handled = true; + ok = mFiles->FileControl(hash, RS_FILE_CTRL_FORCE_CHECK); + } + if(action == "cancel") + { + handled = true; + ok = mFiles->FileCancel(hash); + } + if(ok) + resp.setOk(); + else + resp.setFail("something went wrong. not sure what or why."); + if(handled) + return; + resp.setFail("error: action not handled"); +} + +void TransfersHandler::handleDownloads(Request & /* req */, Response &resp) +{ + tick(); + resp.mStateToken = mStateToken; + resp.mDataStream.getStreamToMember(); + for(std::list::iterator lit = mDownloadsAtLastCheck.begin(); + lit != mDownloadsAtLastCheck.end(); ++lit) + { + FileInfo fi; + if(mFiles->FileDetails(*lit, RS_FILE_HINTS_DOWNLOAD, fi)) + { + StreamBase& stream = resp.mDataStream.getStreamToMember(); + stream << makeKeyValueReference("id", fi.hash) + << makeKeyValueReference("hash", fi.hash) + << makeKeyValueReference("name", fi.fname); + double size = fi.size; + double transfered = fi.transfered; + stream << makeKeyValueReference("size", size) + << makeKeyValueReference("transferred", transfered) + << makeKeyValue("transfer_rate", fi.tfRate); + + std::string dl_status; + + switch(fi.downloadStatus) + { + case FT_STATE_FAILED: + dl_status = "failed"; + break; + case FT_STATE_OKAY: + dl_status = "okay"; + break; + case FT_STATE_WAITING: + dl_status = "waiting"; + break; + case FT_STATE_DOWNLOADING: + dl_status = "downloading"; + break; + case FT_STATE_COMPLETE: + dl_status = "complete"; + break; + case FT_STATE_QUEUED: + dl_status = "queued"; + break; + case FT_STATE_PAUSED: + dl_status = "paused"; + break; + case FT_STATE_CHECKING_HASH: + dl_status = "checking"; + break; + default: + dl_status = "error_unknown"; + } + + stream << makeKeyValueReference("download_status", dl_status); + } + } + resp.setOk(); +} + +void TransfersHandler::handleUploads(Request & /* req */, Response &resp) +{ + tick(); + resp.mStateToken = mStateToken; + resp.mDataStream.getStreamToMember(); + + RsPeerId ownId = mRsPeers->getOwnId(); + + for(std::list::iterator lit = mUploadsAtLastCheck.begin(); + lit != mUploadsAtLastCheck.end(); ++lit) + { + FileInfo fi; + if(mFiles->FileDetails(*lit, RS_FILE_HINTS_UPLOAD, fi)) + { + std::list::iterator pit; + for(pit = fi.peers.begin(); pit != fi.peers.end(); ++pit) + { + if (pit->peerId == ownId) //don't display transfer to ourselves + continue ; + + std::string sourceName = mRsPeers->getPeerName(pit->peerId); + bool isAnon = false; + bool isEncryptedE2E = false; + + if(sourceName == "") + { + isAnon = true; + sourceName = pit->peerId.toStdString(); + + if(rsFiles->isEncryptedSource(pit->peerId)) + isEncryptedE2E = true; + } + + std::string status; + switch(pit->status) + { + case FT_STATE_FAILED: + status = "Failed"; + break; + case FT_STATE_OKAY: + status = "Okay"; + break; + case FT_STATE_WAITING: + status = "Waiting"; + break; + case FT_STATE_DOWNLOADING: + status = "Uploading"; + break; + case FT_STATE_COMPLETE: + status = "Complete"; + break; + default: + status = "Complete"; + break; + } + + CompressedChunkMap cChunkMap; + + if(!rsFiles->FileUploadChunksDetails(*lit, pit->peerId, cChunkMap)) + continue; + + double dlspeed = pit->tfRate; + double fileSize = fi.size; + double completed = pit->transfered; + + uint32_t chunk_size = 1024*1024; + uint32_t nb_chunks = (uint32_t)((fi.size + (uint64_t)chunk_size - 1) / (uint64_t)(chunk_size)); + uint32_t filled_chunks = cChunkMap.filledChunks(nb_chunks); + + if(filled_chunks > 0 && nb_chunks > 0) + completed = cChunkMap.computeProgress(fi.size, chunk_size); + else + completed = pit->transfered % chunk_size; + + resp.mDataStream.getStreamToMember() + << makeKeyValueReference("hash", fi.hash) + << makeKeyValueReference("name", fi.fname) + << makeKeyValueReference("source", sourceName) + << makeKeyValueReference("size", fileSize) + << makeKeyValueReference("transferred", completed) + << makeKeyValueReference("is_anonymous", isAnon) + << makeKeyValueReference("is_encrypted_e2e", isEncryptedE2E) + << makeKeyValueReference("transfer_rate", dlspeed) + << makeKeyValueReference("status", status); + } + } + } + resp.setOk(); +} + +} // namespace resource_api diff --git a/libresapi/src/api/TransfersHandler.h b/libresapi/src/api/TransfersHandler.h index e4029284d..0c53f2cd7 100644 --- a/libresapi/src/api/TransfersHandler.h +++ b/libresapi/src/api/TransfersHandler.h @@ -1,10 +1,10 @@ #pragma once -#pragma once #include "ResourceRouter.h" #include "StateTokenServer.h" #include +#include namespace resource_api { @@ -12,7 +12,7 @@ namespace resource_api class TransfersHandler: public ResourceRouter, Tickable { public: - TransfersHandler(StateTokenServer* sts, RsFiles* files); + TransfersHandler(StateTokenServer* sts, RsFiles* files, RsPeers *peers); virtual ~TransfersHandler(); // from Tickable @@ -21,14 +21,17 @@ private: void handleWildcard(Request& req, Response& resp); void handleControlDownload(Request& req, Response& resp); void handleDownloads(Request& req, Response& resp); + void handleUploads(Request& req, Response& resp); StateTokenServer* mStateTokenServer; RsFiles* mFiles; + RsPeers* mRsPeers; StateToken mStateToken; time_t mLastUpdateTS; std::list mDownloadsAtLastCheck; + std::list mUploadsAtLastCheck; }; } // namespace resource_api diff --git a/libresapi/src/libresapi.pro b/libresapi/src/libresapi.pro index e548ea9d0..69745f1b0 100644 --- a/libresapi/src/libresapi.pro +++ b/libresapi/src/libresapi.pro @@ -182,7 +182,8 @@ SOURCES += \ util/ContentTypes.cpp \ api/ApiPluginHandler.cpp \ api/ChannelsHandler.cpp \ - api/StatsHandler.cpp + api/StatsHandler.cpp \ + api/FileSharingHandler.cpp HEADERS += \ api/ApiServer.h \ @@ -209,7 +210,8 @@ HEADERS += \ util/ContentTypes.h \ api/ApiPluginHandler.h \ api/ChannelsHandler.h \ - api/StatsHandler.h + api/StatsHandler.h \ + api/FileSharingHandler.h libresapilocalserver { CONFIG *= qt diff --git a/libresapi/src/webui-src/app/chat.js b/libresapi/src/webui-src/app/chat.js index b08cfa59b..0d8ef7069 100644 --- a/libresapi/src/webui-src/app/chat.js +++ b/libresapi/src/webui-src/app/chat.js @@ -234,9 +234,11 @@ function lobby(lobbyid){ ]; } else { - var el = document.getElementById("CharLobbyName"); - el.innerText = lobdt.name; - + var cln = document.getElementById("ChatLobbyName"); + if (cln != null) { + cln.innerText = lobdt.name; + } + msg = m(".chat.bottom",[ m("div","enter new message, Ctrl+Enter to submit:"), m("textarea",{ @@ -388,7 +390,7 @@ module.exports = { "h2", { style:{margin:"0px"}, - id:"CharLobbyName" + id:"ChatLobbyName" }, "Lobby Name" ) diff --git a/libretroshare/src/file_sharing/dir_hierarchy.cc b/libretroshare/src/file_sharing/dir_hierarchy.cc index 9ec6d2088..c2b7baa44 100644 --- a/libretroshare/src/file_sharing/dir_hierarchy.cc +++ b/libretroshare/src/file_sharing/dir_hierarchy.cc @@ -887,7 +887,10 @@ void InternalFileHierarchyStorage::print() const std::cerr << "(EE) Error: unknown type node found!" << std::endl; } - std::cerr << "Total nodes: " << mNodes.size() << " (" << nfiles << " files, " << ndirs << " dirs, " << nempty << " empty slots)" << std::endl; + std::cerr << "Total nodes: " << mNodes.size() << " (" << nfiles << " files, " << ndirs << " dirs, " << nempty << " empty slots"; + if (nunknown > 0) std::cerr << ", " << nunknown << " unknown"; + std::cerr << ")" << std::endl; + recursPrint(0,DirectoryStorage::EntryIndex(0)); diff --git a/libretroshare/src/file_sharing/dir_hierarchy.h b/libretroshare/src/file_sharing/dir_hierarchy.h index e9ef9f1c4..0eeda5e6f 100644 --- a/libretroshare/src/file_sharing/dir_hierarchy.h +++ b/libretroshare/src/file_sharing/dir_hierarchy.h @@ -68,7 +68,7 @@ public: class DirEntry: public FileStorageNode { public: - DirEntry(const std::string& name) : dir_name(name), dir_modtime(0),dir_most_recent_time(0),dir_update_time(0) {} + explicit DirEntry(const std::string& name) : dir_name(name), dir_modtime(0),dir_most_recent_time(0),dir_update_time(0) {} virtual ~DirEntry() {} virtual uint32_t type() const { return FileStorageNode::TYPE_DIR ; } diff --git a/libretroshare/src/file_sharing/directory_storage.cc b/libretroshare/src/file_sharing/directory_storage.cc index 8a58ec0fc..eb3c58626 100644 --- a/libretroshare/src/file_sharing/directory_storage.cc +++ b/libretroshare/src/file_sharing/directory_storage.cc @@ -576,7 +576,7 @@ bool LocalDirectoryStorage::getFileInfo(DirectoryStorage::EntryIndex i,FileInfo& info.transfered = 0; info.tfRate = 0; /* in kbytes */ info.downloadStatus = FT_STATE_COMPLETE ; - std::list peers; + //std::list peers; info.priority = SPEED_NORMAL; info.lastTS = 0; diff --git a/libretroshare/src/file_sharing/directory_storage.h b/libretroshare/src/file_sharing/directory_storage.h index 91e67fcff..22377bb0b 100644 --- a/libretroshare/src/file_sharing/directory_storage.h +++ b/libretroshare/src/file_sharing/directory_storage.h @@ -97,7 +97,7 @@ class DirectoryStorage class FileIterator { public: - FileIterator(DirIterator& d); // crawls all files in specified directory + explicit FileIterator(DirIterator& d); // crawls all files in specified directory FileIterator(DirectoryStorage *d,EntryIndex e); // crawls all files in specified directory FileIterator& operator++() ; diff --git a/libretroshare/src/file_sharing/hash_cache.cc b/libretroshare/src/file_sharing/hash_cache.cc index 03ee9f991..89a4aec38 100644 --- a/libretroshare/src/file_sharing/hash_cache.cc +++ b/libretroshare/src/file_sharing/hash_cache.cc @@ -24,6 +24,7 @@ */ #include "util/rsdir.h" #include "util/rsprint.h" +#include "util/rsscopetimer.h" #include "rsserver/p3face.h" #include "pqi/authssl.h" #include "hash_cache.h" @@ -43,8 +44,11 @@ HashStorage::HashStorage(const std::string& save_file_name) mLastSaveTime = 0 ; mTotalSizeToHash = 0; mTotalFilesToHash = 0; + mCurrentHashingSpeed = 0 ; mMaxStorageDurationDays = DEFAULT_HASH_STORAGE_DURATION_DAYS ; mHashingProcessPaused = false; + mHashedBytes = 0 ; + mHashingTime = 0 ; { RS_STACK_MUTEX(mHashMtx) ; @@ -178,32 +182,48 @@ void HashStorage::data_tick() #endif std::string tmpout; - rs_sprintf(tmpout, "%lu/%lu (%s - %d%%) : %s", (unsigned long int)mHashCounter+1, (unsigned long int)mTotalFilesToHash, friendlyUnit(mTotalHashedSize).c_str(), int(mTotalHashedSize/double(mTotalSizeToHash)*100.0), job.full_path.c_str()) ; + + if(mCurrentHashingSpeed > 0) + rs_sprintf(tmpout, "%lu/%lu (%s - %d%%, %d MB/s) : %s", (unsigned long int)mHashCounter+1, (unsigned long int)mTotalFilesToHash, friendlyUnit(mTotalHashedSize).c_str(), int(mTotalHashedSize/double(mTotalSizeToHash)*100.0), mCurrentHashingSpeed,job.full_path.c_str()) ; + else + rs_sprintf(tmpout, "%lu/%lu (%s - %d%%) : %s", (unsigned long int)mHashCounter+1, (unsigned long int)mTotalFilesToHash, friendlyUnit(mTotalHashedSize).c_str(), int(mTotalHashedSize/double(mTotalSizeToHash)*100.0), job.full_path.c_str()) ; RsServer::notify()->notifyHashingInfo(NOTIFY_HASHTYPE_HASH_FILE, tmpout) ; - if(RsDirUtil::getFileHash(job.full_path, hash,size, this)) - { - // store the result + double seconds_origin = RsScopeTimer::currentTime() ; + + if(RsDirUtil::getFileHash(job.full_path, hash,size, this)) + { + // store the result #ifdef HASHSTORAGE_DEBUG - std::cerr << "done."<< std::endl; + std::cerr << "done."<< std::endl; #endif - RS_STACK_MUTEX(mHashMtx) ; - HashStorageInfo& info(mFiles[job.real_path]); + RS_STACK_MUTEX(mHashMtx) ; + HashStorageInfo& info(mFiles[job.real_path]); - info.filename = job.real_path ; - info.size = size ; - info.modf_stamp = job.ts ; - info.time_stamp = time(NULL); - info.hash = hash; + info.filename = job.real_path ; + info.size = size ; + info.modf_stamp = job.ts ; + info.time_stamp = time(NULL); + info.hash = hash; - mChanged = true ; - mTotalHashedSize += size ; - } - else - std::cerr << "ERROR: cannot hash file " << job.full_path << std::endl; + mChanged = true ; + mTotalHashedSize += size ; + } + else + std::cerr << "ERROR: cannot hash file " << job.full_path << std::endl; + + mHashingTime += RsScopeTimer::currentTime() - seconds_origin ; + mHashedBytes += size ; + + if(mHashingTime > 3) + { + mCurrentHashingSpeed = (int)(mHashedBytes / mHashingTime ) / (1024*1024) ; + mHashingTime = 0 ; + mHashedBytes = 0 ; + } ++mHashCounter ; } diff --git a/libretroshare/src/file_sharing/hash_cache.h b/libretroshare/src/file_sharing/hash_cache.h index 7a235dc9a..05dcbd9c3 100644 --- a/libretroshare/src/file_sharing/hash_cache.h +++ b/libretroshare/src/file_sharing/hash_cache.h @@ -54,7 +54,7 @@ public: class HashStorage: public RsTickingThread { public: - HashStorage(const std::string& save_file_name) ; + explicit HashStorage(const std::string& save_file_name) ; /*! * \brief requestHash Requests the hash for the given file, assuming size and mod_time are the same. @@ -140,5 +140,11 @@ private: uint64_t mTotalHashedSize ; uint64_t mTotalFilesToHash ; time_t mLastSaveTime ; + + // The following is used to estimate hashing speed. + + double mHashingTime ; + uint64_t mHashedBytes ; + uint32_t mCurrentHashingSpeed ; // in MB/s }; diff --git a/libretroshare/src/file_sharing/p3filelists.cc b/libretroshare/src/file_sharing/p3filelists.cc index 1a93f4350..bb5ba4e2f 100644 --- a/libretroshare/src/file_sharing/p3filelists.cc +++ b/libretroshare/src/file_sharing/p3filelists.cc @@ -437,14 +437,14 @@ bool p3FileDatabase::loadList(std::list& load) if (NULL != (rskv = dynamic_cast(*it))) { /* make into map */ - std::map configMap; - std::map::const_iterator mit ; + //std::map configMap; + //std::map::const_iterator mit ; for(std::list::const_iterator kit = rskv->tlvkvs.pairs.begin(); kit != rskv->tlvkvs.pairs.end(); ++kit) if (kit->key == HASH_CACHE_DURATION_SS) { uint32_t t=0 ; - if(sscanf(kit->value.c_str(),"%d",&t) == 1) + if(sscanf(kit->value.c_str(),"%u",&t) == 1) mHashCache->setRememberHashFilesDuration(t); } else if(kit->key == WATCH_FILE_DURATION_SS) @@ -1744,7 +1744,7 @@ void p3FileDatabase::locked_recursSweepRemoteDirectory(RemoteDirectoryStorage *r { time_t now = time(NULL) ; - std::string indent(2*depth,' ') ; + //std::string indent(2*depth,' ') ; // if not up to date, request update, and return (content is not certified, so no need to recurs yet). // if up to date, return, because TS is about the last modif TS below, so no need to recurs either. diff --git a/libretroshare/src/file_sharing/p3filelists.h b/libretroshare/src/file_sharing/p3filelists.h index 15f279484..9eb5047da 100644 --- a/libretroshare/src/file_sharing/p3filelists.h +++ b/libretroshare/src/file_sharing/p3filelists.h @@ -83,7 +83,7 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub // [...] more to add here }; - p3FileDatabase(p3ServiceControl *mpeers) ; + explicit p3FileDatabase(p3ServiceControl *mpeers) ; ~p3FileDatabase(); /*! diff --git a/libretroshare/src/file_sharing/rsfilelistitems.h b/libretroshare/src/file_sharing/rsfilelistitems.h index 51e40b9c3..2f04a84a5 100644 --- a/libretroshare/src/file_sharing/rsfilelistitems.h +++ b/libretroshare/src/file_sharing/rsfilelistitems.h @@ -49,7 +49,7 @@ const uint8_t RS_PKT_SUBTYPE_FILELISTS_CONFIG_ITEM = 0x03; class RsFileListsItem : public RsItem { public: - RsFileListsItem(uint8_t subtype) + explicit RsFileListsItem(uint8_t subtype) : RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_FILE_DATABASE, subtype) { setPriorityLevel(QOS_PRIORITY_RS_SLOW_SYNC_REQUEST); // this is the default. Someitems may be faster, on demand. @@ -75,7 +75,7 @@ class RsFileListsSyncRequestItem : public RsFileListsItem { public: - RsFileListsSyncRequestItem() : RsFileListsItem(RS_PKT_SUBTYPE_FILELISTS_SYNC_REQ_ITEM) {} + RsFileListsSyncRequestItem() : RsFileListsItem(RS_PKT_SUBTYPE_FILELISTS_SYNC_REQ_ITEM), flags(0), last_known_recurs_modf_TS(0), request_id(0) {} virtual void clear(){} @@ -91,7 +91,7 @@ class RsFileListsSyncResponseItem : public RsFileListsItem { public: - RsFileListsSyncResponseItem() : RsFileListsItem(RS_PKT_SUBTYPE_FILELISTS_SYNC_RSP_ITEM) {} + RsFileListsSyncResponseItem() : RsFileListsItem(RS_PKT_SUBTYPE_FILELISTS_SYNC_RSP_ITEM), flags(0), last_known_recurs_modf_TS(0), request_id(0) {} virtual void clear(); diff --git a/libretroshare/src/ft/ftchunkmap.h b/libretroshare/src/ft/ftchunkmap.h index 93ca25021..3ee4a1234 100644 --- a/libretroshare/src/ft/ftchunkmap.h +++ b/libretroshare/src/ft/ftchunkmap.h @@ -34,7 +34,7 @@ class ftChunk public: typedef uint64_t ChunkId ; - ftChunk():offset(0), size(0), ts(0),ref_cnt(NULL) {} + ftChunk():offset(0), size(0), id(0), ts(0),ref_cnt(NULL) {} friend std::ostream& operator<<(std::ostream& o,const ftChunk& f) ; diff --git a/libretroshare/src/ft/ftfilecreator.cc b/libretroshare/src/ft/ftfilecreator.cc index ec6d0099f..c47cc1c4c 100644 --- a/libretroshare/src/ft/ftfilecreator.cc +++ b/libretroshare/src/ft/ftfilecreator.cc @@ -83,7 +83,7 @@ bool ftFileCreator::getFileData(const RsPeerId& peer_id,uint64_t offset, uint32_ // try if we have data from an incomplete or not veryfied chunk if(!have_it && allow_unverified) { - std::map::iterator it; + //std::map::iterator it; have_it = true; // this map contains chunks which are currently being downloaded for(std::map::iterator it=mChunks.begin(); it!=mChunks.end(); ++it) @@ -542,6 +542,7 @@ bool ftFileCreator::getMissingChunk(const RsPeerId& peer_id,uint32_t size_hint,u mChunks[chunk.offset] = chunk ; offset = chunk.offset ; + // cppcheck-suppress unreadVariable size = chunk.size ; ++chunks_for_this_peer ; // increase number of chunks for this peer. diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc index 7b546c31e..f2200d7db 100644 --- a/libretroshare/src/ft/ftserver.cc +++ b/libretroshare/src/ft/ftserver.cc @@ -131,8 +131,8 @@ void ftServer::SetupFtServer() { /* setup FiStore/Monitor */ - std::string localcachedir = mConfigPath + "/cache/local"; - std::string remotecachedir = mConfigPath + "/cache/remote"; + //std::string localcachedir = mConfigPath + "/cache/local"; + //std::string remotecachedir = mConfigPath + "/cache/remote"; RsPeerId ownId = mServiceCtrl->getOwnId(); /* search/extras List */ diff --git a/libretroshare/src/ft/fttransfermodule.cc b/libretroshare/src/ft/fttransfermodule.cc index 3c4951dc9..46d10c400 100644 --- a/libretroshare/src/ft/fttransfermodule.cc +++ b/libretroshare/src/ft/fttransfermodule.cc @@ -155,7 +155,7 @@ bool ftTransferModule::addFileSource(const RsPeerId& peerId) /* add in new source */ peerInfo pInfo(peerId); mFileSources.insert(std::pair(peerId,pInfo)); - mit = mFileSources.find(peerId); + //mit = mFileSources.find(peerId); mMultiplexor->sendChunkMapRequest(peerId, mHash,false) ; #ifdef FT_DEBUG @@ -545,7 +545,7 @@ bool ftTransferModule::isCheckingHash() class HashThread: public RsSingleJobThread { public: - HashThread(ftFileCreator *m) + explicit HashThread(ftFileCreator *m) : _hashThreadMtx("HashThread"), _m(m),_finished(false),_hash("") {} virtual void run() diff --git a/libretroshare/src/ft/fttransfermodule.h b/libretroshare/src/ft/fttransfermodule.h index 163773a4e..02cf0212d 100644 --- a/libretroshare/src/ft/fttransfermodule.h +++ b/libretroshare/src/ft/fttransfermodule.h @@ -56,7 +56,7 @@ class HashThread ; class peerInfo { public: - peerInfo(const RsPeerId& peerId_in):peerId(peerId_in),state(PQIPEER_NOT_ONLINE),desiredRate(0),actualRate(0), + explicit peerInfo(const RsPeerId& peerId_in):peerId(peerId_in),state(PQIPEER_NOT_ONLINE),desiredRate(0),actualRate(0), lastTS(0), recvTS(0), lastTransfers(0), nResets(0), rtt(0), rttActive(false), rttStart(0), rttOffset(0), @@ -111,7 +111,7 @@ public: }; ftFileStatus():hash(""),stat(PQIFILE_INIT) {} - ftFileStatus(const RsFileHash& hash_in):hash(hash_in),stat(PQIFILE_INIT) {} + explicit ftFileStatus(const RsFileHash& hash_in):hash(hash_in),stat(PQIFILE_INIT) {} RsFileHash hash; Status stat; diff --git a/libretroshare/src/ft/ftturtlefiletransferitem.h b/libretroshare/src/ft/ftturtlefiletransferitem.h index ce4a25217..a2aa18034 100644 --- a/libretroshare/src/ft/ftturtlefiletransferitem.h +++ b/libretroshare/src/ft/ftturtlefiletransferitem.h @@ -33,7 +33,7 @@ class RsTurtleFileRequestItem: public RsTurtleGenericTunnelItem { public: - RsTurtleFileRequestItem() : RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_FILE_REQUEST) { setPriorityLevel(QOS_PRIORITY_RS_TURTLE_FILE_REQUEST);} + RsTurtleFileRequestItem() : RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_FILE_REQUEST), chunk_offset(0), chunk_size(0) { setPriorityLevel(QOS_PRIORITY_RS_TURTLE_FILE_REQUEST);} virtual bool shouldStampTunnel() const { return false ; } virtual Direction travelingDirection() const { return DIRECTION_SERVER ; } @@ -49,7 +49,7 @@ class RsTurtleFileRequestItem: public RsTurtleGenericTunnelItem class RsTurtleFileDataItem: public RsTurtleGenericTunnelItem { public: - RsTurtleFileDataItem() : RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_FILE_DATA) { setPriorityLevel(QOS_PRIORITY_RS_TURTLE_FILE_DATA) ;} + RsTurtleFileDataItem() : RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_FILE_DATA), chunk_offset(0), chunk_size(0), chunk_data(NULL) { setPriorityLevel(QOS_PRIORITY_RS_TURTLE_FILE_DATA) ;} ~RsTurtleFileDataItem() { clear() ; } virtual bool shouldStampTunnel() const { return true ; } @@ -99,13 +99,13 @@ class RsTurtleFileMapItem: public RsTurtleGenericTunnelItem class RsTurtleChunkCrcRequestItem: public RsTurtleGenericTunnelItem { public: - RsTurtleChunkCrcRequestItem() : RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_CHUNK_CRC_REQUEST) { setPriorityLevel(QOS_PRIORITY_RS_CHUNK_CRC_REQUEST);} + RsTurtleChunkCrcRequestItem() : RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_CHUNK_CRC_REQUEST), chunk_number(0) { setPriorityLevel(QOS_PRIORITY_RS_CHUNK_CRC_REQUEST);} virtual bool shouldStampTunnel() const { return false ; } virtual Direction travelingDirection() const { return DIRECTION_SERVER ; } uint32_t chunk_number ; // id of the chunk to CRC. - + void clear() {} void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx); }; @@ -113,7 +113,7 @@ class RsTurtleChunkCrcRequestItem: public RsTurtleGenericTunnelItem class RsTurtleChunkCrcItem: public RsTurtleGenericTunnelItem { public: - RsTurtleChunkCrcItem() : RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_CHUNK_CRC) { setPriorityLevel(QOS_PRIORITY_RS_CHUNK_CRC);} + RsTurtleChunkCrcItem() : RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_CHUNK_CRC), chunk_number(0) { setPriorityLevel(QOS_PRIORITY_RS_CHUNK_CRC);} virtual bool shouldStampTunnel() const { return true ; } virtual Direction travelingDirection() const { return DIRECTION_CLIENT ; } diff --git a/libretroshare/src/grouter/grouteritems.h b/libretroshare/src/grouter/grouteritems.h index 505f35361..9777c074b 100644 --- a/libretroshare/src/grouter/grouteritems.h +++ b/libretroshare/src/grouter/grouteritems.h @@ -59,7 +59,7 @@ const uint8_t QOS_PRIORITY_RS_GROUTER = 4 ; // relevant for items that travel class RsGRouterItem: public RsItem { public: - RsGRouterItem(uint8_t grouter_subtype) : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_TYPE_GROUTER,grouter_subtype) {} + explicit RsGRouterItem(uint8_t grouter_subtype) : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_TYPE_GROUTER,grouter_subtype) {} virtual ~RsGRouterItem() {} @@ -90,7 +90,7 @@ class RsGRouterNonCopyableObject class RsGRouterAbstractMsgItem: public RsGRouterItem { public: - RsGRouterAbstractMsgItem(uint8_t pkt_subtype) : RsGRouterItem(pkt_subtype) {} + explicit RsGRouterAbstractMsgItem(uint8_t pkt_subtype) : RsGRouterItem(pkt_subtype), flags(0) {} virtual ~RsGRouterAbstractMsgItem() {} GRouterMsgPropagationId routing_id ; @@ -103,7 +103,7 @@ public: class RsGRouterGenericDataItem: public RsGRouterAbstractMsgItem, public RsGRouterNonCopyableObject { public: - RsGRouterGenericDataItem() : RsGRouterAbstractMsgItem(RS_PKT_SUBTYPE_GROUTER_DATA) { setPriorityLevel(QOS_PRIORITY_RS_GROUTER) ; } + RsGRouterGenericDataItem() : RsGRouterAbstractMsgItem(RS_PKT_SUBTYPE_GROUTER_DATA), data_size(0), data_bytes(NULL), duplication_factor(0) { setPriorityLevel(QOS_PRIORITY_RS_GROUTER) ; } virtual ~RsGRouterGenericDataItem() { clear() ; } virtual void clear() @@ -144,7 +144,7 @@ class RsGRouterSignedReceiptItem: public RsGRouterAbstractMsgItem class RsGRouterTransactionItem: public RsGRouterItem { public: - RsGRouterTransactionItem(uint8_t pkt_subtype) : RsGRouterItem(pkt_subtype) {} + explicit RsGRouterTransactionItem(uint8_t pkt_subtype) : RsGRouterItem(pkt_subtype) {} virtual ~RsGRouterTransactionItem() {} @@ -156,7 +156,7 @@ class RsGRouterTransactionItem: public RsGRouterItem class RsGRouterTransactionChunkItem: public RsGRouterTransactionItem, public RsGRouterNonCopyableObject { public: - RsGRouterTransactionChunkItem() : RsGRouterTransactionItem(RS_PKT_SUBTYPE_GROUTER_TRANSACTION_CHUNK) { setPriorityLevel(QOS_PRIORITY_RS_GROUTER) ; } + RsGRouterTransactionChunkItem() : RsGRouterTransactionItem(RS_PKT_SUBTYPE_GROUTER_TRANSACTION_CHUNK), chunk_start(0), chunk_size(0), total_size(0), chunk_data(NULL) { setPriorityLevel(QOS_PRIORITY_RS_GROUTER) ; } virtual ~RsGRouterTransactionChunkItem() { free(chunk_data) ; } @@ -217,7 +217,7 @@ class RsGRouterMatrixCluesItem: public RsGRouterItem class RsGRouterMatrixTrackItem: public RsGRouterItem { public: - RsGRouterMatrixTrackItem() : RsGRouterItem(RS_PKT_SUBTYPE_GROUTER_MATRIX_TRACK) + RsGRouterMatrixTrackItem() : RsGRouterItem(RS_PKT_SUBTYPE_GROUTER_MATRIX_TRACK), time_stamp(0) { setPriorityLevel(0) ; } // this item is never sent through the network virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx); @@ -271,7 +271,7 @@ class RsGRouterRoutingInfoItem: public RsGRouterItem, public GRouterRoutingInfo, class RsGRouterSerialiser: public RsServiceSerializer { public: - RsGRouterSerialiser(SerializationFlags flags = SERIALIZATION_FLAG_NONE) : RsServiceSerializer(RS_SERVICE_TYPE_GROUTER,RsGenericSerializer::FORMAT_BINARY,flags) {} + explicit RsGRouterSerialiser(SerializationFlags flags = SERIALIZATION_FLAG_NONE) : RsServiceSerializer(RS_SERVICE_TYPE_GROUTER,RsGenericSerializer::FORMAT_BINARY,flags) {} virtual RsItem *create_item(uint16_t service,uint8_t subtype) const ; }; diff --git a/libretroshare/src/grouter/groutertypes.h b/libretroshare/src/grouter/groutertypes.h index 91eb1608b..df8c90d48 100644 --- a/libretroshare/src/grouter/groutertypes.h +++ b/libretroshare/src/grouter/groutertypes.h @@ -97,11 +97,17 @@ class GRouterRoutingInfo // ovoids lots of duplications if the class is copied. public: GRouterRoutingInfo() - { - data_transaction_TS = 0 ; // this is not serialised. - data_item = NULL ; - receipt_item = NULL ; - } + : data_status(0) + , tunnel_status(0) + , received_time_TS(0) + , last_sent_TS(0) + , last_tunnel_request_TS(0) + , sending_attempts(0) + , routing_flags(0) + , data_item(NULL) + , receipt_item(NULL) + , data_transaction_TS(0) // this is not serialised. + {} uint32_t data_status ; // pending, waiting, etc. uint32_t tunnel_status ; // status of tunnel handling. diff --git a/libretroshare/src/grouter/p3grouter.cc b/libretroshare/src/grouter/p3grouter.cc index 0717ee15f..75e8fd4d6 100644 --- a/libretroshare/src/grouter/p3grouter.cc +++ b/libretroshare/src/grouter/p3grouter.cc @@ -204,7 +204,7 @@ const std::string p3GRouter::SERVICE_INFO_APP_NAME = "Global Router" ; p3GRouter::p3GRouter(p3ServiceControl *sc, RsGixs *is) - : p3Service(), p3Config(), mServiceControl(sc), mGixs(is), grMtx("GRouter") + : p3Service(), p3Config(), mServiceControl(sc), mTurtle(NULL), mGixs(is), grMtx("GRouter") { addSerialType(new RsGRouterSerialiser()) ; @@ -2292,6 +2292,8 @@ bool p3GRouter::saveList(bool& cleanup,std::list& items) { RsGRouterRoutingInfoItem *item = new RsGRouterRoutingInfoItem ; +#warning: Cppcheck(cstyleCast): C-style pointer casting + // cppcheck-suppress cstyleCast *(GRouterRoutingInfo*)item = it->second ; // copy all members item->data_item = it->second.data_item->duplicate() ; // deep copy, because we call delete on the object, and the item might be removed before we handle it in the client. diff --git a/libretroshare/src/grouter/p3grouter.h b/libretroshare/src/grouter/p3grouter.h index 4ed537496..71b2fc138 100644 --- a/libretroshare/src/grouter/p3grouter.h +++ b/libretroshare/src/grouter/p3grouter.h @@ -79,7 +79,7 @@ class GRouterDataInfo { // ! This class does not have a copy constructor that duplicates the incoming data buffer. This is on purpose! public: - GRouterDataInfo() + GRouterDataInfo() : last_activity_TS(0) { incoming_data_buffer = NULL ; } @@ -339,7 +339,7 @@ private: p3ServiceControl *mServiceControl ; p3turtle *mTurtle ; RsGixs *mGixs ; - p3LinkMgr *mLinkMgr ; + //p3LinkMgr *mLinkMgr ; // Multi-thread protection mutex. // diff --git a/libretroshare/src/gxs/gxstokenqueue.h b/libretroshare/src/gxs/gxstokenqueue.h index 4883fecbf..1099cd338 100644 --- a/libretroshare/src/gxs/gxstokenqueue.h +++ b/libretroshare/src/gxs/gxstokenqueue.h @@ -48,7 +48,7 @@ struct GxsTokenQueueItem class GxsTokenQueue { public: - GxsTokenQueue(RsGenExchange *gxs) : + explicit GxsTokenQueue(RsGenExchange *gxs) : mGenExchange(gxs), mQueueMtx("GxsTokenQueueMtx") {} bool queueRequest(uint32_t token, uint32_t req_type); diff --git a/libretroshare/src/gxs/rsgenexchange.cc b/libretroshare/src/gxs/rsgenexchange.cc index d82e5ba45..0c32bab92 100644 --- a/libretroshare/src/gxs/rsgenexchange.cc +++ b/libretroshare/src/gxs/rsgenexchange.cc @@ -82,6 +82,7 @@ RsGenExchange::RsGenExchange(RsGeneralDataService *gds, RsNetworkExchangeService mLastClean((int)time(NULL) - (int)(RSRandom::random_u32() % MSG_CLEANUP_PERIOD)), // this helps unsynchronising the checks for the different services mMsgCleanUp(NULL), mChecking(false), + mCheckStarted(false), mLastCheck((int)time(NULL) - (int)(RSRandom::random_u32() % INTEGRITY_CHECK_PERIOD) + 120), // this helps unsynchronising the checks for the different services, with 2 min security to avoid checking right away before statistics come up. mIntegrityCheck(NULL), SIGN_MAX_WAITING_TIME(60), @@ -1234,7 +1235,7 @@ bool RsGenExchange::getMsgMeta(const uint32_t &token, #ifdef GEN_EXCH_DEBUG std::cerr << "RsGenExchange::getMsgMeta(): retrieving meta data for token " << token << std::endl; #endif - std::list metaL; + //std::list metaL; GxsMsgMetaResult result; bool ok = mDataAccess->getMsgSummary(token, result); @@ -2168,15 +2169,13 @@ void RsGenExchange::publishMsgs() uint32_t size = mSerialiser->size(msgItem); char* mData = new char[size]; - bool serialOk = false; - // for fatal sign creation bool createOk = false; // if sign requests to try later bool tryLater = false; - serialOk = mSerialiser->serialise(msgItem, mData, &size); + bool serialOk = mSerialiser->serialise(msgItem, mData, &size); if(serialOk) { @@ -2266,6 +2265,8 @@ void RsGenExchange::publishMsgs() char* metaDataBuff = new char[size]; bool s = msg->metaData->serialise(metaDataBuff, &size); s &= msg->meta.setBinData(metaDataBuff, size); + if (!s) + std::cerr << "(WW) Can't serialise or set bin data" << std::endl; msg->metaData->mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED; msgId = msg->msgId; diff --git a/libretroshare/src/gxs/rsgixs.h b/libretroshare/src/gxs/rsgixs.h index 6e8591a4a..df3c8af46 100644 --- a/libretroshare/src/gxs/rsgixs.h +++ b/libretroshare/src/gxs/rsgixs.h @@ -176,7 +176,7 @@ public: class GixsReputation { public: - GixsReputation() {} + GixsReputation() :reputation_level(0) {} RsGxsId id; uint32_t reputation_level ; diff --git a/libretroshare/src/gxs/rsgxsdataaccess.h b/libretroshare/src/gxs/rsgxsdataaccess.h index 04a785286..ef132dc0e 100644 --- a/libretroshare/src/gxs/rsgxsdataaccess.h +++ b/libretroshare/src/gxs/rsgxsdataaccess.h @@ -37,7 +37,7 @@ typedef std::map< RsGxsGroupId, RsGxsGrpMetaData* > GrpMetaFilter; class RsGxsDataAccess : public RsTokenService { public: - RsGxsDataAccess(RsGeneralDataService* ds); + explicit RsGxsDataAccess(RsGeneralDataService* ds); virtual ~RsGxsDataAccess() ; public: diff --git a/libretroshare/src/gxstrans/p3gxstrans.h b/libretroshare/src/gxstrans/p3gxstrans.h index 47ef1020d..af79679d9 100644 --- a/libretroshare/src/gxstrans/p3gxstrans.h +++ b/libretroshare/src/gxstrans/p3gxstrans.h @@ -293,7 +293,7 @@ private: enum CheckState { CheckStart, CheckChecking }; public: - GxsTransIntegrityCleanupThread(RsGeneralDataService *const dataService): mDs(dataService),mMtx("GxsTransIntegrityCheck") { mDone=false;} + explicit GxsTransIntegrityCleanupThread(RsGeneralDataService *const dataService): mDs(dataService),mMtx("GxsTransIntegrityCheck") { mDone=false;} bool isDone(); void run(); diff --git a/libretroshare/src/gxstrans/p3gxstransitems.h b/libretroshare/src/gxstrans/p3gxstransitems.h index bfaa98474..f158d0bdd 100644 --- a/libretroshare/src/gxstrans/p3gxstransitems.h +++ b/libretroshare/src/gxstrans/p3gxstransitems.h @@ -39,7 +39,7 @@ public: class RsGxsTransBaseMsgItem : public RsGxsMsgItem { public: - RsGxsTransBaseMsgItem(GxsTransItemsSubtypes subtype) : + explicit RsGxsTransBaseMsgItem(GxsTransItemsSubtypes subtype) : RsGxsMsgItem( RS_SERVICE_TYPE_GXS_TRANS, static_cast(subtype) ), mailId(0) {} diff --git a/libretroshare/src/gxstunnel/p3gxstunnel.h b/libretroshare/src/gxstunnel/p3gxstunnel.h index 0586732ba..cabe520d4 100644 --- a/libretroshare/src/gxstunnel/p3gxstunnel.h +++ b/libretroshare/src/gxstunnel/p3gxstunnel.h @@ -124,7 +124,7 @@ static const uint32_t GXS_TUNNEL_AES_KEY_SIZE = 16 ; class p3GxsTunnelService: public RsGxsTunnelService, public RsTurtleClientService, public p3Service { public: - p3GxsTunnelService(RsGixs *pids) ; + explicit p3GxsTunnelService(RsGixs *pids) ; virtual void connectToTurtleRouter(p3turtle *) ; // Creates the invite if the public key of the distant peer is available. diff --git a/libretroshare/src/gxstunnel/rsgxstunnelitems.h b/libretroshare/src/gxstunnel/rsgxstunnelitems.h index 1bec905c8..8c4e95ba4 100644 --- a/libretroshare/src/gxstunnel/rsgxstunnelitems.h +++ b/libretroshare/src/gxstunnel/rsgxstunnelitems.h @@ -53,7 +53,7 @@ typedef uint64_t GxsTunnelDHSessionId ; class RsGxsTunnelItem: public RsItem { public: - RsGxsTunnelItem(uint8_t item_subtype) : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_TYPE_GXS_TUNNEL,item_subtype) + explicit RsGxsTunnelItem(uint8_t item_subtype) : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_TYPE_GXS_TUNNEL,item_subtype) { setPriorityLevel(QOS_PRIORITY_RS_CHAT_ITEM) ; } @@ -72,8 +72,8 @@ class RsGxsTunnelItem: public RsItem class RsGxsTunnelDataItem: public RsGxsTunnelItem { public: - RsGxsTunnelDataItem() :RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_DATA) { data=NULL ;data_size=0;service_id=0;unique_item_counter=0; } - RsGxsTunnelDataItem(uint8_t subtype) :RsGxsTunnelItem(subtype) { data=NULL ;data_size=0; } + RsGxsTunnelDataItem() :RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_DATA), unique_item_counter(0), flags(0), service_id(0), data_size(0), data(NULL) {} + explicit RsGxsTunnelDataItem(uint8_t subtype) :RsGxsTunnelItem(subtype) , unique_item_counter(0), flags(0), service_id(0), data_size(0), data(NULL) {} virtual ~RsGxsTunnelDataItem() {} virtual void clear() {} @@ -108,7 +108,7 @@ class RsGxsTunnelStatusItem: public RsGxsTunnelItem class RsGxsTunnelDataAckItem: public RsGxsTunnelItem { public: - RsGxsTunnelDataAckItem() :RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_DATA_ACK) {} + RsGxsTunnelDataAckItem() :RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_DATA_ACK), unique_item_counter(0) {} RsGxsTunnelDataAckItem(void *data,uint32_t size) ; // deserialization virtual ~RsGxsTunnelDataAckItem() {} @@ -125,7 +125,7 @@ class RsGxsTunnelDataAckItem: public RsGxsTunnelItem class RsGxsTunnelDHPublicKeyItem: public RsGxsTunnelItem { public: - RsGxsTunnelDHPublicKeyItem() :RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_DH_PUBLIC_KEY) {} + RsGxsTunnelDHPublicKeyItem() :RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_DH_PUBLIC_KEY), public_key(NULL) {} RsGxsTunnelDHPublicKeyItem(void *data,uint32_t size) ; // deserialization virtual ~RsGxsTunnelDHPublicKeyItem() ; @@ -141,8 +141,8 @@ class RsGxsTunnelDHPublicKeyItem: public RsGxsTunnelItem private: // make the object non copy-able - RsGxsTunnelDHPublicKeyItem(const RsGxsTunnelDHPublicKeyItem&) : RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_DH_PUBLIC_KEY) {} - const RsGxsTunnelDHPublicKeyItem& operator=(const RsGxsTunnelDHPublicKeyItem&) { return *this ;} + RsGxsTunnelDHPublicKeyItem(const RsGxsTunnelDHPublicKeyItem&) : RsGxsTunnelItem(RS_PKT_SUBTYPE_GXS_TUNNEL_DH_PUBLIC_KEY), public_key(NULL) {} + const RsGxsTunnelDHPublicKeyItem& operator=(const RsGxsTunnelDHPublicKeyItem&) { public_key = NULL; return *this ;} }; class RsGxsTunnelSerialiser: public RsServiceSerializer diff --git a/libretroshare/src/pgp/pgphandler.h b/libretroshare/src/pgp/pgphandler.h index 88caa891d..8b3d9a4fe 100644 --- a/libretroshare/src/pgp/pgphandler.h +++ b/libretroshare/src/pgp/pgphandler.h @@ -92,8 +92,10 @@ class PGPHandler // The client should supply a memory chunk to store the data. The length will be updated to the real length of the data. // - bool encryptDataBin(const RsPgpId& key_id,const void *data, const uint32_t len, unsigned char *encrypted_data, unsigned int *encrypted_data_len) ; - bool decryptDataBin(const RsPgpId& key_id,const void *data, const uint32_t len, unsigned char *decrypted_data, unsigned int *decrypted_data_len) ; + bool encryptDataBin(const RsPgpId& key_id,const void *data, const uint32_t len + , unsigned char *encrypted_data, unsigned int *encrypted_data_len) ; + bool decryptDataBin(const RsPgpId& key_id,const void *encrypted_data, const uint32_t encrypted_len + , unsigned char *data, unsigned int *data_len) ; bool encryptTextToFile(const RsPgpId& key_id,const std::string& text,const std::string& outfile) ; bool decryptTextFromFile(const RsPgpId& key_id,std::string& text,const std::string& encrypted_inputfile) ; diff --git a/libretroshare/src/pgp/rscertificate.cc b/libretroshare/src/pgp/rscertificate.cc index b29952c91..839f646a7 100644 --- a/libretroshare/src/pgp/rscertificate.cc +++ b/libretroshare/src/pgp/rscertificate.cc @@ -72,7 +72,7 @@ void RsCertificate::addPacket(uint8_t ptag, const unsigned char *mem, size_t siz std::string RsCertificate::toStdString() const { - std::string res ; + //std::string res ; size_t BS = 1000 ; size_t p = 0 ; unsigned char *buf = new unsigned char[BS] ; diff --git a/libretroshare/src/pgp/rscertificate.h b/libretroshare/src/pgp/rscertificate.h index 7f206d904..a70a1752f 100644 --- a/libretroshare/src/pgp/rscertificate.h +++ b/libretroshare/src/pgp/rscertificate.h @@ -13,7 +13,7 @@ class RsCertificate // Constructs from text. // - new format: The input string should only contain radix chars and spaces/LF/tabs. // - RsCertificate(const std::string& input_string) ; + explicit RsCertificate(const std::string& input_string) ; // Constructs from binary gpg key, and RsPeerDetails. // @@ -52,7 +52,11 @@ class RsCertificate static void addPacket(uint8_t ptag, const unsigned char *mem, size_t size, unsigned char *& buf, size_t& offset, size_t& buf_size) ; RsCertificate(const RsCertificate&) {} // non copy-able - const RsCertificate& operator=(const RsCertificate&) { return *this ;} // non copy-able + const RsCertificate& operator=(const RsCertificate&) + { memset(ipv4_external_ip_and_port,0,6); memset(ipv4_internal_ip_and_port,0,6); + binary_pgp_key = NULL; binary_pgp_key_size = 0; + only_pgp = false; hidden_node = false; + return *this ;} // non copy-able unsigned char ipv4_external_ip_and_port[6] ; unsigned char ipv4_internal_ip_and_port[6] ; diff --git a/libretroshare/src/plugins/pluginmanager.h b/libretroshare/src/plugins/pluginmanager.h index c8a7d3290..09f05563b 100644 --- a/libretroshare/src/plugins/pluginmanager.h +++ b/libretroshare/src/plugins/pluginmanager.h @@ -45,7 +45,7 @@ public: class RsPluginManager: public RsPluginHandler, public p3Config { public: - RsPluginManager(const RsFileHash& current_executable_sha1_hash) ; + explicit RsPluginManager(const RsFileHash& current_executable_sha1_hash) ; virtual ~RsPluginManager() {} // ------------ Derived from RsPluginHandler ----------------// diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc index 138e07389..8553fc127 100644 --- a/libretroshare/src/pqi/authgpg.cc +++ b/libretroshare/src/pqi/authgpg.cc @@ -127,11 +127,12 @@ AuthGPG::AuthGPG(const std::string& path_to_public_keyring,const std::string& pa gpgMtxService("AuthGPG-service"), gpgMtxEngine("AuthGPG-engine"), gpgMtxData("AuthGPG-data"), - gpgKeySelected(false) + mStoreKeyTime(0), + gpgKeySelected(false), + _force_sync_database(false), + mCount(0) { - _force_sync_database = false ; - mCount = 0; - start("AuthGPG"); + start("AuthGPG"); } /* This function is called when retroshare is first started diff --git a/libretroshare/src/pqi/authgpg.h b/libretroshare/src/pqi/authgpg.h index 63cffe784..4ad48c42b 100644 --- a/libretroshare/src/pqi/authgpg.h +++ b/libretroshare/src/pqi/authgpg.h @@ -55,7 +55,7 @@ class RsPeerDetails; class AuthGPGOperation { public: - AuthGPGOperation(void *userdata) + explicit AuthGPGOperation(void *userdata) { m_userdata = userdata; } diff --git a/libretroshare/src/pqi/authssl.cc b/libretroshare/src/pqi/authssl.cc index e00c81c4e..4d57b1f24 100644 --- a/libretroshare/src/pqi/authssl.cc +++ b/libretroshare/src/pqi/authssl.cc @@ -246,6 +246,7 @@ sslcert::sslcert(X509 *x509, const RsPeerId& pid) certificate = x509; id = pid; #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + // cppcheck-suppress useInitializationList name = getX509CNString(x509->cert_info->subject); org = getX509OrgString(x509->cert_info->subject); location = getX509LocString(x509->cert_info->subject); @@ -363,7 +364,8 @@ static int initLib = 0; // // std::string dh_prime_2048_dec = "30651576830996935311378276950670996791883170963804289256203421500259588715033040934547350194073369837229137842804826417332761673984632102152477971341551955103053338169949165519208562998954887445690136488713010579430413255432398961330773637820158790237012997356731669148258317860643591694814197514454546928317578771868379525705082166818553884557266645700906836702542808787791878865135741211056957383668479369231868698451684633965462539374994559481908068730787128654626819903401038534403722014687647173327537458614224702967073490136394698912372792187651228785689025073104374674728645661275001416541267543884923191810923"; // - std::string dh_prime_2048_hex = "B3B86A844550486C7EA459FA468D3A8EFD71139593FE1C658BBEFA9B2FC0AD2628242C2CDC2F91F5B220ED29AAC271192A7374DFA28CDDCA70252F342D0821273940344A7A6A3CB70C7897A39864309F6CAC5C7EA18020EF882693CA2C12BB211B7BA8367D5A7C7252A5B5E840C9E8F081469EBA0B98BCC3F593A4D9C4D5DF539362084F1B9581316C1F80FDAD452FD56DBC6B8ED0775F596F7BB22A3FE2B4753764221528D33DB4140DE58083DB660E3E105123FC963BFF108AC3A268B7380FFA72005A1515C371287C5706FFA6062C9AC73A9B1A6AC842C2764CDACFC85556607E86611FDF486C222E4896CDF6908F239E177ACC641FCBFF72A758D1C10CBB" ; + //Not used (should be here: /libretroshare/src/gxstunnel/p3gxstunnel.cc:1131 + //std::string dh_prime_2048_hex = "B3B86A844550486C7EA459FA468D3A8EFD71139593FE1C658BBEFA9B2FC0AD2628242C2CDC2F91F5B220ED29AAC271192A7374DFA28CDDCA70252F342D0821273940344A7A6A3CB70C7897A39864309F6CAC5C7EA18020EF882693CA2C12BB211B7BA8367D5A7C7252A5B5E840C9E8F081469EBA0B98BCC3F593A4D9C4D5DF539362084F1B9581316C1F80FDAD452FD56DBC6B8ED0775F596F7BB22A3FE2B4753764221528D33DB4140DE58083DB660E3E105123FC963BFF108AC3A268B7380FFA72005A1515C371287C5706FFA6062C9AC73A9B1A6AC842C2764CDACFC85556607E86611FDF486C222E4896CDF6908F239E177ACC641FCBFF72A758D1C10CBB" ; std::string dh_prime_4096_hex = "A6F5777292D9E6BB95559C9124B9119E6771F11F2048C8FE74F4E8140494520972A087EF1D60B73894F1C5D509DD15D96CF379E9DDD46CE51B748085BACB440D915565782C73AF3A9580CE788441D1DA4D114E3D302CAB45A061ABCFC1F7E9200AE019CB923B77E096FA9377454A16FFE91D86535FF23E075B3E714F785CD7606E9CBD9D06F01CAFA2271883D649F13ABE170D714F6B6EC064C5BF35C4F4BDA5EF5ED5E70D5DC78F1AC1CDC04EEDAE8ADD65C4A9E27368E0B2C8595DD7626D763BFFB15364B3CCA9FCE814B9226B35FE652F4B041F0FF6694D6A482B0EF48CA41163D083AD2DE7B7A068BB05C0453E9D008551C7F67993A3EF2C4874F0244F78C4E0997BD31AB3BD88446916B499B2513DD5BA002063BD38D2CE55D29D071399D5CEE99458AF6FDC104A61CA3FACDAC803CBDE62B4C0EAC946D0E12F05CE9E94497110D64E611D957423B8AA412D84EC83E6E70E0977A31D6EE056D0527D4667D7242A77C9B679D191562E4026DA9C35FF85666296D872ED548E0FFE1A677FCC373C1F490CAB4F53DFD8735C0F1DF02FEAD824A217FDF4E3404D38A5BBC719C6622630FCD34F6F1968AF1B66A4AB1A9FCF653DA96EB3A42AF6FCFEA0547B8F314A527C519949007D7FA1726FF3D33EC46393B0207AA029E5EA574BDAC94D78894B22A2E3303E65A3F820DF57DB44951DE4E973C016C57F7A242D0BC53BC563AF" ; @@ -816,8 +818,6 @@ X509 *AuthSSLimpl::SignX509ReqWithGPG(X509_REQ *req, long /*days*/) const EVP_MD *type = EVP_sha1(); EVP_MD_CTX *ctx = EVP_MD_CTX_create(); - unsigned char *buf_in=NULL; - unsigned char *buf_hashout=NULL,*buf_sigout=NULL; int inl=0,hashoutl=0; int sigoutl=0; X509_ALGOR *a; @@ -854,17 +854,18 @@ X509 *AuthSSLimpl::SignX509ReqWithGPG(X509_REQ *req, long /*days*/) /* input buffer */ #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) inl=i2d(data,NULL); - buf_in=(unsigned char *)OPENSSL_malloc((unsigned int)inl); + unsigned char *buf_in=(unsigned char *)OPENSSL_malloc((unsigned int)inl); unsigned char *p=NULL; #else + unsigned char *buf_in=NULL; inl=i2d_re_X509_tbs(x509,&buf_in) ; // this does the i2d over x509->cert_info #endif hashoutl=EVP_MD_size(type); - buf_hashout=(unsigned char *)OPENSSL_malloc((unsigned int)hashoutl); + unsigned char *buf_hashout=(unsigned char *)OPENSSL_malloc((unsigned int)hashoutl); sigoutl=2048; // hashoutl; //EVP_PKEY_size(pkey); - buf_sigout=(unsigned char *)OPENSSL_malloc((unsigned int)sigoutl); + unsigned char *buf_sigout=(unsigned char *)OPENSSL_malloc((unsigned int)sigoutl); if ((buf_in == NULL) || (buf_hashout == NULL) || (buf_sigout == NULL)) { @@ -995,25 +996,24 @@ bool AuthSSLimpl::AuthX509WithGPG(X509 *x509,uint32_t& diagnostic) const EVP_MD *type = EVP_sha1(); EVP_MD_CTX *ctx = EVP_MD_CTX_create(); - unsigned char *buf_in=NULL; - unsigned char *buf_hashout=NULL,*buf_sigout=NULL; int inl=0,hashoutl=0; int sigoutl=0; /* input buffer */ #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) inl=i2d(data,NULL); - buf_in=(unsigned char *)OPENSSL_malloc((unsigned int)inl); + unsigned char *buf_in=(unsigned char *)OPENSSL_malloc((unsigned int)inl); unsigned char *p=NULL; #else + unsigned char *buf_in=NULL; inl=i2d_re_X509_tbs(x509,&buf_in) ; // this does the i2d over x509->cert_info #endif hashoutl=EVP_MD_size(type); - buf_hashout=(unsigned char *)OPENSSL_malloc((unsigned int)hashoutl); + unsigned char *buf_hashout=(unsigned char *)OPENSSL_malloc((unsigned int)hashoutl); sigoutl=2048; //hashoutl; //EVP_PKEY_size(pkey); - buf_sigout=(unsigned char *)OPENSSL_malloc((unsigned int)sigoutl); + unsigned char *buf_sigout=(unsigned char *)OPENSSL_malloc((unsigned int)sigoutl); #ifdef AUTHSSL_DEBUG std::cerr << "Buffer Sizes: in: " << inl; @@ -1445,10 +1445,9 @@ bool AuthSSLimpl::decrypt(void *&out, int &outlen, const void *in, int inlen) // outlen = inlen; EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); int eklen = 0, net_ekl = 0; - unsigned char *ek = NULL; unsigned char iv[EVP_MAX_IV_LENGTH]; int ek_mkl = EVP_PKEY_size(mOwnPrivateKey); - ek = (unsigned char*)malloc(ek_mkl); + unsigned char *ek = (unsigned char*)malloc(ek_mkl); if(ek == NULL) { @@ -1505,7 +1504,7 @@ bool AuthSSLimpl::decrypt(void *&out, int &outlen, const void *in, int inlen) return false; } - in_offset += out_currOffset; + //in_offset += out_currOffset; outlen += out_currOffset; if(!EVP_OpenFinal(ctx, (unsigned char*)out + out_currOffset, &out_currOffset)) { diff --git a/libretroshare/src/pqi/p3cfgmgr.h b/libretroshare/src/pqi/p3cfgmgr.h index 27986f04a..43e19b66e 100644 --- a/libretroshare/src/pqi/p3cfgmgr.h +++ b/libretroshare/src/pqi/p3cfgmgr.h @@ -151,7 +151,7 @@ class p3ConfigMgr /** * @param bdir base directory: where config files will be saved */ - p3ConfigMgr(std::string bdir); + explicit p3ConfigMgr(std::string bdir); /** * checks and update all added configurations diff --git a/libretroshare/src/pqi/p3historymgr.cc b/libretroshare/src/pqi/p3historymgr.cc index 72a2640ec..39c2960a3 100644 --- a/libretroshare/src/pqi/p3historymgr.cc +++ b/libretroshare/src/pqi/p3historymgr.cc @@ -350,7 +350,7 @@ bool p3HistoryMgr::loadList(std::list& load) if (kit->key == "MAX_STORAGE_TIME") { uint32_t val ; - if (sscanf(kit->value.c_str(), "%d", &val) == 1) + if (sscanf(kit->value.c_str(), "%u", &val) == 1) mMaxStorageDurationSeconds = val ; #ifdef HISTMGR_DEBUG diff --git a/libretroshare/src/pqi/p3linkmgr.cc b/libretroshare/src/pqi/p3linkmgr.cc index 3bfcc253d..c84b8ea4f 100644 --- a/libretroshare/src/pqi/p3linkmgr.cc +++ b/libretroshare/src/pqi/p3linkmgr.cc @@ -326,7 +326,6 @@ void p3LinkMgrIMPL::statusTick() std::cerr << "p3LinkMgrIMPL::statusTick()" << std::endl; #endif std::list retryIds; - std::list::iterator it2; //std::list dummyToRemove; { @@ -362,8 +361,8 @@ void p3LinkMgrIMPL::statusTick() } #ifndef P3CONNMGR_NO_AUTO_CONNECTION - - for(it2 = retryIds.begin(); it2 != retryIds.end(); ++it2) + std::list::iterator it2; + for(it2 = retryIds.begin(); it2 != retryIds.end(); ++it2) { #ifdef LINKMGR_DEBUG_TICK std::cerr << "p3LinkMgrIMPL::statusTick() RETRY TIMEOUT for: "; diff --git a/libretroshare/src/pqi/p3netmgr.cc b/libretroshare/src/pqi/p3netmgr.cc index a34119ed5..03c809789 100644 --- a/libretroshare/src/pqi/p3netmgr.cc +++ b/libretroshare/src/pqi/p3netmgr.cc @@ -923,8 +923,8 @@ void p3NetMgrIMPL::netExtCheck() //pqiNotify *notify = getPqiNotify(); //if (notify) { - std::string title = - "Warning: Bad Firewall Configuration"; + //std::string title = + // "Warning: Bad Firewall Configuration"; std::string msg; msg += " **** WARNING **** \n"; @@ -1814,7 +1814,7 @@ void p3NetMgrIMPL::updateNetStateBox_temporal() std::cerr << std::endl; std::cerr << "\tNetState: " << netstatestr; std::cerr << std::endl; - std::cerr << "\tConnectModes: " << netstatestr; + std::cerr << "\tConnectModes: " << connectstr; std::cerr << std::endl; std::cerr << "\tNetworkMode: " << netmodestr; std::cerr << std::endl; diff --git a/libretroshare/src/pqi/p3servicecontrol.cc b/libretroshare/src/pqi/p3servicecontrol.cc index 3942232c4..251777e70 100644 --- a/libretroshare/src/pqi/p3servicecontrol.cc +++ b/libretroshare/src/pqi/p3servicecontrol.cc @@ -42,17 +42,17 @@ static const uint8_t RS_PKT_SUBTYPE_SERVICE_CONTROL_SERVICE_PERMISSIONS = 0x01 ; class RsServiceControlItem: public RsItem { public: - RsServiceControlItem(uint8_t item_subtype) : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_TYPE_SERVICE_CONTROL,item_subtype) {} + explicit RsServiceControlItem(uint8_t item_subtype) : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_TYPE_SERVICE_CONTROL,item_subtype) {} }; class RsServicePermissionItem: public RsServiceControlItem, public RsServicePermissions { public: - RsServicePermissionItem(): RsServiceControlItem(RS_PKT_SUBTYPE_SERVICE_CONTROL_SERVICE_PERMISSIONS) {} - RsServicePermissionItem(const RsServicePermissions& perms) : RsServiceControlItem(RS_PKT_SUBTYPE_SERVICE_CONTROL_SERVICE_PERMISSIONS), RsServicePermissions(perms) {} + RsServicePermissionItem(): RsServiceControlItem(RS_PKT_SUBTYPE_SERVICE_CONTROL_SERVICE_PERMISSIONS) {} + explicit RsServicePermissionItem(const RsServicePermissions& perms) : RsServiceControlItem(RS_PKT_SUBTYPE_SERVICE_CONTROL_SERVICE_PERMISSIONS), RsServicePermissions(perms) {} - virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) - { + virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) + { RsTypeSerializer::serial_process(j,ctx,mServiceId,"mServiceId") ; RsTypeSerializer::serial_process (j,ctx,TLV_TYPE_STR_NAME,mServiceName,"mServiceName") ; RsTypeSerializer::serial_process (j,ctx,mDefaultAllowed,"mDefaultAllowed") ; @@ -86,9 +86,10 @@ public: RsServiceControl *rsServiceControl = NULL; p3ServiceControl::p3ServiceControl(p3LinkMgr *linkMgr) - :RsServiceControl(), p3Config(), - mLinkMgr(linkMgr), mOwnPeerId(linkMgr->getOwnId()), - mCtrlMtx("p3ServiceControl"), mMonitorMtx("P3ServiceControl::Monitor") + : RsServiceControl(), p3Config(), + mLinkMgr(linkMgr), mOwnPeerId(linkMgr->getOwnId()), + mCtrlMtx("p3ServiceControl"), mMonitorMtx("P3ServiceControl::Monitor"), + mServiceServer(NULL) { mSerialiser = new ServiceControlSerialiser ; } @@ -356,7 +357,7 @@ bool p3ServiceControl::getServicePermissions(uint32_t serviceId, RsServicePermis return true; } -bool p3ServiceControl::createDefaultPermissions_locked(uint32_t serviceId, std::string serviceName, bool defaultOn) +bool p3ServiceControl::createDefaultPermissions_locked(uint32_t serviceId, const std::string& serviceName, bool defaultOn) { std::map::iterator it; it = mServicePermissionMap.find(serviceId); @@ -780,7 +781,7 @@ void p3ServiceControl::recordFilterChanges_locked(const RsPeerId &peerId, #endif /* find differences */ - std::map changes; + //std::map changes; std::set::const_iterator it1, it2, eit1, eit2; it1 = originalFilter.mAllowedServices.begin(); eit1 = originalFilter.mAllowedServices.end(); @@ -796,7 +797,7 @@ void p3ServiceControl::recordFilterChanges_locked(const RsPeerId &peerId, std::cerr << std::endl; #endif // removal - changes[*it1] = false; + //changes[*it1] = false; filterChangeRemoved_locked(peerId, *it1); ++it1; } @@ -808,7 +809,7 @@ void p3ServiceControl::recordFilterChanges_locked(const RsPeerId &peerId, #endif // addition. filterChangeAdded_locked(peerId, *it2); - changes[*it2] = true; + //changes[*it2] = true; ++it2; } else @@ -826,7 +827,7 @@ void p3ServiceControl::recordFilterChanges_locked(const RsPeerId &peerId, std::cerr << std::endl; #endif // removal - changes[*it1] = false; + //changes[*it1] = false; filterChangeRemoved_locked(peerId, *it1); } @@ -837,7 +838,7 @@ void p3ServiceControl::recordFilterChanges_locked(const RsPeerId &peerId, std::cerr << std::endl; #endif // addition. - changes[*it2] = true; + //changes[*it2] = true; filterChangeAdded_locked(peerId, *it2); } @@ -938,7 +939,7 @@ void p3ServiceControl::filterChangeRemoved_locked(const RsPeerId &peerId, uint32 std::cerr << std::endl; #endif - std::map >::iterator mit; + //std::map >::iterator mit; std::set &peerSet = mServicePeerMap[serviceId]; std::set::iterator sit; @@ -969,7 +970,7 @@ void p3ServiceControl::filterChangeAdded_locked(const RsPeerId &peerId, uint32_t std::cerr << std::endl; #endif - std::map >::iterator mit; + //std::map >::iterator mit; std::set &peerSet = mServicePeerMap[serviceId]; @@ -1366,7 +1367,7 @@ void RsServicePermissions::resetPermission(const RsPeerId& peerId) RsServiceInfo::RsServiceInfo( const uint16_t service_type, - const std::string service_name, + const std::string& service_name, const uint16_t version_major, const uint16_t version_minor, const uint16_t min_version_major, diff --git a/libretroshare/src/pqi/p3servicecontrol.h b/libretroshare/src/pqi/p3servicecontrol.h index 9c9724347..e7f4e5959 100644 --- a/libretroshare/src/pqi/p3servicecontrol.h +++ b/libretroshare/src/pqi/p3servicecontrol.h @@ -66,7 +66,7 @@ public: /** */ - p3ServiceControl(p3LinkMgr *linkMgr); + explicit p3ServiceControl(p3LinkMgr *linkMgr); /** * checks and update all added configurations @@ -171,7 +171,7 @@ bool updateFilterByPeer_locked(const RsPeerId &peerId); void filterChangeAdded_locked(const RsPeerId &peerId, uint32_t serviceId); void filterChangeRemoved_locked(const RsPeerId &peerId, uint32_t serviceId); -bool createDefaultPermissions_locked(uint32_t serviceId, std::string serviceName, bool defaultOn); +bool createDefaultPermissions_locked(uint32_t serviceId, const std::string& serviceName, bool defaultOn); bool peerHasPermissionForService_locked(const RsPeerId &peerId, uint32_t serviceId); p3LinkMgr *mLinkMgr; diff --git a/libretroshare/src/pqi/pqi_base.h b/libretroshare/src/pqi/pqi_base.h index d247d9862..a7d06c644 100644 --- a/libretroshare/src/pqi/pqi_base.h +++ b/libretroshare/src/pqi/pqi_base.h @@ -192,7 +192,7 @@ class NetInterface; class PQInterface: public RateInterface { public: - PQInterface(const RsPeerId &id) :peerId(id) { return; } + explicit PQInterface(const RsPeerId &id) :peerId(id) { return; } virtual ~PQInterface() { return; } /*! diff --git a/libretroshare/src/pqi/pqihandler.cc b/libretroshare/src/pqi/pqihandler.cc index c67bd04a2..a589f7e26 100644 --- a/libretroshare/src/pqi/pqihandler.cc +++ b/libretroshare/src/pqi/pqihandler.cc @@ -196,7 +196,7 @@ bool pqihandler::AddSearchModule(SearchModule *mod) { RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/ // if peerid used -> error. - std::map::iterator it; + //std::map::iterator it; if (mod->peerid != mod->pqi->PeerId()) { // ERROR! diff --git a/libretroshare/src/pqi/pqiindic.h b/libretroshare/src/pqi/pqiindic.h index b75130265..391f4791a 100644 --- a/libretroshare/src/pqi/pqiindic.h +++ b/libretroshare/src/pqi/pqiindic.h @@ -36,7 +36,7 @@ class Indicator { public: - Indicator(uint16_t n = 1) + explicit Indicator(uint16_t n = 1) :num(n), changeFlags(n) {IndicateChanged();} void IndicateChanged() { diff --git a/libretroshare/src/pqi/pqiqos.h b/libretroshare/src/pqi/pqiqos.h index a83ec1445..3a006b5a0 100644 --- a/libretroshare/src/pqi/pqiqos.h +++ b/libretroshare/src/pqi/pqiqos.h @@ -60,9 +60,11 @@ public: { public: ItemQueue() - { - _item_count =0 ; - } + : _threshold(0.0) + , _counter(0.0) + , _inc(0.0) + , _item_count(0) + {} void *pop() { if(_items.empty()) diff --git a/libretroshare/src/pqi/pqissllistener.cc b/libretroshare/src/pqi/pqissllistener.cc index 2259b01ea..975791eec 100644 --- a/libretroshare/src/pqi/pqissllistener.cc +++ b/libretroshare/src/pqi/pqissllistener.cc @@ -378,6 +378,11 @@ int pqissllistenbase::acceptconnection() if(rsBanList != NULL && !rsBanList->isAddressAccepted(remote_addr, RSBANLIST_CHECKING_FLAGS_BLACKLIST)) { std::cerr << " => early rejected at this point, because of blacklist." << std::endl; +#ifndef WINDOWS_SYS + close(fd); +#else + closesocket(fd); +#endif return false ; } else diff --git a/libretroshare/src/retroshare/rsgxschannels.h b/libretroshare/src/retroshare/rsgxschannels.h index c55d46a72..c75235f0e 100644 --- a/libretroshare/src/retroshare/rsgxschannels.h +++ b/libretroshare/src/retroshare/rsgxschannels.h @@ -79,9 +79,9 @@ class RsGxsChannels: public RsGxsIfaceHelper, public RsGxsCommentService { public: - RsGxsChannels(RsGxsIface *gxs) - :RsGxsIfaceHelper(gxs) { return; } -virtual ~RsGxsChannels() { return; } + explicit RsGxsChannels(RsGxsIface *gxs) + :RsGxsIfaceHelper(gxs) {} + virtual ~RsGxsChannels() {} /* Specific Service Data */ virtual bool getGroupData(const uint32_t &token, std::vector &groups) = 0; diff --git a/libretroshare/src/retroshare/rsgxsforums.h b/libretroshare/src/retroshare/rsgxsforums.h index e1835928e..28558d4ce 100644 --- a/libretroshare/src/retroshare/rsgxsforums.h +++ b/libretroshare/src/retroshare/rsgxsforums.h @@ -63,9 +63,9 @@ class RsGxsForums: public RsGxsIfaceHelper { public: - RsGxsForums(RsGxsIface *gxs) - :RsGxsIfaceHelper(gxs) { return; } - virtual ~RsGxsForums() { return; } + explicit RsGxsForums(RsGxsIface *gxs) + :RsGxsIfaceHelper(gxs) {} + virtual ~RsGxsForums() {} /* Specific Service Data */ virtual bool getGroupData(const uint32_t &token, std::vector &groups) = 0; diff --git a/libretroshare/src/retroshare/rsidentity.h b/libretroshare/src/retroshare/rsidentity.h index c5c47703a..bf650d462 100644 --- a/libretroshare/src/retroshare/rsidentity.h +++ b/libretroshare/src/retroshare/rsidentity.h @@ -266,8 +266,8 @@ class RsIdentity: public RsGxsIfaceHelper public: - RsIdentity(RsGxsIface *gxs): RsGxsIfaceHelper(gxs) { return; } - virtual ~RsIdentity() { return; } + explicit RsIdentity(RsGxsIface *gxs): RsGxsIfaceHelper(gxs) {} + virtual ~RsIdentity() {} /********************************************************************************************/ /********************************************************************************************/ diff --git a/libretroshare/src/retroshare/rsphoto.h b/libretroshare/src/retroshare/rsphoto.h index 5a27a491b..1e782d2ef 100644 --- a/libretroshare/src/retroshare/rsphoto.h +++ b/libretroshare/src/retroshare/rsphoto.h @@ -159,7 +159,7 @@ class RsPhotoComment public: RsPhotoComment(); - RsPhotoComment(const RsGxsPhotoCommentItem& comment); + explicit RsPhotoComment(const RsGxsPhotoCommentItem& comment); RsPhotoComment& operator=(const RsGxsPhotoCommentItem& comment); diff --git a/libretroshare/src/retroshare/rsposted.h b/libretroshare/src/retroshare/rsposted.h index 69f9a17a5..586449a47 100644 --- a/libretroshare/src/retroshare/rsposted.h +++ b/libretroshare/src/retroshare/rsposted.h @@ -78,8 +78,8 @@ class RsPosted : public RsGxsIfaceHelper, public RsGxsCommentService //static const uint32_t FLAG_MSGTYPE_POST; //static const uint32_t FLAG_MSGTYPE_MASK; - RsPosted(RsGxsIface* gxs) : RsGxsIfaceHelper(gxs) { return; } -virtual ~RsPosted() { return; } + explicit RsPosted(RsGxsIface* gxs) : RsGxsIfaceHelper(gxs) {} + virtual ~RsPosted() {} /* Specific Service Data */ virtual bool getGroupData(const uint32_t &token, std::vector &groups) = 0; diff --git a/libretroshare/src/retroshare/rsservicecontrol.h b/libretroshare/src/retroshare/rsservicecontrol.h index 7558764e7..12d9dc5d2 100644 --- a/libretroshare/src/retroshare/rsservicecontrol.h +++ b/libretroshare/src/retroshare/rsservicecontrol.h @@ -43,7 +43,7 @@ class RsServiceInfo RsServiceInfo(); RsServiceInfo( const uint16_t service_type, - const std::string service_name, + const std::string& service_name, const uint16_t version_major, const uint16_t version_minor, const uint16_t min_version_major, diff --git a/libretroshare/src/retroshare/rswire.h b/libretroshare/src/retroshare/rswire.h index 1bef58577..d9cdb7832 100644 --- a/libretroshare/src/retroshare/rswire.h +++ b/libretroshare/src/retroshare/rswire.h @@ -108,8 +108,8 @@ class RsWire: public RsGxsIfaceHelper { public: - RsWire(RsGxsIface *gxs): RsGxsIfaceHelper(gxs) { return; } -virtual ~RsWire() { return; } + explicit RsWire(RsGxsIface *gxs): RsGxsIfaceHelper(gxs) {} + virtual ~RsWire() {} /* Specific Service Data */ virtual bool getGroupData(const uint32_t &token, std::vector &groups) = 0; diff --git a/libretroshare/src/rsitems/rsconfigitems.h b/libretroshare/src/rsitems/rsconfigitems.h index 4e31b2d43..bc7240e99 100644 --- a/libretroshare/src/rsitems/rsconfigitems.h +++ b/libretroshare/src/rsitems/rsconfigitems.h @@ -72,9 +72,11 @@ class RsPeerNetItem: public RsItem { public: RsPeerNetItem() - :RsItem(RS_PKT_VERSION1, RS_PKT_CLASS_CONFIG, - RS_PKT_TYPE_PEER_CONFIG, - RS_PKT_SUBTYPE_PEER_NET) {} + :RsItem(RS_PKT_VERSION1, RS_PKT_CLASS_CONFIG, + RS_PKT_TYPE_PEER_CONFIG, + RS_PKT_SUBTYPE_PEER_NET) + , netMode(0), vs_disc(0), vs_dht(0), lastContact(0), domain_port(0) + {} virtual ~RsPeerNetItem(){} virtual void clear(); @@ -143,7 +145,7 @@ class RsPeerBandwidthLimitsItem : public RsItem class RsNodeGroupItem: public RsItem { public: - RsNodeGroupItem(): RsItem(RS_PKT_VERSION1, RS_PKT_CLASS_CONFIG, RS_PKT_TYPE_PEER_CONFIG, RS_PKT_SUBTYPE_NODE_GROUP){} + RsNodeGroupItem(): RsItem(RS_PKT_VERSION1, RS_PKT_CLASS_CONFIG, RS_PKT_TYPE_PEER_CONFIG, RS_PKT_SUBTYPE_NODE_GROUP), flag(0) {} virtual ~RsNodeGroupItem() {} virtual void clear() { pgpList.TlvClear();} @@ -240,7 +242,7 @@ const uint32_t RS_FILE_CONFIG_CLEANUP_DELETE = 0x0001; class RsFileConfigItem: public RsItem { public: - RsFileConfigItem() :RsItem(RS_PKT_VERSION1, RS_PKT_CLASS_CONFIG, RS_PKT_TYPE_FILE_CONFIG, RS_PKT_SUBTYPE_FILE_ITEM) {} + RsFileConfigItem() :RsItem(RS_PKT_VERSION1, RS_PKT_CLASS_CONFIG, RS_PKT_TYPE_FILE_CONFIG, RS_PKT_SUBTYPE_FILE_ITEM), flags(0) {} virtual ~RsFileConfigItem() {} virtual void clear() { parent_groups.TlvClear(); } diff --git a/libretroshare/src/rsitems/rsgxsrecognitems.h b/libretroshare/src/rsitems/rsgxsrecognitems.h index e072477ce..68a9aa174 100644 --- a/libretroshare/src/rsitems/rsgxsrecognitems.h +++ b/libretroshare/src/rsitems/rsgxsrecognitems.h @@ -53,7 +53,9 @@ class RsGxsRecognReqItem: public RsItem { public: - RsGxsRecognReqItem() :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_GXS_RECOGN, RS_PKT_SUBTYPE_RECOGN_REQ) + RsGxsRecognReqItem() + :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_GXS_RECOGN, RS_PKT_SUBTYPE_RECOGN_REQ) + , issued_at(0), period(0), tag_class(0), tag_type(0) { setPriorityLevel(QOS_PRIORITY_DEFAULT); return; @@ -79,7 +81,9 @@ public: class RsGxsRecognTagItem: public RsItem { public: - RsGxsRecognTagItem() :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_GXS_RECOGN, RS_PKT_SUBTYPE_RECOGN_TAG) + RsGxsRecognTagItem() + :RsItem(RS_PKT_VERSION_SERVICE, RS_SERVICE_TYPE_GXS_RECOGN, RS_PKT_SUBTYPE_RECOGN_TAG) + , valid_from(0), valid_to(0), tag_class(0), tag_type(0) { setPriorityLevel(QOS_PRIORITY_DEFAULT); return; diff --git a/libretroshare/src/rsitems/rsgxsupdateitems.h b/libretroshare/src/rsitems/rsgxsupdateitems.h index 15a0976b6..c9725426c 100644 --- a/libretroshare/src/rsitems/rsgxsupdateitems.h +++ b/libretroshare/src/rsitems/rsgxsupdateitems.h @@ -85,7 +85,7 @@ public: class RsGxsGrpConfigItem : public RsGxsNetServiceItem, public RsGxsGrpConfig { public: - RsGxsGrpConfigItem(uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_GRP_CONFIG) {} + explicit RsGxsGrpConfigItem(uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_GRP_CONFIG) {} RsGxsGrpConfigItem(const RsGxsGrpConfig& m,uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_GRP_CONFIG),RsGxsGrpConfig(m) {} virtual ~RsGxsGrpConfigItem() {} @@ -106,7 +106,7 @@ public: class RsGxsGrpUpdateItem : public RsGxsNetServiceItem, public RsGxsGrpUpdate { public: - RsGxsGrpUpdateItem(uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_GRP_UPDATE) {clear();} + explicit RsGxsGrpUpdateItem(uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_GRP_UPDATE) {clear();} RsGxsGrpUpdateItem(const RsGxsGrpUpdate& u,uint16_t serv_type) : RsGxsNetServiceItem(serv_type, RS_PKT_SUBTYPE_GXS_GRP_UPDATE), RsGxsGrpUpdate(u) {} virtual ~RsGxsGrpUpdateItem() {} @@ -128,7 +128,7 @@ public: class RsGxsServerGrpUpdateItem : public RsGxsNetServiceItem, public RsGxsServerGrpUpdate { public: - RsGxsServerGrpUpdateItem(uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_SERVER_GRP_UPDATE) { clear();} + explicit RsGxsServerGrpUpdateItem(uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_SERVER_GRP_UPDATE) { clear();} RsGxsServerGrpUpdateItem(const RsGxsServerGrpUpdate& u,uint16_t serv_type) : RsGxsNetServiceItem(serv_type, RS_PKT_SUBTYPE_GXS_SERVER_GRP_UPDATE), RsGxsServerGrpUpdate(u) {} virtual ~RsGxsServerGrpUpdateItem() {} @@ -154,7 +154,7 @@ public: class RsGxsMsgUpdateItem : public RsGxsNetServiceItem, public RsGxsMsgUpdate { public: - RsGxsMsgUpdateItem(uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_MSG_UPDATE) { clear();} + explicit RsGxsMsgUpdateItem(uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_MSG_UPDATE) { clear();} RsGxsMsgUpdateItem(const RsGxsMsgUpdate& m,uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_MSG_UPDATE), RsGxsMsgUpdate(m) {} virtual ~RsGxsMsgUpdateItem() {} @@ -176,7 +176,7 @@ public: class RsGxsServerMsgUpdateItem : public RsGxsNetServiceItem, public RsGxsServerMsgUpdate { public: - RsGxsServerMsgUpdateItem(uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_SERVER_MSG_UPDATE) { clear();} + explicit RsGxsServerMsgUpdateItem(uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_SERVER_MSG_UPDATE) { clear();} RsGxsServerMsgUpdateItem(const RsGxsServerMsgUpdate& m,uint16_t servType) : RsGxsNetServiceItem(servType, RS_PKT_SUBTYPE_GXS_SERVER_MSG_UPDATE),RsGxsServerMsgUpdate(m) {} virtual ~RsGxsServerMsgUpdateItem() {} @@ -191,7 +191,7 @@ class RsGxsUpdateSerialiser : public RsServiceSerializer { public: - RsGxsUpdateSerialiser(uint16_t servtype) : RsServiceSerializer(servtype), SERVICE_TYPE(servtype) {} + explicit RsGxsUpdateSerialiser(uint16_t servtype) : RsServiceSerializer(servtype), SERVICE_TYPE(servtype) {} virtual ~RsGxsUpdateSerialiser() {} diff --git a/libretroshare/src/rsitems/rsitem.h b/libretroshare/src/rsitems/rsitem.h index e123c37dc..056bbe084 100644 --- a/libretroshare/src/rsitems/rsitem.h +++ b/libretroshare/src/rsitems/rsitem.h @@ -12,7 +12,7 @@ class RsItem: public RsMemoryManagement::SmallObject { public: - RsItem(uint32_t t); + explicit RsItem(uint32_t t); RsItem(uint8_t ver, uint8_t cls, uint8_t t, uint8_t subtype); #ifdef DO_STATISTICS void *operator new(size_t s) ; diff --git a/libretroshare/src/rsitems/rsnxsitems.h b/libretroshare/src/rsitems/rsnxsitems.h index fb49436d5..f717a3d09 100644 --- a/libretroshare/src/rsitems/rsnxsitems.h +++ b/libretroshare/src/rsitems/rsnxsitems.h @@ -96,7 +96,7 @@ public: static const uint8_t FLAG_USE_SYNC_HASH; static const uint8_t FLAG_ONLY_CURRENT; // only send most current version of grps / ignores sync hash - RsNxsSyncGrpReqItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_GRP_REQ_ITEM) { clear();} + explicit RsNxsSyncGrpReqItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_GRP_REQ_ITEM) { clear();} virtual void clear(); virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx); @@ -114,7 +114,10 @@ class RsNxsSyncGrpStatsItem : public RsNxsItem { public: - RsNxsSyncGrpStatsItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_GRP_STATS_ITEM) {} + explicit RsNxsSyncGrpStatsItem(uint16_t servtype) + : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_GRP_STATS_ITEM) + , request_type(0), number_of_posts(0), last_post_TS(0) + {} virtual void clear() {} @@ -137,7 +140,7 @@ public: class RsNxsGroupPublishKeyItem : public RsNxsItem { public: - RsNxsGroupPublishKeyItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_GRP_PUBLISH_KEY_ITEM) { clear(); } + explicit RsNxsGroupPublishKeyItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_GRP_PUBLISH_KEY_ITEM) { clear(); } virtual void clear(); @@ -180,7 +183,7 @@ public: static const uint16_t FLAG_TYPE_MSGS; static const uint16_t FLAG_TYPE_ENCRYPTED_DATA; - RsNxsTransacItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_TRANSAC_ITEM) { clear(); } + explicit RsNxsTransacItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_TRANSAC_ITEM) { clear(); } virtual ~RsNxsTransacItem() {} virtual void clear(); @@ -208,7 +211,7 @@ public: static const uint8_t FLAG_RESPONSE; static const uint8_t FLAG_USE_SYNC_HASH; - RsNxsSyncGrpItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_GRP_ITEM) { clear();} + explicit RsNxsSyncGrpItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_GRP_ITEM) { clear();} virtual ~RsNxsSyncGrpItem() {} virtual void clear(); @@ -234,7 +237,7 @@ class RsNxsSessionKeyItem : public RsNxsItem public: - RsNxsSessionKeyItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SESSION_KEY_ITEM) { clear(); } + explicit RsNxsSessionKeyItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SESSION_KEY_ITEM) { clear(); } virtual ~RsNxsSessionKeyItem() {} virtual void clear(); @@ -254,11 +257,11 @@ class RsNxsEncryptedDataItem : public RsNxsItem public: - RsNxsEncryptedDataItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_ENCRYPTED_DATA_ITEM),encrypted_data(servtype) - { - encrypted_data.tlvtype = TLV_TYPE_BIN_ENCRYPTED ; - clear(); - } + explicit RsNxsEncryptedDataItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_ENCRYPTED_DATA_ITEM),encrypted_data(servtype) + { + encrypted_data.tlvtype = TLV_TYPE_BIN_ENCRYPTED ; + clear(); + } virtual ~RsNxsEncryptedDataItem() {} virtual void clear(); @@ -280,9 +283,10 @@ class RsNxsGrp : public RsNxsItem public: - RsNxsGrp(uint16_t servtype) : - RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_GRP_ITEM), grp(servtype), - meta(servtype), metaData(NULL) { clear(); } + explicit RsNxsGrp(uint16_t servtype) + : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_GRP_ITEM), grp(servtype) + , meta(servtype), metaData(NULL) + { clear(); } virtual ~RsNxsGrp() { delete metaData; } RsNxsGrp* clone() const; @@ -324,7 +328,7 @@ public: #endif static const uint8_t FLAG_USE_HASHED_GROUP_ID; - RsNxsSyncMsgReqItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_MSG_REQ_ITEM) { clear(); } + explicit RsNxsSyncMsgReqItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_MSG_REQ_ITEM) { clear(); } virtual void clear(); @@ -348,7 +352,7 @@ public: static const uint8_t FLAG_REQUEST; static const uint8_t FLAG_RESPONSE; static const uint8_t FLAG_USE_SYNC_HASH; - RsNxsSyncMsgItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_MSG_ITEM) { clear(); } + explicit RsNxsSyncMsgItem(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_SYNC_MSG_ITEM) { clear(); } virtual void clear(); @@ -368,9 +372,10 @@ public: */ struct RsNxsMsg : RsNxsItem { - RsNxsMsg(uint16_t servtype) : - RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_MSG_ITEM), meta(servtype), - msg(servtype), metaData(NULL) { clear(); } + explicit RsNxsMsg(uint16_t servtype) + : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_MSG_ITEM) + , pos(0), count(0), meta(servtype), msg(servtype), metaData(NULL) + { clear(); } virtual ~RsNxsMsg() { delete metaData; } virtual void serial_process( RsGenericSerializer::SerializeJob j, @@ -407,7 +412,10 @@ class RsNxsSearchReqItem : public RsNxsItem { public: - RsNxsSearchReqItem(uint16_t servtype): RsNxsItem(servtype, RS_PKT_SUBTYPE_EXT_SEARCH_REQ), serviceSearchItem(servtype) {} + explicit RsNxsSearchReqItem(uint16_t servtype) + : RsNxsItem(servtype, RS_PKT_SUBTYPE_EXT_SEARCH_REQ) + , nHops(0), token(0), serviceSearchItem(servtype), expiration(0) + {} virtual ~RsNxsSearchReqItem() {} virtual void clear() {} @@ -428,7 +436,9 @@ class RsNxsSearchResultMsgItem { public: - RsNxsSearchResultMsgItem() : context(0) {} + RsNxsSearchResultMsgItem() + : token(0), context(0), expiration(0) + {} void clear() {} @@ -497,8 +507,8 @@ class RsNxsSerialiser : public RsServiceSerializer { public: - RsNxsSerialiser(uint16_t servtype) : RsServiceSerializer(servtype), SERVICE_TYPE(servtype) {} - virtual ~RsNxsSerialiser() {} + explicit RsNxsSerialiser(uint16_t servtype) : RsServiceSerializer(servtype), SERVICE_TYPE(servtype) {} + virtual ~RsNxsSerialiser() {} virtual RsItem *create_item(uint16_t service_id,uint8_t item_subtype) const ; diff --git a/libretroshare/src/rsitems/rspluginitems.h b/libretroshare/src/rsitems/rspluginitems.h index f5ff61321..c21567cd1 100644 --- a/libretroshare/src/rsitems/rspluginitems.h +++ b/libretroshare/src/rsitems/rspluginitems.h @@ -36,7 +36,7 @@ const uint8_t RS_PKT_CLASS_PLUGIN_SUBTYPE_HASHSET = 0x01 ; class RsPluginItem: public RsItem { public: - RsPluginItem(uint8_t plugin_item_subtype): RsItem(RS_PKT_VERSION1,RS_PKT_CLASS_CONFIG,RS_PKT_TYPE_PLUGIN_CONFIG,plugin_item_subtype) {} + explicit RsPluginItem(uint8_t plugin_item_subtype): RsItem(RS_PKT_VERSION1,RS_PKT_CLASS_CONFIG,RS_PKT_TYPE_PLUGIN_CONFIG,plugin_item_subtype) {} virtual ~RsPluginItem() {} virtual void clear() {} diff --git a/libretroshare/src/rsitems/rsrttitems.h b/libretroshare/src/rsitems/rsrttitems.h index 35cf85bae..90b2e385e 100644 --- a/libretroshare/src/rsitems/rsrttitems.h +++ b/libretroshare/src/rsitems/rsrttitems.h @@ -43,17 +43,20 @@ const uint8_t RS_PKT_SUBTYPE_RTT_PONG = 0x02; class RsRttItem: public RsItem { public: - RsRttItem(uint8_t subtype) : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_TYPE_RTT,subtype) - { setPriorityLevel(QOS_PRIORITY_RS_RTT_PING) ;} // should be refined later. + explicit RsRttItem(uint8_t subtype) : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_TYPE_RTT,subtype) + { setPriorityLevel(QOS_PRIORITY_RS_RTT_PING) ;} // should be refined later. - virtual ~RsRttItem() {}; - virtual void clear() {}; + virtual ~RsRttItem() {} + virtual void clear() {} }; class RsRttPingItem: public RsRttItem { public: - RsRttPingItem() :RsRttItem(RS_PKT_SUBTYPE_RTT_PING) {} + RsRttPingItem() + : RsRttItem(RS_PKT_SUBTYPE_RTT_PING) + , mSeqNo(0), mPingTS(0) + {} virtual ~RsRttPingItem(){} virtual void clear(){} @@ -67,7 +70,10 @@ class RsRttPingItem: public RsRttItem class RsRttPongItem: public RsRttItem { public: - RsRttPongItem() :RsRttItem(RS_PKT_SUBTYPE_RTT_PONG) {} + RsRttPongItem() + : RsRttItem(RS_PKT_SUBTYPE_RTT_PONG) + , mSeqNo(0), mPingTS(0), mPongTS(0) + {} virtual ~RsRttPongItem(){} virtual void clear(){} diff --git a/libretroshare/src/rsserver/p3status.h b/libretroshare/src/rsserver/p3status.h index ca7a0e508..bec3d4822 100644 --- a/libretroshare/src/rsserver/p3status.h +++ b/libretroshare/src/rsserver/p3status.h @@ -39,7 +39,7 @@ class p3Status : public RsStatus { public: - p3Status(p3StatusService* statusSrv); + explicit p3Status(p3StatusService* statusSrv); virtual ~p3Status(); diff --git a/libretroshare/src/rsserver/rsaccounts.cc b/libretroshare/src/rsserver/rsaccounts.cc index 6bd36b04d..45983b5c3 100644 --- a/libretroshare/src/rsserver/rsaccounts.cc +++ b/libretroshare/src/rsserver/rsaccounts.cc @@ -56,7 +56,7 @@ RsAccountsDetail *rsAccounts; /* Uses private class - so must be hidden */ -static bool checkAccount(std::string accountdir, AccountDetails &account,std::map >& unsupported_keys); +static bool checkAccount(const std::string &accountdir, AccountDetails &account,std::map >& unsupported_keys); AccountDetails::AccountDetails() :mSslId(""), mAccountDir(""), mPgpId(""), mPgpName(""), mPgpEmail(""), @@ -660,7 +660,7 @@ bool RsAccountsDetail::getAvailableAccounts(std::map & -static bool checkAccount(std::string accountdir, AccountDetails &account,std::map >& unsupported_keys) +static bool checkAccount(const std::string &accountdir, AccountDetails &account,std::map >& unsupported_keys) { /* check if the cert/key file exists */ @@ -671,7 +671,7 @@ static bool checkAccount(std::string accountdir, AccountDetails &account,std::ma basename += "user"; std::string cert_name = basename + "_cert.pem"; - std::string userName; + //std::string userName; #ifdef AUTHSSL_DEBUG std::cerr << "checkAccount() dir: " << accountdir << std::endl; @@ -806,6 +806,7 @@ static bool checkAccount(std::string accountdir, AccountDetails &account,std::ma #elif defined(ANDROID) dataDirectory = defaultBaseDirectory()+"/usr/share/retroshare"; #elif defined(DATA_DIR) + // cppcheck-suppress ConfigurationNotChecked dataDirectory = DATA_DIR; // For all other OS the data directory must be set in libretroshare.pro #else @@ -1003,7 +1004,7 @@ bool RsAccountsDetail::GenerateSSLCertificate(const RsPgpId& pgp_id, const s int nbits = 4096; - std::string pgp_name = AuthGPG::getAuthGPG()->getGPGName(pgp_id); + //std::string pgp_name = AuthGPG::getAuthGPG()->getGPGName(pgp_id); // Create the filename ..... // Temporary Directory for creating files.... @@ -1054,8 +1055,7 @@ bool RsAccountsDetail::GenerateSSLCertificate(const RsPgpId& pgp_id, const s bool gen_ok = true; /* Print the signed Certificate! */ - BIO *bio_out = NULL; - bio_out = BIO_new(BIO_s_file()); + BIO *bio_out = BIO_new(BIO_s_file()); BIO_set_fp(bio_out,stdout,BIO_NOCLOSE); /* Print it out */ diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc index 50c8c33e0..dae235aa2 100644 --- a/libretroshare/src/rsserver/rsinit.cc +++ b/libretroshare/src/rsserver/rsinit.cc @@ -190,7 +190,7 @@ void RsInit::InitRsConfig() rsInitConfig->passwd = ""; rsInitConfig->debugLevel = PQL_WARNING; rsInitConfig->udpListenerOnly = false; - rsInitConfig->opModeStr = std::string("FULL"); + rsInitConfig->opModeStr = std::string(""); /* setup the homePath (default save location) */ // rsInitConfig->homePath = getHomePath(); @@ -1011,9 +1011,11 @@ int RsServer::StartupRetroShare() RestrictedUdpLayer *url = (RestrictedUdpLayer *) mDhtStack->getUdpLayer(); url->addRestrictedPortRange(lport, uport); } -#else +#else //LOCALNET_TESTING +#ifdef RS_USE_BITDHT rsUdpStack *mDhtStack = new rsUdpStack(tmpladdr); #endif +#endif //LOCALNET_TESTING #ifdef RS_USE_BITDHT @@ -1153,10 +1155,10 @@ int RsServer::StartupRetroShare() #ifdef RS_USE_DHT_STUNNER mNetMgr->setAddrAssist(new stunAddrAssist(mDhtStunner), new stunAddrAssist(mProxyStunner)); #endif // RS_USE_DHT_STUNNER -#else +#else //RS_USE_BITDHT /* install NULL Pointer for rsDht Interface */ rsDht = NULL; -#endif +#endif //RS_USE_BITDHT /**************************** BITDHT ***********************************/ @@ -1605,7 +1607,7 @@ int RsServer::StartupRetroShare() #endif //mConfigMgr->addConfiguration("photo.cfg", photo_ns); //mConfigMgr->addConfiguration("wire.cfg", wire_ns); -#endif +#endif //RS_ENABLE_GXS mConfigMgr->addConfiguration("I2PBOB.cfg", mI2pBob); mPluginsManager->addConfigurations(mConfigMgr) ; diff --git a/libretroshare/src/serialiser/rstlvidset.h b/libretroshare/src/serialiser/rstlvidset.h index e70b055cf..b1d0ee51f 100644 --- a/libretroshare/src/serialiser/rstlvidset.h +++ b/libretroshare/src/serialiser/rstlvidset.h @@ -95,6 +95,9 @@ template class t_RsTlvIdSet: public RsTlvItem } if(*offset != tlvend) std::cerr << "(EE) deserialisaiton error in " << __PRETTY_FUNCTION__ << std::endl; + else if(!ok) + std::cerr << "(WW) something wrong in ID_CLASS.deserialise in " << __PRETTY_FUNCTION__ << std::endl; + return *offset == tlvend ; } virtual std::ostream &print(std::ostream &out, uint16_t /* indent */) const diff --git a/libretroshare/src/serialiser/rstlvstring.h b/libretroshare/src/serialiser/rstlvstring.h index 9408668c5..9c22ee939 100644 --- a/libretroshare/src/serialiser/rstlvstring.h +++ b/libretroshare/src/serialiser/rstlvstring.h @@ -37,7 +37,7 @@ class RsTlvStringSet: public RsTlvItem { public: - RsTlvStringSet(uint16_t type); +explicit RsTlvStringSet(uint16_t type); virtual ~RsTlvStringSet() { return; } virtual uint32_t TlvSize() const; virtual void TlvClear(); diff --git a/libretroshare/src/services/autoproxy/p3i2pbob.h b/libretroshare/src/services/autoproxy/p3i2pbob.h index bd88c2e86..5fd44bc85 100644 --- a/libretroshare/src/services/autoproxy/p3i2pbob.h +++ b/libretroshare/src/services/autoproxy/p3i2pbob.h @@ -173,7 +173,7 @@ class p3PeerMgr; class p3I2pBob : public RsTickingThread, public p3Config, public autoProxyService { public: - p3I2pBob(p3PeerMgr *peerMgr); + explicit p3I2pBob(p3PeerMgr *peerMgr); // autoProxyService interface public: diff --git a/libretroshare/src/services/p3bwctrl.h b/libretroshare/src/services/p3bwctrl.h index 9e80bb188..67e6f97fd 100644 --- a/libretroshare/src/services/p3bwctrl.h +++ b/libretroshare/src/services/p3bwctrl.h @@ -74,7 +74,7 @@ class BwCtrlData class p3BandwidthControl: public p3Service, public pqiServiceMonitor { public: - p3BandwidthControl(pqipersongrp *pg); + explicit p3BandwidthControl(pqipersongrp *pg); virtual RsServiceInfo getServiceInfo(); /***** overloaded from RsBanList *****/ diff --git a/libretroshare/src/services/p3discovery2.cc b/libretroshare/src/services/p3discovery2.cc index 24f1a5dc4..4c08b4abe 100644 --- a/libretroshare/src/services/p3discovery2.cc +++ b/libretroshare/src/services/p3discovery2.cc @@ -913,7 +913,7 @@ void p3discovery2::processContactInfo(const SSLID &fromId, const RsDiscContactIt /* insert! */ DiscSslInfo sslInfo; it->second.mSslIds[item->sslId] = sslInfo; - sit = it->second.mSslIds.find(item->sslId); + //sit = it->second.mSslIds.find(item->sslId); should_notify_discovery = true; diff --git a/libretroshare/src/services/p3gxscommon.cc b/libretroshare/src/services/p3gxscommon.cc index 822c19cdf..5793e58ff 100644 --- a/libretroshare/src/services/p3gxscommon.cc +++ b/libretroshare/src/services/p3gxscommon.cc @@ -394,18 +394,28 @@ bool p3GxsCommentService::getGxsRelatedComments(const uint32_t &token, std::vect double p3GxsCommentService::calculateBestScore(int upVotes, int downVotes) { - static float z = 1.0; float score; - int n = upVotes - downVotes; + int n = upVotes + downVotes; + if(n==0) - { score = 0.0; - } else { - float phat = upVotes; - score = sqrt(phat+z*z/(2*n)-z*((phat*(1-phat)+z*z/(4*n))/n))/(1+z*z/n); + // See https://github.com/reddit/reddit/blob/master/r2/r2/lib/db/_sorts.pyx#L45 for the source of this nice formula. + // http://www.evanmiller.org/how-not-to-sort-by-average-rating.html for the mathematical explanation. + + float p = upVotes/n; + float z = 1.281551565545 ; + + float left = p + 1/(2*n)*z*z ; + float right = z*sqrt(p*(1-p)/n + z*z/(4*n*n)) ; + float under = 1+1/n*z*z ; + + score = (left - right)/under ; + + //static float z = 1.0; + //score = sqrt(phat+z*z/(2*n)-z*((phat*(1-phat)+z*z/(4*n))/n))/(1+z*z/n); } return score; } diff --git a/libretroshare/src/services/p3postbase.cc b/libretroshare/src/services/p3postbase.cc index 077104db0..0c37db1f1 100644 --- a/libretroshare/src/services/p3postbase.cc +++ b/libretroshare/src/services/p3postbase.cc @@ -625,7 +625,7 @@ bool extractPostCache(const std::string &str, PostStats &s) { uint32_t iupvotes, idownvotes, icomments; - if (3 == sscanf(str.c_str(), "%d %d %d", &icomments, &iupvotes, &idownvotes)) + if (3 == sscanf(str.c_str(), "%u %u %u", &icomments, &iupvotes, &idownvotes)) { s.comments = icomments; s.up_votes = iupvotes; diff --git a/libretroshare/src/turtle/p3turtle.cc b/libretroshare/src/turtle/p3turtle.cc index c94978823..9fe58915b 100644 --- a/libretroshare/src/turtle/p3turtle.cc +++ b/libretroshare/src/turtle/p3turtle.cc @@ -1447,7 +1447,7 @@ void p3turtle::handleTunnelRequest(RsTurtleOpenTunnelItem *item) // We're off-mutex here. bool found = false ; - std::string info ; + //std::string info ; RsTurtleClientService *service = NULL ; if(item->PeerId() != _own_id) @@ -1872,13 +1872,12 @@ void p3turtle::monitorTunnels(const RsFileHash& hash,RsTurtleClientService *clie // First, check if the hash is tagged for removal (there's a delay) - if(_hashes_to_remove.find(hash) != _hashes_to_remove.end()) - { - _hashes_to_remove.erase(hash) ; + if(_hashes_to_remove.erase(hash) > 0) + { #ifdef P3TURTLE_DEBUG - std::cerr << "p3turtle: File hash " << hash << " Was scheduled for removal. Canceling the removal." << std::endl ; + std::cerr << "p3turtle: File hash " << hash << " Was scheduled for removal. Canceling the removal." << std::endl ; #endif - } + } // Then, check if the hash is already there // diff --git a/libretroshare/src/upnp/UPnPBase.h b/libretroshare/src/upnp/UPnPBase.h index d01c61363..8fed1014b 100644 --- a/libretroshare/src/upnp/UPnPBase.h +++ b/libretroshare/src/upnp/UPnPBase.h @@ -66,8 +66,8 @@ private: public: CUPnPPortMapping( - int in_port = 0, int ex_port = 0, + int in_port = 0, const std::string &protocol = stdEmptyString, bool enabled = false, const std::string &description = stdEmptyString); @@ -106,7 +106,7 @@ public: CUPnPControlPoint &m_ctrlPoint; public: - CUPnPLib(CUPnPControlPoint &ctrlPoint); + explicit CUPnPLib(CUPnPControlPoint &ctrlPoint); ~CUPnPLib() {} // Convenience function so we don't have to write explicit calls @@ -574,7 +574,7 @@ public: CUPnPService *m_WanService; std::string m_getStateVariableLastResult; static CUPnPControlPoint *s_CtrlPoint; - CUPnPControlPoint(unsigned short udpPort); + explicit CUPnPControlPoint(unsigned short udpPort); ~CUPnPControlPoint(); char* getInternalIpAddress(); std::string getExternalAddress(); diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc index 8e528613a..42e075cdf 100644 --- a/libretroshare/src/util/rsdir.cc +++ b/libretroshare/src/util/rsdir.cc @@ -536,7 +536,10 @@ bool RsDirUtil::getFileHash(const std::string& filepath, RsFileHash &hash, uint6 int len; SHA_CTX *sha_ctx = new SHA_CTX; unsigned char sha_buf[SHA_DIGEST_LENGTH]; - unsigned char gblBuf[512]; + + static const uint32_t HASH_BUFFER_SIZE = 1024*1024*10 ;// allocate a 10MB buffer. Too small a buffer will cause multiple HD hits and slow down the hashing process. + RsTemporaryMemory gblBuf(HASH_BUFFER_SIZE) ; + //unsigned char gblBuf[512]; /* determine size */ fseeko64(fd, 0, SEEK_END); @@ -548,7 +551,7 @@ bool RsDirUtil::getFileHash(const std::string& filepath, RsFileHash &hash, uint6 int runningCheckCount = 0; SHA1_Init(sha_ctx); - while(isRunning && (len = fread(gblBuf,1, 512, fd)) > 0) + while(isRunning && (len = fread(gblBuf,1, HASH_BUFFER_SIZE, fd)) > 0) { SHA1_Update(sha_ctx, gblBuf, len); diff --git a/libretroshare/src/util/rsscopetimer.h b/libretroshare/src/util/rsscopetimer.h index b76ae4f96..875a8bb5e 100644 --- a/libretroshare/src/util/rsscopetimer.h +++ b/libretroshare/src/util/rsscopetimer.h @@ -43,8 +43,7 @@ public: void start(); double duration(); -private: - double currentTime(); + static double currentTime(); private: std::string _name ; diff --git a/plugins/FeedReader/util/XPathWrapper.h b/plugins/FeedReader/util/XPathWrapper.h index 7707e3873..fd40fcd37 100644 --- a/plugins/FeedReader/util/XPathWrapper.h +++ b/plugins/FeedReader/util/XPathWrapper.h @@ -43,7 +43,7 @@ public: xmlNodePtr node(unsigned int index); protected: - XPathWrapper(XMLWrapper &xmlWrapper); + explicit XPathWrapper(XMLWrapper &xmlWrapper); XMLWrapper &mXMLWrapper; xmlXPathContextPtr mContext; diff --git a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp index 56c25ce15..7f3d31554 100644 --- a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp +++ b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp @@ -187,15 +187,32 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti } painter->drawText(option.rect, Qt::AlignCenter, newopt.text); break; - case COLUMN_SOURCES: - { - double dblValue = index.data().toDouble(); + case COLUMN_SOURCES: + { + double dblValue = index.data().toDouble(); - temp = dblValue!=0 ? QString("%1 (%2)").arg((int)dblValue).arg((int)((fmod(dblValue,1)*1000)+0.5)) : ""; - painter->drawText(option.rect, Qt::AlignCenter, temp); - } - break; - case COLUMN_DOWNLOADTIME: + temp = dblValue!=0 ? QString("%1 (%2)").arg((int)dblValue).arg((int)((fmod(dblValue,1)*1000)+0.5)) : ""; + painter->drawText(option.rect, Qt::AlignCenter, temp); + } + break; + case COLUMN_PRIORITY: + { + double dblValue = index.data().toDouble(); + if (dblValue == PRIORITY_NULL) + temp = ""; + else if (dblValue == PRIORITY_FASTER) + temp = tr("Faster"); + else if (dblValue == PRIORITY_AVERAGE) + temp = tr("Average"); + else if (dblValue == PRIORITY_SLOWER) + temp = tr("Slower"); + else + temp = QString::number((uint32_t)dblValue); + + painter->drawText(option.rect, Qt::AlignCenter, temp); + } + break; + case COLUMN_DOWNLOADTIME: downloadtime = index.data().toLongLong(); minutes = downloadtime / 60; seconds = downloadtime % 60; diff --git a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h index 2f50c6876..7516b17af 100644 --- a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h +++ b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h @@ -42,6 +42,11 @@ #define COLUMN_PATH 12 #define COLUMN_COUNT 13 +#define PRIORITY_NULL 0.0 +#define PRIORITY_FASTER 0.1 +#define PRIORITY_AVERAGE 0.2 +#define PRIORITY_SLOWER 0.3 + #define MAX_CHAR_TMP 128 diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp index facb8b60d..d55f78e99 100644 --- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp @@ -1166,6 +1166,7 @@ void SearchDialog::insertFile(qulonglong searchId, const FileDetail& file, int s // 1 - look in result window whether the file already exists. // bool found = false ; + bool altname = false ; int sources; int friendSource = 0; int anonymousSource = 0; @@ -1193,7 +1194,11 @@ void SearchDialog::insertFile(qulonglong searchId, const FileDetail& file, int s (*it)->setText(SR_SOURCES_COL,modifiedResult); (*it)->setData(SR_SOURCES_COL, ROLE_SORT, fltRes); QTreeWidgetItem *item = (*it); + found = true ; + + if(QString::compare((*it)->text(SR_NAME_COL), QString::fromUtf8(file.name.c_str()), Qt::CaseSensitive)!=0) + altname = true; if (!item->data(SR_DATA_COL, SR_ROLE_LOCAL).toBool()) { @@ -1233,9 +1238,20 @@ void SearchDialog::insertFile(qulonglong searchId, const FileDetail& file, int s item->setForeground(i, brush); } } - break ; - } + if(altname) + { + QTreeWidgetItem *item = new RSTreeWidgetItem(compareResultRole); + item->setText(SR_NAME_COL, QString::fromUtf8(file.name.c_str())); + item->setText(SR_HASH_COL, QString::fromStdString(file.hash.toStdString())); + setIconAndType(item, QString::fromUtf8(file.name.c_str())); + item->setText(SR_SIZE_COL, QString::number(file.size)); + setIconAndType(item, QString::fromUtf8(file.name.c_str())); + (*it)->addChild(item); + } + + } + if(!found) { ++nb_results[searchId] ; diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp index afba50f7b..bf3e1c92b 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp @@ -42,6 +42,7 @@ #include "gui/msgs/MessageComposer.h" #include "gui/settings/AddFileAssociationDialog.h" #include "gui/gxschannels/GxsChannelDialog.h" +#include "gui/gxsforums/GxsForumsDialog.h" #include "gui/settings/rsharesettings.h" #include "util/QtVersion.h" #include "util/RsAction.h" @@ -64,6 +65,7 @@ #define IMAGE_OPENFILE ":/images/fileopen.png" #define IMAGE_LIBRARY ":/images/library.png" #define IMAGE_CHANNEL ":/images/channels32.png" +#define IMAGE_FORUMS ":/icons/png/forums.png" #define IMAGE_COLLCREATE ":/images/library_add.png" #define IMAGE_COLLMODIF ":/images/library_edit.png" #define IMAGE_COLLVIEW ":/images/library_view.png" @@ -963,6 +965,15 @@ void SharedFilesDialog::postModDirectories(bool local) QCoreApplication::flush(); } +class ChannelCompare +{ +public: + bool operator()(const std::pair& id1,const std::pair& id2) const + { + return id1.first < id2.first ; + } +}; + void LocalSharedFilesDialog::spawnCustomPopupMenu( QPoint point ) { if (!rsPeers) return; /* not ready yet! */ @@ -1017,26 +1028,55 @@ void LocalSharedFilesDialog::spawnCustomPopupMenu( QPoint point ) } GxsChannelDialog *channelDialog = dynamic_cast(MainWindow::getPage(MainWindow::Channels)); + QMenu shareChannelMenu(tr("Share on channel...")) ; // added here because the shareChannelMenu QMenu object is deleted afterwards if(channelDialog != NULL) { - QMenu shareChannelMenu(tr("Share on channel...")) ; shareChannelMenu.setIcon(QIcon(IMAGE_CHANNEL)); std::list grp_metas ; channelDialog->getGroupList(grp_metas) ; + std::vector > grplist ; // I dont use a std::map because two or more channels may have the same name. + for(auto it(grp_metas.begin());it!=grp_metas.end();++it) - if(IS_GROUP_PUBLISHER((*it).mSubscribeFlags)) - shareChannelMenu.addAction(QString::fromUtf8((*it).mGroupName.c_str()), this, SLOT(shareOnChannel()))->setData(QString::fromStdString((*it).mGroupId.toStdString())) ; + if(IS_GROUP_PUBLISHER((*it).mSubscribeFlags) && IS_GROUP_SUBSCRIBED((*it).mSubscribeFlags)) + grplist.push_back(std::make_pair((*it).mGroupName, (*it).mGroupId)); + + std::sort(grplist.begin(),grplist.end(),ChannelCompare()) ; + + for(auto it(grplist.begin());it!=grplist.end();++it) + shareChannelMenu.addAction(QString::fromUtf8((*it).first.c_str()), this, SLOT(shareOnChannel()))->setData(QString::fromStdString((*it).second.toStdString())) ; contextMnu.addMenu(&shareChannelMenu) ; - contextMnu.exec(QCursor::pos()) ; // added here because the shareChannelMenu QMenu object is deleted afterwards } - else - contextMnu.exec(QCursor::pos()) ; -} + GxsForumsDialog *forumsDialog = dynamic_cast(MainWindow::getPage(MainWindow::Forums)); + QMenu shareForumMenu(tr("Share on forum...")) ; // added here because the shareChannelMenu QMenu object is deleted afterwards + + if(forumsDialog != NULL) + { + shareForumMenu.setIcon(QIcon(IMAGE_FORUMS)); + + std::list grp_metas ; + forumsDialog->getGroupList(grp_metas) ; + + std::vector > grplist ; // I dont use a std::map because two or more channels may have the same name. + + for(auto it(grp_metas.begin());it!=grp_metas.end();++it) + if(IS_GROUP_SUBSCRIBED((*it).mSubscribeFlags)) + grplist.push_back(std::make_pair((*it).mGroupName, (*it).mGroupId)); + + std::sort(grplist.begin(),grplist.end(),ChannelCompare()) ; + + for(auto it(grplist.begin());it!=grplist.end();++it) + shareForumMenu.addAction(QString::fromUtf8((*it).first.c_str()), this, SLOT(shareInForum()))->setData(QString::fromStdString((*it).second.toStdString())) ; + + contextMnu.addMenu(&shareForumMenu) ; + } + + contextMnu.exec(QCursor::pos()) ; +} void LocalSharedFilesDialog::shareOnChannel() { RsGxsGroupId groupId(qobject_cast(sender())->data().toString().toStdString()); @@ -1055,6 +1095,24 @@ void LocalSharedFilesDialog::shareOnChannel() channelDialog->shareOnChannel(groupId,file_links_list) ; } +void LocalSharedFilesDialog::shareInForum() +{ + RsGxsGroupId groupId(qobject_cast(sender())->data().toString().toStdString()); + + GxsForumsDialog *forumsDialog = dynamic_cast(MainWindow::getPage(MainWindow::Forums)); + + if(forumsDialog == NULL) + return ; + + std::list files_info ; + + QList file_links_list ; + bool has_unhashed_files ; + + copyLinks(getSelected(),false,file_links_list,has_unhashed_files) ; + + forumsDialog->shareInMessage(groupId,file_links_list) ; +} //============================================================================ diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h index 885bab91a..8e242a0a6 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h @@ -160,6 +160,7 @@ class LocalSharedFilesDialog : public SharedFilesDialog void tryToAddNewAssotiation(); void forceCheck(); void shareOnChannel(); + void shareInForum(); QAction* fileAssotiationAction(const QString fileName); diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp index b9e961457..ea06b598b 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp @@ -159,32 +159,6 @@ public: } }; -class PriorityItem : public SortByNameItem -{ - public: - PriorityItem(QHeaderView *header) : SortByNameItem(header) {} - - virtual bool operator<(const QStandardItem &other) const - { - const int role = model() ? model()->sortRole() : Qt::DisplayRole; - - QString l = data(role).value(); - QString r = other.data(role).value(); - - bool bl,br ; - int nl = l.toInt(&bl) ; - int nr = r.toInt(&br) ; - - if(bl && br) - return nl < nr ; - - if(bl ^ br) - return br ; - - return SortByNameItem::operator<(other); - } -}; - /** Constructor */ TransfersDialog::TransfersDialog(QWidget *parent) : RsAutoUpdatePage(1000,parent) @@ -911,16 +885,18 @@ int TransfersDialog::addDLItem(int row, const FileInfo &fileInfo) default: status = tr("Unknown"); break; } - QString priority; + double priority = PRIORITY_NULL; if (fileInfo.downloadStatus == FT_STATE_QUEUED) { - priority = QString::number(fileInfo.queue_position); + priority = fileInfo.queue_position; + } else if (fileInfo.downloadStatus == FT_STATE_COMPLETE) { + priority = 0; } else { switch (fileInfo.priority) { - case SPEED_LOW: priority = tr("Slower");break; - case SPEED_NORMAL: priority = tr("Average");break; - case SPEED_HIGH: priority = tr("Faster");break; - default: priority = tr("Average");break; + case SPEED_LOW: priority = PRIORITY_SLOWER; break; + case SPEED_NORMAL: priority = PRIORITY_AVERAGE; break; + case SPEED_HIGH: priority = PRIORITY_FASTER; break; + default: priority = PRIORITY_AVERAGE; break; } } @@ -982,7 +958,6 @@ int TransfersDialog::addDLItem(int row, const FileInfo &fileInfo) // change progress column to own class for sorting DLListModel->setItem(row, COLUMN_PROGRESS, new ProgressItem(NULL)); - DLListModel->setItem(row, COLUMN_PRIORITY, new PriorityItem(NULL)); DLListModel->setData(DLListModel->index(row, COLUMN_SIZE), QVariant((qlonglong) fileInfo.size)); DLListModel->setData(DLListModel->index(row, COLUMN_ID), fileHash, Qt::DisplayRole); @@ -1107,7 +1082,7 @@ int TransfersDialog::addPeerToDLItem(QStandardItem *dlItem, const RsPeerId& peer iProgress->setData(QVariant::fromValue(peerInfo), Qt::UserRole); iSource->setData(QVariant(QString()), Qt::DisplayRole); - iPriority->setData(QVariant(QString()), Qt::DisplayRole); // blank field for priority + iPriority->setData(QVariant((double)PRIORITY_NULL), Qt::DisplayRole); // blank field for priority iRemaining->setData(QVariant(QString()), Qt::DisplayRole); iDownloadTime->setData(QVariant(QString()), Qt::DisplayRole); iID->setData(QVariant() , Qt::DisplayRole); diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 8fb52664e..8fed35c56 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -144,6 +144,7 @@ QList sizes; RsAutoUpdatePage::lockAllEvents(); ui.friendList->setColumnVisible(FriendList::COLUMN_LAST_CONTACT, false); ui.friendList->setColumnVisible(FriendList::COLUMN_IP, false); + ui.friendList->setColumnVisible(FriendList::COLUMN_ID, false); ui.friendList->setShowGroups(true); processSettings(true); RsAutoUpdatePage::unlockAllEvents(); diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index e5d9430ce..cc08d4954 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -1489,7 +1489,7 @@ void MainWindow::processLastArgs() opModeStatus->setCurrentIndex(RS_OPMODE_GAMING - 1); } else if (opmode == "minimal") { opModeStatus->setCurrentIndex(RS_OPMODE_MINIMAL - 1); - } else { + } else if (opmode != "") { opModeStatus->setCurrentIndex(RS_OPMODE_FULL - 1); } opModeStatus->setOpMode(); diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp index 327608ff8..7d70b3e15 100644 --- a/retroshare-gui/src/gui/Posted/PostedItem.cpp +++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp @@ -32,9 +32,6 @@ #include -#define COLOR_NORMAL QColor(248, 248, 248) -#define COLOR_NEW QColor(220, 236, 253) - /** Constructor */ PostedItem::PostedItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate) : @@ -427,16 +424,9 @@ void PostedItem::setReadStatus(bool isNew, bool isUnread) ui->newLabel->setVisible(isNew); - /* unpolish widget to clear the stylesheet's palette cache */ - ui->mainFrame->style()->unpolish(ui->mainFrame); - - QPalette palette = ui->mainFrame->palette(); - palette.setColor(ui->mainFrame->backgroundRole(), isNew ? COLOR_NEW : COLOR_NORMAL); // QScrollArea - palette.setColor(QPalette::Base, isNew ? COLOR_NEW : COLOR_NORMAL); // QTreeWidget - ui->mainFrame->setPalette(palette); - ui->mainFrame->setProperty("new", isNew); - Rshare::refreshStyleSheet(ui->mainFrame, false); + ui->mainFrame->style()->unpolish(ui->mainFrame); + ui->mainFrame->style()->polish( ui->mainFrame); } void PostedItem::readToggled(bool checked) diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp index a42d9c104..3a0f7fb9a 100644 --- a/retroshare-gui/src/gui/RetroShareLink.cpp +++ b/retroshare-gui/src/gui/RetroShareLink.cpp @@ -1129,7 +1129,8 @@ static void processList(const QStringList &list, const QString &textSingular, co links.append(*linkIt); } - if (flag & RSLINK_PROCESS_NOTIFY_ASK) { + if (flag & RSLINK_PROCESS_NOTIFY_ASK) + { /* ask for some types of link */ QStringList fileAdd; QStringList personAdd; @@ -1153,12 +1154,9 @@ static void processList(const QStringList &list, const QString &textSingular, co case TYPE_CERTIFICATE: case TYPE_PUBLIC_MSG: case TYPE_PRIVATE_CHAT: - // no need to ask - break; - case TYPE_FILE: case TYPE_EXTRAFILE: - fileAdd.append(link.name()); + // no need to ask break; case TYPE_PERSON: @@ -1166,30 +1164,6 @@ static void processList(const QStringList &list, const QString &textSingular, co break; } } - - QString content; - if (!fileAdd.isEmpty()) { - processList(fileAdd, QObject::tr("Add file"), QObject::tr("Add files"), content); - } - - //if (personAdd.size()) { - // processList(personAdd, QObject::tr("Add friend"), QObject::tr("Add friends"), content); - //} - - if (content.isEmpty() == false) { - QString question = ""; - if (links.size() == 1) { - question += QObject::tr("Do you want to process the link ?"); - } else { - question += QObject::tr("Do you want to process %1 links ?").arg(links.size()); - } - question += "

" + content + ""; - - QMessageBox mb(QObject::tr("Confirmation"), question, QMessageBox::Question, QMessageBox::Yes,QMessageBox::No, 0); - if (mb.exec() == QMessageBox::No) { - return 0; - } - } } int countInvalid = 0; @@ -1305,9 +1279,8 @@ static void processList(const QStringList &list, const QString &textSingular, co } break; - case TYPE_FILE: case TYPE_EXTRAFILE: - { + { #ifdef DEBUG_RSLINK std::cerr << " RetroShareLink::process FileRequest : fileName : " << link.name().toUtf8().constData() << ". fileHash : " << link.hash().toStdString() << ". fileSize : " << link.size() << std::endl; #endif @@ -1388,9 +1361,18 @@ static void processList(const QStringList &list, const QString &textSingular, co } else { if (!bFileOpened) fileExist.append(link.name()); } - } + } break; + case TYPE_FILE: + { + RsCollection col ; + col.merge_in(link.name(),link.size(),RsFileHash(link.hash().toStdString())) ; + col.downloadFiles(); + } + break; + + case TYPE_FILE_TREE: { FileTree *ft = FileTree::create(link.radix().toStdString()) ; diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index ba5c94af7..a8807cb3b 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -499,7 +499,7 @@ bool ChatWidget::eventFilter(QObject *obj, QEvent *event) bTextselected=true; } } - ui->searchButton->setChecked(!ui->searchButton->isChecked() | bTextselected); + ui->searchButton->setChecked(!ui->searchButton->isChecked() || bTextselected); ui->leSearch->setVisible(bTextselected);//To discard re-selection of text on_searchButton_clicked(ui->searchButton->isChecked()); return true; // eat event diff --git a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp index 5e3eca6d7..f457e11d9 100644 --- a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp @@ -32,10 +32,10 @@ #include "RsAutoUpdatePage.h" #include "PopupDistantChatDialog.h" -#define IMAGE_RED_LED ":/icons/bullet_red_64.png" -#define IMAGE_YEL_LED ":/icons/bullet_yellow_64.png" -#define IMAGE_GRN_LED ":/icons/bullet_green_64.png" -#define IMAGE_GRY_LED ":/icons/bullet_grey_64.png" +#define IMAGE_RED_LED ":/icons/bullet_red_128.png" +#define IMAGE_YEL_LED ":/icons/bullet_yellow_128.png" +#define IMAGE_GRN_LED ":/icons/bullet_green_128.png" +#define IMAGE_GRY_LED ":/icons/bullet_grey_128.png" PopupDistantChatDialog::~PopupDistantChatDialog() { diff --git a/retroshare-gui/src/gui/common/FlowLayout.h b/retroshare-gui/src/gui/common/FlowLayout.h index 69f20a4f2..bf18f4056 100644 --- a/retroshare-gui/src/gui/common/FlowLayout.h +++ b/retroshare-gui/src/gui/common/FlowLayout.h @@ -74,7 +74,9 @@ class FlowLayoutItem : public QWidget Q_OBJECT public: - FlowLayoutItem(QString name=QString(), QWidget *parent=0) : QWidget(parent), m_myName(name){ + FlowLayoutItem(QString name=QString(), QWidget *parent=0) + : QWidget(parent), m_myName(name), m_isSelected(false), m_isCurrent(false) + { setFocusPolicy(Qt::StrongFocus); setAcceptDrops(true); } diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.h b/retroshare-gui/src/gui/common/GroupTreeWidget.h index fedd70ef3..d1a708258 100644 --- a/retroshare-gui/src/gui/common/GroupTreeWidget.h +++ b/retroshare-gui/src/gui/common/GroupTreeWidget.h @@ -45,12 +45,9 @@ class GroupItemInfo { public: GroupItemInfo() - { - popularity = 0; - publishKey = false; - subscribeFlags = 0; - max_visible_posts =0; - } + : popularity(0), publishKey(false), adminKey(false) + , subscribeFlags(0), max_visible_posts(0) + {} public: QString id; @@ -65,6 +62,7 @@ public: quint32 max_visible_posts ; }; +//cppcheck-suppress noConstructor class GroupTreeWidget : public QWidget { Q_OBJECT diff --git a/retroshare-gui/src/gui/common/MimeTextEdit.h b/retroshare-gui/src/gui/common/MimeTextEdit.h index 463452bbf..7b22dee88 100644 --- a/retroshare-gui/src/gui/common/MimeTextEdit.h +++ b/retroshare-gui/src/gui/common/MimeTextEdit.h @@ -26,6 +26,7 @@ #include "RSTextEdit.h" #include "util/RsSyntaxHighlighter.h" +//cppcheck-suppress noConstructor class MimeTextEdit : public RSTextEdit { Q_OBJECT diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.h b/retroshare-gui/src/gui/common/RSTextBrowser.h index 13e520d00..5ef4f1637 100644 --- a/retroshare-gui/src/gui/common/RSTextBrowser.h +++ b/retroshare-gui/src/gui/common/RSTextBrowser.h @@ -8,6 +8,7 @@ class RSImageBlockWidget; +//cppcheck-suppress noConstructor class RSTextBrowser : public QTextBrowser { Q_OBJECT diff --git a/retroshare-gui/src/gui/common/RsButtonOnText.cpp b/retroshare-gui/src/gui/common/RsButtonOnText.cpp index 6907a81aa..e93134deb 100644 --- a/retroshare-gui/src/gui/common/RsButtonOnText.cpp +++ b/retroshare-gui/src/gui/common/RsButtonOnText.cpp @@ -11,67 +11,55 @@ #include RSButtonOnText::RSButtonOnText(QWidget *parent) - : QPushButton(parent) + : QPushButton(parent), _textEdit(NULL), _textEditViewPort(NULL), _textCursor(NULL) + , _lenght(-1), _mouseOver(false), _pressed(false) { _uuid = QUuid::createUuid().toString(); - _lenght = -1; - _mouseOver = false; - _pressed = false; } RSButtonOnText::RSButtonOnText(const QString &text, QWidget *parent) - : QPushButton(parent) + : QPushButton(parent), _textEdit(NULL), _textEditViewPort(NULL), _textCursor(NULL) + , _lenght(-1), _mouseOver(false), _pressed(false) //: RSButtonOnText(parent)//delegating constructors only available with -std=c++11 or -std=gnu++11 { _uuid = QUuid::createUuid().toString(); - _lenght = -1; - _mouseOver = false; - _pressed = false; setText(text); } RSButtonOnText::RSButtonOnText(const QIcon& icon, const QString &text, QWidget *parent) - : QPushButton(parent) + : QPushButton(parent), _textEdit(NULL), _textEditViewPort(NULL), _textCursor(NULL) + , _lenght(-1), _mouseOver(false), _pressed(false) //: RSButtonOnText(text, parent)//delegating constructors only available with -std=c++11 or -std=gnu++11 { _uuid = QUuid::createUuid().toString(); - _lenght = -1; - _mouseOver = false; - _pressed = false; setIcon(icon); setText(text); } RSButtonOnText::RSButtonOnText(QTextEdit *textEdit, QWidget *parent) : QPushButton(parent) + , _lenght(-1), _mouseOver(false), _pressed(false) //: RSButtonOnText(parent)//delegating constructors only available with -std=c++11 or -std=gnu++11 { _uuid = QUuid::createUuid().toString(); - _lenght = -1; - _mouseOver = false; - _pressed = false; - appendToText(textEdit); + appendToText(textEdit); } RSButtonOnText::RSButtonOnText(const QString &text, QTextEdit *textEdit, QWidget *parent) : QPushButton(parent) + , _lenght(-1), _mouseOver(false), _pressed(false) //: RSButtonOnText(parent)//delegating constructors only available with -std=c++11 or -std=gnu++11 { _uuid = QUuid::createUuid().toString(); - _lenght = -1; - _mouseOver = false; - _pressed = false; setText(text); appendToText(textEdit); } RSButtonOnText::RSButtonOnText(const QIcon& icon, const QString &text, QTextEdit *textEdit, QWidget *parent) : QPushButton(parent) + , _lenght(-1), _mouseOver(false), _pressed(false) //: RSButtonOnText(parent)//delegating constructors only available with -std=c++11 or -std=gnu++11 { _uuid = QUuid::createUuid().toString(); - _lenght = -1; - _mouseOver = false; - _pressed = false; setIcon(icon); setText(text); appendToText(textEdit); diff --git a/retroshare-gui/src/gui/common/RsButtonOnText.h b/retroshare-gui/src/gui/common/RsButtonOnText.h index 63f5f3248..2d6ecbc5a 100644 --- a/retroshare-gui/src/gui/common/RsButtonOnText.h +++ b/retroshare-gui/src/gui/common/RsButtonOnText.h @@ -35,10 +35,10 @@ private: bool isEventForThis(QObject *obj, QEvent *event, QPoint &point); QString _uuid; - int _lenght;//Because cursor end position move durring editing QTextEdit* _textEdit; QWidget* _textEditViewPort; QTextCursor* _textCursor; + int _lenght;//Because cursor end position move durring editing bool _mouseOver; bool _pressed; diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp index e78fbdf08..3f0d1383d 100644 --- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp +++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp @@ -146,16 +146,20 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName ui.headerFrame->setHeaderText(tr("Collection Editor")); ui.downloadFolder_LE->hide(); ui.downloadFolder_LB->hide(); + ui.destinationDir_TB->hide(); } else { ui.headerFrame->setHeaderText(tr("Download files")); ui.downloadFolder_LE->show(); ui.downloadFolder_LB->show(); + ui.label_filename->hide(); + ui._filename_TL->hide(); ui.downloadFolder_LE->setText(QString::fromUtf8(rsFiles->getDownloadDirectory().c_str())) ; - QObject::connect(ui.downloadFolder_LE,SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(openDestinationDirectoryMenu(QPoint))); + QObject::connect(ui.downloadFolder_LE,SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(openDestinationDirectoryMenu())); + QObject::connect(ui.destinationDir_TB,SIGNAL(pressed()), this, SLOT(openDestinationDirectoryMenu())); } // 1 - add all elements to the list. @@ -227,7 +231,7 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName QMessageBox::warning(NULL,tr("Bad filenames have been cleaned"),tr("Some filenames or directory names contained forbidden characters.\nCharacters \",|,/,\\,<,>,*,? will be replaced by '_'.\n Concerned files are listed in red.")) ; } -void RsCollectionDialog::openDestinationDirectoryMenu(QPoint) +void RsCollectionDialog::openDestinationDirectoryMenu() { QMenu contextMnu( this ); @@ -398,30 +402,34 @@ void RsCollectionDialog::processSettings(bool bLoad) */ QTreeWidgetItem* RsCollectionDialog::getRootItem() { - QTreeWidgetItem* root= ui._fileEntriesTW->topLevelItem(0); - if (!root) { - root= new QTreeWidgetItem; - root->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate); - root->setText(COLUMN_FILE, "/"); - root->setToolTip(COLUMN_FILE,tr("This is the root directory.")); - root->setText(COLUMN_FILEPATH, "/"); - root->setText(COLUMN_HASH, ""); - root->setData(COLUMN_HASH, ROLE_NAME, ""); - root->setData(COLUMN_HASH, ROLE_PATH, ""); - root->setData(COLUMN_HASH, ROLE_TYPE, DIR_TYPE_DIR); - root->setText(COLUMN_SIZE, misc::friendlyUnit(0)); - root->setToolTip(COLUMN_SIZE, tr("Real Size: Waiting child...")); - root->setData(COLUMN_SIZE, ROLE_SIZE, 0); - root->setData(COLUMN_SIZE, ROLE_SELSIZE, 0); - root->setText(COLUMN_FILEC, "0"); - root->setToolTip(COLUMN_FILEC, tr("Real File Count: Waiting child...")); - root->setData(COLUMN_FILEC, ROLE_FILEC, 0); - root->setData(COLUMN_FILEC, ROLE_SELFILEC, 0); - ui._fileEntriesTW->addTopLevelItem(root); - } - root->setExpanded(true); + return ui._fileEntriesTW->invisibleRootItem(); - return root; +// (csoler) I removed this code because it does the job of the invisibleRootItem() method. +// +// QTreeWidgetItem* root= ui._fileEntriesTW->topLevelItem(0); +// if (!root) { +// root= new QTreeWidgetItem; +// root->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate); +// root->setText(COLUMN_FILE, "/"); +// root->setToolTip(COLUMN_FILE,tr("This is the root directory.")); +// root->setText(COLUMN_FILEPATH, "/"); +// root->setText(COLUMN_HASH, ""); +// root->setData(COLUMN_HASH, ROLE_NAME, ""); +// root->setData(COLUMN_HASH, ROLE_PATH, ""); +// root->setData(COLUMN_HASH, ROLE_TYPE, DIR_TYPE_DIR); +// root->setText(COLUMN_SIZE, misc::friendlyUnit(0)); +// root->setToolTip(COLUMN_SIZE, tr("Real Size: Waiting child...")); +// root->setData(COLUMN_SIZE, ROLE_SIZE, 0); +// root->setData(COLUMN_SIZE, ROLE_SELSIZE, 0); +// root->setText(COLUMN_FILEC, "0"); +// root->setToolTip(COLUMN_FILEC, tr("Real File Count: Waiting child...")); +// root->setData(COLUMN_FILEC, ROLE_FILEC, 0); +// root->setData(COLUMN_FILEC, ROLE_SELFILEC, 0); +// ui._fileEntriesTW->addTopLevelItem(root); +// } +// root->setExpanded(true); +// +// return root; } /** @@ -512,6 +520,7 @@ bool RsCollectionDialog::addChild(QTreeWidgetItem* parent, const std::vectorsetData(COLUMN_FILEC, ROLE_SELFILEC, 1); } item->setFont(COLUMN_FILE, font); + item->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless); if (colFileInfo.filename_has_wrong_characters) { diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.h b/retroshare-gui/src/gui/common/RsCollectionDialog.h index 7ecf9b6da..ec3bf8711 100644 --- a/retroshare-gui/src/gui/common/RsCollectionDialog.h +++ b/retroshare-gui/src/gui/common/RsCollectionDialog.h @@ -51,7 +51,7 @@ private slots: void remove() ; void chooseDestinationDirectory(); void setDestinationDirectory(); - void openDestinationDirectoryMenu(QPoint pt); + void openDestinationDirectoryMenu(); void processItem(QMap &dirToAdd , int &index , ColFileInfo &parent diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui index 1e867eb2a..a930d2e7d 100644 --- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui +++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui @@ -377,7 +377,7 @@ QAbstractItemView::ExtendedSelection - false + true true @@ -422,6 +422,17 @@ + + + + ... + + + + :/images/start.png:/images/start.png + + + diff --git a/retroshare-gui/src/gui/emojione.qrc b/retroshare-gui/src/gui/emojione.qrc index bea37e960..77ddbc113 100644 --- a/retroshare-gui/src/gui/emojione.qrc +++ b/retroshare-gui/src/gui/emojione.qrc @@ -558,6 +558,7 @@ emojione/1F640.png emojione/1F641.png emojione/1F642.png + emojione/1f644.png emojione/1F645.png emojione/1F646.png emojione/1F647.png @@ -654,6 +655,7 @@ emojione/2611.png emojione/2614.png emojione/2615.png + emojione/2639.png emojione/2620.png emojione/2708.png emojione/2744.png @@ -668,6 +670,12 @@ emojione/1f914.png emojione/1f915.png emojione/1f916.png + emojione/1f917.png + emojione/1f922.png + emojione/1f923.png + emojione/1f924.png + emojione/1f925.png + emojione/1f927.png emojione/1f643.png emojione/emotes.acs diff --git a/retroshare-gui/src/gui/emojione/0023-20E3.png b/retroshare-gui/src/gui/emojione/0023-20E3.png index 511a2a9d6..25f79d95e 100644 Binary files a/retroshare-gui/src/gui/emojione/0023-20E3.png and b/retroshare-gui/src/gui/emojione/0023-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/002a-20e3.png b/retroshare-gui/src/gui/emojione/002a-20e3.png index bc95f409c..81911ae0a 100644 Binary files a/retroshare-gui/src/gui/emojione/002a-20e3.png and b/retroshare-gui/src/gui/emojione/002a-20e3.png differ diff --git a/retroshare-gui/src/gui/emojione/0030-20E3.png b/retroshare-gui/src/gui/emojione/0030-20E3.png index c8bb62402..3adb488ba 100644 Binary files a/retroshare-gui/src/gui/emojione/0030-20E3.png and b/retroshare-gui/src/gui/emojione/0030-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0031-20E3.png b/retroshare-gui/src/gui/emojione/0031-20E3.png index 80eee63eb..9c66bccd5 100644 Binary files a/retroshare-gui/src/gui/emojione/0031-20E3.png and b/retroshare-gui/src/gui/emojione/0031-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0032-20E3.png b/retroshare-gui/src/gui/emojione/0032-20E3.png index f668ce429..d9955827e 100644 Binary files a/retroshare-gui/src/gui/emojione/0032-20E3.png and b/retroshare-gui/src/gui/emojione/0032-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0033-20E3.png b/retroshare-gui/src/gui/emojione/0033-20E3.png index 574d1b64e..c04445b56 100644 Binary files a/retroshare-gui/src/gui/emojione/0033-20E3.png and b/retroshare-gui/src/gui/emojione/0033-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0034-20E3.png b/retroshare-gui/src/gui/emojione/0034-20E3.png index 3adf0c57d..eb888e88d 100644 Binary files a/retroshare-gui/src/gui/emojione/0034-20E3.png and b/retroshare-gui/src/gui/emojione/0034-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0035-20E3.png b/retroshare-gui/src/gui/emojione/0035-20E3.png index e2c2e2b98..82b1f6fd0 100644 Binary files a/retroshare-gui/src/gui/emojione/0035-20E3.png and b/retroshare-gui/src/gui/emojione/0035-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0036-20E3.png b/retroshare-gui/src/gui/emojione/0036-20E3.png index 5a2828043..3f629ac93 100644 Binary files a/retroshare-gui/src/gui/emojione/0036-20E3.png and b/retroshare-gui/src/gui/emojione/0036-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0037-20E3.png b/retroshare-gui/src/gui/emojione/0037-20E3.png index 0fc70e574..f53856654 100644 Binary files a/retroshare-gui/src/gui/emojione/0037-20E3.png and b/retroshare-gui/src/gui/emojione/0037-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0038-20E3.png b/retroshare-gui/src/gui/emojione/0038-20E3.png index f57e3b91d..b6272f294 100644 Binary files a/retroshare-gui/src/gui/emojione/0038-20E3.png and b/retroshare-gui/src/gui/emojione/0038-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/0039-20E3.png b/retroshare-gui/src/gui/emojione/0039-20E3.png index d46d32aa5..8d00beb9d 100644 Binary files a/retroshare-gui/src/gui/emojione/0039-20E3.png and b/retroshare-gui/src/gui/emojione/0039-20E3.png differ diff --git a/retroshare-gui/src/gui/emojione/00A9.png b/retroshare-gui/src/gui/emojione/00A9.png index c257d5174..b1a65f5c8 100644 Binary files a/retroshare-gui/src/gui/emojione/00A9.png and b/retroshare-gui/src/gui/emojione/00A9.png differ diff --git a/retroshare-gui/src/gui/emojione/00AE.png b/retroshare-gui/src/gui/emojione/00AE.png index 30fff1819..baf3ce3a4 100644 Binary files a/retroshare-gui/src/gui/emojione/00AE.png and b/retroshare-gui/src/gui/emojione/00AE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F004.png b/retroshare-gui/src/gui/emojione/1F004.png index 565d71046..4879d630b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F004.png and b/retroshare-gui/src/gui/emojione/1F004.png differ diff --git a/retroshare-gui/src/gui/emojione/1F0CF.png b/retroshare-gui/src/gui/emojione/1F0CF.png index 496830045..b2027b1c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F0CF.png and b/retroshare-gui/src/gui/emojione/1F0CF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F170.png b/retroshare-gui/src/gui/emojione/1F170.png index b3248d641..cfd50e8f0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F170.png and b/retroshare-gui/src/gui/emojione/1F170.png differ diff --git a/retroshare-gui/src/gui/emojione/1F171.png b/retroshare-gui/src/gui/emojione/1F171.png index 7cfa784e6..7076ece8c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F171.png and b/retroshare-gui/src/gui/emojione/1F171.png differ diff --git a/retroshare-gui/src/gui/emojione/1F17E.png b/retroshare-gui/src/gui/emojione/1F17E.png index cb55d7bb1..47dd4f282 100644 Binary files a/retroshare-gui/src/gui/emojione/1F17E.png and b/retroshare-gui/src/gui/emojione/1F17E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F17F.png b/retroshare-gui/src/gui/emojione/1F17F.png index 5e3474257..5ef8e5299 100644 Binary files a/retroshare-gui/src/gui/emojione/1F17F.png and b/retroshare-gui/src/gui/emojione/1F17F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F18E.png b/retroshare-gui/src/gui/emojione/1F18E.png index d7d80a0f4..ae12068ba 100644 Binary files a/retroshare-gui/src/gui/emojione/1F18E.png and b/retroshare-gui/src/gui/emojione/1F18E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F191.png b/retroshare-gui/src/gui/emojione/1F191.png index e14b5ed9b..d592d35f9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F191.png and b/retroshare-gui/src/gui/emojione/1F191.png differ diff --git a/retroshare-gui/src/gui/emojione/1F192.png b/retroshare-gui/src/gui/emojione/1F192.png index f83cb84e8..c9eb4562f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F192.png and b/retroshare-gui/src/gui/emojione/1F192.png differ diff --git a/retroshare-gui/src/gui/emojione/1F193.png b/retroshare-gui/src/gui/emojione/1F193.png index f5ef7b5ed..d9ce7ddf2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F193.png and b/retroshare-gui/src/gui/emojione/1F193.png differ diff --git a/retroshare-gui/src/gui/emojione/1F194.png b/retroshare-gui/src/gui/emojione/1F194.png index e8e34f50a..2e54cf1f8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F194.png and b/retroshare-gui/src/gui/emojione/1F194.png differ diff --git a/retroshare-gui/src/gui/emojione/1F195.png b/retroshare-gui/src/gui/emojione/1F195.png index c2b783cf5..117820789 100644 Binary files a/retroshare-gui/src/gui/emojione/1F195.png and b/retroshare-gui/src/gui/emojione/1F195.png differ diff --git a/retroshare-gui/src/gui/emojione/1F196.png b/retroshare-gui/src/gui/emojione/1F196.png index faf83fe33..0cc92e10b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F196.png and b/retroshare-gui/src/gui/emojione/1F196.png differ diff --git a/retroshare-gui/src/gui/emojione/1F197.png b/retroshare-gui/src/gui/emojione/1F197.png index 3d6339085..1a779d3b1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F197.png and b/retroshare-gui/src/gui/emojione/1F197.png differ diff --git a/retroshare-gui/src/gui/emojione/1F198.png b/retroshare-gui/src/gui/emojione/1F198.png index 5dcc3eaed..7cf6c0d67 100644 Binary files a/retroshare-gui/src/gui/emojione/1F198.png and b/retroshare-gui/src/gui/emojione/1F198.png differ diff --git a/retroshare-gui/src/gui/emojione/1F199.png b/retroshare-gui/src/gui/emojione/1F199.png index cb898f3e7..4101440c3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F199.png and b/retroshare-gui/src/gui/emojione/1F199.png differ diff --git a/retroshare-gui/src/gui/emojione/1F19A.png b/retroshare-gui/src/gui/emojione/1F19A.png index d053d76c5..04d44d369 100644 Binary files a/retroshare-gui/src/gui/emojione/1F19A.png and b/retroshare-gui/src/gui/emojione/1F19A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1E8.png index 9444c1376..d7b1263bb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1E9.png index 0f1522b34..b3624f5ee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1EA.png index f9478ee50..bc40caa3e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1EB.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1EB.png index 81cedfc9e..f11a335d0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1EB.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1EC.png index b24f9d847..288abab7c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1EE.png index f5df49746..55f891110 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1F1.png index 450c8d5b0..3c873993f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1F2.png index 7d9b44633..785d5435a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1F4.png index 23091aff1..57599e903 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1F7.png index e3d627be8..4e00a265e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1F9.png index 7e5d50505..80309ce9f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1FA.png index 9a78fb958..81ad67d5e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1FC.png index 52e31df69..5d8e84ed1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E6-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1E6-1F1FF.png index b455c0fa0..e970b76e4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E6-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1E6-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1E6.png index 307530b96..9467a9412 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1E7.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1E7.png index bcc558454..731eb8729 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1E7.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1E9.png index 4d5232de4..2c2d79669 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1EA.png index 5e887afda..d723b7368 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1EB.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1EB.png index 7a586453d..55eb87aba 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1EB.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1EC.png index 01d7de0fd..a0a7fc655 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1ED.png index 2107ff717..fb58900b2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1EE.png index a09ac6764..9e9125ced 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1EF.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1EF.png index 405f539fd..81c80394e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1EF.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F2.png index 171fa5eaa..32f396854 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F3.png index a22c86c89..728fa09f9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F4.png index 7bf4d571f..94c0f5fde 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F7.png index dae5f5f17..b0c345477 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F8.png index 711c45a76..fc3a61ec0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1F9.png index be481e7d4..a69a55e19 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1FC.png index a6016b843..9e84a4a91 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1FE.png index 7263ae389..00911a2e9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E7-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1E7-1F1FF.png index 753941407..ee2443059 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E7-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1E7-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1E6.png index 050ebca18..05824b8e6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1E9.png index cdc28e96c..855be1c37 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1EB.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1EB.png index d221f2bab..0b4885f05 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1EB.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1EC.png index b4d0281d4..3d7fe3acf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1ED.png index 49be7c66e..770903e60 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1EE.png index 13260140d..3a9cbe2da 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1F1.png index c1e8fa72d..b8cc36277 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1F2.png index 057318c51..deb630549 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1F3.png index c9407f3d4..da7219e3a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1F4.png index f2347a63a..da0f2ecbc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1F7.png index 58bdcf8a9..b097d58f8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1FA.png index 665d01ecc..f43ecfc6d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1FB.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1FB.png index 4fc447c5f..a302f3724 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1FB.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1FE.png index dc4a2b4a5..f07950fb3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E8-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1E8-1F1FF.png index 525fda409..31f8ecd3f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E8-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1E8-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1EA.png index 64097cd49..270970598 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1EF.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1EF.png index ac1ec0e94..5ac7500dc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1EF.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1F0.png index 47e8e5043..8efe78c2a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1F2.png index 77f3ff77e..166b6fbda 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1F4.png index 0f377f7fd..b41ba37f8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1E9-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1E9-1F1FF.png index b88fcdc09..a9633f0dc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1E9-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1E9-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1E8.png index ed1346f97..f374316c5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1EA.png index 2ff982cdc..2ffc38023 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1EC.png index 2d5be073b..59338a87b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1ED.png index 17baa1776..568c56012 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1F7.png index 5945efc8f..8726608c3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1F8.png index cfe2ad773..807c56bc6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EA-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1EA-1F1F9.png index ffb65dd25..3612c8142 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EA-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1EA-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1EE.png index b2fc3c8bf..321827fe0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1EF.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1EF.png index b396385a2..d95c6db5a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1EF.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1F0.png index 07289abbf..aeaecf555 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1F2.png index 137b702a6..0b781ed3b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1F4.png index e88e0e24f..4472fe750 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EB-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1EB-1F1F7.png index 20527eac5..ea5a8a395 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EB-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1EB-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1E6.png index 4da8e632a..615e48063 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1E7.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1E7.png index 4f5707f3c..bfc20892d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1E7.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1E9.png index 3c5fd134c..69970013d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1EA.png index aa83ae096..fd73f785c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1ED.png index 31f632d30..250c64249 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1EE.png index f5939ef0a..5e610b003 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F1.png index 5cea230ee..43f493ece 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F2.png index 18a2ddd5c..5ec3bb660 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F3.png index cd2d53a65..4efe4963f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F6.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F6.png index 189fcf65d..1a6f308a7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F6.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F7.png index 35c61141c..2683d2d9c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1F9.png index a12ce474d..983d6190a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1FA.png index ec2bbf744..3a88f84cd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1FC.png index 47d36a5f7..1755ae09d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EC-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1EC-1F1FE.png index eea0c9745..e1035261b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EC-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1EC-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1ED-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1ED-1F1F0.png index 2d3df30b9..ee658a0ee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1ED-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1ED-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1ED-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1ED-1F1F3.png index b6d2f02f5..a412423fa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1ED-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1ED-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1ED-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1ED-1F1F7.png index 6bcc20a27..9cbe4e596 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1ED-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1ED-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1ED-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1ED-1F1F9.png index 770934122..4f995621d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1ED-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1ED-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1ED-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1ED-1F1FA.png index 43d9ee414..364e52993 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1ED-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1ED-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1E9.png index 3f93d4bda..426d3ad30 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1EA.png index c432556a3..e5ef12fb0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F1.png index 7c185b62e..f1c18619a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F3.png index 6cba61acb..338b47472 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F6.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F6.png index 5c193d8fd..c381ee29a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F6.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F7.png index 2824dd70d..c7a623e46 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F8.png index 310fdbe66..53760d932 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EE-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1EE-1F1F9.png index 4ead88b47..6fb9ca709 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EE-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1EE-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EF-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1EF-1F1EA.png index f9a8ce7dc..8f28fe191 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EF-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1EF-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EF-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1EF-1F1F2.png index f8ddb8e8c..89c7237ce 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EF-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1EF-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EF-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1EF-1F1F4.png index e792bccf7..34fb5a6ca 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EF-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1EF-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1EF-1F1F5.png b/retroshare-gui/src/gui/emojione/1F1EF-1F1F5.png index 7171833f9..1110d2285 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1EF-1F1F5.png and b/retroshare-gui/src/gui/emojione/1F1EF-1F1F5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1EA.png index dba4e063f..036b28b06 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1EC.png index 401ed94cb..312f751db 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1ED.png index 75cf8c2be..c6827a194 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1EE.png index 5cb70fa12..4f87fb428 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1F2.png index a39239115..8a17a3d26 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1F3.png index c4c262969..936dfb0d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1F5.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1F5.png index e2af6dd27..917cb3117 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1F5.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1F5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1F7.png index 37e640042..3f6e15112 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1FC.png index 9645f171c..54479b151 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1FE.png index e821f3c5a..73557a6ed 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F0-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1F0-1F1FF.png index 5943711a4..67ebe1452 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F0-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1F0-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1E6.png index 203e6fa6c..84d5b53a9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1E7.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1E7.png index 3661b90b3..461024fee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1E7.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1E8.png index 08c7a7eb4..4c4690c72 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1EE.png index 5169f4825..c36832073 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1F0.png index 63cdf4cdf..a896c2246 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1F7.png index 5ce1f9e91..1fd8f2d88 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1F8.png index 6e6a93376..e6d68e92e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1F9.png index e7a4e2157..17f4ace71 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1FA.png index 28a4b7506..24c9c80bb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1FB.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1FB.png index 81fc06316..ed377fd6f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1FB.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F1-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1F1-1F1FE.png index aa5966102..ee3b6a6cf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F1-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1F1-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1E6.png index cc0275b4a..38ab24eca 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1E8.png index a362e2de5..426d3ad30 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1E9.png index 64556857d..c6a247744 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1EA.png index 2a5bd4440..3ab0d5869 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1EC.png index 47bb94902..42a0155a4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1ED.png index 332ab31a5..2e89f556e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F0.png index 8ac7574a8..db1d536cd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F1.png index 019b2b705..d8bc0be9c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F2.png index 5de7cf32c..a60dcbfa9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F3.png index f7dea4702..5c438d989 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F4.png index c4e2887fb..c497cec63 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F7.png index 4bf5f988d..0912ced81 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F8.png index 88c603947..67497a771 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1F9.png index 7716807cb..a88d88515 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FA.png index 25a697491..37790353e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FB.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FB.png index 9b61c743c..239ba68b0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FB.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FC.png index 925d07073..e5307d409 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FD.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FD.png index f430ef3a5..ae6d3ce4e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FD.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FE.png index 5c07c147f..475727a6e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F2-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1F2-1F1FF.png index e75eff224..271beee74 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F2-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1F2-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1E6.png index 4ed5b28bc..dd79a41be 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1E8.png index 6e21c3f47..76329f301 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1EA.png index 26f8c31a1..c43022c29 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1EC.png index bfe4f640e..7b9c7be77 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1EE.png index c0a462a21..00dd968d5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1F1.png index 5f042de7c..d49c3defb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1F4.png index f74080a07..1fbc262c9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1F5.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1F5.png index 1bf4e39cf..364b895eb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1F5.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1F5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1F7.png index 60279d858..0fd931c10 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1FA.png index a114dbc04..45c84a9b6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F3-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1F3-1F1FF.png index 72a178877..01f14c9af 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F3-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1F3-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F4-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1F4-1F1F2.png index 772ec69fb..1616f2634 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F4-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1F4-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1E6.png index 6c65714d3..b3277336a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1EA.png index 49c2ed41a..f878115cd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1EB.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1EB.png index 97b253cac..bf81f8574 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1EB.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1EC.png index 34b6c1535..36007a351 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1ED.png index 964713f26..2f0f7c4f0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1F0.png index fe7640bc6..b0a0a5ab5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1F1.png index 97e699ea9..f6ccda512 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1F7.png index 637e7414e..6c2815e17 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1F8.png index 708bfa927..f532c6f9c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1F9.png index 5c3fd7db6..e2f912711 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1FC.png index 559b3aa5b..d7790acf3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F5-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1F5-1F1FE.png index 27956e54d..5313a63c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F5-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1F5-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F6-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F6-1F1E6.png index a964faed6..480e1166f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F6-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F6-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F7-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1F7-1F1F4.png index 01172e315..de64a4e4b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F7-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1F7-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F7-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1F7-1F1F8.png index f74f4a419..186348057 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F7-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1F7-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F7-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1F7-1F1FA.png index 4f3bbbc03..aa0953ecc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F7-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1F7-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F7-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1F7-1F1FC.png index cc0a3f0c8..6a8cb1333 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F7-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1F7-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1E6.png index ca5dd20da..cd0c151d5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1E7.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1E7.png index 1b124c904..8b2002042 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1E7.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1E8.png index 3968be7bd..98137d6b4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1E9.png index 7b0d2f243..0e67fa71c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1EA.png index bc59c94e7..b459f00c2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1EC.png index ab0363e72..5b20af17c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1ED.png index 1d8669a38..71ddd0db9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1EE.png index 4fb858be3..3f0d9aa97 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F0.png index 7364eead6..1b648d45f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F1.png index 51843f8d0..552b78373 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F2.png index 67903cb28..f5e21b3bb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F3.png index 96b182073..6563af805 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F4.png index 7c500767e..ebeeebad4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F7.png index a11c2919c..550fb844c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1F9.png index 39bfd4c20..2fa33eef0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1FB.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1FB.png index afc717dee..d78533bb7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1FB.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1FE.png index 80ee51681..629a94a1b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F8-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1F8-1F1FF.png index bd0815625..a2e180a4a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F8-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1F8-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1E9.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1E9.png index 3da5c5bb2..de64a4e4b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1E9.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1EC.png index 3c4af9a24..92b48f00c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1ED.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1ED.png index 6f79a6d69..ef835ac48 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1ED.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1EF.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1EF.png index 139669dc3..6cd05edd5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1EF.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F1.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F1.png index 23f2eff95..3a2c7fd98 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F1.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F2.png index 27f2e0179..8c0929f7d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F3.png index a6aa7bdb8..856070564 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F4.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F4.png index 23965f3c2..95bfef47a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F4.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F7.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F7.png index 2f96b97ca..d45c67b52 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F7.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1F9.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1F9.png index 88e6f383f..d01d0a34f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1F9.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1FB.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1FB.png index 5c4bff9bd..11d58644a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1FB.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1FC.png index 2d3e8180f..af39b9b5b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1F9-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1F9-1F1FF.png index f81163801..21a846bcb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1F9-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1F9-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FA-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1FA-1F1E6.png index 4e9a768f1..795a45d95 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FA-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1FA-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FA-1F1EC.png b/retroshare-gui/src/gui/emojione/1F1FA-1F1EC.png index 784ce4ab5..a8cb224e2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FA-1F1EC.png and b/retroshare-gui/src/gui/emojione/1F1FA-1F1EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FA-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1FA-1F1F8.png index 9fc60f33b..439296c1e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FA-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1FA-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FA-1F1FE.png b/retroshare-gui/src/gui/emojione/1F1FA-1F1FE.png index 139fb2107..8719ab442 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FA-1F1FE.png and b/retroshare-gui/src/gui/emojione/1F1FA-1F1FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FA-1F1FF.png b/retroshare-gui/src/gui/emojione/1F1FA-1F1FF.png index 9070f6188..88ef01b24 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FA-1F1FF.png and b/retroshare-gui/src/gui/emojione/1F1FA-1F1FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1E6.png index 4731c943a..be09587fe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1E8.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1E8.png index 077083a8c..bbb5b067c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1E8.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1EA.png index 3db950ba3..0477fbf10 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1EE.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1EE.png index 2cfe1e1fc..b111ce92a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1EE.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1F3.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1F3.png index de28f4727..7ca073690 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1F3.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FB-1F1FA.png b/retroshare-gui/src/gui/emojione/1F1FB-1F1FA.png index afe90e932..276628f29 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FB-1F1FA.png and b/retroshare-gui/src/gui/emojione/1F1FB-1F1FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FC-1F1EB.png b/retroshare-gui/src/gui/emojione/1F1FC-1F1EB.png index 7ee75aac2..da183dc24 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FC-1F1EB.png and b/retroshare-gui/src/gui/emojione/1F1FC-1F1EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FC-1F1F8.png b/retroshare-gui/src/gui/emojione/1F1FC-1F1F8.png index 8c0b8aa74..2dc79eb58 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FC-1F1F8.png and b/retroshare-gui/src/gui/emojione/1F1FC-1F1F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FD-1F1F0.png b/retroshare-gui/src/gui/emojione/1F1FD-1F1F0.png index 601650411..663b2232e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FD-1F1F0.png and b/retroshare-gui/src/gui/emojione/1F1FD-1F1F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FE-1F1EA.png b/retroshare-gui/src/gui/emojione/1F1FE-1F1EA.png index 3b971bff0..9d78eae5d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FE-1F1EA.png and b/retroshare-gui/src/gui/emojione/1F1FE-1F1EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FF-1F1E6.png b/retroshare-gui/src/gui/emojione/1F1FF-1F1E6.png index 3e4e1d183..07d8d7f06 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FF-1F1E6.png and b/retroshare-gui/src/gui/emojione/1F1FF-1F1E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FF-1F1F2.png b/retroshare-gui/src/gui/emojione/1F1FF-1F1F2.png index e57447667..ec853c250 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FF-1F1F2.png and b/retroshare-gui/src/gui/emojione/1F1FF-1F1F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F1FF-1F1FC.png b/retroshare-gui/src/gui/emojione/1F1FF-1F1FC.png index 911c755b9..93ac5e862 100644 Binary files a/retroshare-gui/src/gui/emojione/1F1FF-1F1FC.png and b/retroshare-gui/src/gui/emojione/1F1FF-1F1FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F201.png b/retroshare-gui/src/gui/emojione/1F201.png index 0b65aee22..0fe207a86 100644 Binary files a/retroshare-gui/src/gui/emojione/1F201.png and b/retroshare-gui/src/gui/emojione/1F201.png differ diff --git a/retroshare-gui/src/gui/emojione/1F202.png b/retroshare-gui/src/gui/emojione/1F202.png index 784fa1237..fa1047248 100644 Binary files a/retroshare-gui/src/gui/emojione/1F202.png and b/retroshare-gui/src/gui/emojione/1F202.png differ diff --git a/retroshare-gui/src/gui/emojione/1F21A.png b/retroshare-gui/src/gui/emojione/1F21A.png index 5d0900b70..6221a7ff0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F21A.png and b/retroshare-gui/src/gui/emojione/1F21A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F22F.png b/retroshare-gui/src/gui/emojione/1F22F.png index 6700de8af..aa7b61dc3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F22F.png and b/retroshare-gui/src/gui/emojione/1F22F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F232.png b/retroshare-gui/src/gui/emojione/1F232.png index a80d9da35..b6eea6d9d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F232.png and b/retroshare-gui/src/gui/emojione/1F232.png differ diff --git a/retroshare-gui/src/gui/emojione/1F233.png b/retroshare-gui/src/gui/emojione/1F233.png index 0698f13c0..8ba5ceec1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F233.png and b/retroshare-gui/src/gui/emojione/1F233.png differ diff --git a/retroshare-gui/src/gui/emojione/1F234.png b/retroshare-gui/src/gui/emojione/1F234.png index 4a554ff29..e6a82b6c6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F234.png and b/retroshare-gui/src/gui/emojione/1F234.png differ diff --git a/retroshare-gui/src/gui/emojione/1F235.png b/retroshare-gui/src/gui/emojione/1F235.png index 6d773fe8a..15b7496fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F235.png and b/retroshare-gui/src/gui/emojione/1F235.png differ diff --git a/retroshare-gui/src/gui/emojione/1F236.png b/retroshare-gui/src/gui/emojione/1F236.png index aa0bfbefd..fa9c2ac1f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F236.png and b/retroshare-gui/src/gui/emojione/1F236.png differ diff --git a/retroshare-gui/src/gui/emojione/1F237.png b/retroshare-gui/src/gui/emojione/1F237.png index 6aa777599..ded05cc85 100644 Binary files a/retroshare-gui/src/gui/emojione/1F237.png and b/retroshare-gui/src/gui/emojione/1F237.png differ diff --git a/retroshare-gui/src/gui/emojione/1F238.png b/retroshare-gui/src/gui/emojione/1F238.png index e68cedbe6..39f91f90b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F238.png and b/retroshare-gui/src/gui/emojione/1F238.png differ diff --git a/retroshare-gui/src/gui/emojione/1F239.png b/retroshare-gui/src/gui/emojione/1F239.png index 187d5d189..d3ae16b2b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F239.png and b/retroshare-gui/src/gui/emojione/1F239.png differ diff --git a/retroshare-gui/src/gui/emojione/1F23A.png b/retroshare-gui/src/gui/emojione/1F23A.png index 466b06cf4..c5558452d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F23A.png and b/retroshare-gui/src/gui/emojione/1F23A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F250.png b/retroshare-gui/src/gui/emojione/1F250.png index 5468e2bf0..480557d67 100644 Binary files a/retroshare-gui/src/gui/emojione/1F250.png and b/retroshare-gui/src/gui/emojione/1F250.png differ diff --git a/retroshare-gui/src/gui/emojione/1F251.png b/retroshare-gui/src/gui/emojione/1F251.png index 35d029586..f8123f5c3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F251.png and b/retroshare-gui/src/gui/emojione/1F251.png differ diff --git a/retroshare-gui/src/gui/emojione/1F300.png b/retroshare-gui/src/gui/emojione/1F300.png index 2ab11057f..01456dfe2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F300.png and b/retroshare-gui/src/gui/emojione/1F300.png differ diff --git a/retroshare-gui/src/gui/emojione/1F301.png b/retroshare-gui/src/gui/emojione/1F301.png index a2f7a1fbe..247d37883 100644 Binary files a/retroshare-gui/src/gui/emojione/1F301.png and b/retroshare-gui/src/gui/emojione/1F301.png differ diff --git a/retroshare-gui/src/gui/emojione/1F302.png b/retroshare-gui/src/gui/emojione/1F302.png index 61c090000..4839da96f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F302.png and b/retroshare-gui/src/gui/emojione/1F302.png differ diff --git a/retroshare-gui/src/gui/emojione/1F303.png b/retroshare-gui/src/gui/emojione/1F303.png index 99ab83e80..bbbc176ec 100644 Binary files a/retroshare-gui/src/gui/emojione/1F303.png and b/retroshare-gui/src/gui/emojione/1F303.png differ diff --git a/retroshare-gui/src/gui/emojione/1F304.png b/retroshare-gui/src/gui/emojione/1F304.png index 63ba56d07..a683880e2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F304.png and b/retroshare-gui/src/gui/emojione/1F304.png differ diff --git a/retroshare-gui/src/gui/emojione/1F305.png b/retroshare-gui/src/gui/emojione/1F305.png index 2005d89ee..22efc2cf2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F305.png and b/retroshare-gui/src/gui/emojione/1F305.png differ diff --git a/retroshare-gui/src/gui/emojione/1F306.png b/retroshare-gui/src/gui/emojione/1F306.png index 59b84489b..a7cffb567 100644 Binary files a/retroshare-gui/src/gui/emojione/1F306.png and b/retroshare-gui/src/gui/emojione/1F306.png differ diff --git a/retroshare-gui/src/gui/emojione/1F307.png b/retroshare-gui/src/gui/emojione/1F307.png index 1581aadee..82e53994c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F307.png and b/retroshare-gui/src/gui/emojione/1F307.png differ diff --git a/retroshare-gui/src/gui/emojione/1F308.png b/retroshare-gui/src/gui/emojione/1F308.png index baa210688..21e21a771 100644 Binary files a/retroshare-gui/src/gui/emojione/1F308.png and b/retroshare-gui/src/gui/emojione/1F308.png differ diff --git a/retroshare-gui/src/gui/emojione/1F309.png b/retroshare-gui/src/gui/emojione/1F309.png index 0e3818cdc..bf68e3ccb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F309.png and b/retroshare-gui/src/gui/emojione/1F309.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30A.png b/retroshare-gui/src/gui/emojione/1F30A.png index 52c1fdce2..7c97322ae 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30A.png and b/retroshare-gui/src/gui/emojione/1F30A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30B.png b/retroshare-gui/src/gui/emojione/1F30B.png index 88dc23dab..b17adc3c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30B.png and b/retroshare-gui/src/gui/emojione/1F30B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30C.png b/retroshare-gui/src/gui/emojione/1F30C.png index 7f4877734..649ebcfbe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30C.png and b/retroshare-gui/src/gui/emojione/1F30C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30D.png b/retroshare-gui/src/gui/emojione/1F30D.png index bdad3d019..2f92d788c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30D.png and b/retroshare-gui/src/gui/emojione/1F30D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30E.png b/retroshare-gui/src/gui/emojione/1F30E.png index 602088930..ddb32ac65 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30E.png and b/retroshare-gui/src/gui/emojione/1F30E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F30F.png b/retroshare-gui/src/gui/emojione/1F30F.png index 846579f07..d05a7ebea 100644 Binary files a/retroshare-gui/src/gui/emojione/1F30F.png and b/retroshare-gui/src/gui/emojione/1F30F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F310.png b/retroshare-gui/src/gui/emojione/1F310.png index e81e2e6b1..3374262af 100644 Binary files a/retroshare-gui/src/gui/emojione/1F310.png and b/retroshare-gui/src/gui/emojione/1F310.png differ diff --git a/retroshare-gui/src/gui/emojione/1F311.png b/retroshare-gui/src/gui/emojione/1F311.png index 509024724..a8a42a9d9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F311.png and b/retroshare-gui/src/gui/emojione/1F311.png differ diff --git a/retroshare-gui/src/gui/emojione/1F312.png b/retroshare-gui/src/gui/emojione/1F312.png index ba98f5fce..7ee36f9e3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F312.png and b/retroshare-gui/src/gui/emojione/1F312.png differ diff --git a/retroshare-gui/src/gui/emojione/1F313.png b/retroshare-gui/src/gui/emojione/1F313.png index faf23868f..2f7ff6fdf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F313.png and b/retroshare-gui/src/gui/emojione/1F313.png differ diff --git a/retroshare-gui/src/gui/emojione/1F314.png b/retroshare-gui/src/gui/emojione/1F314.png index 48beec030..b8d9824d0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F314.png and b/retroshare-gui/src/gui/emojione/1F314.png differ diff --git a/retroshare-gui/src/gui/emojione/1F315.png b/retroshare-gui/src/gui/emojione/1F315.png index db80c0f6f..0d593af85 100644 Binary files a/retroshare-gui/src/gui/emojione/1F315.png and b/retroshare-gui/src/gui/emojione/1F315.png differ diff --git a/retroshare-gui/src/gui/emojione/1F316.png b/retroshare-gui/src/gui/emojione/1F316.png index 98c655c9c..9e8ecbfb9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F316.png and b/retroshare-gui/src/gui/emojione/1F316.png differ diff --git a/retroshare-gui/src/gui/emojione/1F317.png b/retroshare-gui/src/gui/emojione/1F317.png index 795c31f5a..ebb8aa63d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F317.png and b/retroshare-gui/src/gui/emojione/1F317.png differ diff --git a/retroshare-gui/src/gui/emojione/1F318.png b/retroshare-gui/src/gui/emojione/1F318.png index 06e297144..a4940b476 100644 Binary files a/retroshare-gui/src/gui/emojione/1F318.png and b/retroshare-gui/src/gui/emojione/1F318.png differ diff --git a/retroshare-gui/src/gui/emojione/1F319.png b/retroshare-gui/src/gui/emojione/1F319.png index c777cf537..f93635eb4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F319.png and b/retroshare-gui/src/gui/emojione/1F319.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31A.png b/retroshare-gui/src/gui/emojione/1F31A.png index f053bafb1..b7b90f8d2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31A.png and b/retroshare-gui/src/gui/emojione/1F31A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31B.png b/retroshare-gui/src/gui/emojione/1F31B.png index a53a6708e..e715a7614 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31B.png and b/retroshare-gui/src/gui/emojione/1F31B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31C.png b/retroshare-gui/src/gui/emojione/1F31C.png index 544fc3b7d..3bcdf4b63 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31C.png and b/retroshare-gui/src/gui/emojione/1F31C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31D.png b/retroshare-gui/src/gui/emojione/1F31D.png index 548370628..16bf52f5b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31D.png and b/retroshare-gui/src/gui/emojione/1F31D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31E.png b/retroshare-gui/src/gui/emojione/1F31E.png index 01eb0f8e0..d2aeed384 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31E.png and b/retroshare-gui/src/gui/emojione/1F31E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F31F.png b/retroshare-gui/src/gui/emojione/1F31F.png index 85445e940..88d142aad 100644 Binary files a/retroshare-gui/src/gui/emojione/1F31F.png and b/retroshare-gui/src/gui/emojione/1F31F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F320.png b/retroshare-gui/src/gui/emojione/1F320.png index e371b3c21..c65180ce1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F320.png and b/retroshare-gui/src/gui/emojione/1F320.png differ diff --git a/retroshare-gui/src/gui/emojione/1F321.png b/retroshare-gui/src/gui/emojione/1F321.png index 40449cdcf..2cb8a67a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F321.png and b/retroshare-gui/src/gui/emojione/1F321.png differ diff --git a/retroshare-gui/src/gui/emojione/1F327.png b/retroshare-gui/src/gui/emojione/1F327.png index 1205c3fbe..37d24fd01 100644 Binary files a/retroshare-gui/src/gui/emojione/1F327.png and b/retroshare-gui/src/gui/emojione/1F327.png differ diff --git a/retroshare-gui/src/gui/emojione/1F328.png b/retroshare-gui/src/gui/emojione/1F328.png index ba67dbe7c..f5e02080c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F328.png and b/retroshare-gui/src/gui/emojione/1F328.png differ diff --git a/retroshare-gui/src/gui/emojione/1F329.png b/retroshare-gui/src/gui/emojione/1F329.png index cfaed819c..ed9c0750d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F329.png and b/retroshare-gui/src/gui/emojione/1F329.png differ diff --git a/retroshare-gui/src/gui/emojione/1F32A.png b/retroshare-gui/src/gui/emojione/1F32A.png index c81d8cbd3..b9944a9e1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F32A.png and b/retroshare-gui/src/gui/emojione/1F32A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F32B.png b/retroshare-gui/src/gui/emojione/1F32B.png index 69a793720..b84589e99 100644 Binary files a/retroshare-gui/src/gui/emojione/1F32B.png and b/retroshare-gui/src/gui/emojione/1F32B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F32C.png b/retroshare-gui/src/gui/emojione/1F32C.png index 14b9a75b1..8ecb3d467 100644 Binary files a/retroshare-gui/src/gui/emojione/1F32C.png and b/retroshare-gui/src/gui/emojione/1F32C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F330.png b/retroshare-gui/src/gui/emojione/1F330.png index 54d338f89..27a9d48d0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F330.png and b/retroshare-gui/src/gui/emojione/1F330.png differ diff --git a/retroshare-gui/src/gui/emojione/1F331.png b/retroshare-gui/src/gui/emojione/1F331.png index dbe55869b..0e46989a9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F331.png and b/retroshare-gui/src/gui/emojione/1F331.png differ diff --git a/retroshare-gui/src/gui/emojione/1F332.png b/retroshare-gui/src/gui/emojione/1F332.png index 53e54062f..3911d1fbb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F332.png and b/retroshare-gui/src/gui/emojione/1F332.png differ diff --git a/retroshare-gui/src/gui/emojione/1F333.png b/retroshare-gui/src/gui/emojione/1F333.png index 39e2598c8..cf5d05bb6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F333.png and b/retroshare-gui/src/gui/emojione/1F333.png differ diff --git a/retroshare-gui/src/gui/emojione/1F334.png b/retroshare-gui/src/gui/emojione/1F334.png index cc353daaa..94e185ad3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F334.png and b/retroshare-gui/src/gui/emojione/1F334.png differ diff --git a/retroshare-gui/src/gui/emojione/1F335.png b/retroshare-gui/src/gui/emojione/1F335.png index c26fc5d79..2cfc3bf11 100644 Binary files a/retroshare-gui/src/gui/emojione/1F335.png and b/retroshare-gui/src/gui/emojione/1F335.png differ diff --git a/retroshare-gui/src/gui/emojione/1F336.png b/retroshare-gui/src/gui/emojione/1F336.png index 1180b003e..2d1c70d8f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F336.png and b/retroshare-gui/src/gui/emojione/1F336.png differ diff --git a/retroshare-gui/src/gui/emojione/1F337.png b/retroshare-gui/src/gui/emojione/1F337.png index 9d2f18beb..0ba554bec 100644 Binary files a/retroshare-gui/src/gui/emojione/1F337.png and b/retroshare-gui/src/gui/emojione/1F337.png differ diff --git a/retroshare-gui/src/gui/emojione/1F338.png b/retroshare-gui/src/gui/emojione/1F338.png index 45a9113d3..bd032d6ba 100644 Binary files a/retroshare-gui/src/gui/emojione/1F338.png and b/retroshare-gui/src/gui/emojione/1F338.png differ diff --git a/retroshare-gui/src/gui/emojione/1F339.png b/retroshare-gui/src/gui/emojione/1F339.png index b4dd0f450..da8e2f258 100644 Binary files a/retroshare-gui/src/gui/emojione/1F339.png and b/retroshare-gui/src/gui/emojione/1F339.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33A.png b/retroshare-gui/src/gui/emojione/1F33A.png index 7159d5f6d..9d6bf535b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33A.png and b/retroshare-gui/src/gui/emojione/1F33A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33B.png b/retroshare-gui/src/gui/emojione/1F33B.png index dfe138438..0023321f6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33B.png and b/retroshare-gui/src/gui/emojione/1F33B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33C.png b/retroshare-gui/src/gui/emojione/1F33C.png index 17320ed61..daea1ff07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33C.png and b/retroshare-gui/src/gui/emojione/1F33C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33D.png b/retroshare-gui/src/gui/emojione/1F33D.png index bc19512b0..fc8c662c7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33D.png and b/retroshare-gui/src/gui/emojione/1F33D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33E.png b/retroshare-gui/src/gui/emojione/1F33E.png index 6fed0c55d..15484a4ac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33E.png and b/retroshare-gui/src/gui/emojione/1F33E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F33F.png b/retroshare-gui/src/gui/emojione/1F33F.png index 9cf4d974b..345f3c3f4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F33F.png and b/retroshare-gui/src/gui/emojione/1F33F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F340.png b/retroshare-gui/src/gui/emojione/1F340.png index 9d4b8df9b..84654f4bd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F340.png and b/retroshare-gui/src/gui/emojione/1F340.png differ diff --git a/retroshare-gui/src/gui/emojione/1F341.png b/retroshare-gui/src/gui/emojione/1F341.png index b9bc1fca4..da8cc32a2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F341.png and b/retroshare-gui/src/gui/emojione/1F341.png differ diff --git a/retroshare-gui/src/gui/emojione/1F342.png b/retroshare-gui/src/gui/emojione/1F342.png index 12b439007..3295d18a7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F342.png and b/retroshare-gui/src/gui/emojione/1F342.png differ diff --git a/retroshare-gui/src/gui/emojione/1F343.png b/retroshare-gui/src/gui/emojione/1F343.png index ef904d6cb..1c3282afb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F343.png and b/retroshare-gui/src/gui/emojione/1F343.png differ diff --git a/retroshare-gui/src/gui/emojione/1F344.png b/retroshare-gui/src/gui/emojione/1F344.png index b8782d509..e557e725e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F344.png and b/retroshare-gui/src/gui/emojione/1F344.png differ diff --git a/retroshare-gui/src/gui/emojione/1F345.png b/retroshare-gui/src/gui/emojione/1F345.png index 37c83f11f..2370c4ac6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F345.png and b/retroshare-gui/src/gui/emojione/1F345.png differ diff --git a/retroshare-gui/src/gui/emojione/1F346.png b/retroshare-gui/src/gui/emojione/1F346.png index 3a67020b1..07504d18c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F346.png and b/retroshare-gui/src/gui/emojione/1F346.png differ diff --git a/retroshare-gui/src/gui/emojione/1F347.png b/retroshare-gui/src/gui/emojione/1F347.png index bff815106..96bdb5d3f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F347.png and b/retroshare-gui/src/gui/emojione/1F347.png differ diff --git a/retroshare-gui/src/gui/emojione/1F348.png b/retroshare-gui/src/gui/emojione/1F348.png index da19f1623..6eafb3fd4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F348.png and b/retroshare-gui/src/gui/emojione/1F348.png differ diff --git a/retroshare-gui/src/gui/emojione/1F349.png b/retroshare-gui/src/gui/emojione/1F349.png index 065d3ecee..c97e35923 100644 Binary files a/retroshare-gui/src/gui/emojione/1F349.png and b/retroshare-gui/src/gui/emojione/1F349.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34A.png b/retroshare-gui/src/gui/emojione/1F34A.png index cd1bcfef4..33eeeac46 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34A.png and b/retroshare-gui/src/gui/emojione/1F34A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34B.png b/retroshare-gui/src/gui/emojione/1F34B.png index f50aa8527..f954934c2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34B.png and b/retroshare-gui/src/gui/emojione/1F34B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34C.png b/retroshare-gui/src/gui/emojione/1F34C.png index 2e814c467..678e0d400 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34C.png and b/retroshare-gui/src/gui/emojione/1F34C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34D.png b/retroshare-gui/src/gui/emojione/1F34D.png index e6303db67..c0a6e632a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34D.png and b/retroshare-gui/src/gui/emojione/1F34D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34E.png b/retroshare-gui/src/gui/emojione/1F34E.png index c1534dc1d..11c2e49b4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34E.png and b/retroshare-gui/src/gui/emojione/1F34E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F34F.png b/retroshare-gui/src/gui/emojione/1F34F.png index 4542be449..407668bac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F34F.png and b/retroshare-gui/src/gui/emojione/1F34F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F350.png b/retroshare-gui/src/gui/emojione/1F350.png index a56d47236..87615b007 100644 Binary files a/retroshare-gui/src/gui/emojione/1F350.png and b/retroshare-gui/src/gui/emojione/1F350.png differ diff --git a/retroshare-gui/src/gui/emojione/1F351.png b/retroshare-gui/src/gui/emojione/1F351.png index 02a3c93db..d92ebcbb9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F351.png and b/retroshare-gui/src/gui/emojione/1F351.png differ diff --git a/retroshare-gui/src/gui/emojione/1F352.png b/retroshare-gui/src/gui/emojione/1F352.png index 1f2635a66..4222411fe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F352.png and b/retroshare-gui/src/gui/emojione/1F352.png differ diff --git a/retroshare-gui/src/gui/emojione/1F353.png b/retroshare-gui/src/gui/emojione/1F353.png index f11d8661c..1e676a9d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F353.png and b/retroshare-gui/src/gui/emojione/1F353.png differ diff --git a/retroshare-gui/src/gui/emojione/1F354.png b/retroshare-gui/src/gui/emojione/1F354.png index e4804b33e..cbc38b57b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F354.png and b/retroshare-gui/src/gui/emojione/1F354.png differ diff --git a/retroshare-gui/src/gui/emojione/1F355.png b/retroshare-gui/src/gui/emojione/1F355.png index 33be94939..285245e24 100644 Binary files a/retroshare-gui/src/gui/emojione/1F355.png and b/retroshare-gui/src/gui/emojione/1F355.png differ diff --git a/retroshare-gui/src/gui/emojione/1F356.png b/retroshare-gui/src/gui/emojione/1F356.png index 4f6a82b34..d5ccd65c2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F356.png and b/retroshare-gui/src/gui/emojione/1F356.png differ diff --git a/retroshare-gui/src/gui/emojione/1F357.png b/retroshare-gui/src/gui/emojione/1F357.png index a15d446f9..d2bbcbe7a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F357.png and b/retroshare-gui/src/gui/emojione/1F357.png differ diff --git a/retroshare-gui/src/gui/emojione/1F358.png b/retroshare-gui/src/gui/emojione/1F358.png index 2bc88af45..e506a275f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F358.png and b/retroshare-gui/src/gui/emojione/1F358.png differ diff --git a/retroshare-gui/src/gui/emojione/1F359.png b/retroshare-gui/src/gui/emojione/1F359.png index a9a9a5f11..d1a4da17e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F359.png and b/retroshare-gui/src/gui/emojione/1F359.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35A.png b/retroshare-gui/src/gui/emojione/1F35A.png index e424ecb56..b53f1d1f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35A.png and b/retroshare-gui/src/gui/emojione/1F35A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35B.png b/retroshare-gui/src/gui/emojione/1F35B.png index b424f47de..ec271c265 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35B.png and b/retroshare-gui/src/gui/emojione/1F35B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35C.png b/retroshare-gui/src/gui/emojione/1F35C.png index 52e9a771d..f83be6440 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35C.png and b/retroshare-gui/src/gui/emojione/1F35C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35D.png b/retroshare-gui/src/gui/emojione/1F35D.png index ff5aa4b79..e343d388f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35D.png and b/retroshare-gui/src/gui/emojione/1F35D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35E.png b/retroshare-gui/src/gui/emojione/1F35E.png index 7e2c1f4ae..7ca60c411 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35E.png and b/retroshare-gui/src/gui/emojione/1F35E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F35F.png b/retroshare-gui/src/gui/emojione/1F35F.png index c28171e71..adcd0ad7f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F35F.png and b/retroshare-gui/src/gui/emojione/1F35F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F360.png b/retroshare-gui/src/gui/emojione/1F360.png index 61a906c21..c6a64c024 100644 Binary files a/retroshare-gui/src/gui/emojione/1F360.png and b/retroshare-gui/src/gui/emojione/1F360.png differ diff --git a/retroshare-gui/src/gui/emojione/1F361.png b/retroshare-gui/src/gui/emojione/1F361.png index d0e9a5cfd..f0c46427f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F361.png and b/retroshare-gui/src/gui/emojione/1F361.png differ diff --git a/retroshare-gui/src/gui/emojione/1F362.png b/retroshare-gui/src/gui/emojione/1F362.png index 8d9b7badb..59a1159db 100644 Binary files a/retroshare-gui/src/gui/emojione/1F362.png and b/retroshare-gui/src/gui/emojione/1F362.png differ diff --git a/retroshare-gui/src/gui/emojione/1F363.png b/retroshare-gui/src/gui/emojione/1F363.png index dc3539b0e..6251753f6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F363.png and b/retroshare-gui/src/gui/emojione/1F363.png differ diff --git a/retroshare-gui/src/gui/emojione/1F364.png b/retroshare-gui/src/gui/emojione/1F364.png index 68f426555..911fa54cb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F364.png and b/retroshare-gui/src/gui/emojione/1F364.png differ diff --git a/retroshare-gui/src/gui/emojione/1F365.png b/retroshare-gui/src/gui/emojione/1F365.png index b933e0f0a..4b9783a68 100644 Binary files a/retroshare-gui/src/gui/emojione/1F365.png and b/retroshare-gui/src/gui/emojione/1F365.png differ diff --git a/retroshare-gui/src/gui/emojione/1F366.png b/retroshare-gui/src/gui/emojione/1F366.png index e2ec004bc..7899f4fae 100644 Binary files a/retroshare-gui/src/gui/emojione/1F366.png and b/retroshare-gui/src/gui/emojione/1F366.png differ diff --git a/retroshare-gui/src/gui/emojione/1F367.png b/retroshare-gui/src/gui/emojione/1F367.png index 40ba60864..c24543572 100644 Binary files a/retroshare-gui/src/gui/emojione/1F367.png and b/retroshare-gui/src/gui/emojione/1F367.png differ diff --git a/retroshare-gui/src/gui/emojione/1F368.png b/retroshare-gui/src/gui/emojione/1F368.png index b4ebc5072..1803ddc7b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F368.png and b/retroshare-gui/src/gui/emojione/1F368.png differ diff --git a/retroshare-gui/src/gui/emojione/1F369.png b/retroshare-gui/src/gui/emojione/1F369.png index b9e41f002..ef9943efc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F369.png and b/retroshare-gui/src/gui/emojione/1F369.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36A.png b/retroshare-gui/src/gui/emojione/1F36A.png index a9b3d501a..3b423310d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36A.png and b/retroshare-gui/src/gui/emojione/1F36A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36B.png b/retroshare-gui/src/gui/emojione/1F36B.png index 7bcc18b9d..c3bf301ce 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36B.png and b/retroshare-gui/src/gui/emojione/1F36B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36C.png b/retroshare-gui/src/gui/emojione/1F36C.png index c2dc36091..0e5dcc9ac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36C.png and b/retroshare-gui/src/gui/emojione/1F36C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36D.png b/retroshare-gui/src/gui/emojione/1F36D.png index 2f63a0212..c6fcfe938 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36D.png and b/retroshare-gui/src/gui/emojione/1F36D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36E.png b/retroshare-gui/src/gui/emojione/1F36E.png index 4676eac36..f0a0a043f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36E.png and b/retroshare-gui/src/gui/emojione/1F36E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F36F.png b/retroshare-gui/src/gui/emojione/1F36F.png index 443110373..0fc9055a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F36F.png and b/retroshare-gui/src/gui/emojione/1F36F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F370.png b/retroshare-gui/src/gui/emojione/1F370.png index f65744b40..bbedf6828 100644 Binary files a/retroshare-gui/src/gui/emojione/1F370.png and b/retroshare-gui/src/gui/emojione/1F370.png differ diff --git a/retroshare-gui/src/gui/emojione/1F371.png b/retroshare-gui/src/gui/emojione/1F371.png index 54f2b9a80..eed756277 100644 Binary files a/retroshare-gui/src/gui/emojione/1F371.png and b/retroshare-gui/src/gui/emojione/1F371.png differ diff --git a/retroshare-gui/src/gui/emojione/1F372.png b/retroshare-gui/src/gui/emojione/1F372.png index 643536e59..f0e075d60 100644 Binary files a/retroshare-gui/src/gui/emojione/1F372.png and b/retroshare-gui/src/gui/emojione/1F372.png differ diff --git a/retroshare-gui/src/gui/emojione/1F373.png b/retroshare-gui/src/gui/emojione/1F373.png index 1afd9f680..822fba125 100644 Binary files a/retroshare-gui/src/gui/emojione/1F373.png and b/retroshare-gui/src/gui/emojione/1F373.png differ diff --git a/retroshare-gui/src/gui/emojione/1F374.png b/retroshare-gui/src/gui/emojione/1F374.png index cfb2bec6f..229da5e73 100644 Binary files a/retroshare-gui/src/gui/emojione/1F374.png and b/retroshare-gui/src/gui/emojione/1F374.png differ diff --git a/retroshare-gui/src/gui/emojione/1F375.png b/retroshare-gui/src/gui/emojione/1F375.png index 24e792514..dadce7a8b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F375.png and b/retroshare-gui/src/gui/emojione/1F375.png differ diff --git a/retroshare-gui/src/gui/emojione/1F376.png b/retroshare-gui/src/gui/emojione/1F376.png index c084b57da..a969df302 100644 Binary files a/retroshare-gui/src/gui/emojione/1F376.png and b/retroshare-gui/src/gui/emojione/1F376.png differ diff --git a/retroshare-gui/src/gui/emojione/1F377.png b/retroshare-gui/src/gui/emojione/1F377.png index fc2be5c8f..a8f067aa3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F377.png and b/retroshare-gui/src/gui/emojione/1F377.png differ diff --git a/retroshare-gui/src/gui/emojione/1F378.png b/retroshare-gui/src/gui/emojione/1F378.png index a73355736..a2b350129 100644 Binary files a/retroshare-gui/src/gui/emojione/1F378.png and b/retroshare-gui/src/gui/emojione/1F378.png differ diff --git a/retroshare-gui/src/gui/emojione/1F379.png b/retroshare-gui/src/gui/emojione/1F379.png index 050e8fe83..cc42e2525 100644 Binary files a/retroshare-gui/src/gui/emojione/1F379.png and b/retroshare-gui/src/gui/emojione/1F379.png differ diff --git a/retroshare-gui/src/gui/emojione/1F37A.png b/retroshare-gui/src/gui/emojione/1F37A.png index 1561bdbf3..08ca85e5b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F37A.png and b/retroshare-gui/src/gui/emojione/1F37A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F37B.png b/retroshare-gui/src/gui/emojione/1F37B.png index f2507addc..98098bb16 100644 Binary files a/retroshare-gui/src/gui/emojione/1F37B.png and b/retroshare-gui/src/gui/emojione/1F37B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F37C.png b/retroshare-gui/src/gui/emojione/1F37C.png index 24bda2948..3e9de96a9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F37C.png and b/retroshare-gui/src/gui/emojione/1F37C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F37D.png b/retroshare-gui/src/gui/emojione/1F37D.png index 49b95c709..fc42b718e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F37D.png and b/retroshare-gui/src/gui/emojione/1F37D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F380.png b/retroshare-gui/src/gui/emojione/1F380.png index 48892c2c2..ccd111597 100644 Binary files a/retroshare-gui/src/gui/emojione/1F380.png and b/retroshare-gui/src/gui/emojione/1F380.png differ diff --git a/retroshare-gui/src/gui/emojione/1F381.png b/retroshare-gui/src/gui/emojione/1F381.png index bdc736a03..91d82edc0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F381.png and b/retroshare-gui/src/gui/emojione/1F381.png differ diff --git a/retroshare-gui/src/gui/emojione/1F382.png b/retroshare-gui/src/gui/emojione/1F382.png index cb21bd2dc..effa2b424 100644 Binary files a/retroshare-gui/src/gui/emojione/1F382.png and b/retroshare-gui/src/gui/emojione/1F382.png differ diff --git a/retroshare-gui/src/gui/emojione/1F383.png b/retroshare-gui/src/gui/emojione/1F383.png index b6c687803..5f4ff6a88 100644 Binary files a/retroshare-gui/src/gui/emojione/1F383.png and b/retroshare-gui/src/gui/emojione/1F383.png differ diff --git a/retroshare-gui/src/gui/emojione/1F384.png b/retroshare-gui/src/gui/emojione/1F384.png index cfff01fcd..9db84bedd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F384.png and b/retroshare-gui/src/gui/emojione/1F384.png differ diff --git a/retroshare-gui/src/gui/emojione/1F385.png b/retroshare-gui/src/gui/emojione/1F385.png index 9604b76d3..d4d130afc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F385.png and b/retroshare-gui/src/gui/emojione/1F385.png differ diff --git a/retroshare-gui/src/gui/emojione/1F386.png b/retroshare-gui/src/gui/emojione/1F386.png index 62294db08..039e6b401 100644 Binary files a/retroshare-gui/src/gui/emojione/1F386.png and b/retroshare-gui/src/gui/emojione/1F386.png differ diff --git a/retroshare-gui/src/gui/emojione/1F387.png b/retroshare-gui/src/gui/emojione/1F387.png index 71d84f125..151713e90 100644 Binary files a/retroshare-gui/src/gui/emojione/1F387.png and b/retroshare-gui/src/gui/emojione/1F387.png differ diff --git a/retroshare-gui/src/gui/emojione/1F388.png b/retroshare-gui/src/gui/emojione/1F388.png index faabf3173..376cdebd9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F388.png and b/retroshare-gui/src/gui/emojione/1F388.png differ diff --git a/retroshare-gui/src/gui/emojione/1F389.png b/retroshare-gui/src/gui/emojione/1F389.png index 80324f90d..3caa1441b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F389.png and b/retroshare-gui/src/gui/emojione/1F389.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38A.png b/retroshare-gui/src/gui/emojione/1F38A.png index 29f93ee5d..185a06058 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38A.png and b/retroshare-gui/src/gui/emojione/1F38A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38B.png b/retroshare-gui/src/gui/emojione/1F38B.png index da4574e4c..083d3ce51 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38B.png and b/retroshare-gui/src/gui/emojione/1F38B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38C.png b/retroshare-gui/src/gui/emojione/1F38C.png index 250265c91..f63585760 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38C.png and b/retroshare-gui/src/gui/emojione/1F38C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38D.png b/retroshare-gui/src/gui/emojione/1F38D.png index b05dc1ec1..47adb3066 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38D.png and b/retroshare-gui/src/gui/emojione/1F38D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38E.png b/retroshare-gui/src/gui/emojione/1F38E.png index eb9a2097f..d4555e208 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38E.png and b/retroshare-gui/src/gui/emojione/1F38E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F38F.png b/retroshare-gui/src/gui/emojione/1F38F.png index f49c51627..7188f4f6b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F38F.png and b/retroshare-gui/src/gui/emojione/1F38F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F390.png b/retroshare-gui/src/gui/emojione/1F390.png index 1fae9462d..df5aec55f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F390.png and b/retroshare-gui/src/gui/emojione/1F390.png differ diff --git a/retroshare-gui/src/gui/emojione/1F391.png b/retroshare-gui/src/gui/emojione/1F391.png index 7725bd275..2413b4bdd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F391.png and b/retroshare-gui/src/gui/emojione/1F391.png differ diff --git a/retroshare-gui/src/gui/emojione/1F392.png b/retroshare-gui/src/gui/emojione/1F392.png index 9eeb6a006..e13f569d7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F392.png and b/retroshare-gui/src/gui/emojione/1F392.png differ diff --git a/retroshare-gui/src/gui/emojione/1F393.png b/retroshare-gui/src/gui/emojione/1F393.png index c07415c63..dff9c2326 100644 Binary files a/retroshare-gui/src/gui/emojione/1F393.png and b/retroshare-gui/src/gui/emojione/1F393.png differ diff --git a/retroshare-gui/src/gui/emojione/1F396.png b/retroshare-gui/src/gui/emojione/1F396.png index f425764d3..d51ea3260 100644 Binary files a/retroshare-gui/src/gui/emojione/1F396.png and b/retroshare-gui/src/gui/emojione/1F396.png differ diff --git a/retroshare-gui/src/gui/emojione/1F397.png b/retroshare-gui/src/gui/emojione/1F397.png index f816107f0..ea191d806 100644 Binary files a/retroshare-gui/src/gui/emojione/1F397.png and b/retroshare-gui/src/gui/emojione/1F397.png differ diff --git a/retroshare-gui/src/gui/emojione/1F399.png b/retroshare-gui/src/gui/emojione/1F399.png index 150ed6167..a1bc602d7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F399.png and b/retroshare-gui/src/gui/emojione/1F399.png differ diff --git a/retroshare-gui/src/gui/emojione/1F39A.png b/retroshare-gui/src/gui/emojione/1F39A.png index 493573a29..a43799b5b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F39A.png and b/retroshare-gui/src/gui/emojione/1F39A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F39B.png b/retroshare-gui/src/gui/emojione/1F39B.png index 7b12bc4fe..8687633fe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F39B.png and b/retroshare-gui/src/gui/emojione/1F39B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F39E.png b/retroshare-gui/src/gui/emojione/1F39E.png index 19157126e..377e19cca 100644 Binary files a/retroshare-gui/src/gui/emojione/1F39E.png and b/retroshare-gui/src/gui/emojione/1F39E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F39F.png b/retroshare-gui/src/gui/emojione/1F39F.png index b2841a7e8..2453e1654 100644 Binary files a/retroshare-gui/src/gui/emojione/1F39F.png and b/retroshare-gui/src/gui/emojione/1F39F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A0.png b/retroshare-gui/src/gui/emojione/1F3A0.png index c9f7c238d..29d6cf4cf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A0.png and b/retroshare-gui/src/gui/emojione/1F3A0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A1.png b/retroshare-gui/src/gui/emojione/1F3A1.png index 2fa554a78..6e0b0d4d2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A1.png and b/retroshare-gui/src/gui/emojione/1F3A1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A2.png b/retroshare-gui/src/gui/emojione/1F3A2.png index 5b0bca27f..336b1d8c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A2.png and b/retroshare-gui/src/gui/emojione/1F3A2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A3.png b/retroshare-gui/src/gui/emojione/1F3A3.png index 5d186900e..a27b3dd3f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A3.png and b/retroshare-gui/src/gui/emojione/1F3A3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A4.png b/retroshare-gui/src/gui/emojione/1F3A4.png index ecb025a6b..e3ae52d9f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A4.png and b/retroshare-gui/src/gui/emojione/1F3A4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A5.png b/retroshare-gui/src/gui/emojione/1F3A5.png index 1a0ac154b..dadcddc3e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A5.png and b/retroshare-gui/src/gui/emojione/1F3A5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A6.png b/retroshare-gui/src/gui/emojione/1F3A6.png index 94b04b5fc..88e0c87a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A6.png and b/retroshare-gui/src/gui/emojione/1F3A6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A7.png b/retroshare-gui/src/gui/emojione/1F3A7.png index 3409a9d68..4b5ab233a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A7.png and b/retroshare-gui/src/gui/emojione/1F3A7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A8.png b/retroshare-gui/src/gui/emojione/1F3A8.png index 336b05bbc..8413ef2ae 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A8.png and b/retroshare-gui/src/gui/emojione/1F3A8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3A9.png b/retroshare-gui/src/gui/emojione/1F3A9.png index 792935f69..faf39786f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3A9.png and b/retroshare-gui/src/gui/emojione/1F3A9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AA.png b/retroshare-gui/src/gui/emojione/1F3AA.png index ee0d3afa2..8ce589e12 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AA.png and b/retroshare-gui/src/gui/emojione/1F3AA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AB.png b/retroshare-gui/src/gui/emojione/1F3AB.png index e2e45a6fa..f270056fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AB.png and b/retroshare-gui/src/gui/emojione/1F3AB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AC.png b/retroshare-gui/src/gui/emojione/1F3AC.png index 572dda34a..1509c28d9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AC.png and b/retroshare-gui/src/gui/emojione/1F3AC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AD.png b/retroshare-gui/src/gui/emojione/1F3AD.png index 50698f764..52da03ed2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AD.png and b/retroshare-gui/src/gui/emojione/1F3AD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AE.png b/retroshare-gui/src/gui/emojione/1F3AE.png index 18755f62e..c50f662d6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AE.png and b/retroshare-gui/src/gui/emojione/1F3AE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3AF.png b/retroshare-gui/src/gui/emojione/1F3AF.png index 5283a4a84..edacee154 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3AF.png and b/retroshare-gui/src/gui/emojione/1F3AF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B0.png b/retroshare-gui/src/gui/emojione/1F3B0.png index 4fca22c7a..c8905e8dc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B0.png and b/retroshare-gui/src/gui/emojione/1F3B0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B1.png b/retroshare-gui/src/gui/emojione/1F3B1.png index 8a6333149..bd9e88653 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B1.png and b/retroshare-gui/src/gui/emojione/1F3B1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B2.png b/retroshare-gui/src/gui/emojione/1F3B2.png index f7f2c1d6d..13044b67e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B2.png and b/retroshare-gui/src/gui/emojione/1F3B2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B3.png b/retroshare-gui/src/gui/emojione/1F3B3.png index ead4d328c..d1445d26f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B3.png and b/retroshare-gui/src/gui/emojione/1F3B3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B4.png b/retroshare-gui/src/gui/emojione/1F3B4.png index 2e008f817..43620d32f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B4.png and b/retroshare-gui/src/gui/emojione/1F3B4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B5.png b/retroshare-gui/src/gui/emojione/1F3B5.png index 9dae60e2b..7797fe99a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B5.png and b/retroshare-gui/src/gui/emojione/1F3B5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B6.png b/retroshare-gui/src/gui/emojione/1F3B6.png index 5cbac3db8..0727d08d8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B6.png and b/retroshare-gui/src/gui/emojione/1F3B6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B7.png b/retroshare-gui/src/gui/emojione/1F3B7.png index e0ed47b70..2677dd42a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B7.png and b/retroshare-gui/src/gui/emojione/1F3B7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B8.png b/retroshare-gui/src/gui/emojione/1F3B8.png index 57ec48628..8d2a19cf3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B8.png and b/retroshare-gui/src/gui/emojione/1F3B8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3B9.png b/retroshare-gui/src/gui/emojione/1F3B9.png index 2e0a039a1..7a35d4a4f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3B9.png and b/retroshare-gui/src/gui/emojione/1F3B9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BA.png b/retroshare-gui/src/gui/emojione/1F3BA.png index 8b9a73ac0..0562e35e0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BA.png and b/retroshare-gui/src/gui/emojione/1F3BA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BB.png b/retroshare-gui/src/gui/emojione/1F3BB.png index 23bde2862..60f2bd779 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BB.png and b/retroshare-gui/src/gui/emojione/1F3BB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BC.png b/retroshare-gui/src/gui/emojione/1F3BC.png index f733e0c18..8f345faad 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BC.png and b/retroshare-gui/src/gui/emojione/1F3BC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BD.png b/retroshare-gui/src/gui/emojione/1F3BD.png index f23748c14..cb8490cb9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BD.png and b/retroshare-gui/src/gui/emojione/1F3BD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BE.png b/retroshare-gui/src/gui/emojione/1F3BE.png index f92cd5d3c..61d3074c2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BE.png and b/retroshare-gui/src/gui/emojione/1F3BE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3BF.png b/retroshare-gui/src/gui/emojione/1F3BF.png index 590956c98..5ef3d1285 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3BF.png and b/retroshare-gui/src/gui/emojione/1F3BF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C0.png b/retroshare-gui/src/gui/emojione/1F3C0.png index eaa231833..aac411ce6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C0.png and b/retroshare-gui/src/gui/emojione/1F3C0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C1.png b/retroshare-gui/src/gui/emojione/1F3C1.png index e15a696b7..2efc6af09 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C1.png and b/retroshare-gui/src/gui/emojione/1F3C1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C2.png b/retroshare-gui/src/gui/emojione/1F3C2.png index 4bd61a1e3..ef879bbef 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C2.png and b/retroshare-gui/src/gui/emojione/1F3C2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C3.png b/retroshare-gui/src/gui/emojione/1F3C3.png index 32605baed..07b816c7f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C3.png and b/retroshare-gui/src/gui/emojione/1F3C3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C4.png b/retroshare-gui/src/gui/emojione/1F3C4.png index ac6c51ec2..0f456e56d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C4.png and b/retroshare-gui/src/gui/emojione/1F3C4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C5.png b/retroshare-gui/src/gui/emojione/1F3C5.png index 40000d3a7..7c06eb60b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C5.png and b/retroshare-gui/src/gui/emojione/1F3C5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C6.png b/retroshare-gui/src/gui/emojione/1F3C6.png index 0966b0390..b4dd5a804 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C6.png and b/retroshare-gui/src/gui/emojione/1F3C6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C7.png b/retroshare-gui/src/gui/emojione/1F3C7.png index c06aad6ee..0d4f07659 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C7.png and b/retroshare-gui/src/gui/emojione/1F3C7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C8.png b/retroshare-gui/src/gui/emojione/1F3C8.png index 5b1704c57..30500ae07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C8.png and b/retroshare-gui/src/gui/emojione/1F3C8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3C9.png b/retroshare-gui/src/gui/emojione/1F3C9.png index 6ead96d70..e96de25aa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3C9.png and b/retroshare-gui/src/gui/emojione/1F3C9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3CA.png b/retroshare-gui/src/gui/emojione/1F3CA.png index 518971f4e..e17df1ec1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3CA.png and b/retroshare-gui/src/gui/emojione/1F3CA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3CB.png b/retroshare-gui/src/gui/emojione/1F3CB.png index 3786bd972..377b019ff 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3CB.png and b/retroshare-gui/src/gui/emojione/1F3CB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3CC.png b/retroshare-gui/src/gui/emojione/1F3CC.png index 7d1d1ca6f..496818f07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3CC.png and b/retroshare-gui/src/gui/emojione/1F3CC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3CD.png b/retroshare-gui/src/gui/emojione/1F3CD.png index b03250d08..c6eae3527 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3CD.png and b/retroshare-gui/src/gui/emojione/1F3CD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3CE.png b/retroshare-gui/src/gui/emojione/1F3CE.png index a9d8c15d9..a130c8dd0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3CE.png and b/retroshare-gui/src/gui/emojione/1F3CE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D4.png b/retroshare-gui/src/gui/emojione/1F3D4.png index 396732811..85481c63f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D4.png and b/retroshare-gui/src/gui/emojione/1F3D4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D5.png b/retroshare-gui/src/gui/emojione/1F3D5.png index 563ac28ed..fa249bdb1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D5.png and b/retroshare-gui/src/gui/emojione/1F3D5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D6.png b/retroshare-gui/src/gui/emojione/1F3D6.png index 018d4b9c1..d387a7940 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D6.png and b/retroshare-gui/src/gui/emojione/1F3D6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D7.png b/retroshare-gui/src/gui/emojione/1F3D7.png index a7e54fc5c..38f0273da 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D7.png and b/retroshare-gui/src/gui/emojione/1F3D7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D8.png b/retroshare-gui/src/gui/emojione/1F3D8.png index eb5c7f0a5..e9f032d42 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D8.png and b/retroshare-gui/src/gui/emojione/1F3D8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3D9.png b/retroshare-gui/src/gui/emojione/1F3D9.png index 8c9a2d070..e94449ffc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3D9.png and b/retroshare-gui/src/gui/emojione/1F3D9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DA.png b/retroshare-gui/src/gui/emojione/1F3DA.png index 0b0f779c1..c364bb16c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DA.png and b/retroshare-gui/src/gui/emojione/1F3DA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DB.png b/retroshare-gui/src/gui/emojione/1F3DB.png index cb7ccfbd7..0bc62d154 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DB.png and b/retroshare-gui/src/gui/emojione/1F3DB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DC.png b/retroshare-gui/src/gui/emojione/1F3DC.png index 55a50c5d8..6bc096b6a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DC.png and b/retroshare-gui/src/gui/emojione/1F3DC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DD.png b/retroshare-gui/src/gui/emojione/1F3DD.png index 5be55696e..19edefb40 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DD.png and b/retroshare-gui/src/gui/emojione/1F3DD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DE.png b/retroshare-gui/src/gui/emojione/1F3DE.png index 4b9cafa9d..5ff354a7d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DE.png and b/retroshare-gui/src/gui/emojione/1F3DE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3DF.png b/retroshare-gui/src/gui/emojione/1F3DF.png index 28d96db5c..c131751b7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3DF.png and b/retroshare-gui/src/gui/emojione/1F3DF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E0.png b/retroshare-gui/src/gui/emojione/1F3E0.png index fd1efcf27..6460ba3f4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E0.png and b/retroshare-gui/src/gui/emojione/1F3E0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E1.png b/retroshare-gui/src/gui/emojione/1F3E1.png index 65edd5329..d1dc02ca3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E1.png and b/retroshare-gui/src/gui/emojione/1F3E1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E2.png b/retroshare-gui/src/gui/emojione/1F3E2.png index c00294010..e8825c268 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E2.png and b/retroshare-gui/src/gui/emojione/1F3E2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E3.png b/retroshare-gui/src/gui/emojione/1F3E3.png index d6df036f6..e5e2a3455 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E3.png and b/retroshare-gui/src/gui/emojione/1F3E3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E4.png b/retroshare-gui/src/gui/emojione/1F3E4.png index 782cb3aa5..1c21caf1c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E4.png and b/retroshare-gui/src/gui/emojione/1F3E4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E5.png b/retroshare-gui/src/gui/emojione/1F3E5.png index 52431a4ae..eec4eaafe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E5.png and b/retroshare-gui/src/gui/emojione/1F3E5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E6.png b/retroshare-gui/src/gui/emojione/1F3E6.png index 758decaff..03c478375 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E6.png and b/retroshare-gui/src/gui/emojione/1F3E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E7.png b/retroshare-gui/src/gui/emojione/1F3E7.png index 3c28d5d81..873e17c74 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E7.png and b/retroshare-gui/src/gui/emojione/1F3E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E8.png b/retroshare-gui/src/gui/emojione/1F3E8.png index 58e07af43..b36222f01 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E8.png and b/retroshare-gui/src/gui/emojione/1F3E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3E9.png b/retroshare-gui/src/gui/emojione/1F3E9.png index d4bbe02e5..21b696a1a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3E9.png and b/retroshare-gui/src/gui/emojione/1F3E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3EA.png b/retroshare-gui/src/gui/emojione/1F3EA.png index 38ddd8fec..e21e83f26 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3EA.png and b/retroshare-gui/src/gui/emojione/1F3EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3EB.png b/retroshare-gui/src/gui/emojione/1F3EB.png index 364e44bf5..f983808f5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3EB.png and b/retroshare-gui/src/gui/emojione/1F3EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3EC.png b/retroshare-gui/src/gui/emojione/1F3EC.png index a2d6cccba..6ff53b74a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3EC.png and b/retroshare-gui/src/gui/emojione/1F3EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3ED.png b/retroshare-gui/src/gui/emojione/1F3ED.png index 893f8cd9a..428c95cac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3ED.png and b/retroshare-gui/src/gui/emojione/1F3ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3EE.png b/retroshare-gui/src/gui/emojione/1F3EE.png index 3f946b1d6..6bbf2587b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3EE.png and b/retroshare-gui/src/gui/emojione/1F3EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3EF.png b/retroshare-gui/src/gui/emojione/1F3EF.png index 39109f36e..5d5371f33 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3EF.png and b/retroshare-gui/src/gui/emojione/1F3EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F0.png b/retroshare-gui/src/gui/emojione/1F3F0.png index 908fb71e6..ae024fea4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F0.png and b/retroshare-gui/src/gui/emojione/1F3F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F3.png b/retroshare-gui/src/gui/emojione/1F3F3.png index 7c7ac2357..ce52a2a51 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F3.png and b/retroshare-gui/src/gui/emojione/1F3F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F4.png b/retroshare-gui/src/gui/emojione/1F3F4.png index 0074268bc..2cbf49ab4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F4.png and b/retroshare-gui/src/gui/emojione/1F3F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F5.png b/retroshare-gui/src/gui/emojione/1F3F5.png index 17421b883..fb0e10479 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F5.png and b/retroshare-gui/src/gui/emojione/1F3F5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F3F7.png b/retroshare-gui/src/gui/emojione/1F3F7.png index b9c42bdd9..269fea526 100644 Binary files a/retroshare-gui/src/gui/emojione/1F3F7.png and b/retroshare-gui/src/gui/emojione/1F3F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F400.png b/retroshare-gui/src/gui/emojione/1F400.png index a1201e5f1..55a395622 100644 Binary files a/retroshare-gui/src/gui/emojione/1F400.png and b/retroshare-gui/src/gui/emojione/1F400.png differ diff --git a/retroshare-gui/src/gui/emojione/1F401.png b/retroshare-gui/src/gui/emojione/1F401.png index a7253fcc0..bee125d41 100644 Binary files a/retroshare-gui/src/gui/emojione/1F401.png and b/retroshare-gui/src/gui/emojione/1F401.png differ diff --git a/retroshare-gui/src/gui/emojione/1F402.png b/retroshare-gui/src/gui/emojione/1F402.png index 7e2963a6e..227cbb9a6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F402.png and b/retroshare-gui/src/gui/emojione/1F402.png differ diff --git a/retroshare-gui/src/gui/emojione/1F403.png b/retroshare-gui/src/gui/emojione/1F403.png index 406bd30ef..9e4bf8dbd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F403.png and b/retroshare-gui/src/gui/emojione/1F403.png differ diff --git a/retroshare-gui/src/gui/emojione/1F404.png b/retroshare-gui/src/gui/emojione/1F404.png index 61a75fdcb..3f08481a2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F404.png and b/retroshare-gui/src/gui/emojione/1F404.png differ diff --git a/retroshare-gui/src/gui/emojione/1F405.png b/retroshare-gui/src/gui/emojione/1F405.png index e652e9645..2a79382d1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F405.png and b/retroshare-gui/src/gui/emojione/1F405.png differ diff --git a/retroshare-gui/src/gui/emojione/1F406.png b/retroshare-gui/src/gui/emojione/1F406.png index 52c899860..a68d5602e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F406.png and b/retroshare-gui/src/gui/emojione/1F406.png differ diff --git a/retroshare-gui/src/gui/emojione/1F407.png b/retroshare-gui/src/gui/emojione/1F407.png index 93b576553..848e77b07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F407.png and b/retroshare-gui/src/gui/emojione/1F407.png differ diff --git a/retroshare-gui/src/gui/emojione/1F408.png b/retroshare-gui/src/gui/emojione/1F408.png index b8deeeeb5..cbb5eda12 100644 Binary files a/retroshare-gui/src/gui/emojione/1F408.png and b/retroshare-gui/src/gui/emojione/1F408.png differ diff --git a/retroshare-gui/src/gui/emojione/1F409.png b/retroshare-gui/src/gui/emojione/1F409.png index 0aa0497b7..5ad74bbcc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F409.png and b/retroshare-gui/src/gui/emojione/1F409.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40A.png b/retroshare-gui/src/gui/emojione/1F40A.png index 4e3e4673c..e8a4ea435 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40A.png and b/retroshare-gui/src/gui/emojione/1F40A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40B.png b/retroshare-gui/src/gui/emojione/1F40B.png index 08ea23240..7b744fcc4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40B.png and b/retroshare-gui/src/gui/emojione/1F40B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40C.png b/retroshare-gui/src/gui/emojione/1F40C.png index 70b347c96..0724f4fd1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40C.png and b/retroshare-gui/src/gui/emojione/1F40C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40D.png b/retroshare-gui/src/gui/emojione/1F40D.png index 247e2b448..97f44b690 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40D.png and b/retroshare-gui/src/gui/emojione/1F40D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40E.png b/retroshare-gui/src/gui/emojione/1F40E.png index 43db51692..baa0cb42c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40E.png and b/retroshare-gui/src/gui/emojione/1F40E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F40F.png b/retroshare-gui/src/gui/emojione/1F40F.png index 0cec7ce97..1b0e3e5ec 100644 Binary files a/retroshare-gui/src/gui/emojione/1F40F.png and b/retroshare-gui/src/gui/emojione/1F40F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F410.png b/retroshare-gui/src/gui/emojione/1F410.png index 1fef3b0a6..2d9f68967 100644 Binary files a/retroshare-gui/src/gui/emojione/1F410.png and b/retroshare-gui/src/gui/emojione/1F410.png differ diff --git a/retroshare-gui/src/gui/emojione/1F411.png b/retroshare-gui/src/gui/emojione/1F411.png index ffdc33795..112799463 100644 Binary files a/retroshare-gui/src/gui/emojione/1F411.png and b/retroshare-gui/src/gui/emojione/1F411.png differ diff --git a/retroshare-gui/src/gui/emojione/1F412.png b/retroshare-gui/src/gui/emojione/1F412.png index 2a1feac4c..eec88a48d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F412.png and b/retroshare-gui/src/gui/emojione/1F412.png differ diff --git a/retroshare-gui/src/gui/emojione/1F413.png b/retroshare-gui/src/gui/emojione/1F413.png index 08409cd29..2fe6e51ba 100644 Binary files a/retroshare-gui/src/gui/emojione/1F413.png and b/retroshare-gui/src/gui/emojione/1F413.png differ diff --git a/retroshare-gui/src/gui/emojione/1F414.png b/retroshare-gui/src/gui/emojione/1F414.png index 7a3fb770a..dc959c299 100644 Binary files a/retroshare-gui/src/gui/emojione/1F414.png and b/retroshare-gui/src/gui/emojione/1F414.png differ diff --git a/retroshare-gui/src/gui/emojione/1F415.png b/retroshare-gui/src/gui/emojione/1F415.png index b4f578ddd..616e4e7d2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F415.png and b/retroshare-gui/src/gui/emojione/1F415.png differ diff --git a/retroshare-gui/src/gui/emojione/1F416.png b/retroshare-gui/src/gui/emojione/1F416.png index 7e386344d..c4f144521 100644 Binary files a/retroshare-gui/src/gui/emojione/1F416.png and b/retroshare-gui/src/gui/emojione/1F416.png differ diff --git a/retroshare-gui/src/gui/emojione/1F417.png b/retroshare-gui/src/gui/emojione/1F417.png index c03fed945..d6df5190e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F417.png and b/retroshare-gui/src/gui/emojione/1F417.png differ diff --git a/retroshare-gui/src/gui/emojione/1F418.png b/retroshare-gui/src/gui/emojione/1F418.png index 6f7d128ce..9e0f3bf2c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F418.png and b/retroshare-gui/src/gui/emojione/1F418.png differ diff --git a/retroshare-gui/src/gui/emojione/1F419.png b/retroshare-gui/src/gui/emojione/1F419.png index 9ec93b3de..77b5556d2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F419.png and b/retroshare-gui/src/gui/emojione/1F419.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41A.png b/retroshare-gui/src/gui/emojione/1F41A.png index cbe39979f..20a8a774e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41A.png and b/retroshare-gui/src/gui/emojione/1F41A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41B.png b/retroshare-gui/src/gui/emojione/1F41B.png index d0052988a..7b1d33673 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41B.png and b/retroshare-gui/src/gui/emojione/1F41B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41C.png b/retroshare-gui/src/gui/emojione/1F41C.png index a8e563fbc..2e81b9042 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41C.png and b/retroshare-gui/src/gui/emojione/1F41C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41D.png b/retroshare-gui/src/gui/emojione/1F41D.png index 678c07fc3..9fcfff27f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41D.png and b/retroshare-gui/src/gui/emojione/1F41D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41E.png b/retroshare-gui/src/gui/emojione/1F41E.png index 04959d6ef..1f549bccc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41E.png and b/retroshare-gui/src/gui/emojione/1F41E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F41F.png b/retroshare-gui/src/gui/emojione/1F41F.png index 2cb910ee4..773429bdc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F41F.png and b/retroshare-gui/src/gui/emojione/1F41F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F420.png b/retroshare-gui/src/gui/emojione/1F420.png index 4e017702a..81d2c9b6e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F420.png and b/retroshare-gui/src/gui/emojione/1F420.png differ diff --git a/retroshare-gui/src/gui/emojione/1F421.png b/retroshare-gui/src/gui/emojione/1F421.png index 7dc0eef4c..c78ff494a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F421.png and b/retroshare-gui/src/gui/emojione/1F421.png differ diff --git a/retroshare-gui/src/gui/emojione/1F422.png b/retroshare-gui/src/gui/emojione/1F422.png index ff60f972b..33fd0496d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F422.png and b/retroshare-gui/src/gui/emojione/1F422.png differ diff --git a/retroshare-gui/src/gui/emojione/1F423.png b/retroshare-gui/src/gui/emojione/1F423.png index 28c38b3d1..5f809ea56 100644 Binary files a/retroshare-gui/src/gui/emojione/1F423.png and b/retroshare-gui/src/gui/emojione/1F423.png differ diff --git a/retroshare-gui/src/gui/emojione/1F424.png b/retroshare-gui/src/gui/emojione/1F424.png index 8a711a46f..8dce36917 100644 Binary files a/retroshare-gui/src/gui/emojione/1F424.png and b/retroshare-gui/src/gui/emojione/1F424.png differ diff --git a/retroshare-gui/src/gui/emojione/1F425.png b/retroshare-gui/src/gui/emojione/1F425.png index 6e8ebae53..ecd500add 100644 Binary files a/retroshare-gui/src/gui/emojione/1F425.png and b/retroshare-gui/src/gui/emojione/1F425.png differ diff --git a/retroshare-gui/src/gui/emojione/1F426.png b/retroshare-gui/src/gui/emojione/1F426.png index c92d1f251..389ffc6f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F426.png and b/retroshare-gui/src/gui/emojione/1F426.png differ diff --git a/retroshare-gui/src/gui/emojione/1F427.png b/retroshare-gui/src/gui/emojione/1F427.png index f88decd4e..224ec32c2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F427.png and b/retroshare-gui/src/gui/emojione/1F427.png differ diff --git a/retroshare-gui/src/gui/emojione/1F428.png b/retroshare-gui/src/gui/emojione/1F428.png index d84c55e06..164adcac4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F428.png and b/retroshare-gui/src/gui/emojione/1F428.png differ diff --git a/retroshare-gui/src/gui/emojione/1F429.png b/retroshare-gui/src/gui/emojione/1F429.png index 8cbb10743..f228ba639 100644 Binary files a/retroshare-gui/src/gui/emojione/1F429.png and b/retroshare-gui/src/gui/emojione/1F429.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42A.png b/retroshare-gui/src/gui/emojione/1F42A.png index fe9e97083..eb31f13eb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42A.png and b/retroshare-gui/src/gui/emojione/1F42A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42B.png b/retroshare-gui/src/gui/emojione/1F42B.png index e1df3e2ea..8cf659156 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42B.png and b/retroshare-gui/src/gui/emojione/1F42B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42C.png b/retroshare-gui/src/gui/emojione/1F42C.png index 28a06ef57..0bedf9e1f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42C.png and b/retroshare-gui/src/gui/emojione/1F42C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42D.png b/retroshare-gui/src/gui/emojione/1F42D.png index e3c97eabe..f4eb945a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42D.png and b/retroshare-gui/src/gui/emojione/1F42D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42E.png b/retroshare-gui/src/gui/emojione/1F42E.png index 97456691e..a877cffae 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42E.png and b/retroshare-gui/src/gui/emojione/1F42E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F42F.png b/retroshare-gui/src/gui/emojione/1F42F.png index 5b8af2084..efcb3def4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F42F.png and b/retroshare-gui/src/gui/emojione/1F42F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F430.png b/retroshare-gui/src/gui/emojione/1F430.png index d98cb38b0..f68211ac7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F430.png and b/retroshare-gui/src/gui/emojione/1F430.png differ diff --git a/retroshare-gui/src/gui/emojione/1F431.png b/retroshare-gui/src/gui/emojione/1F431.png index 298efbf71..36dc58eba 100644 Binary files a/retroshare-gui/src/gui/emojione/1F431.png and b/retroshare-gui/src/gui/emojione/1F431.png differ diff --git a/retroshare-gui/src/gui/emojione/1F432.png b/retroshare-gui/src/gui/emojione/1F432.png index 367390783..4f5b468f6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F432.png and b/retroshare-gui/src/gui/emojione/1F432.png differ diff --git a/retroshare-gui/src/gui/emojione/1F433.png b/retroshare-gui/src/gui/emojione/1F433.png index 844e3d4ba..f42c02856 100644 Binary files a/retroshare-gui/src/gui/emojione/1F433.png and b/retroshare-gui/src/gui/emojione/1F433.png differ diff --git a/retroshare-gui/src/gui/emojione/1F434.png b/retroshare-gui/src/gui/emojione/1F434.png index 47acb0b79..bcd6360b7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F434.png and b/retroshare-gui/src/gui/emojione/1F434.png differ diff --git a/retroshare-gui/src/gui/emojione/1F435.png b/retroshare-gui/src/gui/emojione/1F435.png index e8df21924..742a5e066 100644 Binary files a/retroshare-gui/src/gui/emojione/1F435.png and b/retroshare-gui/src/gui/emojione/1F435.png differ diff --git a/retroshare-gui/src/gui/emojione/1F436.png b/retroshare-gui/src/gui/emojione/1F436.png index 032eb2a25..56451d3f8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F436.png and b/retroshare-gui/src/gui/emojione/1F436.png differ diff --git a/retroshare-gui/src/gui/emojione/1F437.png b/retroshare-gui/src/gui/emojione/1F437.png index a82c2ed1a..8aaafad02 100644 Binary files a/retroshare-gui/src/gui/emojione/1F437.png and b/retroshare-gui/src/gui/emojione/1F437.png differ diff --git a/retroshare-gui/src/gui/emojione/1F438.png b/retroshare-gui/src/gui/emojione/1F438.png index ec3b85b54..5b3667bcf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F438.png and b/retroshare-gui/src/gui/emojione/1F438.png differ diff --git a/retroshare-gui/src/gui/emojione/1F439.png b/retroshare-gui/src/gui/emojione/1F439.png index a3bc0d1e7..c774bc4f8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F439.png and b/retroshare-gui/src/gui/emojione/1F439.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43A.png b/retroshare-gui/src/gui/emojione/1F43A.png index 50c2b55ca..c0f957967 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43A.png and b/retroshare-gui/src/gui/emojione/1F43A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43B.png b/retroshare-gui/src/gui/emojione/1F43B.png index 28babf126..29c8a20f0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43B.png and b/retroshare-gui/src/gui/emojione/1F43B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43C.png b/retroshare-gui/src/gui/emojione/1F43C.png index be236dbd2..94ee231a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43C.png and b/retroshare-gui/src/gui/emojione/1F43C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43D.png b/retroshare-gui/src/gui/emojione/1F43D.png index 7c19ea46c..6175a458c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43D.png and b/retroshare-gui/src/gui/emojione/1F43D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43E.png b/retroshare-gui/src/gui/emojione/1F43E.png index 74fb333cf..0026be887 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43E.png and b/retroshare-gui/src/gui/emojione/1F43E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F43F.png b/retroshare-gui/src/gui/emojione/1F43F.png index 5ef8cfb79..64b0bcc79 100644 Binary files a/retroshare-gui/src/gui/emojione/1F43F.png and b/retroshare-gui/src/gui/emojione/1F43F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F440.png b/retroshare-gui/src/gui/emojione/1F440.png index 11013822c..8ad467b8d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F440.png and b/retroshare-gui/src/gui/emojione/1F440.png differ diff --git a/retroshare-gui/src/gui/emojione/1F441.png b/retroshare-gui/src/gui/emojione/1F441.png index 197a94361..e9fe5dd55 100644 Binary files a/retroshare-gui/src/gui/emojione/1F441.png and b/retroshare-gui/src/gui/emojione/1F441.png differ diff --git a/retroshare-gui/src/gui/emojione/1F442.png b/retroshare-gui/src/gui/emojione/1F442.png index a95c7f76e..fc74a4922 100644 Binary files a/retroshare-gui/src/gui/emojione/1F442.png and b/retroshare-gui/src/gui/emojione/1F442.png differ diff --git a/retroshare-gui/src/gui/emojione/1F443.png b/retroshare-gui/src/gui/emojione/1F443.png index 16c6e6422..f708c9a24 100644 Binary files a/retroshare-gui/src/gui/emojione/1F443.png and b/retroshare-gui/src/gui/emojione/1F443.png differ diff --git a/retroshare-gui/src/gui/emojione/1F444.png b/retroshare-gui/src/gui/emojione/1F444.png index ad22024b6..e961e53d6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F444.png and b/retroshare-gui/src/gui/emojione/1F444.png differ diff --git a/retroshare-gui/src/gui/emojione/1F445.png b/retroshare-gui/src/gui/emojione/1F445.png index 90fec1b0b..bb1e8b409 100644 Binary files a/retroshare-gui/src/gui/emojione/1F445.png and b/retroshare-gui/src/gui/emojione/1F445.png differ diff --git a/retroshare-gui/src/gui/emojione/1F446.png b/retroshare-gui/src/gui/emojione/1F446.png index 1bf852500..f4df7791a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F446.png and b/retroshare-gui/src/gui/emojione/1F446.png differ diff --git a/retroshare-gui/src/gui/emojione/1F447.png b/retroshare-gui/src/gui/emojione/1F447.png index 4ef557caf..bd4f11940 100644 Binary files a/retroshare-gui/src/gui/emojione/1F447.png and b/retroshare-gui/src/gui/emojione/1F447.png differ diff --git a/retroshare-gui/src/gui/emojione/1F448.png b/retroshare-gui/src/gui/emojione/1F448.png index 9de59ae80..2aa4bedd1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F448.png and b/retroshare-gui/src/gui/emojione/1F448.png differ diff --git a/retroshare-gui/src/gui/emojione/1F449.png b/retroshare-gui/src/gui/emojione/1F449.png index ae307665b..2e78fcc41 100644 Binary files a/retroshare-gui/src/gui/emojione/1F449.png and b/retroshare-gui/src/gui/emojione/1F449.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44A.png b/retroshare-gui/src/gui/emojione/1F44A.png index 87c82244d..c86aeec02 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44A.png and b/retroshare-gui/src/gui/emojione/1F44A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44B.png b/retroshare-gui/src/gui/emojione/1F44B.png index 550ef8316..c37545e45 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44B.png and b/retroshare-gui/src/gui/emojione/1F44B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44C.png b/retroshare-gui/src/gui/emojione/1F44C.png index 4857b91f5..a8d09af7f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44C.png and b/retroshare-gui/src/gui/emojione/1F44C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44D.png b/retroshare-gui/src/gui/emojione/1F44D.png index 223af376d..1ba90c01d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44D.png and b/retroshare-gui/src/gui/emojione/1F44D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44E.png b/retroshare-gui/src/gui/emojione/1F44E.png index ccf5b8f5a..c9b7ccb21 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44E.png and b/retroshare-gui/src/gui/emojione/1F44E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F44F.png b/retroshare-gui/src/gui/emojione/1F44F.png index 018d1a011..c685486d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F44F.png and b/retroshare-gui/src/gui/emojione/1F44F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F450.png b/retroshare-gui/src/gui/emojione/1F450.png index 3f799f702..2ec20579a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F450.png and b/retroshare-gui/src/gui/emojione/1F450.png differ diff --git a/retroshare-gui/src/gui/emojione/1F451.png b/retroshare-gui/src/gui/emojione/1F451.png index 221d8d35b..c5176338c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F451.png and b/retroshare-gui/src/gui/emojione/1F451.png differ diff --git a/retroshare-gui/src/gui/emojione/1F452.png b/retroshare-gui/src/gui/emojione/1F452.png index 4ab835b66..724c09e9e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F452.png and b/retroshare-gui/src/gui/emojione/1F452.png differ diff --git a/retroshare-gui/src/gui/emojione/1F453.png b/retroshare-gui/src/gui/emojione/1F453.png index 5d238cf02..d4cf7cefb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F453.png and b/retroshare-gui/src/gui/emojione/1F453.png differ diff --git a/retroshare-gui/src/gui/emojione/1F454.png b/retroshare-gui/src/gui/emojione/1F454.png index f8bd157dc..5e0a80f14 100644 Binary files a/retroshare-gui/src/gui/emojione/1F454.png and b/retroshare-gui/src/gui/emojione/1F454.png differ diff --git a/retroshare-gui/src/gui/emojione/1F455.png b/retroshare-gui/src/gui/emojione/1F455.png index 74931b572..4af45de42 100644 Binary files a/retroshare-gui/src/gui/emojione/1F455.png and b/retroshare-gui/src/gui/emojione/1F455.png differ diff --git a/retroshare-gui/src/gui/emojione/1F456.png b/retroshare-gui/src/gui/emojione/1F456.png index 6b503b7fb..f03e5c3bd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F456.png and b/retroshare-gui/src/gui/emojione/1F456.png differ diff --git a/retroshare-gui/src/gui/emojione/1F457.png b/retroshare-gui/src/gui/emojione/1F457.png index 5e9e4469c..22a8486e9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F457.png and b/retroshare-gui/src/gui/emojione/1F457.png differ diff --git a/retroshare-gui/src/gui/emojione/1F458.png b/retroshare-gui/src/gui/emojione/1F458.png index 1742a321c..1c288feb9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F458.png and b/retroshare-gui/src/gui/emojione/1F458.png differ diff --git a/retroshare-gui/src/gui/emojione/1F459.png b/retroshare-gui/src/gui/emojione/1F459.png index 65de89755..6eab71db4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F459.png and b/retroshare-gui/src/gui/emojione/1F459.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45A.png b/retroshare-gui/src/gui/emojione/1F45A.png index f49afa0b7..9e3f6f4fa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45A.png and b/retroshare-gui/src/gui/emojione/1F45A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45B.png b/retroshare-gui/src/gui/emojione/1F45B.png index 3e8e737a8..a625f1b27 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45B.png and b/retroshare-gui/src/gui/emojione/1F45B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45C.png b/retroshare-gui/src/gui/emojione/1F45C.png index 011f72ec3..42007e5bb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45C.png and b/retroshare-gui/src/gui/emojione/1F45C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45D.png b/retroshare-gui/src/gui/emojione/1F45D.png index 6ebe0f5a7..d7835b765 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45D.png and b/retroshare-gui/src/gui/emojione/1F45D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45E.png b/retroshare-gui/src/gui/emojione/1F45E.png index 806eaa1f1..89b3f67b5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45E.png and b/retroshare-gui/src/gui/emojione/1F45E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F45F.png b/retroshare-gui/src/gui/emojione/1F45F.png index 56f18e690..b77eb9f0a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F45F.png and b/retroshare-gui/src/gui/emojione/1F45F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F460.png b/retroshare-gui/src/gui/emojione/1F460.png index 98b85278f..74531613a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F460.png and b/retroshare-gui/src/gui/emojione/1F460.png differ diff --git a/retroshare-gui/src/gui/emojione/1F461.png b/retroshare-gui/src/gui/emojione/1F461.png index df833af2c..0fdb4c3f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F461.png and b/retroshare-gui/src/gui/emojione/1F461.png differ diff --git a/retroshare-gui/src/gui/emojione/1F462.png b/retroshare-gui/src/gui/emojione/1F462.png index f3b5962f4..58f4d2147 100644 Binary files a/retroshare-gui/src/gui/emojione/1F462.png and b/retroshare-gui/src/gui/emojione/1F462.png differ diff --git a/retroshare-gui/src/gui/emojione/1F463.png b/retroshare-gui/src/gui/emojione/1F463.png index 560dbf4ff..e8f760563 100644 Binary files a/retroshare-gui/src/gui/emojione/1F463.png and b/retroshare-gui/src/gui/emojione/1F463.png differ diff --git a/retroshare-gui/src/gui/emojione/1F464.png b/retroshare-gui/src/gui/emojione/1F464.png index 6f77ddba1..92fd293de 100644 Binary files a/retroshare-gui/src/gui/emojione/1F464.png and b/retroshare-gui/src/gui/emojione/1F464.png differ diff --git a/retroshare-gui/src/gui/emojione/1F465.png b/retroshare-gui/src/gui/emojione/1F465.png index bfec1cfca..d3ef76701 100644 Binary files a/retroshare-gui/src/gui/emojione/1F465.png and b/retroshare-gui/src/gui/emojione/1F465.png differ diff --git a/retroshare-gui/src/gui/emojione/1F466.png b/retroshare-gui/src/gui/emojione/1F466.png index 1e88d3766..2b99609c5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F466.png and b/retroshare-gui/src/gui/emojione/1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F467.png b/retroshare-gui/src/gui/emojione/1F467.png index c13fda75d..6687698e4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F467.png and b/retroshare-gui/src/gui/emojione/1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F468-1F466-1F466.png b/retroshare-gui/src/gui/emojione/1F468-1F468-1F466-1F466.png index 126bd4b3c..3c7a98686 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F468-1F466-1F466.png and b/retroshare-gui/src/gui/emojione/1F468-1F468-1F466-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F468-1F466.png b/retroshare-gui/src/gui/emojione/1F468-1F468-1F466.png index 59ac6fea3..27d72951b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F468-1F466.png and b/retroshare-gui/src/gui/emojione/1F468-1F468-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F466.png b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F466.png index 735ebca18..135af3d86 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F466.png and b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F467.png b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F467.png index ffbbf3fe1..60af8f567 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F467.png and b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467.png b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467.png index d8016064c..5e7a3145f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F468-1F467.png and b/retroshare-gui/src/gui/emojione/1F468-1F468-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F469-1F466-1F466.png b/retroshare-gui/src/gui/emojione/1F468-1F469-1F466-1F466.png index 2ffb16b8b..44e390afb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F469-1F466-1F466.png and b/retroshare-gui/src/gui/emojione/1F468-1F469-1F466-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F466.png b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F466.png index de19cbe6b..a2e4cccc3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F466.png and b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F467.png b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F467.png index e6846ce63..7adc1f7c6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F467.png and b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467.png b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467.png index 4a7f50165..6ac858e10 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-1F469-1F467.png and b/retroshare-gui/src/gui/emojione/1F468-1F469-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-2764-1F468.png b/retroshare-gui/src/gui/emojione/1F468-2764-1F468.png index eb3689d3d..126cc8ae8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-2764-1F468.png and b/retroshare-gui/src/gui/emojione/1F468-2764-1F468.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468-2764-1F48B-1F468.png b/retroshare-gui/src/gui/emojione/1F468-2764-1F48B-1F468.png index a8793b5df..702b0134e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468-2764-1F48B-1F468.png and b/retroshare-gui/src/gui/emojione/1F468-2764-1F48B-1F468.png differ diff --git a/retroshare-gui/src/gui/emojione/1F468.png b/retroshare-gui/src/gui/emojione/1F468.png index 0bfbf4fd9..51476d64e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F468.png and b/retroshare-gui/src/gui/emojione/1F468.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-1F469-1F466-1F466.png b/retroshare-gui/src/gui/emojione/1F469-1F469-1F466-1F466.png index a47042075..2106db89a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-1F469-1F466-1F466.png and b/retroshare-gui/src/gui/emojione/1F469-1F469-1F466-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-1F469-1F466.png b/retroshare-gui/src/gui/emojione/1F469-1F469-1F466.png index 55ac74403..093c88786 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-1F469-1F466.png and b/retroshare-gui/src/gui/emojione/1F469-1F469-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F466.png b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F466.png index aa46da18a..1bbd3f2c4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F466.png and b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F466.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F467.png b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F467.png index 885d9ae9b..c8fcd05d2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F467.png and b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467.png b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467.png index 6578bd03a..4a4e47bb1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-1F469-1F467.png and b/retroshare-gui/src/gui/emojione/1F469-1F469-1F467.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-2764-1F469.png b/retroshare-gui/src/gui/emojione/1F469-2764-1F469.png index ea7481ce1..f5d9a28c6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-2764-1F469.png and b/retroshare-gui/src/gui/emojione/1F469-2764-1F469.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469-2764-1F48B-1F469.png b/retroshare-gui/src/gui/emojione/1F469-2764-1F48B-1F469.png index 4d35751f3..8831c56cd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469-2764-1F48B-1F469.png and b/retroshare-gui/src/gui/emojione/1F469-2764-1F48B-1F469.png differ diff --git a/retroshare-gui/src/gui/emojione/1F469.png b/retroshare-gui/src/gui/emojione/1F469.png index 2614ef5c0..00bdd384a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F469.png and b/retroshare-gui/src/gui/emojione/1F469.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46A.png b/retroshare-gui/src/gui/emojione/1F46A.png index 11c05d47d..8f4cb3b55 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46A.png and b/retroshare-gui/src/gui/emojione/1F46A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46B.png b/retroshare-gui/src/gui/emojione/1F46B.png index 34bb4c924..bfea58360 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46B.png and b/retroshare-gui/src/gui/emojione/1F46B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46C.png b/retroshare-gui/src/gui/emojione/1F46C.png index 1b3cdc24e..afdb0ec60 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46C.png and b/retroshare-gui/src/gui/emojione/1F46C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46D.png b/retroshare-gui/src/gui/emojione/1F46D.png index 814345441..dea812021 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46D.png and b/retroshare-gui/src/gui/emojione/1F46D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46E.png b/retroshare-gui/src/gui/emojione/1F46E.png index 70943b1c1..fd744a516 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46E.png and b/retroshare-gui/src/gui/emojione/1F46E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F46F.png b/retroshare-gui/src/gui/emojione/1F46F.png index 0b50812c8..2071ec49b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F46F.png and b/retroshare-gui/src/gui/emojione/1F46F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F470.png b/retroshare-gui/src/gui/emojione/1F470.png index 69fb540f1..632018d9b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F470.png and b/retroshare-gui/src/gui/emojione/1F470.png differ diff --git a/retroshare-gui/src/gui/emojione/1F471.png b/retroshare-gui/src/gui/emojione/1F471.png index 8b4788117..4bdbf3cf0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F471.png and b/retroshare-gui/src/gui/emojione/1F471.png differ diff --git a/retroshare-gui/src/gui/emojione/1F472.png b/retroshare-gui/src/gui/emojione/1F472.png index 9540536f4..8e0edfcac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F472.png and b/retroshare-gui/src/gui/emojione/1F472.png differ diff --git a/retroshare-gui/src/gui/emojione/1F473.png b/retroshare-gui/src/gui/emojione/1F473.png index 8a16d4e22..25174e1b6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F473.png and b/retroshare-gui/src/gui/emojione/1F473.png differ diff --git a/retroshare-gui/src/gui/emojione/1F474.png b/retroshare-gui/src/gui/emojione/1F474.png index bb836ffd4..2026c2be5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F474.png and b/retroshare-gui/src/gui/emojione/1F474.png differ diff --git a/retroshare-gui/src/gui/emojione/1F475.png b/retroshare-gui/src/gui/emojione/1F475.png index 0c23967e1..0378f28a8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F475.png and b/retroshare-gui/src/gui/emojione/1F475.png differ diff --git a/retroshare-gui/src/gui/emojione/1F476.png b/retroshare-gui/src/gui/emojione/1F476.png index d81683077..cc40c3ca3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F476.png and b/retroshare-gui/src/gui/emojione/1F476.png differ diff --git a/retroshare-gui/src/gui/emojione/1F477.png b/retroshare-gui/src/gui/emojione/1F477.png index 031d2e7d7..e638c1b30 100644 Binary files a/retroshare-gui/src/gui/emojione/1F477.png and b/retroshare-gui/src/gui/emojione/1F477.png differ diff --git a/retroshare-gui/src/gui/emojione/1F478.png b/retroshare-gui/src/gui/emojione/1F478.png index d15e7713f..27086b2d5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F478.png and b/retroshare-gui/src/gui/emojione/1F478.png differ diff --git a/retroshare-gui/src/gui/emojione/1F479.png b/retroshare-gui/src/gui/emojione/1F479.png index e623313c1..f14cb4026 100644 Binary files a/retroshare-gui/src/gui/emojione/1F479.png and b/retroshare-gui/src/gui/emojione/1F479.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47A.png b/retroshare-gui/src/gui/emojione/1F47A.png index b92965b4c..9e19d1408 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47A.png and b/retroshare-gui/src/gui/emojione/1F47A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47B.png b/retroshare-gui/src/gui/emojione/1F47B.png index b354f4496..ae1c835ef 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47B.png and b/retroshare-gui/src/gui/emojione/1F47B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47C.png b/retroshare-gui/src/gui/emojione/1F47C.png index 3652383c8..43771e711 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47C.png and b/retroshare-gui/src/gui/emojione/1F47C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47D.png b/retroshare-gui/src/gui/emojione/1F47D.png index 485cc394e..9d61ce32d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47D.png and b/retroshare-gui/src/gui/emojione/1F47D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47E.png b/retroshare-gui/src/gui/emojione/1F47E.png index 069653955..7c6a46a18 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47E.png and b/retroshare-gui/src/gui/emojione/1F47E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F47F.png b/retroshare-gui/src/gui/emojione/1F47F.png index a8a85cfdc..c2c75ea7e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F47F.png and b/retroshare-gui/src/gui/emojione/1F47F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F480.png b/retroshare-gui/src/gui/emojione/1F480.png index 55426859f..d1fbe3217 100644 Binary files a/retroshare-gui/src/gui/emojione/1F480.png and b/retroshare-gui/src/gui/emojione/1F480.png differ diff --git a/retroshare-gui/src/gui/emojione/1F481.png b/retroshare-gui/src/gui/emojione/1F481.png index 548f5cfad..a5200295e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F481.png and b/retroshare-gui/src/gui/emojione/1F481.png differ diff --git a/retroshare-gui/src/gui/emojione/1F482.png b/retroshare-gui/src/gui/emojione/1F482.png index 40cc58159..f059a7f9f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F482.png and b/retroshare-gui/src/gui/emojione/1F482.png differ diff --git a/retroshare-gui/src/gui/emojione/1F483.png b/retroshare-gui/src/gui/emojione/1F483.png index 0de5d3bd3..9cfdc6365 100644 Binary files a/retroshare-gui/src/gui/emojione/1F483.png and b/retroshare-gui/src/gui/emojione/1F483.png differ diff --git a/retroshare-gui/src/gui/emojione/1F484.png b/retroshare-gui/src/gui/emojione/1F484.png index 93622d37d..95849dd4d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F484.png and b/retroshare-gui/src/gui/emojione/1F484.png differ diff --git a/retroshare-gui/src/gui/emojione/1F485.png b/retroshare-gui/src/gui/emojione/1F485.png index 88feb3844..611741693 100644 Binary files a/retroshare-gui/src/gui/emojione/1F485.png and b/retroshare-gui/src/gui/emojione/1F485.png differ diff --git a/retroshare-gui/src/gui/emojione/1F486.png b/retroshare-gui/src/gui/emojione/1F486.png index 4f829e24d..3c5c6b8be 100644 Binary files a/retroshare-gui/src/gui/emojione/1F486.png and b/retroshare-gui/src/gui/emojione/1F486.png differ diff --git a/retroshare-gui/src/gui/emojione/1F487.png b/retroshare-gui/src/gui/emojione/1F487.png index 684c6b34f..c2e67a0ff 100644 Binary files a/retroshare-gui/src/gui/emojione/1F487.png and b/retroshare-gui/src/gui/emojione/1F487.png differ diff --git a/retroshare-gui/src/gui/emojione/1F488.png b/retroshare-gui/src/gui/emojione/1F488.png index b9bfb8013..cef2e5ad2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F488.png and b/retroshare-gui/src/gui/emojione/1F488.png differ diff --git a/retroshare-gui/src/gui/emojione/1F489.png b/retroshare-gui/src/gui/emojione/1F489.png index e326d755b..cefe351e7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F489.png and b/retroshare-gui/src/gui/emojione/1F489.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48A.png b/retroshare-gui/src/gui/emojione/1F48A.png index b1313bcda..5cfc252c6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48A.png and b/retroshare-gui/src/gui/emojione/1F48A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48B.png b/retroshare-gui/src/gui/emojione/1F48B.png index 3048ad124..a2738d4eb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48B.png and b/retroshare-gui/src/gui/emojione/1F48B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48C.png b/retroshare-gui/src/gui/emojione/1F48C.png index 77b5d70de..19db5d5e8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48C.png and b/retroshare-gui/src/gui/emojione/1F48C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48D.png b/retroshare-gui/src/gui/emojione/1F48D.png index 88818f1c3..ac521d9ab 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48D.png and b/retroshare-gui/src/gui/emojione/1F48D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48E.png b/retroshare-gui/src/gui/emojione/1F48E.png index c6f134f46..2dc8e6b25 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48E.png and b/retroshare-gui/src/gui/emojione/1F48E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F48F.png b/retroshare-gui/src/gui/emojione/1F48F.png index a51e9af74..48ecdb043 100644 Binary files a/retroshare-gui/src/gui/emojione/1F48F.png and b/retroshare-gui/src/gui/emojione/1F48F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F490.png b/retroshare-gui/src/gui/emojione/1F490.png index 61baa9bf9..99f665aea 100644 Binary files a/retroshare-gui/src/gui/emojione/1F490.png and b/retroshare-gui/src/gui/emojione/1F490.png differ diff --git a/retroshare-gui/src/gui/emojione/1F491.png b/retroshare-gui/src/gui/emojione/1F491.png index 642a64dbe..9a277dfec 100644 Binary files a/retroshare-gui/src/gui/emojione/1F491.png and b/retroshare-gui/src/gui/emojione/1F491.png differ diff --git a/retroshare-gui/src/gui/emojione/1F492.png b/retroshare-gui/src/gui/emojione/1F492.png index 8b5f8a6b6..0c703079c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F492.png and b/retroshare-gui/src/gui/emojione/1F492.png differ diff --git a/retroshare-gui/src/gui/emojione/1F493.png b/retroshare-gui/src/gui/emojione/1F493.png index fde1e696d..225a0394b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F493.png and b/retroshare-gui/src/gui/emojione/1F493.png differ diff --git a/retroshare-gui/src/gui/emojione/1F494.png b/retroshare-gui/src/gui/emojione/1F494.png index a57e29c10..494e29c8b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F494.png and b/retroshare-gui/src/gui/emojione/1F494.png differ diff --git a/retroshare-gui/src/gui/emojione/1F495.png b/retroshare-gui/src/gui/emojione/1F495.png index eaf0813f1..65578fbbd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F495.png and b/retroshare-gui/src/gui/emojione/1F495.png differ diff --git a/retroshare-gui/src/gui/emojione/1F496.png b/retroshare-gui/src/gui/emojione/1F496.png index 224a1d7e0..50bc685f1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F496.png and b/retroshare-gui/src/gui/emojione/1F496.png differ diff --git a/retroshare-gui/src/gui/emojione/1F497.png b/retroshare-gui/src/gui/emojione/1F497.png index 0c0c61e68..f7a5096a8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F497.png and b/retroshare-gui/src/gui/emojione/1F497.png differ diff --git a/retroshare-gui/src/gui/emojione/1F498.png b/retroshare-gui/src/gui/emojione/1F498.png index 2fbd6cca7..0b7b8fbed 100644 Binary files a/retroshare-gui/src/gui/emojione/1F498.png and b/retroshare-gui/src/gui/emojione/1F498.png differ diff --git a/retroshare-gui/src/gui/emojione/1F499.png b/retroshare-gui/src/gui/emojione/1F499.png index 70d1b3ff0..b7a2b486c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F499.png and b/retroshare-gui/src/gui/emojione/1F499.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49A.png b/retroshare-gui/src/gui/emojione/1F49A.png index 53d803f8b..1c39a8b68 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49A.png and b/retroshare-gui/src/gui/emojione/1F49A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49B.png b/retroshare-gui/src/gui/emojione/1F49B.png index a0aeecc53..e06f75455 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49B.png and b/retroshare-gui/src/gui/emojione/1F49B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49C.png b/retroshare-gui/src/gui/emojione/1F49C.png index cfc0f6cf0..75af0efd1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49C.png and b/retroshare-gui/src/gui/emojione/1F49C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49D.png b/retroshare-gui/src/gui/emojione/1F49D.png index 3a9e89b11..7ca394683 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49D.png and b/retroshare-gui/src/gui/emojione/1F49D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49E.png b/retroshare-gui/src/gui/emojione/1F49E.png index e329e8595..9a15398b3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49E.png and b/retroshare-gui/src/gui/emojione/1F49E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F49F.png b/retroshare-gui/src/gui/emojione/1F49F.png index a93675d21..6b880429f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F49F.png and b/retroshare-gui/src/gui/emojione/1F49F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A0.png b/retroshare-gui/src/gui/emojione/1F4A0.png index 058e5e247..d219429b2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A0.png and b/retroshare-gui/src/gui/emojione/1F4A0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A1.png b/retroshare-gui/src/gui/emojione/1F4A1.png index 6952fa626..8e20be3cb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A1.png and b/retroshare-gui/src/gui/emojione/1F4A1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A2.png b/retroshare-gui/src/gui/emojione/1F4A2.png index 76777327a..ae3bc46ce 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A2.png and b/retroshare-gui/src/gui/emojione/1F4A2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A3.png b/retroshare-gui/src/gui/emojione/1F4A3.png index 23cd364e1..ce6434004 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A3.png and b/retroshare-gui/src/gui/emojione/1F4A3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A4.png b/retroshare-gui/src/gui/emojione/1F4A4.png index c36799acb..bb51cd145 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A4.png and b/retroshare-gui/src/gui/emojione/1F4A4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A5.png b/retroshare-gui/src/gui/emojione/1F4A5.png index 5b086c9c4..587fe6d16 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A5.png and b/retroshare-gui/src/gui/emojione/1F4A5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A6.png b/retroshare-gui/src/gui/emojione/1F4A6.png index 3aa4f438a..8310cdbc8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A6.png and b/retroshare-gui/src/gui/emojione/1F4A6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A7.png b/retroshare-gui/src/gui/emojione/1F4A7.png index e0108fe84..08a91f45b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A7.png and b/retroshare-gui/src/gui/emojione/1F4A7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A8.png b/retroshare-gui/src/gui/emojione/1F4A8.png index 8068ec43f..c154a83a7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A8.png and b/retroshare-gui/src/gui/emojione/1F4A8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4A9.png b/retroshare-gui/src/gui/emojione/1F4A9.png index 13c1d7a5c..84d903700 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4A9.png and b/retroshare-gui/src/gui/emojione/1F4A9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AA.png b/retroshare-gui/src/gui/emojione/1F4AA.png index 4efff713e..824b255a0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AA.png and b/retroshare-gui/src/gui/emojione/1F4AA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AB.png b/retroshare-gui/src/gui/emojione/1F4AB.png index f8204a94c..ffca01ef6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AB.png and b/retroshare-gui/src/gui/emojione/1F4AB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AC.png b/retroshare-gui/src/gui/emojione/1F4AC.png index d95f8c325..246ca0965 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AC.png and b/retroshare-gui/src/gui/emojione/1F4AC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AD.png b/retroshare-gui/src/gui/emojione/1F4AD.png index 4e94cc151..aea256c6f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AD.png and b/retroshare-gui/src/gui/emojione/1F4AD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AE.png b/retroshare-gui/src/gui/emojione/1F4AE.png index f02993874..f18cbf0f6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AE.png and b/retroshare-gui/src/gui/emojione/1F4AE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4AF.png b/retroshare-gui/src/gui/emojione/1F4AF.png index 6ba9bd9dc..819041fff 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4AF.png and b/retroshare-gui/src/gui/emojione/1F4AF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B0.png b/retroshare-gui/src/gui/emojione/1F4B0.png index d9dd8c3fd..47efa1975 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B0.png and b/retroshare-gui/src/gui/emojione/1F4B0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B1.png b/retroshare-gui/src/gui/emojione/1F4B1.png index 307c2aadb..4f5ee1d38 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B1.png and b/retroshare-gui/src/gui/emojione/1F4B1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B2.png b/retroshare-gui/src/gui/emojione/1F4B2.png index 350fcf218..81b5bf431 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B2.png and b/retroshare-gui/src/gui/emojione/1F4B2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B3.png b/retroshare-gui/src/gui/emojione/1F4B3.png index a3ea628a8..3526813c9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B3.png and b/retroshare-gui/src/gui/emojione/1F4B3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B4.png b/retroshare-gui/src/gui/emojione/1F4B4.png index 4b92e0977..3bc9ad517 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B4.png and b/retroshare-gui/src/gui/emojione/1F4B4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B5.png b/retroshare-gui/src/gui/emojione/1F4B5.png index e0273f71c..1e64a5cc0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B5.png and b/retroshare-gui/src/gui/emojione/1F4B5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B6.png b/retroshare-gui/src/gui/emojione/1F4B6.png index 37c5a352d..279b41010 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B6.png and b/retroshare-gui/src/gui/emojione/1F4B6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B7.png b/retroshare-gui/src/gui/emojione/1F4B7.png index 58359af97..a91f989f5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B7.png and b/retroshare-gui/src/gui/emojione/1F4B7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B8.png b/retroshare-gui/src/gui/emojione/1F4B8.png index 1800d0810..a8a7e476d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B8.png and b/retroshare-gui/src/gui/emojione/1F4B8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4B9.png b/retroshare-gui/src/gui/emojione/1F4B9.png index 7177a0e9f..cbba0a3ce 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4B9.png and b/retroshare-gui/src/gui/emojione/1F4B9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BA.png b/retroshare-gui/src/gui/emojione/1F4BA.png index 2461dda71..3de53e8a0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BA.png and b/retroshare-gui/src/gui/emojione/1F4BA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BB.png b/retroshare-gui/src/gui/emojione/1F4BB.png index b635454e8..b849f6e49 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BB.png and b/retroshare-gui/src/gui/emojione/1F4BB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BC.png b/retroshare-gui/src/gui/emojione/1F4BC.png index 134ebb634..f7f82d523 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BC.png and b/retroshare-gui/src/gui/emojione/1F4BC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BD.png b/retroshare-gui/src/gui/emojione/1F4BD.png index e58119565..698c0b699 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BD.png and b/retroshare-gui/src/gui/emojione/1F4BD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BE.png b/retroshare-gui/src/gui/emojione/1F4BE.png index 6264f7da7..9ff0a505d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BE.png and b/retroshare-gui/src/gui/emojione/1F4BE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4BF.png b/retroshare-gui/src/gui/emojione/1F4BF.png index dae663a9f..2a676de66 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4BF.png and b/retroshare-gui/src/gui/emojione/1F4BF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C0.png b/retroshare-gui/src/gui/emojione/1F4C0.png index f485ba8c3..ccd66f794 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C0.png and b/retroshare-gui/src/gui/emojione/1F4C0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C1.png b/retroshare-gui/src/gui/emojione/1F4C1.png index b394c310a..74f6d2c27 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C1.png and b/retroshare-gui/src/gui/emojione/1F4C1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C2.png b/retroshare-gui/src/gui/emojione/1F4C2.png index f396ab9ff..f37d1326d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C2.png and b/retroshare-gui/src/gui/emojione/1F4C2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C3.png b/retroshare-gui/src/gui/emojione/1F4C3.png index acb69209c..84e1f1ea5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C3.png and b/retroshare-gui/src/gui/emojione/1F4C3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C4.png b/retroshare-gui/src/gui/emojione/1F4C4.png index 17cf7617e..f3c458ac2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C4.png and b/retroshare-gui/src/gui/emojione/1F4C4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C5.png b/retroshare-gui/src/gui/emojione/1F4C5.png index 946253368..0d60b518a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C5.png and b/retroshare-gui/src/gui/emojione/1F4C5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C6.png b/retroshare-gui/src/gui/emojione/1F4C6.png index afd34540f..776030f0e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C6.png and b/retroshare-gui/src/gui/emojione/1F4C6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C7.png b/retroshare-gui/src/gui/emojione/1F4C7.png index e9b6247dd..391da82fc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C7.png and b/retroshare-gui/src/gui/emojione/1F4C7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C8.png b/retroshare-gui/src/gui/emojione/1F4C8.png index ad0a54368..6029febf3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C8.png and b/retroshare-gui/src/gui/emojione/1F4C8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4C9.png b/retroshare-gui/src/gui/emojione/1F4C9.png index ef58a975e..572ef3075 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4C9.png and b/retroshare-gui/src/gui/emojione/1F4C9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CA.png b/retroshare-gui/src/gui/emojione/1F4CA.png index 90d6fb841..a7590c532 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CA.png and b/retroshare-gui/src/gui/emojione/1F4CA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CB.png b/retroshare-gui/src/gui/emojione/1F4CB.png index d7e4599d3..1e346b689 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CB.png and b/retroshare-gui/src/gui/emojione/1F4CB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CC.png b/retroshare-gui/src/gui/emojione/1F4CC.png index 7d7484ca4..1ea4137b1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CC.png and b/retroshare-gui/src/gui/emojione/1F4CC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CD.png b/retroshare-gui/src/gui/emojione/1F4CD.png index 1f76929ae..81e696617 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CD.png and b/retroshare-gui/src/gui/emojione/1F4CD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CE.png b/retroshare-gui/src/gui/emojione/1F4CE.png index a231037ba..906f057f2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CE.png and b/retroshare-gui/src/gui/emojione/1F4CE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4CF.png b/retroshare-gui/src/gui/emojione/1F4CF.png index a2522cc13..34ffbc0a7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4CF.png and b/retroshare-gui/src/gui/emojione/1F4CF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D0.png b/retroshare-gui/src/gui/emojione/1F4D0.png index ddad72c72..8b5736606 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D0.png and b/retroshare-gui/src/gui/emojione/1F4D0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D1.png b/retroshare-gui/src/gui/emojione/1F4D1.png index a9bbc87a3..7629fb9ec 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D1.png and b/retroshare-gui/src/gui/emojione/1F4D1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D2.png b/retroshare-gui/src/gui/emojione/1F4D2.png index 4f761f491..08a370a7b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D2.png and b/retroshare-gui/src/gui/emojione/1F4D2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D3.png b/retroshare-gui/src/gui/emojione/1F4D3.png index 3309e0e20..77d919002 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D3.png and b/retroshare-gui/src/gui/emojione/1F4D3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D4.png b/retroshare-gui/src/gui/emojione/1F4D4.png index 512ac0d31..860d74006 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D4.png and b/retroshare-gui/src/gui/emojione/1F4D4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D5.png b/retroshare-gui/src/gui/emojione/1F4D5.png index f8e7eba90..dbf2a0c97 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D5.png and b/retroshare-gui/src/gui/emojione/1F4D5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D6.png b/retroshare-gui/src/gui/emojione/1F4D6.png index f701a4d15..b8c9c7ad4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D6.png and b/retroshare-gui/src/gui/emojione/1F4D6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D7.png b/retroshare-gui/src/gui/emojione/1F4D7.png index e0098664d..ca5e5b8b8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D7.png and b/retroshare-gui/src/gui/emojione/1F4D7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D8.png b/retroshare-gui/src/gui/emojione/1F4D8.png index de281d9a4..3ba65b6cb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D8.png and b/retroshare-gui/src/gui/emojione/1F4D8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4D9.png b/retroshare-gui/src/gui/emojione/1F4D9.png index 378bbb042..0f3c0f184 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4D9.png and b/retroshare-gui/src/gui/emojione/1F4D9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DA.png b/retroshare-gui/src/gui/emojione/1F4DA.png index ade5fd158..bd8c77d07 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DA.png and b/retroshare-gui/src/gui/emojione/1F4DA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DB.png b/retroshare-gui/src/gui/emojione/1F4DB.png index 409961a27..968b88c4e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DB.png and b/retroshare-gui/src/gui/emojione/1F4DB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DC.png b/retroshare-gui/src/gui/emojione/1F4DC.png index ad25631a8..dc2326fa3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DC.png and b/retroshare-gui/src/gui/emojione/1F4DC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DD.png b/retroshare-gui/src/gui/emojione/1F4DD.png index 18c2a00fe..612bc5131 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DD.png and b/retroshare-gui/src/gui/emojione/1F4DD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DE.png b/retroshare-gui/src/gui/emojione/1F4DE.png index 1b94cdaa3..1a21f14db 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DE.png and b/retroshare-gui/src/gui/emojione/1F4DE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4DF.png b/retroshare-gui/src/gui/emojione/1F4DF.png index 2f5783f8a..11da28943 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4DF.png and b/retroshare-gui/src/gui/emojione/1F4DF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E0.png b/retroshare-gui/src/gui/emojione/1F4E0.png index a45530169..40adeccff 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E0.png and b/retroshare-gui/src/gui/emojione/1F4E0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E1.png b/retroshare-gui/src/gui/emojione/1F4E1.png index 97aafdd58..8c16d0b22 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E1.png and b/retroshare-gui/src/gui/emojione/1F4E1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E2.png b/retroshare-gui/src/gui/emojione/1F4E2.png index a26e5c08a..31f5a9a15 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E2.png and b/retroshare-gui/src/gui/emojione/1F4E2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E3.png b/retroshare-gui/src/gui/emojione/1F4E3.png index ad892069b..2c5ea17d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E3.png and b/retroshare-gui/src/gui/emojione/1F4E3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E4.png b/retroshare-gui/src/gui/emojione/1F4E4.png index 146bc58cf..60fac3a70 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E4.png and b/retroshare-gui/src/gui/emojione/1F4E4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E5.png b/retroshare-gui/src/gui/emojione/1F4E5.png index 11c26b2b6..7a1694129 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E5.png and b/retroshare-gui/src/gui/emojione/1F4E5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E6.png b/retroshare-gui/src/gui/emojione/1F4E6.png index 6a080c5af..3969e9fc7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E6.png and b/retroshare-gui/src/gui/emojione/1F4E6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E7.png b/retroshare-gui/src/gui/emojione/1F4E7.png index 43e6b53ad..c57646529 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E7.png and b/retroshare-gui/src/gui/emojione/1F4E7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E8.png b/retroshare-gui/src/gui/emojione/1F4E8.png index f78f51839..66dcb41b3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E8.png and b/retroshare-gui/src/gui/emojione/1F4E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4E9.png b/retroshare-gui/src/gui/emojione/1F4E9.png index f6491ac5a..8e03612e4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4E9.png and b/retroshare-gui/src/gui/emojione/1F4E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4EA.png b/retroshare-gui/src/gui/emojione/1F4EA.png index 7ee06b897..5304fb974 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4EA.png and b/retroshare-gui/src/gui/emojione/1F4EA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4EB.png b/retroshare-gui/src/gui/emojione/1F4EB.png index e2a5c0ad7..73e44a1b9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4EB.png and b/retroshare-gui/src/gui/emojione/1F4EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4EC.png b/retroshare-gui/src/gui/emojione/1F4EC.png index 0e2816c8f..b40e4832b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4EC.png and b/retroshare-gui/src/gui/emojione/1F4EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4ED.png b/retroshare-gui/src/gui/emojione/1F4ED.png index b9341dcc4..ecd4d3d69 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4ED.png and b/retroshare-gui/src/gui/emojione/1F4ED.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4EE.png b/retroshare-gui/src/gui/emojione/1F4EE.png index 36113a6d6..c4fabe42c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4EE.png and b/retroshare-gui/src/gui/emojione/1F4EE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4EF.png b/retroshare-gui/src/gui/emojione/1F4EF.png index b5f403ee3..38b68b601 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4EF.png and b/retroshare-gui/src/gui/emojione/1F4EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F0.png b/retroshare-gui/src/gui/emojione/1F4F0.png index c8c784c54..279af4b76 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F0.png and b/retroshare-gui/src/gui/emojione/1F4F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F1.png b/retroshare-gui/src/gui/emojione/1F4F1.png index c0513a0f9..297a1f832 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F1.png and b/retroshare-gui/src/gui/emojione/1F4F1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F2.png b/retroshare-gui/src/gui/emojione/1F4F2.png index 00293f674..19d67b9c3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F2.png and b/retroshare-gui/src/gui/emojione/1F4F2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F3.png b/retroshare-gui/src/gui/emojione/1F4F3.png index db10e8774..c1c4516be 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F3.png and b/retroshare-gui/src/gui/emojione/1F4F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F4.png b/retroshare-gui/src/gui/emojione/1F4F4.png index c9cbce97e..c4800e698 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F4.png and b/retroshare-gui/src/gui/emojione/1F4F4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F5.png b/retroshare-gui/src/gui/emojione/1F4F5.png index 7ba94df81..381ba48e8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F5.png and b/retroshare-gui/src/gui/emojione/1F4F5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F6.png b/retroshare-gui/src/gui/emojione/1F4F6.png index a823a590e..a1c51b1a4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F6.png and b/retroshare-gui/src/gui/emojione/1F4F6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F7.png b/retroshare-gui/src/gui/emojione/1F4F7.png index 108fc4d0d..02be34505 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F7.png and b/retroshare-gui/src/gui/emojione/1F4F7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F8.png b/retroshare-gui/src/gui/emojione/1F4F8.png index c46f37156..d27a8d401 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F8.png and b/retroshare-gui/src/gui/emojione/1F4F8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4F9.png b/retroshare-gui/src/gui/emojione/1F4F9.png index 8651630f4..7ba1c39bf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4F9.png and b/retroshare-gui/src/gui/emojione/1F4F9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4FA.png b/retroshare-gui/src/gui/emojione/1F4FA.png index ce4c1649b..c47a0fc4b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4FA.png and b/retroshare-gui/src/gui/emojione/1F4FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4FB.png b/retroshare-gui/src/gui/emojione/1F4FB.png index f79371854..03d9fd13e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4FB.png and b/retroshare-gui/src/gui/emojione/1F4FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4FC.png b/retroshare-gui/src/gui/emojione/1F4FC.png index ad7b9ac99..9e62db3e9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4FC.png and b/retroshare-gui/src/gui/emojione/1F4FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F4FD.png b/retroshare-gui/src/gui/emojione/1F4FD.png index 08075f077..b45843f0e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F4FD.png and b/retroshare-gui/src/gui/emojione/1F4FD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F500.png b/retroshare-gui/src/gui/emojione/1F500.png index 318d715f1..02680fd3e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F500.png and b/retroshare-gui/src/gui/emojione/1F500.png differ diff --git a/retroshare-gui/src/gui/emojione/1F501.png b/retroshare-gui/src/gui/emojione/1F501.png index 3a6dbccde..6008642b3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F501.png and b/retroshare-gui/src/gui/emojione/1F501.png differ diff --git a/retroshare-gui/src/gui/emojione/1F502.png b/retroshare-gui/src/gui/emojione/1F502.png index 583555fce..6706746b9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F502.png and b/retroshare-gui/src/gui/emojione/1F502.png differ diff --git a/retroshare-gui/src/gui/emojione/1F503.png b/retroshare-gui/src/gui/emojione/1F503.png index e7121ac23..400089ab7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F503.png and b/retroshare-gui/src/gui/emojione/1F503.png differ diff --git a/retroshare-gui/src/gui/emojione/1F504.png b/retroshare-gui/src/gui/emojione/1F504.png index 7eb1ea177..edf813368 100644 Binary files a/retroshare-gui/src/gui/emojione/1F504.png and b/retroshare-gui/src/gui/emojione/1F504.png differ diff --git a/retroshare-gui/src/gui/emojione/1F505.png b/retroshare-gui/src/gui/emojione/1F505.png index 3f2bc97a0..40c4f9b2d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F505.png and b/retroshare-gui/src/gui/emojione/1F505.png differ diff --git a/retroshare-gui/src/gui/emojione/1F506.png b/retroshare-gui/src/gui/emojione/1F506.png index 2fece75b4..d5f6df709 100644 Binary files a/retroshare-gui/src/gui/emojione/1F506.png and b/retroshare-gui/src/gui/emojione/1F506.png differ diff --git a/retroshare-gui/src/gui/emojione/1F507.png b/retroshare-gui/src/gui/emojione/1F507.png index 0f646e62f..06b4813dd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F507.png and b/retroshare-gui/src/gui/emojione/1F507.png differ diff --git a/retroshare-gui/src/gui/emojione/1F508.png b/retroshare-gui/src/gui/emojione/1F508.png index cd32029be..61d33f326 100644 Binary files a/retroshare-gui/src/gui/emojione/1F508.png and b/retroshare-gui/src/gui/emojione/1F508.png differ diff --git a/retroshare-gui/src/gui/emojione/1F509.png b/retroshare-gui/src/gui/emojione/1F509.png index e7241a019..8b1bbc905 100644 Binary files a/retroshare-gui/src/gui/emojione/1F509.png and b/retroshare-gui/src/gui/emojione/1F509.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50A.png b/retroshare-gui/src/gui/emojione/1F50A.png index 2a9850aea..8d95b662f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50A.png and b/retroshare-gui/src/gui/emojione/1F50A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50B.png b/retroshare-gui/src/gui/emojione/1F50B.png index f813f291b..da30949ac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50B.png and b/retroshare-gui/src/gui/emojione/1F50B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50C.png b/retroshare-gui/src/gui/emojione/1F50C.png index edac69969..730cee96a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50C.png and b/retroshare-gui/src/gui/emojione/1F50C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50D.png b/retroshare-gui/src/gui/emojione/1F50D.png index e32353c9d..a5d8464f6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50D.png and b/retroshare-gui/src/gui/emojione/1F50D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50E.png b/retroshare-gui/src/gui/emojione/1F50E.png index f6a04309f..770ef6752 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50E.png and b/retroshare-gui/src/gui/emojione/1F50E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F50F.png b/retroshare-gui/src/gui/emojione/1F50F.png index 0a2a162e8..b186f4c22 100644 Binary files a/retroshare-gui/src/gui/emojione/1F50F.png and b/retroshare-gui/src/gui/emojione/1F50F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F510.png b/retroshare-gui/src/gui/emojione/1F510.png index 060da0678..6b04cdb52 100644 Binary files a/retroshare-gui/src/gui/emojione/1F510.png and b/retroshare-gui/src/gui/emojione/1F510.png differ diff --git a/retroshare-gui/src/gui/emojione/1F511.png b/retroshare-gui/src/gui/emojione/1F511.png index 8bdfe0ce0..b85f90007 100644 Binary files a/retroshare-gui/src/gui/emojione/1F511.png and b/retroshare-gui/src/gui/emojione/1F511.png differ diff --git a/retroshare-gui/src/gui/emojione/1F512.png b/retroshare-gui/src/gui/emojione/1F512.png index 3734137a9..27228bc83 100644 Binary files a/retroshare-gui/src/gui/emojione/1F512.png and b/retroshare-gui/src/gui/emojione/1F512.png differ diff --git a/retroshare-gui/src/gui/emojione/1F513.png b/retroshare-gui/src/gui/emojione/1F513.png index 67b9eda6a..c7fbe55a3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F513.png and b/retroshare-gui/src/gui/emojione/1F513.png differ diff --git a/retroshare-gui/src/gui/emojione/1F514.png b/retroshare-gui/src/gui/emojione/1F514.png index 0c38127e1..ee891fb96 100644 Binary files a/retroshare-gui/src/gui/emojione/1F514.png and b/retroshare-gui/src/gui/emojione/1F514.png differ diff --git a/retroshare-gui/src/gui/emojione/1F515.png b/retroshare-gui/src/gui/emojione/1F515.png index 66b0a72b1..7f8c2a91f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F515.png and b/retroshare-gui/src/gui/emojione/1F515.png differ diff --git a/retroshare-gui/src/gui/emojione/1F516.png b/retroshare-gui/src/gui/emojione/1F516.png index 752b395a7..12dd381aa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F516.png and b/retroshare-gui/src/gui/emojione/1F516.png differ diff --git a/retroshare-gui/src/gui/emojione/1F517.png b/retroshare-gui/src/gui/emojione/1F517.png index 3d8017144..17a75e8c0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F517.png and b/retroshare-gui/src/gui/emojione/1F517.png differ diff --git a/retroshare-gui/src/gui/emojione/1F518.png b/retroshare-gui/src/gui/emojione/1F518.png index 21fe1c94d..f1d34e73e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F518.png and b/retroshare-gui/src/gui/emojione/1F518.png differ diff --git a/retroshare-gui/src/gui/emojione/1F519.png b/retroshare-gui/src/gui/emojione/1F519.png index bb1bfdd07..829a9bce5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F519.png and b/retroshare-gui/src/gui/emojione/1F519.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51A.png b/retroshare-gui/src/gui/emojione/1F51A.png index a613ef8e1..89050c7bd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51A.png and b/retroshare-gui/src/gui/emojione/1F51A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51B.png b/retroshare-gui/src/gui/emojione/1F51B.png index 131b85343..46942c4f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51B.png and b/retroshare-gui/src/gui/emojione/1F51B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51C.png b/retroshare-gui/src/gui/emojione/1F51C.png index a85fb02f5..cdeb4cc7f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51C.png and b/retroshare-gui/src/gui/emojione/1F51C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51D.png b/retroshare-gui/src/gui/emojione/1F51D.png index 37201db4c..885e20c62 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51D.png and b/retroshare-gui/src/gui/emojione/1F51D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51E.png b/retroshare-gui/src/gui/emojione/1F51E.png index 5341f2222..31ea22ea1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51E.png and b/retroshare-gui/src/gui/emojione/1F51E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F51F.png b/retroshare-gui/src/gui/emojione/1F51F.png index 9a1f17a7e..dfbf32914 100644 Binary files a/retroshare-gui/src/gui/emojione/1F51F.png and b/retroshare-gui/src/gui/emojione/1F51F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F520.png b/retroshare-gui/src/gui/emojione/1F520.png index 40d3ebaf8..415cfb955 100644 Binary files a/retroshare-gui/src/gui/emojione/1F520.png and b/retroshare-gui/src/gui/emojione/1F520.png differ diff --git a/retroshare-gui/src/gui/emojione/1F521.png b/retroshare-gui/src/gui/emojione/1F521.png index 0c8758c48..39a21d638 100644 Binary files a/retroshare-gui/src/gui/emojione/1F521.png and b/retroshare-gui/src/gui/emojione/1F521.png differ diff --git a/retroshare-gui/src/gui/emojione/1F522.png b/retroshare-gui/src/gui/emojione/1F522.png index 0d3f518f3..abaa72de1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F522.png and b/retroshare-gui/src/gui/emojione/1F522.png differ diff --git a/retroshare-gui/src/gui/emojione/1F523.png b/retroshare-gui/src/gui/emojione/1F523.png index f00bfec1a..e43b754b6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F523.png and b/retroshare-gui/src/gui/emojione/1F523.png differ diff --git a/retroshare-gui/src/gui/emojione/1F524.png b/retroshare-gui/src/gui/emojione/1F524.png index 6e43a5b40..304f5898b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F524.png and b/retroshare-gui/src/gui/emojione/1F524.png differ diff --git a/retroshare-gui/src/gui/emojione/1F525.png b/retroshare-gui/src/gui/emojione/1F525.png index 4760d4bf8..2a550adf0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F525.png and b/retroshare-gui/src/gui/emojione/1F525.png differ diff --git a/retroshare-gui/src/gui/emojione/1F526.png b/retroshare-gui/src/gui/emojione/1F526.png index ced6462bf..453d2f0b5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F526.png and b/retroshare-gui/src/gui/emojione/1F526.png differ diff --git a/retroshare-gui/src/gui/emojione/1F527.png b/retroshare-gui/src/gui/emojione/1F527.png index 58bfca877..64dd5b2d6 100644 Binary files a/retroshare-gui/src/gui/emojione/1F527.png and b/retroshare-gui/src/gui/emojione/1F527.png differ diff --git a/retroshare-gui/src/gui/emojione/1F528.png b/retroshare-gui/src/gui/emojione/1F528.png index d0d9c030f..7deaeb5f2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F528.png and b/retroshare-gui/src/gui/emojione/1F528.png differ diff --git a/retroshare-gui/src/gui/emojione/1F529.png b/retroshare-gui/src/gui/emojione/1F529.png index bc20fede1..b3fbf8b85 100644 Binary files a/retroshare-gui/src/gui/emojione/1F529.png and b/retroshare-gui/src/gui/emojione/1F529.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52A.png b/retroshare-gui/src/gui/emojione/1F52A.png index 4c4547910..542520a3d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52A.png and b/retroshare-gui/src/gui/emojione/1F52A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52B.png b/retroshare-gui/src/gui/emojione/1F52B.png index adce53dcb..cb8c1658f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52B.png and b/retroshare-gui/src/gui/emojione/1F52B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52C.png b/retroshare-gui/src/gui/emojione/1F52C.png index 5cd55a631..d69e47437 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52C.png and b/retroshare-gui/src/gui/emojione/1F52C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52D.png b/retroshare-gui/src/gui/emojione/1F52D.png index 613800929..87050582f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52D.png and b/retroshare-gui/src/gui/emojione/1F52D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52E.png b/retroshare-gui/src/gui/emojione/1F52E.png index e48c1d0e0..79dc9a5bf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52E.png and b/retroshare-gui/src/gui/emojione/1F52E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F52F.png b/retroshare-gui/src/gui/emojione/1F52F.png index 72b236473..feb01c9ea 100644 Binary files a/retroshare-gui/src/gui/emojione/1F52F.png and b/retroshare-gui/src/gui/emojione/1F52F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F530.png b/retroshare-gui/src/gui/emojione/1F530.png index 870f671af..964042e52 100644 Binary files a/retroshare-gui/src/gui/emojione/1F530.png and b/retroshare-gui/src/gui/emojione/1F530.png differ diff --git a/retroshare-gui/src/gui/emojione/1F531.png b/retroshare-gui/src/gui/emojione/1F531.png index 6230f7d53..9b0df1820 100644 Binary files a/retroshare-gui/src/gui/emojione/1F531.png and b/retroshare-gui/src/gui/emojione/1F531.png differ diff --git a/retroshare-gui/src/gui/emojione/1F532.png b/retroshare-gui/src/gui/emojione/1F532.png index db26027ef..c7a4b21e8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F532.png and b/retroshare-gui/src/gui/emojione/1F532.png differ diff --git a/retroshare-gui/src/gui/emojione/1F533.png b/retroshare-gui/src/gui/emojione/1F533.png index c365a022d..9611349cb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F533.png and b/retroshare-gui/src/gui/emojione/1F533.png differ diff --git a/retroshare-gui/src/gui/emojione/1F534.png b/retroshare-gui/src/gui/emojione/1F534.png index 4d05a0752..70fb27318 100644 Binary files a/retroshare-gui/src/gui/emojione/1F534.png and b/retroshare-gui/src/gui/emojione/1F534.png differ diff --git a/retroshare-gui/src/gui/emojione/1F535.png b/retroshare-gui/src/gui/emojione/1F535.png index 2de19351b..16d9852a9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F535.png and b/retroshare-gui/src/gui/emojione/1F535.png differ diff --git a/retroshare-gui/src/gui/emojione/1F536.png b/retroshare-gui/src/gui/emojione/1F536.png index 012df89dd..e3cfa88ef 100644 Binary files a/retroshare-gui/src/gui/emojione/1F536.png and b/retroshare-gui/src/gui/emojione/1F536.png differ diff --git a/retroshare-gui/src/gui/emojione/1F537.png b/retroshare-gui/src/gui/emojione/1F537.png index b009dbb30..b184bcbbf 100644 Binary files a/retroshare-gui/src/gui/emojione/1F537.png and b/retroshare-gui/src/gui/emojione/1F537.png differ diff --git a/retroshare-gui/src/gui/emojione/1F538.png b/retroshare-gui/src/gui/emojione/1F538.png index 5d8b510fb..dd7b90783 100644 Binary files a/retroshare-gui/src/gui/emojione/1F538.png and b/retroshare-gui/src/gui/emojione/1F538.png differ diff --git a/retroshare-gui/src/gui/emojione/1F539.png b/retroshare-gui/src/gui/emojione/1F539.png index bfc68b759..6765105a9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F539.png and b/retroshare-gui/src/gui/emojione/1F539.png differ diff --git a/retroshare-gui/src/gui/emojione/1F53A.png b/retroshare-gui/src/gui/emojione/1F53A.png index f578e667c..f042728b1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F53A.png and b/retroshare-gui/src/gui/emojione/1F53A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F53B.png b/retroshare-gui/src/gui/emojione/1F53B.png index 08cd42db5..ab981ceb2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F53B.png and b/retroshare-gui/src/gui/emojione/1F53B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F53C.png b/retroshare-gui/src/gui/emojione/1F53C.png index d8de0f046..52b55de85 100644 Binary files a/retroshare-gui/src/gui/emojione/1F53C.png and b/retroshare-gui/src/gui/emojione/1F53C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F53D.png b/retroshare-gui/src/gui/emojione/1F53D.png index ea48f111c..fa75466ae 100644 Binary files a/retroshare-gui/src/gui/emojione/1F53D.png and b/retroshare-gui/src/gui/emojione/1F53D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F549.png b/retroshare-gui/src/gui/emojione/1F549.png index 7635a4da7..0477003a1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F549.png and b/retroshare-gui/src/gui/emojione/1F549.png differ diff --git a/retroshare-gui/src/gui/emojione/1F54A.png b/retroshare-gui/src/gui/emojione/1F54A.png index fcfa8ad62..b01f86a44 100644 Binary files a/retroshare-gui/src/gui/emojione/1F54A.png and b/retroshare-gui/src/gui/emojione/1F54A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F550.png b/retroshare-gui/src/gui/emojione/1F550.png index 502b2f130..91875c90c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F550.png and b/retroshare-gui/src/gui/emojione/1F550.png differ diff --git a/retroshare-gui/src/gui/emojione/1F551.png b/retroshare-gui/src/gui/emojione/1F551.png index 06666cb11..6ec4aa11a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F551.png and b/retroshare-gui/src/gui/emojione/1F551.png differ diff --git a/retroshare-gui/src/gui/emojione/1F552.png b/retroshare-gui/src/gui/emojione/1F552.png index ff10a1b07..97a08a2cd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F552.png and b/retroshare-gui/src/gui/emojione/1F552.png differ diff --git a/retroshare-gui/src/gui/emojione/1F553.png b/retroshare-gui/src/gui/emojione/1F553.png index 0457b29e9..b61ca5819 100644 Binary files a/retroshare-gui/src/gui/emojione/1F553.png and b/retroshare-gui/src/gui/emojione/1F553.png differ diff --git a/retroshare-gui/src/gui/emojione/1F554.png b/retroshare-gui/src/gui/emojione/1F554.png index cd02dff15..df38b783a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F554.png and b/retroshare-gui/src/gui/emojione/1F554.png differ diff --git a/retroshare-gui/src/gui/emojione/1F555.png b/retroshare-gui/src/gui/emojione/1F555.png index f12f74120..2f5469236 100644 Binary files a/retroshare-gui/src/gui/emojione/1F555.png and b/retroshare-gui/src/gui/emojione/1F555.png differ diff --git a/retroshare-gui/src/gui/emojione/1F556.png b/retroshare-gui/src/gui/emojione/1F556.png index 8affb8f8a..f55c5d4fc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F556.png and b/retroshare-gui/src/gui/emojione/1F556.png differ diff --git a/retroshare-gui/src/gui/emojione/1F557.png b/retroshare-gui/src/gui/emojione/1F557.png index bacc0eb3f..9a7abb5eb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F557.png and b/retroshare-gui/src/gui/emojione/1F557.png differ diff --git a/retroshare-gui/src/gui/emojione/1F558.png b/retroshare-gui/src/gui/emojione/1F558.png index 4505dd785..60e812124 100644 Binary files a/retroshare-gui/src/gui/emojione/1F558.png and b/retroshare-gui/src/gui/emojione/1F558.png differ diff --git a/retroshare-gui/src/gui/emojione/1F559.png b/retroshare-gui/src/gui/emojione/1F559.png index 6f2da920d..34f5030e3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F559.png and b/retroshare-gui/src/gui/emojione/1F559.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55A.png b/retroshare-gui/src/gui/emojione/1F55A.png index 7c0230da8..60ce0f6f9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55A.png and b/retroshare-gui/src/gui/emojione/1F55A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55B.png b/retroshare-gui/src/gui/emojione/1F55B.png index 1a7f7ff37..c6e08112b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55B.png and b/retroshare-gui/src/gui/emojione/1F55B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55C.png b/retroshare-gui/src/gui/emojione/1F55C.png index a17767e03..2259c3692 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55C.png and b/retroshare-gui/src/gui/emojione/1F55C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55D.png b/retroshare-gui/src/gui/emojione/1F55D.png index 49e10ca3a..b47cee6ab 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55D.png and b/retroshare-gui/src/gui/emojione/1F55D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55E.png b/retroshare-gui/src/gui/emojione/1F55E.png index a4d3924b4..47a88a7d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55E.png and b/retroshare-gui/src/gui/emojione/1F55E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F55F.png b/retroshare-gui/src/gui/emojione/1F55F.png index c33c2add1..f78f83764 100644 Binary files a/retroshare-gui/src/gui/emojione/1F55F.png and b/retroshare-gui/src/gui/emojione/1F55F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F560.png b/retroshare-gui/src/gui/emojione/1F560.png index 6b15ec4d3..298855dab 100644 Binary files a/retroshare-gui/src/gui/emojione/1F560.png and b/retroshare-gui/src/gui/emojione/1F560.png differ diff --git a/retroshare-gui/src/gui/emojione/1F561.png b/retroshare-gui/src/gui/emojione/1F561.png index 0a21490aa..8ccf7c168 100644 Binary files a/retroshare-gui/src/gui/emojione/1F561.png and b/retroshare-gui/src/gui/emojione/1F561.png differ diff --git a/retroshare-gui/src/gui/emojione/1F562.png b/retroshare-gui/src/gui/emojione/1F562.png index 6640a09af..2dd7e000c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F562.png and b/retroshare-gui/src/gui/emojione/1F562.png differ diff --git a/retroshare-gui/src/gui/emojione/1F563.png b/retroshare-gui/src/gui/emojione/1F563.png index 637a6308c..fe5afcc08 100644 Binary files a/retroshare-gui/src/gui/emojione/1F563.png and b/retroshare-gui/src/gui/emojione/1F563.png differ diff --git a/retroshare-gui/src/gui/emojione/1F564.png b/retroshare-gui/src/gui/emojione/1F564.png index 701ec2c1e..3d4137ff2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F564.png and b/retroshare-gui/src/gui/emojione/1F564.png differ diff --git a/retroshare-gui/src/gui/emojione/1F565.png b/retroshare-gui/src/gui/emojione/1F565.png index 8a17b5c35..94cb5bef2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F565.png and b/retroshare-gui/src/gui/emojione/1F565.png differ diff --git a/retroshare-gui/src/gui/emojione/1F566.png b/retroshare-gui/src/gui/emojione/1F566.png index 9029ddf0b..89850617a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F566.png and b/retroshare-gui/src/gui/emojione/1F566.png differ diff --git a/retroshare-gui/src/gui/emojione/1F567.png b/retroshare-gui/src/gui/emojione/1F567.png index fb2f30ebf..5f7b45679 100644 Binary files a/retroshare-gui/src/gui/emojione/1F567.png and b/retroshare-gui/src/gui/emojione/1F567.png differ diff --git a/retroshare-gui/src/gui/emojione/1F56F.png b/retroshare-gui/src/gui/emojione/1F56F.png index 5fc292aac..96cd98991 100644 Binary files a/retroshare-gui/src/gui/emojione/1F56F.png and b/retroshare-gui/src/gui/emojione/1F56F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F570.png b/retroshare-gui/src/gui/emojione/1F570.png index daa58920f..fc19934f7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F570.png and b/retroshare-gui/src/gui/emojione/1F570.png differ diff --git a/retroshare-gui/src/gui/emojione/1F573.png b/retroshare-gui/src/gui/emojione/1F573.png index aa4d32ef7..84f503f0b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F573.png and b/retroshare-gui/src/gui/emojione/1F573.png differ diff --git a/retroshare-gui/src/gui/emojione/1F574.png b/retroshare-gui/src/gui/emojione/1F574.png index a2a986451..cd1332333 100644 Binary files a/retroshare-gui/src/gui/emojione/1F574.png and b/retroshare-gui/src/gui/emojione/1F574.png differ diff --git a/retroshare-gui/src/gui/emojione/1F575.png b/retroshare-gui/src/gui/emojione/1F575.png index 064087e8f..b3519055a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F575.png and b/retroshare-gui/src/gui/emojione/1F575.png differ diff --git a/retroshare-gui/src/gui/emojione/1F576.png b/retroshare-gui/src/gui/emojione/1F576.png index e28516ce6..8f94c90ee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F576.png and b/retroshare-gui/src/gui/emojione/1F576.png differ diff --git a/retroshare-gui/src/gui/emojione/1F577.png b/retroshare-gui/src/gui/emojione/1F577.png index e32c700bd..844ba855e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F577.png and b/retroshare-gui/src/gui/emojione/1F577.png differ diff --git a/retroshare-gui/src/gui/emojione/1F578.png b/retroshare-gui/src/gui/emojione/1F578.png index 1ffe465b5..de1cee6e8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F578.png and b/retroshare-gui/src/gui/emojione/1F578.png differ diff --git a/retroshare-gui/src/gui/emojione/1F579.png b/retroshare-gui/src/gui/emojione/1F579.png index 3c86e8cbb..010f2fbe7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F579.png and b/retroshare-gui/src/gui/emojione/1F579.png differ diff --git a/retroshare-gui/src/gui/emojione/1F587.png b/retroshare-gui/src/gui/emojione/1F587.png index f18faa64f..e99b03346 100644 Binary files a/retroshare-gui/src/gui/emojione/1F587.png and b/retroshare-gui/src/gui/emojione/1F587.png differ diff --git a/retroshare-gui/src/gui/emojione/1F58A.png b/retroshare-gui/src/gui/emojione/1F58A.png index 000bb7e94..af88e07e3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F58A.png and b/retroshare-gui/src/gui/emojione/1F58A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F58B.png b/retroshare-gui/src/gui/emojione/1F58B.png index 11a21cc5c..10c900681 100644 Binary files a/retroshare-gui/src/gui/emojione/1F58B.png and b/retroshare-gui/src/gui/emojione/1F58B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F58C.png b/retroshare-gui/src/gui/emojione/1F58C.png index 8422a8a0d..2ff1ad0d3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F58C.png and b/retroshare-gui/src/gui/emojione/1F58C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F58D.png b/retroshare-gui/src/gui/emojione/1F58D.png index a8a229b81..6981b5eab 100644 Binary files a/retroshare-gui/src/gui/emojione/1F58D.png and b/retroshare-gui/src/gui/emojione/1F58D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F590.png b/retroshare-gui/src/gui/emojione/1F590.png index df6c357a3..baec21905 100644 Binary files a/retroshare-gui/src/gui/emojione/1F590.png and b/retroshare-gui/src/gui/emojione/1F590.png differ diff --git a/retroshare-gui/src/gui/emojione/1F595.png b/retroshare-gui/src/gui/emojione/1F595.png index ccec86c88..7e1f5fa63 100644 Binary files a/retroshare-gui/src/gui/emojione/1F595.png and b/retroshare-gui/src/gui/emojione/1F595.png differ diff --git a/retroshare-gui/src/gui/emojione/1F596.png b/retroshare-gui/src/gui/emojione/1F596.png index 888b209fc..198e164dd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F596.png and b/retroshare-gui/src/gui/emojione/1F596.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5A5.png b/retroshare-gui/src/gui/emojione/1F5A5.png index f8adbc199..d3081b139 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5A5.png and b/retroshare-gui/src/gui/emojione/1F5A5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5A8.png b/retroshare-gui/src/gui/emojione/1F5A8.png index b9326d555..c3dbfcb9e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5A8.png and b/retroshare-gui/src/gui/emojione/1F5A8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5B2.png b/retroshare-gui/src/gui/emojione/1F5B2.png index e498368cd..42bd68d5b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5B2.png and b/retroshare-gui/src/gui/emojione/1F5B2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5BC.png b/retroshare-gui/src/gui/emojione/1F5BC.png index 8e321875b..b34769194 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5BC.png and b/retroshare-gui/src/gui/emojione/1F5BC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5C2.png b/retroshare-gui/src/gui/emojione/1F5C2.png index 837fa2319..9bfeb59a0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5C2.png and b/retroshare-gui/src/gui/emojione/1F5C2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5C3.png b/retroshare-gui/src/gui/emojione/1F5C3.png index 77b2e19a3..46aaa0139 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5C3.png and b/retroshare-gui/src/gui/emojione/1F5C3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5C4.png b/retroshare-gui/src/gui/emojione/1F5C4.png index 6b0baeb11..a9806eca9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5C4.png and b/retroshare-gui/src/gui/emojione/1F5C4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5D1.png b/retroshare-gui/src/gui/emojione/1F5D1.png index 6a00b7055..43f460c9c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5D1.png and b/retroshare-gui/src/gui/emojione/1F5D1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5D2.png b/retroshare-gui/src/gui/emojione/1F5D2.png index fed8985d7..2f976f982 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5D2.png and b/retroshare-gui/src/gui/emojione/1F5D2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5D3.png b/retroshare-gui/src/gui/emojione/1F5D3.png index 449ada711..2ccbf7ce1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5D3.png and b/retroshare-gui/src/gui/emojione/1F5D3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5DC.png b/retroshare-gui/src/gui/emojione/1F5DC.png index 36d76d1f7..5a5bc440d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5DC.png and b/retroshare-gui/src/gui/emojione/1F5DC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5DD.png b/retroshare-gui/src/gui/emojione/1F5DD.png index f76d7b14c..9db56033f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5DD.png and b/retroshare-gui/src/gui/emojione/1F5DD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5DE.png b/retroshare-gui/src/gui/emojione/1F5DE.png index 82c170e1c..151544e29 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5DE.png and b/retroshare-gui/src/gui/emojione/1F5DE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5E1.png b/retroshare-gui/src/gui/emojione/1F5E1.png index e2541eeaa..afcc8c225 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5E1.png and b/retroshare-gui/src/gui/emojione/1F5E1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5E3.png b/retroshare-gui/src/gui/emojione/1F5E3.png index 95e071d4e..b2168ee94 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5E3.png and b/retroshare-gui/src/gui/emojione/1F5E3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5E8.png b/retroshare-gui/src/gui/emojione/1F5E8.png index ecffca493..df88f924b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5E8.png and b/retroshare-gui/src/gui/emojione/1F5E8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5EF.png b/retroshare-gui/src/gui/emojione/1F5EF.png index b9f1b95fb..36faebaf4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5EF.png and b/retroshare-gui/src/gui/emojione/1F5EF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5F3.png b/retroshare-gui/src/gui/emojione/1F5F3.png index d1f1a76d0..8d78a550d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5F3.png and b/retroshare-gui/src/gui/emojione/1F5F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FA.png b/retroshare-gui/src/gui/emojione/1F5FA.png index 4f44109a9..59c8c0eeb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FA.png and b/retroshare-gui/src/gui/emojione/1F5FA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FB.png b/retroshare-gui/src/gui/emojione/1F5FB.png index 23b9b632b..bb80aa1d9 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FB.png and b/retroshare-gui/src/gui/emojione/1F5FB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FC.png b/retroshare-gui/src/gui/emojione/1F5FC.png index 86c994ce3..137a6506b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FC.png and b/retroshare-gui/src/gui/emojione/1F5FC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FD.png b/retroshare-gui/src/gui/emojione/1F5FD.png index ddf20539e..1edab4997 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FD.png and b/retroshare-gui/src/gui/emojione/1F5FD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FE.png b/retroshare-gui/src/gui/emojione/1F5FE.png index 70d69de78..f8bb4b04a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FE.png and b/retroshare-gui/src/gui/emojione/1F5FE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F5FF.png b/retroshare-gui/src/gui/emojione/1F5FF.png index a83e87ab1..273756ece 100644 Binary files a/retroshare-gui/src/gui/emojione/1F5FF.png and b/retroshare-gui/src/gui/emojione/1F5FF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F600.png b/retroshare-gui/src/gui/emojione/1F600.png index 59abc50ae..1481a0867 100644 Binary files a/retroshare-gui/src/gui/emojione/1F600.png and b/retroshare-gui/src/gui/emojione/1F600.png differ diff --git a/retroshare-gui/src/gui/emojione/1F601.png b/retroshare-gui/src/gui/emojione/1F601.png index 98773b5f8..daa26ebee 100644 Binary files a/retroshare-gui/src/gui/emojione/1F601.png and b/retroshare-gui/src/gui/emojione/1F601.png differ diff --git a/retroshare-gui/src/gui/emojione/1F602.png b/retroshare-gui/src/gui/emojione/1F602.png index 375beadbe..bdebf3a46 100644 Binary files a/retroshare-gui/src/gui/emojione/1F602.png and b/retroshare-gui/src/gui/emojione/1F602.png differ diff --git a/retroshare-gui/src/gui/emojione/1F603.png b/retroshare-gui/src/gui/emojione/1F603.png index bf8f6baf4..bf2232360 100644 Binary files a/retroshare-gui/src/gui/emojione/1F603.png and b/retroshare-gui/src/gui/emojione/1F603.png differ diff --git a/retroshare-gui/src/gui/emojione/1F604.png b/retroshare-gui/src/gui/emojione/1F604.png index b74609baa..321b0c354 100644 Binary files a/retroshare-gui/src/gui/emojione/1F604.png and b/retroshare-gui/src/gui/emojione/1F604.png differ diff --git a/retroshare-gui/src/gui/emojione/1F605.png b/retroshare-gui/src/gui/emojione/1F605.png index a1da8cd07..483664a70 100644 Binary files a/retroshare-gui/src/gui/emojione/1F605.png and b/retroshare-gui/src/gui/emojione/1F605.png differ diff --git a/retroshare-gui/src/gui/emojione/1F606.png b/retroshare-gui/src/gui/emojione/1F606.png index 6e17c23c9..152782058 100644 Binary files a/retroshare-gui/src/gui/emojione/1F606.png and b/retroshare-gui/src/gui/emojione/1F606.png differ diff --git a/retroshare-gui/src/gui/emojione/1F607.png b/retroshare-gui/src/gui/emojione/1F607.png index 3db445899..80b38488d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F607.png and b/retroshare-gui/src/gui/emojione/1F607.png differ diff --git a/retroshare-gui/src/gui/emojione/1F608.png b/retroshare-gui/src/gui/emojione/1F608.png index 0b0390805..984254ced 100644 Binary files a/retroshare-gui/src/gui/emojione/1F608.png and b/retroshare-gui/src/gui/emojione/1F608.png differ diff --git a/retroshare-gui/src/gui/emojione/1F609.png b/retroshare-gui/src/gui/emojione/1F609.png index 92b0a4e91..37cfe0e49 100644 Binary files a/retroshare-gui/src/gui/emojione/1F609.png and b/retroshare-gui/src/gui/emojione/1F609.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60A.png b/retroshare-gui/src/gui/emojione/1F60A.png index f49f4c33f..7e666a685 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60A.png and b/retroshare-gui/src/gui/emojione/1F60A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60B.png b/retroshare-gui/src/gui/emojione/1F60B.png index 9bb8800e2..43127e7ba 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60B.png and b/retroshare-gui/src/gui/emojione/1F60B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60C.png b/retroshare-gui/src/gui/emojione/1F60C.png index cf2355929..d56f5f928 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60C.png and b/retroshare-gui/src/gui/emojione/1F60C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60D.png b/retroshare-gui/src/gui/emojione/1F60D.png index 6cbb7e88f..b5c75e309 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60D.png and b/retroshare-gui/src/gui/emojione/1F60D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60E.png b/retroshare-gui/src/gui/emojione/1F60E.png index 41814b22e..94dfa78d7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60E.png and b/retroshare-gui/src/gui/emojione/1F60E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F60F.png b/retroshare-gui/src/gui/emojione/1F60F.png index 74bbbfe14..e5092c8aa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F60F.png and b/retroshare-gui/src/gui/emojione/1F60F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F610.png b/retroshare-gui/src/gui/emojione/1F610.png index a012a448a..0e4b66bf5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F610.png and b/retroshare-gui/src/gui/emojione/1F610.png differ diff --git a/retroshare-gui/src/gui/emojione/1F611.png b/retroshare-gui/src/gui/emojione/1F611.png index 09a8f4f8e..9cac6572f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F611.png and b/retroshare-gui/src/gui/emojione/1F611.png differ diff --git a/retroshare-gui/src/gui/emojione/1F612.png b/retroshare-gui/src/gui/emojione/1F612.png index ebfd7a477..e005a5829 100644 Binary files a/retroshare-gui/src/gui/emojione/1F612.png and b/retroshare-gui/src/gui/emojione/1F612.png differ diff --git a/retroshare-gui/src/gui/emojione/1F613.png b/retroshare-gui/src/gui/emojione/1F613.png index 5c4be529b..9c0a8dae2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F613.png and b/retroshare-gui/src/gui/emojione/1F613.png differ diff --git a/retroshare-gui/src/gui/emojione/1F614.png b/retroshare-gui/src/gui/emojione/1F614.png index 3fcd56265..f5a0f514e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F614.png and b/retroshare-gui/src/gui/emojione/1F614.png differ diff --git a/retroshare-gui/src/gui/emojione/1F615.png b/retroshare-gui/src/gui/emojione/1F615.png index d69c69e1e..1a73a088a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F615.png and b/retroshare-gui/src/gui/emojione/1F615.png differ diff --git a/retroshare-gui/src/gui/emojione/1F616.png b/retroshare-gui/src/gui/emojione/1F616.png index 53e316c4b..05a2cee71 100644 Binary files a/retroshare-gui/src/gui/emojione/1F616.png and b/retroshare-gui/src/gui/emojione/1F616.png differ diff --git a/retroshare-gui/src/gui/emojione/1F617.png b/retroshare-gui/src/gui/emojione/1F617.png index 1c2c099c4..f4af33b82 100644 Binary files a/retroshare-gui/src/gui/emojione/1F617.png and b/retroshare-gui/src/gui/emojione/1F617.png differ diff --git a/retroshare-gui/src/gui/emojione/1F618.png b/retroshare-gui/src/gui/emojione/1F618.png index 05d6450c8..1bf90311f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F618.png and b/retroshare-gui/src/gui/emojione/1F618.png differ diff --git a/retroshare-gui/src/gui/emojione/1F619.png b/retroshare-gui/src/gui/emojione/1F619.png index b07f8ca70..00c0641fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F619.png and b/retroshare-gui/src/gui/emojione/1F619.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61A.png b/retroshare-gui/src/gui/emojione/1F61A.png index 280969838..c69a46604 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61A.png and b/retroshare-gui/src/gui/emojione/1F61A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61B.png b/retroshare-gui/src/gui/emojione/1F61B.png index 931f7ebb3..17951ab5b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61B.png and b/retroshare-gui/src/gui/emojione/1F61B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61C.png b/retroshare-gui/src/gui/emojione/1F61C.png index 06d9a37e8..221a0dc80 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61C.png and b/retroshare-gui/src/gui/emojione/1F61C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61D.png b/retroshare-gui/src/gui/emojione/1F61D.png index 46afcb525..3d406100c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61D.png and b/retroshare-gui/src/gui/emojione/1F61D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61E.png b/retroshare-gui/src/gui/emojione/1F61E.png index 23da0ddbb..f8160c75d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61E.png and b/retroshare-gui/src/gui/emojione/1F61E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F61F.png b/retroshare-gui/src/gui/emojione/1F61F.png index 26c364806..b4fd92cbe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F61F.png and b/retroshare-gui/src/gui/emojione/1F61F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F620.png b/retroshare-gui/src/gui/emojione/1F620.png index 368fbd6d6..f8ba2fd0a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F620.png and b/retroshare-gui/src/gui/emojione/1F620.png differ diff --git a/retroshare-gui/src/gui/emojione/1F621.png b/retroshare-gui/src/gui/emojione/1F621.png index 87f4df554..eb0d7fabb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F621.png and b/retroshare-gui/src/gui/emojione/1F621.png differ diff --git a/retroshare-gui/src/gui/emojione/1F622.png b/retroshare-gui/src/gui/emojione/1F622.png index 113e3e3c4..086195c08 100644 Binary files a/retroshare-gui/src/gui/emojione/1F622.png and b/retroshare-gui/src/gui/emojione/1F622.png differ diff --git a/retroshare-gui/src/gui/emojione/1F623.png b/retroshare-gui/src/gui/emojione/1F623.png index a885780cd..cfc22efbc 100644 Binary files a/retroshare-gui/src/gui/emojione/1F623.png and b/retroshare-gui/src/gui/emojione/1F623.png differ diff --git a/retroshare-gui/src/gui/emojione/1F624.png b/retroshare-gui/src/gui/emojione/1F624.png index d00a5e410..74104fea4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F624.png and b/retroshare-gui/src/gui/emojione/1F624.png differ diff --git a/retroshare-gui/src/gui/emojione/1F625.png b/retroshare-gui/src/gui/emojione/1F625.png index d8bdbfb7a..130a0a1e2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F625.png and b/retroshare-gui/src/gui/emojione/1F625.png differ diff --git a/retroshare-gui/src/gui/emojione/1F626.png b/retroshare-gui/src/gui/emojione/1F626.png index 3ed6cfea7..437050cac 100644 Binary files a/retroshare-gui/src/gui/emojione/1F626.png and b/retroshare-gui/src/gui/emojione/1F626.png differ diff --git a/retroshare-gui/src/gui/emojione/1F627.png b/retroshare-gui/src/gui/emojione/1F627.png index dbb72e3fd..275fda8a0 100644 Binary files a/retroshare-gui/src/gui/emojione/1F627.png and b/retroshare-gui/src/gui/emojione/1F627.png differ diff --git a/retroshare-gui/src/gui/emojione/1F628.png b/retroshare-gui/src/gui/emojione/1F628.png index 369e221a0..9c428cbf2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F628.png and b/retroshare-gui/src/gui/emojione/1F628.png differ diff --git a/retroshare-gui/src/gui/emojione/1F629.png b/retroshare-gui/src/gui/emojione/1F629.png index e19301fe4..878b2c8aa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F629.png and b/retroshare-gui/src/gui/emojione/1F629.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62A.png b/retroshare-gui/src/gui/emojione/1F62A.png index 971e2cef2..51ad47890 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62A.png and b/retroshare-gui/src/gui/emojione/1F62A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62B.png b/retroshare-gui/src/gui/emojione/1F62B.png index 2c7035333..94ee300a4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62B.png and b/retroshare-gui/src/gui/emojione/1F62B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62C.png b/retroshare-gui/src/gui/emojione/1F62C.png index 5636fc1f0..b112ddee5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62C.png and b/retroshare-gui/src/gui/emojione/1F62C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62D.png b/retroshare-gui/src/gui/emojione/1F62D.png index a4b823699..2abd626f8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62D.png and b/retroshare-gui/src/gui/emojione/1F62D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62E.png b/retroshare-gui/src/gui/emojione/1F62E.png index 02f3f4d60..6f0198ed2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62E.png and b/retroshare-gui/src/gui/emojione/1F62E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F62F.png b/retroshare-gui/src/gui/emojione/1F62F.png index 45f31a6b9..10718bc92 100644 Binary files a/retroshare-gui/src/gui/emojione/1F62F.png and b/retroshare-gui/src/gui/emojione/1F62F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F630.png b/retroshare-gui/src/gui/emojione/1F630.png index 3fbd940ac..01c540576 100644 Binary files a/retroshare-gui/src/gui/emojione/1F630.png and b/retroshare-gui/src/gui/emojione/1F630.png differ diff --git a/retroshare-gui/src/gui/emojione/1F631.png b/retroshare-gui/src/gui/emojione/1F631.png index ff354229b..fee206ef5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F631.png and b/retroshare-gui/src/gui/emojione/1F631.png differ diff --git a/retroshare-gui/src/gui/emojione/1F632.png b/retroshare-gui/src/gui/emojione/1F632.png index d8ca952ba..4b5b6e516 100644 Binary files a/retroshare-gui/src/gui/emojione/1F632.png and b/retroshare-gui/src/gui/emojione/1F632.png differ diff --git a/retroshare-gui/src/gui/emojione/1F633.png b/retroshare-gui/src/gui/emojione/1F633.png index 90ec4caa6..130c795fd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F633.png and b/retroshare-gui/src/gui/emojione/1F633.png differ diff --git a/retroshare-gui/src/gui/emojione/1F634.png b/retroshare-gui/src/gui/emojione/1F634.png index 5f7cba9af..6d3bcdd86 100644 Binary files a/retroshare-gui/src/gui/emojione/1F634.png and b/retroshare-gui/src/gui/emojione/1F634.png differ diff --git a/retroshare-gui/src/gui/emojione/1F635.png b/retroshare-gui/src/gui/emojione/1F635.png index ab0fe5156..c2714165f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F635.png and b/retroshare-gui/src/gui/emojione/1F635.png differ diff --git a/retroshare-gui/src/gui/emojione/1F636.png b/retroshare-gui/src/gui/emojione/1F636.png index 0a4da5721..8818d9d5c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F636.png and b/retroshare-gui/src/gui/emojione/1F636.png differ diff --git a/retroshare-gui/src/gui/emojione/1F637.png b/retroshare-gui/src/gui/emojione/1F637.png index 641912a0f..b87f2b9cd 100644 Binary files a/retroshare-gui/src/gui/emojione/1F637.png and b/retroshare-gui/src/gui/emojione/1F637.png differ diff --git a/retroshare-gui/src/gui/emojione/1F638.png b/retroshare-gui/src/gui/emojione/1F638.png index 1e3057f46..a54785b4f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F638.png and b/retroshare-gui/src/gui/emojione/1F638.png differ diff --git a/retroshare-gui/src/gui/emojione/1F639.png b/retroshare-gui/src/gui/emojione/1F639.png index a05a81d96..459d81e27 100644 Binary files a/retroshare-gui/src/gui/emojione/1F639.png and b/retroshare-gui/src/gui/emojione/1F639.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63A.png b/retroshare-gui/src/gui/emojione/1F63A.png index 02a529a69..5413b14f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63A.png and b/retroshare-gui/src/gui/emojione/1F63A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63B.png b/retroshare-gui/src/gui/emojione/1F63B.png index e84d043b6..9bf719e09 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63B.png and b/retroshare-gui/src/gui/emojione/1F63B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63C.png b/retroshare-gui/src/gui/emojione/1F63C.png index 18ae5c543..f84030222 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63C.png and b/retroshare-gui/src/gui/emojione/1F63C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63D.png b/retroshare-gui/src/gui/emojione/1F63D.png index 4a092ceab..9bcf43800 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63D.png and b/retroshare-gui/src/gui/emojione/1F63D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63E.png b/retroshare-gui/src/gui/emojione/1F63E.png index ead7d7409..9c15fdefe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63E.png and b/retroshare-gui/src/gui/emojione/1F63E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F63F.png b/retroshare-gui/src/gui/emojione/1F63F.png index 066c5d2d4..ae18b844f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F63F.png and b/retroshare-gui/src/gui/emojione/1F63F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F640.png b/retroshare-gui/src/gui/emojione/1F640.png index e6c518753..25b4d9b6f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F640.png and b/retroshare-gui/src/gui/emojione/1F640.png differ diff --git a/retroshare-gui/src/gui/emojione/1F641.png b/retroshare-gui/src/gui/emojione/1F641.png index 0ad74508d..ccb33f21c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F641.png and b/retroshare-gui/src/gui/emojione/1F641.png differ diff --git a/retroshare-gui/src/gui/emojione/1F642.png b/retroshare-gui/src/gui/emojione/1F642.png index be5202461..5c84740cb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F642.png and b/retroshare-gui/src/gui/emojione/1F642.png differ diff --git a/retroshare-gui/src/gui/emojione/1F645.png b/retroshare-gui/src/gui/emojione/1F645.png index 985f8b51e..002d881fb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F645.png and b/retroshare-gui/src/gui/emojione/1F645.png differ diff --git a/retroshare-gui/src/gui/emojione/1F646.png b/retroshare-gui/src/gui/emojione/1F646.png index bd7996a61..cf0d6ef5b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F646.png and b/retroshare-gui/src/gui/emojione/1F646.png differ diff --git a/retroshare-gui/src/gui/emojione/1F647.png b/retroshare-gui/src/gui/emojione/1F647.png index 4e405e290..84d16f9e4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F647.png and b/retroshare-gui/src/gui/emojione/1F647.png differ diff --git a/retroshare-gui/src/gui/emojione/1F648.png b/retroshare-gui/src/gui/emojione/1F648.png index 5350abd06..e0910cdfe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F648.png and b/retroshare-gui/src/gui/emojione/1F648.png differ diff --git a/retroshare-gui/src/gui/emojione/1F649.png b/retroshare-gui/src/gui/emojione/1F649.png index e0a3b87ac..aa594883d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F649.png and b/retroshare-gui/src/gui/emojione/1F649.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64A.png b/retroshare-gui/src/gui/emojione/1F64A.png index f4512226c..870dcfce8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64A.png and b/retroshare-gui/src/gui/emojione/1F64A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64B.png b/retroshare-gui/src/gui/emojione/1F64B.png index a0f035bb9..fc7397f08 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64B.png and b/retroshare-gui/src/gui/emojione/1F64B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64C.png b/retroshare-gui/src/gui/emojione/1F64C.png index 747626670..b6f1d2271 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64C.png and b/retroshare-gui/src/gui/emojione/1F64C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64D.png b/retroshare-gui/src/gui/emojione/1F64D.png index 945a86d5e..6e8be1507 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64D.png and b/retroshare-gui/src/gui/emojione/1F64D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64E.png b/retroshare-gui/src/gui/emojione/1F64E.png index be2274bf2..bf6ac62e5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64E.png and b/retroshare-gui/src/gui/emojione/1F64E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F64F.png b/retroshare-gui/src/gui/emojione/1F64F.png index 6cf5b142c..994e5013f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F64F.png and b/retroshare-gui/src/gui/emojione/1F64F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F680.png b/retroshare-gui/src/gui/emojione/1F680.png index 69e31cc36..17dcb9e40 100644 Binary files a/retroshare-gui/src/gui/emojione/1F680.png and b/retroshare-gui/src/gui/emojione/1F680.png differ diff --git a/retroshare-gui/src/gui/emojione/1F681.png b/retroshare-gui/src/gui/emojione/1F681.png index aca107a62..b59f74f63 100644 Binary files a/retroshare-gui/src/gui/emojione/1F681.png and b/retroshare-gui/src/gui/emojione/1F681.png differ diff --git a/retroshare-gui/src/gui/emojione/1F682.png b/retroshare-gui/src/gui/emojione/1F682.png index 1e28f1236..7838ce3db 100644 Binary files a/retroshare-gui/src/gui/emojione/1F682.png and b/retroshare-gui/src/gui/emojione/1F682.png differ diff --git a/retroshare-gui/src/gui/emojione/1F683.png b/retroshare-gui/src/gui/emojione/1F683.png index 82abbcd86..1f5add266 100644 Binary files a/retroshare-gui/src/gui/emojione/1F683.png and b/retroshare-gui/src/gui/emojione/1F683.png differ diff --git a/retroshare-gui/src/gui/emojione/1F684.png b/retroshare-gui/src/gui/emojione/1F684.png index addd11484..e9b1ad97a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F684.png and b/retroshare-gui/src/gui/emojione/1F684.png differ diff --git a/retroshare-gui/src/gui/emojione/1F685.png b/retroshare-gui/src/gui/emojione/1F685.png index 45705f092..f7eb1f7c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F685.png and b/retroshare-gui/src/gui/emojione/1F685.png differ diff --git a/retroshare-gui/src/gui/emojione/1F686.png b/retroshare-gui/src/gui/emojione/1F686.png index c93e812a9..48157fdde 100644 Binary files a/retroshare-gui/src/gui/emojione/1F686.png and b/retroshare-gui/src/gui/emojione/1F686.png differ diff --git a/retroshare-gui/src/gui/emojione/1F687.png b/retroshare-gui/src/gui/emojione/1F687.png index 8a4154280..6e4d1281e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F687.png and b/retroshare-gui/src/gui/emojione/1F687.png differ diff --git a/retroshare-gui/src/gui/emojione/1F688.png b/retroshare-gui/src/gui/emojione/1F688.png index c2c3f5d39..fa5dea9fe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F688.png and b/retroshare-gui/src/gui/emojione/1F688.png differ diff --git a/retroshare-gui/src/gui/emojione/1F689.png b/retroshare-gui/src/gui/emojione/1F689.png index a4c74dda7..670b4c69e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F689.png and b/retroshare-gui/src/gui/emojione/1F689.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68A.png b/retroshare-gui/src/gui/emojione/1F68A.png index b4b94728a..f78fb1864 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68A.png and b/retroshare-gui/src/gui/emojione/1F68A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68B.png b/retroshare-gui/src/gui/emojione/1F68B.png index 6ce43289a..6630b0448 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68B.png and b/retroshare-gui/src/gui/emojione/1F68B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68C.png b/retroshare-gui/src/gui/emojione/1F68C.png index 5b4599912..946132838 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68C.png and b/retroshare-gui/src/gui/emojione/1F68C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68D.png b/retroshare-gui/src/gui/emojione/1F68D.png index e2dbcb059..4b6b0e57c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68D.png and b/retroshare-gui/src/gui/emojione/1F68D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68E.png b/retroshare-gui/src/gui/emojione/1F68E.png index 708f8ea83..77f04fc87 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68E.png and b/retroshare-gui/src/gui/emojione/1F68E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F68F.png b/retroshare-gui/src/gui/emojione/1F68F.png index eb31ed035..f4c61eab3 100644 Binary files a/retroshare-gui/src/gui/emojione/1F68F.png and b/retroshare-gui/src/gui/emojione/1F68F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F690.png b/retroshare-gui/src/gui/emojione/1F690.png index 11f94ac36..f1d7b88b8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F690.png and b/retroshare-gui/src/gui/emojione/1F690.png differ diff --git a/retroshare-gui/src/gui/emojione/1F691.png b/retroshare-gui/src/gui/emojione/1F691.png index b893d1392..4a6994855 100644 Binary files a/retroshare-gui/src/gui/emojione/1F691.png and b/retroshare-gui/src/gui/emojione/1F691.png differ diff --git a/retroshare-gui/src/gui/emojione/1F692.png b/retroshare-gui/src/gui/emojione/1F692.png index df44fead7..36fbbecc5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F692.png and b/retroshare-gui/src/gui/emojione/1F692.png differ diff --git a/retroshare-gui/src/gui/emojione/1F693.png b/retroshare-gui/src/gui/emojione/1F693.png index a093145c9..77df41104 100644 Binary files a/retroshare-gui/src/gui/emojione/1F693.png and b/retroshare-gui/src/gui/emojione/1F693.png differ diff --git a/retroshare-gui/src/gui/emojione/1F694.png b/retroshare-gui/src/gui/emojione/1F694.png index ae3be2788..e10dc9b45 100644 Binary files a/retroshare-gui/src/gui/emojione/1F694.png and b/retroshare-gui/src/gui/emojione/1F694.png differ diff --git a/retroshare-gui/src/gui/emojione/1F695.png b/retroshare-gui/src/gui/emojione/1F695.png index 42c47caa7..f5e55118b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F695.png and b/retroshare-gui/src/gui/emojione/1F695.png differ diff --git a/retroshare-gui/src/gui/emojione/1F696.png b/retroshare-gui/src/gui/emojione/1F696.png index 0a0789162..e26ae9f1a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F696.png and b/retroshare-gui/src/gui/emojione/1F696.png differ diff --git a/retroshare-gui/src/gui/emojione/1F697.png b/retroshare-gui/src/gui/emojione/1F697.png index 2165979bb..ce7222ec4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F697.png and b/retroshare-gui/src/gui/emojione/1F697.png differ diff --git a/retroshare-gui/src/gui/emojione/1F698.png b/retroshare-gui/src/gui/emojione/1F698.png index 667cfedf2..e1bcf95e4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F698.png and b/retroshare-gui/src/gui/emojione/1F698.png differ diff --git a/retroshare-gui/src/gui/emojione/1F699.png b/retroshare-gui/src/gui/emojione/1F699.png index c6a826934..f0ca2c0ce 100644 Binary files a/retroshare-gui/src/gui/emojione/1F699.png and b/retroshare-gui/src/gui/emojione/1F699.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69A.png b/retroshare-gui/src/gui/emojione/1F69A.png index 8d4db10ec..485e30e41 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69A.png and b/retroshare-gui/src/gui/emojione/1F69A.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69B.png b/retroshare-gui/src/gui/emojione/1F69B.png index a26de88cd..7c4792927 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69B.png and b/retroshare-gui/src/gui/emojione/1F69B.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69C.png b/retroshare-gui/src/gui/emojione/1F69C.png index fa3287cf0..671e523fe 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69C.png and b/retroshare-gui/src/gui/emojione/1F69C.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69D.png b/retroshare-gui/src/gui/emojione/1F69D.png index 08e8e081b..ce05f828d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69D.png and b/retroshare-gui/src/gui/emojione/1F69D.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69E.png b/retroshare-gui/src/gui/emojione/1F69E.png index 8a6c3477e..537d9a39d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69E.png and b/retroshare-gui/src/gui/emojione/1F69E.png differ diff --git a/retroshare-gui/src/gui/emojione/1F69F.png b/retroshare-gui/src/gui/emojione/1F69F.png index 5f6f227f3..eca42e056 100644 Binary files a/retroshare-gui/src/gui/emojione/1F69F.png and b/retroshare-gui/src/gui/emojione/1F69F.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A0.png b/retroshare-gui/src/gui/emojione/1F6A0.png index e71e5e826..4f0d9cc3a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A0.png and b/retroshare-gui/src/gui/emojione/1F6A0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A1.png b/retroshare-gui/src/gui/emojione/1F6A1.png index 339af06b0..bccfedd90 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A1.png and b/retroshare-gui/src/gui/emojione/1F6A1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A2.png b/retroshare-gui/src/gui/emojione/1F6A2.png index 2954fdd7d..a95540a04 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A2.png and b/retroshare-gui/src/gui/emojione/1F6A2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A3.png b/retroshare-gui/src/gui/emojione/1F6A3.png index eae8a91c7..28b9f3faa 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A3.png and b/retroshare-gui/src/gui/emojione/1F6A3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A4.png b/retroshare-gui/src/gui/emojione/1F6A4.png index deb5cc670..e0540c903 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A4.png and b/retroshare-gui/src/gui/emojione/1F6A4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A5.png b/retroshare-gui/src/gui/emojione/1F6A5.png index 6e9de4113..c8f21176f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A5.png and b/retroshare-gui/src/gui/emojione/1F6A5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A6.png b/retroshare-gui/src/gui/emojione/1F6A6.png index d7be114a1..50acd0c9c 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A6.png and b/retroshare-gui/src/gui/emojione/1F6A6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A7.png b/retroshare-gui/src/gui/emojione/1F6A7.png index 1cad8e762..f2d780d40 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A7.png and b/retroshare-gui/src/gui/emojione/1F6A7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A8.png b/retroshare-gui/src/gui/emojione/1F6A8.png index ad2c93dc5..72af3ab6d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A8.png and b/retroshare-gui/src/gui/emojione/1F6A8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6A9.png b/retroshare-gui/src/gui/emojione/1F6A9.png index cc30cca3b..9d671fd30 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6A9.png and b/retroshare-gui/src/gui/emojione/1F6A9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AA.png b/retroshare-gui/src/gui/emojione/1F6AA.png index 878ac5527..84656e383 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AA.png and b/retroshare-gui/src/gui/emojione/1F6AA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AB.png b/retroshare-gui/src/gui/emojione/1F6AB.png index 6d41e4312..f84ef0809 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AB.png and b/retroshare-gui/src/gui/emojione/1F6AB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AC.png b/retroshare-gui/src/gui/emojione/1F6AC.png index 486f611fa..09368915e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AC.png and b/retroshare-gui/src/gui/emojione/1F6AC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AD.png b/retroshare-gui/src/gui/emojione/1F6AD.png index a11b8051f..ca221da5d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AD.png and b/retroshare-gui/src/gui/emojione/1F6AD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AE.png b/retroshare-gui/src/gui/emojione/1F6AE.png index 854dbdcae..a6ee6e7f8 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AE.png and b/retroshare-gui/src/gui/emojione/1F6AE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6AF.png b/retroshare-gui/src/gui/emojione/1F6AF.png index 3a79be0ad..83cfb8fc4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6AF.png and b/retroshare-gui/src/gui/emojione/1F6AF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B0.png b/retroshare-gui/src/gui/emojione/1F6B0.png index a5a091604..2c6972798 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B0.png and b/retroshare-gui/src/gui/emojione/1F6B0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B1.png b/retroshare-gui/src/gui/emojione/1F6B1.png index 9d9249945..063515b59 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B1.png and b/retroshare-gui/src/gui/emojione/1F6B1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B2.png b/retroshare-gui/src/gui/emojione/1F6B2.png index f7c177c19..2d3586129 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B2.png and b/retroshare-gui/src/gui/emojione/1F6B2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B3.png b/retroshare-gui/src/gui/emojione/1F6B3.png index 7a82268ae..953705696 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B3.png and b/retroshare-gui/src/gui/emojione/1F6B3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B4.png b/retroshare-gui/src/gui/emojione/1F6B4.png index 5966fc333..eacf7a62f 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B4.png and b/retroshare-gui/src/gui/emojione/1F6B4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B5.png b/retroshare-gui/src/gui/emojione/1F6B5.png index 435a75dc1..bf256560b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B5.png and b/retroshare-gui/src/gui/emojione/1F6B5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B6.png b/retroshare-gui/src/gui/emojione/1F6B6.png index e2fceed7c..a4f9bbc43 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B6.png and b/retroshare-gui/src/gui/emojione/1F6B6.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B7.png b/retroshare-gui/src/gui/emojione/1F6B7.png index 8df85ea1d..d84658a31 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B7.png and b/retroshare-gui/src/gui/emojione/1F6B7.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B8.png b/retroshare-gui/src/gui/emojione/1F6B8.png index 0a2d89de1..072a611eb 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B8.png and b/retroshare-gui/src/gui/emojione/1F6B8.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6B9.png b/retroshare-gui/src/gui/emojione/1F6B9.png index 85be8289b..7a0782b4a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6B9.png and b/retroshare-gui/src/gui/emojione/1F6B9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BA.png b/retroshare-gui/src/gui/emojione/1F6BA.png index 670942409..d9cfb1451 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BA.png and b/retroshare-gui/src/gui/emojione/1F6BA.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BB.png b/retroshare-gui/src/gui/emojione/1F6BB.png index 96c3a1fde..071f1b5e1 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BB.png and b/retroshare-gui/src/gui/emojione/1F6BB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BC.png b/retroshare-gui/src/gui/emojione/1F6BC.png index 75b8d375d..f31362cb5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BC.png and b/retroshare-gui/src/gui/emojione/1F6BC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BD.png b/retroshare-gui/src/gui/emojione/1F6BD.png index 9726156d2..357a52025 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BD.png and b/retroshare-gui/src/gui/emojione/1F6BD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BE.png b/retroshare-gui/src/gui/emojione/1F6BE.png index d2ad2225f..7d432db1e 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BE.png and b/retroshare-gui/src/gui/emojione/1F6BE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6BF.png b/retroshare-gui/src/gui/emojione/1F6BF.png index 4977fab4e..23e3f9b10 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6BF.png and b/retroshare-gui/src/gui/emojione/1F6BF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C0.png b/retroshare-gui/src/gui/emojione/1F6C0.png index 8aa3f6b0e..5f20c3c94 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C0.png and b/retroshare-gui/src/gui/emojione/1F6C0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C1.png b/retroshare-gui/src/gui/emojione/1F6C1.png index 248efcee7..beefbe74b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C1.png and b/retroshare-gui/src/gui/emojione/1F6C1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C2.png b/retroshare-gui/src/gui/emojione/1F6C2.png index 9d81a7540..cc1479b57 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C2.png and b/retroshare-gui/src/gui/emojione/1F6C2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C3.png b/retroshare-gui/src/gui/emojione/1F6C3.png index d748ea456..c4302cd18 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C3.png and b/retroshare-gui/src/gui/emojione/1F6C3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C4.png b/retroshare-gui/src/gui/emojione/1F6C4.png index 3df984aef..9f8879643 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C4.png and b/retroshare-gui/src/gui/emojione/1F6C4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6C5.png b/retroshare-gui/src/gui/emojione/1F6C5.png index 0fffcfea3..ae79c37df 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6C5.png and b/retroshare-gui/src/gui/emojione/1F6C5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6CB.png b/retroshare-gui/src/gui/emojione/1F6CB.png index fb2f5157d..6510d50c5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6CB.png and b/retroshare-gui/src/gui/emojione/1F6CB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6CC.png b/retroshare-gui/src/gui/emojione/1F6CC.png index 2b3886e89..280da1cd5 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6CC.png and b/retroshare-gui/src/gui/emojione/1F6CC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6CD.png b/retroshare-gui/src/gui/emojione/1F6CD.png index a9de77242..d7fcbe65a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6CD.png and b/retroshare-gui/src/gui/emojione/1F6CD.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6CE.png b/retroshare-gui/src/gui/emojione/1F6CE.png index 3a9cad3e0..d36aa6dd2 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6CE.png and b/retroshare-gui/src/gui/emojione/1F6CE.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6CF.png b/retroshare-gui/src/gui/emojione/1F6CF.png index 2ee28edcb..2864269f4 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6CF.png and b/retroshare-gui/src/gui/emojione/1F6CF.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E0.png b/retroshare-gui/src/gui/emojione/1F6E0.png index d0cb8b672..ada4846b7 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E0.png and b/retroshare-gui/src/gui/emojione/1F6E0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E1.png b/retroshare-gui/src/gui/emojione/1F6E1.png index 0d25a31aa..568ead120 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E1.png and b/retroshare-gui/src/gui/emojione/1F6E1.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E2.png b/retroshare-gui/src/gui/emojione/1F6E2.png index 8dd8bd996..1c8721c17 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E2.png and b/retroshare-gui/src/gui/emojione/1F6E2.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E3.png b/retroshare-gui/src/gui/emojione/1F6E3.png index 6156044c2..509f81cce 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E3.png and b/retroshare-gui/src/gui/emojione/1F6E3.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E4.png b/retroshare-gui/src/gui/emojione/1F6E4.png index 1957fc8b3..079e69005 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E4.png and b/retroshare-gui/src/gui/emojione/1F6E4.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E5.png b/retroshare-gui/src/gui/emojione/1F6E5.png index cfb624c8e..e1531f92a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E5.png and b/retroshare-gui/src/gui/emojione/1F6E5.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6E9.png b/retroshare-gui/src/gui/emojione/1F6E9.png index 3baf8928e..5cba94bde 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6E9.png and b/retroshare-gui/src/gui/emojione/1F6E9.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6EB.png b/retroshare-gui/src/gui/emojione/1F6EB.png index 13ad7f9ee..bedf3a21b 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6EB.png and b/retroshare-gui/src/gui/emojione/1F6EB.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6EC.png b/retroshare-gui/src/gui/emojione/1F6EC.png index 0df413a55..4bcaaae6a 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6EC.png and b/retroshare-gui/src/gui/emojione/1F6EC.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6F0.png b/retroshare-gui/src/gui/emojione/1F6F0.png index 61fc8a4c5..6e5f8ef69 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6F0.png and b/retroshare-gui/src/gui/emojione/1F6F0.png differ diff --git a/retroshare-gui/src/gui/emojione/1F6F3.png b/retroshare-gui/src/gui/emojione/1F6F3.png index b292cfd07..6dc87435d 100644 Binary files a/retroshare-gui/src/gui/emojione/1F6F3.png and b/retroshare-gui/src/gui/emojione/1F6F3.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e6-1f1f6.png b/retroshare-gui/src/gui/emojione/1f1e6-1f1f6.png index 650d6b54a..8e6553fc0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e6-1f1f6.png and b/retroshare-gui/src/gui/emojione/1f1e6-1f1f6.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e6-1f1f8.png b/retroshare-gui/src/gui/emojione/1f1e6-1f1f8.png index 7a70bf965..9ea1249d1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e6-1f1f8.png and b/retroshare-gui/src/gui/emojione/1f1e6-1f1f8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e6-1f1fd.png b/retroshare-gui/src/gui/emojione/1f1e6-1f1fd.png index fd2737d06..d041eaa64 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e6-1f1fd.png and b/retroshare-gui/src/gui/emojione/1f1e6-1f1fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e7-1f1f1.png b/retroshare-gui/src/gui/emojione/1f1e7-1f1f1.png index 598662e84..a7863016a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e7-1f1f1.png and b/retroshare-gui/src/gui/emojione/1f1e7-1f1f1.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e7-1f1f6.png b/retroshare-gui/src/gui/emojione/1f1e7-1f1f6.png index e69a8bfc3..470bf2e5b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e7-1f1f6.png and b/retroshare-gui/src/gui/emojione/1f1e7-1f1f6.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e7-1f1fb.png b/retroshare-gui/src/gui/emojione/1f1e7-1f1fb.png index 7b02ebf17..1fbc262c9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e7-1f1fb.png and b/retroshare-gui/src/gui/emojione/1f1e7-1f1fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e8-1f1e8.png b/retroshare-gui/src/gui/emojione/1f1e8-1f1e8.png index 6dd0f91ca..d005ed7de 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e8-1f1e8.png and b/retroshare-gui/src/gui/emojione/1f1e8-1f1e8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e8-1f1f0.png b/retroshare-gui/src/gui/emojione/1f1e8-1f1f0.png index c64eed352..134d4aa85 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e8-1f1f0.png and b/retroshare-gui/src/gui/emojione/1f1e8-1f1f0.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e8-1f1f5.png b/retroshare-gui/src/gui/emojione/1f1e8-1f1f5.png index 7ee75aac2..ea5a8a395 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e8-1f1f5.png and b/retroshare-gui/src/gui/emojione/1f1e8-1f1f5.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e8-1f1fc.png b/retroshare-gui/src/gui/emojione/1f1e8-1f1fc.png index 031eac1a6..18b90045d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e8-1f1fc.png and b/retroshare-gui/src/gui/emojione/1f1e8-1f1fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e8-1f1fd.png b/retroshare-gui/src/gui/emojione/1f1e8-1f1fd.png index 407074f28..c29ce4858 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e8-1f1fd.png and b/retroshare-gui/src/gui/emojione/1f1e8-1f1fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1e9-1f1ec.png b/retroshare-gui/src/gui/emojione/1f1e9-1f1ec.png index 3313c918d..8ec0f641b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1e9-1f1ec.png and b/retroshare-gui/src/gui/emojione/1f1e9-1f1ec.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ea-1f1e6.png b/retroshare-gui/src/gui/emojione/1f1ea-1f1e6.png index acc6f17f3..fa030a513 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ea-1f1e6.png and b/retroshare-gui/src/gui/emojione/1f1ea-1f1e6.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ea-1f1fa.png b/retroshare-gui/src/gui/emojione/1f1ea-1f1fa.png index 4e7cd8eca..cc90a1aea 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ea-1f1fa.png and b/retroshare-gui/src/gui/emojione/1f1ea-1f1fa.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ec-1f1eb.png b/retroshare-gui/src/gui/emojione/1f1ec-1f1eb.png index 0e9da86ce..48b0ac026 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ec-1f1eb.png and b/retroshare-gui/src/gui/emojione/1f1ec-1f1eb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ec-1f1ec.png b/retroshare-gui/src/gui/emojione/1f1ec-1f1ec.png index c5c2bbf90..992ff2131 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ec-1f1ec.png and b/retroshare-gui/src/gui/emojione/1f1ec-1f1ec.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ec-1f1f5.png b/retroshare-gui/src/gui/emojione/1f1ec-1f1f5.png index 35ff3def7..678172d29 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ec-1f1f5.png and b/retroshare-gui/src/gui/emojione/1f1ec-1f1f5.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ec-1f1f8.png b/retroshare-gui/src/gui/emojione/1f1ec-1f1f8.png index 6615c0f13..5e908efac 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ec-1f1f8.png and b/retroshare-gui/src/gui/emojione/1f1ec-1f1f8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ed-1f1f2.png b/retroshare-gui/src/gui/emojione/1f1ed-1f1f2.png index b19efd45f..8e8942260 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ed-1f1f2.png and b/retroshare-gui/src/gui/emojione/1f1ed-1f1f2.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ee-1f1e8.png b/retroshare-gui/src/gui/emojione/1f1ee-1f1e8.png index 46f16f4fb..277b7b482 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ee-1f1e8.png and b/retroshare-gui/src/gui/emojione/1f1ee-1f1e8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ee-1f1f2.png b/retroshare-gui/src/gui/emojione/1f1ee-1f1f2.png index 27f23f01a..8a5e11695 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ee-1f1f2.png and b/retroshare-gui/src/gui/emojione/1f1ee-1f1f2.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1ee-1f1f4.png b/retroshare-gui/src/gui/emojione/1f1ee-1f1f4.png index 3313c918d..e372af562 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1ee-1f1f4.png and b/retroshare-gui/src/gui/emojione/1f1ee-1f1f4.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f2-1f1eb.png b/retroshare-gui/src/gui/emojione/1f1f2-1f1eb.png index 7ee75aac2..ea5a8a395 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f2-1f1eb.png and b/retroshare-gui/src/gui/emojione/1f1f2-1f1eb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f2-1f1f5.png b/retroshare-gui/src/gui/emojione/1f1f2-1f1f5.png index a3393d687..b396bf458 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f2-1f1f5.png and b/retroshare-gui/src/gui/emojione/1f1f2-1f1f5.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f2-1f1f6.png b/retroshare-gui/src/gui/emojione/1f1f2-1f1f6.png index cf527cd8c..fdd048205 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f2-1f1f6.png and b/retroshare-gui/src/gui/emojione/1f1f2-1f1f6.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f3-1f1eb.png b/retroshare-gui/src/gui/emojione/1f1f3-1f1eb.png index 79b821dbc..bd705aa0f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f3-1f1eb.png and b/retroshare-gui/src/gui/emojione/1f1f3-1f1eb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f5-1f1f2.png b/retroshare-gui/src/gui/emojione/1f1f5-1f1f2.png index ee6ab9887..01699031f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f5-1f1f2.png and b/retroshare-gui/src/gui/emojione/1f1f5-1f1f2.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f5-1f1f3.png b/retroshare-gui/src/gui/emojione/1f1f5-1f1f3.png index 83840f70d..5b96c928b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f5-1f1f3.png and b/retroshare-gui/src/gui/emojione/1f1f5-1f1f3.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f7-1f1ea.png b/retroshare-gui/src/gui/emojione/1f1f7-1f1ea.png index c8a298659..61ee51dd0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f7-1f1ea.png and b/retroshare-gui/src/gui/emojione/1f1f7-1f1ea.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f8-1f1ef.png b/retroshare-gui/src/gui/emojione/1f1f8-1f1ef.png index ddf1810c5..1fbc262c9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f8-1f1ef.png and b/retroshare-gui/src/gui/emojione/1f1f8-1f1ef.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f8-1f1f8.png b/retroshare-gui/src/gui/emojione/1f1f8-1f1f8.png index e72daa95d..2a6e363f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f8-1f1f8.png and b/retroshare-gui/src/gui/emojione/1f1f8-1f1f8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f8-1f1fd.png b/retroshare-gui/src/gui/emojione/1f1f8-1f1fd.png index 1a7a35b59..f7694d68b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f8-1f1fd.png and b/retroshare-gui/src/gui/emojione/1f1f8-1f1fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f9-1f1e6.png b/retroshare-gui/src/gui/emojione/1f1f9-1f1e6.png index bfeff756f..29999b9d1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f9-1f1e6.png and b/retroshare-gui/src/gui/emojione/1f1f9-1f1e6.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f9-1f1e8.png b/retroshare-gui/src/gui/emojione/1f1f9-1f1e8.png index d2eb0d400..0ded8d326 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f9-1f1e8.png and b/retroshare-gui/src/gui/emojione/1f1f9-1f1e8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f9-1f1eb.png b/retroshare-gui/src/gui/emojione/1f1f9-1f1eb.png index df6d25947..44558e628 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f9-1f1eb.png and b/retroshare-gui/src/gui/emojione/1f1f9-1f1eb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1f9-1f1f0.png b/retroshare-gui/src/gui/emojione/1f1f9-1f1f0.png index 43020303e..11dd4883e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1f9-1f1f0.png and b/retroshare-gui/src/gui/emojione/1f1f9-1f1f0.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1fa-1f1f2.png b/retroshare-gui/src/gui/emojione/1f1fa-1f1f2.png index a47d96d0a..439296c1e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1fa-1f1f2.png and b/retroshare-gui/src/gui/emojione/1f1fa-1f1f2.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1fb-1f1ec.png b/retroshare-gui/src/gui/emojione/1f1fb-1f1ec.png index 58a00576b..a4a2133b0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1fb-1f1ec.png and b/retroshare-gui/src/gui/emojione/1f1fb-1f1ec.png differ diff --git a/retroshare-gui/src/gui/emojione/1f1fe-1f1f9.png b/retroshare-gui/src/gui/emojione/1f1fe-1f1f9.png index c67d79845..a6e7d020e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f1fe-1f1f9.png and b/retroshare-gui/src/gui/emojione/1f1fe-1f1f9.png differ diff --git a/retroshare-gui/src/gui/emojione/1f324.png b/retroshare-gui/src/gui/emojione/1f324.png index 0de48d93e..f9706ae3a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f324.png and b/retroshare-gui/src/gui/emojione/1f324.png differ diff --git a/retroshare-gui/src/gui/emojione/1f325.png b/retroshare-gui/src/gui/emojione/1f325.png index 57590cbc7..da3ae5a09 100644 Binary files a/retroshare-gui/src/gui/emojione/1f325.png and b/retroshare-gui/src/gui/emojione/1f325.png differ diff --git a/retroshare-gui/src/gui/emojione/1f326.png b/retroshare-gui/src/gui/emojione/1f326.png index 0b76c3dd0..003bf5337 100644 Binary files a/retroshare-gui/src/gui/emojione/1f326.png and b/retroshare-gui/src/gui/emojione/1f326.png differ diff --git a/retroshare-gui/src/gui/emojione/1f32d.png b/retroshare-gui/src/gui/emojione/1f32d.png index 989ad1342..0201b0716 100644 Binary files a/retroshare-gui/src/gui/emojione/1f32d.png and b/retroshare-gui/src/gui/emojione/1f32d.png differ diff --git a/retroshare-gui/src/gui/emojione/1f32e.png b/retroshare-gui/src/gui/emojione/1f32e.png index 38a2c0436..6464ec9e9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f32e.png and b/retroshare-gui/src/gui/emojione/1f32e.png differ diff --git a/retroshare-gui/src/gui/emojione/1f32f.png b/retroshare-gui/src/gui/emojione/1f32f.png index 64235b6fb..35003f6c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f32f.png and b/retroshare-gui/src/gui/emojione/1f32f.png differ diff --git a/retroshare-gui/src/gui/emojione/1f37e.png b/retroshare-gui/src/gui/emojione/1f37e.png index fba4fe465..fd37389d1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f37e.png and b/retroshare-gui/src/gui/emojione/1f37e.png differ diff --git a/retroshare-gui/src/gui/emojione/1f37f.png b/retroshare-gui/src/gui/emojione/1f37f.png index 6ce3ab720..07388fb85 100644 Binary files a/retroshare-gui/src/gui/emojione/1f37f.png and b/retroshare-gui/src/gui/emojione/1f37f.png differ diff --git a/retroshare-gui/src/gui/emojione/1f385-1f3fb.png b/retroshare-gui/src/gui/emojione/1f385-1f3fb.png index b9787fad2..6fe707dbf 100644 Binary files a/retroshare-gui/src/gui/emojione/1f385-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f385-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f385-1f3fc.png b/retroshare-gui/src/gui/emojione/1f385-1f3fc.png index 0632e486d..4f851380a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f385-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f385-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f385-1f3fd.png b/retroshare-gui/src/gui/emojione/1f385-1f3fd.png index a5d8e584a..57fe3e86f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f385-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f385-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f385-1f3fe.png b/retroshare-gui/src/gui/emojione/1f385-1f3fe.png index dce030f66..fad2a2376 100644 Binary files a/retroshare-gui/src/gui/emojione/1f385-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f385-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f385-1f3ff.png b/retroshare-gui/src/gui/emojione/1f385-1f3ff.png index ad691e443..0a1fffc7c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f385-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f385-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c3-1f3fb.png b/retroshare-gui/src/gui/emojione/1f3c3-1f3fb.png index 85b999403..ab80d481a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c3-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3c3-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c3-1f3fc.png b/retroshare-gui/src/gui/emojione/1f3c3-1f3fc.png index 421c3ae18..b3f5c8839 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c3-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3c3-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c3-1f3fd.png b/retroshare-gui/src/gui/emojione/1f3c3-1f3fd.png index 7f48586e7..0a1363950 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c3-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3c3-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c3-1f3fe.png b/retroshare-gui/src/gui/emojione/1f3c3-1f3fe.png index 0f07bd8b8..eaebc589e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c3-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3c3-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c3-1f3ff.png b/retroshare-gui/src/gui/emojione/1f3c3-1f3ff.png index edc634b60..c17e94d15 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c3-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3c3-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c4-1f3fb.png b/retroshare-gui/src/gui/emojione/1f3c4-1f3fb.png index 823565950..8526e2c5a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c4-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3c4-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c4-1f3fc.png b/retroshare-gui/src/gui/emojione/1f3c4-1f3fc.png index 50a041a11..86954a73e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c4-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3c4-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c4-1f3fd.png b/retroshare-gui/src/gui/emojione/1f3c4-1f3fd.png index f1f40afe9..a64ee1b60 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c4-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3c4-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c4-1f3fe.png b/retroshare-gui/src/gui/emojione/1f3c4-1f3fe.png index cdc80fab2..affcc4b20 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c4-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3c4-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c4-1f3ff.png b/retroshare-gui/src/gui/emojione/1f3c4-1f3ff.png index 213811bcf..ec3d28fcc 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c4-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3c4-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c7-1f3fb.png b/retroshare-gui/src/gui/emojione/1f3c7-1f3fb.png index 073957d2e..c421635be 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c7-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3c7-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c7-1f3fc.png b/retroshare-gui/src/gui/emojione/1f3c7-1f3fc.png index daed3558d..952bc31d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c7-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3c7-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c7-1f3fd.png b/retroshare-gui/src/gui/emojione/1f3c7-1f3fd.png index 88a45646d..ffceeee9d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c7-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3c7-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c7-1f3fe.png b/retroshare-gui/src/gui/emojione/1f3c7-1f3fe.png index 3be2e642a..452a95a2e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c7-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3c7-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3c7-1f3ff.png b/retroshare-gui/src/gui/emojione/1f3c7-1f3ff.png index d59ae677e..9774e356c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3c7-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3c7-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ca-1f3fb.png b/retroshare-gui/src/gui/emojione/1f3ca-1f3fb.png index d92536dd5..4e20f1d94 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ca-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3ca-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ca-1f3fc.png b/retroshare-gui/src/gui/emojione/1f3ca-1f3fc.png index 39e9400f0..11dee6b01 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ca-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3ca-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ca-1f3fd.png b/retroshare-gui/src/gui/emojione/1f3ca-1f3fd.png index 9d61f60b4..d9c89a80c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ca-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3ca-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ca-1f3fe.png b/retroshare-gui/src/gui/emojione/1f3ca-1f3fe.png index f5f1c5176..338c1e2d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ca-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3ca-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ca-1f3ff.png b/retroshare-gui/src/gui/emojione/1f3ca-1f3ff.png index ce0463658..610b184a9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ca-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3ca-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cb-1f3fb.png b/retroshare-gui/src/gui/emojione/1f3cb-1f3fb.png index 50b95afdf..291fda53a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cb-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3cb-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cb-1f3fc.png b/retroshare-gui/src/gui/emojione/1f3cb-1f3fc.png index d1c5105d0..1ff534357 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cb-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3cb-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cb-1f3fd.png b/retroshare-gui/src/gui/emojione/1f3cb-1f3fd.png index a8c16425c..6e2083b51 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cb-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3cb-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cb-1f3fe.png b/retroshare-gui/src/gui/emojione/1f3cb-1f3fe.png index 0ce274d9f..7c7cc12f6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cb-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3cb-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cb-1f3ff.png b/retroshare-gui/src/gui/emojione/1f3cb-1f3ff.png index 8f099ba11..182024ab4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cb-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3cb-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3cf.png b/retroshare-gui/src/gui/emojione/1f3cf.png index a08535b68..14c018a00 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3cf.png and b/retroshare-gui/src/gui/emojione/1f3cf.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3d0.png b/retroshare-gui/src/gui/emojione/1f3d0.png index 809964213..646b4314b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3d0.png and b/retroshare-gui/src/gui/emojione/1f3d0.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3d1.png b/retroshare-gui/src/gui/emojione/1f3d1.png index fa53a3b45..b7e26eca2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3d1.png and b/retroshare-gui/src/gui/emojione/1f3d1.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3d2.png b/retroshare-gui/src/gui/emojione/1f3d2.png index b76f02415..1a117ca38 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3d2.png and b/retroshare-gui/src/gui/emojione/1f3d2.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3d3.png b/retroshare-gui/src/gui/emojione/1f3d3.png index c9591e268..dea4cc075 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3d3.png and b/retroshare-gui/src/gui/emojione/1f3d3.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3f8.png b/retroshare-gui/src/gui/emojione/1f3f8.png index 0425b0e81..204bc3efe 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3f8.png and b/retroshare-gui/src/gui/emojione/1f3f8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3f9.png b/retroshare-gui/src/gui/emojione/1f3f9.png index 149f31f1b..20192336d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3f9.png and b/retroshare-gui/src/gui/emojione/1f3f9.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3fa.png b/retroshare-gui/src/gui/emojione/1f3fa.png index c3bf52cbf..69c7dbd21 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3fa.png and b/retroshare-gui/src/gui/emojione/1f3fa.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3fb.png b/retroshare-gui/src/gui/emojione/1f3fb.png index afd5cf8d4..d7d157361 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3fb.png and b/retroshare-gui/src/gui/emojione/1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3fc.png b/retroshare-gui/src/gui/emojione/1f3fc.png index 1cd30c8d6..e232b991b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3fc.png and b/retroshare-gui/src/gui/emojione/1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3fd.png b/retroshare-gui/src/gui/emojione/1f3fd.png index 8cadef08e..6c4eda97f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3fd.png and b/retroshare-gui/src/gui/emojione/1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3fe.png b/retroshare-gui/src/gui/emojione/1f3fe.png index 2b714c5fb..555c74649 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3fe.png and b/retroshare-gui/src/gui/emojione/1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f3ff.png b/retroshare-gui/src/gui/emojione/1f3ff.png index 3fb467273..865729e3a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f3ff.png and b/retroshare-gui/src/gui/emojione/1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f441-1f5e8.png b/retroshare-gui/src/gui/emojione/1f441-1f5e8.png index 78ffe1bb8..17897b36d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f441-1f5e8.png and b/retroshare-gui/src/gui/emojione/1f441-1f5e8.png differ diff --git a/retroshare-gui/src/gui/emojione/1f442-1f3fb.png b/retroshare-gui/src/gui/emojione/1f442-1f3fb.png index 0fd292b22..b2263ff30 100644 Binary files a/retroshare-gui/src/gui/emojione/1f442-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f442-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f442-1f3fc.png b/retroshare-gui/src/gui/emojione/1f442-1f3fc.png index ce87db740..b06d064c2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f442-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f442-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f442-1f3fd.png b/retroshare-gui/src/gui/emojione/1f442-1f3fd.png index bb08429c1..380c3a56d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f442-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f442-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f442-1f3fe.png b/retroshare-gui/src/gui/emojione/1f442-1f3fe.png index 157604326..81d2a14ce 100644 Binary files a/retroshare-gui/src/gui/emojione/1f442-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f442-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f442-1f3ff.png b/retroshare-gui/src/gui/emojione/1f442-1f3ff.png index 73afe06ec..75059391f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f442-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f442-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f443-1f3fb.png b/retroshare-gui/src/gui/emojione/1f443-1f3fb.png index 084fea009..2cc942d18 100644 Binary files a/retroshare-gui/src/gui/emojione/1f443-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f443-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f443-1f3fc.png b/retroshare-gui/src/gui/emojione/1f443-1f3fc.png index 4d5021da4..0fd45846c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f443-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f443-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f443-1f3fd.png b/retroshare-gui/src/gui/emojione/1f443-1f3fd.png index 296dde779..ad9a92367 100644 Binary files a/retroshare-gui/src/gui/emojione/1f443-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f443-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f443-1f3fe.png b/retroshare-gui/src/gui/emojione/1f443-1f3fe.png index 04100e7e5..8ed141c82 100644 Binary files a/retroshare-gui/src/gui/emojione/1f443-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f443-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f443-1f3ff.png b/retroshare-gui/src/gui/emojione/1f443-1f3ff.png index 0bbc96b1d..9d91e1d75 100644 Binary files a/retroshare-gui/src/gui/emojione/1f443-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f443-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f446-1f3fb.png b/retroshare-gui/src/gui/emojione/1f446-1f3fb.png index b50c0eb56..2f9202bf4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f446-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f446-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f446-1f3fc.png b/retroshare-gui/src/gui/emojione/1f446-1f3fc.png index fbc340007..d56d5a5a5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f446-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f446-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f446-1f3fd.png b/retroshare-gui/src/gui/emojione/1f446-1f3fd.png index 1668d2e4a..da932ef51 100644 Binary files a/retroshare-gui/src/gui/emojione/1f446-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f446-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f446-1f3fe.png b/retroshare-gui/src/gui/emojione/1f446-1f3fe.png index e28d399a6..5d1603ef7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f446-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f446-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f446-1f3ff.png b/retroshare-gui/src/gui/emojione/1f446-1f3ff.png index 2f443a4fb..b6ecb218d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f446-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f446-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f447-1f3fb.png b/retroshare-gui/src/gui/emojione/1f447-1f3fb.png index 3eec5d751..d8154701d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f447-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f447-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f447-1f3fc.png b/retroshare-gui/src/gui/emojione/1f447-1f3fc.png index 5a4f6a67e..6197c7333 100644 Binary files a/retroshare-gui/src/gui/emojione/1f447-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f447-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f447-1f3fd.png b/retroshare-gui/src/gui/emojione/1f447-1f3fd.png index ae9168fc3..a9e970172 100644 Binary files a/retroshare-gui/src/gui/emojione/1f447-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f447-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f447-1f3fe.png b/retroshare-gui/src/gui/emojione/1f447-1f3fe.png index 5b2b8ed8f..7dd8b5b8e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f447-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f447-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f447-1f3ff.png b/retroshare-gui/src/gui/emojione/1f447-1f3ff.png index cc09f7fd8..5d20ad3be 100644 Binary files a/retroshare-gui/src/gui/emojione/1f447-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f447-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f448-1f3fb.png b/retroshare-gui/src/gui/emojione/1f448-1f3fb.png index 5f2b0f564..cf7b5b96c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f448-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f448-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f448-1f3fc.png b/retroshare-gui/src/gui/emojione/1f448-1f3fc.png index 1c115c419..32c60b78d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f448-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f448-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f448-1f3fd.png b/retroshare-gui/src/gui/emojione/1f448-1f3fd.png index e399dd49a..3e5f0a15a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f448-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f448-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f448-1f3fe.png b/retroshare-gui/src/gui/emojione/1f448-1f3fe.png index 689f33eb6..1f7ca2edb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f448-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f448-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f448-1f3ff.png b/retroshare-gui/src/gui/emojione/1f448-1f3ff.png index 29a193828..2a7a66efa 100644 Binary files a/retroshare-gui/src/gui/emojione/1f448-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f448-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f449-1f3fb.png b/retroshare-gui/src/gui/emojione/1f449-1f3fb.png index f4171a27d..2b11c1848 100644 Binary files a/retroshare-gui/src/gui/emojione/1f449-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f449-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f449-1f3fc.png b/retroshare-gui/src/gui/emojione/1f449-1f3fc.png index b8614edfe..0ad9f8ffa 100644 Binary files a/retroshare-gui/src/gui/emojione/1f449-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f449-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f449-1f3fd.png b/retroshare-gui/src/gui/emojione/1f449-1f3fd.png index 38c953a86..9baae109c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f449-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f449-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f449-1f3fe.png b/retroshare-gui/src/gui/emojione/1f449-1f3fe.png index d84cccd4a..60647582c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f449-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f449-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f449-1f3ff.png b/retroshare-gui/src/gui/emojione/1f449-1f3ff.png index 578bad164..fb42a7ae4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f449-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f449-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44a-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44a-1f3fb.png index 34a8b498c..632c32693 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44a-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44a-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44a-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44a-1f3fc.png index e47bd04eb..b2b321ae8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44a-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44a-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44a-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44a-1f3fd.png index ae954aa88..4e3fd72a6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44a-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44a-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44a-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44a-1f3fe.png index 43c001354..7d560fff8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44a-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44a-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44a-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44a-1f3ff.png index b50e7ff74..536993f9c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44a-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44a-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44b-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44b-1f3fb.png index d9e029c42..5a2f14c0c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44b-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44b-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44b-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44b-1f3fc.png index 1e01924c4..4fea2c9a7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44b-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44b-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44b-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44b-1f3fd.png index 584d2a3fa..a01a7935a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44b-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44b-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44b-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44b-1f3fe.png index ba2e67095..944c5602d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44b-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44b-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44b-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44b-1f3ff.png index e71596644..db34e30d6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44b-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44b-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44c-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44c-1f3fb.png index 9f31aecc0..eaf44cb54 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44c-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44c-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44c-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44c-1f3fc.png index dd9b9c6f0..963202afb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44c-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44c-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44c-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44c-1f3fd.png index cf8840946..86ee6f23d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44c-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44c-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44c-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44c-1f3fe.png index b0039f11f..e2a3f8ab7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44c-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44c-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44c-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44c-1f3ff.png index 78493d109..e0a9af360 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44c-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44c-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44d-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44d-1f3fb.png index 2d1957a5f..42c64923c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44d-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44d-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44d-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44d-1f3fc.png index 0599f643d..b26e1bb12 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44d-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44d-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44d-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44d-1f3fd.png index 22fa70da8..678c53a20 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44d-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44d-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44d-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44d-1f3fe.png index 8eec989fa..6cc810b56 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44d-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44d-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44d-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44d-1f3ff.png index 9a0f6b9d1..ff8fefb38 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44d-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44d-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44e-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44e-1f3fb.png index e4e72a2b1..1ce65b0da 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44e-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44e-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44e-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44e-1f3fc.png index f0f43fd7a..9bd23c316 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44e-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44e-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44e-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44e-1f3fd.png index 4e31f49f1..11e08842c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44e-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44e-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44e-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44e-1f3fe.png index adc3231db..08ba6954b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44e-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44e-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44e-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44e-1f3ff.png index 6e2866819..fcb61b3c5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44e-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44e-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44f-1f3fb.png b/retroshare-gui/src/gui/emojione/1f44f-1f3fb.png index 385f9377f..9d389ea91 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44f-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f44f-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44f-1f3fc.png b/retroshare-gui/src/gui/emojione/1f44f-1f3fc.png index 5d1f2f33e..5b59d3c7d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44f-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f44f-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44f-1f3fd.png b/retroshare-gui/src/gui/emojione/1f44f-1f3fd.png index 9a6a1aca0..71a68ecba 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44f-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f44f-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44f-1f3fe.png b/retroshare-gui/src/gui/emojione/1f44f-1f3fe.png index 645cdc607..a47b714f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44f-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f44f-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f44f-1f3ff.png b/retroshare-gui/src/gui/emojione/1f44f-1f3ff.png index e134edbbc..0753e6a35 100644 Binary files a/retroshare-gui/src/gui/emojione/1f44f-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f44f-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f450-1f3fb.png b/retroshare-gui/src/gui/emojione/1f450-1f3fb.png index eb57a4792..cf0e5edc2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f450-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f450-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f450-1f3fc.png b/retroshare-gui/src/gui/emojione/1f450-1f3fc.png index f46510b8f..d26bafe1b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f450-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f450-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f450-1f3fd.png b/retroshare-gui/src/gui/emojione/1f450-1f3fd.png index 508aa23b9..a81c91cbf 100644 Binary files a/retroshare-gui/src/gui/emojione/1f450-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f450-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f450-1f3fe.png b/retroshare-gui/src/gui/emojione/1f450-1f3fe.png index 39ca833c6..b4a3ac571 100644 Binary files a/retroshare-gui/src/gui/emojione/1f450-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f450-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f450-1f3ff.png b/retroshare-gui/src/gui/emojione/1f450-1f3ff.png index 4bce65064..7366cf3a4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f450-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f450-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f466-1f3fb.png b/retroshare-gui/src/gui/emojione/1f466-1f3fb.png index af558330f..89e039b6e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f466-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f466-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f466-1f3fc.png b/retroshare-gui/src/gui/emojione/1f466-1f3fc.png index ba056d8c8..5dc7e5118 100644 Binary files a/retroshare-gui/src/gui/emojione/1f466-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f466-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f466-1f3fd.png b/retroshare-gui/src/gui/emojione/1f466-1f3fd.png index 832aa023c..2c05864c0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f466-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f466-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f466-1f3fe.png b/retroshare-gui/src/gui/emojione/1f466-1f3fe.png index 8e2d1ff2a..6ff14a216 100644 Binary files a/retroshare-gui/src/gui/emojione/1f466-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f466-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f466-1f3ff.png b/retroshare-gui/src/gui/emojione/1f466-1f3ff.png index ef18e7388..1bc65f69d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f466-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f466-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f467-1f3fb.png b/retroshare-gui/src/gui/emojione/1f467-1f3fb.png index 1bfeb45b1..09b82624a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f467-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f467-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f467-1f3fc.png b/retroshare-gui/src/gui/emojione/1f467-1f3fc.png index 8424a6710..3e7507496 100644 Binary files a/retroshare-gui/src/gui/emojione/1f467-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f467-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f467-1f3fd.png b/retroshare-gui/src/gui/emojione/1f467-1f3fd.png index 4e88722ed..8ffbf76d8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f467-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f467-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f467-1f3fe.png b/retroshare-gui/src/gui/emojione/1f467-1f3fe.png index 1f088fbef..34779a803 100644 Binary files a/retroshare-gui/src/gui/emojione/1f467-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f467-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f467-1f3ff.png b/retroshare-gui/src/gui/emojione/1f467-1f3ff.png index bf06d0ef8..c54140e00 100644 Binary files a/retroshare-gui/src/gui/emojione/1f467-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f467-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f468-1f3fb.png b/retroshare-gui/src/gui/emojione/1f468-1f3fb.png index 1bb616a23..f01fd18bd 100644 Binary files a/retroshare-gui/src/gui/emojione/1f468-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f468-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f468-1f3fc.png b/retroshare-gui/src/gui/emojione/1f468-1f3fc.png index 5a61f4bf2..0e5ac13c6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f468-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f468-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f468-1f3fd.png b/retroshare-gui/src/gui/emojione/1f468-1f3fd.png index 3548165a1..f50326c64 100644 Binary files a/retroshare-gui/src/gui/emojione/1f468-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f468-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f468-1f3fe.png b/retroshare-gui/src/gui/emojione/1f468-1f3fe.png index 5402eb9fe..ef2d26186 100644 Binary files a/retroshare-gui/src/gui/emojione/1f468-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f468-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f468-1f3ff.png b/retroshare-gui/src/gui/emojione/1f468-1f3ff.png index f62e003f5..e38926021 100644 Binary files a/retroshare-gui/src/gui/emojione/1f468-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f468-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f469-1f3fb.png b/retroshare-gui/src/gui/emojione/1f469-1f3fb.png index 0da933b26..9d212d661 100644 Binary files a/retroshare-gui/src/gui/emojione/1f469-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f469-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f469-1f3fc.png b/retroshare-gui/src/gui/emojione/1f469-1f3fc.png index 12e885ada..2c0c9c134 100644 Binary files a/retroshare-gui/src/gui/emojione/1f469-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f469-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f469-1f3fd.png b/retroshare-gui/src/gui/emojione/1f469-1f3fd.png index 38262f4f4..efaa19e98 100644 Binary files a/retroshare-gui/src/gui/emojione/1f469-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f469-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f469-1f3fe.png b/retroshare-gui/src/gui/emojione/1f469-1f3fe.png index 7dc115348..527367067 100644 Binary files a/retroshare-gui/src/gui/emojione/1f469-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f469-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f469-1f3ff.png b/retroshare-gui/src/gui/emojione/1f469-1f3ff.png index fd7d6c441..920e3ff2e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f469-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f469-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f46e-1f3fb.png b/retroshare-gui/src/gui/emojione/1f46e-1f3fb.png index cb0d78cb2..eb5450b5e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f46e-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f46e-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f46e-1f3fc.png b/retroshare-gui/src/gui/emojione/1f46e-1f3fc.png index 8e05cab22..080f332ed 100644 Binary files a/retroshare-gui/src/gui/emojione/1f46e-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f46e-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f46e-1f3fd.png b/retroshare-gui/src/gui/emojione/1f46e-1f3fd.png index c30208935..833063d03 100644 Binary files a/retroshare-gui/src/gui/emojione/1f46e-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f46e-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f46e-1f3fe.png b/retroshare-gui/src/gui/emojione/1f46e-1f3fe.png index 3c1f21081..77505612c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f46e-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f46e-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f46e-1f3ff.png b/retroshare-gui/src/gui/emojione/1f46e-1f3ff.png index 1664be362..ac562114d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f46e-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f46e-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f470-1f3fb.png b/retroshare-gui/src/gui/emojione/1f470-1f3fb.png index 950c6f73f..092ab6423 100644 Binary files a/retroshare-gui/src/gui/emojione/1f470-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f470-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f470-1f3fc.png b/retroshare-gui/src/gui/emojione/1f470-1f3fc.png index 55edb0fa7..a76ac05db 100644 Binary files a/retroshare-gui/src/gui/emojione/1f470-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f470-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f470-1f3fd.png b/retroshare-gui/src/gui/emojione/1f470-1f3fd.png index fed217d9b..a9bf26d94 100644 Binary files a/retroshare-gui/src/gui/emojione/1f470-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f470-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f470-1f3fe.png b/retroshare-gui/src/gui/emojione/1f470-1f3fe.png index 45ce943ce..6ea9306b4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f470-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f470-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f470-1f3ff.png b/retroshare-gui/src/gui/emojione/1f470-1f3ff.png index bc400ff03..fbda1bb40 100644 Binary files a/retroshare-gui/src/gui/emojione/1f470-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f470-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f471-1f3fb.png b/retroshare-gui/src/gui/emojione/1f471-1f3fb.png index 29dd8a4c0..d4cd44a40 100644 Binary files a/retroshare-gui/src/gui/emojione/1f471-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f471-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f471-1f3fc.png b/retroshare-gui/src/gui/emojione/1f471-1f3fc.png index 09a8437eb..92ad5ea74 100644 Binary files a/retroshare-gui/src/gui/emojione/1f471-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f471-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f471-1f3fd.png b/retroshare-gui/src/gui/emojione/1f471-1f3fd.png index cb184c1d6..5dedf1ae3 100644 Binary files a/retroshare-gui/src/gui/emojione/1f471-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f471-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f471-1f3fe.png b/retroshare-gui/src/gui/emojione/1f471-1f3fe.png index 9f8c6407d..5c3dfa2bc 100644 Binary files a/retroshare-gui/src/gui/emojione/1f471-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f471-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f471-1f3ff.png b/retroshare-gui/src/gui/emojione/1f471-1f3ff.png index 01697ec19..c642da03c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f471-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f471-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f472-1f3fb.png b/retroshare-gui/src/gui/emojione/1f472-1f3fb.png index 3f6580016..96528b5b2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f472-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f472-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f472-1f3fc.png b/retroshare-gui/src/gui/emojione/1f472-1f3fc.png index 0ae64685c..651e9fbc5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f472-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f472-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f472-1f3fd.png b/retroshare-gui/src/gui/emojione/1f472-1f3fd.png index c4084306b..6af344861 100644 Binary files a/retroshare-gui/src/gui/emojione/1f472-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f472-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f472-1f3fe.png b/retroshare-gui/src/gui/emojione/1f472-1f3fe.png index 45df60b69..d7732a376 100644 Binary files a/retroshare-gui/src/gui/emojione/1f472-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f472-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f472-1f3ff.png b/retroshare-gui/src/gui/emojione/1f472-1f3ff.png index 5cc711c0c..f8c71c8e2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f472-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f472-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f473-1f3fb.png b/retroshare-gui/src/gui/emojione/1f473-1f3fb.png index 1b149818a..3dffa8826 100644 Binary files a/retroshare-gui/src/gui/emojione/1f473-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f473-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f473-1f3fc.png b/retroshare-gui/src/gui/emojione/1f473-1f3fc.png index ca9b87a1d..feac82858 100644 Binary files a/retroshare-gui/src/gui/emojione/1f473-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f473-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f473-1f3fd.png b/retroshare-gui/src/gui/emojione/1f473-1f3fd.png index 110ef10be..d41299064 100644 Binary files a/retroshare-gui/src/gui/emojione/1f473-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f473-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f473-1f3fe.png b/retroshare-gui/src/gui/emojione/1f473-1f3fe.png index a1d8c49a2..8af30d553 100644 Binary files a/retroshare-gui/src/gui/emojione/1f473-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f473-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f473-1f3ff.png b/retroshare-gui/src/gui/emojione/1f473-1f3ff.png index 75ec2a5c8..d342949ab 100644 Binary files a/retroshare-gui/src/gui/emojione/1f473-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f473-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f474-1f3fb.png b/retroshare-gui/src/gui/emojione/1f474-1f3fb.png index b0c1950f0..1b42608ff 100644 Binary files a/retroshare-gui/src/gui/emojione/1f474-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f474-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f474-1f3fc.png b/retroshare-gui/src/gui/emojione/1f474-1f3fc.png index a4d3a0294..ae328737c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f474-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f474-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f474-1f3fd.png b/retroshare-gui/src/gui/emojione/1f474-1f3fd.png index 1bf96dd2c..48ffb5ad7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f474-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f474-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f474-1f3fe.png b/retroshare-gui/src/gui/emojione/1f474-1f3fe.png index 56d8138a7..6c46d3a85 100644 Binary files a/retroshare-gui/src/gui/emojione/1f474-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f474-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f474-1f3ff.png b/retroshare-gui/src/gui/emojione/1f474-1f3ff.png index b0df5b4c7..d9abe6732 100644 Binary files a/retroshare-gui/src/gui/emojione/1f474-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f474-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f475-1f3fb.png b/retroshare-gui/src/gui/emojione/1f475-1f3fb.png index bcf419786..81d8c3bda 100644 Binary files a/retroshare-gui/src/gui/emojione/1f475-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f475-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f475-1f3fc.png b/retroshare-gui/src/gui/emojione/1f475-1f3fc.png index 9b6e88cb1..1e1a703d9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f475-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f475-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f475-1f3fd.png b/retroshare-gui/src/gui/emojione/1f475-1f3fd.png index 0229c6860..566e48332 100644 Binary files a/retroshare-gui/src/gui/emojione/1f475-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f475-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f475-1f3fe.png b/retroshare-gui/src/gui/emojione/1f475-1f3fe.png index 9e2635597..bb0f6ca6f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f475-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f475-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f475-1f3ff.png b/retroshare-gui/src/gui/emojione/1f475-1f3ff.png index ded578d0f..af54723ea 100644 Binary files a/retroshare-gui/src/gui/emojione/1f475-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f475-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f476-1f3fb.png b/retroshare-gui/src/gui/emojione/1f476-1f3fb.png index 0dcf363af..d3f1f0ecc 100644 Binary files a/retroshare-gui/src/gui/emojione/1f476-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f476-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f476-1f3fc.png b/retroshare-gui/src/gui/emojione/1f476-1f3fc.png index 78beb2d21..595fdb6c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f476-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f476-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f476-1f3fd.png b/retroshare-gui/src/gui/emojione/1f476-1f3fd.png index 3d6bbd4a3..d9b385990 100644 Binary files a/retroshare-gui/src/gui/emojione/1f476-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f476-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f476-1f3fe.png b/retroshare-gui/src/gui/emojione/1f476-1f3fe.png index 4748e5c10..d85e446ff 100644 Binary files a/retroshare-gui/src/gui/emojione/1f476-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f476-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f476-1f3ff.png b/retroshare-gui/src/gui/emojione/1f476-1f3ff.png index 138efbd4b..ff9f02101 100644 Binary files a/retroshare-gui/src/gui/emojione/1f476-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f476-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f477-1f3fb.png b/retroshare-gui/src/gui/emojione/1f477-1f3fb.png index dde79c6f6..d1a777285 100644 Binary files a/retroshare-gui/src/gui/emojione/1f477-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f477-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f477-1f3fc.png b/retroshare-gui/src/gui/emojione/1f477-1f3fc.png index eb8b81b30..cb194cd62 100644 Binary files a/retroshare-gui/src/gui/emojione/1f477-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f477-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f477-1f3fd.png b/retroshare-gui/src/gui/emojione/1f477-1f3fd.png index bed106d5c..2652c86c8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f477-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f477-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f477-1f3fe.png b/retroshare-gui/src/gui/emojione/1f477-1f3fe.png index f7b7d656b..abb256996 100644 Binary files a/retroshare-gui/src/gui/emojione/1f477-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f477-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f477-1f3ff.png b/retroshare-gui/src/gui/emojione/1f477-1f3ff.png index 75fa336a7..8657b6885 100644 Binary files a/retroshare-gui/src/gui/emojione/1f477-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f477-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f478-1f3fb.png b/retroshare-gui/src/gui/emojione/1f478-1f3fb.png index 0ad53b6be..b96de2562 100644 Binary files a/retroshare-gui/src/gui/emojione/1f478-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f478-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f478-1f3fc.png b/retroshare-gui/src/gui/emojione/1f478-1f3fc.png index dad125d8c..115f8dfc9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f478-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f478-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f478-1f3fd.png b/retroshare-gui/src/gui/emojione/1f478-1f3fd.png index 0aae1ea6a..4998de0d6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f478-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f478-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f478-1f3fe.png b/retroshare-gui/src/gui/emojione/1f478-1f3fe.png index 67061b782..ad220ecbe 100644 Binary files a/retroshare-gui/src/gui/emojione/1f478-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f478-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f478-1f3ff.png b/retroshare-gui/src/gui/emojione/1f478-1f3ff.png index 544a8e846..3b92455ac 100644 Binary files a/retroshare-gui/src/gui/emojione/1f478-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f478-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f47c-1f3fb.png b/retroshare-gui/src/gui/emojione/1f47c-1f3fb.png index 47a3afb9e..e86362658 100644 Binary files a/retroshare-gui/src/gui/emojione/1f47c-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f47c-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f47c-1f3fc.png b/retroshare-gui/src/gui/emojione/1f47c-1f3fc.png index 86a4b33fb..484c00cfd 100644 Binary files a/retroshare-gui/src/gui/emojione/1f47c-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f47c-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f47c-1f3fd.png b/retroshare-gui/src/gui/emojione/1f47c-1f3fd.png index 92b61242c..25eacd735 100644 Binary files a/retroshare-gui/src/gui/emojione/1f47c-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f47c-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f47c-1f3fe.png b/retroshare-gui/src/gui/emojione/1f47c-1f3fe.png index 4ba863637..545a780f4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f47c-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f47c-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f47c-1f3ff.png b/retroshare-gui/src/gui/emojione/1f47c-1f3ff.png index 1229b9a33..a746e8fd5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f47c-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f47c-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f481-1f3fb.png b/retroshare-gui/src/gui/emojione/1f481-1f3fb.png index 31823ef12..4749f47ca 100644 Binary files a/retroshare-gui/src/gui/emojione/1f481-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f481-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f481-1f3fc.png b/retroshare-gui/src/gui/emojione/1f481-1f3fc.png index cb71fde01..4901686ff 100644 Binary files a/retroshare-gui/src/gui/emojione/1f481-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f481-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f481-1f3fd.png b/retroshare-gui/src/gui/emojione/1f481-1f3fd.png index df9a7cc63..496708b30 100644 Binary files a/retroshare-gui/src/gui/emojione/1f481-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f481-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f481-1f3fe.png b/retroshare-gui/src/gui/emojione/1f481-1f3fe.png index 1d21f516f..d5c105d8c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f481-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f481-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f481-1f3ff.png b/retroshare-gui/src/gui/emojione/1f481-1f3ff.png index 8d440cbb4..3fb1de024 100644 Binary files a/retroshare-gui/src/gui/emojione/1f481-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f481-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f482-1f3fb.png b/retroshare-gui/src/gui/emojione/1f482-1f3fb.png index 8f620a261..711209233 100644 Binary files a/retroshare-gui/src/gui/emojione/1f482-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f482-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f482-1f3fc.png b/retroshare-gui/src/gui/emojione/1f482-1f3fc.png index 3ab5d8a4e..7b0db0c46 100644 Binary files a/retroshare-gui/src/gui/emojione/1f482-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f482-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f482-1f3fd.png b/retroshare-gui/src/gui/emojione/1f482-1f3fd.png index e1c8c755c..0cc06250f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f482-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f482-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f482-1f3fe.png b/retroshare-gui/src/gui/emojione/1f482-1f3fe.png index aa31e884c..e3c88b79e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f482-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f482-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f482-1f3ff.png b/retroshare-gui/src/gui/emojione/1f482-1f3ff.png index 95f065194..d7d11f9de 100644 Binary files a/retroshare-gui/src/gui/emojione/1f482-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f482-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f483-1f3fb.png b/retroshare-gui/src/gui/emojione/1f483-1f3fb.png index c7cf0f14a..fb19aa6f9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f483-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f483-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f483-1f3fc.png b/retroshare-gui/src/gui/emojione/1f483-1f3fc.png index d961b023b..e4444a47d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f483-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f483-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f483-1f3fd.png b/retroshare-gui/src/gui/emojione/1f483-1f3fd.png index 9047fa825..53e6d8a4c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f483-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f483-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f483-1f3fe.png b/retroshare-gui/src/gui/emojione/1f483-1f3fe.png index 0b82cb796..cd27e3615 100644 Binary files a/retroshare-gui/src/gui/emojione/1f483-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f483-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f483-1f3ff.png b/retroshare-gui/src/gui/emojione/1f483-1f3ff.png index ccb2ef918..c1093ad5e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f483-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f483-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f485-1f3fb.png b/retroshare-gui/src/gui/emojione/1f485-1f3fb.png index 95bcd8107..3686c0ac5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f485-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f485-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f485-1f3fc.png b/retroshare-gui/src/gui/emojione/1f485-1f3fc.png index eec081ddd..642e33d33 100644 Binary files a/retroshare-gui/src/gui/emojione/1f485-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f485-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f485-1f3fd.png b/retroshare-gui/src/gui/emojione/1f485-1f3fd.png index 31d80dc84..a280a0324 100644 Binary files a/retroshare-gui/src/gui/emojione/1f485-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f485-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f485-1f3fe.png b/retroshare-gui/src/gui/emojione/1f485-1f3fe.png index a9446d754..4da1ca35e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f485-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f485-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f485-1f3ff.png b/retroshare-gui/src/gui/emojione/1f485-1f3ff.png index 9245033f7..aeedd6f89 100644 Binary files a/retroshare-gui/src/gui/emojione/1f485-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f485-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f486-1f3fb.png b/retroshare-gui/src/gui/emojione/1f486-1f3fb.png index fc78cfd5c..2e8850809 100644 Binary files a/retroshare-gui/src/gui/emojione/1f486-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f486-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f486-1f3fc.png b/retroshare-gui/src/gui/emojione/1f486-1f3fc.png index a038498fb..0579dcf3a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f486-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f486-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f486-1f3fd.png b/retroshare-gui/src/gui/emojione/1f486-1f3fd.png index a1f0b41bb..a8b2ce09a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f486-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f486-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f486-1f3fe.png b/retroshare-gui/src/gui/emojione/1f486-1f3fe.png index f8b128a40..699606ae5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f486-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f486-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f486-1f3ff.png b/retroshare-gui/src/gui/emojione/1f486-1f3ff.png index 605c8f3b8..af0ccc391 100644 Binary files a/retroshare-gui/src/gui/emojione/1f486-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f486-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f487-1f3fb.png b/retroshare-gui/src/gui/emojione/1f487-1f3fb.png index 97fc245fc..363694ca0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f487-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f487-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f487-1f3fc.png b/retroshare-gui/src/gui/emojione/1f487-1f3fc.png index 5efa57189..562d27dd4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f487-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f487-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f487-1f3fd.png b/retroshare-gui/src/gui/emojione/1f487-1f3fd.png index 390bb8545..61e68ee49 100644 Binary files a/retroshare-gui/src/gui/emojione/1f487-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f487-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f487-1f3fe.png b/retroshare-gui/src/gui/emojione/1f487-1f3fe.png index 1587214e1..9eecb9c08 100644 Binary files a/retroshare-gui/src/gui/emojione/1f487-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f487-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f487-1f3ff.png b/retroshare-gui/src/gui/emojione/1f487-1f3ff.png index 0da63b371..190af6e7a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f487-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f487-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4aa-1f3fb.png b/retroshare-gui/src/gui/emojione/1f4aa-1f3fb.png index a0c533bf5..7b4fbbb2e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4aa-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f4aa-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4aa-1f3fc.png b/retroshare-gui/src/gui/emojione/1f4aa-1f3fc.png index 229dc03f8..dcf83016a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4aa-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f4aa-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4aa-1f3fd.png b/retroshare-gui/src/gui/emojione/1f4aa-1f3fd.png index f60b3ff21..8432b9a57 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4aa-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f4aa-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4aa-1f3fe.png b/retroshare-gui/src/gui/emojione/1f4aa-1f3fe.png index 1a2117972..9d06dfc3c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4aa-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f4aa-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4aa-1f3ff.png b/retroshare-gui/src/gui/emojione/1f4aa-1f3ff.png index c39e9ef82..747db1636 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4aa-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f4aa-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f4ff.png b/retroshare-gui/src/gui/emojione/1f4ff.png index 99bcd5792..7586eb89c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f4ff.png and b/retroshare-gui/src/gui/emojione/1f4ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f54b.png b/retroshare-gui/src/gui/emojione/1f54b.png index 3d10a7b52..aea3dc5f2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f54b.png and b/retroshare-gui/src/gui/emojione/1f54b.png differ diff --git a/retroshare-gui/src/gui/emojione/1f54c.png b/retroshare-gui/src/gui/emojione/1f54c.png index 2bbb6f8d3..0eeb43962 100644 Binary files a/retroshare-gui/src/gui/emojione/1f54c.png and b/retroshare-gui/src/gui/emojione/1f54c.png differ diff --git a/retroshare-gui/src/gui/emojione/1f54d.png b/retroshare-gui/src/gui/emojione/1f54d.png index 50d59968a..21872eeec 100644 Binary files a/retroshare-gui/src/gui/emojione/1f54d.png and b/retroshare-gui/src/gui/emojione/1f54d.png differ diff --git a/retroshare-gui/src/gui/emojione/1f54e.png b/retroshare-gui/src/gui/emojione/1f54e.png index 5c6e881d2..2c8634bbe 100644 Binary files a/retroshare-gui/src/gui/emojione/1f54e.png and b/retroshare-gui/src/gui/emojione/1f54e.png differ diff --git a/retroshare-gui/src/gui/emojione/1f575-1f3fb.png b/retroshare-gui/src/gui/emojione/1f575-1f3fb.png index b9af51ed9..3e0be9a86 100644 Binary files a/retroshare-gui/src/gui/emojione/1f575-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f575-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f575-1f3fc.png b/retroshare-gui/src/gui/emojione/1f575-1f3fc.png index e6ad4c804..179340467 100644 Binary files a/retroshare-gui/src/gui/emojione/1f575-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f575-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f575-1f3fd.png b/retroshare-gui/src/gui/emojione/1f575-1f3fd.png index 93501cfc4..74d134ba4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f575-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f575-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f575-1f3fe.png b/retroshare-gui/src/gui/emojione/1f575-1f3fe.png index ce159fef9..3f53317e6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f575-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f575-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f575-1f3ff.png b/retroshare-gui/src/gui/emojione/1f575-1f3ff.png index d8b680dfa..dad804ba7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f575-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f575-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f590-1f3fb.png b/retroshare-gui/src/gui/emojione/1f590-1f3fb.png index d8d1ab52b..44e5660a2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f590-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f590-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f590-1f3fc.png b/retroshare-gui/src/gui/emojione/1f590-1f3fc.png index 1350e8c5a..964f8252c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f590-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f590-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f590-1f3fd.png b/retroshare-gui/src/gui/emojione/1f590-1f3fd.png index 3bdd73509..37a5516a0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f590-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f590-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f590-1f3fe.png b/retroshare-gui/src/gui/emojione/1f590-1f3fe.png index 89011296e..745f40c1c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f590-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f590-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f590-1f3ff.png b/retroshare-gui/src/gui/emojione/1f590-1f3ff.png index cd084f6d0..2df751d63 100644 Binary files a/retroshare-gui/src/gui/emojione/1f590-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f590-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f595-1f3fb.png b/retroshare-gui/src/gui/emojione/1f595-1f3fb.png index 316d5e3c6..947faf252 100644 Binary files a/retroshare-gui/src/gui/emojione/1f595-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f595-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f595-1f3fc.png b/retroshare-gui/src/gui/emojione/1f595-1f3fc.png index 8cebd9be8..16bd64fa9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f595-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f595-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f595-1f3fd.png b/retroshare-gui/src/gui/emojione/1f595-1f3fd.png index 54358b357..3ae7c260d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f595-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f595-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f595-1f3fe.png b/retroshare-gui/src/gui/emojione/1f595-1f3fe.png index 65d51742c..329a021e7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f595-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f595-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f595-1f3ff.png b/retroshare-gui/src/gui/emojione/1f595-1f3ff.png index 107781e0b..5b25783bf 100644 Binary files a/retroshare-gui/src/gui/emojione/1f595-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f595-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f596-1f3fb.png b/retroshare-gui/src/gui/emojione/1f596-1f3fb.png index 192963e71..28ef24910 100644 Binary files a/retroshare-gui/src/gui/emojione/1f596-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f596-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f596-1f3fc.png b/retroshare-gui/src/gui/emojione/1f596-1f3fc.png index e228c2b2a..d52d7c94b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f596-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f596-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f596-1f3fd.png b/retroshare-gui/src/gui/emojione/1f596-1f3fd.png index c1c802f30..972297977 100644 Binary files a/retroshare-gui/src/gui/emojione/1f596-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f596-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f596-1f3fe.png b/retroshare-gui/src/gui/emojione/1f596-1f3fe.png index 59b7e0238..0911bfc52 100644 Binary files a/retroshare-gui/src/gui/emojione/1f596-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f596-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f596-1f3ff.png b/retroshare-gui/src/gui/emojione/1f596-1f3ff.png index 27c14d3db..5f8fb3a93 100644 Binary files a/retroshare-gui/src/gui/emojione/1f596-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f596-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f5b1.png b/retroshare-gui/src/gui/emojione/1f5b1.png index c464eddc9..1072fd70e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f5b1.png and b/retroshare-gui/src/gui/emojione/1f5b1.png differ diff --git a/retroshare-gui/src/gui/emojione/1f643.png b/retroshare-gui/src/gui/emojione/1f643.png index 0a539e9f6..829238f35 100644 Binary files a/retroshare-gui/src/gui/emojione/1f643.png and b/retroshare-gui/src/gui/emojione/1f643.png differ diff --git a/retroshare-gui/src/gui/emojione/1f644.png b/retroshare-gui/src/gui/emojione/1f644.png index 1ee0d05c2..8fc1cfb01 100644 Binary files a/retroshare-gui/src/gui/emojione/1f644.png and b/retroshare-gui/src/gui/emojione/1f644.png differ diff --git a/retroshare-gui/src/gui/emojione/1f645-1f3fb.png b/retroshare-gui/src/gui/emojione/1f645-1f3fb.png index 9f39db989..7ad04330d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f645-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f645-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f645-1f3fc.png b/retroshare-gui/src/gui/emojione/1f645-1f3fc.png index b7b47f4b9..b643e8080 100644 Binary files a/retroshare-gui/src/gui/emojione/1f645-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f645-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f645-1f3fd.png b/retroshare-gui/src/gui/emojione/1f645-1f3fd.png index a8e77106c..ab9d55a58 100644 Binary files a/retroshare-gui/src/gui/emojione/1f645-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f645-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f645-1f3fe.png b/retroshare-gui/src/gui/emojione/1f645-1f3fe.png index a85db4963..67735ddd4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f645-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f645-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f645-1f3ff.png b/retroshare-gui/src/gui/emojione/1f645-1f3ff.png index ef9af1515..f60bcb5d0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f645-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f645-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f646-1f3fb.png b/retroshare-gui/src/gui/emojione/1f646-1f3fb.png index 50d27bbf9..a2cb0dc67 100644 Binary files a/retroshare-gui/src/gui/emojione/1f646-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f646-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f646-1f3fc.png b/retroshare-gui/src/gui/emojione/1f646-1f3fc.png index 6612731e9..3767edf2e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f646-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f646-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f646-1f3fd.png b/retroshare-gui/src/gui/emojione/1f646-1f3fd.png index 527f72088..83da4473c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f646-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f646-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f646-1f3fe.png b/retroshare-gui/src/gui/emojione/1f646-1f3fe.png index 1be6637c2..8f77b1088 100644 Binary files a/retroshare-gui/src/gui/emojione/1f646-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f646-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f646-1f3ff.png b/retroshare-gui/src/gui/emojione/1f646-1f3ff.png index 9f49c610d..e5154ce82 100644 Binary files a/retroshare-gui/src/gui/emojione/1f646-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f646-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f647-1f3fb.png b/retroshare-gui/src/gui/emojione/1f647-1f3fb.png index 3e7b913cc..56f8a2046 100644 Binary files a/retroshare-gui/src/gui/emojione/1f647-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f647-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f647-1f3fc.png b/retroshare-gui/src/gui/emojione/1f647-1f3fc.png index e3c9e4414..6e6abf071 100644 Binary files a/retroshare-gui/src/gui/emojione/1f647-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f647-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f647-1f3fd.png b/retroshare-gui/src/gui/emojione/1f647-1f3fd.png index de7e0f867..ae07f5ae6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f647-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f647-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f647-1f3fe.png b/retroshare-gui/src/gui/emojione/1f647-1f3fe.png index bf03d4207..553109794 100644 Binary files a/retroshare-gui/src/gui/emojione/1f647-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f647-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f647-1f3ff.png b/retroshare-gui/src/gui/emojione/1f647-1f3ff.png index c35bc8cfb..272082ca8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f647-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f647-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64b-1f3fb.png b/retroshare-gui/src/gui/emojione/1f64b-1f3fb.png index 16a866942..9a91439ae 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64b-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f64b-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64b-1f3fc.png b/retroshare-gui/src/gui/emojione/1f64b-1f3fc.png index da29ad282..99e0f23ad 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64b-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f64b-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64b-1f3fd.png b/retroshare-gui/src/gui/emojione/1f64b-1f3fd.png index 3454a2423..ec963732d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64b-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f64b-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64b-1f3fe.png b/retroshare-gui/src/gui/emojione/1f64b-1f3fe.png index 35af6963c..5b4631ace 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64b-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f64b-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64b-1f3ff.png b/retroshare-gui/src/gui/emojione/1f64b-1f3ff.png index 36473557a..21a940a78 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64b-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f64b-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64c-1f3fb.png b/retroshare-gui/src/gui/emojione/1f64c-1f3fb.png index b25bdc944..8701582ce 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64c-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f64c-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64c-1f3fc.png b/retroshare-gui/src/gui/emojione/1f64c-1f3fc.png index 28124ded6..21f8bf886 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64c-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f64c-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64c-1f3fd.png b/retroshare-gui/src/gui/emojione/1f64c-1f3fd.png index 41f18db90..d795eb00b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64c-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f64c-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64c-1f3fe.png b/retroshare-gui/src/gui/emojione/1f64c-1f3fe.png index f3e8a31a8..4326aa565 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64c-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f64c-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64c-1f3ff.png b/retroshare-gui/src/gui/emojione/1f64c-1f3ff.png index 20d98f013..977d74c33 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64c-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f64c-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64d-1f3fb.png b/retroshare-gui/src/gui/emojione/1f64d-1f3fb.png index 8eb8e4570..6679fc2b8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64d-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f64d-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64d-1f3fc.png b/retroshare-gui/src/gui/emojione/1f64d-1f3fc.png index b467ceef6..c23775865 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64d-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f64d-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64d-1f3fd.png b/retroshare-gui/src/gui/emojione/1f64d-1f3fd.png index f2b1f03eb..ad162cc26 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64d-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f64d-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64d-1f3fe.png b/retroshare-gui/src/gui/emojione/1f64d-1f3fe.png index 1ca21a42d..443c88b9c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64d-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f64d-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64d-1f3ff.png b/retroshare-gui/src/gui/emojione/1f64d-1f3ff.png index 8d2c2b3a3..6c74a2c79 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64d-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f64d-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64e-1f3fb.png b/retroshare-gui/src/gui/emojione/1f64e-1f3fb.png index eed745e47..369ea658b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64e-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f64e-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64e-1f3fc.png b/retroshare-gui/src/gui/emojione/1f64e-1f3fc.png index 3f7507cb2..df6164282 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64e-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f64e-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64e-1f3fd.png b/retroshare-gui/src/gui/emojione/1f64e-1f3fd.png index dfa3dea4f..38c34ad05 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64e-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f64e-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64e-1f3fe.png b/retroshare-gui/src/gui/emojione/1f64e-1f3fe.png index b07caee90..0266dad0c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64e-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f64e-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64e-1f3ff.png b/retroshare-gui/src/gui/emojione/1f64e-1f3ff.png index e31bbdf48..b4de621f3 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64e-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f64e-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64f-1f3fb.png b/retroshare-gui/src/gui/emojione/1f64f-1f3fb.png index 6f0a66ba4..084771561 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64f-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f64f-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64f-1f3fc.png b/retroshare-gui/src/gui/emojione/1f64f-1f3fc.png index e187f2bd1..519b21b05 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64f-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f64f-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64f-1f3fd.png b/retroshare-gui/src/gui/emojione/1f64f-1f3fd.png index 1f925737b..11ffbd873 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64f-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f64f-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64f-1f3fe.png b/retroshare-gui/src/gui/emojione/1f64f-1f3fe.png index a879115e4..7a1ce5e14 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64f-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f64f-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f64f-1f3ff.png b/retroshare-gui/src/gui/emojione/1f64f-1f3ff.png index 97af94e1c..78f34b4bf 100644 Binary files a/retroshare-gui/src/gui/emojione/1f64f-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f64f-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6a3-1f3fb.png b/retroshare-gui/src/gui/emojione/1f6a3-1f3fb.png index c31583ba5..b1d579cd2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6a3-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f6a3-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6a3-1f3fc.png b/retroshare-gui/src/gui/emojione/1f6a3-1f3fc.png index 7157b4092..de0f63648 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6a3-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f6a3-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6a3-1f3fd.png b/retroshare-gui/src/gui/emojione/1f6a3-1f3fd.png index 8a91b0a74..1645d2c6c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6a3-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f6a3-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6a3-1f3fe.png b/retroshare-gui/src/gui/emojione/1f6a3-1f3fe.png index 27071035e..09b39a878 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6a3-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f6a3-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6a3-1f3ff.png b/retroshare-gui/src/gui/emojione/1f6a3-1f3ff.png index afc465e95..6f47c0441 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6a3-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f6a3-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b4-1f3fb.png b/retroshare-gui/src/gui/emojione/1f6b4-1f3fb.png index b53367a27..d059e743a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b4-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f6b4-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b4-1f3fc.png b/retroshare-gui/src/gui/emojione/1f6b4-1f3fc.png index 5e72b33c3..21527c5c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b4-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f6b4-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b4-1f3fd.png b/retroshare-gui/src/gui/emojione/1f6b4-1f3fd.png index 933736e9f..2c56f1dd8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b4-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f6b4-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b4-1f3fe.png b/retroshare-gui/src/gui/emojione/1f6b4-1f3fe.png index 420c91944..6b3632895 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b4-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f6b4-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b4-1f3ff.png b/retroshare-gui/src/gui/emojione/1f6b4-1f3ff.png index b6c540916..e24993c7d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b4-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f6b4-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b5-1f3fb.png b/retroshare-gui/src/gui/emojione/1f6b5-1f3fb.png index d7da9a33a..f1b5baabb 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b5-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f6b5-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b5-1f3fc.png b/retroshare-gui/src/gui/emojione/1f6b5-1f3fc.png index 3a679ce78..899c2d351 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b5-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f6b5-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b5-1f3fd.png b/retroshare-gui/src/gui/emojione/1f6b5-1f3fd.png index 1f9c07148..41bc08565 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b5-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f6b5-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b5-1f3fe.png b/retroshare-gui/src/gui/emojione/1f6b5-1f3fe.png index 1391b80ef..636ff9187 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b5-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f6b5-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b5-1f3ff.png b/retroshare-gui/src/gui/emojione/1f6b5-1f3ff.png index a1bef71d2..45486a163 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b5-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f6b5-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b6-1f3fb.png b/retroshare-gui/src/gui/emojione/1f6b6-1f3fb.png index 929f5cdd9..ffa9c1fe4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b6-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f6b6-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b6-1f3fc.png b/retroshare-gui/src/gui/emojione/1f6b6-1f3fc.png index 557dc5679..3c1540ca7 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b6-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f6b6-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b6-1f3fd.png b/retroshare-gui/src/gui/emojione/1f6b6-1f3fd.png index d56af53da..79fc73f5a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b6-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f6b6-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b6-1f3fe.png b/retroshare-gui/src/gui/emojione/1f6b6-1f3fe.png index ad570290a..b3167350f 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b6-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f6b6-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6b6-1f3ff.png b/retroshare-gui/src/gui/emojione/1f6b6-1f3ff.png index 678eebaf6..c41053017 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6b6-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f6b6-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6c0-1f3fb.png b/retroshare-gui/src/gui/emojione/1f6c0-1f3fb.png index 467acfacd..58f884490 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6c0-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f6c0-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6c0-1f3fc.png b/retroshare-gui/src/gui/emojione/1f6c0-1f3fc.png index 48d24e3ae..3308e63c0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6c0-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f6c0-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6c0-1f3fd.png b/retroshare-gui/src/gui/emojione/1f6c0-1f3fd.png index ba5163209..d172ccbd6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6c0-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f6c0-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6c0-1f3fe.png b/retroshare-gui/src/gui/emojione/1f6c0-1f3fe.png index 3330aaea1..f2ee3d9e8 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6c0-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f6c0-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6c0-1f3ff.png b/retroshare-gui/src/gui/emojione/1f6c0-1f3ff.png index ed971f9c1..2187e0bde 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6c0-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f6c0-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f6d0.png b/retroshare-gui/src/gui/emojione/1f6d0.png index d61ef3d5e..42a1c2736 100644 Binary files a/retroshare-gui/src/gui/emojione/1f6d0.png and b/retroshare-gui/src/gui/emojione/1f6d0.png differ diff --git a/retroshare-gui/src/gui/emojione/1f910.png b/retroshare-gui/src/gui/emojione/1f910.png index cca3804ca..d41053e4b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f910.png and b/retroshare-gui/src/gui/emojione/1f910.png differ diff --git a/retroshare-gui/src/gui/emojione/1f911.png b/retroshare-gui/src/gui/emojione/1f911.png index 0fdcb7351..58c4027d4 100644 Binary files a/retroshare-gui/src/gui/emojione/1f911.png and b/retroshare-gui/src/gui/emojione/1f911.png differ diff --git a/retroshare-gui/src/gui/emojione/1f912.png b/retroshare-gui/src/gui/emojione/1f912.png index b4329af21..981f2740a 100644 Binary files a/retroshare-gui/src/gui/emojione/1f912.png and b/retroshare-gui/src/gui/emojione/1f912.png differ diff --git a/retroshare-gui/src/gui/emojione/1f913.png b/retroshare-gui/src/gui/emojione/1f913.png index 5d0b6ddd6..61455324e 100644 Binary files a/retroshare-gui/src/gui/emojione/1f913.png and b/retroshare-gui/src/gui/emojione/1f913.png differ diff --git a/retroshare-gui/src/gui/emojione/1f914.png b/retroshare-gui/src/gui/emojione/1f914.png index 6c8a308f2..e5c1080bd 100644 Binary files a/retroshare-gui/src/gui/emojione/1f914.png and b/retroshare-gui/src/gui/emojione/1f914.png differ diff --git a/retroshare-gui/src/gui/emojione/1f915.png b/retroshare-gui/src/gui/emojione/1f915.png index c4901e840..fd656c8ad 100644 Binary files a/retroshare-gui/src/gui/emojione/1f915.png and b/retroshare-gui/src/gui/emojione/1f915.png differ diff --git a/retroshare-gui/src/gui/emojione/1f916.png b/retroshare-gui/src/gui/emojione/1f916.png index 83228abe4..991640f2d 100644 Binary files a/retroshare-gui/src/gui/emojione/1f916.png and b/retroshare-gui/src/gui/emojione/1f916.png differ diff --git a/retroshare-gui/src/gui/emojione/1f917.png b/retroshare-gui/src/gui/emojione/1f917.png index 41a8c9a8e..adfc3bde2 100644 Binary files a/retroshare-gui/src/gui/emojione/1f917.png and b/retroshare-gui/src/gui/emojione/1f917.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918-1f3fb.png b/retroshare-gui/src/gui/emojione/1f918-1f3fb.png index 53434b34b..4754441c1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918-1f3fb.png and b/retroshare-gui/src/gui/emojione/1f918-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918-1f3fc.png b/retroshare-gui/src/gui/emojione/1f918-1f3fc.png index be2e08222..60767eed5 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918-1f3fc.png and b/retroshare-gui/src/gui/emojione/1f918-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918-1f3fd.png b/retroshare-gui/src/gui/emojione/1f918-1f3fd.png index 74227cf71..1e4005405 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918-1f3fd.png and b/retroshare-gui/src/gui/emojione/1f918-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918-1f3fe.png b/retroshare-gui/src/gui/emojione/1f918-1f3fe.png index d02794df0..fadaa1fb6 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918-1f3fe.png and b/retroshare-gui/src/gui/emojione/1f918-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918-1f3ff.png b/retroshare-gui/src/gui/emojione/1f918-1f3ff.png index 68701b59e..17ed777e9 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918-1f3ff.png and b/retroshare-gui/src/gui/emojione/1f918-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/1f918.png b/retroshare-gui/src/gui/emojione/1f918.png index 0c01efb67..d385a34c0 100644 Binary files a/retroshare-gui/src/gui/emojione/1f918.png and b/retroshare-gui/src/gui/emojione/1f918.png differ diff --git a/retroshare-gui/src/gui/emojione/1f922.png b/retroshare-gui/src/gui/emojione/1f922.png new file mode 100644 index 000000000..740091587 Binary files /dev/null and b/retroshare-gui/src/gui/emojione/1f922.png differ diff --git a/retroshare-gui/src/gui/emojione/1f923.png b/retroshare-gui/src/gui/emojione/1f923.png new file mode 100644 index 000000000..38cee4e2a Binary files /dev/null and b/retroshare-gui/src/gui/emojione/1f923.png differ diff --git a/retroshare-gui/src/gui/emojione/1f924.png b/retroshare-gui/src/gui/emojione/1f924.png new file mode 100644 index 000000000..b8cb3dd55 Binary files /dev/null and b/retroshare-gui/src/gui/emojione/1f924.png differ diff --git a/retroshare-gui/src/gui/emojione/1f925.png b/retroshare-gui/src/gui/emojione/1f925.png new file mode 100644 index 000000000..e389aad1f Binary files /dev/null and b/retroshare-gui/src/gui/emojione/1f925.png differ diff --git a/retroshare-gui/src/gui/emojione/1f927.png b/retroshare-gui/src/gui/emojione/1f927.png new file mode 100644 index 000000000..b05cb9398 Binary files /dev/null and b/retroshare-gui/src/gui/emojione/1f927.png differ diff --git a/retroshare-gui/src/gui/emojione/1f980.png b/retroshare-gui/src/gui/emojione/1f980.png index 3af0cc85e..c8946e348 100644 Binary files a/retroshare-gui/src/gui/emojione/1f980.png and b/retroshare-gui/src/gui/emojione/1f980.png differ diff --git a/retroshare-gui/src/gui/emojione/1f981.png b/retroshare-gui/src/gui/emojione/1f981.png index 60dd480a5..976acbeb1 100644 Binary files a/retroshare-gui/src/gui/emojione/1f981.png and b/retroshare-gui/src/gui/emojione/1f981.png differ diff --git a/retroshare-gui/src/gui/emojione/1f982.png b/retroshare-gui/src/gui/emojione/1f982.png index bac096e76..98000e72b 100644 Binary files a/retroshare-gui/src/gui/emojione/1f982.png and b/retroshare-gui/src/gui/emojione/1f982.png differ diff --git a/retroshare-gui/src/gui/emojione/1f983.png b/retroshare-gui/src/gui/emojione/1f983.png index 5e5eb4fb1..d2544262c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f983.png and b/retroshare-gui/src/gui/emojione/1f983.png differ diff --git a/retroshare-gui/src/gui/emojione/1f984.png b/retroshare-gui/src/gui/emojione/1f984.png index 6db8511c4..573c37966 100644 Binary files a/retroshare-gui/src/gui/emojione/1f984.png and b/retroshare-gui/src/gui/emojione/1f984.png differ diff --git a/retroshare-gui/src/gui/emojione/1f9c0.png b/retroshare-gui/src/gui/emojione/1f9c0.png index 2dea0ea70..36629b22c 100644 Binary files a/retroshare-gui/src/gui/emojione/1f9c0.png and b/retroshare-gui/src/gui/emojione/1f9c0.png differ diff --git a/retroshare-gui/src/gui/emojione/203C.png b/retroshare-gui/src/gui/emojione/203C.png index 0ea1a55ea..5eaa71129 100644 Binary files a/retroshare-gui/src/gui/emojione/203C.png and b/retroshare-gui/src/gui/emojione/203C.png differ diff --git a/retroshare-gui/src/gui/emojione/2049.png b/retroshare-gui/src/gui/emojione/2049.png index c1d6ae251..89c99e1d7 100644 Binary files a/retroshare-gui/src/gui/emojione/2049.png and b/retroshare-gui/src/gui/emojione/2049.png differ diff --git a/retroshare-gui/src/gui/emojione/2122.png b/retroshare-gui/src/gui/emojione/2122.png index 82178737d..87a5aceaa 100644 Binary files a/retroshare-gui/src/gui/emojione/2122.png and b/retroshare-gui/src/gui/emojione/2122.png differ diff --git a/retroshare-gui/src/gui/emojione/2139.png b/retroshare-gui/src/gui/emojione/2139.png index 097ed7ef1..2c2797713 100644 Binary files a/retroshare-gui/src/gui/emojione/2139.png and b/retroshare-gui/src/gui/emojione/2139.png differ diff --git a/retroshare-gui/src/gui/emojione/2194.png b/retroshare-gui/src/gui/emojione/2194.png index 839265bab..daaaf3a41 100644 Binary files a/retroshare-gui/src/gui/emojione/2194.png and b/retroshare-gui/src/gui/emojione/2194.png differ diff --git a/retroshare-gui/src/gui/emojione/2195.png b/retroshare-gui/src/gui/emojione/2195.png index be3d9755d..47da98007 100644 Binary files a/retroshare-gui/src/gui/emojione/2195.png and b/retroshare-gui/src/gui/emojione/2195.png differ diff --git a/retroshare-gui/src/gui/emojione/2196.png b/retroshare-gui/src/gui/emojione/2196.png index 3a2ae3ef6..c54032819 100644 Binary files a/retroshare-gui/src/gui/emojione/2196.png and b/retroshare-gui/src/gui/emojione/2196.png differ diff --git a/retroshare-gui/src/gui/emojione/2197.png b/retroshare-gui/src/gui/emojione/2197.png index 724d7eda0..db8a5a334 100644 Binary files a/retroshare-gui/src/gui/emojione/2197.png and b/retroshare-gui/src/gui/emojione/2197.png differ diff --git a/retroshare-gui/src/gui/emojione/2198.png b/retroshare-gui/src/gui/emojione/2198.png index 6e6a8ac0f..967022131 100644 Binary files a/retroshare-gui/src/gui/emojione/2198.png and b/retroshare-gui/src/gui/emojione/2198.png differ diff --git a/retroshare-gui/src/gui/emojione/2199.png b/retroshare-gui/src/gui/emojione/2199.png index 19abc6979..393368368 100644 Binary files a/retroshare-gui/src/gui/emojione/2199.png and b/retroshare-gui/src/gui/emojione/2199.png differ diff --git a/retroshare-gui/src/gui/emojione/21A9.png b/retroshare-gui/src/gui/emojione/21A9.png index d733bdaa7..b2a4ab8a5 100644 Binary files a/retroshare-gui/src/gui/emojione/21A9.png and b/retroshare-gui/src/gui/emojione/21A9.png differ diff --git a/retroshare-gui/src/gui/emojione/21AA.png b/retroshare-gui/src/gui/emojione/21AA.png index cb2383814..39c7dacca 100644 Binary files a/retroshare-gui/src/gui/emojione/21AA.png and b/retroshare-gui/src/gui/emojione/21AA.png differ diff --git a/retroshare-gui/src/gui/emojione/231A.png b/retroshare-gui/src/gui/emojione/231A.png index 893bddb09..bdb927317 100644 Binary files a/retroshare-gui/src/gui/emojione/231A.png and b/retroshare-gui/src/gui/emojione/231A.png differ diff --git a/retroshare-gui/src/gui/emojione/231B.png b/retroshare-gui/src/gui/emojione/231B.png index 986c06242..468651f51 100644 Binary files a/retroshare-gui/src/gui/emojione/231B.png and b/retroshare-gui/src/gui/emojione/231B.png differ diff --git a/retroshare-gui/src/gui/emojione/2328.png b/retroshare-gui/src/gui/emojione/2328.png index 6bf4c3c57..e2b73334c 100644 Binary files a/retroshare-gui/src/gui/emojione/2328.png and b/retroshare-gui/src/gui/emojione/2328.png differ diff --git a/retroshare-gui/src/gui/emojione/23E9.png b/retroshare-gui/src/gui/emojione/23E9.png index 9684e18b7..9c50b2144 100644 Binary files a/retroshare-gui/src/gui/emojione/23E9.png and b/retroshare-gui/src/gui/emojione/23E9.png differ diff --git a/retroshare-gui/src/gui/emojione/23EA.png b/retroshare-gui/src/gui/emojione/23EA.png index 929b13be8..74d8ca0ee 100644 Binary files a/retroshare-gui/src/gui/emojione/23EA.png and b/retroshare-gui/src/gui/emojione/23EA.png differ diff --git a/retroshare-gui/src/gui/emojione/23EB.png b/retroshare-gui/src/gui/emojione/23EB.png index f7f26fe80..1a4dfa056 100644 Binary files a/retroshare-gui/src/gui/emojione/23EB.png and b/retroshare-gui/src/gui/emojione/23EB.png differ diff --git a/retroshare-gui/src/gui/emojione/23EC.png b/retroshare-gui/src/gui/emojione/23EC.png index 5d607f3e9..ff1836856 100644 Binary files a/retroshare-gui/src/gui/emojione/23EC.png and b/retroshare-gui/src/gui/emojione/23EC.png differ diff --git a/retroshare-gui/src/gui/emojione/23F0.png b/retroshare-gui/src/gui/emojione/23F0.png index 3b3cd47e1..3a27f83f9 100644 Binary files a/retroshare-gui/src/gui/emojione/23F0.png and b/retroshare-gui/src/gui/emojione/23F0.png differ diff --git a/retroshare-gui/src/gui/emojione/23F3.png b/retroshare-gui/src/gui/emojione/23F3.png index 30954157a..046e809fa 100644 Binary files a/retroshare-gui/src/gui/emojione/23F3.png and b/retroshare-gui/src/gui/emojione/23F3.png differ diff --git a/retroshare-gui/src/gui/emojione/23ed.png b/retroshare-gui/src/gui/emojione/23ed.png index 4a08f473c..dc6c318e5 100644 Binary files a/retroshare-gui/src/gui/emojione/23ed.png and b/retroshare-gui/src/gui/emojione/23ed.png differ diff --git a/retroshare-gui/src/gui/emojione/23ee.png b/retroshare-gui/src/gui/emojione/23ee.png index 8ff4391e8..c477407bf 100644 Binary files a/retroshare-gui/src/gui/emojione/23ee.png and b/retroshare-gui/src/gui/emojione/23ee.png differ diff --git a/retroshare-gui/src/gui/emojione/23ef.png b/retroshare-gui/src/gui/emojione/23ef.png index 478612f61..84fbd4cc2 100644 Binary files a/retroshare-gui/src/gui/emojione/23ef.png and b/retroshare-gui/src/gui/emojione/23ef.png differ diff --git a/retroshare-gui/src/gui/emojione/23f1.png b/retroshare-gui/src/gui/emojione/23f1.png index a6e2ea70b..0f670c934 100644 Binary files a/retroshare-gui/src/gui/emojione/23f1.png and b/retroshare-gui/src/gui/emojione/23f1.png differ diff --git a/retroshare-gui/src/gui/emojione/23f2.png b/retroshare-gui/src/gui/emojione/23f2.png index 25db82de7..f0ae9f5f9 100644 Binary files a/retroshare-gui/src/gui/emojione/23f2.png and b/retroshare-gui/src/gui/emojione/23f2.png differ diff --git a/retroshare-gui/src/gui/emojione/23f8.png b/retroshare-gui/src/gui/emojione/23f8.png index b9b63afe1..8af7d21a7 100644 Binary files a/retroshare-gui/src/gui/emojione/23f8.png and b/retroshare-gui/src/gui/emojione/23f8.png differ diff --git a/retroshare-gui/src/gui/emojione/23f9.png b/retroshare-gui/src/gui/emojione/23f9.png index 7bdbbdefd..cb6371b3d 100644 Binary files a/retroshare-gui/src/gui/emojione/23f9.png and b/retroshare-gui/src/gui/emojione/23f9.png differ diff --git a/retroshare-gui/src/gui/emojione/23fa.png b/retroshare-gui/src/gui/emojione/23fa.png index d32849e67..e671d4115 100644 Binary files a/retroshare-gui/src/gui/emojione/23fa.png and b/retroshare-gui/src/gui/emojione/23fa.png differ diff --git a/retroshare-gui/src/gui/emojione/24C2.png b/retroshare-gui/src/gui/emojione/24C2.png index a890bf7a9..3edae26aa 100644 Binary files a/retroshare-gui/src/gui/emojione/24C2.png and b/retroshare-gui/src/gui/emojione/24C2.png differ diff --git a/retroshare-gui/src/gui/emojione/25AA.png b/retroshare-gui/src/gui/emojione/25AA.png index 246cbf2a1..bc91d75e5 100644 Binary files a/retroshare-gui/src/gui/emojione/25AA.png and b/retroshare-gui/src/gui/emojione/25AA.png differ diff --git a/retroshare-gui/src/gui/emojione/25AB.png b/retroshare-gui/src/gui/emojione/25AB.png index 6c3f20b5d..8de86caba 100644 Binary files a/retroshare-gui/src/gui/emojione/25AB.png and b/retroshare-gui/src/gui/emojione/25AB.png differ diff --git a/retroshare-gui/src/gui/emojione/25B6.png b/retroshare-gui/src/gui/emojione/25B6.png index 50567f342..04ccc5851 100644 Binary files a/retroshare-gui/src/gui/emojione/25B6.png and b/retroshare-gui/src/gui/emojione/25B6.png differ diff --git a/retroshare-gui/src/gui/emojione/25C0.png b/retroshare-gui/src/gui/emojione/25C0.png index f12cfc6a0..1c8e878e1 100644 Binary files a/retroshare-gui/src/gui/emojione/25C0.png and b/retroshare-gui/src/gui/emojione/25C0.png differ diff --git a/retroshare-gui/src/gui/emojione/25FB.png b/retroshare-gui/src/gui/emojione/25FB.png index 94fe7507a..fa027417a 100644 Binary files a/retroshare-gui/src/gui/emojione/25FB.png and b/retroshare-gui/src/gui/emojione/25FB.png differ diff --git a/retroshare-gui/src/gui/emojione/25FC.png b/retroshare-gui/src/gui/emojione/25FC.png index 42f1a8e24..6acbfde5b 100644 Binary files a/retroshare-gui/src/gui/emojione/25FC.png and b/retroshare-gui/src/gui/emojione/25FC.png differ diff --git a/retroshare-gui/src/gui/emojione/25FD.png b/retroshare-gui/src/gui/emojione/25FD.png index e17800131..7d3e00d44 100644 Binary files a/retroshare-gui/src/gui/emojione/25FD.png and b/retroshare-gui/src/gui/emojione/25FD.png differ diff --git a/retroshare-gui/src/gui/emojione/25FE.png b/retroshare-gui/src/gui/emojione/25FE.png index aeac30b6a..95bab9d97 100644 Binary files a/retroshare-gui/src/gui/emojione/25FE.png and b/retroshare-gui/src/gui/emojione/25FE.png differ diff --git a/retroshare-gui/src/gui/emojione/2600.png b/retroshare-gui/src/gui/emojione/2600.png index 1dbf3b07b..affe6cb1a 100644 Binary files a/retroshare-gui/src/gui/emojione/2600.png and b/retroshare-gui/src/gui/emojione/2600.png differ diff --git a/retroshare-gui/src/gui/emojione/2601.png b/retroshare-gui/src/gui/emojione/2601.png index 2bb687011..4b738ca94 100644 Binary files a/retroshare-gui/src/gui/emojione/2601.png and b/retroshare-gui/src/gui/emojione/2601.png differ diff --git a/retroshare-gui/src/gui/emojione/2602.png b/retroshare-gui/src/gui/emojione/2602.png index fd74158b3..52d7d0e32 100644 Binary files a/retroshare-gui/src/gui/emojione/2602.png and b/retroshare-gui/src/gui/emojione/2602.png differ diff --git a/retroshare-gui/src/gui/emojione/2603.png b/retroshare-gui/src/gui/emojione/2603.png index 49715694d..990053a92 100644 Binary files a/retroshare-gui/src/gui/emojione/2603.png and b/retroshare-gui/src/gui/emojione/2603.png differ diff --git a/retroshare-gui/src/gui/emojione/2604.png b/retroshare-gui/src/gui/emojione/2604.png index 12307dd9f..d02084236 100644 Binary files a/retroshare-gui/src/gui/emojione/2604.png and b/retroshare-gui/src/gui/emojione/2604.png differ diff --git a/retroshare-gui/src/gui/emojione/260E.png b/retroshare-gui/src/gui/emojione/260E.png index 51bae9e5a..80e2e59b6 100644 Binary files a/retroshare-gui/src/gui/emojione/260E.png and b/retroshare-gui/src/gui/emojione/260E.png differ diff --git a/retroshare-gui/src/gui/emojione/2611.png b/retroshare-gui/src/gui/emojione/2611.png index b7c600e02..ff6a6edd3 100644 Binary files a/retroshare-gui/src/gui/emojione/2611.png and b/retroshare-gui/src/gui/emojione/2611.png differ diff --git a/retroshare-gui/src/gui/emojione/2614.png b/retroshare-gui/src/gui/emojione/2614.png index 1afc97107..7712339a2 100644 Binary files a/retroshare-gui/src/gui/emojione/2614.png and b/retroshare-gui/src/gui/emojione/2614.png differ diff --git a/retroshare-gui/src/gui/emojione/2615.png b/retroshare-gui/src/gui/emojione/2615.png index ba4d34f8c..1cb82aff4 100644 Binary files a/retroshare-gui/src/gui/emojione/2615.png and b/retroshare-gui/src/gui/emojione/2615.png differ diff --git a/retroshare-gui/src/gui/emojione/2618.png b/retroshare-gui/src/gui/emojione/2618.png index 79dca809f..03732ea6c 100644 Binary files a/retroshare-gui/src/gui/emojione/2618.png and b/retroshare-gui/src/gui/emojione/2618.png differ diff --git a/retroshare-gui/src/gui/emojione/261D.png b/retroshare-gui/src/gui/emojione/261D.png index 93df9e64c..4b3ff2525 100644 Binary files a/retroshare-gui/src/gui/emojione/261D.png and b/retroshare-gui/src/gui/emojione/261D.png differ diff --git a/retroshare-gui/src/gui/emojione/261d-1f3fb.png b/retroshare-gui/src/gui/emojione/261d-1f3fb.png index 6aa773931..37bd7cd7b 100644 Binary files a/retroshare-gui/src/gui/emojione/261d-1f3fb.png and b/retroshare-gui/src/gui/emojione/261d-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/261d-1f3fc.png b/retroshare-gui/src/gui/emojione/261d-1f3fc.png index 4acffc000..2bfb1a78f 100644 Binary files a/retroshare-gui/src/gui/emojione/261d-1f3fc.png and b/retroshare-gui/src/gui/emojione/261d-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/261d-1f3fd.png b/retroshare-gui/src/gui/emojione/261d-1f3fd.png index 7dae8571f..362a3d664 100644 Binary files a/retroshare-gui/src/gui/emojione/261d-1f3fd.png and b/retroshare-gui/src/gui/emojione/261d-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/261d-1f3fe.png b/retroshare-gui/src/gui/emojione/261d-1f3fe.png index d4052999e..53f9bf0bb 100644 Binary files a/retroshare-gui/src/gui/emojione/261d-1f3fe.png and b/retroshare-gui/src/gui/emojione/261d-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/261d-1f3ff.png b/retroshare-gui/src/gui/emojione/261d-1f3ff.png index 00a9987e0..19722b2bd 100644 Binary files a/retroshare-gui/src/gui/emojione/261d-1f3ff.png and b/retroshare-gui/src/gui/emojione/261d-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/2620.png b/retroshare-gui/src/gui/emojione/2620.png index c7230d2b7..112845685 100644 Binary files a/retroshare-gui/src/gui/emojione/2620.png and b/retroshare-gui/src/gui/emojione/2620.png differ diff --git a/retroshare-gui/src/gui/emojione/2622.png b/retroshare-gui/src/gui/emojione/2622.png index af5d32967..607c72d07 100644 Binary files a/retroshare-gui/src/gui/emojione/2622.png and b/retroshare-gui/src/gui/emojione/2622.png differ diff --git a/retroshare-gui/src/gui/emojione/2623.png b/retroshare-gui/src/gui/emojione/2623.png index 13658e901..b8140c382 100644 Binary files a/retroshare-gui/src/gui/emojione/2623.png and b/retroshare-gui/src/gui/emojione/2623.png differ diff --git a/retroshare-gui/src/gui/emojione/2626.png b/retroshare-gui/src/gui/emojione/2626.png index 6252c4c27..61229941a 100644 Binary files a/retroshare-gui/src/gui/emojione/2626.png and b/retroshare-gui/src/gui/emojione/2626.png differ diff --git a/retroshare-gui/src/gui/emojione/262a.png b/retroshare-gui/src/gui/emojione/262a.png index 6e0f14f90..d29513410 100644 Binary files a/retroshare-gui/src/gui/emojione/262a.png and b/retroshare-gui/src/gui/emojione/262a.png differ diff --git a/retroshare-gui/src/gui/emojione/262e.png b/retroshare-gui/src/gui/emojione/262e.png index e4be564ff..4f53753f6 100644 Binary files a/retroshare-gui/src/gui/emojione/262e.png and b/retroshare-gui/src/gui/emojione/262e.png differ diff --git a/retroshare-gui/src/gui/emojione/262f.png b/retroshare-gui/src/gui/emojione/262f.png index 2f5a13532..ea6d57812 100644 Binary files a/retroshare-gui/src/gui/emojione/262f.png and b/retroshare-gui/src/gui/emojione/262f.png differ diff --git a/retroshare-gui/src/gui/emojione/2638.png b/retroshare-gui/src/gui/emojione/2638.png index 34839562b..eec0157fd 100644 Binary files a/retroshare-gui/src/gui/emojione/2638.png and b/retroshare-gui/src/gui/emojione/2638.png differ diff --git a/retroshare-gui/src/gui/emojione/2639.png b/retroshare-gui/src/gui/emojione/2639.png index 9bff86e11..8115b1f6b 100644 Binary files a/retroshare-gui/src/gui/emojione/2639.png and b/retroshare-gui/src/gui/emojione/2639.png differ diff --git a/retroshare-gui/src/gui/emojione/263A.png b/retroshare-gui/src/gui/emojione/263A.png index e2ecdabe4..b4d94eca8 100644 Binary files a/retroshare-gui/src/gui/emojione/263A.png and b/retroshare-gui/src/gui/emojione/263A.png differ diff --git a/retroshare-gui/src/gui/emojione/2648.png b/retroshare-gui/src/gui/emojione/2648.png index 411e8110a..97794a5a0 100644 Binary files a/retroshare-gui/src/gui/emojione/2648.png and b/retroshare-gui/src/gui/emojione/2648.png differ diff --git a/retroshare-gui/src/gui/emojione/2649.png b/retroshare-gui/src/gui/emojione/2649.png index 428373850..41596b541 100644 Binary files a/retroshare-gui/src/gui/emojione/2649.png and b/retroshare-gui/src/gui/emojione/2649.png differ diff --git a/retroshare-gui/src/gui/emojione/264A.png b/retroshare-gui/src/gui/emojione/264A.png index 6e9ec673a..a07afd8a0 100644 Binary files a/retroshare-gui/src/gui/emojione/264A.png and b/retroshare-gui/src/gui/emojione/264A.png differ diff --git a/retroshare-gui/src/gui/emojione/264B.png b/retroshare-gui/src/gui/emojione/264B.png index 9673e5d88..7fbd1775a 100644 Binary files a/retroshare-gui/src/gui/emojione/264B.png and b/retroshare-gui/src/gui/emojione/264B.png differ diff --git a/retroshare-gui/src/gui/emojione/264C.png b/retroshare-gui/src/gui/emojione/264C.png index 04e683f4f..707ebc4e2 100644 Binary files a/retroshare-gui/src/gui/emojione/264C.png and b/retroshare-gui/src/gui/emojione/264C.png differ diff --git a/retroshare-gui/src/gui/emojione/264D.png b/retroshare-gui/src/gui/emojione/264D.png index 28b0255fa..77e8ab761 100644 Binary files a/retroshare-gui/src/gui/emojione/264D.png and b/retroshare-gui/src/gui/emojione/264D.png differ diff --git a/retroshare-gui/src/gui/emojione/264E.png b/retroshare-gui/src/gui/emojione/264E.png index f491a1258..272153b5e 100644 Binary files a/retroshare-gui/src/gui/emojione/264E.png and b/retroshare-gui/src/gui/emojione/264E.png differ diff --git a/retroshare-gui/src/gui/emojione/264F.png b/retroshare-gui/src/gui/emojione/264F.png index b8b007884..e047afc7c 100644 Binary files a/retroshare-gui/src/gui/emojione/264F.png and b/retroshare-gui/src/gui/emojione/264F.png differ diff --git a/retroshare-gui/src/gui/emojione/2650.png b/retroshare-gui/src/gui/emojione/2650.png index 8b4f1e810..abdff532e 100644 Binary files a/retroshare-gui/src/gui/emojione/2650.png and b/retroshare-gui/src/gui/emojione/2650.png differ diff --git a/retroshare-gui/src/gui/emojione/2651.png b/retroshare-gui/src/gui/emojione/2651.png index 6812d052e..03edd2fe6 100644 Binary files a/retroshare-gui/src/gui/emojione/2651.png and b/retroshare-gui/src/gui/emojione/2651.png differ diff --git a/retroshare-gui/src/gui/emojione/2652.png b/retroshare-gui/src/gui/emojione/2652.png index da31145ac..c51e158b3 100644 Binary files a/retroshare-gui/src/gui/emojione/2652.png and b/retroshare-gui/src/gui/emojione/2652.png differ diff --git a/retroshare-gui/src/gui/emojione/2653.png b/retroshare-gui/src/gui/emojione/2653.png index af63c0024..82241aa7c 100644 Binary files a/retroshare-gui/src/gui/emojione/2653.png and b/retroshare-gui/src/gui/emojione/2653.png differ diff --git a/retroshare-gui/src/gui/emojione/2660.png b/retroshare-gui/src/gui/emojione/2660.png index 3cf4c2f8b..5e244516e 100644 Binary files a/retroshare-gui/src/gui/emojione/2660.png and b/retroshare-gui/src/gui/emojione/2660.png differ diff --git a/retroshare-gui/src/gui/emojione/2663.png b/retroshare-gui/src/gui/emojione/2663.png index 9e4aa85f1..eb59f1447 100644 Binary files a/retroshare-gui/src/gui/emojione/2663.png and b/retroshare-gui/src/gui/emojione/2663.png differ diff --git a/retroshare-gui/src/gui/emojione/2665.png b/retroshare-gui/src/gui/emojione/2665.png index 133c7dc1a..e04b67545 100644 Binary files a/retroshare-gui/src/gui/emojione/2665.png and b/retroshare-gui/src/gui/emojione/2665.png differ diff --git a/retroshare-gui/src/gui/emojione/2666.png b/retroshare-gui/src/gui/emojione/2666.png index 36571fcb4..f7f403f54 100644 Binary files a/retroshare-gui/src/gui/emojione/2666.png and b/retroshare-gui/src/gui/emojione/2666.png differ diff --git a/retroshare-gui/src/gui/emojione/2668.png b/retroshare-gui/src/gui/emojione/2668.png index 6b0469235..3aafdac52 100644 Binary files a/retroshare-gui/src/gui/emojione/2668.png and b/retroshare-gui/src/gui/emojione/2668.png differ diff --git a/retroshare-gui/src/gui/emojione/267B.png b/retroshare-gui/src/gui/emojione/267B.png index 5b238869a..e32896ca5 100644 Binary files a/retroshare-gui/src/gui/emojione/267B.png and b/retroshare-gui/src/gui/emojione/267B.png differ diff --git a/retroshare-gui/src/gui/emojione/267F.png b/retroshare-gui/src/gui/emojione/267F.png index 210c29a2d..945ed89e4 100644 Binary files a/retroshare-gui/src/gui/emojione/267F.png and b/retroshare-gui/src/gui/emojione/267F.png differ diff --git a/retroshare-gui/src/gui/emojione/2692.png b/retroshare-gui/src/gui/emojione/2692.png index 8200f8f9c..8eef5bc82 100644 Binary files a/retroshare-gui/src/gui/emojione/2692.png and b/retroshare-gui/src/gui/emojione/2692.png differ diff --git a/retroshare-gui/src/gui/emojione/2693.png b/retroshare-gui/src/gui/emojione/2693.png index d8b357021..bdc32d0dd 100644 Binary files a/retroshare-gui/src/gui/emojione/2693.png and b/retroshare-gui/src/gui/emojione/2693.png differ diff --git a/retroshare-gui/src/gui/emojione/2694.png b/retroshare-gui/src/gui/emojione/2694.png index 3b1192a1f..8692dc950 100644 Binary files a/retroshare-gui/src/gui/emojione/2694.png and b/retroshare-gui/src/gui/emojione/2694.png differ diff --git a/retroshare-gui/src/gui/emojione/2696.png b/retroshare-gui/src/gui/emojione/2696.png index 499682aec..69fa5866e 100644 Binary files a/retroshare-gui/src/gui/emojione/2696.png and b/retroshare-gui/src/gui/emojione/2696.png differ diff --git a/retroshare-gui/src/gui/emojione/2697.png b/retroshare-gui/src/gui/emojione/2697.png index 3f432afe8..950fa9da5 100644 Binary files a/retroshare-gui/src/gui/emojione/2697.png and b/retroshare-gui/src/gui/emojione/2697.png differ diff --git a/retroshare-gui/src/gui/emojione/2699.png b/retroshare-gui/src/gui/emojione/2699.png index 4839f407e..cf2b65181 100644 Binary files a/retroshare-gui/src/gui/emojione/2699.png and b/retroshare-gui/src/gui/emojione/2699.png differ diff --git a/retroshare-gui/src/gui/emojione/269b.png b/retroshare-gui/src/gui/emojione/269b.png index 252e511a7..7c63d8968 100644 Binary files a/retroshare-gui/src/gui/emojione/269b.png and b/retroshare-gui/src/gui/emojione/269b.png differ diff --git a/retroshare-gui/src/gui/emojione/269c.png b/retroshare-gui/src/gui/emojione/269c.png index 940c6c659..a85fd29bb 100644 Binary files a/retroshare-gui/src/gui/emojione/269c.png and b/retroshare-gui/src/gui/emojione/269c.png differ diff --git a/retroshare-gui/src/gui/emojione/26A0.png b/retroshare-gui/src/gui/emojione/26A0.png index 0142fe0a1..1b3661775 100644 Binary files a/retroshare-gui/src/gui/emojione/26A0.png and b/retroshare-gui/src/gui/emojione/26A0.png differ diff --git a/retroshare-gui/src/gui/emojione/26A1.png b/retroshare-gui/src/gui/emojione/26A1.png index eda3afd62..8b90dbfd5 100644 Binary files a/retroshare-gui/src/gui/emojione/26A1.png and b/retroshare-gui/src/gui/emojione/26A1.png differ diff --git a/retroshare-gui/src/gui/emojione/26AA.png b/retroshare-gui/src/gui/emojione/26AA.png index 17aa834ed..87193ce9b 100644 Binary files a/retroshare-gui/src/gui/emojione/26AA.png and b/retroshare-gui/src/gui/emojione/26AA.png differ diff --git a/retroshare-gui/src/gui/emojione/26AB.png b/retroshare-gui/src/gui/emojione/26AB.png index d32849e67..ffc68bba2 100644 Binary files a/retroshare-gui/src/gui/emojione/26AB.png and b/retroshare-gui/src/gui/emojione/26AB.png differ diff --git a/retroshare-gui/src/gui/emojione/26BD.png b/retroshare-gui/src/gui/emojione/26BD.png index 2eec6307b..7a728867d 100644 Binary files a/retroshare-gui/src/gui/emojione/26BD.png and b/retroshare-gui/src/gui/emojione/26BD.png differ diff --git a/retroshare-gui/src/gui/emojione/26BE.png b/retroshare-gui/src/gui/emojione/26BE.png index 1a8043c97..8234f2db1 100644 Binary files a/retroshare-gui/src/gui/emojione/26BE.png and b/retroshare-gui/src/gui/emojione/26BE.png differ diff --git a/retroshare-gui/src/gui/emojione/26C4.png b/retroshare-gui/src/gui/emojione/26C4.png index 0fdbc0c6a..af355ebae 100644 Binary files a/retroshare-gui/src/gui/emojione/26C4.png and b/retroshare-gui/src/gui/emojione/26C4.png differ diff --git a/retroshare-gui/src/gui/emojione/26C5.png b/retroshare-gui/src/gui/emojione/26C5.png index 3d5643173..302e3ac28 100644 Binary files a/retroshare-gui/src/gui/emojione/26C5.png and b/retroshare-gui/src/gui/emojione/26C5.png differ diff --git a/retroshare-gui/src/gui/emojione/26CE.png b/retroshare-gui/src/gui/emojione/26CE.png index 3bb5f621e..fb90a7d85 100644 Binary files a/retroshare-gui/src/gui/emojione/26CE.png and b/retroshare-gui/src/gui/emojione/26CE.png differ diff --git a/retroshare-gui/src/gui/emojione/26D4.png b/retroshare-gui/src/gui/emojione/26D4.png index f2772f9e8..ee2bfb6be 100644 Binary files a/retroshare-gui/src/gui/emojione/26D4.png and b/retroshare-gui/src/gui/emojione/26D4.png differ diff --git a/retroshare-gui/src/gui/emojione/26EA.png b/retroshare-gui/src/gui/emojione/26EA.png index a45c52acc..7cdeb72f5 100644 Binary files a/retroshare-gui/src/gui/emojione/26EA.png and b/retroshare-gui/src/gui/emojione/26EA.png differ diff --git a/retroshare-gui/src/gui/emojione/26F2.png b/retroshare-gui/src/gui/emojione/26F2.png index 95ad69936..e4a27cfbd 100644 Binary files a/retroshare-gui/src/gui/emojione/26F2.png and b/retroshare-gui/src/gui/emojione/26F2.png differ diff --git a/retroshare-gui/src/gui/emojione/26F3.png b/retroshare-gui/src/gui/emojione/26F3.png index c5b0c0b2c..1893bf1a8 100644 Binary files a/retroshare-gui/src/gui/emojione/26F3.png and b/retroshare-gui/src/gui/emojione/26F3.png differ diff --git a/retroshare-gui/src/gui/emojione/26F5.png b/retroshare-gui/src/gui/emojione/26F5.png index 72066f535..63e3486b5 100644 Binary files a/retroshare-gui/src/gui/emojione/26F5.png and b/retroshare-gui/src/gui/emojione/26F5.png differ diff --git a/retroshare-gui/src/gui/emojione/26FA.png b/retroshare-gui/src/gui/emojione/26FA.png index 49922034f..2225bfa06 100644 Binary files a/retroshare-gui/src/gui/emojione/26FA.png and b/retroshare-gui/src/gui/emojione/26FA.png differ diff --git a/retroshare-gui/src/gui/emojione/26FD.png b/retroshare-gui/src/gui/emojione/26FD.png index 17739c493..03005e198 100644 Binary files a/retroshare-gui/src/gui/emojione/26FD.png and b/retroshare-gui/src/gui/emojione/26FD.png differ diff --git a/retroshare-gui/src/gui/emojione/26b0.png b/retroshare-gui/src/gui/emojione/26b0.png index 2f8344dbc..2ab1f7275 100644 Binary files a/retroshare-gui/src/gui/emojione/26b0.png and b/retroshare-gui/src/gui/emojione/26b0.png differ diff --git a/retroshare-gui/src/gui/emojione/26b1.png b/retroshare-gui/src/gui/emojione/26b1.png index 45135438b..9a0bf135e 100644 Binary files a/retroshare-gui/src/gui/emojione/26b1.png and b/retroshare-gui/src/gui/emojione/26b1.png differ diff --git a/retroshare-gui/src/gui/emojione/26c8.png b/retroshare-gui/src/gui/emojione/26c8.png index 2b8a62e42..0e3e0c25e 100644 Binary files a/retroshare-gui/src/gui/emojione/26c8.png and b/retroshare-gui/src/gui/emojione/26c8.png differ diff --git a/retroshare-gui/src/gui/emojione/26cf.png b/retroshare-gui/src/gui/emojione/26cf.png index 088ae98a6..7041323b5 100644 Binary files a/retroshare-gui/src/gui/emojione/26cf.png and b/retroshare-gui/src/gui/emojione/26cf.png differ diff --git a/retroshare-gui/src/gui/emojione/26d1.png b/retroshare-gui/src/gui/emojione/26d1.png index 27a73a97e..d3e5ac269 100644 Binary files a/retroshare-gui/src/gui/emojione/26d1.png and b/retroshare-gui/src/gui/emojione/26d1.png differ diff --git a/retroshare-gui/src/gui/emojione/26d3.png b/retroshare-gui/src/gui/emojione/26d3.png index b41e671c3..3bdd0bacb 100644 Binary files a/retroshare-gui/src/gui/emojione/26d3.png and b/retroshare-gui/src/gui/emojione/26d3.png differ diff --git a/retroshare-gui/src/gui/emojione/26e9.png b/retroshare-gui/src/gui/emojione/26e9.png index 83cd681a0..3ec022465 100644 Binary files a/retroshare-gui/src/gui/emojione/26e9.png and b/retroshare-gui/src/gui/emojione/26e9.png differ diff --git a/retroshare-gui/src/gui/emojione/26f0.png b/retroshare-gui/src/gui/emojione/26f0.png index 8dbb74518..63a1926aa 100644 Binary files a/retroshare-gui/src/gui/emojione/26f0.png and b/retroshare-gui/src/gui/emojione/26f0.png differ diff --git a/retroshare-gui/src/gui/emojione/26f1.png b/retroshare-gui/src/gui/emojione/26f1.png index 600baf494..009172b6b 100644 Binary files a/retroshare-gui/src/gui/emojione/26f1.png and b/retroshare-gui/src/gui/emojione/26f1.png differ diff --git a/retroshare-gui/src/gui/emojione/26f4.png b/retroshare-gui/src/gui/emojione/26f4.png index 8e964356c..3db6be86e 100644 Binary files a/retroshare-gui/src/gui/emojione/26f4.png and b/retroshare-gui/src/gui/emojione/26f4.png differ diff --git a/retroshare-gui/src/gui/emojione/26f7.png b/retroshare-gui/src/gui/emojione/26f7.png index 8255bc114..7fe956cbe 100644 Binary files a/retroshare-gui/src/gui/emojione/26f7.png and b/retroshare-gui/src/gui/emojione/26f7.png differ diff --git a/retroshare-gui/src/gui/emojione/26f8.png b/retroshare-gui/src/gui/emojione/26f8.png index b9d3de868..2c7806af5 100644 Binary files a/retroshare-gui/src/gui/emojione/26f8.png and b/retroshare-gui/src/gui/emojione/26f8.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9-1f3fb.png b/retroshare-gui/src/gui/emojione/26f9-1f3fb.png index 974bb41cb..bd268e09c 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9-1f3fb.png and b/retroshare-gui/src/gui/emojione/26f9-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9-1f3fc.png b/retroshare-gui/src/gui/emojione/26f9-1f3fc.png index 4b5d9b6cd..e7c2fae56 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9-1f3fc.png and b/retroshare-gui/src/gui/emojione/26f9-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9-1f3fd.png b/retroshare-gui/src/gui/emojione/26f9-1f3fd.png index 0472fccba..0ef15eb0c 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9-1f3fd.png and b/retroshare-gui/src/gui/emojione/26f9-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9-1f3fe.png b/retroshare-gui/src/gui/emojione/26f9-1f3fe.png index c3c1f5929..c0e943c18 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9-1f3fe.png and b/retroshare-gui/src/gui/emojione/26f9-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9-1f3ff.png b/retroshare-gui/src/gui/emojione/26f9-1f3ff.png index 8b0a58280..012a969c3 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9-1f3ff.png and b/retroshare-gui/src/gui/emojione/26f9-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/26f9.png b/retroshare-gui/src/gui/emojione/26f9.png index 3a1a492c3..452a6a76b 100644 Binary files a/retroshare-gui/src/gui/emojione/26f9.png and b/retroshare-gui/src/gui/emojione/26f9.png differ diff --git a/retroshare-gui/src/gui/emojione/2702.png b/retroshare-gui/src/gui/emojione/2702.png index 56e7e34a7..0fb2cb422 100644 Binary files a/retroshare-gui/src/gui/emojione/2702.png and b/retroshare-gui/src/gui/emojione/2702.png differ diff --git a/retroshare-gui/src/gui/emojione/2705.png b/retroshare-gui/src/gui/emojione/2705.png index d2182b9e6..18211ad3c 100644 Binary files a/retroshare-gui/src/gui/emojione/2705.png and b/retroshare-gui/src/gui/emojione/2705.png differ diff --git a/retroshare-gui/src/gui/emojione/2708.png b/retroshare-gui/src/gui/emojione/2708.png index 7f7d3a6a3..827fd324b 100644 Binary files a/retroshare-gui/src/gui/emojione/2708.png and b/retroshare-gui/src/gui/emojione/2708.png differ diff --git a/retroshare-gui/src/gui/emojione/2709.png b/retroshare-gui/src/gui/emojione/2709.png index 4ac264319..2b0f955f8 100644 Binary files a/retroshare-gui/src/gui/emojione/2709.png and b/retroshare-gui/src/gui/emojione/2709.png differ diff --git a/retroshare-gui/src/gui/emojione/270A.png b/retroshare-gui/src/gui/emojione/270A.png index 3bc460c9c..2e3158e92 100644 Binary files a/retroshare-gui/src/gui/emojione/270A.png and b/retroshare-gui/src/gui/emojione/270A.png differ diff --git a/retroshare-gui/src/gui/emojione/270B.png b/retroshare-gui/src/gui/emojione/270B.png index e7025fefc..17dcdafa7 100644 Binary files a/retroshare-gui/src/gui/emojione/270B.png and b/retroshare-gui/src/gui/emojione/270B.png differ diff --git a/retroshare-gui/src/gui/emojione/270C.png b/retroshare-gui/src/gui/emojione/270C.png index 1db91636e..e2b7e80fe 100644 Binary files a/retroshare-gui/src/gui/emojione/270C.png and b/retroshare-gui/src/gui/emojione/270C.png differ diff --git a/retroshare-gui/src/gui/emojione/270F.png b/retroshare-gui/src/gui/emojione/270F.png index 133f3fcc9..4f02ee089 100644 Binary files a/retroshare-gui/src/gui/emojione/270F.png and b/retroshare-gui/src/gui/emojione/270F.png differ diff --git a/retroshare-gui/src/gui/emojione/270a-1f3fb.png b/retroshare-gui/src/gui/emojione/270a-1f3fb.png index 37ea07ce0..97cc63e85 100644 Binary files a/retroshare-gui/src/gui/emojione/270a-1f3fb.png and b/retroshare-gui/src/gui/emojione/270a-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/270a-1f3fc.png b/retroshare-gui/src/gui/emojione/270a-1f3fc.png index b873de0b7..26e14281e 100644 Binary files a/retroshare-gui/src/gui/emojione/270a-1f3fc.png and b/retroshare-gui/src/gui/emojione/270a-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/270a-1f3fd.png b/retroshare-gui/src/gui/emojione/270a-1f3fd.png index 096428413..04f7717f9 100644 Binary files a/retroshare-gui/src/gui/emojione/270a-1f3fd.png and b/retroshare-gui/src/gui/emojione/270a-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/270a-1f3fe.png b/retroshare-gui/src/gui/emojione/270a-1f3fe.png index 3d2b15e4d..7197de4ec 100644 Binary files a/retroshare-gui/src/gui/emojione/270a-1f3fe.png and b/retroshare-gui/src/gui/emojione/270a-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/270a-1f3ff.png b/retroshare-gui/src/gui/emojione/270a-1f3ff.png index 206ce0197..0c3f3f9af 100644 Binary files a/retroshare-gui/src/gui/emojione/270a-1f3ff.png and b/retroshare-gui/src/gui/emojione/270a-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/270b-1f3fb.png b/retroshare-gui/src/gui/emojione/270b-1f3fb.png index 20e542ac2..d5ea7a9b9 100644 Binary files a/retroshare-gui/src/gui/emojione/270b-1f3fb.png and b/retroshare-gui/src/gui/emojione/270b-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/270b-1f3fc.png b/retroshare-gui/src/gui/emojione/270b-1f3fc.png index ff6fa3d42..42f09e44c 100644 Binary files a/retroshare-gui/src/gui/emojione/270b-1f3fc.png and b/retroshare-gui/src/gui/emojione/270b-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/270b-1f3fd.png b/retroshare-gui/src/gui/emojione/270b-1f3fd.png index a74492cca..f11a21f6a 100644 Binary files a/retroshare-gui/src/gui/emojione/270b-1f3fd.png and b/retroshare-gui/src/gui/emojione/270b-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/270b-1f3fe.png b/retroshare-gui/src/gui/emojione/270b-1f3fe.png index 9f38b66e7..c1cf54a87 100644 Binary files a/retroshare-gui/src/gui/emojione/270b-1f3fe.png and b/retroshare-gui/src/gui/emojione/270b-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/270b-1f3ff.png b/retroshare-gui/src/gui/emojione/270b-1f3ff.png index 136631d43..3de9e4683 100644 Binary files a/retroshare-gui/src/gui/emojione/270b-1f3ff.png and b/retroshare-gui/src/gui/emojione/270b-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/270c-1f3fb.png b/retroshare-gui/src/gui/emojione/270c-1f3fb.png index cc8b674ef..3d05d61f3 100644 Binary files a/retroshare-gui/src/gui/emojione/270c-1f3fb.png and b/retroshare-gui/src/gui/emojione/270c-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/270c-1f3fc.png b/retroshare-gui/src/gui/emojione/270c-1f3fc.png index ef0bec358..4256b4bf2 100644 Binary files a/retroshare-gui/src/gui/emojione/270c-1f3fc.png and b/retroshare-gui/src/gui/emojione/270c-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/270c-1f3fd.png b/retroshare-gui/src/gui/emojione/270c-1f3fd.png index 2fb3f4a45..d54471b21 100644 Binary files a/retroshare-gui/src/gui/emojione/270c-1f3fd.png and b/retroshare-gui/src/gui/emojione/270c-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/270c-1f3fe.png b/retroshare-gui/src/gui/emojione/270c-1f3fe.png index 5cb1818e2..6bf3b56ec 100644 Binary files a/retroshare-gui/src/gui/emojione/270c-1f3fe.png and b/retroshare-gui/src/gui/emojione/270c-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/270c-1f3ff.png b/retroshare-gui/src/gui/emojione/270c-1f3ff.png index 0527d98d5..beff084fd 100644 Binary files a/retroshare-gui/src/gui/emojione/270c-1f3ff.png and b/retroshare-gui/src/gui/emojione/270c-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/270d-1f3fb.png b/retroshare-gui/src/gui/emojione/270d-1f3fb.png index 89c6711d9..d9c1b758e 100644 Binary files a/retroshare-gui/src/gui/emojione/270d-1f3fb.png and b/retroshare-gui/src/gui/emojione/270d-1f3fb.png differ diff --git a/retroshare-gui/src/gui/emojione/270d-1f3fc.png b/retroshare-gui/src/gui/emojione/270d-1f3fc.png index f316620ef..af0938d1d 100644 Binary files a/retroshare-gui/src/gui/emojione/270d-1f3fc.png and b/retroshare-gui/src/gui/emojione/270d-1f3fc.png differ diff --git a/retroshare-gui/src/gui/emojione/270d-1f3fd.png b/retroshare-gui/src/gui/emojione/270d-1f3fd.png index e11272d4b..da76c2555 100644 Binary files a/retroshare-gui/src/gui/emojione/270d-1f3fd.png and b/retroshare-gui/src/gui/emojione/270d-1f3fd.png differ diff --git a/retroshare-gui/src/gui/emojione/270d-1f3fe.png b/retroshare-gui/src/gui/emojione/270d-1f3fe.png index 4c38483b8..6f82c2a17 100644 Binary files a/retroshare-gui/src/gui/emojione/270d-1f3fe.png and b/retroshare-gui/src/gui/emojione/270d-1f3fe.png differ diff --git a/retroshare-gui/src/gui/emojione/270d-1f3ff.png b/retroshare-gui/src/gui/emojione/270d-1f3ff.png index 83e4202bf..510b2308b 100644 Binary files a/retroshare-gui/src/gui/emojione/270d-1f3ff.png and b/retroshare-gui/src/gui/emojione/270d-1f3ff.png differ diff --git a/retroshare-gui/src/gui/emojione/270d.png b/retroshare-gui/src/gui/emojione/270d.png index 28582012f..63f25652e 100644 Binary files a/retroshare-gui/src/gui/emojione/270d.png and b/retroshare-gui/src/gui/emojione/270d.png differ diff --git a/retroshare-gui/src/gui/emojione/2712.png b/retroshare-gui/src/gui/emojione/2712.png index 477e73839..54fb3bbf0 100644 Binary files a/retroshare-gui/src/gui/emojione/2712.png and b/retroshare-gui/src/gui/emojione/2712.png differ diff --git a/retroshare-gui/src/gui/emojione/2714.png b/retroshare-gui/src/gui/emojione/2714.png index 24860b106..c29b4b55e 100644 Binary files a/retroshare-gui/src/gui/emojione/2714.png and b/retroshare-gui/src/gui/emojione/2714.png differ diff --git a/retroshare-gui/src/gui/emojione/2716.png b/retroshare-gui/src/gui/emojione/2716.png index 51d5c0800..7f4285b49 100644 Binary files a/retroshare-gui/src/gui/emojione/2716.png and b/retroshare-gui/src/gui/emojione/2716.png differ diff --git a/retroshare-gui/src/gui/emojione/271d.png b/retroshare-gui/src/gui/emojione/271d.png index d5ba92c72..5195887ce 100644 Binary files a/retroshare-gui/src/gui/emojione/271d.png and b/retroshare-gui/src/gui/emojione/271d.png differ diff --git a/retroshare-gui/src/gui/emojione/2721.png b/retroshare-gui/src/gui/emojione/2721.png index c4a759e91..82db2ef47 100644 Binary files a/retroshare-gui/src/gui/emojione/2721.png and b/retroshare-gui/src/gui/emojione/2721.png differ diff --git a/retroshare-gui/src/gui/emojione/2728.png b/retroshare-gui/src/gui/emojione/2728.png index 149c60619..963220225 100644 Binary files a/retroshare-gui/src/gui/emojione/2728.png and b/retroshare-gui/src/gui/emojione/2728.png differ diff --git a/retroshare-gui/src/gui/emojione/2733.png b/retroshare-gui/src/gui/emojione/2733.png index 3e56937a7..c487bd572 100644 Binary files a/retroshare-gui/src/gui/emojione/2733.png and b/retroshare-gui/src/gui/emojione/2733.png differ diff --git a/retroshare-gui/src/gui/emojione/2734.png b/retroshare-gui/src/gui/emojione/2734.png index 0fdd1c22b..71dff354c 100644 Binary files a/retroshare-gui/src/gui/emojione/2734.png and b/retroshare-gui/src/gui/emojione/2734.png differ diff --git a/retroshare-gui/src/gui/emojione/2744.png b/retroshare-gui/src/gui/emojione/2744.png index 029cd6668..b9e938682 100644 Binary files a/retroshare-gui/src/gui/emojione/2744.png and b/retroshare-gui/src/gui/emojione/2744.png differ diff --git a/retroshare-gui/src/gui/emojione/2747.png b/retroshare-gui/src/gui/emojione/2747.png index fbc2027a6..563a3385d 100644 Binary files a/retroshare-gui/src/gui/emojione/2747.png and b/retroshare-gui/src/gui/emojione/2747.png differ diff --git a/retroshare-gui/src/gui/emojione/274C.png b/retroshare-gui/src/gui/emojione/274C.png index 51517b777..d7c51de17 100644 Binary files a/retroshare-gui/src/gui/emojione/274C.png and b/retroshare-gui/src/gui/emojione/274C.png differ diff --git a/retroshare-gui/src/gui/emojione/274E.png b/retroshare-gui/src/gui/emojione/274E.png index 62592c2bd..ba2ed2c47 100644 Binary files a/retroshare-gui/src/gui/emojione/274E.png and b/retroshare-gui/src/gui/emojione/274E.png differ diff --git a/retroshare-gui/src/gui/emojione/2753.png b/retroshare-gui/src/gui/emojione/2753.png index d654b9963..7bcfafc96 100644 Binary files a/retroshare-gui/src/gui/emojione/2753.png and b/retroshare-gui/src/gui/emojione/2753.png differ diff --git a/retroshare-gui/src/gui/emojione/2754.png b/retroshare-gui/src/gui/emojione/2754.png index 718b88127..1ded8f7f0 100644 Binary files a/retroshare-gui/src/gui/emojione/2754.png and b/retroshare-gui/src/gui/emojione/2754.png differ diff --git a/retroshare-gui/src/gui/emojione/2755.png b/retroshare-gui/src/gui/emojione/2755.png index 82e452634..274ab99f0 100644 Binary files a/retroshare-gui/src/gui/emojione/2755.png and b/retroshare-gui/src/gui/emojione/2755.png differ diff --git a/retroshare-gui/src/gui/emojione/2757.png b/retroshare-gui/src/gui/emojione/2757.png index 92192c80b..fb2bf3eee 100644 Binary files a/retroshare-gui/src/gui/emojione/2757.png and b/retroshare-gui/src/gui/emojione/2757.png differ diff --git a/retroshare-gui/src/gui/emojione/2763.png b/retroshare-gui/src/gui/emojione/2763.png index dfa5f2a28..bd83e5510 100644 Binary files a/retroshare-gui/src/gui/emojione/2763.png and b/retroshare-gui/src/gui/emojione/2763.png differ diff --git a/retroshare-gui/src/gui/emojione/2764.png b/retroshare-gui/src/gui/emojione/2764.png index 90416cbfe..2f86fb0a3 100644 Binary files a/retroshare-gui/src/gui/emojione/2764.png and b/retroshare-gui/src/gui/emojione/2764.png differ diff --git a/retroshare-gui/src/gui/emojione/2795.png b/retroshare-gui/src/gui/emojione/2795.png index cf2b485c3..2633b547b 100644 Binary files a/retroshare-gui/src/gui/emojione/2795.png and b/retroshare-gui/src/gui/emojione/2795.png differ diff --git a/retroshare-gui/src/gui/emojione/2796.png b/retroshare-gui/src/gui/emojione/2796.png index 7f6252c56..a57876596 100644 Binary files a/retroshare-gui/src/gui/emojione/2796.png and b/retroshare-gui/src/gui/emojione/2796.png differ diff --git a/retroshare-gui/src/gui/emojione/2797.png b/retroshare-gui/src/gui/emojione/2797.png index e783d9621..049dc5f78 100644 Binary files a/retroshare-gui/src/gui/emojione/2797.png and b/retroshare-gui/src/gui/emojione/2797.png differ diff --git a/retroshare-gui/src/gui/emojione/27A1.png b/retroshare-gui/src/gui/emojione/27A1.png index 14f3b155e..3de46cadc 100644 Binary files a/retroshare-gui/src/gui/emojione/27A1.png and b/retroshare-gui/src/gui/emojione/27A1.png differ diff --git a/retroshare-gui/src/gui/emojione/27B0.png b/retroshare-gui/src/gui/emojione/27B0.png index 0615483e8..790650251 100644 Binary files a/retroshare-gui/src/gui/emojione/27B0.png and b/retroshare-gui/src/gui/emojione/27B0.png differ diff --git a/retroshare-gui/src/gui/emojione/27BF.png b/retroshare-gui/src/gui/emojione/27BF.png index 6eb3fe43e..bbc0a9b9f 100644 Binary files a/retroshare-gui/src/gui/emojione/27BF.png and b/retroshare-gui/src/gui/emojione/27BF.png differ diff --git a/retroshare-gui/src/gui/emojione/2934.png b/retroshare-gui/src/gui/emojione/2934.png index 451d09d31..938570e11 100644 Binary files a/retroshare-gui/src/gui/emojione/2934.png and b/retroshare-gui/src/gui/emojione/2934.png differ diff --git a/retroshare-gui/src/gui/emojione/2935.png b/retroshare-gui/src/gui/emojione/2935.png index cab2fad57..afe0bea9e 100644 Binary files a/retroshare-gui/src/gui/emojione/2935.png and b/retroshare-gui/src/gui/emojione/2935.png differ diff --git a/retroshare-gui/src/gui/emojione/2B05.png b/retroshare-gui/src/gui/emojione/2B05.png index 6c05e76a4..77f7c1ded 100644 Binary files a/retroshare-gui/src/gui/emojione/2B05.png and b/retroshare-gui/src/gui/emojione/2B05.png differ diff --git a/retroshare-gui/src/gui/emojione/2B06.png b/retroshare-gui/src/gui/emojione/2B06.png index a4deaddd9..cc6483d96 100644 Binary files a/retroshare-gui/src/gui/emojione/2B06.png and b/retroshare-gui/src/gui/emojione/2B06.png differ diff --git a/retroshare-gui/src/gui/emojione/2B07.png b/retroshare-gui/src/gui/emojione/2B07.png index f1c689184..d91282c81 100644 Binary files a/retroshare-gui/src/gui/emojione/2B07.png and b/retroshare-gui/src/gui/emojione/2B07.png differ diff --git a/retroshare-gui/src/gui/emojione/2B1B.png b/retroshare-gui/src/gui/emojione/2B1B.png index 31e81e7fd..e56ebc2c4 100644 Binary files a/retroshare-gui/src/gui/emojione/2B1B.png and b/retroshare-gui/src/gui/emojione/2B1B.png differ diff --git a/retroshare-gui/src/gui/emojione/2B1C.png b/retroshare-gui/src/gui/emojione/2B1C.png index d579a3719..b9ad0060b 100644 Binary files a/retroshare-gui/src/gui/emojione/2B1C.png and b/retroshare-gui/src/gui/emojione/2B1C.png differ diff --git a/retroshare-gui/src/gui/emojione/2B50.png b/retroshare-gui/src/gui/emojione/2B50.png index 903ed20c0..010e5b6e8 100644 Binary files a/retroshare-gui/src/gui/emojione/2B50.png and b/retroshare-gui/src/gui/emojione/2B50.png differ diff --git a/retroshare-gui/src/gui/emojione/2B55.png b/retroshare-gui/src/gui/emojione/2B55.png index 0cf133dcd..1afe744fc 100644 Binary files a/retroshare-gui/src/gui/emojione/2B55.png and b/retroshare-gui/src/gui/emojione/2B55.png differ diff --git a/retroshare-gui/src/gui/emojione/3030.png b/retroshare-gui/src/gui/emojione/3030.png index f9b466c20..110c6fd79 100644 Binary files a/retroshare-gui/src/gui/emojione/3030.png and b/retroshare-gui/src/gui/emojione/3030.png differ diff --git a/retroshare-gui/src/gui/emojione/303D.png b/retroshare-gui/src/gui/emojione/303D.png index e73c8671e..890eb6a52 100644 Binary files a/retroshare-gui/src/gui/emojione/303D.png and b/retroshare-gui/src/gui/emojione/303D.png differ diff --git a/retroshare-gui/src/gui/emojione/3297.png b/retroshare-gui/src/gui/emojione/3297.png index 52f00c98d..524dc250d 100644 Binary files a/retroshare-gui/src/gui/emojione/3297.png and b/retroshare-gui/src/gui/emojione/3297.png differ diff --git a/retroshare-gui/src/gui/emojione/3299.png b/retroshare-gui/src/gui/emojione/3299.png index 598eeba69..bf3cae98a 100644 Binary files a/retroshare-gui/src/gui/emojione/3299.png and b/retroshare-gui/src/gui/emojione/3299.png differ diff --git a/retroshare-gui/src/gui/emojione/emotes.acs b/retroshare-gui/src/gui/emojione/emotes.acs index a9ded10a9..7db8ef8f6 100644 --- a/retroshare-gui/src/gui/emojione/emotes.acs +++ b/retroshare-gui/src/gui/emojione/emotes.acs @@ -1,78 +1,88 @@ { "emojione/people.png"|":grinning:":"emojione/1F600.png"; -"emojione/people.png"|":grin:":"emojione/1F601.png"; -"emojione/people.png"|":joy:|:')|:'-)":"emojione/1F602.png"; -"emojione/people.png"|":smile:|:-DD|:DD":"emojione/1F604.png"; "emojione/people.png"|":smiley:|:-D|:D":"emojione/1F603.png"; -"emojione/people.png"|":sweat_smile:|':)|':-)|'=)|':D|':-D|'=D":"emojione/1F605.png"; +"emojione/people.png"|":smile:|:-DD|:DD":"emojione/1F604.png"; +"emojione/people.png"|":grin:":"emojione/1F601.png"; "emojione/people.png"|":laughing:|:satisfied":"emojione/1F606.png"; -"emojione/people.png"|":innocent:|O:-)|0:-3|0:3|0:-)|0:)":"emojione/1F607.png"; -"emojione/people.png"|":wink:|;-)|;)":"emojione/1F609.png"; +"emojione/people.png"|":sweat_smile:|':)|':-)|'=)|':D|':-D|'=D":"emojione/1F605.png"; +"emojione/people.png"|":joy:|:')|:'-)":"emojione/1F602.png"; +"emojione/people.png"|":rofl:":"emojione/1f923.png"; "emojione/people.png"|":blush:":"emojione/1F60A.png"; "emojione/people.png"|":relaxed:":"emojione/263A.png"; -"emojione/people.png"|":yum:":"emojione/1F60B.png"; +"emojione/people.png"|":innocent:|O:-)|0:-3|0:3|0:-)|0:)":"emojione/1F607.png"; +"emojione/people.png"|":slight_smile:|:)|:-)|:slightly_smiling_face:":"emojione/1F642.png"; +"emojione/people.png"|":updside_down_face:":"emojione/1f643.png"; +"emojione/people.png"|":wink:|;-)|;)":"emojione/1F609.png"; "emojione/people.png"|":relieved:":"emojione/1F60C.png"; "emojione/people.png"|":heart_eyes:":"emojione/1F60D.png"; -"emojione/people.png"|":sunglasses:|B-)|B)|8)|8-)|B-D|8-D":"emojione/1F60E.png"; -"emojione/people.png"|":smirk:":"emojione/1F60F.png"; -"emojione/people.png"|":neutral_face:":"emojione/1F610.png"; -"emojione/people.png"|":expressionless:|-_-":"emojione/1F611.png"; -"emojione/people.png"|":unamused:":"emojione/1F612.png"; -"emojione/people.png"|":sweat:|':(|':-(|'=(":"emojione/1F613.png"; -"emojione/people.png"|":pensive:":"emojione/1F614.png"; -"emojione/people.png"|":confused:|:-/|:-.|:\|=/|=\|:L|=L":"emojione/1F615.png"; -"emojione/people.png"|":confounded:":"emojione/1F616.png"; -"emojione/people.png"|":kissing:":"emojione/1F617.png"; "emojione/people.png"|":kissing_heart:|:*|:-*|=*":"emojione/1F618.png"; +"emojione/people.png"|":kissing:":"emojione/1F617.png"; "emojione/people.png"|":kissing_smiling_eyes:":"emojione/1F619.png"; "emojione/people.png"|":kissing_closed_eyes:":"emojione/1F61A.png"; +"emojione/people.png"|":yum:":"emojione/1F60B.png"; "emojione/people.png"|":stuck_out_tongue:|:-P|:P|:p|:-p":"emojione/1F61B.png"; "emojione/people.png"|":stuck_out_tongue_winking_eye:":"emojione/1F61C.png"; "emojione/people.png"|":stuck_out_tongue_closed_eyes:":"emojione/1F61D.png"; +"emojione/people.png"|":money_mouth_face:":"emojione/1f911.png"; +"emojione/people.png"|":hugging:":"emojione/1f917.png"; +"emojione/people.png"|":nerd_face:":"emojione/1f913.png"; +"emojione/people.png"|":sunglasses:|B-)|B)|8)|8-)|B-D|8-D":"emojione/1F60E.png"; +"emojione/people.png"|":smirk:":"emojione/1F60F.png"; +"emojione/people.png"|":unamused:":"emojione/1F612.png"; "emojione/people.png"|":disappointed:|:-(|:(":"emojione/1F61E.png"; +"emojione/people.png"|":pensive:":"emojione/1F614.png"; "emojione/people.png"|":worried:":"emojione/1F61F.png"; +"emojione/people.png"|":confused:|:-/|:-.|:\|=/|=\|:L|=L":"emojione/1F615.png"; +"emojione/people.png"|":slight_frown:|:slightly_frowning_face:":"emojione/1F641.png"; +"emojione/people.png"|":frowning2:":"emojione/2639.png"; +"emojione/people.png"|":persevere:":"emojione/1F623.png"; +"emojione/people.png"|":confounded:":"emojione/1F616.png"; +"emojione/people.png"|":tired_face:":"emojione/1F62B.png"; +"emojione/people.png"|":weary:":"emojione/1F629.png"; +"emojione/people.png"|":triumph:":"emojione/1F624.png"; "emojione/people.png"|":angry:|:@":"emojione/1F620.png"; "emojione/people.png"|":rage:":"emojione/1F621.png"; -"emojione/people.png"|":cry:|:'(|:'-(|;(|;-(":"emojione/1F622.png"; -"emojione/people.png"|":persevere:":"emojione/1F623.png"; -"emojione/people.png"|":triumph:":"emojione/1F624.png"; -"emojione/people.png"|":disappointed_relieved:":"emojione/1F625.png"; -"emojione/people.png"|":frowning:":"emojione/1F626.png"; -"emojione/people.png"|":anguished:":"emojione/1F627.png"; -"emojione/people.png"|":fearful:":"emojione/1F628.png"; -"emojione/people.png"|":weary:":"emojione/1F629.png"; -"emojione/people.png"|":sleepy:":"emojione/1F62A.png"; -"emojione/people.png"|":tired_face:":"emojione/1F62B.png"; -"emojione/people.png"|":grimacing:":"emojione/1F62C.png"; -"emojione/people.png"|":sob:":"emojione/1F62D.png"; -"emojione/people.png"|":open_mouth:|:-O|:O":"emojione/1F62E.png"; -"emojione/people.png"|":hushed:":"emojione/1F62F.png"; -"emojione/people.png"|":cold_sweat:":"emojione/1F630.png"; -"emojione/people.png"|":scream:":"emojione/1F631.png"; -"emojione/people.png"|":astonished:":"emojione/1F632.png"; -"emojione/people.png"|":flushed:|=$|:$|:-$":"emojione/1F633.png"; -"emojione/people.png"|":sleeping:":"emojione/1F634.png"; -"emojione/people.png"|":dizzy_face:|#-)|#)|%-)|%)|X)|X-)":"emojione/1F635.png"; "emojione/people.png"|":no_mouth:|:-X|:X:|-#|:#|=X|=x|:x|:-x|=#":"emojione/1F636.png"; -"emojione/people.png"|":mask:":"emojione/1F637.png"; -"emojione/people.png"|":slight_frown:|:slightly_frowning_face:":"emojione/1F641.png"; -"emojione/people.png"|":slight_smile:|:)|:-)|:slightly_smiling_face:":"emojione/1F642.png"; -"emojione/people.png"|":zipper_mouth_face:":"emojione/1f910.png"; -"emojione/people.png"|":money_mouth_face:":"emojione/1f911.png"; -"emojione/people.png"|":face_with_thermometer:":"emojione/1f912.png"; -"emojione/people.png"|":nerd_face:":"emojione/1f913.png"; +"emojione/people.png"|":neutral_face:":"emojione/1F610.png"; +"emojione/people.png"|":expressionless:|-_-":"emojione/1F611.png"; +"emojione/people.png"|":hushed:":"emojione/1F62F.png"; +"emojione/people.png"|":frowning:":"emojione/1f626.png"; +"emojione/people.png"|":anguished:":"emojione/1F627.png"; +"emojione/people.png"|":open_mouth:|:-O|:O":"emojione/1F62E.png"; +"emojione/people.png"|":astonished:":"emojione/1F632.png"; +"emojione/people.png"|":dizzy_face:|#-)|#)|%-)|%)|X)|X-)":"emojione/1F635.png"; +"emojione/people.png"|":flushed:|=$|:$|:-$":"emojione/1F633.png"; +"emojione/people.png"|":scream:":"emojione/1F631.png"; +"emojione/people.png"|":fearful:":"emojione/1F628.png"; +"emojione/people.png"|":cold_sweat:":"emojione/1F630.png"; +"emojione/people.png"|":cry:|:'(|:'-(|;(|;-(":"emojione/1F622.png"; +"emojione/people.png"|":disappointed_relieved:":"emojione/1F625.png"; +"emojione/people.png"|":drooling_face:":"emojione/1f924.png"; +"emojione/people.png"|":sob:":"emojione/1F62D.png"; +"emojione/people.png"|":sweat:|':(|':-(|'=(":"emojione/1F613.png"; +"emojione/people.png"|":sleepy:":"emojione/1F62A.png"; +"emojione/people.png"|":sleeping:":"emojione/1F634.png"; +"emojione/people.png"|":rolling_eyes:":"emojione/1f644.png"; "emojione/people.png"|":thinking_face:":"emojione/1f914.png"; +"emojione/people.png"|":lying_face:":"emojione/1f925.png"; +"emojione/people.png"|":grimacing:":"emojione/1F62C.png"; +"emojione/people.png"|":zipper_mouth_face:":"emojione/1f910.png"; +"emojione/people.png"|":sick:":"emojione/1f922.png"; +"emojione/people.png"|":sneeze:":"emojione/1f927.png"; +"emojione/people.png"|":mask:":"emojione/1F637.png"; +"emojione/people.png"|":face_with_thermometer:":"emojione/1f912.png"; "emojione/people.png"|":head_bandage:":"emojione/1f915.png"; -"emojione/people.png"|":updside_down_face:":"emojione/1f643.png"; "emojione/people.png"|":smiling_imp:":"emojione/1F608.png"; "emojione/people.png"|":imp:":"emojione/1F47F.png"; "emojione/people.png"|":japanese_ogre:":"emojione/1F479.png"; "emojione/people.png"|":japanese_goblin:":"emojione/1F47A.png"; -"emojione/people.png"|":skull:|:skeleton:":"emojione/1F480.png"; "emojione/people.png"|":ghost:":"emojione/1F47B.png"; +"emojione/people.png"|":skull:|:skeleton:":"emojione/1F480.png"; +"emojione/people.png"|":skull_crossbones:":"emojione/2620.png"; "emojione/people.png"|":alien:":"emojione/1F47D.png"; "emojione/people.png"|":space_invader:":"emojione/1F47E.png"; "emojione/people.png"|":robot_face:":"emojione/1f916.png"; +"emojione/people.png"|":jack_o_lantern:":"emojione/1f383.png"; "emojione/people.png"|":poop:|:shit:|:hankey:|:poo:":"emojione/1F4A9.png"; "emojione/people.png"|":smile_cat:|(@)":"emojione/1F638.png"; "emojione/people.png"|":joy_cat:":"emojione/1F639.png"; @@ -405,7 +415,6 @@ "emojione/travel.png"|":stars:":"emojione/1F320.png"; "emojione/travel.png"|":rainbow:":"emojione/1F308.png"; "emojione/travel.png"|":rice_scene:":"emojione/1F391.png"; -"emojione/objects.png"|"skull_crossbones":"emojione/2620.png"; "emojione/objects.png"|":love_letter:":"emojione/1F48C.png"; "emojione/objects.png"|":bomb:":"emojione/1F4A3.png"; "emojione/objects.png"|":hole:":"emojione/1F573.png"; diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp index 1135a1dda..d154408b7 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp @@ -44,9 +44,6 @@ * #define DEBUG_ITEM 1 ****/ -#define COLOR_NORMAL QColor(248, 248, 248) -#define COLOR_NEW QColor(220, 236, 253) - GxsChannelPostItem::GxsChannelPostItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate,const std::set& older_versions) : GxsFeedItem(feedHolder, feedId, groupId, messageId, isHome, rsGxsChannels, autoUpdate) { @@ -69,9 +66,9 @@ void GxsChannelPostItem::init(const RsGxsMessageId& messageId,const std::setsubjectLabel->setMinimumWidth(100); ui->warning_label->setMinimumWidth(100); - ui->mainFrame->setProperty("state", ""); - QPalette palette = ui->mainFrame->palette(); - palette.setColor(ui->mainFrame->backgroundRole(), COLOR_NORMAL); - ui->mainFrame->setPalette(palette); + ui->mainFrame->setProperty("new", false); + ui->mainFrame->style()->unpolish(ui->mainFrame); + ui->mainFrame->style()->polish( ui->mainFrame); ui->expandFrame->hide(); } @@ -516,7 +512,12 @@ void GxsChannelPostItem::fill() ui->datetimelabel->setText(DateTime::formatLongDateTime(mPost.mMeta.mPublishTs)); - ui->filelabel->setText(QString("(%1 %2) %3").arg(mPost.mCount).arg(tr("Files")).arg(misc::friendlyUnit(mPost.mSize))); + if ( (mPost.mCount != 0) || (mPost.mSize != 0) ) { + ui->filelabel->setVisible(true); + ui->filelabel->setText(QString("(%1 %2) %3").arg(mPost.mCount).arg(tr("Files")).arg(misc::friendlyUnit(mPost.mSize))); + } else { + ui->filelabel->setVisible(false); + } if (mFileItems.empty() == false) { std::list::iterator it; @@ -579,16 +580,9 @@ void GxsChannelPostItem::setReadStatus(bool isNew, bool isUnread) ui->newLabel->setVisible(isNew); - /* unpolish widget to clear the stylesheet's palette cache */ - ui->mainFrame->style()->unpolish(ui->mainFrame); - - QPalette palette = ui->mainFrame->palette(); - palette.setColor(ui->mainFrame->backgroundRole(), isNew ? COLOR_NEW : COLOR_NORMAL); // QScrollArea - palette.setColor(QPalette::Base, isNew ? COLOR_NEW : COLOR_NORMAL); // QTreeWidget - ui->mainFrame->setPalette(palette); - ui->mainFrame->setProperty("new", isNew); - Rshare::refreshStyleSheet(ui->mainFrame, false); + ui->mainFrame->style()->unpolish(ui->mainFrame); + ui->mainFrame->style()->polish( ui->mainFrame); } void GxsChannelPostItem::setFileCleanUpWarning(uint32_t time_left) diff --git a/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp b/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp index b37b72ef1..c130e1031 100644 --- a/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp @@ -39,9 +39,6 @@ * #define DEBUG_ITEM 1 ****/ -#define COLOR_NORMAL QColor(248, 248, 248) -#define COLOR_NEW QColor(220, 236, 253) - #define CIRCLESDIALOG_GROUPUPDATE 3 diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp index 2f4ec243e..97ac9dd75 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp @@ -39,9 +39,6 @@ * #define DEBUG_ITEM 1 ****/ -#define COLOR_NORMAL QColor(248, 248, 248) -#define COLOR_NEW QColor(220, 236, 253) - GxsForumMsgItem::GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate) : GxsFeedItem(feedHolder, feedId, groupId, messageId, isHome, rsGxsForums, autoUpdate) { @@ -415,16 +412,9 @@ void GxsForumMsgItem::toggle() void GxsForumMsgItem::setReadStatus(bool isNew, bool /*isUnread*/) { - /* unpolish widget to clear the stylesheet's palette cache */ - ui->frame->style()->unpolish(ui->frame); - - QPalette palette = ui->frame->palette(); - palette.setColor(ui->frame->backgroundRole(), isNew ? COLOR_NEW : COLOR_NORMAL); // QScrollArea - palette.setColor(QPalette::Base, isNew ? COLOR_NEW : COLOR_NORMAL); // QTreeWidget - ui->frame->setPalette(palette); - ui->frame->setProperty("new", isNew); - Rshare::refreshStyleSheet(ui->frame, false); + ui->frame->style()->unpolish(ui->frame); + ui->frame->style()->polish( ui->frame); } void GxsForumMsgItem::requestParentMessage(const RsGxsMessageId &msgId) diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp index 8c4f2c524..e8b15ed8e 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp @@ -412,6 +412,11 @@ void CreateGxsChannelMsg::addExtraFile() } } +void CreateGxsChannelMsg::addSubject(const QString& text) +{ + subjectEdit->setText(text) ; +} + void CreateGxsChannelMsg::addHtmlText(const QString& text) { msgEdit->setHtml(text) ; diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h index 5168c6226..3e9f6ccc6 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h @@ -44,6 +44,7 @@ public: ~CreateGxsChannelMsg(); void addHtmlText(const QString& text) ; + void addSubject(const QString& text) ; void addAttachment(const std::string &path); void addAttachment(const RsFileHash &hash, const std::string &fname, uint64_t size, bool local, const RsPeerId &srcId,bool assume_file_ready = false); diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp index c011621a8..4bff7528b 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp @@ -87,6 +87,12 @@ void GxsChannelDialog::shareOnChannel(const RsGxsGroupId& channel_id,const QList for(QList::const_iterator it(file_links.begin());it!=file_links.end();++it) txt += (*it).toHtml() + "\n" ; + if(!file_links.empty()) + { + QString subject = (*file_links.begin()).name() ; + msgDialog->addSubject(subject); + } + msgDialog->addHtmlText(txt); msgDialog->show(); } diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp index c0fe50316..60f34221f 100644 --- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp +++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp @@ -152,12 +152,13 @@ void CreateGxsForumMsg::newMsg() mStateHelper->setActive(CREATEGXSFORUMMSG_FORUMINFO, false); mStateHelper->setActive(CREATEGXSFORUMMSG_PARENTMSG, false); mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, false); + mStateHelper->clear(CREATEGXSFORUMMSG_FORUMINFO); mStateHelper->clear(CREATEGXSFORUMMSG_PARENTMSG); mStateHelper->clear(CREATEGXSFORUMMSG_ORIGMSG); ui.forumName->setText(tr("No Forum")); return; - }//if ( mForumId.isNull()) + } {/* request Data */ mStateHelper->setLoading(CREATEGXSFORUMMSG_FORUMINFO, true); @@ -192,7 +193,7 @@ void CreateGxsForumMsg::newMsg() uint32_t token; mForumQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, msgIds, CREATEGXSFORUMMSG_PARENTMSG); - }//if (mParentId.isNull()) + } if (mOrigMsgId.isNull()) { mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, true); @@ -212,7 +213,7 @@ void CreateGxsForumMsg::newMsg() uint32_t token; mForumQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, msgIds, CREATEGXSFORUMMSG_ORIGMSG); - }//if (mParentId.isNull()) + } } void CreateGxsForumMsg::loadFormInformation() @@ -307,17 +308,14 @@ void CreateGxsForumMsg::loadFormInformation() } ui.forumName->setText(misc::removeNewLine(name)); - ui.forumSubject->setText(misc::removeNewLine(subj)); - //ui.forumSubject->setReadOnly(!mOrigMsgId.isNull()); + + if(!subj.isNull()) + ui.forumSubject->setText(misc::removeNewLine(subj)); if (ui.forumSubject->text().isEmpty()) - { ui.forumSubject->setFocus(); - } else - { ui.forumMessage->setFocus(); - } #ifdef TOGXS if (mForumMeta.mGroupFlags & RS_DISTRIB_AUTHEN_REQ) @@ -687,8 +685,12 @@ void CreateGxsForumMsg::loadRequest(const TokenQueue *queue, const TokenRequest } } } +void CreateGxsForumMsg::setSubject(const QString& msg) +{ + ui.forumSubject->setText(msg); +} -void CreateGxsForumMsg::insertPastedText(QString msg) +void CreateGxsForumMsg::insertPastedText(const QString& msg) { ui.forumMessage->append(msg); } diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h index 7f84a434b..a7e4c78c3 100644 --- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h +++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h @@ -41,7 +41,8 @@ public: void newMsg(); /* cleanup */ virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req); -void insertPastedText(QString msg) ; + void insertPastedText(const QString& msg) ; + void setSubject(const QString& msg); private slots: void fileHashingFinished(QList hashedFiles); diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp index 9dcbc24f5..38a57742f 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp @@ -22,6 +22,7 @@ #include "GxsForumsDialog.h" #include "GxsForumGroupDialog.h" #include "GxsForumThreadWidget.h" +#include "CreateGxsForumMsg.h" #include "GxsForumUserNotify.h" #include "gui/notifyqt.h" #include "gui/gxs/GxsGroupShareKey.h" @@ -60,6 +61,24 @@ QString GxsForumsDialog::getHelpString() const return hlp_str ; } +void GxsForumsDialog::shareInMessage(const RsGxsGroupId& forum_id,const QList& file_links) +{ + CreateGxsForumMsg *msgDialog = new CreateGxsForumMsg(forum_id,RsGxsMessageId(),RsGxsMessageId(),RsGxsId()) ; + + QString txt ; + for(QList::const_iterator it(file_links.begin());it!=file_links.end();++it) + txt += (*it).toHtml() + "\n" ; + + if(!file_links.empty()) + { + QString subject = (*file_links.begin()).name() ; + msgDialog->setSubject(subject); + } + + msgDialog->insertPastedText(txt); + msgDialog->show(); +} + UserNotify *GxsForumsDialog::getUserNotify(QObject *parent) { return new GxsForumUserNotify(rsGxsForums, parent); diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h index 60a713151..2183a9000 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h +++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h @@ -40,6 +40,8 @@ public: virtual UserNotify *getUserNotify(QObject *parent); + void shareInMessage(const RsGxsGroupId& forum_id, const QList& file_link) ; + protected: virtual QString getHelpString() const ; virtual RetroShareLink::enumType getLinkType() { return RetroShareLink::TYPE_FORUM; } diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index 43f061079..c7b21df03 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -76,8 +76,6 @@ #define ROLE_CONTACT_ID Qt::UserRole #define ROLE_CONTACT_SORT Qt::UserRole + 1 -#define COLOR_CONNECT Qt::blue - #define COLUMN_RECIPIENT_TYPE 0 #define COLUMN_RECIPIENT_ICON 1 #define COLUMN_RECIPIENT_NAME 2 diff --git a/retroshare-gui/src/gui/qss/stylesheet/qss.default b/retroshare-gui/src/gui/qss/stylesheet/qss.default index e3c01bca1..8be8eb2e1 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/qss.default +++ b/retroshare-gui/src/gui/qss/stylesheet/qss.default @@ -243,3 +243,10 @@ OpModeStatus[opMode="Gaming"] { OpModeStatus[opMode="Minimal"] { background: #FFCCCC; } + +[new=false] { + background: #F8F8F8; +} +[new=true] { + background: #DCECFD; +} diff --git a/retroshare-gui/src/gui/settings/ForumPage.cpp b/retroshare-gui/src/gui/settings/ForumPage.cpp index ef1c5dbe4..2c1622e93 100644 --- a/retroshare-gui/src/gui/settings/ForumPage.cpp +++ b/retroshare-gui/src/gui/settings/ForumPage.cpp @@ -34,7 +34,7 @@ ForumPage::ForumPage(QWidget * parent, Qt::WindowFlags flags) connect(ui.setMsgToReadOnActivate,SIGNAL(toggled(bool)),this,SLOT(updateMsgReadOnActivate())) ; connect(ui.expandNewMessages , SIGNAL(toggled(bool)), this, SLOT( updateExpandNewMessages())); - connect(ui.loadEmbeddedImages , SIGNAL(toggled(bool)), this, SLOT(updateLoadEmbeddedImage() )); + connect(ui.loadEmbeddedImages , SIGNAL(toggled(bool)), this, SLOT(updateLoadEmbeddedImages() )); connect(ui.loadEmoticons , SIGNAL(toggled(bool)), this, SLOT( updateLoadEmoticons() )); ui.groupFrameSettingsWidget->setType(GroupFrameSettings::Forum) ; diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index eac1323c8..666e69bab 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -408,9 +408,6 @@ true - - <html><head/><body><p>The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.</p></body></html> - [Hidden mode] diff --git a/retroshare-gui/src/gui/settings/rsettings.cpp b/retroshare-gui/src/gui/settings/rsettings.cpp index aeeb0db73..3c0565273 100644 --- a/retroshare-gui/src/gui/settings/rsettings.cpp +++ b/retroshare-gui/src/gui/settings/rsettings.cpp @@ -40,7 +40,7 @@ RSettings::RSettings(const QString settingsGroup) beginGroup(settingsGroup); } -RSettings::RSettings(std::string fileName, const QString settingsGroup) +RSettings::RSettings(const std::string &fileName, const QString settingsGroup) : QSettings(QString::fromStdString(fileName), QSettings::IniFormat) { m_bValid = true; diff --git a/retroshare-gui/src/gui/settings/rsettings.h b/retroshare-gui/src/gui/settings/rsettings.h index 095b84413..cde44e65b 100644 --- a/retroshare-gui/src/gui/settings/rsettings.h +++ b/retroshare-gui/src/gui/settings/rsettings.h @@ -40,7 +40,7 @@ public: /** Default constructor. The optional parameter group can be used to * set a prefix that will be prepended to keys specified to RSettings in * value() and setValue(). */ - RSettings(std::string fileName, const QString group = QString()); + RSettings(const std::string &fileName, const QString group = QString()); /** Resets all settings. */ static void reset(); diff --git a/retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp b/retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp index 980025a03..2c30c9b25 100644 --- a/retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp +++ b/retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp @@ -285,7 +285,7 @@ void BwCtrlWindow::updateBandwidth() std::string name = rsPeers->getPeerName(it->first); peer_item -> setData(COLUMN_PEERID, Qt::DisplayRole, QString::fromStdString(it->first.toStdString())); - peer_item -> setData(COLUMN_RSNAME, Qt::DisplayRole, QString::fromStdString(name)); + peer_item -> setData(COLUMN_RSNAME, Qt::DisplayRole, QString::fromUtf8(name.c_str())); peer_item -> setData(COLUMN_IN_RATE, Qt::DisplayRole, it->second.mRateIn); peer_item -> setData(COLUMN_IN_MAX, Qt::DisplayRole, it->second.mRateMaxIn); diff --git a/retroshare-gui/src/gui/toaster/ToasterItem.h b/retroshare-gui/src/gui/toaster/ToasterItem.h index 12c963f2c..4e446308f 100644 --- a/retroshare-gui/src/gui/toaster/ToasterItem.h +++ b/retroshare-gui/src/gui/toaster/ToasterItem.h @@ -32,7 +32,7 @@ class ToasterItem : public QObject public: /** Default Constructor */ - ToasterItem(QWidget *child = 0); + explicit ToasterItem(QWidget *child = 0); /** Default Destructor */ virtual ~ToasterItem(); diff --git a/retroshare-gui/src/idle/idle.cpp b/retroshare-gui/src/idle/idle.cpp index 5110a10b3..14ff41df3 100644 --- a/retroshare-gui/src/idle/idle.cpp +++ b/retroshare-gui/src/idle/idle.cpp @@ -115,9 +115,9 @@ int Idle::secondsIdle() d->startTime = beginIdle; } // beginIdle earlier than startTime? - else if(t > 0) { - // do nothing - } + //else if(t > 0) { //t is always > 0 + // // do nothing + //} // how long have we been idle? int idleTime = d->startTime.secsTo(QDateTime::currentDateTime()); diff --git a/retroshare-gui/src/qss/blacknight.qss b/retroshare-gui/src/qss/blacknight.qss index 4a454c54e..1b89a5f4c 100644 --- a/retroshare-gui/src/qss/blacknight.qss +++ b/retroshare-gui/src/qss/blacknight.qss @@ -3,7 +3,7 @@ HeaderFrame { border: 0px; } -ForumsDialog +ForumsDialog, GxsForumThreadWidget { qproperty-textColorRead: gray; qproperty-textColorUnread: white; @@ -292,3 +292,10 @@ OpModeStatus[opMode="Gaming"] { OpModeStatus[opMode="Minimal"] { background: #700000; } + +[new=false] { + background: #202020; +} +[new=true] { + background: #005000; +} diff --git a/retroshare-gui/src/qss/qdarkstyle.qss b/retroshare-gui/src/qss/qdarkstyle.qss index ad18bd402..224497a48 100644 --- a/retroshare-gui/src/qss/qdarkstyle.qss +++ b/retroshare-gui/src/qss/qdarkstyle.qss @@ -35,7 +35,7 @@ QProgressBar::chunk:horizontal { } QFrame#titleBarFrame, QFrame#toolBarFrame -{ +{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #616161, stop: 0.5 #505050, stop: 0.6 #434343, stop:1 #656565); @@ -74,6 +74,15 @@ QWidget:item:selected stop: 0 #78879b, stop: 1 #78879b); } +ForumsDialog, GxsForumThreadWidget +{ + qproperty-textColorRead: gray; + qproperty-textColorUnread: white; + qproperty-textColorUnreadChildren: gray; + qproperty-textColorNotSubscribed: white; + qproperty-textColorMissing: red; +} + QMenuBar { background-color: #302F2F; @@ -1079,3 +1088,10 @@ OpModeStatus[opMode="Gaming"] { OpModeStatus[opMode="Minimal"] { background: #700000; } + +[new=false] { + background: #202020; +} +[new=true] { + background: #005000; +} diff --git a/retroshare-gui/src/util/HandleRichText.cpp b/retroshare-gui/src/util/HandleRichText.cpp index ee087d66e..cbe524cf7 100644 --- a/retroshare-gui/src/util/HandleRichText.cpp +++ b/retroshare-gui/src/util/HandleRichText.cpp @@ -388,6 +388,20 @@ void RsHtml::embedHtml(QTextDocument *textDocument, QDomDocument& doc, QDomEleme replaceAnchorWithImg(doc, element, textDocument, link); } } + else + { + QUrl url(element.attribute("href")); + if(url.isValid()) + { + QString title = url.host(); + if (!title.isEmpty()) { + element.setAttribute("title", title); + } + if (textDocument && (flag & RSHTML_FORMATTEXT_REPLACE_LINKS)) { + replaceAnchorWithImg(doc, element, textDocument, url); + } + } + } } else { if (textDocument && (flag & RSHTML_FORMATTEXT_REPLACE_LINKS)) { RetroShareLink link(element.attribute("href")); @@ -443,6 +457,20 @@ void RsHtml::embedHtml(QTextDocument *textDocument, QDomDocument& doc, QDomEleme replaceAnchorWithImg(doc, insertedTag, textDocument, link); } } + else + { + QUrl url(myRE.cap(0)); + if(url.isValid()) + { + QString title = url.host(); + if (!title.isEmpty()) { + insertedTag.setAttribute("title", title); + } + if (textDocument && (flag & RSHTML_FORMATTEXT_REPLACE_LINKS)) { + replaceAnchorWithImg(doc, insertedTag, textDocument, url); + } + } + } } break; case Img: diff --git a/retroshare-gui/src/util/framecatcher.cpp b/retroshare-gui/src/util/framecatcher.cpp index c771fc49e..8d1331797 100644 --- a/retroshare-gui/src/util/framecatcher.cpp +++ b/retroshare-gui/src/util/framecatcher.cpp @@ -25,7 +25,7 @@ #include -framecatcher::framecatcher(): xine(NULL), stream(NULL), vo_port(NULL){ +framecatcher::framecatcher(): xine(NULL), stream(NULL), vo_port(NULL) , length(0){ // start up drivers std::string vo_driver = "auto"; diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp index c0cc2cde4..ca2716b09 100644 --- a/retroshare-gui/src/util/imageutil.cpp +++ b/retroshare-gui/src/util/imageutil.cpp @@ -64,9 +64,10 @@ bool ImageUtil::optimizeSize(QString &html, const QImage& original, QImage &opti //Downscale the image to fit into maxPixels double whratio = (qreal)original.width() / (qreal)original.height(); int maxwidth; - if(maxPixels > 0) - maxwidth = (int)sqrt((double)(maxPixels) * whratio); - else + if(maxPixels > 0) { + int maxwidth2 = (int)sqrt((double)(maxPixels) * whratio); + maxwidth = (original.width() > maxwidth2) ? maxwidth2 : original.width(); + } else maxwidth = original.width(); int minwidth = (int)sqrt(100.0 * whratio); diff --git a/retroshare-nogui/src/notifytxt.cc b/retroshare-nogui/src/notifytxt.cc index 3c5651dc7..18212b17e 100644 --- a/retroshare-nogui/src/notifytxt.cc +++ b/retroshare-nogui/src/notifytxt.cc @@ -152,7 +152,7 @@ void NotifyTxt::displayNeighbours() rsPeers->getGPGAllList(neighs); std::ostringstream out; - for(it = neighs.begin(); it != neighs.end(); it++) + for(it = neighs.begin(); it != neighs.end(); ++it) { RsPeerDetails detail; rsPeers->getGPGDetails(*it, detail); @@ -172,7 +172,7 @@ void NotifyTxt::displayFriends() rsPeers->getFriendList(ids); std::ostringstream out; - for(it = ids.begin(); it != ids.end(); it++) + for(it = ids.begin(); it != ids.end(); ++it) { RsPeerDetails detail; rsPeers->getPeerDetails(*it, detail); @@ -245,7 +245,7 @@ void NotifyTxt::notifyTurtleSearchResult(uint32_t search_id,const std::list::const_iterator fit; - for(fit = found_files.begin(); fit != found_files.end(); fit++) + for(fit = found_files.begin(); fit != found_files.end(); ++fit) { it->second.push_back(*fit); } @@ -259,7 +259,7 @@ void NotifyTxt::getSearchIds(std::list &searchIds) RsStackMutex stack(mNotifyMtx); /****** LOCKED *****/ std::map >::iterator it; - for(it = mSearchResults.begin(); it != mSearchResults.end(); it++) + for(it = mSearchResults.begin(); it != mSearchResults.end(); ++it) { searchIds.push_back(it->first); } diff --git a/retroshare-qml-app/src/libresapilocalclient.cpp b/retroshare-qml-app/src/libresapilocalclient.cpp index 680851752..e332e7b94 100644 --- a/retroshare-qml-app/src/libresapilocalclient.cpp +++ b/retroshare-qml-app/src/libresapilocalclient.cpp @@ -106,7 +106,14 @@ void LibresapiLocalClient::read() QJSValue&& params(p.mCallback.engine()->newObject()); params.setProperty("response", receivedMsg); - p.mCallback.call(QJSValueList { params }); + QJSValue temp = p.mCallback.call(QJSValueList { params }); + if(temp.isError()) + { + qCritical() << __PRETTY_FUNCTION__ + << "JavaScript callback uncaught exception:" + << temp.property("stack").toString() + << temp.toString(); + } } // In case of multiple reply coaleshed in the same signal