diff --git a/Static/Main.qss b/Static/Main.qss index c195519..5a4ca25 100644 --- a/Static/Main.qss +++ b/Static/Main.qss @@ -265,7 +265,6 @@ QPushButton#mesButton:pressed QPushButton#setButton{ - min-height: 33px; background-color: #2277EF; @@ -281,6 +280,17 @@ QPushButton#setButton{ font-weight: 520; } + +QPushButton#setButton:hover { + background-color: #1a5bc5; + + border-radius: 5px; + + font-weight: bold; +} + + + QPushButton#registerPushButton{ width: 100px; diff --git a/Static/control.png b/Static/control.png index de98c81..22dfa4a 100644 Binary files a/Static/control.png and b/Static/control.png differ diff --git a/Static/controlH.png b/Static/controlH.png index a820dd1..928e0f9 100644 Binary files a/Static/controlH.png and b/Static/controlH.png differ diff --git a/Static/procedure.png b/Static/procedure.png new file mode 100644 index 0000000..0226189 Binary files /dev/null and b/Static/procedure.png differ diff --git a/Static/procedureH.png b/Static/procedureH.png new file mode 100644 index 0000000..ffbebf9 Binary files /dev/null and b/Static/procedureH.png differ diff --git a/UI/Main/MainLeft.py b/UI/Main/MainLeft.py index 0275ea0..12c9fc6 100644 --- a/UI/Main/MainLeft.py +++ b/UI/Main/MainLeft.py @@ -103,6 +103,7 @@ class MainLeft(QWidget): self.trendMag.clicked.connect(lambda:self.trendMag.setIcon(QIcon('./Static/trendH.png'))) self.userMag.clicked.connect(lambda:self.userMag.setIcon(QIcon('./Static/userMagH.png'))) self.protocolMag.clicked.connect(lambda:self.protocolMag.setIcon(QIcon('./Static/settingH.png'))) + self.procedureMag.clicked.connect(lambda:self.procedureMag.setIcon(QIcon('./Static/procedureH.png'))) self.controlMag.clicked.connect(lambda:self.controlMag.setIcon(QIcon('./Static/controlH.png'))) self.createProject.setChecked(True) @@ -164,6 +165,12 @@ class MainLeft(QWidget): if event.type() == QtCore.QEvent.HoverLeave and not self.protocolMag.isChecked(): self.protocolMag.setIcon(QIcon('./Static/setting.png')) return True + if object == self.procedureMag: + if event.type() == QtCore.QEvent.HoverEnter: + self.procedureMag.setIcon(QIcon('./Static/procedureH.png')) + return True + if event.type() == QtCore.QEvent.HoverLeave and not self.procedureMag.isChecked(): + self.procedureMag.setIcon(QIcon('./Static/procedure.png')) if object == self.controlMag: if event.type() == QtCore.QEvent.HoverEnter: self.controlMag.setIcon(QIcon('./Static/controlH.png')) @@ -180,6 +187,7 @@ class MainLeft(QWidget): self.trendMag.setDown(False) self.userMag.setDown(False) self.protocolMag.setDown(False) + self.procedureMag.setDown(False) self.controlMag.setDown(False) self.createProject.setIcon(QIcon('./Static/new.png')) @@ -188,4 +196,5 @@ class MainLeft(QWidget): self.trendMag.setIcon(QIcon('./Static/trend.png')) self.userMag.setIcon(QIcon('./Static/userMag.png')) self.protocolMag.setIcon(QIcon('./Static/setting.png')) + self.procedureMag.setIcon(QIcon('./Static/procedure.png')) self.controlMag.setIcon(QIcon('./Static/control.png')) diff --git a/UI/ProjectManages/ProjectModel.py b/UI/ProjectManages/ProjectModel.py index dee4201..bec49dc 100644 --- a/UI/ProjectManages/ProjectModel.py +++ b/UI/ProjectManages/ProjectModel.py @@ -220,6 +220,7 @@ class ProjectButtonDelegate(QItemDelegate): # 初始化读取数据库数据,添加进度条 progress = QtWidgets.QProgressDialog() + progress.setWindowTitle("提示") progress.setLabelText("正在加载工程数据...") progress.setCancelButton(None) progress.setMinimum(0)