gajim: Use OrderedDict to maintain emoticons order in packs.

changeset f8aeab45f1c8 in /home/hg/repos/gajim

author: Anaël Verrier elghinn@free.fr branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f8aeab45f1c8 description: Use OrderedDict to maintain emoticons order in packs.

diffstat:

data/emoticons/animated/emoticons.py | 100 ++++++++++++++++--------------- data/emoticons/static-big/emoticons.py | 86 +++++++++++++------------- data/emoticons/static/emoticons.py | 86 +++++++++++++------------- data/emoticons/tango/emoticons.py | 104 ++++++++++++++++---------------- 4 files changed, 192 insertions(+), 184 deletions(-)

diffs (truncated from 396 to 300 lines):

diff -r ac352597e14a -r f8aeab45f1c8 data/emoticons/animated/emoticons.py --- a/data/emoticons/animated/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/animated/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,50 +1,52 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['B-)', '(H)'], - 'wink.gif': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\', ':\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.gif': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'pussy.png': ['(@)'], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'cigarette.gif': ['(ci)'], - 'cake.gif': ['(^)'], - 'dontknow.gif': [':^)'], - 'eyeroll.gif': ['8-)'], - 'lightning.gif': ['(li)'], - 'party.gif': ['<:o)'], - 'sleepy.gif': ['|-)'], - 'think.gif': ['*-)'], - 'puke.gif': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['B-)', '(H)']), + ('wink.gif', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.gif', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\', ':\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.gif', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('pussy.png', ['(@)']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('cigarette.gif', ['(ci)']), + ('cake.gif', ['(^)']), + ('dontknow.gif', [':^)']), + ('eyeroll.gif', ['8-)']), + ('lightning.gif', ['(li)']), + ('party.gif', ['<:o)']), + ('sleepy.gif', ['|-)']), + ('think.gif', ['*-)']), + ('puke.gif', [':-!']), +)) diff -r ac352597e14a -r f8aeab45f1c8 data/emoticons/static-big/emoticons.py --- a/data/emoticons/static-big/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/static-big/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,43 +1,45 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\', ':\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['8-)', 'B-)', '(H)']), + ('wink.png', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\', ':\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.png', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('lion.png', [':3', '>:3']), + ('pussy.png', ['(@)', '=^.^=']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('puke.png', [':-!']), +)) diff -r ac352597e14a -r f8aeab45f1c8 data/emoticons/static/emoticons.py --- a/data/emoticons/static/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/static/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,43 +1,45 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\', ':\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['8-)', 'B-)', '(H)']), + ('wink.png', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\', ':\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.png', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('lion.png', [':3', '>:3']), + ('pussy.png', ['(@)', '=^.^=']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('puke.png', [':-!']), +)) diff -r ac352597e14a -r f8aeab45f1c8 data/emoticons/tango/emoticons.py --- a/data/emoticons/tango/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/tango/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,52 +1,54 @@ # coding=utf-8 -emoticons = { - 'angel.png': ['O:-)', 'o:-)', '0:-)'], - 'curl-lip.png': [':-)', ':)', '=)'], - 'sarcastic.png': [';D', ';-D'], - 'sad.png': [':-(', ':(', '=('], - 'wink.png': [';-)', ';)'], - 'tongue.png': [':-P', ':P', ':-p', ':p'], - 'glasses-cool': ['8-)', 'B-)', '(H)'],