diff --git a/src/budget/_account.py b/src/budget/_account.py index 2d78e24..f40160e 100644 --- a/src/budget/_account.py +++ b/src/budget/_account.py @@ -35,7 +35,6 @@ class AccountTab(TabPage): # 新建对话框,询问是否删除 dialog = QDialog(self) dialog.setWindowTitle('Delete Account') - dialog.resize(300, 200) label1 = QLabel("Are you sure to delete this account?") label2 = QLabel("This action cannot be undone.") @@ -48,7 +47,9 @@ class AccountTab(TabPage): layout.addWidget(label1) layout.addWidget(label2) layout.addWidget(buttonBox) - + layout.setSpacing(12) + layout.setContentsMargins(15, 15, 15, 15) + dialog.setMinimumWidth(400) dialog.setLayout(layout) # 若确认删除,则执行删除操作 @@ -70,7 +71,6 @@ class AccountTab(TabPage): # 创建添加数据对话框 self.aDialog = QDialog(self) self.aDialog.setWindowTitle('Modify') - self.aDialog.resize(400, 300) index = self.accountComboBox.currentIndex() # 若为空,抛出错误 @@ -119,7 +119,9 @@ class AccountTab(TabPage): layout.addRow(label2,line2) layout.addRow(label3,line3) layout.addRow(buttonLayout) - + layout.setSpacing(12) + layout.setContentsMargins(15, 15, 15, 15) + self.aDialog.setMinimumWidth(400) self.aDialog.setLayout(layout) # 显示添加数据对话框 @@ -152,7 +154,6 @@ class AccountTab(TabPage): # 创建添加数据对话框 self.aDialog = QDialog(self) self.aDialog.setWindowTitle('Add New Account') - self.aDialog.resize(400, 300) label1 = QLabel("Account Name:") line1 = QLineEdit() @@ -178,7 +179,9 @@ class AccountTab(TabPage): layout.addRow(label2,line2) layout.addRow(label3,line3) layout.addRow(buttonLayout) - + layout.setSpacing(12) + layout.setContentsMargins(15, 15, 15, 15) + self.aDialog.setMinimumWidth(400) self.aDialog.setLayout(layout) # 显示添加数据对话框 diff --git a/src/budget/_category.py b/src/budget/_category.py index a7bce9b..c09785c 100644 --- a/src/budget/_category.py +++ b/src/budget/_category.py @@ -35,9 +35,8 @@ class CategoryTab(TabPage): def onCategoryModifyClicked(self): # 创建添加数据对话框 - addDialog = QDialog(self) - addDialog.setWindowTitle('Modify Category') - addDialog.resize(400, 300) + self.cDialog = QDialog(self) + self.cDialog.setWindowTitle('Modify Category') index = self.categoryComboBox.currentIndex() # 若为空,抛出错误 @@ -79,20 +78,22 @@ class CategoryTab(TabPage): buttonLayout.addWidget(button3) buttonLayout.addWidget(button2) - button1.clicked.connect(addDialog.accept) + button1.clicked.connect(self.cDialog.accept) button3.clicked.connect(self.onCategoryDeleteClicked) - button2.clicked.connect(addDialog.reject) + button2.clicked.connect(self.cDialog.reject) layout = QFormLayout() layout.addRow(label1, line1) layout.addRow(label2, line2) layout.addRow(label3, line3) layout.addRow(buttonLayout) - - addDialog.setLayout(layout) + layout.setSpacing(12) + layout.setContentsMargins(15, 15, 15, 15) + self.cDialog.setLayout(layout) + self.cDialog.setMinimumWidth(400) # 显示添加数据对话框 - if addDialog.exec() == QDialog.DialogCode.Accepted: + if self.cDialog.exec() == QDialog.DialogCode.Accepted: try: # 获取输入数据 name = line1.text() @@ -124,9 +125,8 @@ class CategoryTab(TabPage): def onCategoryAddClicked(self): # 创建添加数据对话框 - addDialog = QDialog(self) - addDialog.setWindowTitle('Add New Category') - addDialog.resize(400, 300) + self.cDialog = QDialog(self) + self.cDialog.setWindowTitle('Add New Category') label1 = QLabel("Category Name:") line1 = QLineEdit() @@ -144,19 +144,21 @@ class CategoryTab(TabPage): buttonLayout.addWidget(button1) buttonLayout.addWidget(button2) - button1.clicked.connect(addDialog.accept) - button2.clicked.connect(addDialog.reject) + button1.clicked.connect(self.cDialog.accept) + button2.clicked.connect(self.cDialog.reject) layout = QFormLayout() layout.addRow(label1, line1) layout.addRow(label2, line2) layout.addRow(label3, line3) layout.addRow(buttonLayout) - - addDialog.setLayout(layout) + layout.setSpacing(12) + layout.setContentsMargins(15, 15, 15, 15) + self.cDialog.setMinimumWidth(400) + self.cDialog.setLayout(layout) # 显示添加数据对话框 - if addDialog.exec() == QDialog.DialogCode.Accepted: + if self.cDialog.exec() == QDialog.DialogCode.Accepted: try: # 获取输入数据 name = line1.text() diff --git a/src/budget/_mw.py b/src/budget/_mw.py index decfc6a..9e743c3 100644 --- a/src/budget/_mw.py +++ b/src/budget/_mw.py @@ -7,7 +7,7 @@ from ._account import AccountTab def initUI(self): self.setWindowTitle('budget') - self.setGeometry(100, 100, 800, 600) + self.setMinimumSize(800, 400) self.pg = PostgresTab() self.categoryTab = CategoryTab(self) @@ -19,6 +19,7 @@ def initUI(self): mainWidget.addTab(self.categoryTab, 'Category') mainWidget.addTab(self.accountTab, 'Account') + # 槽连接 mainWidget.currentChanged.connect(self.onTabChanged) self.setCentralWidget(mainWidget)