fix tabs + set window icon
This commit is contained in:
parent
8c1093e006
commit
0b802b3e95
73
AO2XP.py
73
AO2XP.py
@ -31,42 +31,43 @@ if not debugmode:
|
|||||||
os._exit(-2)
|
os._exit(-2)
|
||||||
|
|
||||||
class gamewindow(QtGui.QMainWindow):
|
class gamewindow(QtGui.QMainWindow):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
super(gamewindow, self).__init__()
|
super(gamewindow, self).__init__()
|
||||||
self.stackwidget = QtGui.QStackedWidget(self)
|
self.stackwidget = QtGui.QStackedWidget(self)
|
||||||
self.widget = mainmenu.lobby(self)
|
self.widget = mainmenu.lobby(self)
|
||||||
self.gamewidget = gameview.gui(self)
|
self.gamewidget = gameview.gui(self)
|
||||||
self.stackwidget.addWidget(self.widget)
|
self.stackwidget.addWidget(self.widget)
|
||||||
self.stackwidget.addWidget(self.gamewidget)
|
self.stackwidget.addWidget(self.gamewidget)
|
||||||
self.setCentralWidget(self.stackwidget)
|
self.setCentralWidget(self.stackwidget)
|
||||||
self.stackwidget.setCurrentWidget(self.widget)
|
self.stackwidget.setCurrentWidget(self.widget)
|
||||||
self.setFixedSize(self.widget.lobbyimg.size().width(), self.widget.lobbyimg.size().height())
|
self.setFixedSize(self.widget.lobbyimg.size().width(), self.widget.lobbyimg.size().height())
|
||||||
self.center()
|
self.center()
|
||||||
self.setWindowTitle("AO2XP")
|
self.setWindowTitle("AO2XP")
|
||||||
self.setWindowFlags(QtCore.Qt.WindowMinimizeButtonHint)
|
self.setWindowIcon(QtGui.QIcon("AO2XP.ico"))
|
||||||
|
self.setWindowFlags(QtCore.Qt.WindowMinimizeButtonHint)
|
||||||
self.settingsgui = options.Settings()
|
|
||||||
|
self.settingsgui = options.Settings()
|
||||||
def center(self):
|
|
||||||
frameGm = self.frameGeometry()
|
def center(self):
|
||||||
centerPoint = QtGui.QDesktopWidget().availableGeometry().center()
|
frameGm = self.frameGeometry()
|
||||||
frameGm.moveCenter(centerPoint)
|
centerPoint = QtGui.QDesktopWidget().availableGeometry().center()
|
||||||
self.move(frameGm.topLeft())
|
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
|
def showGame(self, tcp, playerlist, charlist, musiclist, background, evidence, areas, features=[], oocjoin=[], hplist=[], webAO_bucket=""):
|
||||||
self.gamewidget.startGame(tcp, playerlist, charlist, musiclist, background, evidence, areas, features, oocjoin, hplist, webAO_bucket)
|
self.gamewidget.disconnectnow = False
|
||||||
self.stackwidget.setCurrentWidget(self.gamewidget)
|
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
|
def returnToMenu(self):
|
||||||
self.setFixedSize(self.widget.lobbyimg.size().width(), self.widget.lobbyimg.size().height())
|
self.gamewidget.disconnectnow = True
|
||||||
self.widget.onClicked_cancelconnect()
|
self.setFixedSize(self.widget.lobbyimg.size().width(), self.widget.lobbyimg.size().height())
|
||||||
self.stackwidget.setCurrentWidget(self.widget)
|
self.widget.onClicked_cancelconnect()
|
||||||
self.setWindowTitle("AO2XP")
|
self.stackwidget.setCurrentWidget(self.widget)
|
||||||
|
self.setWindowTitle("AO2XP")
|
||||||
def showSettings(self):
|
|
||||||
self.settingsgui.showSettings()
|
def showSettings(self):
|
||||||
|
self.settingsgui.showSettings()
|
||||||
|
|
||||||
if not debugmode:
|
if not debugmode:
|
||||||
# Vanilla downloader
|
# Vanilla downloader
|
||||||
|
Loading…
Reference in New Issue
Block a user