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

align def and pro to the sides when using widescreen viewports

Browse Source
This commit is contained in:
cidoku 2026-01-26 16:29:44 -03:00
parent a88888824f
commit 9cc715c331
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gameview.py
View File

@ -108,12 +108,12 @@ def mockString(text):
upper = not upper upper = not upper
return "".join(l) return "".join(l)
class MusicDownloadThread(QtCore.QThread): class XPMusicDownloadThread(QtCore.QThread):
# Part of the evil HTTPS music download hack for XP systems # Part of the evil HTTPS music download hack for XP systems
finished_signal = QtCore.pyqtSignal(int, str) finished_signal = QtCore.pyqtSignal(int, str)
def __init__(self, caller, url): def __init__(self, caller, url):
super(MusicDownloadThread, self).__init__() super(XPMusicDownloadThread, self).__init__()
self.caller = caller self.caller = caller
self.url = url self.url = url
self.exiting = False self.exiting = False
@ -261,13 +261,14 @@ class AOCharMovie(QtGui.QLabel):
self.showOnPlay = True self.showOnPlay = True
self.mMovie = QtGui.QMovie() self.mMovie = QtGui.QMovie()
self.setAlignment(QtCore.Qt.AlignCenter)
self.preanimTimer = QtCore.QTimer(self) self.preanimTimer = QtCore.QTimer(self)
self.preanimTimer.setSingleShot(True) self.preanimTimer.setSingleShot(True)
self.pillowTimer = QtCore.QTimer(self) self.pillowTimer = QtCore.QTimer(self)
self.pillowTimer.setSingleShot(True) self.pillowTimer.setSingleShot(True)
self.preanimTimer.timeout.connect(self.timer_done) self.preanimTimer.timeout.connect(self.timerDone)
self.pillowTimer.timeout.connect(self.pillowFrameChange) self.pillowTimer.timeout.connect(self.pillowFrameChange)
self.mMovie.frameChanged.connect(self.frameChange) self.mMovie.frameChanged.connect(self.frameChange)
@ -287,6 +288,14 @@ class AOCharMovie(QtGui.QLabel):
def setFlipped(self, flip): def setFlipped(self, flip):
self.mFlipped = flip self.mFlipped = flip
def setAlignPos(self, pos):
if pos == "def":
self.setAlignment(QtCore.Qt.AlignLeft)
elif pos == "pro":
self.setAlignment(QtCore.Qt.AlignRight)
else:
self.setAlignment(QtCore.Qt.AlignCenter)
def play(self, pChar, pEmote, emotePrefix, scaling = SCALING_AUTO, singleFrameDuration = -1): def play(self, pChar, pEmote, emotePrefix, scaling = SCALING_AUTO, singleFrameDuration = -1):
if not len(pEmote): if not len(pEmote):
@ -582,7 +591,7 @@ class AOCharMovie(QtGui.QLabel):
self.setPixmap(fPixmap) self.setPixmap(fPixmap)
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def timer_done(self): def timerDone(self):
self.done.emit() self.done.emit()
class AOMovie(QtGui.QLabel): class AOMovie(QtGui.QLabel):
@ -3799,6 +3808,7 @@ class GUI(QtGui.QWidget):
if not self.animIsEmpty: if not self.animIsEmpty:
self.char.move(self.viewport.width() * hor_offset / 100, self.viewport.height() * vert_offset / 100) self.char.move(self.viewport.width() * hor_offset / 100, self.viewport.height() * vert_offset / 100)
self.char.setAlignPos(side)
# check if paired # check if paired
if not self.mChatMessage[OTHER_CHARID] and not self.animIsEmpty: if not self.mChatMessage[OTHER_CHARID] and not self.animIsEmpty:
@ -3812,6 +3822,7 @@ class GUI(QtGui.QWidget):
if got_otherCharId > -1: # user is paired if got_otherCharId > -1: # user is paired
self.sideChar.show() self.sideChar.show()
self.sideChar.setAlignPos(side)
boxPairOrder = self.mChatMessage[OTHER_CHARID].split("^") boxPairOrder = self.mChatMessage[OTHER_CHARID].split("^")
if "effects" in self.features and len(boxPairOrder) > 1: if "effects" in self.features and len(boxPairOrder) > 1:
@ -4426,7 +4437,7 @@ class GUI(QtGui.QWidget):
self.specialStream = True self.specialStream = True
if (musl.startswith("https") and error == 2) or self.specialStream: if (musl.startswith("https") and error == 2) or self.specialStream:
print "[audio] Downloading music with urllib2" print "[audio] Downloading music with urllib2"
self.downloadThread = MusicDownloadThread(self, mus.replace(" ", "%20")) self.downloadThread = XPMusicDownloadThread(self, mus.replace(" ", "%20"))
self.downloadThread.finished_signal.connect(self.playDownloadedMusic) self.downloadThread.finished_signal.connect(self.playDownloadedMusic)
self.downloadThread.start() self.downloadThread.start()
else: else: