Mercurial > pidgin.yaz
changeset 29839:b785bf663cca
Smiley changes:
* Add :'-( as an alias for crying.png in the default set.
* Add the XMPP smiley definitions from XEP-0038. I kept the default smileys
in XMPP as well.
* Add the hidden cyclops smiley from our default set to all of the
per-protocol sets. I added all three hidden smileys to the MySpace set.
* Rebuild the small.default.in set, after these changes.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 17 Nov 2008 20:38:19 +0000 |
| parents | 30014b0ad09c |
| children | fca74ad80194 |
| files | pidgin/pixmaps/emotes/default/24/default.theme.in pidgin/pixmaps/emotes/small/16/small.theme.in |
| diffstat | 2 files changed, 100 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in Mon Nov 17 20:34:02 2008 +0000 +++ b/pidgin/pixmaps/emotes/default/24/default.theme.in Mon Nov 17 20:38:19 2008 +0000 @@ -15,7 +15,7 @@ kiss.png :-* glasses-cool.png 8-) embarrassed.png :-[ -crying.png :'( +crying.png :'( :'-( thinking.png :-/ :-\\ angel.png O:-) o:-) shut-mouth.png :-X @@ -27,6 +27,51 @@ ! cyclops.png O-) o-) +[XMPP] +# Following XEP-0038 + our default set, in default set order +happy.png :) :-) +excited.png :-D :-d :D :d +sad.png :-( :( +wink.png ;-) ;) +tongue.png :P :-P :-p :p +shocked.png =-O =-o +kiss.png :kiss: :-* +glasses-cool.png 8-) +embarrassed.png :-[ +crying.png :'-( :'( +thinking.png :-/ :-\\ +angel.png O:-) o:-) +shut-mouth.png :-X +moneymouth.png :-$ +foot-in-mouth.png :-! +shout.png >:o >:O + +# Following XEP-0038 +angry.png >:-( >:( +good.png :yes: +bad.png :no: +stop.png :wait: +rose.png @->-- :rose: +phone.png :telephone: +mail.png :email: +lamp.png :jabber: +cake.png :cake: +in_love.png :heart: :love: +love-over.png :brokenheart: +musical-note.png :music: +beer.png :beer: +coffee.png :coffee: +coins.png :money: +moon.png :moon: +sun.png :sun: +star.png :star: + +# Hidden icons from the default set. +! skywalker.png C:-) c:-) C:) c:) +! monkey.png :-(|) :(|) 8-|) +! cyclops.png O-) o-) + + # Following AIM 6.1 [AIM] happy.png :-) :) @@ -47,6 +92,7 @@ glasses-cool.png 8-) ! skywalker.png C:-) c:-) C:) c:) ! monkey.png :-(|) :(|) +! cyclops.png O-) o-) # Following Windows Live Messenger 8.1 @@ -129,6 +175,7 @@ bunny.png ('.') ! skywalker.png C:-) c:-) C:) c:) ! monkey.png :-(|) :(|) +! cyclops.png O-) o-) # Hidden MSN emotes cigarette.png (ci) (CI) @@ -234,6 +281,7 @@ boy.png /<11> /nan /man ! skywalker.png C:-) c:-) C:) c:) ! monkey.png :-(|) :(|) +! cyclops.png O-) o-) # Following ICQ 6.0 @@ -270,6 +318,7 @@ amorous.png *IN\ LOVE* ! skywalker.png C:-) c:-) C:) c:) ! monkey.png :-(|) :(|) +! cyclops.png O-) o-) # Following Yahoo! Messenger 8.1 @@ -330,6 +379,7 @@ desire.png 8-> ! skywalker.png C:-) c:-) C:) c:) ! monkey.png :-(|) :(|) +! cyclops.png O-) o-) # Hidden Yahoo emotes alien.png =:) >-) @@ -392,3 +442,7 @@ wink.png ;-) ;) sad.png :[ kiss.png :x +! skywalker.png C:-) c:-) C:) c:) +! monkey.png :-(|) :(|) +! cyclops.png O-) o-) +
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in Mon Nov 17 20:34:02 2008 +0000 +++ b/pidgin/pixmaps/emotes/small/16/small.theme.in Mon Nov 17 20:38:19 2008 +0000 @@ -6,26 +6,51 @@ # Default smileys [default] -smile.png :) :-) +happy.png :) :-) +excited.png :-D :-d :D :d +sad.png :-( :( +wink.png ;-) ;) +tongue.png :P :-P :-p :p +shocked.png =-O =-o +kiss.png :-* +embarrassed.png :-[ +crying.png :'( :'-( +thinking.png :-/ :-\\ +angel.png O:-) o:-) + + +[XMPP] +# Following XEP-0038 + our default set, in default set order +happy.png :) :-) excited.png :-D :-d :D :d sad.png :-( :( wink.png ;-) ;) tongue.png :P :-P :-p :p -shock.png =-O =-o -kiss.png :-* +shocked.png =-O =-o +kiss.png :kiss: :-* embarrassed.png :-[ -crying.png :'( +crying.png :'-( :'( thinking.png :-/ :-\\ angel.png O:-) o:-) +# Following XEP-0038 +angry.png >:-( >:( +phone.png :telephone: +in_love.png :heart: :love: +musical-note.png :music: +beer.png :beer: +coffee.png :coffee: + +# Hidden icons from the default set. + # Following AIM 6.1 [AIM] -smile.png :-) :) +happy.png :-) :) wink.png ;-) ;) sad.png :-( :( tongue.png :-P :P :-p :p -shock.png =-O +shocked.png =-O kiss.png :-* excited.png :-D :D embarrassed.png :-[ @@ -36,10 +61,10 @@ # Following Windows Live Messenger 8.1 [MSN] -smile.png :) :-) +happy.png :) :-) excited.png :D :d :-D :-d wink.png ;) ;-) -shock.png :-O :-o :O :o +shocked.png :-O :-o :O :o tongue.png :P :p :-P :-p angry.png :@ :-@ embarrassed.png :$ :-$ @@ -74,22 +99,25 @@ # Following QQ 2006 [QQ] -shock.png /:O /jy /surprised +shocked.png /:O /jy /surprised party.png /8-) /dy /revel crying.png /:< /ll /cry sleeping.png /:Z /shui /sleep embarrassed.png /:-| /gg /embarassed excited.png /:D /cy /toothy_smile -smile.png /:) /wx /small_smile +happy.png /:) /wx /small_smile sad.png /:( /ng /sad sick.png /:T /tu /vomit sleepy.png /|-) /kun /sleepy +hot.png /:L /sweat question.png /? /yiw /question +afraid.png /shake /fad /shake amorous.png /love /aiq /love search.png /find /zhao /search hug-left.png /hug /yb /hug musical-note.png /music /yy /music coffee.png /coffee /kf /coffee +hungry.png /eat /fan /eat kiss.png /kiss /wen /kiss in_love.png /heart /xin /heart meeting.png /meeting /hy /meeting @@ -100,10 +128,10 @@ # Following ICQ 6.0 [ICQ] -smile.png :-) :) +happy.png :-) :) neutral.png :-$ sad.png :-( :( -shock.png =-O +shocked.png =-O wink.png ;-) ;) tongue.png :-P :P :-p :p sleeping.png *TIRED* @@ -121,9 +149,9 @@ # Following Yahoo! Messenger 8.1 [Yahoo] -smile.png :) :-) +happy.png :) :-) question.png :-/ :-\\ -shock.png :-O :O :-o :o +shocked.png :-O :O :-o :o devil.png >:) angel.png O:-) o:-) 0:-) sick.png :-& @@ -144,7 +172,9 @@ confused.png :-S :-s sarcastic.png /:) hug-left.png >:D< >:d< +hot.png #:-S #:-s party.png <:-P <:-p +nervous.png :-SS :-Ss :-sS :-ss # Hidden Yahoo emotes coffee.png ~o) ~O) @@ -168,3 +198,4 @@ wink.png ;-) ;) sad.png :[ kiss.png :x +