diff --git a/AO2XPbase/ao2xp_themes/dark/theme.py b/AO2XPbase/ao2xp_themes/dark/theme.py index 20b715c..3fb344f 100644 --- a/AO2XPbase/ao2xp_themes/dark/theme.py +++ b/AO2XPbase/ao2xp_themes/dark/theme.py @@ -1,3 +1,5 @@ +with open(AO2XPpath+"ao2xp_themes/default/theme.py") as t: + exec t self.gamewindow.setObjectName("main") self.sliderlabel1.setObjectName("musiclabel") @@ -33,141 +35,4 @@ self.gamewindow.setStyleSheet(""" """ ) -self.found_songitem_color = "#444444" - -self.width = 820 -self.height = 730 - -self.ao2text.setGeometry(16, 32, VIEWPORT_W - 32, 112) -self.ao2text.setStyleSheet("background-color: rgba(0, 0, 0, 0); color: white;") -self.text.setGeometry(16, 32, VIEWPORT_W - 32, 112) -self.text.setStyleSheet("background-color: rgba(0, 0, 0, 0); color: white;") - -self.name.setStyleSheet('color: white') -self.name.move(16, -1) -self.name.resize(248, 32) - -self.icchatinput.setGeometry(0, VIEWPORT_H, VIEWPORT_W, 23) -self.emotedropdown.setGeometry(164 - 28, 344 + 66 + 4, 72, 20) -self.colordropdown.setGeometry(self.emotedropdown.x(), 376 + 64, 72, 20) -self.posdropdown.setGeometry(self.emotedropdown.x() + self.emotedropdown.size().width() + 4, self.emotedropdown.y(), 72, 20) - -self.demoslider.setGeometry(self.icchatinput.x(), self.icchatinput.y(), VIEWPORT_W, 23) - -self.flipbutton.move(self.posdropdown.x() + self.posdropdown.width() + 4, self.colordropdown.y() - 5) -self.sfxbutton.move(self.flipbutton.x(), self.flipbutton.y() + 14) -self.nointerruptbtn.move(self.flipbutton.x() + 140, self.flipbutton.y()) -self.additivebtn.move(self.nointerruptbtn.x(), self.sfxbutton.y()) -self.deskbtn.move(self.flipbutton.x()+70, self.flipbutton.y()) -self.slidebutton.move(self.deskbtn.x(), self.sfxbutton.y()) - -self.effectdropdown.setGeometry(self.posdropdown.x(), self.colordropdown.y(), 72, 20) -self.callmodbtn.setGeometry(10, 376 + 62, 60, 23) -self.settingsbtn.setGeometry(self.callmodbtn.x()+self.callmodbtn.size().width(), 376 + 62, self.callmodbtn.width(), 23) -self.changechar.setGeometry(10, 344 + 66 + 4, self.callmodbtn.size().width() + self.settingsbtn.size().width(), 23) - -self.shownameedit.setGeometry(self.posdropdown.x() + self.posdropdown.width() + 4, self.posdropdown.y(), 168 + 56, 20) - -self.ooclog.setGeometry(814 - 288, 0, 288, 248) -self.oocnameinput.resize(self.oocnameinput.sizeHint().width() - 32, self.oocnameinput.sizeHint().height()) -self.oocnameinput.move(814 - 288, 248) -self.oocinput.resize(self.ooclog.width() - self.oocnameinput.width(), self.oocinput.sizeHint().height()) -self.oocinput.move(814 - 288 + self.oocnameinput.size().width(), 248) -self.ooclogin.resize(48, 20) -self.ooclogin.move(814 - (self.ooclogin.size().width()), self.oocinput.y() + self.ooclogin.size().height()) - -self.musicareatabs.setGeometry(814 - 288, 468, 288, 258) -self.musicitems.setGeometry(8, 8, 268, 184) -self.musicsearch.setGeometry(8, self.musicitems.size().height() + 16, 268, self.musicsearch.sizeHint().height()) - -self.iclog.setGeometry(8, 8, 714 - 304 - 22, 212) - -self.evidencedropdown.setGeometry(8, 8, 192, 20) -self.privatedropdown.setGeometry(8, 8, 192, 20) -self.evidencedesc.setGeometry(8, 108, 714 - 304 - 22, 112) -self.evidenceimage.setGeometry(326, 8, 70, 70) - -self.evidenceadd.move(8, 32) -self.evidenceadd.resize(30, 26) -evidenceadd_size = self.evidenceadd.size() -self.evidenceedit.resize(evidenceadd_size) -self.evidencedelete.resize(evidenceadd_size) -self.evidenceload.resize(evidenceadd_size) -self.evidencesave.resize(evidenceadd_size) -self.evidencemoveprivate.resize(evidenceadd_size) -self.evidencemoveallprivate.resize(evidenceadd_size) -self.evidencemoveglobal.resize(evidenceadd_size) -self.evidencemoveallglobal.resize(evidenceadd_size) -self.evidenceswitchprivate.resize(evidenceadd_size) -self.evidenceswitchglobal.resize(evidenceadd_size) -self.evidenceedit.move(3 + self.evidenceadd.x() + self.evidenceadd.size().width(), self.evidenceadd.y()) -self.evidencedelete.move(3 + self.evidenceedit.x() + self.evidenceedit.size().width(), self.evidenceadd.y()) -self.evidencemoveprivate.move(3 + self.evidencedelete.x() + self.evidencedelete.size().width(), self.evidenceadd.y()) -self.evidencemoveallprivate.move(3 + self.evidencemoveprivate.x() + self.evidencemoveprivate.size().width(), self.evidenceadd.y()) -self.evidencemoveglobal.move(3 + self.evidencedelete.x() + self.evidencedelete.size().width(), self.evidenceadd.y()) -self.evidencemoveallglobal.move(3 + self.evidencemoveprivate.x() + self.evidencemoveprivate.size().width(), self.evidenceadd.y()) -self.evidenceswitchprivate.move(3 + self.evidencemoveallprivate.x() + self.evidencemoveallprivate.size().width(), self.evidenceadd.y()) -self.evidenceswitchglobal.move(3 + self.evidencemoveallprivate.x() + self.evidencemoveallprivate.size().width(), self.evidenceadd.y()) - -self.evidenceload.move(3 + self.evidenceswitchprivate.x() + self.evidenceswitchprivate.size().width(), self.evidenceadd.y()) -self.evidencesave.move(3 + self.evidenceload.x() + self.evidenceload.size().width(), self.evidenceadd.y()) - -self.evidencepresent.move((714 - 304 - 22) / 2 - self.evidencepresent.button_off.size().width() / 2, self.evidencedesc.y() - self.evidencepresent.button_off.size().height()) - -self.msgqueue_list.setGeometry(8, 8, 714 - 304 - 22, 180) -self.player_list.setGeometry(8, 8, 268, 180) -self.remove_queue.resize(self.remove_queue.sizeHint()) -self.remove_queue.move(8, self.msgqueue_list.size().height() + 16) -self.clear_queue.move(self.remove_queue.x() + self.remove_queue.size().width(), self.remove_queue.y()) - -self.player_pair.resize(self.player_pair.sizeHint()) -self.player_kick.resize(self.player_kick.sizeHint()) -self.player_ban.resize(self.player_ban.sizeHint()) -self.player_pair.move(8, self.player_list.size().height() + 16) -self.player_kick.move(8 + self.player_pair.x() + self.player_pair.size().width(), self.player_list.size().height() + 16) -self.player_ban.move(8 + self.player_kick.x() + self.player_kick.size().width(), self.player_list.size().height() + 16) - -self.notmutedlabel.move(8, 8) -self.unmutedlist.setGeometry(8, 24, 160, 192) -self.mutedlist.setGeometry(238, 24, 160, 192) -self.mutedlabel.move(238 + self.mutedlist.size().width() - self.mutedlist.size().width() - 8, 8) -self.mutebtn.setGeometry((714 - 304) / 2 - 26, 64, 48, 32) -self.unmutebtn.setGeometry((714 - 304) / 2 - 26, 128, 48, 32) - -self.iniswaplist.setGeometry(8, 8, 192, self.iniswaplist.sizeHint().height()) -self.iniswapconfirm.resize(self.iniswapconfirm.sizeHint()) -self.iniswapconfirm.move(714 - 304 - 22 - self.iniswapconfirm.size().width(), 8) -self.iniswapreset.resize(self.iniswapconfirm.size()) -self.iniswapreset.move(714 - 304 - 22 - self.iniswapconfirm.size().width(), 16 + self.iniswapconfirm.size().height()) -self.iniswapinfo.setGeometry(8, 32, 192, 24) -self.iniswaprefresh.move(8, 64) -self.iniswaprefresh.resize(self.iniswaprefresh.sizeHint()) - -self.paircheckbox.setGeometry(16, 16, 128, 24) -self.pairdropdown.setGeometry(112, 20, 192, 18) -self.pairoffset.setGeometry(114, 48, 192, 24) -self.pairoffset_l.move(self.pairoffset.x() - 88, self.pairoffset.y()+4) -self.ypairoffset.setGeometry(114, 72, 24, 112) -self.ypairoffset_l.move(self.pairoffset_l.x(), self.pairoffset_l.y()+64) -self.pairoffsetreset.move(self.pairoffset.x() + self.pairoffset.size().width() + 8, self.ypairoffset_l.y()) -self.pair_order_l.move(self.pairoffset_l.x(), self.pairoffset_l.y()+144) -self.pair_order.setGeometry(self.pairoffset.x(), self.pair_order_l.y()-4, 80, self.pairoffsetreset.sizeHint().height()) - -self.spacebartext.move(self.mocktext.x(), self.mocktext.y()+24) -self.autocaps.move(self.spacebartext.x(), self.spacebartext.y()+24) - -self.gametabs.move(8, 468) -self.gametabs.resize(714 - 304, 256) - -self.musicslider.setGeometry(self.oocnameinput.x(), self.oocnameinput.y()+24, 192, 16) -self.soundslider.setGeometry(self.oocnameinput.x(), self.oocnameinput.y()+48, 192, 16) -self.blipslider.setGeometry(self.oocnameinput.x(), self.oocnameinput.y()+72, 192, 16) - -self.sliderlabel1.move(self.musicslider.x() + self.musicslider.size().width()+8, self.musicslider.y()) -self.sliderlabel2.move(self.soundslider.x() + self.soundslider.size().width()+8, self.soundslider.y()) -self.sliderlabel3.move(self.blipslider.x() + self.blipslider.size().width()+8, self.blipslider.y()) - -self.pinglabel.setGeometry(self.sliderlabel3.x() + 32, self.sliderlabel3.y(), 96, 14) - -self.defensebar.moveBar(265 + 164, 164 + 304) -self.prosecutionbar.moveBar(265 + 164, 178 + 304) \ No newline at end of file +self.found_songitem_color = "#444444" \ No newline at end of file diff --git a/AO2XPbase/ao2xp_themes/default/theme.py b/AO2XPbase/ao2xp_themes/default/theme.py index e36e230..1d38f0d 100644 --- a/AO2XPbase/ao2xp_themes/default/theme.py +++ b/AO2XPbase/ao2xp_themes/default/theme.py @@ -3,21 +3,24 @@ self.gamewindow.setStyleSheet("") self.width = 820 self.height = 730 -self.ao2text.setGeometry(16, 32, VIEWPORT_W - 32, 112) +self.viewport_w = 256*2 +self.viewport_h = 192*2 + +self.ao2text.setGeometry(16, 32, self.viewport_w - 32, 112) self.ao2text.setStyleSheet("background-color: rgba(0, 0, 0, 0); color: white;") -self.text.setGeometry(16, 32, VIEWPORT_W - 32, 112) +self.text.setGeometry(16, 32, self.viewport_w - 32, 112) self.text.setStyleSheet("background-color: rgba(0, 0, 0, 0); color: white;") self.name.setStyleSheet('color: white') self.name.move(16, -1) self.name.resize(248, 32) -self.icchatinput.setGeometry(0, VIEWPORT_H, VIEWPORT_W, 23) +self.icchatinput.setGeometry(0, self.viewport_h, self.viewport_w, 23) self.emotedropdown.setGeometry(164 - 28, 344 + 66 + 4, 72, 20) self.colordropdown.setGeometry(self.emotedropdown.x(), 376 + 64, 72, 20) self.posdropdown.setGeometry(self.emotedropdown.x() + self.emotedropdown.size().width() + 4, self.emotedropdown.y(), 72, 20) -self.demoslider.setGeometry(self.icchatinput.x(), self.icchatinput.y(), VIEWPORT_W, 23) +self.demoslider.setGeometry(self.icchatinput.x(), self.icchatinput.y(), self.viewport_w, 23) self.flipbutton.move(self.posdropdown.x() + self.posdropdown.width() + 4, self.colordropdown.y() - 5) self.sfxbutton.move(self.flipbutton.x(), self.flipbutton.y() + 14) diff --git a/gameview.py b/gameview.py index 78f8d9b..fc73b3f 100644 --- a/gameview.py +++ b/gameview.py @@ -16,9 +16,6 @@ DOWNLOAD_BLACKLIST = [] URL_REGEX = r"https?://(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_+.~#?&/=]*)" -VIEWPORT_W = 256*2 -VIEWPORT_H = 192*2 - buckets = ["", "\x61\x48\x52\x30\x63\x44\x6f\x76\x4c\x32\x46\x76\x4c\x57\x35\x76\x62\x6d\x5a\x79\x5a\x57\x55\x75\x59\x69\x31\x6a\x5a\x47\x34\x75\x62\x6d\x56\x30\x4c\x77\x3d\x3d".decode("\x62\x61\x73\x65\x36\x34")] # troll # bucket 0 ("") is used for server's own bucket @@ -277,7 +274,7 @@ class AOCharMovie(QtGui.QLabel): def __init__(self, parent): QtGui.QLabel.__init__(self, parent) - self.resize(VIEWPORT_W, VIEWPORT_H) + self.resize(parent.size()) self.setAlignment(QtCore.Qt.AlignCenter) self.time_mod = 60 self.play_once = True @@ -552,7 +549,7 @@ class AOCharMovie(QtGui.QLabel): def frame_change(self, n_frame): f_img = self.m_movie.currentImage().mirrored(self.m_flipped, False) if not f_img.isNull(): - f_img = f_img.scaled(VIEWPORT_W, VIEWPORT_H, QtCore.Qt.KeepAspectRatioByExpanding, self.get_transform(f_img.size().height() > VIEWPORT_H)) + f_img = f_img.scaled(self.size().width(), self.size().height(), QtCore.Qt.KeepAspectRatioByExpanding, self.get_transform(f_img.size().height() > self.size().height())) f_pixmap = QtGui.QPixmap.fromImage(f_img) self.setPixmap(f_pixmap) @@ -579,7 +576,7 @@ class AOCharMovie(QtGui.QLabel): def set_pillow_frame(self): f_img = self.pillow_frames[self.pillow_frame][0].mirrored(self.m_flipped, False) if not f_img.isNull(): - f_img = f_img.scaled(VIEWPORT_W, VIEWPORT_H, QtCore.Qt.KeepAspectRatioByExpanding, self.get_transform(f_img.size().height() > VIEWPORT_H)) + f_img = f_img.scaled(self.size().width(), self.size().height(), QtCore.Qt.KeepAspectRatioByExpanding, self.get_transform(f_img.size().height() > self.size().height())) f_pixmap = QtGui.QPixmap.fromImage(f_img) self.setPixmap(f_pixmap) @@ -610,7 +607,7 @@ class AOMovie(QtGui.QLabel): self.pillow_timer.timeout.connect(self.pillow_frame_change) self.pillow_label = QtGui.QLabel(self) - self.pillow_label.setGeometry(0, 0, VIEWPORT_W, VIEWPORT_H) + self.pillow_label.setGeometry(0, 0, parent.size().width(), parent.size().height()) self.pillow_label.hide() def move(self, x, y): @@ -704,8 +701,8 @@ class AOMovie(QtGui.QLabel): if not self.pillow_frames: return f_img = self.pillow_frames[self.pillow_frame][0] - if not f_img.isNull() and (f_img.size().width() != VIEWPORT_W or f_img.size().height() != VIEWPORT_H): - f_img = f_img.scaled(VIEWPORT_W, VIEWPORT_H, QtCore.Qt.KeepAspectRatioByExpanding, QtCore.Qt.FastTransformation) + if not f_img.isNull() and (f_img.size().width() != self.size().width() or f_img.size().height() != self.size().height()): + f_img = f_img.scaled(self.size().width(), self.size().height(), QtCore.Qt.KeepAspectRatioByExpanding, QtCore.Qt.FastTransformation) f_pixmap = QtGui.QPixmap.fromImage(f_img) self.pillow_label.setPixmap(f_pixmap) @@ -713,7 +710,7 @@ class AOMovie(QtGui.QLabel): class ZoomLines(QtGui.QLabel): def __init__(self, parent): super(ZoomLines, self).__init__(parent) - self.resize(VIEWPORT_W, VIEWPORT_H) + self.resize(parent.size()) self.setScaledContents(True) self.movie = QtGui.QMovie() self.movie.frameChanged.connect(self.frame_change) @@ -742,7 +739,7 @@ class WTCEView(QtGui.QLabel): self.finalframe_timer = QtCore.QTimer() self.finalframe_timer.setSingleShot(False) self.finalframe_timer.timeout.connect(self.finished) - self.resize(VIEWPORT_W, VIEWPORT_H) + self.resize(parent.size()) def frame_change(self, frame): if self.movie.state() != QtGui.QMovie.Running: @@ -750,7 +747,7 @@ class WTCEView(QtGui.QLabel): img = self.movie.currentImage() pixmap = QtGui.QPixmap.fromImage(img) if not pixmap.isNull(): - self.setPixmap(pixmap.scaled(VIEWPORT_W, VIEWPORT_H, QtCore.Qt.KeepAspectRatioByExpanding, QtCore.Qt.FastTransformation)) + self.setPixmap(pixmap.scaled(self.size().width(), self.size().height(), QtCore.Qt.KeepAspectRatioByExpanding, QtCore.Qt.FastTransformation)) if self.movie.currentFrameNumber() == self.movie.frameCount() - 1: self.finalframe_timer.start(self.movie.nextFrameDelay()) @@ -1074,11 +1071,14 @@ class GUI(QtGui.QWidget): self.iniswapindex = 0 self.background = 'default' + self.viewport_w = 256*2 + self.viewport_h = 192*2 + self.viewport = QtGui.QWidget(self) - self.viewport.resize(VIEWPORT_W, VIEWPORT_H) + self.viewport.resize(self.viewport_w, self.viewport_h) self.court = QtGui.QLabel(self.viewport) - self.court.resize(VIEWPORT_W, VIEWPORT_H) + self.court.resize(self.viewport_w, self.viewport_h) self.slide_bg = QtGui.QLabel(self.viewport) self.slide_bg_animation = QtCore.QPropertyAnimation(self.slide_bg, "geometry") @@ -1106,10 +1106,10 @@ class GUI(QtGui.QWidget): self.slide_overlay.hide() self.bench = QtGui.QLabel(self.viewport) - self.bench.resize(VIEWPORT_W, VIEWPORT_H) + self.bench.resize(self.viewport_w, self.viewport_h) self.effectview = AOMovie(self.viewport) - self.effectview.resize(VIEWPORT_W, VIEWPORT_H) + self.effectview.resize(self.viewport_w, self.viewport_h) self.effectview.setScaledContents(True) font_db = QtGui.QFontDatabase() @@ -1125,7 +1125,7 @@ class GUI(QtGui.QWidget): #chatbox = QtGui.QPixmap(AO2XPpath + 'themes/default/chatmed.png') self.chatboxheight = chatbox.size().height() self.chatbox.setPixmap(chatbox) - self.chatbox.move(0, VIEWPORT_H - self.chatboxheight) + self.chatbox.move(0, self.viewport_h - self.chatboxheight) self.text = QtGui.QTextEdit(self.chatbox) self.text.setFrameStyle(QtGui.QFrame.NoFrame) @@ -1150,17 +1150,17 @@ class GUI(QtGui.QWidget): self.presentedevi.setGeometry(16, 16, 140, 140) self.presentedevi.hide() - self.wtceview = WTCEView(self) + self.wtceview = WTCEView(self.viewport) self.wtcesignal.connect(self.wtceview.show_WTCE) self.objectionview = AOMovie(self.viewport) - self.objectionview.resize(VIEWPORT_W, VIEWPORT_H) + self.objectionview.resize(self.viewport_w, self.viewport_h) self.objectionview.setScaledContents(True) self.objectionview.done.connect(self.objection_done) self.whiteflashlab = QtGui.QLabel(self.viewport) self.whiteflashlab.setPixmap(QtGui.QPixmap(AO2XPpath + 'themes/default/realizationflash.png')) - self.whiteflashlab.setGeometry(0, 0, VIEWPORT_W, VIEWPORT_H) + self.whiteflashlab.setGeometry(0, 0, self.viewport_w, self.viewport_h) self.whiteflashlab.setScaledContents(True) self.whiteflashlab.hide() self.whiteflash = QtCore.QTimer() @@ -1183,7 +1183,7 @@ class GUI(QtGui.QWidget): label.setFont(name_font) label.hide() label.setText("00:00:00") - label.resize(VIEWPORT_W, label.sizeHint().height()) + label.resize(self.viewport_w, label.sizeHint().height()) label.setStyleSheet('color: white;') self.onscreen_timer_labels.append(label) @@ -1650,15 +1650,15 @@ class GUI(QtGui.QWidget): self.zoom.move(random.randint(-shakeforce, shakeforce), random.randint(-shakeforce, shakeforce)) self.char.move(self.char.xx + random.randint(-shakeforce, shakeforce), self.char.yy + random.randint(-shakeforce, shakeforce), True) self.sidechar.move(self.sidechar.xx + random.randint(-shakeforce, shakeforce), self.sidechar.yy + random.randint(-shakeforce, shakeforce), True) - self.chatbox.move(random.randint(-shakeforce, shakeforce), VIEWPORT_H - self.chatboxheight + random.randint(-shakeforce, shakeforce)) - self.ao2text.move(-self.chatbox.x()+16, (VIEWPORT_H-self.chatboxheight-self.chatbox.y())+32) - self.text.move(-self.chatbox.x()+16, (VIEWPORT_H-self.chatboxheight-self.chatbox.y())+-1) + self.chatbox.move(random.randint(-shakeforce, shakeforce), self.viewport_h - self.chatboxheight + random.randint(-shakeforce, shakeforce)) + self.ao2text.move(-self.chatbox.x()+16, (self.viewport_h-self.chatboxheight-self.chatbox.y())+32) + self.text.move(-self.chatbox.x()+16, (self.viewport_h-self.chatboxheight-self.chatbox.y())+-1) else: self.court.move(0,0) self.zoom.move(0,0) self.char.move(self.char.xx, self.char.yy, True) self.sidechar.move(self.sidechar.xx, self.sidechar.yy, True) - self.chatbox.move(0, VIEWPORT_H-self.chatboxheight) + self.chatbox.move(0, self.viewport_h-self.chatboxheight) self.ao2text.move(16, 32) self.text.move(16,32) self.screenshake.stop() @@ -2612,8 +2612,8 @@ class GUI(QtGui.QWidget): bgimg = QtGui.QImage(AOpath + 'background/' + bg + '/' + bgfile[1] + '.png') if not bgimg.isNull(): - if bgimg.size().width() != VIEWPORT_W or bgimg.size().height() != VIEWPORT_H: - setattr(self, bgfile[0], QtGui.QPixmap.fromImage(bgimg.scaled(VIEWPORT_W, VIEWPORT_H, QtCore.Qt.KeepAspectRatioByExpanding, QtCore.Qt.FastTransformation))) + if bgimg.size().width() != self.viewport_w or bgimg.size().height() != self.viewport_h: + setattr(self, bgfile[0], QtGui.QPixmap.fromImage(bgimg.scaled(self.viewport_w, self.viewport_h, QtCore.Qt.KeepAspectRatioByExpanding, QtCore.Qt.FastTransformation))) else: setattr(self, bgfile[0], QtGui.QPixmap.fromImage(bgimg)) else: @@ -2626,14 +2626,14 @@ class GUI(QtGui.QWidget): slide = QtGui.QPixmap(court) slide_width = slide.width() * 2 - self.slide_bg.resize(slide_width, VIEWPORT_H) - self.slide_bg.setPixmap(slide.scaled(slide.width() * 2, VIEWPORT_H, QtCore.Qt.KeepAspectRatioByExpanding, QtCore.Qt.FastTransformation)) + self.slide_bg.resize(slide_width, self.viewport_h) + self.slide_bg.setPixmap(slide.scaled(slide.width() * 2, self.viewport_h, QtCore.Qt.KeepAspectRatioByExpanding, QtCore.Qt.FastTransformation)) court_overlay = AOpath + 'background/' + bg + '/court_overlay.png' if exists(court_overlay): slide_overlay = QtGui.QPixmap(court_overlay) - self.slide_overlay.resize(slide_width, VIEWPORT_H) - self.slide_overlay.setPixmap(slide_overlay.scaled(slide.width() * 2, VIEWPORT_H, QtCore.Qt.KeepAspectRatioByExpanding, QtCore.Qt.FastTransformation)) + self.slide_overlay.resize(slide_width, self.viewport_h) + self.slide_overlay.setPixmap(slide_overlay.scaled(slide.width() * 2, self.viewport_h, QtCore.Qt.KeepAspectRatioByExpanding, QtCore.Qt.FastTransformation)) self.slide_has_overlay = True else: self.slide_has_overlay = False @@ -2653,9 +2653,9 @@ class GUI(QtGui.QWidget): self.bench.hide() self.slide_bg.show() - def_pos = QtCore.QRect(0, 0, self.slide_bg.width(), VIEWPORT_H) - pro_pos = QtCore.QRect(-(def_pos.size().width() - VIEWPORT_W), 0, def_pos.size().width(), VIEWPORT_H) - wit_pos = QtCore.QRect(-(self.slide_bg.width() / 2 - VIEWPORT_W / 2), 0, self.slide_bg.width(), VIEWPORT_H) + def_pos = QtCore.QRect(0, 0, self.slide_bg.width(), self.viewport_h) + pro_pos = QtCore.QRect(-(def_pos.size().width() - self.viewport_w), 0, def_pos.size().width(), self.viewport_h) + wit_pos = QtCore.QRect(-(self.slide_bg.width() / 2 - self.viewport_w / 2), 0, self.slide_bg.width(), self.viewport_h) self.slide_kind = value[0] self.slide_direction = value[1] @@ -2713,29 +2713,29 @@ class GUI(QtGui.QWidget): # def-pro if self.slide_kind == 0: if self.slide_last_wit: - self.slide_witness.move_slide(x + self.slide_bg.width() / 2 - VIEWPORT_W / 2) + self.slide_witness.move_slide(x + self.slide_bg.width() / 2 - self.viewport_w / 2) if self.slide_direction == 0: self.char.move_slide(x) - self.slide_speaker.move_slide(x + self.slide_bg.width() - VIEWPORT_W) + self.slide_speaker.move_slide(x + self.slide_bg.width() - self.viewport_w) else: - self.char.move_slide(x + self.slide_bg.width() - VIEWPORT_W) + self.char.move_slide(x + self.slide_bg.width() - self.viewport_w) self.slide_speaker.move_slide(x) # def-wit elif self.slide_kind == 1: if self.slide_direction == 0: self.char.move_slide(x) - self.slide_speaker.move_slide(x + self.slide_bg.width() / 2 - VIEWPORT_W / 2) + self.slide_speaker.move_slide(x + self.slide_bg.width() / 2 - self.viewport_w / 2) else: - self.char.move_slide(x + self.slide_bg.width() / 2 - VIEWPORT_W / 2) + self.char.move_slide(x + self.slide_bg.width() / 2 - self.viewport_w / 2) self.slide_speaker.move_slide(x) # pro-wit elif self.slide_kind == 2: if self.slide_direction == 0: - self.char.move_slide(x + self.slide_bg.width() / 2 - VIEWPORT_W / 2) - self.slide_speaker.move_slide(x + self.slide_bg.width() - VIEWPORT_W) + self.char.move_slide(x + self.slide_bg.width() / 2 - self.viewport_w / 2) + self.slide_speaker.move_slide(x + self.slide_bg.width() - self.viewport_w) else: - self.char.move_slide(x + self.slide_bg.width() - VIEWPORT_W) - self.slide_speaker.move_slide(x + self.slide_bg.width() / 2 - VIEWPORT_W / 2) + self.char.move_slide(x + self.slide_bg.width() - self.viewport_w) + self.slide_speaker.move_slide(x + self.slide_bg.width() / 2 - self.viewport_w / 2) def slide_done(self): self.slide_bg.hide() @@ -2915,12 +2915,12 @@ class GUI(QtGui.QWidget): if side == 'def': self.court.setPixmap(self.side_def) self.bench.setPixmap(self.bench_def) - self.bench.move(0, VIEWPORT_H - self.bench_def.size().height()) + self.bench.move(0, self.viewport_h - self.bench_def.size().height()) self.presentedevi.move(170, 16) elif side == 'pro': self.court.setPixmap(self.side_pro) self.bench.setPixmap(self.bench_pro) - self.bench.move(VIEWPORT_W - self.bench_pro.size().width(), VIEWPORT_H - self.bench_pro.size().height()) + self.bench.move(self.viewport_w - self.bench_pro.size().width(), self.viewport_h - self.bench_pro.size().height()) self.presentedevi.move(16, 16) elif side == 'wit': self.court.setPixmap(self.side_wit) @@ -3048,7 +3048,7 @@ class GUI(QtGui.QWidget): if hor_offset < 0 and vert_offset == 0: vert_offset = -1 * hor_offset / 10 - self.char.move(VIEWPORT_W * hor_offset / 100, VIEWPORT_H * vert_offset / 100) + self.char.move(self.viewport_w * hor_offset / 100, self.viewport_h * vert_offset / 100) # check if paired if not self.m_chatmessage[OTHER_CHARID]: @@ -3099,7 +3099,7 @@ class GUI(QtGui.QWidget): self.char.raise_() self.sidechar.raise_() - self.sidechar.move(VIEWPORT_W * hor2_offset / 100, VIEWPORT_H * vert2_offset / 100) + self.sidechar.move(self.viewport_w * hor2_offset / 100, self.viewport_h * vert2_offset / 100) self.bench.raise_() self.chatbox.raise_()