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

make judge buttons and health bars skinnable

Browse Source
This commit is contained in:
cidoku 2025-10-11 20:44:57 -03:00
parent 8d3272f90b
commit 6289b2a834
3 changed files with 348 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
# window size is defined at the end of the file # window size is defined at the end of the file
# IC viewport # IC viewport
_scale = 2 _scale = 2.5
self.viewport.setGeometry(0, 0, 256 * _scale, 192 * _scale) self.viewport.setGeometry(0, 0, 256 * _scale, 192 * _scale)
# Textbox # Textbox
@ -110,10 +110,14 @@ self.cbSpacing.move(self.cbMockText.x(), self.cbMockText.y()+24)
self.cbAutoCaps.move(self.cbSpacing.x(), self.cbSpacing.y()+24) self.cbAutoCaps.move(self.cbSpacing.x(), self.cbSpacing.y()+24)
# Judge options # Judge options
self.btnDefenseBar.moveBar(self.gameTabs.x() + self.gameTabs.width() + 11, viewportBottom + 61) self.btnDefenseBar.setGeometry(self.gameTabs.x() + self.gameTabs.width() + 11, viewportBottom + 61, 84, 14)
self.btnProsecutionBar.moveBar(self.btnDefenseBar.x(), viewportBottom + 75) self.btnProsecutionBar.setGeometry(self.btnDefenseBar.x(), viewportBottom + 75, 84, 14)
self.btnRealization.move(self.btnDefenseBar.x(), viewportBottom + 89) self.btnRealization.move(self.btnDefenseBar.x(), viewportBottom + 89)
self.btnShake.move(self.btnRealization.x() + self.btnRealization.width(), self.btnRealization.y()) self.btnShake.move(self.btnRealization.x() + self.btnRealization.width(), self.btnRealization.y())
self.btnDefenseBar.btnMinus.move(self.btnDefenseBar.x() - (9/2), self.btnDefenseBar.y() + (14/2) - (9/2))
self.btnDefenseBar.btnPlus.move(self.btnDefenseBar.x() + 84 - (9/2), self.btnDefenseBar.y() + (14/2) - (9/2))
self.btnProsecutionBar.btnMinus.move(self.btnProsecutionBar.x() - (9/2), self.btnProsecutionBar.y() + (14/2) - (9/2))
self.btnProsecutionBar.btnPlus.move(self.btnProsecutionBar.x() + 84 - (9/2), self.btnProsecutionBar.y() + (14/2) - (9/2))
self.btnWitnessTestimony.move(self.btnDefenseBar.x(), viewportBottom + 137) self.btnWitnessTestimony.move(self.btnDefenseBar.x(), viewportBottom + 137)
self.btnCrossExamination.move(self.btnWitnessTestimony.x(), self.btnWitnessTestimony.y() + self.btnWitnessTestimony.size().height()) self.btnCrossExamination.move(self.btnWitnessTestimony.x(), self.btnWitnessTestimony.y() + self.btnWitnessTestimony.size().height())

128
buttons.py
View File

