From 032ab2d2c4fc17b2257d8f73c9f1f72f40602a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20R=C3=A9aux?= Date: Fri, 30 Jan 2026 01:01:35 +0100 Subject: [PATCH] layout in UI --- src/warchron/view/ui/ui_main_window.py | 356 +++++--- src/warchron/view/ui/ui_main_window.ui | 1115 +++++++++++------------- 2 files changed, 743 insertions(+), 728 deletions(-) diff --git a/src/warchron/view/ui/ui_main_window.py b/src/warchron/view/ui/ui_main_window.py index 8da8938..196353d 100644 --- a/src/warchron/view/ui/ui_main_window.py +++ b/src/warchron/view/ui/ui_main_window.py @@ -12,19 +12,29 @@ from PyQt6 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(800, 600) + MainWindow.resize(1288, 817) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/warchron_logo.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) MainWindow.setWindowIcon(icon) self.centralwidget = QtWidgets.QWidget(parent=MainWindow) self.centralwidget.setObjectName("centralwidget") + self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget) + self.verticalLayout.setObjectName("verticalLayout") self.tabWidget = QtWidgets.QTabWidget(parent=self.centralwidget) - self.tabWidget.setGeometry(QtCore.QRect(16, 9, 771, 531)) self.tabWidget.setObjectName("tabWidget") self.playersTab = QtWidgets.QWidget() self.playersTab.setObjectName("playersTab") + self.gridLayout = QtWidgets.QGridLayout(self.playersTab) + self.gridLayout.setObjectName("gridLayout") + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.addPlayerBtn = QtWidgets.QPushButton(parent=self.playersTab) + self.addPlayerBtn.setObjectName("addPlayerBtn") + self.horizontalLayout.addWidget(self.addPlayerBtn) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout.addItem(spacerItem) + self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1) self.playersTable = QtWidgets.QTableWidget(parent=self.playersTab) - self.playersTable.setGeometry(QtCore.QRect(10, 60, 741, 431)) self.playersTable.setObjectName("playersTable") self.playersTable.setColumnCount(4) self.playersTable.setRowCount(0) @@ -36,59 +46,60 @@ class Ui_MainWindow(object): self.playersTable.setHorizontalHeaderItem(2, item) item = QtWidgets.QTableWidgetItem() self.playersTable.setHorizontalHeaderItem(3, item) - self.addPlayerBtn = QtWidgets.QPushButton(parent=self.playersTab) - self.addPlayerBtn.setGeometry(QtCore.QRect(20, 20, 75, 23)) - self.addPlayerBtn.setObjectName("addPlayerBtn") + self.gridLayout.addWidget(self.playersTable, 1, 0, 1, 1) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/users.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.tabWidget.addTab(self.playersTab, icon1, "") self.warsTab = QtWidgets.QWidget() self.warsTab.setObjectName("warsTab") - self.warsTree = QtWidgets.QTreeWidget(parent=self.warsTab) - self.warsTree.setGeometry(QtCore.QRect(10, 60, 211, 431)) - self.warsTree.setObjectName("warsTree") + self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.warsTab) + self.verticalLayout_3.setObjectName("verticalLayout_3") + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.addWarBtn = QtWidgets.QPushButton(parent=self.warsTab) - self.addWarBtn.setGeometry(QtCore.QRect(20, 20, 75, 23)) self.addWarBtn.setObjectName("addWarBtn") + self.horizontalLayout_2.addWidget(self.addWarBtn) self.addCampaignBtn = QtWidgets.QPushButton(parent=self.warsTab) self.addCampaignBtn.setEnabled(False) - self.addCampaignBtn.setGeometry(QtCore.QRect(110, 20, 91, 23)) self.addCampaignBtn.setObjectName("addCampaignBtn") + self.horizontalLayout_2.addWidget(self.addCampaignBtn) self.addRoundBtn = QtWidgets.QPushButton(parent=self.warsTab) self.addRoundBtn.setEnabled(False) - self.addRoundBtn.setGeometry(QtCore.QRect(220, 20, 91, 23)) self.addRoundBtn.setObjectName("addRoundBtn") + self.horizontalLayout_2.addWidget(self.addRoundBtn) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_2.addItem(spacerItem1) + self.verticalLayout_3.addLayout(self.horizontalLayout_2) + self.horizontalLayout_6 = QtWidgets.QHBoxLayout() + self.horizontalLayout_6.setObjectName("horizontalLayout_6") + self.warsTree = QtWidgets.QTreeWidget(parent=self.warsTab) + self.warsTree.setObjectName("warsTree") + self.horizontalLayout_6.addWidget(self.warsTree) self.selectedDetailsStack = QtWidgets.QStackedWidget(parent=self.warsTab) - self.selectedDetailsStack.setGeometry(QtCore.QRect(239, 59, 511, 431)) self.selectedDetailsStack.setObjectName("selectedDetailsStack") self.pageEmpty = QtWidgets.QWidget() self.pageEmpty.setObjectName("pageEmpty") + self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.pageEmpty) + self.verticalLayout_4.setObjectName("verticalLayout_4") + self.horizontalLayout_7 = QtWidgets.QHBoxLayout() + self.horizontalLayout_7.setSizeConstraint(QtWidgets.QLayout.SizeConstraint.SetDefaultConstraint) + self.horizontalLayout_7.setObjectName("horizontalLayout_7") + spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_7.addItem(spacerItem2) self.labelSelect = QtWidgets.QLabel(parent=self.pageEmpty) - self.labelSelect.setGeometry(QtCore.QRect(110, 30, 301, 51)) self.labelSelect.setObjectName("labelSelect") + self.horizontalLayout_7.addWidget(self.labelSelect) + spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_7.addItem(spacerItem3) + self.verticalLayout_4.addLayout(self.horizontalLayout_7) self.selectedDetailsStack.addWidget(self.pageEmpty) self.pageWar = QtWidgets.QWidget() self.pageWar.setObjectName("pageWar") - self.warName = QtWidgets.QLabel(parent=self.pageWar) - self.warName.setGeometry(QtCore.QRect(10, 10, 241, 16)) - font = QtGui.QFont() - font.setPointSize(12) - self.warName.setFont(font) - self.warName.setObjectName("warName") - self.warYear = QtWidgets.QLabel(parent=self.pageWar) - self.warYear.setGeometry(QtCore.QRect(280, 10, 71, 16)) - font = QtGui.QFont() - font.setPointSize(12) - self.warYear.setFont(font) - self.warYear.setObjectName("warYear") - self.labelParticipants = QtWidgets.QLabel(parent=self.pageWar) - self.labelParticipants.setGeometry(QtCore.QRect(10, 150, 111, 16)) - self.labelParticipants.setObjectName("labelParticipants") - self.addWarParticipantBtn = QtWidgets.QPushButton(parent=self.pageWar) - self.addWarParticipantBtn.setGeometry(QtCore.QRect(420, 270, 81, 23)) - self.addWarParticipantBtn.setObjectName("addWarParticipantBtn") + self.gridLayout_3 = QtWidgets.QGridLayout(self.pageWar) + self.gridLayout_3.setObjectName("gridLayout_3") + self.horizontalLayout_10 = QtWidgets.QHBoxLayout() + self.horizontalLayout_10.setObjectName("horizontalLayout_10") self.warParticipantsTable = QtWidgets.QTableWidget(parent=self.pageWar) - self.warParticipantsTable.setGeometry(QtCore.QRect(10, 170, 401, 211)) self.warParticipantsTable.setObjectName("warParticipantsTable") self.warParticipantsTable.setColumnCount(5) self.warParticipantsTable.setRowCount(0) @@ -102,12 +113,14 @@ class Ui_MainWindow(object): self.warParticipantsTable.setHorizontalHeaderItem(3, item) item = QtWidgets.QTableWidgetItem() self.warParticipantsTable.setHorizontalHeaderItem(4, item) - self.endWarBtn = QtWidgets.QPushButton(parent=self.pageWar) - self.endWarBtn.setEnabled(True) - self.endWarBtn.setGeometry(QtCore.QRect(230, 400, 61, 23)) - self.endWarBtn.setObjectName("endWarBtn") + self.horizontalLayout_10.addWidget(self.warParticipantsTable) + self.addWarParticipantBtn = QtWidgets.QPushButton(parent=self.pageWar) + self.addWarParticipantBtn.setObjectName("addWarParticipantBtn") + self.horizontalLayout_10.addWidget(self.addWarParticipantBtn) + self.gridLayout_3.addLayout(self.horizontalLayout_10, 4, 0, 1, 4) + self.horizontalLayout_9 = QtWidgets.QHBoxLayout() + self.horizontalLayout_9.setObjectName("horizontalLayout_9") self.objectivesTable = QtWidgets.QTableWidget(parent=self.pageWar) - self.objectivesTable.setGeometry(QtCore.QRect(10, 60, 401, 71)) self.objectivesTable.setObjectName("objectivesTable") self.objectivesTable.setColumnCount(2) self.objectivesTable.setRowCount(0) @@ -115,57 +128,62 @@ class Ui_MainWindow(object): self.objectivesTable.setHorizontalHeaderItem(0, item) item = QtWidgets.QTableWidgetItem() self.objectivesTable.setHorizontalHeaderItem(1, item) - self.labelObjectives = QtWidgets.QLabel(parent=self.pageWar) - self.labelObjectives.setGeometry(QtCore.QRect(10, 40, 111, 20)) - self.labelObjectives.setObjectName("labelObjectives") + self.horizontalLayout_9.addWidget(self.objectivesTable) self.addObjectiveBtn = QtWidgets.QPushButton(parent=self.pageWar) self.addObjectiveBtn.setEnabled(True) - self.addObjectiveBtn.setGeometry(QtCore.QRect(420, 80, 91, 23)) font = QtGui.QFont() font.setPointSize(10) self.addObjectiveBtn.setFont(font) self.addObjectiveBtn.setObjectName("addObjectiveBtn") + self.horizontalLayout_9.addWidget(self.addObjectiveBtn) + self.gridLayout_3.addLayout(self.horizontalLayout_9, 2, 0, 1, 4) + spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.gridLayout_3.addItem(spacerItem4, 5, 3, 1, 1) + self.endWarBtn = QtWidgets.QPushButton(parent=self.pageWar) + self.endWarBtn.setEnabled(True) + self.endWarBtn.setObjectName("endWarBtn") + self.gridLayout_3.addWidget(self.endWarBtn, 5, 1, 1, 1) + self.labelParticipants = QtWidgets.QLabel(parent=self.pageWar) + self.labelParticipants.setObjectName("labelParticipants") + self.gridLayout_3.addWidget(self.labelParticipants, 3, 0, 1, 1) + self.labelObjectives = QtWidgets.QLabel(parent=self.pageWar) + self.labelObjectives.setObjectName("labelObjectives") + self.gridLayout_3.addWidget(self.labelObjectives, 1, 0, 1, 1) + self.horizontalLayout_8 = QtWidgets.QHBoxLayout() + self.horizontalLayout_8.setObjectName("horizontalLayout_8") + self.warName = QtWidgets.QLabel(parent=self.pageWar) + font = QtGui.QFont() + font.setPointSize(12) + self.warName.setFont(font) + self.warName.setObjectName("warName") + self.horizontalLayout_8.addWidget(self.warName) + self.warYear = QtWidgets.QLabel(parent=self.pageWar) + font = QtGui.QFont() + font.setPointSize(12) + self.warYear.setFont(font) + self.warYear.setObjectName("warYear") + self.horizontalLayout_8.addWidget(self.warYear) + self.gridLayout_3.addLayout(self.horizontalLayout_8, 0, 0, 1, 4) self.selectedDetailsStack.addWidget(self.pageWar) self.pageCampaign = QtWidgets.QWidget() self.pageCampaign.setObjectName("pageCampaign") - self.campaignName = QtWidgets.QLabel(parent=self.pageCampaign) - self.campaignName.setGeometry(QtCore.QRect(10, 10, 241, 16)) - font = QtGui.QFont() - font.setPointSize(12) - self.campaignName.setFont(font) - self.campaignName.setObjectName("campaignName") + self.gridLayout_4 = QtWidgets.QGridLayout(self.pageCampaign) + self.gridLayout_4.setObjectName("gridLayout_4") self.labelSectors = QtWidgets.QLabel(parent=self.pageCampaign) - self.labelSectors.setGeometry(QtCore.QRect(10, 40, 91, 16)) self.labelSectors.setObjectName("labelSectors") - self.addCampaignParticipantBtn = QtWidgets.QPushButton(parent=self.pageCampaign) - self.addCampaignParticipantBtn.setGeometry(QtCore.QRect(420, 270, 75, 23)) - self.addCampaignParticipantBtn.setObjectName("addCampaignParticipantBtn") - self.campaignMonth = QtWidgets.QLabel(parent=self.pageCampaign) - self.campaignMonth.setGeometry(QtCore.QRect(280, 10, 121, 16)) - font = QtGui.QFont() - font.setPointSize(12) - self.campaignMonth.setFont(font) - self.campaignMonth.setObjectName("campaignMonth") + self.gridLayout_4.addWidget(self.labelSectors, 1, 0, 1, 1) self.labelParticipants_2 = QtWidgets.QLabel(parent=self.pageCampaign) - self.labelParticipants_2.setGeometry(QtCore.QRect(10, 180, 61, 16)) self.labelParticipants_2.setObjectName("labelParticipants_2") - self.campaignParticipantsTable = QtWidgets.QTableWidget(parent=self.pageCampaign) - self.campaignParticipantsTable.setGeometry(QtCore.QRect(10, 200, 401, 181)) - self.campaignParticipantsTable.setObjectName("campaignParticipantsTable") - self.campaignParticipantsTable.setColumnCount(5) - self.campaignParticipantsTable.setRowCount(0) - item = QtWidgets.QTableWidgetItem() - self.campaignParticipantsTable.setHorizontalHeaderItem(0, item) - item = QtWidgets.QTableWidgetItem() - self.campaignParticipantsTable.setHorizontalHeaderItem(1, item) - item = QtWidgets.QTableWidgetItem() - self.campaignParticipantsTable.setHorizontalHeaderItem(2, item) - item = QtWidgets.QTableWidgetItem() - self.campaignParticipantsTable.setHorizontalHeaderItem(3, item) - item = QtWidgets.QTableWidgetItem() - self.campaignParticipantsTable.setHorizontalHeaderItem(4, item) + self.gridLayout_4.addWidget(self.labelParticipants_2, 3, 0, 1, 1) + self.endCampaignBtn = QtWidgets.QPushButton(parent=self.pageCampaign) + self.endCampaignBtn.setEnabled(True) + self.endCampaignBtn.setObjectName("endCampaignBtn") + self.gridLayout_4.addWidget(self.endCampaignBtn, 5, 1, 1, 1) + spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.gridLayout_4.addItem(spacerItem5, 5, 2, 1, 1) + self.horizontalLayout_12 = QtWidgets.QHBoxLayout() + self.horizontalLayout_12.setObjectName("horizontalLayout_12") self.sectorsTable = QtWidgets.QTableWidget(parent=self.pageCampaign) - self.sectorsTable.setGeometry(QtCore.QRect(10, 60, 401, 101)) self.sectorsTable.setObjectName("sectorsTable") self.sectorsTable.setColumnCount(5) self.sectorsTable.setRowCount(0) @@ -179,43 +197,68 @@ class Ui_MainWindow(object): self.sectorsTable.setHorizontalHeaderItem(3, item) item = QtWidgets.QTableWidgetItem() self.sectorsTable.setHorizontalHeaderItem(4, item) + self.horizontalLayout_12.addWidget(self.sectorsTable) self.addSectorBtn = QtWidgets.QPushButton(parent=self.pageCampaign) self.addSectorBtn.setEnabled(True) - self.addSectorBtn.setGeometry(QtCore.QRect(420, 110, 71, 23)) self.addSectorBtn.setObjectName("addSectorBtn") - self.endCampaignBtn = QtWidgets.QPushButton(parent=self.pageCampaign) - self.endCampaignBtn.setEnabled(True) - self.endCampaignBtn.setGeometry(QtCore.QRect(210, 400, 91, 23)) - self.endCampaignBtn.setObjectName("endCampaignBtn") + self.horizontalLayout_12.addWidget(self.addSectorBtn) + self.gridLayout_4.addLayout(self.horizontalLayout_12, 4, 0, 1, 3) + self.horizontalLayout_13 = QtWidgets.QHBoxLayout() + self.horizontalLayout_13.setObjectName("horizontalLayout_13") + self.campaignParticipantsTable = QtWidgets.QTableWidget(parent=self.pageCampaign) + self.campaignParticipantsTable.setObjectName("campaignParticipantsTable") + self.campaignParticipantsTable.setColumnCount(5) + self.campaignParticipantsTable.setRowCount(0) + item = QtWidgets.QTableWidgetItem() + self.campaignParticipantsTable.setHorizontalHeaderItem(0, item) + item = QtWidgets.QTableWidgetItem() + self.campaignParticipantsTable.setHorizontalHeaderItem(1, item) + item = QtWidgets.QTableWidgetItem() + self.campaignParticipantsTable.setHorizontalHeaderItem(2, item) + item = QtWidgets.QTableWidgetItem() + self.campaignParticipantsTable.setHorizontalHeaderItem(3, item) + item = QtWidgets.QTableWidgetItem() + self.campaignParticipantsTable.setHorizontalHeaderItem(4, item) + self.horizontalLayout_13.addWidget(self.campaignParticipantsTable) + self.addCampaignParticipantBtn = QtWidgets.QPushButton(parent=self.pageCampaign) + self.addCampaignParticipantBtn.setObjectName("addCampaignParticipantBtn") + self.horizontalLayout_13.addWidget(self.addCampaignParticipantBtn) + self.gridLayout_4.addLayout(self.horizontalLayout_13, 2, 0, 1, 3) + self.horizontalLayout_11 = QtWidgets.QHBoxLayout() + self.horizontalLayout_11.setObjectName("horizontalLayout_11") + self.campaignName = QtWidgets.QLabel(parent=self.pageCampaign) + font = QtGui.QFont() + font.setPointSize(12) + self.campaignName.setFont(font) + self.campaignName.setObjectName("campaignName") + self.horizontalLayout_11.addWidget(self.campaignName) + self.campaignMonth = QtWidgets.QLabel(parent=self.pageCampaign) + font = QtGui.QFont() + font.setPointSize(12) + self.campaignMonth.setFont(font) + self.campaignMonth.setObjectName("campaignMonth") + self.horizontalLayout_11.addWidget(self.campaignMonth) + self.gridLayout_4.addLayout(self.horizontalLayout_11, 0, 0, 1, 3) self.selectedDetailsStack.addWidget(self.pageCampaign) self.pageRound = QtWidgets.QWidget() self.pageRound.setObjectName("pageRound") + self.gridLayout_5 = QtWidgets.QGridLayout(self.pageRound) + self.gridLayout_5.setObjectName("gridLayout_5") self.labelChoices = QtWidgets.QLabel(parent=self.pageRound) - self.labelChoices.setGeometry(QtCore.QRect(10, 40, 91, 16)) self.labelChoices.setObjectName("labelChoices") - self.choicesTable = QtWidgets.QTableWidget(parent=self.pageRound) - self.choicesTable.setGeometry(QtCore.QRect(10, 60, 301, 141)) - self.choicesTable.setObjectName("choicesTable") - self.choicesTable.setColumnCount(3) - self.choicesTable.setRowCount(0) - item = QtWidgets.QTableWidgetItem() - self.choicesTable.setHorizontalHeaderItem(0, item) - item = QtWidgets.QTableWidgetItem() - self.choicesTable.setHorizontalHeaderItem(1, item) - item = QtWidgets.QTableWidgetItem() - self.choicesTable.setHorizontalHeaderItem(2, item) - self.roundNb = QtWidgets.QLabel(parent=self.pageRound) - self.roundNb.setGeometry(QtCore.QRect(10, 10, 241, 16)) - font = QtGui.QFont() - font.setPointSize(12) - self.roundNb.setFont(font) - self.roundNb.setObjectName("roundNb") - self.resolvePairingBtn = QtWidgets.QPushButton(parent=self.pageRound) - self.resolvePairingBtn.setEnabled(True) - self.resolvePairingBtn.setGeometry(QtCore.QRect(320, 110, 91, 23)) - self.resolvePairingBtn.setObjectName("resolvePairingBtn") + self.gridLayout_5.addWidget(self.labelChoices, 1, 0, 1, 1) + self.labelBattles = QtWidgets.QLabel(parent=self.pageRound) + self.labelBattles.setObjectName("labelBattles") + self.gridLayout_5.addWidget(self.labelBattles, 3, 0, 1, 1) + self.endRoundBtn = QtWidgets.QPushButton(parent=self.pageRound) + self.endRoundBtn.setEnabled(True) + self.endRoundBtn.setObjectName("endRoundBtn") + self.gridLayout_5.addWidget(self.endRoundBtn, 5, 1, 1, 1) + spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.gridLayout_5.addItem(spacerItem6, 5, 2, 1, 1) + self.horizontalLayout_15 = QtWidgets.QHBoxLayout() + self.horizontalLayout_15.setObjectName("horizontalLayout_15") self.battlesTable = QtWidgets.QTableWidget(parent=self.pageRound) - self.battlesTable.setGeometry(QtCore.QRect(10, 240, 301, 111)) self.battlesTable.setObjectName("battlesTable") self.battlesTable.setColumnCount(3) self.battlesTable.setRowCount(0) @@ -225,24 +268,49 @@ class Ui_MainWindow(object): self.battlesTable.setHorizontalHeaderItem(1, item) item = QtWidgets.QTableWidgetItem() self.battlesTable.setHorizontalHeaderItem(2, item) + self.horizontalLayout_15.addWidget(self.battlesTable) self.enterResultBtn = QtWidgets.QPushButton(parent=self.pageRound) self.enterResultBtn.setEnabled(True) - self.enterResultBtn.setGeometry(QtCore.QRect(320, 290, 91, 23)) self.enterResultBtn.setObjectName("enterResultBtn") - self.endRoundBtn = QtWidgets.QPushButton(parent=self.pageRound) - self.endRoundBtn.setEnabled(True) - self.endRoundBtn.setGeometry(QtCore.QRect(220, 400, 71, 23)) - self.endRoundBtn.setObjectName("endRoundBtn") - self.labelBattles = QtWidgets.QLabel(parent=self.pageRound) - self.labelBattles.setGeometry(QtCore.QRect(10, 220, 91, 16)) - self.labelBattles.setObjectName("labelBattles") + self.horizontalLayout_15.addWidget(self.enterResultBtn) + self.gridLayout_5.addLayout(self.horizontalLayout_15, 4, 0, 1, 3) + self.horizontalLayout_16 = QtWidgets.QHBoxLayout() + self.horizontalLayout_16.setObjectName("horizontalLayout_16") + self.choicesTable = QtWidgets.QTableWidget(parent=self.pageRound) + self.choicesTable.setObjectName("choicesTable") + self.choicesTable.setColumnCount(3) + self.choicesTable.setRowCount(0) + item = QtWidgets.QTableWidgetItem() + self.choicesTable.setHorizontalHeaderItem(0, item) + item = QtWidgets.QTableWidgetItem() + self.choicesTable.setHorizontalHeaderItem(1, item) + item = QtWidgets.QTableWidgetItem() + self.choicesTable.setHorizontalHeaderItem(2, item) + self.horizontalLayout_16.addWidget(self.choicesTable) + self.resolvePairingBtn = QtWidgets.QPushButton(parent=self.pageRound) + self.resolvePairingBtn.setEnabled(True) + self.resolvePairingBtn.setObjectName("resolvePairingBtn") + self.horizontalLayout_16.addWidget(self.resolvePairingBtn) + self.gridLayout_5.addLayout(self.horizontalLayout_16, 2, 0, 1, 3) + self.horizontalLayout_14 = QtWidgets.QHBoxLayout() + self.horizontalLayout_14.setObjectName("horizontalLayout_14") + self.roundNb = QtWidgets.QLabel(parent=self.pageRound) + font = QtGui.QFont() + font.setPointSize(12) + self.roundNb.setFont(font) + self.roundNb.setObjectName("roundNb") + self.horizontalLayout_14.addWidget(self.roundNb) + self.gridLayout_5.addLayout(self.horizontalLayout_14, 0, 0, 1, 3) self.selectedDetailsStack.addWidget(self.pageRound) + self.horizontalLayout_6.addWidget(self.selectedDetailsStack) + self.verticalLayout_3.addLayout(self.horizontalLayout_6) icon2 = QtGui.QIcon() icon2.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/swords-small.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.tabWidget.addTab(self.warsTab, icon2, "") + self.verticalLayout.addWidget(self.tabWidget) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(parent=MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 21)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 1288, 31)) self.menubar.setObjectName("menubar") self.menuFile = QtWidgets.QMenu(parent=self.menubar) self.menuFile.setObjectName("menuFile") @@ -317,12 +385,13 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) self.tabWidget.setCurrentIndex(1) - self.selectedDetailsStack.setCurrentIndex(2) + self.selectedDetailsStack.setCurrentIndex(3) QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate MainWindow.setWindowTitle(_translate("MainWindow", "WarChron")) + self.addPlayerBtn.setText(_translate("MainWindow", "Add player")) item = self.playersTable.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Name")) item = self.playersTable.horizontalHeaderItem(1) @@ -331,16 +400,11 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Wins")) item = self.playersTable.horizontalHeaderItem(3) item.setText(_translate("MainWindow", "Rewards")) - self.addPlayerBtn.setText(_translate("MainWindow", "Add player")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.playersTab), _translate("MainWindow", "Players")) self.addWarBtn.setText(_translate("MainWindow", "Add war")) self.addCampaignBtn.setText(_translate("MainWindow", "Add Campaign")) self.addRoundBtn.setText(_translate("MainWindow", "Add Round")) self.labelSelect.setText(_translate("MainWindow", "Select an element within the tree to show/edit details.")) - self.warName.setText(_translate("MainWindow", "warName")) - self.warYear.setText(_translate("MainWindow", "warYear")) - self.labelParticipants.setText(_translate("MainWindow", "Participants")) - self.addWarParticipantBtn.setText(_translate("MainWindow", "Add participant")) item = self.warParticipantsTable.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Name")) item = self.warParticipantsTable.horizontalHeaderItem(1) @@ -351,28 +415,20 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Victory pts.")) item = self.warParticipantsTable.horizontalHeaderItem(4) item.setText(_translate("MainWindow", "Theme pts")) - self.endWarBtn.setText(_translate("MainWindow", "End war")) + self.addWarParticipantBtn.setText(_translate("MainWindow", "Add participant")) item = self.objectivesTable.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Name")) item = self.objectivesTable.horizontalHeaderItem(1) item.setText(_translate("MainWindow", "Description")) - self.labelObjectives.setText(_translate("MainWindow", "Objectives")) self.addObjectiveBtn.setText(_translate("MainWindow", "Add objective")) - self.campaignName.setText(_translate("MainWindow", "campaignName")) + self.endWarBtn.setText(_translate("MainWindow", "End war")) + self.labelParticipants.setText(_translate("MainWindow", "Participants")) + self.labelObjectives.setText(_translate("MainWindow", "Objectives")) + self.warName.setText(_translate("MainWindow", "warName")) + self.warYear.setText(_translate("MainWindow", "warYear")) self.labelSectors.setText(_translate("MainWindow", "Sectors")) - self.addCampaignParticipantBtn.setText(_translate("MainWindow", "Add participant")) - self.campaignMonth.setText(_translate("MainWindow", "campaignMonth")) self.labelParticipants_2.setText(_translate("MainWindow", "Participants")) - item = self.campaignParticipantsTable.horizontalHeaderItem(0) - item.setText(_translate("MainWindow", "Name")) - item = self.campaignParticipantsTable.horizontalHeaderItem(1) - item.setText(_translate("MainWindow", "Leader")) - item = self.campaignParticipantsTable.horizontalHeaderItem(2) - item.setText(_translate("MainWindow", "Theme")) - item = self.campaignParticipantsTable.horizontalHeaderItem(3) - item.setText(_translate("MainWindow", "Victory pts.")) - item = self.campaignParticipantsTable.horizontalHeaderItem(4) - item.setText(_translate("MainWindow", "Theme pts.")) + self.endCampaignBtn.setText(_translate("MainWindow", "End campaign")) item = self.sectorsTable.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Name")) item = self.sectorsTable.horizontalHeaderItem(1) @@ -384,16 +440,22 @@ class Ui_MainWindow(object): item = self.sectorsTable.horizontalHeaderItem(4) item.setText(_translate("MainWindow", "Influence imp.")) self.addSectorBtn.setText(_translate("MainWindow", "Add Sector")) - self.endCampaignBtn.setText(_translate("MainWindow", "End campaign")) + item = self.campaignParticipantsTable.horizontalHeaderItem(0) + item.setText(_translate("MainWindow", "Name")) + item = self.campaignParticipantsTable.horizontalHeaderItem(1) + item.setText(_translate("MainWindow", "Leader")) + item = self.campaignParticipantsTable.horizontalHeaderItem(2) + item.setText(_translate("MainWindow", "Theme")) + item = self.campaignParticipantsTable.horizontalHeaderItem(3) + item.setText(_translate("MainWindow", "Victory pts.")) + item = self.campaignParticipantsTable.horizontalHeaderItem(4) + item.setText(_translate("MainWindow", "Theme pts.")) + self.addCampaignParticipantBtn.setText(_translate("MainWindow", "Add participant")) + self.campaignName.setText(_translate("MainWindow", "campaignName")) + self.campaignMonth.setText(_translate("MainWindow", "campaignMonth")) self.labelChoices.setText(_translate("MainWindow", "Choices")) - item = self.choicesTable.horizontalHeaderItem(0) - item.setText(_translate("MainWindow", "Player")) - item = self.choicesTable.horizontalHeaderItem(1) - item.setText(_translate("MainWindow", "Prioritary")) - item = self.choicesTable.horizontalHeaderItem(2) - item.setText(_translate("MainWindow", "Secondary")) - self.roundNb.setText(_translate("MainWindow", "Round Nb")) - self.resolvePairingBtn.setText(_translate("MainWindow", "Resolve pairing")) + self.labelBattles.setText(_translate("MainWindow", "Battles")) + self.endRoundBtn.setText(_translate("MainWindow", "End round")) item = self.battlesTable.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Sector")) item = self.battlesTable.horizontalHeaderItem(1) @@ -401,8 +463,14 @@ class Ui_MainWindow(object): item = self.battlesTable.horizontalHeaderItem(2) item.setText(_translate("MainWindow", "Player 2")) self.enterResultBtn.setText(_translate("MainWindow", "Enter results")) - self.endRoundBtn.setText(_translate("MainWindow", "End round")) - self.labelBattles.setText(_translate("MainWindow", "Battles")) + item = self.choicesTable.horizontalHeaderItem(0) + item.setText(_translate("MainWindow", "Player")) + item = self.choicesTable.horizontalHeaderItem(1) + item.setText(_translate("MainWindow", "Prioritary")) + item = self.choicesTable.horizontalHeaderItem(2) + item.setText(_translate("MainWindow", "Secondary")) + self.resolvePairingBtn.setText(_translate("MainWindow", "Resolve pairing")) + self.roundNb.setText(_translate("MainWindow", "Round Nb")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.warsTab), _translate("MainWindow", "Wars")) self.menuFile.setTitle(_translate("MainWindow", "File")) self.menuEdit.setTitle(_translate("MainWindow", "Edit")) diff --git a/src/warchron/view/ui/ui_main_window.ui b/src/warchron/view/ui/ui_main_window.ui index ab0cc4f..5c4df48 100644 --- a/src/warchron/view/ui/ui_main_window.ui +++ b/src/warchron/view/ui/ui_main_window.ui @@ -6,8 +6,8 @@ 0 0 - 914 - 527 + 1288 + 817 @@ -22,7 +22,7 @@ - 0 + 1 @@ -91,586 +91,533 @@ Wars - - - - 10 - 60 - 211 - 431 - - - - - - - - - - - - 20 - 20 - 75 - 23 - - - - Add war - - - - - false - - - - 110 - 20 - 91 - 23 - - - - Add Campaign - - - - - false - - - - 220 - 20 - 91 - 23 - - - - Add Round - - - - - - 239 - 59 - 511 - 431 - - - - 2 - - - - - - 110 - 30 - 301 - 51 - - - - Select an element within the tree to show/edit details. - - - - - - - - 10 - 10 - 241 - 16 - - - - - 12 - - - - warName - - - - - - 280 - 10 - 71 - 16 - - - - - 12 - - - - warYear - - - - - - 10 - 150 - 111 - 16 - - - - Participants - - - - - - 420 - 270 - 81 - 23 - - - - Add participant - - - - - - 10 - 170 - 401 - 211 - - - - - Name - - - - - Faction - - - - - Campaigns - - - - - Victory pts. - - - - - Theme pts - - - - - - true - - - - 230 - 400 - 61 - 23 - - - - End war - - - - - - 10 - 60 - 401 - 71 - - - - - Name - - - - - Description - - - - - - - 10 - 40 - 111 - 20 - - - - Objectives - - - - - true - - - - 420 - 80 - 91 - 23 - - - - - 10 - - - - Add objective - - - - - - - - 10 - 10 - 241 - 16 - - - - - 12 - - - - campaignName - - - - - - 10 - 40 - 91 - 16 - - - - Sectors - - - - - - 420 - 270 - 75 - 23 - - - - Add participant - - - - - - 280 - 10 - 121 - 16 - - - - - 12 - - - - campaignMonth - - - - - - 10 - 180 - 61 - 16 - - - - Participants - - - - - - 10 - 200 - 401 - 181 - - - - - Name - - - - - Leader - - - - - Theme - - - - - Victory pts. - - - - - Theme pts. - - - - - - - 10 - 60 - 401 - 101 - - - - - Name - - - - - Round - - - - - Major obj. - - - - - Minor opp. - - - - - Influence imp. - - - - - - true - - - - 420 - 110 - 71 - 23 - - - - Add Sector - - - - - true - - - - 210 - 400 - 91 - 23 - - - - End campaign - - - - - - - - 10 - 40 - 91 - 16 - - - - Choices - - - - - - 10 - 60 - 301 - 141 - - - - - Player - - - - - Prioritary - - - - - Secondary - - - - - - - 10 - 10 - 241 - 16 - - - - - 12 - - - - Round Nb - - - - - true - - - - 320 - 110 - 91 - 23 - - - - Resolve pairing - - - - - - 10 - 240 - 301 - 111 - - - - - Sector - - - - - Player 1 - - - - - Player 2 - - - - - - true - - - - 320 - 290 - 91 - 23 - - - - Enter results - - - - - true - - - - 220 - 400 - 71 - 23 - - - - End round - - - - - - 10 - 220 - 91 - 16 - - - - Battles - - - - + + + + + + + Add war + + + + + + + false + + + Add Campaign + + + + + + + false + + + Add Round + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + + + + + 3 + + + + + + + QLayout::SetDefaultConstraint + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Select an element within the tree to show/edit details. + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + Name + + + + + Faction + + + + + Campaigns + + + + + Victory pts. + + + + + Theme pts + + + + + + + + Add participant + + + + + + + + + + + + Name + + + + + Description + + + + + + + + true + + + + 10 + + + + Add objective + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true + + + End war + + + + + + + Participants + + + + + + + Objectives + + + + + + + + + + 12 + + + + warName + + + + + + + + 12 + + + + warYear + + + + + + + + + + + + + Sectors + + + + + + + Participants + + + + + + + true + + + End campaign + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Name + + + + + Round + + + + + Major obj. + + + + + Minor opp. + + + + + Influence imp. + + + + + + + + true + + + Add Sector + + + + + + + + + + + + Name + + + + + Leader + + + + + Theme + + + + + Victory pts. + + + + + Theme pts. + + + + + + + + Add participant + + + + + + + + + + + + 12 + + + + campaignName + + + + + + + + 12 + + + + campaignMonth + + + + + + + + + + + + + Choices + + + + + + + Battles + + + + + + + true + + + End round + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Sector + + + + + Player 1 + + + + + Player 2 + + + + + + + + true + + + Enter results + + + + + + + + + + + + Player + + + + + Prioritary + + + + + Secondary + + + + + + + + true + + + Resolve pairing + + + + + + + + + + + + 12 + + + + Round Nb + + + + + + + + + + + + @@ -681,7 +628,7 @@ 0 0 - 914 + 1288 31