From a63d1c995229d50e3198fcd42f0ffdac58530278 Mon Sep 17 00:00:00 2001 From: cidoku Date: Wed, 19 Feb 2025 17:03:36 -0300 Subject: [PATCH] move player list tab --- AO2XPbase/ao2xp_themes/default/theme.py | 2 +- gameview.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AO2XPbase/ao2xp_themes/default/theme.py b/AO2XPbase/ao2xp_themes/default/theme.py index 3de507a..6daf05c 100644 --- a/AO2XPbase/ao2xp_themes/default/theme.py +++ b/AO2XPbase/ao2xp_themes/default/theme.py @@ -72,7 +72,7 @@ self.evidencesave.move(3 + self.evidenceload.x() + self.evidenceload.size().widt self.evidencepresent.move((714 - 304 - 22) / 2 - self.evidencepresent.button_off.size().width() / 2, self.evidencedesc.y() - self.evidencepresent.button_off.size().height()) self.msgqueueList.setGeometry(8, 8, 714 - 304 - 22, 180) -self.playerList.setGeometry(8, 8, 714 - 304 - 22, 180) +self.playerList.setGeometry(8, 8, 268, 180) self.removeQueue.resize(self.removeQueue.sizeHint()) self.removeQueue.move(8, self.msgqueueList.size().height() + 16) self.clearQueue.move(self.removeQueue.x() + self.removeQueue.size().width(), self.removeQueue.y()) diff --git a/gameview.py b/gameview.py index 46641dd..5bd3c1a 100644 --- a/gameview.py +++ b/gameview.py @@ -820,9 +820,6 @@ class gui(QtGui.QWidget): self.areaitems = QtGui.QListWidget() self.areaitems.itemDoubleClicked.connect(self.onAreaClick) - self.musicareatabs.addTab(self.musicitems, "Music") - self.musicareatabs.addTab(self.areaitems, "Areas") - self.gametabs = QtGui.QTabWidget(self) self.gametab_log = QtGui.QWidget() # the IC chat log self.gametab_evidence = QtGui.QWidget() # court record @@ -978,13 +975,16 @@ class gui(QtGui.QWidget): self.gametabs.addTab(self.gametab_log, 'Log') self.gametabs.addTab(self.gametab_evidence, 'Evidence') - self.gametabs.addTab(self.gametab_players, 'Players') self.gametabs.addTab(self.gametab_mute, 'Mute') self.gametabs.addTab(self.gametab_iniswap, 'INI swap') self.gametabs.addTab(self.gametab_pair, 'Pair') self.gametabs.addTab(self.gametab_misc, 'Misc') self.gametabs.addTab(self.gametab_msgqueue, 'Queue') + self.musicareatabs.addTab(self.musicitems, "Music") + self.musicareatabs.addTab(self.areaitems, "Areas") + self.musicareatabs.addTab(self.gametab_players, 'Players') + self.icchatinput = QtGui.QLineEdit(self) self.icchatinput.returnPressed.connect(self.onICreturn) self.icchatinput.setPlaceholderText('Game chat')