edit/delete player/war/campaign/round
This commit is contained in:
parent
dc854b4065
commit
185733b5d4
9 changed files with 363 additions and 58 deletions
|
|
@ -28,6 +28,14 @@ class Ui_campaignDialog(object):
|
|||
self.campaignName = QtWidgets.QLineEdit(parent=campaignDialog)
|
||||
self.campaignName.setGeometry(QtCore.QRect(60, 20, 113, 20))
|
||||
self.campaignName.setObjectName("campaignName")
|
||||
self.label_2 = QtWidgets.QLabel(parent=campaignDialog)
|
||||
self.label_2.setGeometry(QtCore.QRect(10, 50, 47, 14))
|
||||
self.label_2.setObjectName("label_2")
|
||||
self.campaignMonth = QtWidgets.QSpinBox(parent=campaignDialog)
|
||||
self.campaignMonth.setGeometry(QtCore.QRect(60, 50, 71, 22))
|
||||
self.campaignMonth.setMinimum(1)
|
||||
self.campaignMonth.setMaximum(12)
|
||||
self.campaignMonth.setObjectName("campaignMonth")
|
||||
|
||||
self.retranslateUi(campaignDialog)
|
||||
self.buttonBox.accepted.connect(campaignDialog.accept) # type: ignore
|
||||
|
|
@ -38,6 +46,7 @@ class Ui_campaignDialog(object):
|
|||
_translate = QtCore.QCoreApplication.translate
|
||||
campaignDialog.setWindowTitle(_translate("campaignDialog", "Campaign"))
|
||||
self.label.setText(_translate("campaignDialog", "Name:"))
|
||||
self.label_2.setText(_translate("campaignDialog", "Month:"))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
|||
|
|
@ -59,6 +59,35 @@
|
|||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>50</y>
|
||||
<width>47</width>
|
||||
<height>14</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Month:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="campaignMonth">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>60</x>
|
||||
<y>50</y>
|
||||
<width>71</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>12</number>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@ class Ui_warDialog(object):
|
|||
def setupUi(self, warDialog):
|
||||
warDialog.setObjectName("warDialog")
|
||||
warDialog.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
|
||||
warDialog.resize(378, 98)
|
||||
warDialog.resize(378, 124)
|
||||
icon = QtGui.QIcon()
|
||||
icon.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/warchron_logo.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
|
||||
warDialog.setWindowIcon(icon)
|
||||
self.buttonBox = QtWidgets.QDialogButtonBox(parent=warDialog)
|
||||
self.buttonBox.setGeometry(QtCore.QRect(10, 60, 341, 32))
|
||||
self.buttonBox.setGeometry(QtCore.QRect(10, 80, 341, 32))
|
||||
self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
|
||||
self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
|
||||
self.buttonBox.setObjectName("buttonBox")
|
||||
|
|
@ -28,6 +28,14 @@ class Ui_warDialog(object):
|
|||
self.warName = QtWidgets.QLineEdit(parent=warDialog)
|
||||
self.warName.setGeometry(QtCore.QRect(60, 20, 113, 20))
|
||||
self.warName.setObjectName("warName")
|
||||
self.label_2 = QtWidgets.QLabel(parent=warDialog)
|
||||
self.label_2.setGeometry(QtCore.QRect(10, 50, 47, 14))
|
||||
self.label_2.setObjectName("label_2")
|
||||
self.warYear = QtWidgets.QSpinBox(parent=warDialog)
|
||||
self.warYear.setGeometry(QtCore.QRect(60, 50, 71, 22))
|
||||
self.warYear.setMinimum(1970)
|
||||
self.warYear.setMaximum(3000)
|
||||
self.warYear.setObjectName("warYear")
|
||||
|
||||
self.retranslateUi(warDialog)
|
||||
self.buttonBox.accepted.connect(warDialog.accept) # type: ignore
|
||||
|
|
@ -38,6 +46,7 @@ class Ui_warDialog(object):
|
|||
_translate = QtCore.QCoreApplication.translate
|
||||
warDialog.setWindowTitle(_translate("warDialog", "War"))
|
||||
self.label.setText(_translate("warDialog", "Name:"))
|
||||
self.label_2.setText(_translate("warDialog", "Year:"))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>378</width>
|
||||
<height>98</height>
|
||||
<height>124</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>60</y>
|
||||
<y>80</y>
|
||||
<width>341</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
|
|
@ -59,6 +59,35 @@
|
|||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>50</y>
|
||||
<width>47</width>
|
||||
<height>14</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Year:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="warYear">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>60</x>
|
||||
<y>50</y>
|
||||
<width>71</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>1970</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>3000</number>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import calendar
|
|||
|
||||
from PyQt6 import QtWidgets
|
||||
from PyQt6.QtCore import Qt
|
||||
from PyQt6.QtWidgets import QDialog, QFileDialog, QTreeWidgetItem
|
||||
from PyQt6.QtWidgets import QDialog, QFileDialog, QTreeWidgetItem, QMenu
|
||||
from PyQt6.QtGui import QCloseEvent
|
||||
|
||||
from warchron.view.ui.ui_main_window import Ui_MainWindow
|
||||
|
|
@ -22,7 +22,13 @@ class View(QtWidgets.QMainWindow, Ui_MainWindow):
|
|||
self.on_selection_changed = None
|
||||
self.on_add_campaign = None
|
||||
self.on_add_round = None
|
||||
self.on_edit_item = None
|
||||
self.on_delete_item = None
|
||||
self.playersTable.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
|
||||
self.playersTable.customContextMenuRequested.connect(self._on_players_table_context_menu)
|
||||
self.warsTree.currentItemChanged.connect(self._emit_selection_changed)
|
||||
self.warsTree.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
|
||||
self.warsTree.customContextMenuRequested.connect(self._on_wars_tree_context_menu)
|
||||
self.addCampaignBtn.clicked.connect(self._on_add_campaign_clicked)
|
||||
self.addRoundBtn.clicked.connect(self._on_add_round_clicked)
|
||||
|
||||
|
|
@ -36,7 +42,42 @@ class View(QtWidgets.QMainWindow, Ui_MainWindow):
|
|||
"type": current.data(0, ROLE_TYPE),
|
||||
"id": current.data(0, ROLE_ID),
|
||||
})
|
||||
|
||||
|
||||
def _on_players_table_context_menu(self, pos):
|
||||
item = self.playersTable.itemAt(pos)
|
||||
if not item:
|
||||
return
|
||||
row = item.row()
|
||||
player_item = self.playersTable.item(row, 0)
|
||||
player_id = player_item.data(Qt.ItemDataRole.UserRole)
|
||||
menu = QMenu(self)
|
||||
edit_action = menu.addAction("Edit")
|
||||
delete_action = menu.addAction("Delete")
|
||||
action = menu.exec(self.playersTable.viewport().mapToGlobal(pos))
|
||||
if action == edit_action and self.on_edit_item:
|
||||
self.on_edit_item("player", player_id)
|
||||
elif action == delete_action and self.on_delete_item:
|
||||
self.on_delete_item("player", player_id)
|
||||
|
||||
def _on_wars_tree_context_menu(self, pos):
|
||||
item = self.warsTree.itemAt(pos)
|
||||
if not item:
|
||||
return
|
||||
item_type = item.data(0, ROLE_TYPE)
|
||||
item_id = item.data(0, ROLE_ID)
|
||||
menu = QMenu(self)
|
||||
edit_action = None
|
||||
if item_type != "round":
|
||||
edit_action = menu.addAction("Edit")
|
||||
delete_action = menu.addAction("Delete")
|
||||
action = menu.exec(self.warsTree.viewport().mapToGlobal(pos))
|
||||
if action == edit_action:
|
||||
if self.on_edit_item:
|
||||
self.on_edit_item(item_type, item_id)
|
||||
elif action == delete_action:
|
||||
if self.on_delete_item:
|
||||
self.on_delete_item(item_type, item_id)
|
||||
|
||||
def _on_add_campaign_clicked(self):
|
||||
if self.on_add_campaign:
|
||||
self.on_add_campaign()
|
||||
|
|
@ -75,8 +116,12 @@ class View(QtWidgets.QMainWindow, Ui_MainWindow):
|
|||
table = self.playersTable
|
||||
table.setRowCount(len(players))
|
||||
for row, player in enumerate(players):
|
||||
table.setItem(row, 0, QtWidgets.QTableWidgetItem(player.name))
|
||||
table.setItem(row, 1, QtWidgets.QTableWidgetItem(player.id))
|
||||
name_item = QtWidgets.QTableWidgetItem(player.name)
|
||||
name_item.setData(Qt.ItemDataRole.UserRole, player.id)
|
||||
table.setItem(row, 0, name_item)
|
||||
id_item = QtWidgets.QTableWidgetItem(player.id)
|
||||
id_item.setFlags(id_item.flags() & ~Qt.ItemFlag.ItemIsEditable)
|
||||
table.setItem(row, 1, id_item)
|
||||
table.resizeColumnsToContents()
|
||||
|
||||
def display_wars(self, wars: list):
|
||||
|
|
@ -116,29 +161,50 @@ class View(QtWidgets.QMainWindow, Ui_MainWindow):
|
|||
def set_add_round_enabled(self, enabled: bool):
|
||||
self.addRoundBtn.setEnabled(enabled)
|
||||
|
||||
def get_current_tab(self) -> str:
|
||||
index = self.tabWidget.currentIndex()
|
||||
if index == 0:
|
||||
return "players"
|
||||
elif index == 1:
|
||||
return "wars"
|
||||
return ""
|
||||
|
||||
class PlayerDialog(QDialog):
|
||||
def __init__(self, parent=None):
|
||||
def __init__(self, parent=None, *, default_name: str = ""):
|
||||
super().__init__(parent)
|
||||
self.ui = Ui_playerDialog()
|
||||
self.ui.setupUi(self)
|
||||
self.ui.playerName.setText(default_name)
|
||||
|
||||
def get_player_name(self) -> str:
|
||||
return self.ui.playerName.text().strip()
|
||||
|
||||
class WarDialog(QDialog):
|
||||
def __init__(self, parent=None):
|
||||
def __init__(self, parent=None, default_name: str = "", default_year: int | None = None):
|
||||
super().__init__(parent)
|
||||
self.ui = Ui_warDialog()
|
||||
self.ui.setupUi(self)
|
||||
self.ui.warName.setText(default_name)
|
||||
if default_year is not None:
|
||||
self.ui.warYear.setValue(default_year)
|
||||
|
||||
def get_war_name(self) -> str:
|
||||
return self.ui.warName.text().strip()
|
||||
|
||||
def get_war_year(self) -> int:
|
||||
return int(self.ui.warYear.value())
|
||||
|
||||
class CampaignDialog(QDialog):
|
||||
def __init__(self, parent=None):
|
||||
def __init__(self, parent=None, default_name: str = "", default_month: int | None = None):
|
||||
super().__init__(parent)
|
||||
self.ui = Ui_campaignDialog()
|
||||
self.ui.setupUi(self)
|
||||
self.ui.campaignName.setText(default_name)
|
||||
if default_month is not None:
|
||||
self.ui.campaignMonth.setValue(default_month)
|
||||
|
||||
def get_campaign_name(self) -> str:
|
||||
return self.ui.campaignName.text().strip()
|
||||
|
||||
def get_campaign_month(self) -> int:
|
||||
return int(self.ui.campaignMonth.value())
|
||||
Loading…
Add table
Add a link
Reference in a new issue