make more buttons skinnable

This commit is contained in:
cidoku 2026-01-26 05:34:57 -03:00
parent aeaf0997e7
commit 0345a91fd5
2 changed files with 517 additions and 509 deletions

View File

@ -337,25 +337,33 @@ class EmoteButton(QtGui.QLabel):
self.clicked.emit() self.clicked.emit()
class BackEmoteButton(QtGui.QLabel): class BackEmoteButton(QtGui.QLabel):
def __init__(self, gamewindow): def __init__(self, gamewindow):
super(BackEmoteButton, self).__init__(gamewindow) super(BackEmoteButton, self).__init__(gamewindow)
self.gamewindow = gamewindow self.gamewindow = gamewindow
self.setPixmap(QtGui.QPixmap(AO2XPpath + 'themes/default/arrow_left.png'))
self.show() self.show()
def mousePressEvent(self, event): def mousePressEvent(self, event):
self.gamewindow.currentEmotePage -= 1 self.gamewindow.currentEmotePage -= 1
self.gamewindow.setEmotePage() self.gamewindow.setEmotePage()
class NextEmoteButton(QtGui.QLabel): def setPixmaps(self, theme):
self.setPixmap(QtGui.QPixmap(testPath(
AO2XPpath + "ao2xp_themes/%s/arrow_left.png" % (theme),
AO2XPpath + 'themes/default/arrow_left.png'
)))
class NextEmoteButton(QtGui.QLabel):
def __init__(self, gamewindow): def __init__(self, gamewindow):
super(NextEmoteButton, self).__init__(gamewindow) super(NextEmoteButton, self).__init__(gamewindow)
self.gamewindow = gamewindow self.gamewindow = gamewindow
self.setPixmap(QtGui.QPixmap(AO2XPpath + 'themes/default/arrow_right.png'))
self.show() self.show()
def mousePressEvent(self, event): def mousePressEvent(self, event):
self.gamewindow.currentEmotePage += 1 self.gamewindow.currentEmotePage += 1
self.gamewindow.setEmotePage() self.gamewindow.setEmotePage()
def setPixmaps(self, theme):
self.setPixmap(QtGui.QPixmap(testPath(
AO2XPpath + "ao2xp_themes/%s/arrow_right.png" % (theme),
AO2XPpath + 'themes/default/arrow_right.png'
)))

View File

@ -1789,6 +1789,7 @@ class GUI(QtGui.QWidget):
self.btnReloadTheme.setVisible(False) self.btnReloadTheme.setVisible(False)
self.cbBench.setVisible(True) self.cbBench.setVisible(True)
self.cbSlide.setVisible(True) self.cbSlide.setVisible(True)
self.OOCLogin.setVisible(True)
self.nameFontPointSize = 6 self.nameFontPointSize = 6
self.textFontPointSize = 12 self.textFontPointSize = 12
@ -1803,7 +1804,8 @@ class GUI(QtGui.QWidget):
self.btnTakeThat, self.btnHoldIt, self.btnGuilty, self.btnTakeThat, self.btnHoldIt, self.btnGuilty,
self.btnNotGuilty, self.btnWitnessTestimony, self.btnNotGuilty, self.btnWitnessTestimony,
self.btnCrossExamination, self.btnDefenseBar, self.btnCrossExamination, self.btnDefenseBar,
self.btnProsecutionBar]: self.btnProsecutionBar, self.btnPrevEmotePage,
self.btnNextEmotePage]:
btn.setPixmaps(theme) btn.setPixmaps(theme)
# Design # Design
@ -1846,6 +1848,7 @@ class GUI(QtGui.QWidget):
"music_list": self.serverTabs, "music_list": self.serverTabs,
"defense_bar": self.btnDefenseBar, "defense_bar": self.btnDefenseBar,
"prosecution_bar": self.btnProsecutionBar, "prosecution_bar": self.btnProsecutionBar,
"ao2xp_login": self.OOCLogin,
} }
move = { move = {
@ -1870,6 +1873,7 @@ class GUI(QtGui.QWidget):
"defense_minus": self.btnDefenseBar.btnMinus, "defense_minus": self.btnDefenseBar.btnMinus,
"prosecution_plus": self.btnProsecutionBar.btnPlus, "prosecution_plus": self.btnProsecutionBar.btnPlus,
"prosecution_minus": self.btnProsecutionBar.btnMinus, "prosecution_minus": self.btnProsecutionBar.btnMinus,
"ao2xp_desk" : self.cbBench,
} }
for e in geometry.keys(): for e in geometry.keys():
@ -1907,6 +1911,7 @@ class GUI(QtGui.QWidget):
self.cbSlide.setVisible("slide_enable" in design) self.cbSlide.setVisible("slide_enable" in design)
self.cbBench.setVisible("ao2xp_desk" in design) self.cbBench.setVisible("ao2xp_desk" in design)
self.OOCLogin.setVisible("ao2xp_login" in design)
self.btnReloadTheme.setVisible(True) self.btnReloadTheme.setVisible(True)
QtGui.QApplication.setStyle('plastique') QtGui.QApplication.setStyle('plastique')
@ -2176,11 +2181,6 @@ class GUI(QtGui.QWidget):
self.lblPairOrder.move(self.lblPairOffset.x(), self.lblPairOffset.y()+144) self.lblPairOrder.move(self.lblPairOffset.x(), self.lblPairOffset.y()+144)
self.boxPairOrder.setGeometry(self.sliPairOffset.x(), self.lblPairOrder.y()-4, 80, self.btnPairOffsetReset.sizeHint().height()) self.boxPairOrder.setGeometry(self.sliPairOffset.x(), self.lblPairOrder.y()-4, 80, self.btnPairOffsetReset.sizeHint().height())
## Sidebar
oocBottom = self.OOCNameInput.y() + self.OOCNameInput.height() # 268
self.OOCLogin.resize(48, 20)
self.OOCLogin.move(viewportRight + 14 + self.OOCLog.size().width() - (self.OOCLogin.size().width()), oocBottom + 6)
# Server tabs # Server tabs
serverTabsHeight = self.serverTabs.height() - self.serverTabs.findChild(QtGui.QTabBar).height() serverTabsHeight = self.serverTabs.height() - self.serverTabs.findChild(QtGui.QTabBar).height()