@ -50,12 +50,24 @@ class CustomObjection(QtGui.QLabel):
def __init__(self, parent): def __init__(self, parent):
super(CustomObjection, self).__init__(parent) super(CustomObjection, self).__init__(parent)
self.parent = parent self.parent = parent
self.resize(76, 28) self.notpressed_pix = None
self.notpressed_pix = QtGui.QPixmap(AO2XPpath + "themes/default/custom.png") self.pressed_pix = None
self.pressed_pix = QtGui.QPixmap(AO2XPpath + "themes/default/custom_selected.png")
self.setPixmap(self.notpressed_pix)
self.show() self.show()
def setPixmaps(self, theme):
self.pressed_pix = QtGui.QPixmap(testPath(
AO2XPpath + "ao2xp_themes/%s/custom_selected.png" % theme,
AO2XPpath + "themes/default/custom_selected.png",
))
self.notpressed_pix = QtGui.QPixmap(testPath(
AO2XPpath + "ao2xp_themes/%s/custom.png" % theme,
AO2XPpath + "themes/default/custom.png",
))
self.setPixmap(self.pressed_pix if self.pressed else self.notpressed_pix)
def move(self, x, y):
self.setGeometry(x, y, self.notpressed_pix.size().width(), self.notpressed_pix.size().height())
def setPressed(self, on): def setPressed(self, on):
self.pressed = on self.pressed = on
if on: if on:
@ -79,18 +91,30 @@ class WTCEbuttons(QtGui.QLabel):
variant = 0 variant = 0
def __init__(self, parent, type, variant=0): def __init__(self, parent, type, variant=0):
super(WTCEbuttons, self).__init__(parent) super(WTCEbuttons, self).__init__(parent)
self.resize(85, 42)
if type == 0:
self.setPixmap(QtGui.QPixmap(AO2XPpath + "themes/default/witnesstestimony.png"))
elif type == 1:
self.setPixmap(QtGui.QPixmap(AO2XPpath + "themes/default/crossexamination.png"))
elif type == 2:
if variant == 0:
self.setPixmap(QtGui.QPixmap(AO2XPpath + "themes/default/notguilty.png"))
elif variant == 1:
self.setPixmap(QtGui.QPixmap(AO2XPpath + "themes/default/guilty.png"))
self.type = type self.type = type
self.variant = variant self.variant = variant
self.pix = None
def setPixmaps(self, theme):
name = ""
if self.type == 0:
name = "witnesstestimony"
elif self.type == 1:
name = "crossexamination"
elif self.type == 2:
if self.variant == 0:
name = "notguilty"
else:
name = "guilty"
self.pix = QtGui.QPixmap(testPath(
AO2XPpath + "ao2xp_themes/%s/%s.png" % (theme, name),
AO2XPpath + "themes/default/%s.png" % name,
))
self.setPixmap(self.pix)
def move(self, x, y):
self.setGeometry(x, y, self.pix.size().width(), self.pix.size().height())
def mousePressEvent(self, event): def mousePressEvent(self, event):
self.clicked.emit(self.type, self.variant) self.clicked.emit(self.type, self.variant)
@ -154,7 +178,7 @@ class Objections(QtGui.QLabel):
self.clicked.emit() self.clicked.emit()
class PixmapButton(QtGui.QAbstractButton): class PixmapButton(QtGui.QAbstractButton):
def __init__(self, parent, pixmap): def __init__(self, parent, pixmap = None):
super(PixmapButton, self).__init__(parent) super(PixmapButton, self).__init__(parent)
self.pixmap = pixmap self.pixmap = pixmap
@ -162,8 +186,11 @@ class PixmapButton(QtGui.QAbstractButton):
painter = QtGui.QPainter(self) painter = QtGui.QPainter(self)
painter.drawPixmap(event.rect(), self.pixmap) painter.drawPixmap(event.rect(), self.pixmap)
def sizeHint(self): # def sizeHint(self):
return self.pixmap.size() # return self.pixmap.size() if self.pixmap else None
def move(self, x, y):
self.setGeometry(x, y, self.pixmap.size().width(), self.pixmap.size().height())
def setPixmap(self, pixmap): def setPixmap(self, pixmap):
self.pixmap = pixmap self.pixmap = pixmap
@ -192,29 +219,50 @@ class PenaltyBars(QtGui.QLabel):
self.penaltybars = [] self.penaltybars = []
self.type = type self.type = type
self.health = 10 self.health = 10
self.resize(84, 14) self.side = "def" if self.type == 1 else "pro"
if type == 1: #defense bar. self.btnMinus = PixmapButton(parent)
for i in range(11): self.btnPlus = PixmapButton(parent)
self.penaltybars.append(QtGui.QPixmap(AO2XPpath + "themes/default/defensebar"+str(i)+".png")) self.btnMinus.clicked.connect(self.minusClick)
side = "def" self.btnPlus.clicked.connect(self.plusClick)
elif type == 2: #prosecution bar self.btnMinus.show()
for i in range(11): self.btnPlus.show()
self.penaltybars.append(QtGui.QPixmap(AO2XPpath + "themes/default/prosecutionbar"+str(i)+".png")) self.pixMinus = None
side = "pro" self.pixPlus = None
self.side = side self.setScaledContents(True)
self.minusbtn = PixmapButton(parent, QtGui.QPixmap(AO2XPpath + "themes/default/" + side + "minus.png"))
self.plusbtn = PixmapButton(parent, QtGui.QPixmap(AO2XPpath + "themes/default/" + side + "plus.png"))
self.minusbtn.clicked.connect(self.minusClick)
self.plusbtn.clicked.connect(self.plusClick)
self.setPixmap(self.penaltybars[10])
self.minusbtn.show()
self.plusbtn.show()
self.show() self.show()
def moveBar(self, x, y): def setPixmaps(self, theme):
self.move(x, y) del self.penaltybars[:]
self.minusbtn.move(x-(9/2), y+(14/2)-(9/2)) self.penaltybars = []
self.plusbtn.move(x+84-(9/2), y+(14/2)-(9/2)) if self.type == 1:
for i in range(11):
pix = QtGui.QPixmap(testPath(
AO2XPpath + "ao2xp_themes/%s/defensebar%s.png" % (theme, i),
AO2XPpath + "themes/default/defensebar%s.png" % i
))
self.penaltybars.append(pix)
elif self.type == 2:
for i in range(11):
pix = QtGui.QPixmap(testPath(
AO2XPpath + "ao2xp_themes/%s/prosecutionbar%s.png" % (theme, i),
AO2XPpath + "themes/default/prosecutionbar%s.png" % i
))
self.penaltybars.append(pix)
self.setPixmap(self.penaltybars[self.health])
self.pixMinus = QtGui.QPixmap(testPath(
AO2XPpath + "ao2xp_themes/%s/%sminus.png" % (theme, self.side),
AO2XPpath + "themes/default/%sminus.png" % self.side
))
self.pixPlus = QtGui.QPixmap(testPath(
AO2XPpath + "ao2xp_themes/%s/%splus.png" % (theme, self.side),
AO2XPpath + "themes/default/%splus.png" % self.side
))
self.btnMinus.setPixmap(self.pixMinus)
self.btnPlus.setPixmap(self.pixPlus)
# def setGeometry(self, x, y):
# super(PenaltyBars, self).setGeometry(x, y, self.penaltybars[0].size().width(), self.penaltybars[0].size().height())
def plusClick(self): def plusClick(self):
self.plusClicked.emit(self.type) self.plusClicked.emit(self.type)
@ -223,8 +271,8 @@ class PenaltyBars(QtGui.QLabel):
self.minusClicked.emit(self.type) self.minusClicked.emit(self.type)
def setHealth(self, health): def setHealth(self, health):
self.minusbtn.setPixmap(QtGui.QPixmap(AO2XPpath + "themes/default/"+self.side+"minus.png")) self.btnMinus.setPixmap(self.pixMinus)
self.plusbtn.setPixmap(QtGui.QPixmap(AO2XPpath + "themes/default/"+self.side+"plus.png")) self.btnPlus.setPixmap(self.pixPlus)
self.setPixmap(self.penaltybars[health]) self.setPixmap(self.penaltybars[health])
self.health = health self.health = health

