emdee/toxygen
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

os x and freebsd support (untested)

Browse source
This commit is contained in:
ingvar1995 2016-07-26 19:09:57 +03:00
parent af5db43248
commit 08ef8294df
3 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
toxygen/file_transfers.py
View file

@ -8,6 +8,7 @@ try:
from PySide import QtCore
except ImportError:
from PyQt4 import QtCore
QtCore.Signal = QtCore.pyqtSignal
# TODO: threads!
@ -34,10 +35,8 @@ ALLOWED_FILES = ('toxygen_inline.png', 'utox-inline.png', 'sticker.png')
class StateSignal(QtCore.QObject):
try:
signal = QtCore.Signal(int, float, int) # state and progress
except:
signal = QtCore.pyqtSignal(int, float, int) # state and progress - pyqt4
signal = QtCore.Signal(int, float, int) # state and progress
class FileTransfer(QtCore.QObject):

8
toxygen/settings.py
View file

@ -204,10 +204,12 @@ class Settings(dict, Singleton):
@staticmethod
def get_default_path():
if system() == 'Linux':
return os.getenv('HOME') + '/.config/tox/'
elif system() == 'Windows':
if system() == 'Windows':
return os.getenv('APPDATA') + '/Tox/'
elif system() == 'Darwin':
return os.getenv('HOME') + '/Library/Application Support/Tox/'
else:
return os.getenv('HOME') + '/.config/tox/'
class ProfileHelper(Singleton):