Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge remote-tracking branch 'origin/chat-osd' into chat-osd

Browse Source
This commit is contained in:
Etoh 2017-04-16 12:11:51 +01:00
commit b57e5e28c0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syncplay/client.py
View File

@ -1344,7 +1344,7 @@ class UiManager(object):
def showDebugMessage(self, message):
if constants.DEBUG_MODE and message.rstrip():
sys.stderr.write("{}{}\n".format(time.strftime(constants.UI_TIME_FORMAT, time.localtime()),message.rstrip()))
sys.stderr.write("{}{}\n".format(time.strftime(constants.UI_TIME_FORMAT, time.localtime()).decode('utf-8'),message.rstrip()))
def showChatMessage(self, username, userMessage):
messageString = u"<{}> {}".format(username, userMessage)

2
syncplay/ui/consoleUI.py
View File

@ -94,7 +94,7 @@ class ConsoleUI(threading.Thread):
if noTimestamp:
print(message)
else:
print(time.strftime(constants.UI_TIME_FORMAT, time.localtime()) + message)
print(time.strftime(constants.UI_TIME_FORMAT, time.localtime()).decode('utf-8') + message)
def showDebugMessage(self, message):
print(message)

6
syncplay/ui/gui.py
View File

@ -349,7 +349,7 @@ class MainWindow(QtGui.QMainWindow):
if noTimestamp:
self.newMessage(u"{}<br />".format(message))
else:
self.newMessage(time.strftime(constants.UI_TIME_FORMAT, time.localtime()) + message + u"<br />")
self.newMessage(time.strftime(constants.UI_TIME_FORMAT, time.localtime()).decode('utf-8') + message + u"<br />")
@needsClient
def getFileSwitchState(self, filename):
@ -370,7 +370,7 @@ class MainWindow(QtGui.QMainWindow):
@needsClient
def isItemUntrusted(self, filename):
return isURL(filename) and not self._syncplayClient.isURITrusted(filename)
@needsClient
def isFileAvailable(self, filename):
if filename:
@ -681,7 +681,7 @@ class MainWindow(QtGui.QMainWindow):
message = message.replace(u"&", u"&amp;").replace(u'"', u"&quot;").replace(u"<", u"&lt;").replace(u">", u"&gt;")
message = message.replace(u"\n", u"<br />")
message = u"<span style=\"{}\">".format(constants.STYLE_ERRORNOTIFICATION) + message + u"</span>"
self.newMessage(time.strftime(constants.UI_TIME_FORMAT, time.localtime()) + message + u"<br />")
self.newMessage(time.strftime(constants.UI_TIME_FORMAT, time.localtime()).decode('utf-8') + message + u"<br />")
@needsClient
def joinRoom(self, room=None):