diff --git a/src/warchron/constants.py b/src/warchron/constants.py
index ead7600..8da62f9 100644
--- a/src/warchron/constants.py
+++ b/src/warchron/constants.py
@@ -38,7 +38,8 @@ class IconName(str, Enum):
DONE = "done"
WIN = "win"
PLAYERS = "players"
- WARCHRON = "warchron"
+ WARCHRONICO = "warchron_icon"
+ WARCHRONBACK = "warchron_background"
TOKEN = "token"
TOKENS = "tokens"
VP1ST = "vp1st"
@@ -98,7 +99,7 @@ class Icons:
IconName.DONE: "tick.png",
IconName.WIN: "trophy.png",
IconName.PLAYERS: "users.png",
- IconName.WARCHRON: "warchron_logo_background.png",
+ IconName.WARCHRONICO: "warchron_icon.png",
IconName.TOKEN: "point.png",
IconName.TOKENS: "points.png",
IconName.VP1ST: "trophy.png",
@@ -108,6 +109,7 @@ class Icons:
IconName.NP1ST: "medal.png",
IconName.NP2ND: "medal-silver.png",
IconName.NP3RD: "medal-bronze.png",
+ IconName.WARCHRONBACK: "warchron_background.png",
}
@classmethod
diff --git a/src/warchron/view/battle_dialog.py b/src/warchron/view/battle_dialog.py
index 8dd4637..75e79bf 100644
--- a/src/warchron/view/battle_dialog.py
+++ b/src/warchron/view/battle_dialog.py
@@ -46,7 +46,7 @@ class BattleDialog(QDialog):
self.ui.score.setText(default_score)
self.ui.victoryCondition.setText(default_victory_condition)
self.ui.battleComment.setPlainText(default_comment)
- self.setWindowIcon(Icons.get(IconName.WARCHRON))
+ self.setWindowIcon(Icons.get(IconName.WARCHRONICO))
def get_sector_id(self) -> str:
return cast(str, self.ui.sectorComboBox.currentData())
diff --git a/src/warchron/view/campaign_dialog.py b/src/warchron/view/campaign_dialog.py
index 4d19265..6d2f295 100644
--- a/src/warchron/view/campaign_dialog.py
+++ b/src/warchron/view/campaign_dialog.py
@@ -17,7 +17,7 @@ class CampaignDialog(QDialog):
self.ui.campaignName.setText(default_name)
if default_month is not None:
self.ui.campaignMonth.setValue(default_month)
- self.setWindowIcon(Icons.get(IconName.WARCHRON))
+ self.setWindowIcon(Icons.get(IconName.WARCHRONICO))
def get_campaign_name(self) -> str:
return self.ui.campaignName.text().strip()
diff --git a/src/warchron/view/campaign_participant_dialog.py b/src/warchron/view/campaign_participant_dialog.py
index 37a4ea2..a6624b2 100644
--- a/src/warchron/view/campaign_participant_dialog.py
+++ b/src/warchron/view/campaign_participant_dialog.py
@@ -30,7 +30,7 @@ class CampaignParticipantDialog(QDialog):
self.ui.playerComboBox.setEnabled(editable_player)
self.ui.leader.setText(default_leader)
self.ui.theme.setText(default_theme)
- self.setWindowIcon(Icons.get(IconName.WARCHRON))
+ self.setWindowIcon(Icons.get(IconName.WARCHRONICO))
def get_player_id(self) -> str:
return cast(str, self.ui.playerComboBox.currentData())
diff --git a/src/warchron/view/choice_dialog.py b/src/warchron/view/choice_dialog.py
index 0e4c429..f0ecde7 100644
--- a/src/warchron/view/choice_dialog.py
+++ b/src/warchron/view/choice_dialog.py
@@ -35,7 +35,7 @@ class ChoiceDialog(QDialog):
select_if_exists(self.ui.priorityComboBox, default_priority_id)
select_if_exists(self.ui.secondaryComboBox, default_secondary_id)
self.ui.choiceComment.setPlainText(default_comment)
- self.setWindowIcon(Icons.get(IconName.WARCHRON))
+ self.setWindowIcon(Icons.get(IconName.WARCHRONICO))
def get_participant_id(self) -> str:
return cast(str, self.ui.playerComboBox.currentData())
diff --git a/src/warchron/view/objective_dialog.py b/src/warchron/view/objective_dialog.py
index b8765a0..0cbb53e 100644
--- a/src/warchron/view/objective_dialog.py
+++ b/src/warchron/view/objective_dialog.py
@@ -17,7 +17,7 @@ class ObjectiveDialog(QDialog):
self.ui.setupUi(self) # type: ignore
self.ui.objectiveName.setText(default_name)
self.ui.objectiveDescription.setPlainText(default_description)
- self.setWindowIcon(Icons.get(IconName.WARCHRON))
+ self.setWindowIcon(Icons.get(IconName.WARCHRONICO))
def get_objective_name(self) -> str:
return self.ui.objectiveName.text().strip()
diff --git a/src/warchron/view/player_dialog.py b/src/warchron/view/player_dialog.py
index 0fc7d5c..6bdc733 100644
--- a/src/warchron/view/player_dialog.py
+++ b/src/warchron/view/player_dialog.py
@@ -12,7 +12,7 @@ class PlayerDialog(QDialog):
self.ui: Ui_playerDialog = Ui_playerDialog()
self.ui.setupUi(self) # type: ignore
self.ui.playerName.setText(default_name)
- self.setWindowIcon(Icons.get(IconName.WARCHRON))
+ self.setWindowIcon(Icons.get(IconName.WARCHRONICO))
def get_player_name(self) -> str:
return self.ui.playerName.text().strip()
diff --git a/src/warchron/view/resources/warchron_logo.png b/src/warchron/view/resources/warchron_background.png.png
similarity index 100%
rename from src/warchron/view/resources/warchron_logo.png
rename to src/warchron/view/resources/warchron_background.png.png
diff --git a/src/warchron/view/resources/warchron_logo_background.png b/src/warchron/view/resources/warchron_icon.png.png
similarity index 100%
rename from src/warchron/view/resources/warchron_logo_background.png
rename to src/warchron/view/resources/warchron_icon.png.png
diff --git a/src/warchron/view/sector_dialog.py b/src/warchron/view/sector_dialog.py
index a930e5c..59da94c 100644
--- a/src/warchron/view/sector_dialog.py
+++ b/src/warchron/view/sector_dialog.py
@@ -43,7 +43,7 @@ class SectorDialog(QDialog):
select_if_exists(self.ui.influenceComboBox, default_influence_id)
self.ui.sectorMission.setText(default_mission)
self.ui.sectorDescription.setPlainText(default_description)
- self.setWindowIcon(Icons.get(IconName.WARCHRON))
+ self.setWindowIcon(Icons.get(IconName.WARCHRONICO))
def get_sector_name(self) -> str:
return self.ui.sectorName.text().strip()
diff --git a/src/warchron/view/tie_dialog.py b/src/warchron/view/tie_dialog.py
index 2e75e48..971a5ec 100644
--- a/src/warchron/view/tie_dialog.py
+++ b/src/warchron/view/tie_dialog.py
@@ -32,7 +32,7 @@ class TieDialog(QDialog):
self._checkboxes: Dict[str, QCheckBox] = {}
self.ui: Ui_tieDialog = Ui_tieDialog()
self.ui.setupUi(self) # type: ignore
- self.setWindowIcon(Icons.get(IconName.WARCHRON))
+ self.setWindowIcon(Icons.get(IconName.WARCHRONICO))
self.ui.tieContext.setText(self._get_context_title(context_type))
grid = self.ui.playersGridLayout
icon_path = (RESOURCES_DIR / Icons._paths[IconName.TOKENS]).as_posix()
diff --git a/src/warchron/view/ui/ui_main_window.py b/src/warchron/view/ui/ui_main_window.py
index 9fe6722..227d449 100644
--- a/src/warchron/view/ui/ui_main_window.py
+++ b/src/warchron/view/ui/ui_main_window.py
@@ -12,14 +12,14 @@ from PyQt6 import QtCore, QtGui, QtWidgets
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
- MainWindow.resize(1235, 954)
+ MainWindow.resize(849, 788)
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_9 = QtWidgets.QVBoxLayout(self.centralwidget)
- self.verticalLayout_9.setObjectName("verticalLayout_9")
+ self.gridLayout_2 = QtWidgets.QGridLayout(self.centralwidget)
+ self.gridLayout_2.setObjectName("gridLayout_2")
self.tabWidget = QtWidgets.QTabWidget(parent=self.centralwidget)
self.tabWidget.setObjectName("tabWidget")
self.playersTab = QtWidgets.QWidget()
@@ -81,19 +81,27 @@ class Ui_MainWindow(object):
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.gridLayout_3 = QtWidgets.QGridLayout(self.pageEmpty)
+ self.gridLayout_3.setObjectName("gridLayout_3")
self.labelSelect = QtWidgets.QLabel(parent=self.pageEmpty)
+ font = QtGui.QFont()
+ font.setPointSize(12)
+ self.labelSelect.setFont(font)
+ self.labelSelect.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
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.gridLayout_3.addWidget(self.labelSelect, 0, 0, 1, 1)
+ self.backgroundImage = QtWidgets.QLabel(parent=self.pageEmpty)
+ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ sizePolicy.setHeightForWidth(self.backgroundImage.sizePolicy().hasHeightForWidth())
+ self.backgroundImage.setSizePolicy(sizePolicy)
+ font = QtGui.QFont()
+ font.setPointSize(11)
+ self.backgroundImage.setFont(font)
+ self.backgroundImage.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
+ self.backgroundImage.setObjectName("backgroundImage")
+ self.gridLayout_3.addWidget(self.backgroundImage, 0, 0, 1, 1)
self.selectedDetailsStack.addWidget(self.pageEmpty)
self.pageWar = QtWidgets.QWidget()
self.pageWar.setObjectName("pageWar")
@@ -107,8 +115,8 @@ class Ui_MainWindow(object):
self.warName.setFont(font)
self.warName.setObjectName("warName")
self.horizontalLayout_8.addWidget(self.warName)
- spacerItem4 = QtWidgets.QSpacerItem(630, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_8.addItem(spacerItem4)
+ spacerItem2 = QtWidgets.QSpacerItem(630, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_8.addItem(spacerItem2)
self.warYear = QtWidgets.QLabel(parent=self.pageWar)
font = QtGui.QFont()
font.setPointSize(12)
@@ -129,8 +137,8 @@ class Ui_MainWindow(object):
self.addObjectiveBtn.setEnabled(True)
self.addObjectiveBtn.setObjectName("addObjectiveBtn")
self.horizontalLayout_3.addWidget(self.addObjectiveBtn)
- spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_3.addItem(spacerItem5)
+ spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_3.addItem(spacerItem3)
self.label = QtWidgets.QLabel(parent=self.groupBox)
self.label.setObjectName("label")
self.horizontalLayout_3.addWidget(self.label)
@@ -141,8 +149,8 @@ class Ui_MainWindow(object):
self.label_5 = QtWidgets.QLabel(parent=self.groupBox)
self.label_5.setObjectName("label_5")
self.horizontalLayout_3.addWidget(self.label_5)
- spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_3.addItem(spacerItem6)
+ spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_3.addItem(spacerItem4)
self.label_2 = QtWidgets.QLabel(parent=self.groupBox)
self.label_2.setObjectName("label_2")
self.horizontalLayout_3.addWidget(self.label_2)
@@ -153,8 +161,8 @@ class Ui_MainWindow(object):
self.label_4 = QtWidgets.QLabel(parent=self.groupBox)
self.label_4.setObjectName("label_4")
self.horizontalLayout_3.addWidget(self.label_4)
- spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_3.addItem(spacerItem7)
+ spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_3.addItem(spacerItem5)
self.label_3 = QtWidgets.QLabel(parent=self.groupBox)
self.label_3.setObjectName("label_3")
self.horizontalLayout_3.addWidget(self.label_3)
@@ -164,8 +172,8 @@ class Ui_MainWindow(object):
self.influenceToken.setChecked(True)
self.influenceToken.setObjectName("influenceToken")
self.horizontalLayout_3.addWidget(self.influenceToken)
- spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_3.addItem(spacerItem8)
+ spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_3.addItem(spacerItem6)
self.verticalLayout.addLayout(self.horizontalLayout_3)
self.objectivesTable = QtWidgets.QTableWidget(parent=self.groupBox)
self.objectivesTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
@@ -193,8 +201,8 @@ class Ui_MainWindow(object):
self.addWarParticipantBtn = QtWidgets.QPushButton(parent=self.groupBox_2)
self.addWarParticipantBtn.setObjectName("addWarParticipantBtn")
self.horizontalLayout_5.addWidget(self.addWarParticipantBtn)
- spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_5.addItem(spacerItem9)
+ spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_5.addItem(spacerItem7)
self.verticalLayout_2.addLayout(self.horizontalLayout_5)
self.warParticipantsTable = QtWidgets.QTableWidget(parent=self.groupBox_2)
self.warParticipantsTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
@@ -218,8 +226,8 @@ class Ui_MainWindow(object):
self.verticalLayout_10.addWidget(self.groupBox_2)
self.horizontalLayout_6 = QtWidgets.QHBoxLayout()
self.horizontalLayout_6.setObjectName("horizontalLayout_6")
- spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_6.addItem(spacerItem10)
+ spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_6.addItem(spacerItem8)
self.endWarBtn = QtWidgets.QPushButton(parent=self.pageWar)
self.endWarBtn.setEnabled(True)
self.endWarBtn.setObjectName("endWarBtn")
@@ -238,8 +246,8 @@ class Ui_MainWindow(object):
self.campaignName.setFont(font)
self.campaignName.setObjectName("campaignName")
self.horizontalLayout_11.addWidget(self.campaignName)
- spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_11.addItem(spacerItem11)
+ spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_11.addItem(spacerItem9)
self.campaignMonth = QtWidgets.QLabel(parent=self.pageCampaign)
font = QtGui.QFont()
font.setPointSize(12)
@@ -260,8 +268,8 @@ class Ui_MainWindow(object):
self.addSectorBtn.setEnabled(True)
self.addSectorBtn.setObjectName("addSectorBtn")
self.horizontalLayout_17.addWidget(self.addSectorBtn)
- spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_17.addItem(spacerItem12)
+ spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_17.addItem(spacerItem10)
self.verticalLayout_5.addLayout(self.horizontalLayout_17)
self.sectorsTable = QtWidgets.QTableWidget(parent=self.groupBox_3)
self.sectorsTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
@@ -298,8 +306,8 @@ class Ui_MainWindow(object):
self.addCampaignParticipantBtn = QtWidgets.QPushButton(parent=self.groupBox_4)
self.addCampaignParticipantBtn.setObjectName("addCampaignParticipantBtn")
self.horizontalLayout_18.addWidget(self.addCampaignParticipantBtn)
- spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_18.addItem(spacerItem13)
+ spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_18.addItem(spacerItem11)
self.verticalLayout_6.addLayout(self.horizontalLayout_18)
self.campaignParticipantsTable = QtWidgets.QTableWidget(parent=self.groupBox_4)
self.campaignParticipantsTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
@@ -322,8 +330,8 @@ class Ui_MainWindow(object):
self.verticalLayout_7.addWidget(self.groupBox_4)
self.horizontalLayout_10 = QtWidgets.QHBoxLayout()
self.horizontalLayout_10.setObjectName("horizontalLayout_10")
- spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_10.addItem(spacerItem14)
+ spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_10.addItem(spacerItem12)
self.endCampaignBtn = QtWidgets.QPushButton(parent=self.pageCampaign)
self.endCampaignBtn.setEnabled(True)
self.endCampaignBtn.setObjectName("endCampaignBtn")
@@ -368,8 +376,8 @@ class Ui_MainWindow(object):
self.verticalLayout_8.addWidget(self.groupBox_5)
self.horizontalLayout_13 = QtWidgets.QHBoxLayout()
self.horizontalLayout_13.setObjectName("horizontalLayout_13")
- spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_13.addItem(spacerItem15)
+ spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_13.addItem(spacerItem13)
self.resolvePairingBtn = QtWidgets.QPushButton(parent=self.pageRound)
self.resolvePairingBtn.setEnabled(False)
self.resolvePairingBtn.setObjectName("resolvePairingBtn")
@@ -405,8 +413,8 @@ class Ui_MainWindow(object):
self.verticalLayout_8.addWidget(self.groupBox_6)
self.horizontalLayout_9 = QtWidgets.QHBoxLayout()
self.horizontalLayout_9.setObjectName("horizontalLayout_9")
- spacerItem16 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
- self.horizontalLayout_9.addItem(spacerItem16)
+ spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+ self.horizontalLayout_9.addItem(spacerItem14)
self.endRoundBtn = QtWidgets.QPushButton(parent=self.pageRound)
self.endRoundBtn.setEnabled(True)
self.endRoundBtn.setObjectName("endRoundBtn")
@@ -415,10 +423,10 @@ class Ui_MainWindow(object):
self.selectedDetailsStack.addWidget(self.pageRound)
self.verticalLayout_3.addWidget(self.splitter)
self.tabWidget.addTab(self.warsTab, "")
- self.verticalLayout_9.addWidget(self.tabWidget)
+ self.gridLayout_2.addWidget(self.tabWidget, 0, 0, 1, 1)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(parent=MainWindow)
- self.menubar.setGeometry(QtCore.QRect(0, 0, 1235, 21))
+ self.menubar.setGeometry(QtCore.QRect(0, 0, 849, 21))
self.menubar.setObjectName("menubar")
self.menuFile = QtWidgets.QMenu(parent=self.menubar)
self.menuFile.setObjectName("menuFile")
@@ -468,7 +476,7 @@ class Ui_MainWindow(object):
self.retranslateUi(MainWindow)
self.tabWidget.setCurrentIndex(1)
- self.selectedDetailsStack.setCurrentIndex(3)
+ self.selectedDetailsStack.setCurrentIndex(0)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
def retranslateUi(self, MainWindow):
@@ -489,6 +497,7 @@ class Ui_MainWindow(object):
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.backgroundImage.setText(_translate("MainWindow", "IMAGE"))
self.warName.setText(_translate("MainWindow", "warName"))
self.warYear.setText(_translate("MainWindow", "warYear"))
self.groupBox.setTitle(_translate("MainWindow", "Objectives"))
diff --git a/src/warchron/view/ui/ui_main_window.ui b/src/warchron/view/ui/ui_main_window.ui
index 1039268..1650d28 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
- 1235
- 954
+ 849
+ 788
@@ -18,8 +18,8 @@
../resources/warchron_logo.png../resources/warchron_logo.png
-
- -
+
+
-
1
@@ -157,49 +157,45 @@
- 3
+ 0
-
-
-
-
-
- QLayout::SetDefaultConstraint
+
+
-
+
+
+
+ 12
+
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Select an element within the tree to show/edit details.
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
+
+ Select an element within the tree to show/edit details.
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 11
+
+
+
+ IMAGE
+
+
+ Qt::AlignCenter
+
+
@@ -970,7 +966,7 @@
0
0
- 1235
+ 849
21
@@ -1078,6 +1074,8 @@
-
+
+
+
diff --git a/src/warchron/view/view.py b/src/warchron/view/view.py
index 73404ce..012c2bf 100644
--- a/src/warchron/view/view.py
+++ b/src/warchron/view/view.py
@@ -95,7 +95,19 @@ class View(QtWidgets.QMainWindow, Ui_MainWindow):
def _apply_icons(self) -> None:
# Window
- self.setWindowIcon(Icons.get(IconName.WARCHRON))
+ self.setWindowIcon(Icons.get(IconName.WARCHRONICO))
+ # Background
+ pixmap = Icons.get(IconName.WARCHRONBACK).pixmap(512, 512)
+ scaled = pixmap.scaled(
+ self.backgroundImage.size(),
+ Qt.AspectRatioMode.KeepAspectRatio,
+ Qt.TransformationMode.SmoothTransformation,
+ )
+ self.backgroundImage.setPixmap(scaled)
+ self.backgroundImage.setParent(self.pageEmpty)
+ self.backgroundImage.setGeometry(self.pageEmpty.rect())
+ self.backgroundImage.lower()
+ self.labelSelect.raise_()
# Menu bar
self.actionNew.setIcon(Icons.get(IconName.NEW))
self.actionOpen.setIcon(Icons.get(IconName.OPEN))
diff --git a/src/warchron/view/war_dialog.py b/src/warchron/view/war_dialog.py
index 084166f..521c08f 100644
--- a/src/warchron/view/war_dialog.py
+++ b/src/warchron/view/war_dialog.py
@@ -17,7 +17,7 @@ class WarDialog(QDialog):
self.ui.warName.setText(default_name)
if default_year is not None:
self.ui.warYear.setValue(default_year)
- self.setWindowIcon(Icons.get(IconName.WARCHRON))
+ self.setWindowIcon(Icons.get(IconName.WARCHRONICO))
def get_war_name(self) -> str:
return self.ui.warName.text().strip()
diff --git a/src/warchron/view/war_participant_dialog.py b/src/warchron/view/war_participant_dialog.py
index fbe588b..2985181 100644
--- a/src/warchron/view/war_participant_dialog.py
+++ b/src/warchron/view/war_participant_dialog.py
@@ -26,7 +26,7 @@ class WarParticipantDialog(QDialog):
select_if_exists(self.ui.playerComboBox, default_player_id)
self.ui.playerComboBox.setEnabled(editable_player)
self.ui.faction.setText(default_faction)
- self.setWindowIcon(Icons.get(IconName.WARCHRON))
+ self.setWindowIcon(Icons.get(IconName.WARCHRONICO))
def get_player_id(self) -> str:
return cast(str, self.ui.playerComboBox.currentData())