diff options
Diffstat (limited to 'pidgin/pixmaps')
| -rw-r--r-- | pidgin/pixmaps/Makefile.am | 5 | ||||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/Makefile.am | 20 | ||||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/afraid.png (renamed from pidgin/pixmaps/emotes/default/24/tremble.png) | bin | 1493 -> 1493 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/amorous.png (renamed from pidgin/pixmaps/emotes/default/24/in-love.png) | bin | 1636 -> 1636 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/default.theme.in | 267 | ||||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/excited.png (renamed from pidgin/pixmaps/emotes/default/24/smile-big.png) | bin | 1420 -> 1420 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/happy.png (renamed from pidgin/pixmaps/emotes/default/24/smile.png) | bin | 1509 -> 1509 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/hot.png (renamed from pidgin/pixmaps/emotes/default/24/sweat.png) | bin | 1513 -> 1513 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/hungry.png (renamed from pidgin/pixmaps/emotes/default/24/eat.png) | bin | 1598 -> 1598 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/in_love.png (renamed from pidgin/pixmaps/emotes/default/24/love.png) | bin | 1339 -> 1339 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/nervous.png (renamed from pidgin/pixmaps/emotes/default/24/nailbiting.png) | bin | 1514 -> 1514 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/shocked.png (renamed from pidgin/pixmaps/emotes/default/24/shock.png) | bin | 1507 -> 1507 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/sleeping.png | bin | 0 -> 1542 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/sleepy.png | bin | 1542 -> 1506 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/default/24/yawn.png | bin | 1506 -> 0 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/Makefile.am | 36 | ||||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/TODO | 13 | ||||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/afraid.png | bin | 0 -> 909 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/amorous.png | bin | 0 -> 944 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/bathing.png | bin | 0 -> 816 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/cinema.png | bin | 0 -> 659 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/disappointed.png | bin | 0 -> 906 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/embarrassed.png | bin | 0 -> 917 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/excited.png (renamed from pidgin/pixmaps/emotes/small/16/smile-big.png) | bin | 916 -> 916 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/happy.png (renamed from pidgin/pixmaps/emotes/small/16/smile.png) | bin | 973 -> 973 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/hot.png | bin | 0 -> 919 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/hungry.png | bin | 0 -> 956 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/in_love.png (renamed from pidgin/pixmaps/emotes/small/16/love.png) | bin | 847 -> 847 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/internet.png | bin | 0 -> 999 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/mean.png | bin | 0 -> 921 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/mobile.png (renamed from pidgin/pixmaps/emblems/16/mobile.png) | bin | 535 -> 535 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/music.png (renamed from pidgin/pixmaps/emblems/16/music.png) | bin | 571 -> 571 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/nervous.png | bin | 0 -> 937 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/restroom.png | bin | 0 -> 716 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/sarcastic.png | bin | 0 -> 904 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/scalable/mobile.svg (renamed from pidgin/pixmaps/emblems/scalable/mobile.svg) | 0 | ||||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/scalable/music.svg (renamed from pidgin/pixmaps/emblems/scalable/music.svg) | 0 | ||||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/shocked.png (renamed from pidgin/pixmaps/emotes/small/16/shock.png) | bin | 952 -> 952 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/shopping.png | bin | 0 -> 645 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/sleeping.png | bin | 0 -> 912 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/sleepy.png | bin | 912 -> 935 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/small.theme.in | 132 | ||||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/studying.png | bin | 0 -> 718 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/suit.png | bin | 0 -> 804 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/surfing.png | bin | 0 -> 919 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/typing.png | bin | 0 -> 725 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/working.png | bin | 0 -> 924 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/writing.png | bin | 0 -> 714 bytes | |||
| -rw-r--r-- | pidgin/pixmaps/emotes/small/16/yawn.png | bin | 935 -> 0 bytes |
49 files changed, 241 insertions, 232 deletions
diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am index 30f5682461..2ac9241d56 100644 --- a/pidgin/pixmaps/Makefile.am +++ b/pidgin/pixmaps/Makefile.am @@ -101,8 +101,6 @@ EMBLEMS_16 = \ emblems/16/half-operator.png \ emblems/16/hiptop.png \ emblems/16/male.png \ - emblems/16/mobile.png \ - emblems/16/music.png \ emblems/16/not-authorized.png \ emblems/16/operator.png \ emblems/16/qq-member.png \ @@ -120,8 +118,6 @@ EMBLEMS_SCALABLE = \ emblems/scalable/free-for-chat.svg \ emblems/scalable/game.svg \ emblems/scalable/male.svg \ - emblems/scalable/mobile.svg \ - emblems/scalable/music.svg \ emblems/scalable/not-authorized.svg \ emblems/scalable/qq-member.svg \ emblems/scalable/secure.svg \ @@ -207,6 +203,7 @@ EMOTES_DEFAULT_24_SCALABLE = \ emotes/default/24/scalable/yin-yang.svg EMOTES_SMALL_16_SCALABLE = \ + emotes/small/16/scalable/mobile.svg emotes/small/16/scalable/pidgin-emotes.svg PROTOCOLS_16_SCALABLE = \ diff --git a/pidgin/pixmaps/emotes/default/24/Makefile.am b/pidgin/pixmaps/emotes/default/24/Makefile.am index 4bf3d69044..f4edbe83e6 100644 --- a/pidgin/pixmaps/emotes/default/24/Makefile.am +++ b/pidgin/pixmaps/emotes/default/24/Makefile.am @@ -2,6 +2,7 @@ SMILEYS = \ act-up.png \ airplane.png \ alien.png \ + amorous.png \ angel.png \ angry.png \ arrogant.png \ @@ -56,8 +57,9 @@ SMILEYS = \ dont-know.png \ drink.png \ drool.png \ - eat.png \ + hungry.png \ embarrassed.png \ + excited.png \ excruciating.png \ eyeroll.png \ female-fighter.png \ @@ -81,7 +83,7 @@ SMILEYS = \ hug-left.png \ hug-right.png \ hypnotized.png \ - in-love.png \ + in_love.png \ island.png \ jump.png \ kissed.png \ @@ -94,7 +96,6 @@ SMILEYS = \ liquor.png \ loser.png \ love-over.png \ - love.png \ lying.png \ mad-tongue.png \ mail.png \ @@ -114,7 +115,7 @@ SMILEYS = \ msn.png \ musical-note.png \ music.png \ - nailbiting.png \ + nervous.png \ neutral.png \ on-the-phone.png \ party.png \ @@ -144,7 +145,7 @@ SMILEYS = \ secret.png \ shame.png \ sheep.png \ - shock.png \ + shocked.png \ shout.png \ shut-mouth.png \ sick.png \ @@ -153,9 +154,9 @@ SMILEYS = \ sinister.png \ skeleton.png \ skywalker.png \ + sleeping.png \ sleepy.png \ - smile-big.png \ - smile.png \ + happy.png \ smirk.png \ snail.png \ snicker.png \ @@ -167,7 +168,7 @@ SMILEYS = \ stop.png \ struggle.png \ sun.png \ - sweat.png \ + hot.png \ talktohand.png \ teeth.png \ terror.png \ @@ -175,7 +176,7 @@ SMILEYS = \ thunder.png \ time-out.png \ tongue.png \ - tremble.png \ + afraid.png \ turtle.png \ tv.png \ umbrella.png \ @@ -188,7 +189,6 @@ SMILEYS = \ wilt.png \ wink.png \ worship.png \ - yawn.png \ yin-yang.png diff --git a/pidgin/pixmaps/emotes/default/24/tremble.png b/pidgin/pixmaps/emotes/default/24/afraid.png Binary files differindex 623a5d26e3..623a5d26e3 100644 --- a/pidgin/pixmaps/emotes/default/24/tremble.png +++ b/pidgin/pixmaps/emotes/default/24/afraid.png diff --git a/pidgin/pixmaps/emotes/default/24/in-love.png b/pidgin/pixmaps/emotes/default/24/amorous.png Binary files differindex e752acc976..e752acc976 100644 --- a/pidgin/pixmaps/emotes/default/24/in-love.png +++ b/pidgin/pixmaps/emotes/default/24/amorous.png diff --git a/pidgin/pixmaps/emotes/default/24/default.theme.in b/pidgin/pixmaps/emotes/default/24/default.theme.in index 8ddb77e61d..9fa98b13ba 100644 --- a/pidgin/pixmaps/emotes/default/24/default.theme.in +++ b/pidgin/pixmaps/emotes/default/24/default.theme.in @@ -6,37 +6,87 @@ Author=Hylke Bons # Default smileys [default] -smile.png :) :-) -smile-big.png :-D :-d :D :d +happy.png :) :-) +excited.png :-D :-d :D :d sad.png :-( :( wink.png ;-) ;) -tongue.png :P :-P :-p :p -shock.png =-O =-o +tongue.png :P :p :-P :-p +shocked.png =-O =-o kiss.png :-* glasses-cool.png 8-) embarrassed.png :-[ -crying.png :'( +crying.png :'( :'-( +thinking.png :-/ :-\\ +angel.png O:-) o:-) +shut-mouth.png :-X +moneymouth.png :-$ +foot-in-mouth.png :-! +shout.png >:o >:O +! skywalker.png C:-) c:-) C:) c:) +! monkey.png :-(|) :(|) 8-|) +! cyclops.png O-) o-) + + +[XMPP] +# Following XEP-0038 + GTalk + our default set, in default set order +# The GTalk strings come from ticket #3307. +happy.png :) :-) =) +excited.png :-D :-d :D :d =D =d +sad.png :-( :( +wink.png ;-) ;) ;^) +tongue.png :P :p :-P :-p +shocked.png =-O =-o :-O :-o +kiss.png :kiss: :-* +glasses-cool.png 8-) B-) +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 + GTalk +angry.png >:-( >:( X-( x-( +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: <3 +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: + +# Others +neutral.png :| :-| +victory.png \\m/ + +# Hidden icons from the default set. ! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) :(|) 8-|) -! cyclops.png O-) o-) +! monkey.png :-(|) :(|) 8-|) +! cyclops.png O-) o-) # Following AIM 6.1 [AIM] -smile.png :-) :) +happy.png :-) :) wink.png ;-) ;) sad.png :-( :( -tongue.png :-P :P :-p :p -shock.png =-O +tongue.png :P :p :-P :-p +shocked.png =-O kiss.png :-* shout.png >:o -smile-big.png :-D :D +excited.png :-D :D moneymouth.png :-$ foot-in-mouth.png :-! embarrassed.png :-[ @@ -46,26 +96,27 @@ crying.png :'( shut-mouth.png :-X glasses-cool.png 8-) ! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) :(|) +! monkey.png :-(|) :(|) 8-|) +! cyclops.png O-) o-) # Following Windows Live Messenger 8.1 [MSN] -smile.png :) :-) -smile-big.png :D :d :-D :-d +happy.png :) :-) +excited.png :D :d :-D :-d wink.png ;) ;-) -shock.png :-O :-o :O :o -tongue.png :P :p :-P :-p +shocked.png :-O :-o :O :o +tongue.png :-P :P :-p :p glasses-cool.png (H) (h) angry.png :@ :-@ embarrassed.png :$ :-$ -confused.png :S :s :-S :-s +confused.png :S :s :-S :-s sad.png :( :-( crying.png :'( neutral.png :| :-| devil.png (6) angel.png (A) (a) -love.png (L) (l) +in_love.png (L) (l) love-over.png (U) (u) msn.png (M) (m) cat.png (@) @@ -125,10 +176,11 @@ thinking.png *-) thunder.png (li) party.png <:o) eyeroll.png 8-) -yawn.png |-) +sleepy.png |-) bunny.png ('.') ! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) :(|) +! monkey.png :-(|) :(|) 8-|) +! cyclops.png O-) o-) # Hidden MSN emotes cigarette.png (ci) (CI) @@ -139,7 +191,7 @@ fingers-crossed.png (yn) (YN) # Following QQ 2006 [QQ] -shock.png /:O /jy /surprised +shocked.png /:O /jy /surprised curl-lip.png /:~ /pz /curl_lip desire.png /:* /se /desire dazed.png /:| /dazed @@ -147,13 +199,13 @@ party.png /8-) /dy /revel crying.png /:< /ll /cry bashful.png /:$ /hx /bashful shut-mouth.png /:X /bz /shut_mouth -sleepy.png /:Z /shui /sleep +sleeping.png /:Z /shui /sleep weep.png /:'( /dk /weep embarrassed.png /:-| /gg /embarassed pissed-off.png /:@ /fn /pissed_off act-up.png /:P /tp /act_up -smile-big.png /:D /cy /toothy_smile -smile.png /:) /wx /small_smile +excited.png /:D /cy /toothy_smile +happy.png /:) /wx /small_smile sad.png /:( /ng /sad glasses-cool.png /:+ /kuk /cool doctor.png /:# /feid /SARS @@ -164,9 +216,9 @@ cute.png /;-D /ka /cute disdain.png /;d /by /disdain arrogant.png /;o /am /arrogant starving.png /:g /jie /starving -yawn.png /|-) /kun /sleepy +sleepy.png /|-) /kun /sleepy terror.png /:! /jk /terror -sweat.png /:L /sweat +hot.png /:L /sweat smirk.png /:> /hanx /smirk soldier.png /:; /db /soldier struggle.png /;f /fendou /struggle @@ -180,8 +232,8 @@ skeleton.png /!!! /kl /skeleton hammer.png /xx /qiao /hammer bye.png /bye /zj /bye go-away.png /go /shan /go -tremble.png /shake /fad /shake -in-love.png /love /aiq /love +afraid.png /shake /fad /shake +amorous.png /love /aiq /love jump.png /jump /tiao /jump search.png /find /zhao /search lashes.png /& /mm /beautiful_eyebrows @@ -200,12 +252,12 @@ soccerball.png /footb /zq /soccer musical-note.png /music /yy /music poop.png /shit /bb /shit coffee.png /coffee /kf /coffee -eat.png /eat /fan /eat +hungry.png /eat /fan /eat pill.png /pill /yw /pill rose.png /rose /mg /rose wilt.png /fade /dx /wilt kiss.png /kiss /wen /kiss -love.png /heart /xin /heart +in_love.png /heart /xin /heart love-over.png /break /xs /broken_heart meeting.png /meeting /hy /meeting present.png /gift /lw /gift @@ -233,20 +285,21 @@ star.png /<*> /xixing /star girl.png /<00> /nv /woman boy.png /<11> /nan /man ! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) :(|) +! monkey.png :-(|) :(|) 8-|) +! cyclops.png O-) o-) # 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 music.png [:-} laugh.png *JOKINGLY* -sleepy.png *TIRED* +sleeping.png *TIRED* crying.png :'( :'-( sick.png :-! kissed.png *KISSED* @@ -265,26 +318,27 @@ thinking.png :-\\ :-/ good.png *THUMBS\ UP* shout.png >:o >:O :-@ beer.png *DRINK* -smile-big.png :-D :D +excited.png :-D :D glasses-cool.png 8-) -in-love.png *IN\ LOVE* +amorous.png *IN\ LOVE* ! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) :(|) +! monkey.png :-(|) :(|) 8-|) +! cyclops.png O-) o-) # 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 :-& -yawn.png (:| +sleepy.png (:| hypnotized.png @-) on-the-phone.png :)] sad.png :( :-( -in-love.png :x :-x :X :-X +amorous.png :x :-x :X :-X angry.png X-( x-( X( x( crying.png :(( glasses-nerdy.png :-B :-b @@ -301,11 +355,11 @@ arrogant.png [-( thinking.png :-? waiting.png :-w :-W at-wits-end.png ~x( ~X( -smile-big.png :D :-D :d :-d +excited.png :D :-D :d :-d tongue.png :-P :P :-p :p glasses-cool.png B-) b-) neutral.png :| :-| -sleepy.png I-) i-) |-) +sleeping.png I-) i-) |-) clown.png :o) :O) doh.png #-o #-O weep.png :-< @@ -321,107 +375,16 @@ mad-tongue.png >:P >:p time-out.png :-t :-T hug-left.png >:D< >:d< love-over.png =(( -sweat.png #:-S #:-s +hot.png #:-S #:-s rotfl.png =)) :-j :-J loser.png L-) l-) party.png <:-P <:-p -nailbiting.png :-SS :-Ss :-sS :-ss +nervous.png :-SS :-Ss :-sS :-ss cowboy.png <):) desire.png 8-> ! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) :(|) - -# Hidden Yahoo emotes -alien.png =:) >-) -beat-up.png b-( B-( -chicken.png ~:> -coffee.png ~o) ~O) -cow.png 3:-O 3:-o -dance.png \\:D/ \\:d/ -rose.png @};- -dont-know.png :-L :-l -skeleton.png 8-X 8-x -lamp.png *-:) -monkey.png :(|) -coins.png $-) -peace.png :)>- -pig.png :@) -pray.png [-o< [-O< -pumpkin.png (~~) -shame.png [-X [-x -flag.png **== -clover.png %%- -musical-note.png :-" -giggle.png ;)) -worship.png ^:)^ -star.png (*) -waving.png >:/ -talktohand.png :-@ - -# Only available after activating the Yahoo! Fighter IMVironment -male-fighter1.png o-> O-> -male-fighter2.png o=> O=> -female-fighter.png o-+ O-+ -yin-yang.png (%) - -# Following Yahoo! Messenger 8.1 -[Yahoo JAPAN] -smile.png :) :-) -question.png :-/ :-\\ -shock.png :-O :O :-o :o -devil.png >:) -angel.png O:-) o:-) 0:-) -sick.png :-& -yawn.png (:| -hypnotized.png @-) -on-the-phone.png :)] -sad.png :( :-( -in-love.png :x :-x :X :-X -angry.png X-( x-( X( x( -crying.png :(( -glasses-nerdy.png :-B :-b -quiet.png :-$ -drool.png =P~ =p~ -lying.png :^O :^o -call-me.png :-c -wink.png ;) ;-) -embarrassed.png :"> -mean.png :-> :> -laugh.png :)) :-)) -bye.png =; -arrogant.png [-( -thinking.png :-? -waiting.png :-w :-W -at-wits-end.png ~x( ~X( -smile-big.png :D :-D :d :-d -tongue.png :-P :P :-p :p -glasses-cool.png B-) b-) -neutral.png :| :-| -sleepy.png I-) i-) |-) -clown.png :o) :O) -doh.png #-o #-O -weep.png :-< -go-away.png :-h -lashes.png ;;) -kiss.png :-* :* -confused.png :-S :-s -sarcastic.png /:) -eyeroll.png 8-| -silly.png 8-} -clap.png =D> =d> -mad-tongue.png >:P >:p -time-out.png :-t :-T -hug-left.png >:D< >:d< -love-over.png =(( -sweat.png #:-S #:-s -rotfl.png =)) :-j :-J -loser.png L-) l-) -party.png <:-P <:-p -nailbiting.png :-SS :-Ss :-sS :-ss -cowboy.png <):) -desire.png 8-> -! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) :(|) +! monkey.png :-(|) :(|) 8-|) +! cyclops.png O-) o-) # Hidden Yahoo emotes alien.png =:) >-) @@ -459,14 +422,14 @@ yin-yang.png (%) # Following MySpaceIM Beta 1.0.697.0 [MySpaceIM] -smile-big.png :D :-D +excited.png :D :-D devil.png }:) confused.png :Z glasses-nerdy.png B) bulgy-eyes.png %) freaked-out.png :E smile.png :) :-) -in-love.png :X +amorous.png :X laugh.png :)) mohawk.png -: mad-tongue.png X( @@ -474,7 +437,7 @@ messed.png X) glasses-nerdy.png Q) doh.png :G pirate.png P) -shock.png :O +shocked.png :O sidefrown.png :{ sinister.png :B smirk.png :, @@ -484,23 +447,7 @@ pissed-off.png B| wink.png ;-) ;) sad.png :[ kiss.png :x - -[XMPP] -# XMPP emoticons -smile.png :) :-) =) -smile-big.png :D :-D =D -wink.png ;) ;-) ;^) -shock.png :-o -tongue.png :P :-P :-p :p -glasses-cool.png B-) -angry.png X-( -sad.png :( :-( =( -crying.png :'( -neutral.png :-| -thinking.png :-/ -love.png <3 -monkey.png :(|) -victory.png \\m/ ! skywalker.png C:-) c:-) C:) c:) -! monkey.png :-(|) :(|) 8-|) -! cyclops.png O-) o-) +! monkey.png :-(|) :(|) 8-|) +! cyclops.png O-) o-) + diff --git a/pidgin/pixmaps/emotes/default/24/smile-big.png b/pidgin/pixmaps/emotes/default/24/excited.png Binary files differindex ce3f8664bc..ce3f8664bc 100644 --- a/pidgin/pixmaps/emotes/default/24/smile-big.png +++ b/pidgin/pixmaps/emotes/default/24/excited.png diff --git a/pidgin/pixmaps/emotes/default/24/smile.png b/pidgin/pixmaps/emotes/default/24/happy.png Binary files differindex 8a2ba4925c..8a2ba4925c 100644 --- a/pidgin/pixmaps/emotes/default/24/smile.png +++ b/pidgin/pixmaps/emotes/default/24/happy.png diff --git a/pidgin/pixmaps/emotes/default/24/sweat.png b/pidgin/pixmaps/emotes/default/24/hot.png Binary files differindex 1b7fbec14b..1b7fbec14b 100644 --- a/pidgin/pixmaps/emotes/default/24/sweat.png +++ b/pidgin/pixmaps/emotes/default/24/hot.png diff --git a/pidgin/pixmaps/emotes/default/24/eat.png b/pidgin/pixmaps/emotes/default/24/hungry.png Binary files differindex 393482f13e..393482f13e 100644 --- a/pidgin/pixmaps/emotes/default/24/eat.png +++ b/pidgin/pixmaps/emotes/default/24/hungry.png diff --git a/pidgin/pixmaps/emotes/default/24/love.png b/pidgin/pixmaps/emotes/default/24/in_love.png Binary files differindex 31aeea275e..31aeea275e 100644 --- a/pidgin/pixmaps/emotes/default/24/love.png +++ b/pidgin/pixmaps/emotes/default/24/in_love.png diff --git a/pidgin/pixmaps/emotes/default/24/nailbiting.png b/pidgin/pixmaps/emotes/default/24/nervous.png Binary files differindex 6888af8e0a..6888af8e0a 100644 --- a/pidgin/pixmaps/emotes/default/24/nailbiting.png +++ b/pidgin/pixmaps/emotes/default/24/nervous.png diff --git a/pidgin/pixmaps/emotes/default/24/shock.png b/pidgin/pixmaps/emotes/default/24/shocked.png Binary files differindex 0e7438e9ee..0e7438e9ee 100644 --- a/pidgin/pixmaps/emotes/default/24/shock.png +++ b/pidgin/pixmaps/emotes/default/24/shocked.png diff --git a/pidgin/pixmaps/emotes/default/24/sleeping.png b/pidgin/pixmaps/emotes/default/24/sleeping.png Binary files differnew file mode 100644 index 0000000000..e3bfe411b1 --- /dev/null +++ b/pidgin/pixmaps/emotes/default/24/sleeping.png diff --git a/pidgin/pixmaps/emotes/default/24/sleepy.png b/pidgin/pixmaps/emotes/default/24/sleepy.png Binary files differindex e3bfe411b1..2c3e78fd8d 100644 --- a/pidgin/pixmaps/emotes/default/24/sleepy.png +++ b/pidgin/pixmaps/emotes/default/24/sleepy.png diff --git a/pidgin/pixmaps/emotes/default/24/yawn.png b/pidgin/pixmaps/emotes/default/24/yawn.png Binary files differdeleted file mode 100644 index 2c3e78fd8d..0000000000 --- a/pidgin/pixmaps/emotes/default/24/yawn.png +++ /dev/null diff --git a/pidgin/pixmaps/emotes/small/16/Makefile.am b/pidgin/pixmaps/emotes/small/16/Makefile.am index 1980513a37..64ce3768db 100644 --- a/pidgin/pixmaps/emotes/small/16/Makefile.am +++ b/pidgin/pixmaps/emotes/small/16/Makefile.am @@ -1,4 +1,24 @@ +# These are mood images that are NOT also used in the smiley theme. +MOODS = \ + afraid.png \ + bathing.png \ + cinema.png \ + disappointed.png \ + embarrassed.png \ + internet.png \ + music.png \ + restroom.png \ + search.png \ + shopping.png \ + studying.png \ + suit.png \ + surfing.png \ + typing.png \ + working.png \ + writing.png + SMILEYS = \ + amorous.png \ angel.png \ angry.png \ beer.png \ @@ -12,12 +32,15 @@ SMILEYS = \ crying.png \ devil.png \ dont-know.png \ + excited.png \ grin.png \ + happy.png \ hug-left.png \ hug-right.png \ + in_love.png \ kiss.png \ - love.png \ meeting.png \ + mobile.png \ musical-note.png \ nerdy.png \ neutral.png \ @@ -27,18 +50,16 @@ SMILEYS = \ question.png \ sad.png \ shame.png \ - shock.png \ + shocked.png \ sick.png \ silent.png \ + sleeping.png \ sleepy.png \ - smile-big.png \ - smile.png \ thinking.png \ tongue.png \ tv.png \ uhm-yeah.png \ - wink.png \ - yawn.png + wink.png pidginsmileypix_in_files = small.theme.in @@ -46,6 +67,7 @@ pidginsmileypix_in_files = small.theme.in if INSTALL_PIXMAPS pidginsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/small pidginsmileypix_DATA = \ + $(MOODS) \ $(SMILEYS) \ theme @@ -56,4 +78,4 @@ theme: small.theme.in $< > $@ endif -EXTRA_DIST = $(SMILEYS) $(pidginsmileypix_in_files) theme +EXTRA_DIST = $(MOODS) $(SMILEYS) $(pidginsmileypix_in_files) theme diff --git a/pidgin/pixmaps/emotes/small/16/TODO b/pidgin/pixmaps/emotes/small/16/TODO index 06046f86d6..e4d1008102 100644 --- a/pidgin/pixmaps/emotes/small/16/TODO +++ b/pidgin/pixmaps/emotes/small/16/TODO @@ -1,7 +1,18 @@ The following icons where just scaled down from the 24x24 and may need work: + afraid.png + amorous.png + disappointed.png + embarrassed.png + happy.png + hot.png + hungry.png + mean.png meeting.png + nervous.png question.png + sarcastic.png search.png + shocked.png sleepy.png smile-big.png tv.png @@ -13,7 +24,7 @@ our default icons: cigarette.png coffee.png console.png - love.png + in_love.png musical-note.png party.png phone.png diff --git a/pidgin/pixmaps/emotes/small/16/afraid.png b/pidgin/pixmaps/emotes/small/16/afraid.png Binary files differnew file mode 100644 index 0000000000..b10a1a0abf --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/afraid.png diff --git a/pidgin/pixmaps/emotes/small/16/amorous.png b/pidgin/pixmaps/emotes/small/16/amorous.png Binary files differnew file mode 100644 index 0000000000..41a520b194 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/amorous.png diff --git a/pidgin/pixmaps/emotes/small/16/bathing.png b/pidgin/pixmaps/emotes/small/16/bathing.png Binary files differnew file mode 100644 index 0000000000..662eb2ac97 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/bathing.png diff --git a/pidgin/pixmaps/emotes/small/16/cinema.png b/pidgin/pixmaps/emotes/small/16/cinema.png Binary files differnew file mode 100644 index 0000000000..e561cb0791 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/cinema.png diff --git a/pidgin/pixmaps/emotes/small/16/disappointed.png b/pidgin/pixmaps/emotes/small/16/disappointed.png Binary files differnew file mode 100644 index 0000000000..3b3e2a12b8 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/disappointed.png diff --git a/pidgin/pixmaps/emotes/small/16/embarrassed.png b/pidgin/pixmaps/emotes/small/16/embarrassed.png Binary files differnew file mode 100644 index 0000000000..404b38b494 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/embarrassed.png diff --git a/pidgin/pixmaps/emotes/small/16/smile-big.png b/pidgin/pixmaps/emotes/small/16/excited.png Binary files differindex f03bc545ff..f03bc545ff 100644 --- a/pidgin/pixmaps/emotes/small/16/smile-big.png +++ b/pidgin/pixmaps/emotes/small/16/excited.png diff --git a/pidgin/pixmaps/emotes/small/16/smile.png b/pidgin/pixmaps/emotes/small/16/happy.png Binary files differindex cc6d3e2e89..cc6d3e2e89 100644 --- a/pidgin/pixmaps/emotes/small/16/smile.png +++ b/pidgin/pixmaps/emotes/small/16/happy.png diff --git a/pidgin/pixmaps/emotes/small/16/hot.png b/pidgin/pixmaps/emotes/small/16/hot.png Binary files differnew file mode 100644 index 0000000000..518ecc2274 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/hot.png diff --git a/pidgin/pixmaps/emotes/small/16/hungry.png b/pidgin/pixmaps/emotes/small/16/hungry.png Binary files differnew file mode 100644 index 0000000000..bb53909c72 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/hungry.png diff --git a/pidgin/pixmaps/emotes/small/16/love.png b/pidgin/pixmaps/emotes/small/16/in_love.png Binary files differindex 20e596b323..20e596b323 100644 --- a/pidgin/pixmaps/emotes/small/16/love.png +++ b/pidgin/pixmaps/emotes/small/16/in_love.png diff --git a/pidgin/pixmaps/emotes/small/16/internet.png b/pidgin/pixmaps/emotes/small/16/internet.png Binary files differnew file mode 100644 index 0000000000..9281221f98 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/internet.png diff --git a/pidgin/pixmaps/emotes/small/16/mean.png b/pidgin/pixmaps/emotes/small/16/mean.png Binary files differnew file mode 100644 index 0000000000..be41d91e79 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/mean.png diff --git a/pidgin/pixmaps/emblems/16/mobile.png b/pidgin/pixmaps/emotes/small/16/mobile.png Binary files differindex d368e64715..d368e64715 100644 --- a/pidgin/pixmaps/emblems/16/mobile.png +++ b/pidgin/pixmaps/emotes/small/16/mobile.png diff --git a/pidgin/pixmaps/emblems/16/music.png b/pidgin/pixmaps/emotes/small/16/music.png Binary files differindex 4b40b6eedf..4b40b6eedf 100644 --- a/pidgin/pixmaps/emblems/16/music.png +++ b/pidgin/pixmaps/emotes/small/16/music.png diff --git a/pidgin/pixmaps/emotes/small/16/nervous.png b/pidgin/pixmaps/emotes/small/16/nervous.png Binary files differnew file mode 100644 index 0000000000..dee32c7d4f --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/nervous.png diff --git a/pidgin/pixmaps/emotes/small/16/restroom.png b/pidgin/pixmaps/emotes/small/16/restroom.png Binary files differnew file mode 100644 index 0000000000..a642e7d53c --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/restroom.png diff --git a/pidgin/pixmaps/emotes/small/16/sarcastic.png b/pidgin/pixmaps/emotes/small/16/sarcastic.png Binary files differnew file mode 100644 index 0000000000..e18fb792d0 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/sarcastic.png diff --git a/pidgin/pixmaps/emblems/scalable/mobile.svg b/pidgin/pixmaps/emotes/small/16/scalable/mobile.svg index 239d2c38f5..239d2c38f5 100644 --- a/pidgin/pixmaps/emblems/scalable/mobile.svg +++ b/pidgin/pixmaps/emotes/small/16/scalable/mobile.svg diff --git a/pidgin/pixmaps/emblems/scalable/music.svg b/pidgin/pixmaps/emotes/small/16/scalable/music.svg index 29f0acfda6..29f0acfda6 100644 --- a/pidgin/pixmaps/emblems/scalable/music.svg +++ b/pidgin/pixmaps/emotes/small/16/scalable/music.svg diff --git a/pidgin/pixmaps/emotes/small/16/shock.png b/pidgin/pixmaps/emotes/small/16/shocked.png Binary files differindex 0938170ee4..0938170ee4 100644 --- a/pidgin/pixmaps/emotes/small/16/shock.png +++ b/pidgin/pixmaps/emotes/small/16/shocked.png diff --git a/pidgin/pixmaps/emotes/small/16/shopping.png b/pidgin/pixmaps/emotes/small/16/shopping.png Binary files differnew file mode 100644 index 0000000000..291107ae64 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/shopping.png diff --git a/pidgin/pixmaps/emotes/small/16/sleeping.png b/pidgin/pixmaps/emotes/small/16/sleeping.png Binary files differnew file mode 100644 index 0000000000..5fb313e620 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/sleeping.png diff --git a/pidgin/pixmaps/emotes/small/16/sleepy.png b/pidgin/pixmaps/emotes/small/16/sleepy.png Binary files differindex 5fb313e620..9a86537f4f 100644 --- a/pidgin/pixmaps/emotes/small/16/sleepy.png +++ b/pidgin/pixmaps/emotes/small/16/sleepy.png diff --git a/pidgin/pixmaps/emotes/small/16/small.theme.in b/pidgin/pixmaps/emotes/small/16/small.theme.in index 64dc0e4f88..084c603ee0 100644 --- a/pidgin/pixmaps/emotes/small/16/small.theme.in +++ b/pidgin/pixmaps/emotes/small/16/small.theme.in @@ -6,27 +6,58 @@ Author=Hylke Bons # Default smileys [default] -smile.png :) :-) -smile-big.png :-D :-d :D :d +happy.png :) :-) +excited.png :-D :-d :D :d sad.png :-( :( wink.png ;-) ;) -tongue.png :P :-P :-p :p -shock.png =-O =-o +tongue.png :P :p :-P :-p +shocked.png =-O =-o kiss.png :-* -crying.png :'( +embarrassed.png :-[ +crying.png :'( :'-( +thinking.png :-/ :-\\ +angel.png O:-) o:-) + + +[XMPP] +# Following XEP-0038 + GTalk + our default set, in default set order +# The GTalk strings come from ticket #3307. +happy.png :) :-) =) +excited.png :-D :-d :D :d =D =d +sad.png :-( :( +wink.png ;-) ;) ;^) +tongue.png :P :p :-P :-p +shocked.png =-O =-o :-O :-o +kiss.png :kiss: :-* +embarrassed.png :-[ +crying.png :'-( :'( thinking.png :-/ :-\\ angel.png O:-) o:-) +# Following XEP-0038 + GTalk +angry.png >:-( >:( X-( x-( +phone.png :telephone: +in_love.png :heart: :love: <3 +musical-note.png :music: +beer.png :beer: +coffee.png :coffee: + +# Others +neutral.png :| :-| + +# 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 +tongue.png :P :p :-P :-p +shocked.png =-O kiss.png :-* -smile-big.png :-D :D +excited.png :-D :D +embarrassed.png :-[ angel.png O:-) thinking.png :-\\ :-/ crying.png :'( @@ -34,19 +65,20 @@ crying.png :'( # Following Windows Live Messenger 8.1 [MSN] -smile.png :) :-) -smile-big.png :D :d :-D :-d +happy.png :) :-) +excited.png :D :d :-D :-d wink.png ;) ;-) -shock.png :-O :-o :O :o -tongue.png :P :p :-P :-p +shocked.png :-O :-o :O :o +tongue.png :-P :P :-p :p angry.png :@ :-@ -confused.png :S :s :-S :-s +embarrassed.png :$ :-$ +confused.png :S :s :-S :-s sad.png :( :-( crying.png :'( neutral.png :| :-| devil.png (6) angel.png (A) (a) -love.png (L) (l) +in_love.png (L) (l) musical-note.png (8) kiss.png (K) (k) camera.png (P) (p) @@ -55,12 +87,14 @@ phone.png (T) (t) hug-left.png ({) hug-right.png (}) beer.png (B) (b) +sarcastic.png ^o) sick.png +o( plate.png (pl) +mobile.png (mp) dont-know.png :^) thinking.png *-) party.png <:o) -yawn.png |-) +sleepy.png |-) # Hidden MSN emotes cigarette.png (ci) (CI) @@ -69,22 +103,27 @@ console.png (xx) (XX) # Following QQ 2006 [QQ] -shock.png /:O /jy /surprised +shocked.png /:O /jy /surprised party.png /8-) /dy /revel crying.png /:< /ll /cry -sleepy.png /:Z /shui /sleep -smile-big.png /:D /cy /toothy_smile -smile.png /:) /wx /small_smile +sleeping.png /:Z /shui /sleep +embarrassed.png /:-| /gg /embarassed +excited.png /:D /cy /toothy_smile +happy.png /:) /wx /small_smile sad.png /:( /ng /sad sick.png /:T /tu /vomit -yawn.png /|-) /kun /sleepy +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 -love.png /heart /xin /heart +in_love.png /heart /xin /heart meeting.png /meeting /hy /meeting phone.png /phone /dh /phone tv.png /TV /ds /TV @@ -93,45 +132,54 @@ angry.png /<O> /oh /angry # 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 -sleepy.png *TIRED* +music.png [:-} +sleeping.png *TIRED* crying.png :'( :'-( sick.png :-! kiss.png :-{} :-* +embarrassed.png :-[ devil.png ]:-> angel.png O:-) thinking.png :-\\ :-/ beer.png *DRINK* -smile-big.png :-D :D +excited.png :-D :D +amorous.png *IN\ LOVE* # 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 :-& -yawn.png (:| +sleepy.png (:| sad.png :( :-( +amorous.png :x :-x :X :-X angry.png X-( x-( X( x( crying.png :(( wink.png ;) ;-) +embarrassed.png :"> +mean.png :-> :> thinking.png :-? -smile-big.png :D :-D :d :-d +excited.png :D :-D :d :-d tongue.png :-P :P :-p :p neutral.png :| :-| -sleepy.png I-) i-) |-) +sleeping.png I-) i-) |-) kiss.png :-* :* 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) @@ -171,30 +219,14 @@ musical-note.png :-" # Following MySpaceIM Beta 1.0.697.0 [MySpaceIM] -smile-big.png :D :-D +excited.png :D :-D devil.png }:) confused.png :Z -smile.png :) :-) -shock.png :O +amorous.png :X +shocked.png :O neutral.png :| tongue.png :P :p wink.png ;-) ;) sad.png :[ kiss.png :x -[XMPP] -# XMPP emoticons -smile.png :) :-) =) -smile-big.png :D :-D =D -wink.png ;) ;-) ;^) -shock.png :-o -tongue.png :P :-P :-p :p -glasses-cool.png B-) -angry.png X-( -sad.png :( :-( =( -crying.png :'( -neutral.png :-| -thinking.png :-/ -love.png <3 -monkey.png :(|) -victory.png \\m/ diff --git a/pidgin/pixmaps/emotes/small/16/studying.png b/pidgin/pixmaps/emotes/small/16/studying.png Binary files differnew file mode 100644 index 0000000000..0a6053f86c --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/studying.png diff --git a/pidgin/pixmaps/emotes/small/16/suit.png b/pidgin/pixmaps/emotes/small/16/suit.png Binary files differnew file mode 100644 index 0000000000..3c0080f0dd --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/suit.png diff --git a/pidgin/pixmaps/emotes/small/16/surfing.png b/pidgin/pixmaps/emotes/small/16/surfing.png Binary files differnew file mode 100644 index 0000000000..727b352f72 --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/surfing.png diff --git a/pidgin/pixmaps/emotes/small/16/typing.png b/pidgin/pixmaps/emotes/small/16/typing.png Binary files differnew file mode 100644 index 0000000000..7f60b0a25e --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/typing.png diff --git a/pidgin/pixmaps/emotes/small/16/working.png b/pidgin/pixmaps/emotes/small/16/working.png Binary files differnew file mode 100644 index 0000000000..cc90d637df --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/working.png diff --git a/pidgin/pixmaps/emotes/small/16/writing.png b/pidgin/pixmaps/emotes/small/16/writing.png Binary files differnew file mode 100644 index 0000000000..e8b5d0d53e --- /dev/null +++ b/pidgin/pixmaps/emotes/small/16/writing.png diff --git a/pidgin/pixmaps/emotes/small/16/yawn.png b/pidgin/pixmaps/emotes/small/16/yawn.png Binary files differdeleted file mode 100644 index 9a86537f4f..0000000000 --- a/pidgin/pixmaps/emotes/small/16/yawn.png +++ /dev/null |
