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

11 files changed, 6 insertions, 1 deletions

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
--- /dev/null
+++ b/Plugins/emoticons/data/Customize/Emoticons/Tango/Thumbs.db
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
--- /dev/null
+++ b/Plugins/emoticons/data/Customize/Emoticons/Tango/bunny.png
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/cat.png b/Plugins/emoticons/data/Customize/Emoticons/Tango/cat.png
index 9454c7b..4b602da 100644
--- a/Plugins/emoticons/data/Customize/Emoticons/Tango/cat.png
+++ b/Plugins/emoticons/data/Customize/Emoticons/Tango/cat.png
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
--- /dev/null
+++ b/Plugins/emoticons/data/Customize/Emoticons/Tango/desperate.png
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
--- /dev/null
+++ b/Plugins/emoticons/data/Customize/Emoticons/Tango/emo.png
diff --git a/Plugins/emoticons/data/Customize/Emoticons/Tango/immakingadifference.gif b/Plugins/emoticons/data/Customize/Emoticons/Tango/immakingadifference.gif
index ee9120d..01de711 100644
--- a/Plugins/emoticons/data/Customize/Emoticons/Tango/immakingadifference.gif
+++ b/Plugins/emoticons/data/Customize/Emoticons/Tango/immakingadifference.gif
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
--- /dev/null
+++ b/Plugins/emoticons/data/Customize/Emoticons/Tango/skype.png
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
--- /dev/null
+++ b/Plugins/emoticons/data/Customize/Emoticons/Tango/two-questions.png
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]