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

better theme loading and window handling

Browse Source
This commit is contained in:
cidoku 2025-02-20 19:35:28 -03:00
parent 3ba0fbdc0e
commit aad2d8fcbc
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AO2XPbase/ao2xp_themes/default/theme.py
View File

@ -1,4 +1,5 @@
self.gamewindow.setFixedSize(820, 730) self.width = 820
self.height = 730
self.ao2text.setGeometry(16, 32, VIEWPORT_W - 32, 112) self.ao2text.setGeometry(16, 32, VIEWPORT_W - 32, 112)
self.ao2text.setStyleSheet("background-color: rgba(0, 0, 0, 0); color: white;") self.ao2text.setStyleSheet("background-color: rgba(0, 0, 0, 0); color: white;")

22
gameview.py
View File

@ -1182,6 +1182,16 @@ class gui(QtGui.QWidget):
self.stream = 0 self.stream = 0
self.specialstream = 0 self.specialstream = 0
self.download_thread = None self.download_thread = None
# Finally, load the theme
self.width = 820
self.height = 730
theme = get_option("General", "theme", "default")
try:
exec open(AO2XPpath+"ao2xp_themes/"+theme+"/theme.py")
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)
def resetOffsets(self): def resetOffsets(self):
self.pairoffset.setValue(0) self.pairoffset.setValue(0)
@ -1393,7 +1403,7 @@ class gui(QtGui.QWidget):
def setWhiteFlash(self, on, realizationtype=0, msec=0): def setWhiteFlash(self, on, realizationtype=0, msec=0):
self.whiteflashlab.setVisible(on) self.whiteflashlab.setVisible(on)
if realizationtype == 1: if realizationtype == 1:
self.playRealization() self.playRealization(f)
if msec: if msec:
self.whiteflash.start(msec) self.whiteflash.start(msec)
@ -1408,12 +1418,8 @@ class gui(QtGui.QWidget):
self.tcp.send("RT#judgeruling#" +str(variant)+ "#%") self.tcp.send("RT#judgeruling#" +str(variant)+ "#%")
def onPVPacket(self, charname): def onPVPacket(self, charname):
theme = get_option("General", "theme", "default") self.gamewindow.setFixedSize(self.width, self.height)
try: self.gamewindow.center()
exec open(AO2XPpath+"ao2xp_themes/"+theme+"/theme.py")
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)
if not self.swapping: if not self.swapping:
self.loadCharacter(charname) self.loadCharacter(charname)
@ -2959,7 +2965,7 @@ class gui(QtGui.QWidget):
if char[0].lower() == autopick and char[1] == 0: if char[0].lower() == autopick and char[1] == 0:
coincidence = i coincidence = i
break break
if coincidence > -1: if coincidence > -1:
self.tcp.send("CC#0#"+str(coincidence)+"#ur mom gay#%") self.tcp.send("CC#0#"+str(coincidence)+"#ur mom gay#%")
else: else: