diff --git a/gameview.py b/gameview.py index a588bdb..914ee8c 100644 --- a/gameview.py +++ b/gameview.py @@ -151,14 +151,24 @@ def download_thread(link, savepath): def mockStr(text): upper = random.choice([True, False]) - l = list(text) - for i in range(len(text)): - if text[i] == " ": - continue - - l[i] = l[i].upper() if upper else l[i].lower() - upper = not upper - return "".join(l) + if isinstance(text, QtCore.QString): + l = QtCore.QStringList(list(text)) + for i in range(len(text)): + if text[i] == " ": + continue + + l[i] = l[i].toUpper() if upper else l[i].toLower() + upper = not upper + return l.join("") + else: + l = list(text) + for i in range(len(text)): + if text[i] == " ": + continue + + l[i] = l[i].upper() if upper else l[i].lower() + upper = not upper + return "".join(l) class ChatLogs(QtGui.QTextEdit): def __init__(self, parent, logtype, logfile=None): @@ -1601,8 +1611,6 @@ class gui(QtGui.QWidget): if self.ooclog.verticalScrollBar().value() == self.ooclog.verticalScrollBar().maximum(): self.ooclog.verticalScrollBar().setValue(self.ooclog.verticalScrollBar().maximum()) def sendOOCchat(self, name, text): - print type(name) - print type(text) self.tcp.send('CT#' + name + '#' + text + '#%') def onOOCreturn(self): @@ -1629,14 +1637,18 @@ class gui(QtGui.QWidget): if self.mocktext.isChecked(): text = mockStr(text) if self.autocaps.isChecked(): - l = list(text) - if isinstance(l[0], QtCore.QString): - l[0] = l[0].toUpper() - else: - l[0] = l[0].upper() - if l[-1] != ".": + l = QtCore.QStringList(list(text)) + l[0] = l[0].toUpper() + + last = [".", "?", "!"] + if not l[-1] in last: l.append(".") - text = "".join(l).replace(" i ", " I ").replace("i'm", "I'm").replace("it's", "It's") + text = l.join("").replace(" i ", " I ").replace("i'm", "I'm").replace("it's", "It's") + if self.spacebartext.isChecked(): + l = QtCore.QStringList(list(text)) + for i in range(1, len(l)+len(l)-1, 2): + l.insert(i, " ") + text = l.join("") self.sendOOCchat(self.oocnameinput.text().toUtf8(), text) self.oocinput.clear() @@ -1651,7 +1663,8 @@ class gui(QtGui.QWidget): if self.autocaps.isChecked(): l = list(text) l[0] = l[0].upper() - if l[-1] != ".": + last = [".", "?", "!"] + if not l[-1] in last: l.append(".") text = "".join(l).replace(" i ", " I ").replace("i'm", "I'm").replace("it's", "It's") if self.spacebartext.isChecked():