From: Thomas Date: Thu, 22 Mar 2012 20:53:03 +0000 (+0000) Subject: a few new smilieys, plus case-insensitivty for a couple of core smileys X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=184e2b776bd77048ef581488b5d74d26e865f35f;p=friendica-addons.git a few new smilieys, plus case-insensitivty for a couple of core smileys --- diff --git a/smiley_pack/.smiley_pack.php.kate-swp b/smiley_pack/.smiley_pack.php.kate-swp new file mode 100644 index 00000000..73a77b3a Binary files /dev/null and b/smiley_pack/.smiley_pack.php.kate-swp differ diff --git a/smiley_pack/icons/animals/elephant.gif b/smiley_pack/icons/animals/elephant.gif new file mode 100644 index 00000000..4311e97d Binary files /dev/null and b/smiley_pack/icons/animals/elephant.gif differ diff --git a/smiley_pack/icons/animals/fish.gif b/smiley_pack/icons/animals/fish.gif new file mode 100644 index 00000000..3a7a584b Binary files /dev/null and b/smiley_pack/icons/animals/fish.gif differ diff --git a/smiley_pack/icons/animals/giraffe.gif b/smiley_pack/icons/animals/giraffe.gif new file mode 100644 index 00000000..4c95ea4c Binary files /dev/null and b/smiley_pack/icons/animals/giraffe.gif differ diff --git a/smiley_pack/icons/animals/pig.gif b/smiley_pack/icons/animals/pig.gif new file mode 100644 index 00000000..bdc68e83 Binary files /dev/null and b/smiley_pack/icons/animals/pig.gif differ diff --git a/smiley_pack/icons/oldcore/laughing.gif b/smiley_pack/icons/oldcore/laughing.gif new file mode 100755 index 00000000..1bf29de7 Binary files /dev/null and b/smiley_pack/icons/oldcore/laughing.gif differ diff --git a/smiley_pack/icons/oldcore/surprised.gif b/smiley_pack/icons/oldcore/surprised.gif new file mode 100755 index 00000000..b0746532 Binary files /dev/null and b/smiley_pack/icons/oldcore/surprised.gif differ diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php index 4cfcc95d..aa79a7f0 100644 --- a/smiley_pack/smiley_pack.php +++ b/smiley_pack/smiley_pack.php @@ -21,6 +21,15 @@ function smiley_pack__uninstall() { function smiley_pack_smilies(&$a,&$b) { +#Smileys are split into various directories by the intended range of emotions. This is in case we get too big and need to modularise things. We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever. + +#Be careful with invocation strings. If you have a smiley called foo, and another called foobar, typing :foobar will call foo. Avoid this with clever naming, using ~ instead of : +#when all else fails. + + + +#Animal smileys. + $b['texts'][] = ':bunnyflowers'; $b['icons'][] = '' . ':bunnyflowers' . ''; @@ -84,6 +93,7 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':dog'; $b['icons'][] = '' . ':dog' . ''; +#Baby Smileys $b['texts'][] = ':baby'; $b['icons'][] = '' . ':baby' . ''; @@ -98,7 +108,8 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':stork'; $b['icons'][] = '' . ':stork' . ''; - + +#Confused Smileys $b['texts'][] = ':confused'; $b['icons'][] = '' . ':confused' . ''; @@ -108,12 +119,16 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':stupid'; $b['icons'][] = '' . ':stupid' . ''; +#Cool Smileys + $b['texts'][] = ':affro'; $b['icons'][] = '' . ':affro' . ''; $b['texts'][] = ':cool'; $b['icons'][] = '' . ':cool' . ''; +#Devil/Angel Smileys + $b['texts'][] = ':angel'; $b['icons'][] = '' . ':angel' . ''; @@ -141,6 +156,8 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':graveside'; $b['icons'][] = '' . ':graveside' . ''; +#Unpleasent smileys. + $b['texts'][] = ':toilet'; $b['icons'][] = '' . ':toilet' . ''; @@ -150,21 +167,29 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':vomit'; $b['icons'][] = '' . ':vomit' . ''; +#Drinks + $b['texts'][] = ':tea'; $b['icons'][] = '' . ':tea' . ''; $b['texts'][] = ':drool'; $b['icons'][] = '' . ':drool' . ''; +#Sad smileys + $b['texts'][] = ':crying'; $b['icons'][] = '' . ':crying' . ''; $b['texts'][] = ':prisoner'; $b['icons'][] = '' . ':prisoner' . ''; +#Smoking - only one smiley in here, maybe it needs moving elsewhere? + $b['texts'][] = ':smoking'; $b['icons'][] = '' . ':smoking' . ''; +#Sport smileys + $b['texts'][] = ':basketball'; $b['icons'][] = '' . ':basketball' . ''; @@ -207,6 +232,7 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':horseriding'; $b['icons'][] = '' . ':horseriding' . ''; +#Love smileys $b['texts'][] = ':iloveyou'; $b['icons'][] = '' . ':iloveyou' . ''; @@ -226,6 +252,8 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':loveheart'; $b['icons'][] = '' . ':loveheart' . ''; +#Tired/Sleep smileys + $b['texts'][] = ':countsheep'; $b['icons'][] = '' . ':countsheep' . ''; @@ -235,6 +263,8 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':pillow'; $b['icons'][] = '' . ':pillow' . ''; +#Fight/Flame/Violent smileys + $b['texts'][] = ':2guns'; $b['icons'][] = '' . ':2guns' . ''; @@ -292,6 +322,8 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':acid'; $b['icons'][] = '' . ':acid' . ''; +#Fantasy smileys - monsters and dragons fantasy. The other type of fantasy belongs in adult smileys + $b['texts'][] = ':alienmonster'; $b['icons'][] = '' . ':alienmonster' . ''; @@ -313,6 +345,8 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':mummy'; $b['icons'][] = '' . ':mummy' . ''; +#Food smileys + $b['texts'][] = ':apple'; $b['icons'][] = '' . ':apple' . ''; @@ -338,12 +372,16 @@ function smiley_pack_smilies(&$a,&$b) { $b['icons'][] = '' . ':cooking' . ''; +#Happy smileys + $b['texts'][] = ':cloud9'; $b['icons'][] = '' . ':cloud9' . ''; $b['texts'][] = ':tearsofjoy'; $b['icons'][] = '' . ':tearsofjoy' . ''; +#Repsect smileys + $b['texts'][] = ':bow'; $b['icons'][] = '' . ':bow' . ''; @@ -356,6 +394,8 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':number1'; $b['icons'][] = '' . ':number1' . ''; +#Laugh smileys + $b['texts'][] = ':hahaha'; $b['icons'][] = '' . ':hahaha' . ''; @@ -365,6 +405,8 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':rofl'; $b['icons'][] = '' . ':rofl' . ''; +#Music smileys + $b['texts'][] = ':dj'; $b['icons'][] = '' . ':dj' . ''; @@ -383,6 +425,8 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':violin'; $b['icons'][] = '' . ':violin' . ''; +#Smileys that used to be in core + $b['texts'][] = ':headbang'; $b['icons'][] = '' . ':headbang' . ''; @@ -404,5 +448,15 @@ function smiley_pack_smilies(&$a,&$b) { $b['texts'][] = ':headdesk'; $b['icons'][] = '' . ':headdesk' . ''; +#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories + + $b['texts'][] = ':-d'; + $b['icons'][] = '' . ':-d' . ''; + + $b['texts'][] = ':-o'; + $b['icons'][] = '' . ':-o' . ''; + + + }