diff --git a/FILES/CSS/styleSheetMain.css b/FILES/CSS/styleSheetMain.css index 13cfd6d..71cf626 100644 --- a/FILES/CSS/styleSheetMain.css +++ b/FILES/CSS/styleSheetMain.css @@ -22,6 +22,10 @@ QWidget#viewerTrainees padding-left: 20px; } +QDialog { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #e6e7ea, stop: 1 #eaebee); +} QLineEdit, QTextEdit, QComboBox { border: 1px solid gray; @@ -42,14 +46,21 @@ QGroupBox { background: #E0E0E0; border: 1px solid gray; border-radius: 3px; - margin-top: 5ex; /* leave space at the top for the title */ + /*margin-top: 6ex; leave space at the top for the title */ + margin-top: 21px; +} +QGroupBox#groupBox_Report { + /*background: #F9F9F9;*/ + background: #FFFFFF; } QGroupBox::title { border: 1px solid gray; border-bottom: none; - border-radius: 4px; + /*border-radius: 4px;*/ + border-top-left-radius: 4px; + border-top-right-radius: 4px; subcontrol-origin: margin; subcontrol-position: top left; padding-left: 10px; @@ -103,7 +114,7 @@ QPushButton:flat, QToolButton:flat { border: none; /* no border for a flat push button */ } QPushButton:default, QToolButton:default { - border-color: darkblue; /*make the default button prominent */ + border-color: /*darkblue*/#2d5585; /*make the default button prominent */ } QPushButton:hover , QToolButton:hover { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, @@ -153,29 +164,37 @@ QTreeWidget { font-size: 13pt; font-family: Tahoma; icon-size: 32px; + + + border-radius: 4px; + border: 2px solid white; + + /*background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #e6e7ea, stop: 1 #eaebee);*/ + } QTreeWidget::item { height: 34px; } /*Бранчи*/ QTreeWidget::branch:has-siblings:!adjoins-item { - border-image: url(:/resources/icons/vline.png) 0; + /*border-image: url(:/resources/icons/vline.png) 0; */ } QTreeWidget::branch:has-siblings:adjoins-item { - border-image: url(:/resources/icons/branch-more.png) 0; + /*border-image: url(:/resources/icons/branch-more.png) 0;*/ } QTreeWidget::branch:!has-children:!has-siblings:adjoins-item { - border-image: url(:/resources/icons/branch-end.png) 0; + /*border-image: url(:/resources/icons/branch-end.png) 0;*/ } QTreeWidget::branch:closed:has-children:!has-siblings, QTreeWidget::branch:closed:has-children:has-siblings { - border-image: none; + /*border-image: none;*/ image: url(:/resources/icons/branch-closed.png); } QTreeWidget::branch:open:has-children:!has-siblings, QTreeWidget::branch:open:has-children:has-siblings { - border-image: none; + /*border-image: none;*/ image: url(:/resources/icons/branch-open.png); } @@ -215,6 +234,7 @@ QHeaderView::section { color: black; padding-left: 4px; border: 1px solid #6c6c6c; + border-radius: 2px; font-size: 13pt; } @@ -296,7 +316,10 @@ QListWidget#oneDialogMessenger { /*background: #ddeeff;*/ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #A0CECE, stop: 1 #FFFFFF); + stop: 0 #B0DEDE, stop: 1 #FFFFFF); + + border: 1px solid gray; + border-radius: 2px; } QListWidget#subProcItemListWidget::item:hover { @@ -350,7 +373,7 @@ QLabel#MsgWidgetLblAvatar { QLabel#MessangerWidgetLblUser { background: #ddeeff; padding-left: 4px; - border-radius: 8px; + border-radius: 4px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0CECE, stop: 1 #FFFFFF); @@ -373,23 +396,23 @@ QLabel#ReportFimWidget_label_MMEL, QLabel#ActionWidget_lbl_Type { min-width: 50px; min-height: 25px; background: #ffffff; - border: 2px solid gray; + border: 1px solid gray; } QLabel#ActionWidget_lbl_Status { color: black; border-radius: 18px; - min-width: 100px; + min-width: 150px; min-height: 40px; background: #d0d0d0; - border: 2px solid gray; + border: 1px solid gray; } QLabel#DeviceWidget_lbl_Status { color: black; border-radius: 18px; - min-width: 150px; + min-width: 250px; min-height: 40px; background: #f0f0f0; - border: 2px solid gray; + border: 1px solid gray; } QLabel#DeviceWidget_lbl_ObjName { @@ -400,14 +423,20 @@ QLabel#DeviceWidget_lbl_Code { } QPlainTextEdit#ActionWidget_plainTextEdit_Procedure{ - border: 2px solid gray; + border-radius: 5px; + border: 1px solid gray; background: #F0F0F2; } QPlainTextEdit#ActionWidget_plainTextEdit_Comment{ - border: 2px solid gray; - background: #F0F0F0; + border-radius: 5px; + border: 1px solid gray; + background: #FEFEFE; } +QWidget { + /*border-radius: 5px; + border: 1px solid gray;*/ +} QWidget#widgetControl { background: #E0E0E0; diff --git a/LibInstructorsAndTrainees/tasks/checkertask.cpp b/LibInstructorsAndTrainees/tasks/checkertask.cpp index 4dcd143..cfe14f8 100644 --- a/LibInstructorsAndTrainees/tasks/checkertask.cpp +++ b/LibInstructorsAndTrainees/tasks/checkertask.cpp @@ -22,6 +22,7 @@ CheckerTask::CheckerTask(ConnectorToServer* connectorToServer, TypeChecker type, ui->btnCheckup->setObjectName("btnCheckup"); ui->btnWrong->setObjectName("btnWrong"); ui->btnCompleted->setObjectName("btnCompleted"); + ui->groupBox_Report->setObjectName("groupBox_Report"); this->type = type;