diff --git a/toxygen/smileys/ksk/angry.png b/toxygen/smileys/ksk/angry.png index 12a51f5..2659bf2 100644 Binary files a/toxygen/smileys/ksk/angry.png and b/toxygen/smileys/ksk/angry.png differ diff --git a/toxygen/smileys/ksk/angry2.png b/toxygen/smileys/ksk/angry2.png index f345319..6ecbb1e 100644 Binary files a/toxygen/smileys/ksk/angry2.png and b/toxygen/smileys/ksk/angry2.png differ diff --git a/toxygen/smileys/ksk/angry3.png b/toxygen/smileys/ksk/angry3.png index a68d15d..9b9ebc0 100644 Binary files a/toxygen/smileys/ksk/angry3.png and b/toxygen/smileys/ksk/angry3.png differ diff --git a/toxygen/smileys/ksk/blink.png b/toxygen/smileys/ksk/blink.png index 4593e9a..b7fe238 100644 Binary files a/toxygen/smileys/ksk/blink.png and b/toxygen/smileys/ksk/blink.png differ diff --git a/toxygen/smileys/ksk/bluestar.png b/toxygen/smileys/ksk/bluestar.png index 3f84805..21f37ca 100644 Binary files a/toxygen/smileys/ksk/bluestar.png and b/toxygen/smileys/ksk/bluestar.png differ diff --git a/toxygen/smileys/ksk/calm.png b/toxygen/smileys/ksk/calm.png index cc04aa2..da19990 100644 Binary files a/toxygen/smileys/ksk/calm.png and b/toxygen/smileys/ksk/calm.png differ diff --git a/toxygen/smileys/ksk/cool.png b/toxygen/smileys/ksk/cool.png index b223eb3..891ed33 100644 Binary files a/toxygen/smileys/ksk/cool.png and b/toxygen/smileys/ksk/cool.png differ diff --git a/toxygen/smileys/ksk/cool2.png b/toxygen/smileys/ksk/cool2.png index 3e04321..3dea030 100644 Binary files a/toxygen/smileys/ksk/cool2.png and b/toxygen/smileys/ksk/cool2.png differ diff --git a/toxygen/smileys/ksk/cry.png b/toxygen/smileys/ksk/cry.png index bf422fb..fea2481 100644 Binary files a/toxygen/smileys/ksk/cry.png and b/toxygen/smileys/ksk/cry.png differ diff --git a/toxygen/smileys/ksk/dead.png b/toxygen/smileys/ksk/dead.png index 2ea2ca3..7b22495 100644 Binary files a/toxygen/smileys/ksk/dead.png and b/toxygen/smileys/ksk/dead.png differ diff --git a/toxygen/smileys/ksk/evil.png b/toxygen/smileys/ksk/evil.png index a0483e9..140a259 100644 Binary files a/toxygen/smileys/ksk/evil.png and b/toxygen/smileys/ksk/evil.png differ diff --git a/toxygen/smileys/ksk/evil2.png b/toxygen/smileys/ksk/evil2.png index 0388ab2..c01efdd 100644 Binary files a/toxygen/smileys/ksk/evil2.png and b/toxygen/smileys/ksk/evil2.png differ diff --git a/toxygen/smileys/ksk/flower.png b/toxygen/smileys/ksk/flower.png index ca53961..5463fda 100644 Binary files a/toxygen/smileys/ksk/flower.png and b/toxygen/smileys/ksk/flower.png differ diff --git a/toxygen/smileys/ksk/getlost.png b/toxygen/smileys/ksk/getlost.png index c54c5d0..2c75727 100644 Binary files a/toxygen/smileys/ksk/getlost.png and b/toxygen/smileys/ksk/getlost.png differ diff --git a/toxygen/smileys/ksk/greenstar.png b/toxygen/smileys/ksk/greenstar.png index aa0e9eb..b557c50 100644 Binary files a/toxygen/smileys/ksk/greenstar.png and b/toxygen/smileys/ksk/greenstar.png differ diff --git a/toxygen/smileys/ksk/grin.png b/toxygen/smileys/ksk/grin.png index ed79b59..b35bf24 100644 Binary files a/toxygen/smileys/ksk/grin.png and b/toxygen/smileys/ksk/grin.png differ diff --git a/toxygen/smileys/ksk/heart.png b/toxygen/smileys/ksk/heart.png index 32a3e62..25d3d7f 100644 Binary files a/toxygen/smileys/ksk/heart.png and b/toxygen/smileys/ksk/heart.png differ diff --git a/toxygen/smileys/ksk/kiss.png b/toxygen/smileys/ksk/kiss.png index 5ba0bea..4764d69 100644 Binary files a/toxygen/smileys/ksk/kiss.png and b/toxygen/smileys/ksk/kiss.png differ diff --git a/toxygen/smileys/ksk/leaf.png b/toxygen/smileys/ksk/leaf.png index c04bedd..7598896 100644 Binary files a/toxygen/smileys/ksk/leaf.png and b/toxygen/smileys/ksk/leaf.png differ diff --git a/toxygen/smileys/ksk/lol.png b/toxygen/smileys/ksk/lol.png index 801baab..9d42add 100644 Binary files a/toxygen/smileys/ksk/lol.png and b/toxygen/smileys/ksk/lol.png differ diff --git a/toxygen/smileys/ksk/none.png b/toxygen/smileys/ksk/none.png index 99487f5..03d421f 100644 Binary files a/toxygen/smileys/ksk/none.png and b/toxygen/smileys/ksk/none.png differ diff --git a/toxygen/smileys/ksk/none2.png b/toxygen/smileys/ksk/none2.png index 352e102..0fc9cf1 100644 Binary files a/toxygen/smileys/ksk/none2.png and b/toxygen/smileys/ksk/none2.png differ diff --git a/toxygen/smileys/ksk/notes.png b/toxygen/smileys/ksk/notes.png index 7389846..6c07260 100644 Binary files a/toxygen/smileys/ksk/notes.png and b/toxygen/smileys/ksk/notes.png differ diff --git a/toxygen/smileys/ksk/oops.png b/toxygen/smileys/ksk/oops.png index 3fef724..744a2a0 100644 Binary files a/toxygen/smileys/ksk/oops.png and b/toxygen/smileys/ksk/oops.png differ diff --git a/toxygen/smileys/ksk/pawn.png b/toxygen/smileys/ksk/pawn.png index 566d43f..cce0cad 100644 Binary files a/toxygen/smileys/ksk/pawn.png and b/toxygen/smileys/ksk/pawn.png differ diff --git a/toxygen/smileys/ksk/pleased.png b/toxygen/smileys/ksk/pleased.png index 8a265ea..2c7e60d 100644 Binary files a/toxygen/smileys/ksk/pleased.png and b/toxygen/smileys/ksk/pleased.png differ diff --git a/toxygen/smileys/ksk/redstar.png b/toxygen/smileys/ksk/redstar.png index eb634bc..33bcdf1 100644 Binary files a/toxygen/smileys/ksk/redstar.png and b/toxygen/smileys/ksk/redstar.png differ diff --git a/toxygen/smileys/ksk/sad.png b/toxygen/smileys/ksk/sad.png index 3cafa05..0a33174 100644 Binary files a/toxygen/smileys/ksk/sad.png and b/toxygen/smileys/ksk/sad.png differ diff --git a/toxygen/smileys/ksk/scared.png b/toxygen/smileys/ksk/scared.png index b9395c3..1b5c55c 100644 Binary files a/toxygen/smileys/ksk/scared.png and b/toxygen/smileys/ksk/scared.png differ diff --git a/toxygen/smileys/ksk/shocked.png b/toxygen/smileys/ksk/shocked.png index 8e137f6..83e0850 100644 Binary files a/toxygen/smileys/ksk/shocked.png and b/toxygen/smileys/ksk/shocked.png differ diff --git a/toxygen/smileys/ksk/smile.png b/toxygen/smileys/ksk/smile.png index 3f08d94..a431ca7 100644 Binary files a/toxygen/smileys/ksk/smile.png and b/toxygen/smileys/ksk/smile.png differ diff --git a/toxygen/smileys/ksk/smile2.png b/toxygen/smileys/ksk/smile2.png index 11ea087..4d003ae 100644 Binary files a/toxygen/smileys/ksk/smile2.png and b/toxygen/smileys/ksk/smile2.png differ diff --git a/toxygen/smileys/ksk/tongue.png b/toxygen/smileys/ksk/tongue.png index 840d743..bf6c37e 100644 Binary files a/toxygen/smileys/ksk/tongue.png and b/toxygen/smileys/ksk/tongue.png differ diff --git a/toxygen/smileys/ksk/unwell.png b/toxygen/smileys/ksk/unwell.png index c093a9a..5bca721 100644 Binary files a/toxygen/smileys/ksk/unwell.png and b/toxygen/smileys/ksk/unwell.png differ diff --git a/toxygen/smileys/ksk/yellowstar.png b/toxygen/smileys/ksk/yellowstar.png index f8a2672..5e00805 100644 Binary files a/toxygen/smileys/ksk/yellowstar.png and b/toxygen/smileys/ksk/yellowstar.png differ diff --git a/toxygen/smileys/ksk/zzz.png b/toxygen/smileys/ksk/zzz.png index dff4463..0d17073 100644 Binary files a/toxygen/smileys/ksk/zzz.png and b/toxygen/smileys/ksk/zzz.png differ diff --git a/toxygen/smileys/smileys.py b/toxygen/smileys/smileys.py index 0391856..43ae3fd 100644 --- a/toxygen/smileys/smileys.py +++ b/toxygen/smileys/smileys.py @@ -4,6 +4,11 @@ import os from collections import OrderedDict from PyQt5 import QtCore +# LOG=util.log +global LOG +import logging +LOG = logging.getLogger('app.'+__name__) +log = lambda x: LOG.info(x) class SmileyLoader: """ @@ -31,7 +36,7 @@ class SmileyLoader: self._smileys = json.loads(fl.read()) fl.seek(0) tmp = json.loads(fl.read(), object_pairs_hook=OrderedDict) - print('Smiley pack {} loaded'.format(pack_name)) + LOG.info('Smiley pack {} loaded'.format(pack_name)) keys, values, self._list = [], [], [] for key, value in tmp.items(): value = util.join_path(self.get_smileys_path(), value) @@ -42,7 +47,7 @@ class SmileyLoader: except Exception as ex: self._smileys = {} self._list = [] - print('Smiley pack {} was not loaded. Error: {}'.format(pack_name, ex)) + LOG.error('Smiley pack {} was not loaded. Error: {}'.format(pack_name, str(ex))) def get_smileys_path(self): return util.join_path(util.get_smileys_directory(), self._curr_pack) if self._curr_pack is not None else None diff --git a/toxygen/smileys/starwars/ackbar.png b/toxygen/smileys/starwars/ackbar.png index 0a0a482..1f8a4d5 100644 Binary files a/toxygen/smileys/starwars/ackbar.png and b/toxygen/smileys/starwars/ackbar.png differ diff --git a/toxygen/smileys/starwars/boba.png b/toxygen/smileys/starwars/boba.png index 88789dc..1c234c5 100644 Binary files a/toxygen/smileys/starwars/boba.png and b/toxygen/smileys/starwars/boba.png differ diff --git a/toxygen/smileys/starwars/c3p0.png b/toxygen/smileys/starwars/c3p0.png index a37df94..be5adea 100644 Binary files a/toxygen/smileys/starwars/c3p0.png and b/toxygen/smileys/starwars/c3p0.png differ diff --git a/toxygen/smileys/starwars/chewie.png b/toxygen/smileys/starwars/chewie.png index 669dd36..8f5a5f6 100644 Binary files a/toxygen/smileys/starwars/chewie.png and b/toxygen/smileys/starwars/chewie.png differ diff --git a/toxygen/smileys/starwars/confused.png b/toxygen/smileys/starwars/confused.png index 54afd60..5cc2fd1 100644 Binary files a/toxygen/smileys/starwars/confused.png and b/toxygen/smileys/starwars/confused.png differ diff --git a/toxygen/smileys/starwars/darthmaul.png b/toxygen/smileys/starwars/darthmaul.png index e536a7e..57e8ca1 100644 Binary files a/toxygen/smileys/starwars/darthmaul.png and b/toxygen/smileys/starwars/darthmaul.png differ diff --git a/toxygen/smileys/starwars/darthsidious.png b/toxygen/smileys/starwars/darthsidious.png index 6c787c1..de36348 100644 Binary files a/toxygen/smileys/starwars/darthsidious.png and b/toxygen/smileys/starwars/darthsidious.png differ diff --git a/toxygen/smileys/starwars/darthvader.png b/toxygen/smileys/starwars/darthvader.png index a0b01e4..66c1409 100644 Binary files a/toxygen/smileys/starwars/darthvader.png and b/toxygen/smileys/starwars/darthvader.png differ diff --git a/toxygen/smileys/starwars/deathstar.png b/toxygen/smileys/starwars/deathstar.png index 383e730..3ee623c 100644 Binary files a/toxygen/smileys/starwars/deathstar.png and b/toxygen/smileys/starwars/deathstar.png differ diff --git a/toxygen/smileys/starwars/dualsith.png b/toxygen/smileys/starwars/dualsith.png index 39143ec..732d6a3 100644 Binary files a/toxygen/smileys/starwars/dualsith.png and b/toxygen/smileys/starwars/dualsith.png differ diff --git a/toxygen/smileys/starwars/grin.png b/toxygen/smileys/starwars/grin.png index 8ee5ff0..226f31d 100644 Binary files a/toxygen/smileys/starwars/grin.png and b/toxygen/smileys/starwars/grin.png differ diff --git a/toxygen/smileys/starwars/happy.png b/toxygen/smileys/starwars/happy.png index 68f8717..d1f08ed 100644 Binary files a/toxygen/smileys/starwars/happy.png and b/toxygen/smileys/starwars/happy.png differ diff --git a/toxygen/smileys/starwars/jango.png b/toxygen/smileys/starwars/jango.png index 5275e7d..dc731be 100644 Binary files a/toxygen/smileys/starwars/jango.png and b/toxygen/smileys/starwars/jango.png differ diff --git a/toxygen/smileys/starwars/jarjarbinks.png b/toxygen/smileys/starwars/jarjarbinks.png index 802c83a..b83ebbe 100644 Binary files a/toxygen/smileys/starwars/jarjarbinks.png and b/toxygen/smileys/starwars/jarjarbinks.png differ diff --git a/toxygen/smileys/starwars/jedi.png b/toxygen/smileys/starwars/jedi.png index f8ff638..6bc3173 100644 Binary files a/toxygen/smileys/starwars/jedi.png and b/toxygen/smileys/starwars/jedi.png differ diff --git a/toxygen/smileys/starwars/jedi2.png b/toxygen/smileys/starwars/jedi2.png index 3550eb8..3f3a39d 100644 Binary files a/toxygen/smileys/starwars/jedi2.png and b/toxygen/smileys/starwars/jedi2.png differ diff --git a/toxygen/smileys/starwars/leia.png b/toxygen/smileys/starwars/leia.png index 2e40729..885087d 100644 Binary files a/toxygen/smileys/starwars/leia.png and b/toxygen/smileys/starwars/leia.png differ diff --git a/toxygen/smileys/starwars/mad.png b/toxygen/smileys/starwars/mad.png index 6109783..0380c2e 100644 Binary files a/toxygen/smileys/starwars/mad.png and b/toxygen/smileys/starwars/mad.png differ diff --git a/toxygen/smileys/starwars/masteryoda.png b/toxygen/smileys/starwars/masteryoda.png index 9d5f86f..080cc02 100644 Binary files a/toxygen/smileys/starwars/masteryoda.png and b/toxygen/smileys/starwars/masteryoda.png differ diff --git a/toxygen/smileys/starwars/r2d2.png b/toxygen/smileys/starwars/r2d2.png index e114b3f..f0f0f9d 100644 Binary files a/toxygen/smileys/starwars/r2d2.png and b/toxygen/smileys/starwars/r2d2.png differ diff --git a/toxygen/smileys/starwars/sad.png b/toxygen/smileys/starwars/sad.png index 484d18f..c556767 100644 Binary files a/toxygen/smileys/starwars/sad.png and b/toxygen/smileys/starwars/sad.png differ diff --git a/toxygen/smileys/starwars/samjackson.png b/toxygen/smileys/starwars/samjackson.png index d6f8024..3c109d9 100644 Binary files a/toxygen/smileys/starwars/samjackson.png and b/toxygen/smileys/starwars/samjackson.png differ diff --git a/toxygen/smileys/starwars/shocked.png b/toxygen/smileys/starwars/shocked.png index fa3747d..2770ab3 100644 Binary files a/toxygen/smileys/starwars/shocked.png and b/toxygen/smileys/starwars/shocked.png differ diff --git a/toxygen/smileys/starwars/sith.png b/toxygen/smileys/starwars/sith.png index e04a07c..38223e9 100644 Binary files a/toxygen/smileys/starwars/sith.png and b/toxygen/smileys/starwars/sith.png differ diff --git a/toxygen/smileys/starwars/smile.png b/toxygen/smileys/starwars/smile.png index dcc34cb..79beb89 100644 Binary files a/toxygen/smileys/starwars/smile.png and b/toxygen/smileys/starwars/smile.png differ diff --git a/toxygen/smileys/starwars/stormtrooper.png b/toxygen/smileys/starwars/stormtrooper.png index 5014c1e..a4a4cfe 100644 Binary files a/toxygen/smileys/starwars/stormtrooper.png and b/toxygen/smileys/starwars/stormtrooper.png differ diff --git a/toxygen/smileys/starwars/tape.png b/toxygen/smileys/starwars/tape.png index 866ac05..04cefdb 100644 Binary files a/toxygen/smileys/starwars/tape.png and b/toxygen/smileys/starwars/tape.png differ diff --git a/toxygen/smileys/starwars/tongue.png b/toxygen/smileys/starwars/tongue.png index b10b914..8c22f1e 100644 Binary files a/toxygen/smileys/starwars/tongue.png and b/toxygen/smileys/starwars/tongue.png differ diff --git a/toxygen/smileys/starwars/wink.png b/toxygen/smileys/starwars/wink.png index dd5a292..50d0edc 100644 Binary files a/toxygen/smileys/starwars/wink.png and b/toxygen/smileys/starwars/wink.png differ diff --git a/toxygen/smileys/starwars/x-wing.png b/toxygen/smileys/starwars/x-wing.png index e2a633a..e48036b 100644 Binary files a/toxygen/smileys/starwars/x-wing.png and b/toxygen/smileys/starwars/x-wing.png differ diff --git a/toxygen/smileys/starwars/y-wing.png b/toxygen/smileys/starwars/y-wing.png index 59d0b52..f750184 100644 Binary files a/toxygen/smileys/starwars/y-wing.png and b/toxygen/smileys/starwars/y-wing.png differ