cidoku/AO2XP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some unicode fixes + browse button on evidence edit

Browse Source
This commit is contained in:
cidoku 2025-02-13 20:21:37 -03:00
parent 0767cf31e3
commit 961990b42a
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gameview.py
View File

@ -1,5 +1,5 @@
import thread, time, os, buttons, urllib, charselect, ini, random
from os.path import exists
from os.path import exists, basename
from ConfigParser import ConfigParser
from pybass_constants import *
@ -891,7 +891,7 @@ class gui(QtGui.QWidget):
self.gametabs.addTab(self.gametab_msgqueue, 'Queue')
self.gametabs.addTab(self.gametab_players, 'Players')
self.gametabs.addTab(self.gametab_mute, 'Mute')
self.gametabs.addTab(self.gametab_iniswap, 'IniSwap')
self.gametabs.addTab(self.gametab_iniswap, 'INI swap')
self.gametabs.addTab(self.gametab_pair, 'Pair')
self.gametabs.addTab(self.gametab_misc, 'Misc')
@ -1803,7 +1803,7 @@ class gui(QtGui.QWidget):
if self.m_chatmessage[SHOWNAME]:
try:
logcharname += " ("+self.m_chatmessage[SHOWNAME]+")"
logcharname += " ("+self.m_chatmessage[SHOWNAME].decode('utf-8')+")"
except:
logcharname += " (???)"
@ -2697,26 +2697,33 @@ class EditEvidenceDialog(QtGui.QDialog):
self.setModal(True)
self.eviname = QtGui.QLineEdit(self)
self.eviname.setGeometry(8, 8, 384, 24)
self.eviname.setGeometry(8, 8, 410, 24)
self.evidesc = QtGui.QTextEdit(self)
self.evidesc.setGeometry(8, 192, 496, 160)
self.evidesc.setGeometry(8, 192 - 105, 496, 255)
self.evidesc.setAcceptRichText(False)
self.evipicture = QtGui.QLabel(self)
self.filename = 'empty.png'
evipic = QtGui.QPixmap(AOpath + 'evidence/empty.png')
self.evipicture.setPixmap(evipic)
self.evipicture.move(434, 8)
self.evipicture.show()
self.save = QtGui.QPushButton(self)
self.save.setText('Save')
self.save.clicked.connect(self.onSave)
self.save.move(256 - self.save.size().width() - 8, 384 - self.save.size().height())
self.save.move(256 - self.save.size().width() - 8, 384 - self.save.size().height() - 2)
self.cancel = QtGui.QPushButton(self)
self.cancel.setText('Cancel')
self.cancel.clicked.connect(self.onCancel)
self.cancel.move(264, 384 - self.cancel.size().height())
self.cancel.move(264 + 16, 384 - self.cancel.size().height() - 2)
self.choosepic = QtGui.QComboBox(self)
self.choosepic.setGeometry(self.eviname.x() + self.eviname.size().width() - 128 - 84, self.eviname.y() + 70 - 32, 128, 24)
self.filenames = []
self.choosepic.setGeometry(376, 78, 128, 24)
self.browse = QtGui.QPushButton(self)
self.browse.setText('Browse')
self.browse.clicked.connect(self.onBrowse)
self.browse.move(self.choosepic.x() + self.choosepic.width() + 8, self.choosepic.y())
files = os.listdir(AOpath + 'evidence')
fileslength = len(files)
i = 0
@ -2775,6 +2782,22 @@ class EditEvidenceDialog(QtGui.QDialog):
self.choosepic.setCurrentIndex(self.emptyfile)
self.hide()
def onBrowse(self):
path = str(QtGui.QFileDialog.getOpenFileName(self, "Select an image", AOpath + 'evidence', "Images (*.png)"))
if path:
if not "/evidence/" in path.lower():
QtGui.QMessageBox.warning(self, 'Edit evidence', 'Please select a file from the evidence directory.')
self.onBrowse()
return
file = basename(path)
if file.lower().endswith('.png'):
ind = os.listdir(AOpath + 'evidence').index(file)
self.choosepic.setCurrentIndex(ind)
else:
QtGui.QMessageBox.warning(self, 'Edit evidence', 'Please select a PNG file.')
self.onBrowse()
def EditEvidence(self, ind):
self.editing = True
self.edit_ind = ind

2
mainmenu.py
View File

@ -628,5 +628,5 @@ class AOServerInfo(QtCore.QThread):
pid = network[0]
if not pid in playerlist:
playerlist[pid] = []
playerlist[pid].append(network[2])
playerlist[pid].append(network[2].decode('utf-8'))