dont display evidence above objectionview
This commit is contained in:
parent
cc33d71e3f
commit
62deeba0b5
10
gameview.py
10
gameview.py
@ -828,6 +828,10 @@ class gui(QtGui.QWidget):
|
||||
self.name = QtGui.QLabel(self.chatbox)
|
||||
self.name.setFont(name_font)
|
||||
|
||||
self.presentedevi = QtGui.QLabel(self)
|
||||
self.presentedevi.setGeometry(16, 16, 140, 140)
|
||||
self.presentedevi.hide()
|
||||
|
||||
self.wtceview = WTCE_View(self)
|
||||
self.WTCEsignal.connect(self.wtceview.showWTCE)
|
||||
|
||||
@ -1159,9 +1163,6 @@ class gui(QtGui.QWidget):
|
||||
self.notguiltybtn.show()
|
||||
self.guiltybtn.show()
|
||||
self.presenting = -1
|
||||
self.presentedevi = QtGui.QLabel(self)
|
||||
self.presentedevi.setGeometry(16, 16, 140, 140)
|
||||
self.presentedevi.hide()
|
||||
|
||||
self.showname = ""
|
||||
self.shownameedit = QtGui.QLineEdit(self)
|
||||
@ -2259,6 +2260,7 @@ class gui(QtGui.QWidget):
|
||||
|
||||
objections = ["holdit", "objection", "takethat", "custom_objections/"+custom_objection if custom_objection != "custom" else "custom"]
|
||||
self.objectionview.play(objections[objection_mod-1], f_char.lower())
|
||||
self.presentedevi.hide()
|
||||
self.playObjectionSnd(f_char.lower(), objection_mod)
|
||||
|
||||
emote_mod = int(self.m_chatmessage[EMOTE_MOD])
|
||||
@ -3135,7 +3137,7 @@ class gui(QtGui.QWidget):
|
||||
self.areaitems.clear()
|
||||
self.evidencedropdown.clear()
|
||||
for evi in evidence:
|
||||
self.evidencedropdown.addItem(evi[0])
|
||||
self.evidencedropdown.addItem(evi[0].strip())
|
||||
|
||||
logstart = '<b>--- Log started on ' + time.ctime() + ' ---</b>'
|
||||
if self.ooclog.toPlainText():
|
||||
|
Loading…
Reference in New Issue
Block a user