diff --git a/Static/Area.qss b/Static/Area.qss index 8e7aadc..e32560e 100644 --- a/Static/Area.qss +++ b/Static/Area.qss @@ -23,15 +23,15 @@ QPushButton#wirteDIDOforceBtn { QPushButton#forceBtn { - font-size: 26px; + font-size: 25px; - padding-left: 5px; + padding-left: 10px; - padding-right: 5px; + padding-right: 10px; - padding-top: 5px; + /* padding-top: 5px; - padding-bottom: 5px; + padding-bottom: 5px; */ } @@ -56,7 +56,7 @@ QPushButton#initAddDeviceButton, QPushButton#initAreaAddButton{ QPushButton#initAddDeviceButton:hover, QPushButton#initAreaAddButton:hover, QPushButton#deviceAddButton:hover, QPushButton#addareabutton:hover{ - color: #1a86d8; + color: #0f8ef0; font: bold; @@ -68,13 +68,13 @@ QPushButton#initAddDeviceButton:hover, QPushButton#initAreaAddButton:hover, QPus -QLabel#WirteDIDOareaMessLabel, QLabel#WirteDIDOareaValueLabel{ +QLabel#wirteDIDOareaMessLabel, QLabel#wirteDIDOareaValueLabel{ font-size: 16px; } -QLabel#WirteDIDOareaValueLabel{ +QLabel#wirteDIDOareaValueLabel, QLabel#readDIDOareaValueLabel{ color: #0160aa; @@ -121,7 +121,7 @@ QLabel#areaValueLabel{ QLineEdit#byteLineEdit{ - font-size: 24px; + font-size: 20px; } @@ -135,7 +135,7 @@ QLineEdit#areaLineEdit { -QLineEdit#WirteDIDOareaLineEdit { +QLineEdit#wirteDIDOareaLineEdit { font-size: 16px; diff --git a/Static/Main.qss b/Static/Main.qss index 7e3b6e8..206281d 100644 --- a/Static/Main.qss +++ b/Static/Main.qss @@ -120,4 +120,5 @@ QToolBar QToolButton{ font-size: 20px; font: bold; -} \ No newline at end of file +} + diff --git a/Static/force.png b/Static/force.png new file mode 100644 index 0000000..6b4f857 Binary files /dev/null and b/Static/force.png differ diff --git a/Static/startProtocol.png b/Static/startProtocol.png new file mode 100644 index 0000000..e7bb4a9 Binary files /dev/null and b/Static/startProtocol.png differ diff --git a/UI/AreaTabWidget.py b/UI/AreaTabWidget.py index 5105ff2..ae62441 100644 --- a/UI/AreaTabWidget.py +++ b/UI/AreaTabWidget.py @@ -145,14 +145,14 @@ class AreaWidget(QWidget): LimitData = self.devicesManange.getLimitData(self.areaTabWidget.deviceName) - self.pvUpperLimit = QLabel('量程上限: {}'.format(LimitData[0])) + self.pvUpperLimit = QLabel('量程上限: {}'.format(LimitData[0])) self.pvUpperLimit.setObjectName('pvUpperLimit') - self.pvLowerLimit = QLabel('量程下限: {}'.format(LimitData[1])) + self.pvLowerLimit = QLabel('量程下限: {}'.format(LimitData[1])) self.pvLowerLimit.setObjectName('pvLowerLimit') - self.pvUnit = QLabel('单位: {}'.format(LimitData[2])) + self.pvUnit = QLabel('单 位: {}'.format(LimitData[2])) self.pvUnit.setObjectName('pvUnit') diff --git a/UI/MainWindow.py b/UI/MainWindow.py index 7c93f28..a85f3cb 100644 --- a/UI/MainWindow.py +++ b/UI/MainWindow.py @@ -32,8 +32,10 @@ class MainWindow(QMainWindow): self.toolbar = QToolBar() self.addToolBar(self.toolbar) - self.startProtocolBtn = QAction("开始通讯", self) + self.startProtocolBtn = QAction(self) self.startProtocolBtn.setObjectName("startProtocolBtn") + self.startProtocolBtn.setIcon(QIcon('Static/startProtocol.png')) + self.startProtocolBtn.setIconText('开始通讯') self.startProtocolBtn.setCheckable(True) self.startProtocolBtn.triggered.connect(self.startProtocol)