Skip to content

Commit

Permalink
fix(優化測試用例，修復若干BUG):
Browse files Browse the repository at this point in the history
  • Loading branch information
@northgreen
northgreen committed Aug 27, 2024
1 parent 1ad87e6 commit d37f0af
Show file tree
Hide file tree
Showing 9 changed files with 210 additions and 160 deletions.
61 changes: 15 additions & 46 deletions ictye-live-dm/src/ictye_live_dm/GUI/StyleSheets/CommonStyle.qss
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
/* ================================================ *
author:lei
lastedited:2020.2
* ================================================ */
/*hover*/
/*actived*/
/*gradient start*/
/*gradient end*/

QWidget
{
color: #222;
background-color: #FDFDFD;
}

QFrame{
color: #222;
background-color: #FDFDFD;/*不能设置为transparent*/
Expand All @@ -23,9 +13,6 @@ QMainWindow::separator{
width: 4px;
height: 4px;
}
QMainWindow::separator:hover{
background: #8BF;
}
QSplitter::handle{
border: 1px solid #999999;
border-style: outset;
Expand All @@ -51,7 +38,6 @@ QLabel {
padding: 1px;
}


/* A QLabel is a QFrame ... */
/* A QToolTip is a QLabel ... */
QToolTip {
Expand All @@ -65,7 +51,7 @@ QToolTip {
/* TextBox */
/* =============================================== */
QLineEdit {
background: #FDFDFD;/*不建议设为透明，否则table编辑时会字显示*/
background: #FDFDFD;
selection-background-color: #8BF;
border: 1px solid #999999;
border-radius: 2px;
Expand Down Expand Up @@ -104,6 +90,7 @@ QTextEdit:hover{
QTextEdit:focus{
border-color: #EA2;
}

/* =============================================== */
/* Button */
/* =============================================== */
Expand Down Expand Up @@ -135,8 +122,6 @@ QPushButton:pressed
QPushButton:focus, QPushButton:default {
border-color: #EA2; /* make the default button prominent */
}


QToolButton,QToolButton:unchecked { /* ToolBar里的按钮和带下拉菜单的按钮 */
border: 1px solid transparent;
border-radius: 3px;
Expand All @@ -148,6 +133,7 @@ QToolButton:checked{
background-color: #8BF;
border-color: #59F;
}

QToolButton:hover{
background-color: #8BF;
border-color: #59F;
Expand All @@ -167,10 +153,11 @@ QToolButton[popupMode="1"]{
padding-right: 15px; /* make way for the popup button */
border: 1px solid #999999;
min-height: 15px;
/*background: qlineargradient(x1:0, y1:0 ,x2:0, y2:1
background: qlineargradient(x1:0, y1:0 ,x2:0, y2:1
stop: 0 #EEEEEF, stop: 0.05 #DADADF, stop: 0.5 #DADADF
stop: 0.95 #EEEEEF stop: 1#EEEEEF)*/
stop: 0.95 #EEEEEF stop: 1#EEEEEF)
}

QToolButton[popupMode="1"]:hover{
background-color: #8BF;
border-color: #59F;
Expand All @@ -187,7 +174,6 @@ QToolButton::menu-button {
width: 16px;
}


/* =============================================== */
/* Slider ProgressBar */
/* =============================================== */
Expand Down Expand Up @@ -269,9 +255,10 @@ QScrollBar::add-page, QScrollBar::sub-page {
QScrollArea{
border: none;
}
/*QScrollArea QAbstractSlider{
QScrollArea QAbstractSlider{
border-radius: 0px;
}*/
}

/* =============================================== */
/* DockWidget */
/* =============================================== */
Expand Down Expand Up @@ -303,6 +290,7 @@ QGroupBox::title {
top: 0.1em;
background-color: #FDFDFD;
}

/* =============================================== */
/* ToolBox */
/* =============================================== */
Expand Down Expand Up @@ -340,11 +328,13 @@ QTabWidget::tab-bar {
left: 0px;
}
QTabBar::tab {
border-radius: 3px;
background: #FDFDFD;
border: 1px solid #999999;
padding: 3px 5px;
}
QTabBar::tab:hover {

background: #8BF;
border-color: transparent;
}
Expand Down Expand Up @@ -406,7 +396,7 @@ QHeaderView::section:checked {
/* =============================================== */
/* QTableWidget */
/* =============================================== */
QTableWidget, QTableView
QTableWidget
{
gridline-color: #999999; /*表格中的网格线条颜色*/
background: #FDFDFD;
Expand All @@ -416,30 +406,9 @@ QTableWidget, QTableView
selection-background-color:#8BF; /*鼠标选中时背景色*/
border:1px solid #999999; /*边框线的宽度、颜色*/
/*border:none; 去除边界线*/
/*border-radius:5px;*/
border-radius:5px;
/*padding:10px 10px;*/ /*表格与边框的间距*/
}
QTableView::item, QTabWidget::item{
background: transparent;
outline-style: none;
border: none;
}

QTableView::item:hover {
background: #8BF;
border: 1px solid #EA2;
}

QTableView::item:selected {
background: #8BF;
color: #EEEEEF;
}

QTableView::item:selected:active {
background: #59F;
color: #EEEEEF;
}

QTableWidget QComboBox{
margin: 2px;
border: none;
Expand All @@ -455,4 +424,4 @@ QCheckBox::indicator{
border: 1px solid #999999;
border-radius:3px;
background-color:#fff;
}
}
27 changes: 12 additions & 15 deletions ictye-live-dm/src/ictye_live_dm/GUI/Ui_MainWindow.py
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-

# Form implementation generated from reading ui file '.\main.ui'
# Form implementation generated from reading ui file './main.ui'
#
# Created by: PyQt5 UI code generator 5.15.10
# Created by: PyQt5 UI code generator 5.15.11
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
Expand All @@ -15,7 +15,7 @@ class Ui_Form(object):
def setupUi(self, Form):
Form.setObjectName("Form")
Form.setWindowModality(QtCore.Qt.NonModal)
Form.resize(863, 740)
Form.resize(865, 720)
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(".\\../ictye_live_dm/icon.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
Form.setWindowIcon(icon)
Expand All @@ -41,7 +41,7 @@ def setupUi(self, Form):
self.tabWidget = QtWidgets.QTabWidget(Form)
self.tabWidget.setTabPosition(QtWidgets.QTabWidget.West)
self.tabWidget.setTabShape(QtWidgets.QTabWidget.Rounded)
self.tabWidget.setElideMode(QtCore.Qt.ElideNone)
self.tabWidget.setElideMode(QtCore.Qt.ElideLeft)
self.tabWidget.setMovable(False)
self.tabWidget.setTabBarAutoHide(False)
self.tabWidget.setObjectName("tabWidget")
Expand All @@ -54,7 +54,7 @@ def setupUi(self, Form):
self.label_2 = QtWidgets.QLabel(self.tab_2)
self.label_2.setObjectName("label_2")
self.horizontalLayout_6.addWidget(self.label_2)
spacerItem = QtWidgets.QSpacerItem(228, 28, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_6.addItem(spacerItem)
self.StatusLable = QtWidgets.QLabel(self.tab_2)
self.StatusLable.setObjectName("StatusLable")
Expand Down Expand Up @@ -168,7 +168,7 @@ def setupUi(self, Form):
self.scrollArea.setWidgetResizable(True)
self.scrollArea.setObjectName("scrollArea")
self.scrollAreaWidgetContents_2 = QtWidgets.QWidget()
self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 789, 651))
self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 794, 619))
self.scrollAreaWidgetContents_2.setObjectName("scrollAreaWidgetContents_2")
self.formLayout = QtWidgets.QFormLayout(self.scrollAreaWidgetContents_2)
self.formLayout.setObjectName("formLayout")
Expand Down Expand Up @@ -240,13 +240,12 @@ def setupUi(self, Form):
self.settingScrollArea = QtWidgets.QScrollArea(self.setting_Tab)
self.settingScrollArea.setLineWidth(3)
self.settingScrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
self.settingScrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
self.settingScrollArea.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
self.settingScrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
self.settingScrollArea.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustIgnored)
self.settingScrollArea.setWidgetResizable(True)
self.settingScrollArea.setAlignment(QtCore.Qt.AlignCenter)
self.settingScrollArea.setObjectName("settingScrollArea")
self.scrollAreaWidgetContents = QtWidgets.QWidget()
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 789, 651))
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 790, 629))
self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents)
self.verticalLayout_5.setObjectName("verticalLayout_5")
Expand All @@ -263,7 +262,7 @@ def setupUi(self, Form):
self.verticalLayout_5.addLayout(self.horizontalLayout_5)
self.settingTreeWidget = QtWidgets.QTreeWidget(self.scrollAreaWidgetContents)
self.settingTreeWidget.viewport().setProperty("cursor", QtGui.QCursor(QtCore.Qt.ArrowCursor))
self.settingTreeWidget.setEditTriggers(QtWidgets.QAbstractItemView.DoubleClicked|QtWidgets.QAbstractItemView.EditKeyPressed|QtWidgets.QAbstractItemView.SelectedClicked)
self.settingTreeWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
self.settingTreeWidget.setObjectName("settingTreeWidget")
font = QtGui.QFont()
font.setBold(True)
Expand All @@ -279,21 +278,19 @@ def setupUi(self, Form):
self.horizontalLayout_3.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint)
self.horizontalLayout_3.setSpacing(6)
self.horizontalLayout_3.setObjectName("horizontalLayout_3")
spacerItem6 = QtWidgets.QSpacerItem(90, 20, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum)
spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_3.addItem(spacerItem6)
self.applyButton = QtWidgets.QPushButton(self.scrollAreaWidgetContents)
self.applyButton.setObjectName("applyButton")
self.horizontalLayout_3.addWidget(self.applyButton)
spacerItem7 = QtWidgets.QSpacerItem(90, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_3.addItem(spacerItem7)
self.verticalLayout_5.addLayout(self.horizontalLayout_3)
self.settingScrollArea.setWidget(self.scrollAreaWidgetContents)
self.verticalLayout_3.addWidget(self.settingScrollArea)
self.tabWidget.addTab(self.setting_Tab, "")
self.verticalLayout.addWidget(self.tabWidget)

self.retranslateUi(Form)
self.tabWidget.setCurrentIndex(0)
self.tabWidget.setCurrentIndex(2)
QtCore.QMetaObject.connectSlotsByName(Form)

def retranslateUi(self, Form):
Expand Down
Loading

0 comments on commit d37f0af

Please sign in to comment.