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

AO2XP 2.9.0 - move emote button positions to theme

Browse Source
This commit is contained in:
cidoku 2025-10-06 21:02:34 -03:00
parent fed30db7c8
commit ef34c72c09
4 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ self.gamewindow.setStyleSheet("")
# window size is defined at the end of the file
# IC viewport
_scale = 2.5
_scale = 2
self.viewport.move(0, 0)
self.viewport.resize(256 * _scale, 192 * _scale)
@ -112,7 +112,7 @@ self.pair_order.setGeometry(self.pairOffset.x(), self.pair_order_l.y()-4, 80, se
self.spacebartext.move(self.mocktext.x(), self.mocktext.y()+24)
self.autocaps.move(self.spacebartext.x(), self.spacebartext.y()+24)
# Misc IC buttons
# IC image buttons
self.defensebar.moveBar(429, viewportBottom + 61)
self.prosecutionbar.moveBar(429, viewportBottom + 75)
self.realizationbtn.move(429, viewportBottom + 89)
@ -128,6 +128,10 @@ self.objectbtn.move(self.holditbtn.x() + 70, self.holditbtn.y())
self.takethatbtn.move(self.objectbtn.x() + 70, self.holditbtn.y())
self.customobject.move(self.takethatbtn.x() + 70, self.holditbtn.y())
self.emotePageGeometry = (viewportRight + 14, 384, 288, 98)
self.prevemotepage.move(viewportRight + 8, 415)
self.nextemotepage.move(viewportRight + 286, 415)
# OOC chat
self.ooclog.setGeometry(viewportRight + 14, 0, 288, 248)
self.oocnameinput.resize(self.oocnameinput.sizeHint().width() - 32, self.oocnameinput.sizeHint().height())

9
buttons.py
View File

@ -221,11 +221,10 @@ class PresentButton(QtGui.QLabel):
class EmoteButton(QtGui.QLabel):
clicked = QtCore.pyqtSignal()
def __init__(self, gamewindow, x, y, id):
def __init__(self, gamewindow, id):
super(EmoteButton, self).__init__(gamewindow)
self.gamewindow = gamewindow
self.resize(40, 40)
self.move(x, y)
self.emoteid = id
self.path = ''
@ -261,10 +260,9 @@ class EmoteButton(QtGui.QLabel):
class BackEmoteButton(QtGui.QLabel):
def __init__(self, gamewindow, x, y):
def __init__(self, gamewindow):
super(BackEmoteButton, self).__init__(gamewindow)
self.gamewindow = gamewindow
self.move(x, y)
self.setPixmap(QtGui.QPixmap(AO2XPpath + 'themes/default/arrow_left.png'))
self.show()
@ -274,10 +272,9 @@ class BackEmoteButton(QtGui.QLabel):
class NextEmoteButton(QtGui.QLabel):
def __init__(self, gamewindow, x, y):
def __init__(self, gamewindow):
super(NextEmoteButton, self).__init__(gamewindow)
self.gamewindow = gamewindow
self.move(x, y)
self.setPixmap(QtGui.QPixmap(AO2XPpath + 'themes/default/arrow_right.png'))
self.show()

2
constants.py
View File

@ -1,4 +1,4 @@
GAME_VERSION = "2.8.0"
GAME_VERSION = "2.9.0"
AOpath = "base/"
AO2XPpath = "AO2XPbase/"

51
gameview.py
View File

@ -1480,31 +1480,12 @@ class GUI(QtGui.QWidget):
self.changechar = QtGui.QPushButton(self)
self.changechar.clicked.connect(self.onClick_changeChar)
spacing = 1
x_mod_count = y_mod_count = 0
left, top = (10 + 516, 218+190-24)
width, height = (288, 98)
columns = (width - 40) / (spacing + 40) + 1
rows = (height - 40) / (spacing + 40) + 1
self.max_emotes_on_page = columns * rows
self.emotebuttons = []
for i in range(self.max_emotes_on_page):
x_pos = (40 + spacing) * x_mod_count
y_pos = (40 + spacing) * y_mod_count
button = buttons.EmoteButton(self, left + x_pos, top + y_pos, i)
button.clicked.connect(self.icchat_focus)
self.emotebuttons.append(button)
x_mod_count += 1
if x_mod_count == columns:
x_mod_count = 0
y_mod_count += 1
self.emotebuttons[i].show()
self.current_emote_page = 0
self.prevemotepage = buttons.BackEmoteButton(self, 520, 253+190-28)
self.max_emotes_on_page = 0
self.prevemotepage = buttons.BackEmoteButton(self)
self.prevemotepage.hide()
self.nextemotepage = buttons.NextEmoteButton(self, 282 + 516, 253+190-28)
self.nextemotepage = buttons.NextEmoteButton(self)
self.nextemotepage.show()
self.realizationbtn = buttons.AOToggleButton(self, "realization")
@ -1649,6 +1630,7 @@ class GUI(QtGui.QWidget):
self.viewportScale = 1
self.nameFontPointSize = 12
self.textFontPointSize = 24
self.emotePageGeometry = (526, 384, 288, 98)
self.loadTheme()
def loadTheme(self, switching=False):
@ -1704,6 +1686,31 @@ class GUI(QtGui.QWidget):
label.resize(self.viewport.width(), label.sizeHint().height())
label.setFont(nameFont)
spacing = 1
x_mod_count = y_mod_count = 0
left, top, width, height = self.emotePageGeometry
columns = (width - 40) / (spacing + 40) + 1
rows = (height - 40) / (spacing + 40) + 1
self.max_emotes_on_page = columns * rows
self.emotebuttons = []
for i in range(self.max_emotes_on_page):
x_pos = (40 + spacing) * x_mod_count
y_pos = (40 + spacing) * y_mod_count
x_mod_count += 1
if x_mod_count == columns:
x_mod_count = 0
y_mod_count += 1
button = buttons.EmoteButton(self, i)
button.move(left + x_pos, top + y_pos)
button.clicked.connect(self.icchat_focus)
button.show()
self.emotebuttons.append(button)
self.prevemotepage.raise_()
self.nextemotepage.raise_()
if switching:
self.setBackground()
self.setScene()