diff --git a/Static/Profibus.qss b/Static/Profibus.qss index ee0b406..09d3088 100644 --- a/Static/Profibus.qss +++ b/Static/Profibus.qss @@ -319,6 +319,52 @@ QPushButton#confirmButton{ } +QPushButton#profibusExitButton{ + + width: 54.75px; + + height: 40px; + + background-color: #5b8cff; + + border-radius: 5px; + + color: #FFFFFF; + + font-family: ".SFNSDisplay-Medium"; + + font-size: 17px; + + font-weight: 520; + +} + +QPushButton#confirmButton:focus, +QPushButton#profibusExitButton:focus { + + outline: none; + + border: 2px solid #60A5FA; +} + +QPushButton#confirmButton:pressed, +QPushButton#profibusExitButton:pressed { + + background: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #1976D2, + stop:1 #1565C0); + border-color: #1565C0; +} + +QPushButton#confirmButton:hover, +QPushButton#profibusExitButton:hover { + + background: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #3B82F6, + stop:1 #2277EF); + border-color: #2277EF; +} + QPushButton#parameBtn{ border: none; diff --git a/UI/ProfibusWidgets/AreaTabWidget.py b/UI/ProfibusWidgets/AreaTabWidget.py index 2524e75..d0aa1af 100644 --- a/UI/ProfibusWidgets/AreaTabWidget.py +++ b/UI/ProfibusWidgets/AreaTabWidget.py @@ -189,6 +189,7 @@ class AreaWidget(QWidget): self.valueNameEdit = SoftKeyBoardEdit() self.valueNameEdit.setPlaceholderText('变量名') self.valueNameEdit.setObjectName('byteLineEdit') + self.valueNameEdit.setFixedHeight(40) self.okBtn = QPushButton('保存') self.okBtn.setObjectName('okBtn') @@ -208,9 +209,9 @@ class AreaWidget(QWidget): hLayout.addWidget(self.delAreaBtn) hLayout.addWidget(QSplitter()) - self.leftLayout.addWidget(self.pvUpperLimit, 0, 0, 1, 2) - self.leftLayout.addWidget(self.pvLowerLimit, 1, 0, 1, 2) - self.leftLayout.addWidget(self.pvUnit,2, 0, 1, 2) + self.leftLayout.addWidget(self.pvUpperLimit, 0, 0, 2, 2) + self.leftLayout.addWidget(self.pvLowerLimit, 1, 0, 2, 2) + self.leftLayout.addWidget(self.pvUnit,2, 0, 2, 2) self.leftLayout.addWidget(self.dataTypeLabel, 3, 0, 2, 1) self.leftLayout.addWidget(self.dataTypeCombox, 3, 1, 2, 1) diff --git a/UI/ProfibusWidgets/DeviceDialogWidget.py b/UI/ProfibusWidgets/DeviceDialogWidget.py index c006efe..ffc0871 100644 --- a/UI/ProfibusWidgets/DeviceDialogWidget.py +++ b/UI/ProfibusWidgets/DeviceDialogWidget.py @@ -64,7 +64,7 @@ class DeviceDialog(QDialog): self.exitButton = QPushButton('取消') self.exitButton.clicked.connect(self.close) - self.exitButton.setObjectName('exitButton') + self.exitButton.setObjectName('profibusExitButton') self.horizontalLayout = QHBoxLayout() self.horizontalLayout.addWidget(self.confirmButton) diff --git a/UI/ProfibusWidgets/RightAreaWidget.py b/UI/ProfibusWidgets/RightAreaWidget.py index 8bd2ca6..f309105 100644 --- a/UI/ProfibusWidgets/RightAreaWidget.py +++ b/UI/ProfibusWidgets/RightAreaWidget.py @@ -112,15 +112,16 @@ class RightAreaWidgets(QWidget): qualityValueLabel.setObjectName('areaValueLabel') forceLayout.addWidget(qualityLabel,1,0,1,1) forceLayout.addWidget(qualityValueLabel,1,1,1,1) + qualityValueLabel.setFixedHeight(40) if self.force: areaLineEdit = SoftKeyBoardEdit('0') areaLineEdit.setObjectName('areaLineEdit') - areaLineEdit.setFixedSize(80, 33) + areaLineEdit.setFixedSize(80, 45) qualityLineEdit = SoftKeyBoardEdit('80') qualityLineEdit.setObjectName('areaLineEdit') - qualityLineEdit.setFixedSize(80, 33) + qualityLineEdit.setFixedSize(80, 45) forceBtn = ForceButton(number = number, valueLabel=areaValueLabel, valueEdit=areaLineEdit, qualityValueLabel=qualityValueLabel, \ qualityLineEdit=qualityLineEdit, btnName = '强制') forceBtn.clicked.connect(self.AIAOForceValues) diff --git a/UI/VarManages/VarWidget.py b/UI/VarManages/VarWidget.py index 29a1d9f..ba46ef8 100644 --- a/UI/VarManages/VarWidget.py +++ b/UI/VarManages/VarWidget.py @@ -397,7 +397,7 @@ class VarWidgets(QtWidgets.QWidget): action.text(), action.isChecked()) for action in self.menuValues.actions()])) def createVar(self): - self.varView.model.append_data(['', '', '', '', '', '', '', '', '', '', '','本地值','int']) + self.varView.model.append_data(['', '', '', '', '', '', '', '', '', '','本地值','int']) def forceVar(self): check = [i for i, x in enumerate(self.varView.model.checkList) if x == 'Checked']