From 0b802b3e95ff9cb218ec07c762b9a83dda59c744 Mon Sep 17 00:00:00 2001 From: cidoku Date: Thu, 20 Feb 2025 15:38:30 -0300 Subject: [PATCH] fix tabs + set window icon --- AO2XP.py | 73 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/AO2XP.py b/AO2XP.py index 5c0d681..bd8aeba 100644 --- a/AO2XP.py +++ b/AO2XP.py @@ -31,42 +31,43 @@ if not debugmode: os._exit(-2) class gamewindow(QtGui.QMainWindow): - def __init__(self): - super(gamewindow, self).__init__() - self.stackwidget = QtGui.QStackedWidget(self) - self.widget = mainmenu.lobby(self) - self.gamewidget = gameview.gui(self) - self.stackwidget.addWidget(self.widget) - self.stackwidget.addWidget(self.gamewidget) - self.setCentralWidget(self.stackwidget) - self.stackwidget.setCurrentWidget(self.widget) - self.setFixedSize(self.widget.lobbyimg.size().width(), self.widget.lobbyimg.size().height()) - self.center() - self.setWindowTitle("AO2XP") - self.setWindowFlags(QtCore.Qt.WindowMinimizeButtonHint) - - self.settingsgui = options.Settings() - - def center(self): - frameGm = self.frameGeometry() - centerPoint = QtGui.QDesktopWidget().availableGeometry().center() - frameGm.moveCenter(centerPoint) - self.move(frameGm.topLeft()) - - def showGame(self, tcp, playerlist, charlist, musiclist, background, evidence, areas, features=[], oocjoin=[], hplist=[], webAO_bucket=""): - self.gamewidget.disconnectnow = False - self.gamewidget.startGame(tcp, playerlist, charlist, musiclist, background, evidence, areas, features, oocjoin, hplist, webAO_bucket) - self.stackwidget.setCurrentWidget(self.gamewidget) - - def returnToMenu(self): - self.gamewidget.disconnectnow = True - self.setFixedSize(self.widget.lobbyimg.size().width(), self.widget.lobbyimg.size().height()) - self.widget.onClicked_cancelconnect() - self.stackwidget.setCurrentWidget(self.widget) - self.setWindowTitle("AO2XP") - - def showSettings(self): - self.settingsgui.showSettings() + def __init__(self): + super(gamewindow, self).__init__() + self.stackwidget = QtGui.QStackedWidget(self) + self.widget = mainmenu.lobby(self) + self.gamewidget = gameview.gui(self) + self.stackwidget.addWidget(self.widget) + self.stackwidget.addWidget(self.gamewidget) + self.setCentralWidget(self.stackwidget) + self.stackwidget.setCurrentWidget(self.widget) + self.setFixedSize(self.widget.lobbyimg.size().width(), self.widget.lobbyimg.size().height()) + self.center() + self.setWindowTitle("AO2XP") + self.setWindowIcon(QtGui.QIcon("AO2XP.ico")) + self.setWindowFlags(QtCore.Qt.WindowMinimizeButtonHint) + + self.settingsgui = options.Settings() + + def center(self): + frameGm = self.frameGeometry() + centerPoint = QtGui.QDesktopWidget().availableGeometry().center() + frameGm.moveCenter(centerPoint) + self.move(frameGm.topLeft()) + + def showGame(self, tcp, playerlist, charlist, musiclist, background, evidence, areas, features=[], oocjoin=[], hplist=[], webAO_bucket=""): + self.gamewidget.disconnectnow = False + self.gamewidget.startGame(tcp, playerlist, charlist, musiclist, background, evidence, areas, features, oocjoin, hplist, webAO_bucket) + self.stackwidget.setCurrentWidget(self.gamewidget) + + def returnToMenu(self): + self.gamewidget.disconnectnow = True + self.setFixedSize(self.widget.lobbyimg.size().width(), self.widget.lobbyimg.size().height()) + self.widget.onClicked_cancelconnect() + self.stackwidget.setCurrentWidget(self.widget) + self.setWindowTitle("AO2XP") + + def showSettings(self): + self.settingsgui.showSettings() if not debugmode: # Vanilla downloader