From b95d4a9cc2465a53b3bd5ab0805ce9be781ffa8d Mon Sep 17 00:00:00 2001
From: pescuma <pescuma@c086bb3d-8645-0410-b8da-73a8550f86e7>
Date: Mon, 2 Mar 2009 00:58:21 +0000
Subject: emoticons: - fixed and added some emoticons - Added bee emoticon to
 YAHOO - Fix to avoid showing only one emoticon in a row

git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@148 c086bb3d-8645-0410-b8da-73a8550f86e7
---
 Plugins/emoticons/EmoticonsSelectionLayout.cpp        |   4 ++++
 .../data/Customize/Emoticons/Tango/Thumbs.db          | Bin 0 -> 572928 bytes
 .../data/Customize/Emoticons/Tango/bunny.png          | Bin 0 -> 1694 bytes
 .../emoticons/data/Customize/Emoticons/Tango/cat.png  | Bin 1269 -> 1470 bytes
 .../data/Customize/Emoticons/Tango/desperate.png      | Bin 0 -> 1527 bytes
 .../emoticons/data/Customize/Emoticons/Tango/emo.png  | Bin 0 -> 1618 bytes
 .../Customize/Emoticons/Tango/immakingadifference.gif | Bin 301 -> 265 bytes
 .../data/Customize/Emoticons/Tango/skype.png          | Bin 0 -> 1618 bytes
 .../data/Customize/Emoticons/Tango/two-questions.png  | Bin 0 -> 1491 bytes
 Plugins/emoticons/data/Plugins/Emoticons/MSN.emo      |   2 +-
 Plugins/emoticons/data/Plugins/Emoticons/YAHOO.emo    |   1 +
 11 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 Plugins/emoticons/data/Customize/Emoticons/Tango/Thumbs.db
 create mode 100644 Plugins/emoticons/data/Customize/Emoticons/Tango/bunny.png
 create mode 100644 Plugins/emoticons/data/Customize/Emoticons/Tango/desperate.png
 create mode 100644 Plugins/emoticons/data/Customize/Emoticons/Tango/emo.png
 create mode 100644 Plugins/emoticons/data/Customize/Emoticons/Tango/skype.png
 create mode 100644 Plugins/emoticons/data/Customize/Emoticons/Tango/two-questions.png

diff --git a/Plugins/emoticons/EmoticonsSelectionLayout.cpp b/Plugins/emoticons/EmoticonsSelectionLayout.cpp
index 5c58244..f392853 100644
--- a/Plugins/emoticons/EmoticonsSelectionLayout.cpp
+++ b/Plugins/emoticons/EmoticonsSelectionLayout.cpp
@@ -144,6 +144,10 @@ int EmoticonsSelectionLayout::GetNumOfCols(int num_emotes)
 			}
 		}
 	}
+
+	if (num_emotes % cols <= max(2, cols /3))
+		cols++;
+
 	return min(max(MIN_COLS, min(cols, MAX_COLS)), num_emotes);
 }
 
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/Thumbs.db b/Plugins/emoticons/data/Customize/Emoticons/Tango/Thumbs.db
new file mode 100644
index 0000000..82c4553
Binary files /dev/null and b/Plugins/emoticons/data/Customize/Emoticons/Tango/Thumbs.db differ
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/bunny.png b/Plugins/emoticons/data/Customize/Emoticons/Tango/bunny.png
new file mode 100644
index 0000000..77d97c4
Binary files /dev/null and b/Plugins/emoticons/data/Customize/Emoticons/Tango/bunny.png differ
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/cat.png b/Plugins/emoticons/data/Customize/Emoticons/Tango/cat.png
index 9454c7b..4b602da 100644
Binary files a/Plugins/emoticons/data/Customize/Emoticons/Tango/cat.png and b/Plugins/emoticons/data/Customize/Emoticons/Tango/cat.png differ
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/desperate.png b/Plugins/emoticons/data/Customize/Emoticons/Tango/desperate.png
new file mode 100644
index 0000000..e013d97
Binary files /dev/null and b/Plugins/emoticons/data/Customize/Emoticons/Tango/desperate.png differ
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/emo.png b/Plugins/emoticons/data/Customize/Emoticons/Tango/emo.png
new file mode 100644
index 0000000..5ec8df7
Binary files /dev/null and b/Plugins/emoticons/data/Customize/Emoticons/Tango/emo.png differ
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/immakingadifference.gif b/Plugins/emoticons/data/Customize/Emoticons/Tango/immakingadifference.gif
index ee9120d..01de711 100644
Binary files a/Plugins/emoticons/data/Customize/Emoticons/Tango/immakingadifference.gif and b/Plugins/emoticons/data/Customize/Emoticons/Tango/immakingadifference.gif differ
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/skype.png b/Plugins/emoticons/data/Customize/Emoticons/Tango/skype.png
new file mode 100644
index 0000000..4315ef9
Binary files /dev/null and b/Plugins/emoticons/data/Customize/Emoticons/Tango/skype.png differ
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/two-questions.png b/Plugins/emoticons/data/Customize/Emoticons/Tango/two-questions.png
new file mode 100644
index 0000000..fc657b4
Binary files /dev/null and b/Plugins/emoticons/data/Customize/Emoticons/Tango/two-questions.png differ
diff --git a/Plugins/emoticons/data/Plugins/Emoticons/MSN.emo b/Plugins/emoticons/data/Plugins/Emoticons/MSN.emo
index 44a25aa..9be6973 100644
--- a/Plugins/emoticons/data/Plugins/Emoticons/MSN.emo
+++ b/Plugins/emoticons/data/Plugins/Emoticons/MSN.emo
@@ -85,8 +85,8 @@
 "cigarette" = "Cigar", "(ci)"
 "handcuffs" = "Handcuffs", "(%)"
 "fingers-crossed" = "Cross Fingers", "(yn)"
-"immakingadifference" = "i'm™ initiative", "*red+u" "*bgca" "*naf" "*hsus" "*9mil" "*mssoc" "*sierra" "*unicef" "*help" "*komen"
 "bunny" = "Bunny", "('.')"
+"immakingadifference" = "i'm™ initiative", "*red+u" "*bgca" "*naf" "*hsus" "*9mil" "*mssoc" "*sierra" "*unicef" "*help" "*komen"
 
 
 [Nudge]
diff --git a/Plugins/emoticons/data/Plugins/Emoticons/YAHOO.emo b/Plugins/emoticons/data/Plugins/Emoticons/YAHOO.emo
index 3e6bc85..9a674f2 100644
--- a/Plugins/emoticons/data/Plugins/Emoticons/YAHOO.emo
+++ b/Plugins/emoticons/data/Plugins/Emoticons/YAHOO.emo
@@ -92,6 +92,7 @@
 "male" = "Hiro / Billy", "o->" "o=>"
 "female" = "April", "o-+"
 "yin-yang" = "Yin yang", "(%)"
+"bee" = "Bee", ":bz"
 
 
 [Nudge]
-- 
cgit v1.2.3