55
gameview.py
View File

@ -1717,7 +1717,7 @@ class GUI(QtGui.QWidget):
def loadTheme(self, switching=False): def loadTheme(self, switching=False):
theme = getOption("General", "theme", "default") theme = getOption("General", "theme", "default")
try: # try:
stylesheet = "" stylesheet = ""
self.emotePageGeometry = [] self.emotePageGeometry = []
self.gamewindow.setStyleSheet("") self.gamewindow.setStyleSheet("")
@ -1731,11 +1731,13 @@ class GUI(QtGui.QWidget):
stack.setAutoFillBackground(False) stack.setAutoFillBackground(False)
stack.setAttribute(QtCore.Qt.WA_NoSystemBackground, True) stack.setAttribute(QtCore.Qt.WA_NoSystemBackground, True)
self.btnRealization.setPixmaps(theme) for btn in [self.btnRealization, self.btnShake,
self.btnShake.setPixmaps(theme) self.btnCustomObjection, self.btnObjection,
self.btnObjection.setPixmaps(theme) self.btnTakeThat, self.btnHoldIt, self.btnGuilty,
self.btnTakeThat.setPixmaps(theme) self.btnNotGuilty, self.btnWitnessTestimony,
self.btnHoldIt.setPixmaps(theme) self.btnCrossExamination, self.btnDefenseBar,
self.btnProsecutionBar]:
btn.setPixmaps(theme)
# Design # Design
courtroomDesign = AO2XPpath + "ao2xp_themes/" + theme + '/courtroom_design.ini' courtroomDesign = AO2XPpath + "ao2xp_themes/" + theme + '/courtroom_design.ini'
@ -1774,6 +1776,8 @@ class GUI(QtGui.QWidget):
"message": self.text, "message": self.text,
"showname": self.name, "showname": self.name,
"music_list": self.serverTabs, "music_list": self.serverTabs,
"defense_bar": self.btnDefenseBar,
"prosecution_bar": self.btnProsecutionBar,
} }
move = { move = {
@ -1794,11 +1798,10 @@ class GUI(QtGui.QWidget):
"guilty": self.btnGuilty, "guilty": self.btnGuilty,
"witness_testimony": self.btnWitnessTestimony, "witness_testimony": self.btnWitnessTestimony,
"cross_examination": self.btnCrossExamination, "cross_examination": self.btnCrossExamination,
} "defense_plus": self.btnDefenseBar.btnPlus,
"defense_minus": self.btnDefenseBar.btnMinus,
bars = { "prosecution_plus": self.btnProsecutionBar.btnPlus,
"defense_bar": self.btnDefenseBar, "prosecution_minus": self.btnProsecutionBar.btnMinus,
"prosecution_bar": self.btnProsecutionBar
} }
for e in geometry.keys(): for e in geometry.keys():
@ -1809,10 +1812,6 @@ class GUI(QtGui.QWidget):
if e in design: if e in design:
move[e].move(*[int(x) for x in design[e]][0:2]) move[e].move(*[int(x) for x in design[e]][0:2])
for e in bars.keys():
if e in design:
bars[e].moveBar(*[int(x) for x in design[e]][0:2])
if "emotes" in design: if "emotes" in design:
self.emotePageGeometry = [int(x) for x in design["emotes"]] self.emotePageGeometry = [int(x) for x in design["emotes"]]
else: else:
@ -1972,9 +1971,9 @@ class GUI(QtGui.QWidget):
self.setEmotePage() self.setEmotePage()
self.gamewindow.setFixedSize(self.width, self.height) self.gamewindow.setFixedSize(self.width, self.height)
self.gamewindow.center() self.gamewindow.center()
except Exception as e: # 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)) # 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) # os._exit(-2)
def resetPairOffsets(self): def resetPairOffsets(self):
self.sliPairOffset.setValue(0) self.sliPairOffset.setValue(0)
@ -2072,19 +2071,19 @@ class GUI(QtGui.QWidget):
def setJudgeButtons(self): def setJudgeButtons(self):
if self.charSide == 'jud': if self.charSide == 'jud':
self.btnDefenseBar.minusbtn.show() self.btnDefenseBar.btnMinus.show()
self.btnDefenseBar.plusbtn.show() self.btnDefenseBar.btnPlus.show()
self.btnProsecutionBar.minusbtn.show() self.btnProsecutionBar.btnMinus.show()
self.btnProsecutionBar.plusbtn.show() self.btnProsecutionBar.btnPlus.show()
self.btnWitnessTestimony.show() self.btnWitnessTestimony.show()
self.btnCrossExamination.show() self.btnCrossExamination.show()
self.btnNotGuilty.show() self.btnNotGuilty.show()
self.btnGuilty.show() self.btnGuilty.show()
else: else:
self.btnDefenseBar.minusbtn.hide() self.btnDefenseBar.btnMinus.hide()
self.btnDefenseBar.plusbtn.hide() self.btnDefenseBar.btnPlus.hide()
self.btnProsecutionBar.minusbtn.hide() self.btnProsecutionBar.btnMinus.hide()
self.btnProsecutionBar.plusbtn.hide() self.btnProsecutionBar.btnPlus.hide()
self.btnWitnessTestimony.hide() self.btnWitnessTestimony.hide()
self.btnCrossExamination.hide() self.btnCrossExamination.hide()
self.btnNotGuilty.hide() self.btnNotGuilty.hide()
@ -4520,8 +4519,8 @@ class GUI(QtGui.QWidget):
self.cbFlip, self.cbPreanim, self.cbNoInterrupt, self.cbFlip, self.cbPreanim, self.cbNoInterrupt,
self.boxEffects, self.cbSlide, self.cbBench, self.boxEffects, self.cbSlide, self.cbBench,
self.cbAdditive, self.areaItems, self.shownameEdit, self.cbAdditive, self.areaItems, self.shownameEdit,
self.boxColors, self.btnDefenseBar.minusbtn, self.btnProsecutionBar.minusbtn, self.boxColors, self.btnDefenseBar.btnMinus, self.btnProsecutionBar.btnMinus,
self.btnDefenseBar.plusbtn, self.btnProsecutionBar.plusbtn, self.btnWitnessTestimony, self.btnDefenseBar.btnPlus, self.btnProsecutionBar.btnPlus, self.btnWitnessTestimony,
self.btnCrossExamination, self.btnNotGuilty, self.btnGuilty, self.btnCrossExamination, self.btnNotGuilty, self.btnGuilty,
self.btnRealization, self.btnShake, self.btnRealization, self.btnShake,
]: ]: