have autocaps deal with some more closing special chars

gameview.py

@@ -827,7 +827,7 @@ class gui(QtGui.QWidget):
         self.oocinput.setPlaceholderText('Server chat/OOC chat...')
         self.oocinput.returnPressed.connect(self.onOOCreturn)
         
-        self.ooclogin = QtGui.QPushButton("Login", self)
+        self.ooclogin = QtGui.QPushButton("Lo&gin", self)
         self.ooclogin.clicked.connect(self.onOOCLoginBtn)
         
         self.musicareatabs = QtGui.QTabWidget(self)
@@ -989,17 +989,17 @@ class gui(QtGui.QWidget):
         self.misc_layout.addWidget(self.spacebartext)
         self.misc_layout.addWidget(self.autocaps)
         
-        self.gametabs.addTab(self.gametab_log, 'Log')
-        self.gametabs.addTab(self.gametab_evidence, 'Evidence')
-        self.gametabs.addTab(self.gametab_mute, 'Mute')
-        self.gametabs.addTab(self.gametab_iniswap, 'INI swap')
-        self.gametabs.addTab(self.gametab_pair, 'Pair')
-        self.gametabs.addTab(self.gametab_misc, 'Misc')
-        self.gametabs.addTab(self.gametab_msgqueue, 'Queue')
+        self.gametabs.addTab(self.gametab_log, '&Log')
+        self.gametabs.addTab(self.gametab_evidence, '&Evidence')
+        self.gametabs.addTab(self.gametab_mute, 'Mu&te')
+        self.gametabs.addTab(self.gametab_iniswap, '&INI swap')
+        self.gametabs.addTab(self.gametab_pair, 'Pai&r')
+        self.gametabs.addTab(self.gametab_misc, 'Mi&sc')
+        self.gametabs.addTab(self.gametab_msgqueue, '&Queue')
         
-        self.musicareatabs.addTab(self.musicitems, "Music")
-        self.musicareatabs.addTab(self.areaitems, "Areas")
-        self.musicareatabs.addTab(self.gametab_players, 'Players')
+        self.musicareatabs.addTab(self.musicitems, "&Music")
+        self.musicareatabs.addTab(self.areaitems, "&Areas")
+        self.musicareatabs.addTab(self.gametab_players, 'Pla&yers')
         
         self.icchatinput = QtGui.QLineEdit(self)
         self.icchatinput.returnPressed.connect(self.onICreturn)
@@ -1020,14 +1020,14 @@ class gui(QtGui.QWidget):
         
         self.flipbutton = QtGui.QCheckBox(self)
         self.flipbutton.stateChanged.connect(self.changeFlipCheck)
-        self.flipbutton.setText('Flip')
+        self.flipbutton.setText('&Flip')
         self.flipbutton.resize(self.flipbutton.sizeHint())
         self.flipbutton.setToolTip("Mirror your character horizontally")
         
         self.sfxbutton = QtGui.QCheckBox(self)
         self.sfxbutton.setChecked(True)
         self.sfxbutton.stateChanged.connect(self.changeSfxCheck)
-        self.sfxbutton.setText('Play pre-animation')
+        self.sfxbutton.setText('Play &pre-animation')
         self.sfxbutton.setToolTip("Play a character-specific animation before the next message")
         
         self.nointerruptbtn = QtGui.QCheckBox(self)
@@ -1060,7 +1060,7 @@ class gui(QtGui.QWidget):
         self.settingsbtn.clicked.connect(self.gamewindow.showSettings)
 
         self.changechar = QtGui.QPushButton(self)
-        self.changechar.setText('Switch character')
+        self.changechar.setText('&Switch character')
         self.changechar.clicked.connect(self.onClick_changeChar)
         
         spacing = 1
@@ -1197,7 +1197,8 @@ class gui(QtGui.QWidget):
         self.height = 730
         theme = get_option("General", "theme", "default")
         try:
-            exec open(AO2XPpath+"ao2xp_themes/"+theme+"/theme.py")
+            with open(AO2XPpath+"ao2xp_themes/"+theme+"/theme.py") as t:
+                exec t
         except Exception as e:
             QtGui.QMessageBox.critical(None, "Unable to load theme", "There was a problem loading the current theme \"%s\":\n\n%s." % (theme, e))
             os._exit(-2)
