diff --git a/src/budget/_mw.py b/src/budget/_mw.py index 5d4588b..decfc6a 100644 --- a/src/budget/_mw.py +++ b/src/budget/_mw.py @@ -2,6 +2,7 @@ from PyQt6.QtWidgets import * from ._pg import PostgresTab from ._category import CategoryTab from ._pg import PostgresTab +from ._account import AccountTab def initUI(self): @@ -10,11 +11,13 @@ def initUI(self): self.pg = PostgresTab() self.categoryTab = CategoryTab(self) + self.accountTab = AccountTab(self) # 创建主窗口tab布局 mainWidget = QTabWidget() mainWidget.addTab(self.pg, 'Connect') mainWidget.addTab(self.categoryTab, 'Category') + mainWidget.addTab(self.accountTab, 'Account') mainWidget.currentChanged.connect(self.onTabChanged) @@ -23,5 +26,5 @@ def initUI(self): self.pg.onConnectClicked() def onTabChanged(self, index): - if (index == 1): self.centralWidget().widget(index).selected() + diff --git a/src/budget/_pg.py b/src/budget/_pg.py index dfe5bc4..75cf7d2 100644 --- a/src/budget/_pg.py +++ b/src/budget/_pg.py @@ -3,12 +3,19 @@ import psycopg2 from ._tab import TabPage class PostgresTab(TabPage): + + cur = None + conn = None + def __init__(self): super().__init__() self.initUI() - cur = None - conn = None + # 退出时断开数据库连接 + def __del__(self): + if(self.connected()): + self.disconnectFromDatabase() + def connected(self): return self.cur is not None