From 26a3384f5a13820cc351c8ed06ce3530e86ab7ff Mon Sep 17 00:00:00 2001 From: ovalseven8 Date: Sun, 20 Dec 2015 14:28:53 +0100 Subject: [PATCH 1/3] Change order so that there are less problems with displaying unicode characters --- smileys/Basic/emoticons.xml | 50 +++++++++++++++++------------------ smileys/Classic/emoticons.xml | 28 ++++++++++---------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/smileys/Basic/emoticons.xml b/smileys/Basic/emoticons.xml index 17b5f3bc1..33b2c0682 100644 --- a/smileys/Basic/emoticons.xml +++ b/smileys/Basic/emoticons.xml @@ -3,17 +3,17 @@ - 😇 :angel: 0:) O:) 0:-) O:-) + 😇 - 🍺 :beer: + 🍺 @@ -29,14 +29,13 @@ - 😢 :cry: :'( :,( + 😢 - 😈 :devil: :666: }:-) @@ -44,6 +43,7 @@ ]:-) ]:-> >:-> + 😈 @@ -75,15 +75,15 @@ - ❤ <3 :heart: :love: + ❤ - 🙋 :hi: + 🙋 @@ -99,31 +99,31 @@ - 😛 :impertinent: :-P :-p :P :p + 😛 - 😍 :inlove: + 😍 - 😙 :kiss: :* :-* + 😙 - 😄 :lol: :D :-D + 😄 @@ -151,12 +151,12 @@ - 🙊 :silence: :-x :-X :x :X + 🙊 @@ -180,8 +180,8 @@ - 🌧 :rain: + 🌧 @@ -192,10 +192,10 @@ - 😞 :sad: :( :-( + 😞 @@ -205,17 +205,17 @@ - 😴 :sleeping: |-) #) + 😴 - ☺ :smile: :-) :) + ☺ @@ -240,10 +240,10 @@ - 😉 :wink: ;-) ;) + 😉 @@ -256,16 +256,16 @@ - 😆 XD xD + 😆 - 😝 :emoticonmashup: XP xP + 😝 @@ -274,23 +274,23 @@ - 💣 :bomb: + 💣 - 🍪 :cookie: + 🍪 - 🔷 :diamond: + 🔷 - 👁 :eye: + 👁 @@ -299,9 +299,9 @@ - 💉 :syringe: :injection: + 💉 @@ -328,17 +328,17 @@ - 😎 :cool: 8) 8-) + 😎 - 😠 :angry: >:-( >:( + 😠 diff --git a/smileys/Classic/emoticons.xml b/smileys/Classic/emoticons.xml index c6f816f7b..50815abed 100644 --- a/smileys/Classic/emoticons.xml +++ b/smileys/Classic/emoticons.xml @@ -1,85 +1,85 @@ - 😊 :) :-) + 😊 - 😎 8-) 8) + 😎 - 😲 :O :-O + 😲 - 😋 :p :P + 😋 - 😕 :/ :-/ + 😕 - 😉 ;) ;-) + 😉 - 😖 :( :-( + 😖 - 😢 ;( ;-( + 😢 - 😃 :D :-D + 😃 - 😐 :| :-| + 😐 - 😄 ;D ;-D + 😄 - 😠 :@ + 😠 - 😨 D: + 😨 - 😆 xD XD + 😆 From 015a3be2c0b9206142e85722bcab5db937453730 Mon Sep 17 00:00:00 2001 From: ovalseven8 Date: Sun, 20 Dec 2015 15:46:13 +0100 Subject: [PATCH 2/3] Smiley changes: - Removed 'Kappa'-smiley from 'Classic'-pack because it doesn't fit in this pack - Removed 'raw.svg' from 'Classic'-pack because it actually wasn't used - Fixed broken path in Basic/emoticons.xml --- smileys/Basic/emoticons.xml | 5 +- smileys/Classic/Kappa.png | Bin 1242 -> 0 bytes smileys/Classic/emoticons.xml | 4 - smileys/Classic/raw.svg | 889 ---------------------------------- smileys/smileys.qrc | 2 - 5 files changed, 1 insertion(+), 899 deletions(-) delete mode 100644 smileys/Classic/Kappa.png delete mode 100644 smileys/Classic/raw.svg diff --git a/smileys/Basic/emoticons.xml b/smileys/Basic/emoticons.xml index 33b2c0682..6eadedb62 100644 --- a/smileys/Basic/emoticons.xml +++ b/smileys/Basic/emoticons.xml @@ -46,15 +46,13 @@ 😈 - + X. X° Xo >:. >:° >:o - :dho: - :d'ho: @@ -262,7 +260,6 @@ - :emoticonmashup: XP xP 😝 diff --git a/smileys/Classic/Kappa.png b/smileys/Classic/Kappa.png deleted file mode 100644 index a7ebbec4d90af0efba51de1a263d08793ce3a67a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1242 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoO!2%@hbniq1DW)WEcNYeRRlUkaKptm-M`SUO z_5fqIli7Aa6^A`t978NlmtOJCo|7uk@bLBQmn!jUlYP?E)K+$?nO&e-OZw?oizWA8?#p0*xnjemD)|Aek7ijS0@{5&Eu5VbPmhBpTYemmI z)75Y@A8(s2wX8>D=OcC9%JWv{ z3gL%cHLuS-Hcxl^lu}XMij$g)laiB+<0K|*Uu1un)v>AR`<$)M_N^24)7qKgace{7 z(PsYBGfPiSv5ibVHYZ^EMPbj`+m~uw3$pf5^VMFl`t@mvNt41a1|C_mrzg?cjBiq> zhU~9jm#n0AHFd4pGp&$6WJ~XjYc?JkS;~v^<6T3~f1b52<94X|+RXPC_x@8a4B@MM z+@vV{YtyG7G2NR2U#7Y&I@}VzID4V0_9WxH!={e+_eBKX+R^5}=r~8Ibx~5N^Ng^~ zYm^MvX1u*vZ!5U;y_3>n?TVvwLQ_{)b(Q7(QmXPg{=;a(c8%q$(xQV??ml;S%`}K_ zU$cjkwKlpeq^3rp&Rs~ay|&iU@$9_wd{;lk>zWCB&W*|x0H$lz64!{5l*E!$tK_0o zAjM#0U}&UkV61Ck7Gh{>WngS&Y^rNuVP#;zu(-L1;F+74p6Z*Jo|&AjV5SFzx<(2>D-CqPwkiY~nki(IloVL$>z9|8>t%ve z12IswUVc%!gP83hpotP76GJjebCayBT=J7kb5rw5tgHfnN{bl`m;c|b4^$(Lqy}uK zl~qP+W_m^mgONq>=|vnsC1RLL!ZTA!G8l|Z!&TXD 😆 - - - :Kappa: - diff --git a/smileys/Classic/raw.svg b/smileys/Classic/raw.svg deleted file mode 100644 index 8ca952f95..000000000 --- a/smileys/Classic/raw.svg +++ /dev/null @@ -1,889 +0,0 @@ - - - - - qTox - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - qTox - - Created for the qTox project. Inspired by the "Never mind!" smiley pack. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/smileys/smileys.qrc b/smileys/smileys.qrc index 37389d377..6c6551ac2 100644 --- a/smileys/smileys.qrc +++ b/smileys/smileys.qrc @@ -60,11 +60,9 @@ Classic/crying.png Classic/emoticons.xml Classic/happy.png - Classic/Kappa.png Classic/laugh_closed_eyes.png Classic/laugh.png Classic/plain.png - Classic/raw.svg Classic/sad.png Classic/scared.png Classic/smile.png From 00fa6abc2f051407d2d3de6e1fc7f59a338d7ac8 Mon Sep 17 00:00:00 2001 From: ovalseven8 Date: Sun, 20 Dec 2015 15:51:39 +0100 Subject: [PATCH 3/3] The color of the eight smileys is black now. All smileys are visible, now. --- smileys/Universe/2714.svg | 2 +- smileys/Universe/2716.svg | 2 +- smileys/Universe/2734.svg | 2 +- smileys/Universe/2795.svg | 2 +- smileys/Universe/2796.svg | 2 +- smileys/Universe/2797.svg | 2 +- smileys/Universe/27b0.svg | 2 +- smileys/Universe/3030.svg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/smileys/Universe/2714.svg b/smileys/Universe/2714.svg index 3f9830983..83292c0a2 100644 --- a/smileys/Universe/2714.svg +++ b/smileys/Universe/2714.svg @@ -1 +1 @@ - + diff --git a/smileys/Universe/2716.svg b/smileys/Universe/2716.svg index f071a1ec0..ef06926d5 100644 --- a/smileys/Universe/2716.svg +++ b/smileys/Universe/2716.svg @@ -1 +1 @@ - + diff --git a/smileys/Universe/2734.svg b/smileys/Universe/2734.svg index c68890aa9..4e9a9c369 100644 --- a/smileys/Universe/2734.svg +++ b/smileys/Universe/2734.svg @@ -1 +1 @@ - + diff --git a/smileys/Universe/2795.svg b/smileys/Universe/2795.svg index ac849de68..32718f465 100644 --- a/smileys/Universe/2795.svg +++ b/smileys/Universe/2795.svg @@ -1 +1 @@ - + diff --git a/smileys/Universe/2796.svg b/smileys/Universe/2796.svg index 6183aba1d..8865ee2e9 100644 --- a/smileys/Universe/2796.svg +++ b/smileys/Universe/2796.svg @@ -1 +1 @@ - + diff --git a/smileys/Universe/2797.svg b/smileys/Universe/2797.svg index 810aba7ff..acfb43d7a 100644 --- a/smileys/Universe/2797.svg +++ b/smileys/Universe/2797.svg @@ -1 +1 @@ - + diff --git a/smileys/Universe/27b0.svg b/smileys/Universe/27b0.svg index 81823c7c5..1fd2f3448 100644 --- a/smileys/Universe/27b0.svg +++ b/smileys/Universe/27b0.svg @@ -1 +1 @@ - + diff --git a/smileys/Universe/3030.svg b/smileys/Universe/3030.svg index ae9131376..4934ae305 100644 --- a/smileys/Universe/3030.svg +++ b/smileys/Universe/3030.svg @@ -1 +1 @@ - +