@@ -1602,7 +1603,8 @@ class gui(QtGui.QWidget):
                     inifile.set(id, "description", evi[1].replace('\n', '\\n').encode('utf-8'))
                     inifile.set(id, "image", evi[2].encode('utf-8'))
             
-            inifile.write(open(path, "wb"))
+            with open(path, "wb") as f:
+                inifile.write(f)
     
     def onImportEvidence(self, is_autoload=False):
         if not is_autoload:
@@ -1865,7 +1867,7 @@ class gui(QtGui.QWidget):
         self.playerList.clear()
         self.playerKick.setDisabled(True)
         self.playerBan.setDisabled(True)
-        self.ooclogin.setText("Login")
+        self.ooclogin.setText("Lo&gin")
         self.login = False
         self.privateinv = False
         self.charselect.onDisconnect()
@@ -1922,7 +1924,7 @@ class gui(QtGui.QWidget):
             l = QtCore.QStringList(list(text))
             l[0] = l[0].toUpper()
                 
-            last = [".", "?", "!"]
+            last = [".", "?", "!", ")", "]"]
             if not l[-1] in last:
                 l.append(".")
             text = l.join("").replace(" i ", " I ").replace("i'm", "I'm").replace("it's", "It's")
@@ -1936,16 +1938,14 @@ class gui(QtGui.QWidget):
         self.oocinput.clear()
 
     def onICreturn(self):
-        text = str(self.icchatinput.text().toUtf8()).replace('#', '<num>').replace('%', '<percent>').replace('&', '<and>').replace('$', '<dollar>').replace('/n', '\n')
-        #if not text:
-        #    return
+        text = str(self.icchatinput.text().toUtf8()).replace('#', '<num>').replace('%', '<percent>').replace('&', '<and>').replace('$', '<dollar>')#.replace('/n', '\n')
         
         if self.mocktext.isChecked():
             text = mockStr(text)
         if self.autocaps.isChecked():
             l = list(text)
             l[0] = l[0].upper()
-            last = [".", "?", "!"]
+            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")
@@ -2545,7 +2545,8 @@ class gui(QtGui.QWidget):
             self.anim_state = 3
         
         if exists(AO2XPpath+"callwords.ini"):
-            callwords = [line.rstrip() for line in open(AO2XPpath+"callwords.ini")]
+            with open(AO2XPpath+"callwords.ini") as f: 
+                callwords = [line.rstrip() for line in f]
                 for callword in callwords:
                     if callword.decode('utf-8').lower() in self.m_chatmessage[CHATMSG].lower().split(" "):
                         self.ooclog.append("<b>%s called you.</b>" % f_char)
@@ -3105,6 +3106,8 @@ class gui(QtGui.QWidget):
         self.tcpthread.rainbowColor.connect(self.text.setStyleSheet)
         self.tcpthread.start()
         
+        self.icchatinput.setFocus()
+
     def allEvidence(self, evi):
         self.evidence = evi
         if self.evidencedropdown.count() > 0:
@@ -3559,12 +3562,12 @@ class TCP_Thread(QtCore.QThread):
                         self.parent.login = True
                         self.parent.playerKick.setDisabled(False)
                         self.parent.playerBan.setDisabled(False)
-                        self.parent.ooclogin.setText("Log out")
+                        self.parent.ooclogin.setText("Lo&g out")
                     elif status == -1:
                         self.parent.login = False
                         self.parent.playerKick.setDisabled(True)
                         self.parent.playerBan.setDisabled(True)
-                        self.parent.ooclogin.setText("Login")
+                        self.parent.ooclogin.setText("Lo&gin")
                     self.OOC_Log.emit("<b>%s</b>" % (statusStrings[status+1]))
                     
                 elif header == "CHECK": #ping

options.py

@@ -296,7 +296,8 @@ class Settings(QtGui.QDialog):
         self.inifile.set("Audio", "Sound volume", self.soundslider.value())
         self.inifile.set("Audio", "Blip volume", self.blipslider.value())
 
-        self.inifile.write(open("AO2XP.ini", "wb"))
+        with open("AO2XP.ini", "wb") as f:
+            self.inifile.write(f)
         
         with open(AO2XPpath+"callwords.ini", "w") as f:
             f.write(self.callwords_edit.toPlainText().toUtf8())