summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Laager <rlaager@pidgin.im>2008-11-17 02:30:42 +0000
committerRichard Laager <rlaager@pidgin.im>2008-11-17 02:30:42 +0000
commit5096a6ae96b4ed8a43015b5a1f444b710ee75984 (patch)
tree35e50fcc7efdba8fbc341967d59e88760227bede
parentf9e7ef2ad7d4299a30529c19f6734697b3657f0e (diff)
downloadpidgin-5096a6ae96b4ed8a43015b5a1f444b710ee75984.tar.gz
Round two: Scale down more icons to use as emblems.
-rw-r--r--.mtn-ignore7
-rw-r--r--pidgin/pixmaps/Makefile.am7
-rw-r--r--pidgin/pixmaps/emotes/small/16/TODO4
-rw-r--r--pidgin/pixmaps/emotes/small/16/disappointed.pngbin0 -> 906 bytes
-rw-r--r--pidgin/pixmaps/emotes/small/16/embarrassed.pngbin0 -> 917 bytes
-rw-r--r--pidgin/pixmaps/emotes/small/16/mean.pngbin0 -> 921 bytes
-rw-r--r--pidgin/pixmaps/emotes/small/16/sarcastic.pngbin0 -> 904 bytes
-rw-r--r--pidgin/pixmaps/emotes/small/16/small.theme.in9
8 files changed, 27 insertions, 0 deletions
diff --git a/.mtn-ignore b/.mtn-ignore
index 50c370c87b..8dddb9da88 100644
--- a/.mtn-ignore
+++ b/.mtn-ignore
@@ -43,16 +43,23 @@ pidgin/pixmaps/emblems/16/beer.png
pidgin/pixmaps/emblems/16/busy.png
pidgin/pixmaps/emblems/16/cigarette.png
pidgin/pixmaps/emblems/16/coffee.png
+pidgin/pixmaps/emblems/16/confused.png
pidgin/pixmaps/emblems/16/console.png
+pidgin/pixmaps/emblems/16/disappointed.png
+pidgin/pixmaps/emblems/16/embarrassed.png
pidgin/pixmaps/emblems/16/excited.png
pidgin/pixmaps/emblems/16/in_love.png
+pidgin/pixmaps/emblems/16/mean.png
pidgin/pixmaps/emblems/16/meeting.png
pidgin/pixmaps/emblems/16/mobile.png
pidgin/pixmaps/emblems/16/musical-note.png
+pidgin/pixmaps/emblems/16/neutral.png
pidgin/pixmaps/emblems/16/party.png
pidgin/pixmaps/emblems/16/phone.png
pidgin/pixmaps/emblems/16/plate.png
pidgin/pixmaps/emblems/16/question.png
+pidgin/pixmaps/emblems/16/sad.png
+pidgin/pixmaps/emblems/16/sarcastic.png
pidgin/pixmaps/emblems/16/search.png
pidgin/pixmaps/emblems/16/sick.png
pidgin/pixmaps/emblems/16/sleeping.png
diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am
index 60262190dc..1a85c70cd4 100644
--- a/pidgin/pixmaps/Makefile.am
+++ b/pidgin/pixmaps/Makefile.am
@@ -128,16 +128,23 @@ EMBLEMS_16_COPIED = \
emblems/16/beer.png \
emblems/16/cigarette.png \
emblems/16/coffee.png \
+ emblems/16/confused.png \
emblems/16/console.png \
+ emblems/16/disappointed.png \
+ emblems/16/embarrassed.png \
emblems/16/excited.png \
emblems/16/in_love.png \
+ emblems/16/mean.png \
emblems/16/meeting.png \
emblems/16/mobile.png \
emblems/16/musical-note.png \
+ emblems/16/neutral.png \
emblems/16/party.png \
emblems/16/phone.png \
emblems/16/plate.png \
emblems/16/question.png \
+ emblems/16/sad.png \
+ emblems/16/sarcastic.png \
emblems/16/search.png \
emblems/16/sick.png \
emblems/16/sleeping.png \
diff --git a/pidgin/pixmaps/emotes/small/16/TODO b/pidgin/pixmaps/emotes/small/16/TODO
index 94f08a1913..9c0481e7c0 100644
--- a/pidgin/pixmaps/emotes/small/16/TODO
+++ b/pidgin/pixmaps/emotes/small/16/TODO
@@ -1,7 +1,11 @@
The following icons where just scaled down from the 24x24 and may need work:
+ disappointed.png
+ embarrassed.png
+ mean.png
amorous.png
meeting.png
question.png
+ sarcastic.png
search.png
sleepy.png
smile-big.png
diff --git a/pidgin/pixmaps/emotes/small/16/disappointed.png b/pidgin/pixmaps/emotes/small/16/disappointed.png
new file mode 100644
index 0000000000..3b3e2a12b8
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/disappointed.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/small/16/embarrassed.png b/pidgin/pixmaps/emotes/small/16/embarrassed.png
new file mode 100644
index 0000000000..404b38b494
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/embarrassed.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/small/16/mean.png b/pidgin/pixmaps/emotes/small/16/mean.png
new file mode 100644
index 0000000000..be41d91e79
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/mean.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/small/16/sarcastic.png b/pidgin/pixmaps/emotes/small/16/sarcastic.png
new file mode 100644
index 0000000000..e18fb792d0
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/sarcastic.png
Binary files differ
diff --git a/pidgin/pixmaps/emotes/small/16/small.theme.in b/pidgin/pixmaps/emotes/small/16/small.theme.in
index f126514c9d..7f5e4a44f1 100644
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in
@@ -13,6 +13,7 @@ wink.png ;-) ;)
tongue.png :P :-P :-p :p
shock.png =-O =-o
kiss.png :-*
+embarrassed.png :-[
crying.png :'(
thinking.png :-/ :-\\
angel.png O:-) o:-)
@@ -27,6 +28,7 @@ tongue.png :-P :P :-p :p
shock.png =-O
kiss.png :-*
excited.png :-D :D
+embarrassed.png :-[
angel.png O:-)
thinking.png :-\\ :-/
crying.png :'(
@@ -40,6 +42,7 @@ wink.png ;) ;-)
shock.png :-O :-o :O :o
tongue.png :P :p :-P :-p
angry.png :@ :-@
+embarrassed.png :$ :-$
confused.png :S :s :-S :-s
sad.png :( :-(
crying.png :'(
@@ -55,6 +58,7 @@ 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)
@@ -74,6 +78,7 @@ shock.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
sad.png /:( /ng /sad
@@ -105,6 +110,7 @@ sleeping.png *TIRED*
crying.png :'( :'-(
sick.png :-!
kiss.png :-{} :-*
+embarrassed.png :-[
devil.png ]:->
angel.png O:-)
thinking.png :-\\ :-/
@@ -127,6 +133,8 @@ amorous.png :x :-x :X :-X
angry.png X-( x-( X( x(
crying.png :((
wink.png ;) ;-)
+embarrassed.png :">
+mean.png :-> :>
thinking.png :-?
excited.png :D :-D :d :-d
tongue.png :-P :P :-p :p
@@ -134,6 +142,7 @@ neutral.png :| :-|
sleeping.png I-) i-) |-)
kiss.png :-* :*
confused.png :-S :-s
+sarcastic.png /:)
hug-left.png >:D< >:d<
party.png <:-P <:-p