merge with pyqt5 branch and video sending

This commit is contained in:
ingvar1995
2017-06-11 15:35:52 +03:00
parent f8a7087779
commit d0e2f61d03
24 changed files with 681 additions and 805 deletions

View File

@ -2,10 +2,7 @@ import util
import json
import os
from collections import OrderedDict
try:
from PySide import QtCore
except ImportError:
from PyQt4 import QtCore
from PyQt5 import QtCore
class SmileyLoader(util.Singleton):