handle disconnections better + more widgets focus on ic input after clicking
This commit is contained in:
parent
c0a10e853e
commit
13243b2246
@ -80,6 +80,8 @@ class AOwebSocket(object):
|
||||
return -2, []
|
||||
except websocket.WebSocketConnectionClosedException:
|
||||
return -1, []
|
||||
except Exception as e:
|
||||
return -3, e
|
||||
|
||||
totals = contents.split('%')
|
||||
del totals[-1]
|
||||
|
||||
11
gameview.py
11
gameview.py
@ -1222,6 +1222,7 @@ class gui(QtGui.QWidget):
|
||||
self.slidebutton.setToolTip("Tell clients to play courtroom slide animations for your message")
|
||||
|
||||
self.effectdropdown = QtGui.QComboBox(self)
|
||||
self.effectdropdown.currentIndexChanged.connect(self.icchat_focus)
|
||||
self.effectdropdown.setToolTip('Show this effect on your next message')
|
||||
|
||||
self.callmodbtn = QtGui.QPushButton(self)
|
||||
@ -1460,6 +1461,7 @@ class gui(QtGui.QWidget):
|
||||
self.posdropdown.setCurrentIndex(ind)
|
||||
self.charside = str(self.posdropdown.itemText(ind))
|
||||
self.setJudgeButtons()
|
||||
self.icchat_focus()
|
||||
|
||||
server_is_2_8 = "additive" in self.features and "looping_sfx" in self.features and "effects" in self.features
|
||||
if server_is_2_8:
|
||||
@ -2049,6 +2051,8 @@ class gui(QtGui.QWidget):
|
||||
def changeEmote(self, dropdown, ind):
|
||||
if ind == -1:
|
||||
return
|
||||
|
||||
self.icchat_focus()
|
||||
if not dropdown:
|
||||
self.selectedemote = ind + self.current_emote_page * self.max_emotes_on_page
|
||||
else:
|
||||
@ -2067,6 +2071,7 @@ class gui(QtGui.QWidget):
|
||||
|
||||
def setChatColor(self, ind):
|
||||
self.mychatcolor = ind
|
||||
self.icchat_focus()
|
||||
|
||||
def showMessage(self, type, *args, **kwargs):
|
||||
if type == 'critical':
|
||||
@ -3604,6 +3609,7 @@ class PresentButton(QtGui.QLabel):
|
||||
self.setPixmap(self.button_on)
|
||||
else:
|
||||
self.setPixmap(self.button_off)
|
||||
self.gamegui.icchat_focus()
|
||||
|
||||
|
||||
class EditEvidenceDialog(QtGui.QDialog):
|
||||
@ -3882,6 +3888,11 @@ class TCP_Thread(QtCore.QThread):
|
||||
self.parent.willDisconnect = True
|
||||
self.quit()
|
||||
return
|
||||
elif error == -3:
|
||||
self.parent.emit(QtCore.SIGNAL('showMessage(QString, QString, QString)'), 'critical', 'Connection lost', "There was a critical connection failure. Please check your internet connection.\n\nDetails: %s." % total)
|
||||
self.parent.willDisconnect = True
|
||||
self.quit()
|
||||
return
|
||||
else:
|
||||
self.send_attempts = 0
|
||||
|
||||
|
||||
61
mainmenu.py
61
mainmenu.py
@ -252,8 +252,9 @@ class lobby(QtGui.QWidget):
|
||||
if self.tab == 0:
|
||||
try:
|
||||
self.masterserver.start()
|
||||
except:
|
||||
self.lobbychatlog.append('failed to refresh server list')
|
||||
except Exception as e:
|
||||
print "[debug] Failed to refresh server list:", e
|
||||
self.lobbychatlog.append('Failed to refresh server list.')
|
||||
|
||||
elif self.tab == 1:
|
||||
if exists(AOpath+'serverlist.txt'):
|
||||
@ -364,56 +365,16 @@ class MasterServer(QtCore.QThread):
|
||||
super(MasterServer, self).__init__()
|
||||
|
||||
def run(self):
|
||||
tempdata = ""
|
||||
self.ms_http = requests.get("http://servers.aceattorneyonline.com/servers")
|
||||
self.ms_motd = requests.get("http://servers.aceattorneyonline.com/motd")
|
||||
|
||||
if self.ms_http.ok: self.gotServers.emit(json.loads(self.ms_http.content))
|
||||
if self.ms_motd.ok: self.gotOOCMsg.emit(self.ms_motd.content)
|
||||
|
||||
"""
|
||||
try:
|
||||
self.ms_tcp.connect(('master.aceattorneyonline.com', 27016))
|
||||
except:
|
||||
return
|
||||
tempdata = ""
|
||||
self.ms_http = requests.get("http://servers.aceattorneyonline.com/servers")
|
||||
self.ms_motd = requests.get("http://servers.aceattorneyonline.com/motd")
|
||||
|
||||
while True:
|
||||
contents = self.ms_tcp.recv(16384)
|
||||
if len(contents) == 0:
|
||||
print 'masterserver failure'
|
||||
return
|
||||
|
||||
if not contents.endswith("%"):
|
||||
tempdata += contents
|
||||
continue
|
||||
else:
|
||||
if tempdata:
|
||||
contents = tempdata + contents
|
||||
tempdata = ""
|
||||
|
||||
temp = contents.split('%')
|
||||
for msg in temp:
|
||||
network = msg.split('#')
|
||||
header = network[0]
|
||||
|
||||
if header == "servercheok":
|
||||
self.ms_tcp.send("HI#AO2XP %s#%%ID#AO2XP by Headshot#%s#%%" % (hardware.get_hdid(), GAME_VERSION[1:]))
|
||||
self.ms_tcp.send("ALL#%")
|
||||
|
||||
elif header == 'DOOM':
|
||||
print 'banned from masterserver'
|
||||
self.msgbox_signal.emit(0, "WHEEZE", "You are exiled from AO")
|
||||
self.ms_tcp.close()
|
||||
return
|
||||
|
||||
elif header == 'ALL':
|
||||
self.gotServers.emit(network)
|
||||
|
||||
elif header == 'CT':
|
||||
name = decode_ao_str(network[1].decode("utf-8"))
|
||||
chatmsg = decode_ao_str(network[2].decode("utf-8"))
|
||||
self.gotOOCMsg.emit(name, chatmsg)
|
||||
"""
|
||||
if self.ms_http.ok: self.gotServers.emit(json.loads(self.ms_http.content))
|
||||
if self.ms_motd.ok: self.gotOOCMsg.emit(self.ms_motd.content)
|
||||
except Exception as e:
|
||||
print "[debug] Failed to load server list:", e
|
||||
QtGui.QMessageBox.critical(None, "Error", "Failed to load the master server list. Please check your internet connection and try again.")
|
||||
|
||||
class AOServerInfo(QtCore.QThread):
|
||||
moveToGameSignal = QtCore.pyqtSignal(list)
|
||||
|
||||
@ -240,7 +240,7 @@ class Settings(QtGui.QDialog):
|
||||
self.defaultshowname.setText(ini.read_ini(self.inifile, "General", "showname").decode("utf-8"))
|
||||
except:
|
||||
self.defaultshowname.setText(ini.read_ini(self.inifile, "General", "showname"))
|
||||
self.enableslide.setChecked(ini.read_ini_bool(self.inifile, "General", "slide"))
|
||||
self.enableslide.setChecked(ini.read_ini_bool(self.inifile, "General", "slide", False))
|
||||
self.allowdownload_chars.setChecked(ini.read_ini_bool(self.inifile, "General", "download characters"))
|
||||
self.allowdownload_sounds.setChecked(ini.read_ini_bool(self.inifile, "General", "download sounds"))
|
||||
self.allowdownload_music.setChecked(ini.read_ini_bool(self.inifile, "General", "download music"))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user