From 2a2ad69a4413467cc4d8893219360c0c1241fe99 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Wed, 14 Jan 2026 18:26:21 +0300 Subject: [PATCH] refact --- FILES/CSS/styleSheetMain.css | 228 +++++++++++------------ LibServer/settings/dialogsettingstray.ui | 4 +- 2 files changed, 107 insertions(+), 125 deletions(-) diff --git a/FILES/CSS/styleSheetMain.css b/FILES/CSS/styleSheetMain.css index 71cf626..e7b1794 100644 --- a/FILES/CSS/styleSheetMain.css +++ b/FILES/CSS/styleSheetMain.css @@ -9,14 +9,10 @@ QWidget { font-family: Tahoma; font-size: 12pt; icon-size: 24px; - /*background-color: green;*/ } - QWidget#widgetControl { - /*border: 1px solid gray;*/ background: #E0E0E0; } - QWidget#viewerTrainees { padding-left: 20px; @@ -27,6 +23,7 @@ QDialog { stop: 0 #e6e7ea, stop: 1 #eaebee); } + QLineEdit, QTextEdit, QComboBox { border: 1px solid gray; border-radius: 2px; @@ -46,41 +43,42 @@ QGroupBox { background: #E0E0E0; border: 1px solid gray; border-radius: 3px; - /*margin-top: 6ex; leave space at the top for the title */ - margin-top: 21px; - - + margin-top: 26px; + font-size: 13pt; } QGroupBox#groupBox_Report { - /*background: #F9F9F9;*/ background: #FFFFFF; } QGroupBox::title { border: 1px solid gray; border-bottom: none; - /*border-radius: 4px;*/ border-top-left-radius: 4px; border-top-right-radius: 4px; subcontrol-origin: margin; subcontrol-position: top left; padding-left: 10px; padding-right: 10px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #A0CECE, stop: 1 #FFFFFF); - + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #fafafa, stop: 0.1 #E0E0E0, + stop: 0.6 #E0E0E0, stop: 1.0 #fafafa); + color: black; + min-height: 25px; } + QPushButton, QToolButton { - border: 2px solid #8f8f91; + border: 3px solid #8f8f91; border-style: outset; border-radius: 5px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #f6f7fa, stop: 1 #dadbde); + background-color: #5d85B5; min-width: 75px; height: 55px; - padding: 1px; - + padding: 1px; qproperty-iconSize: 32px; + color: white; +} +QToolButton::icon { + background-color: white; } QPushButton { @@ -93,14 +91,14 @@ QToolButton { } QToolButton#btnSend, QToolButton#btnDelete, QToolButton#btnCheck, QToolButton#btnOnlyActive, QToolButton#btnStatus, -QToolButton#btnSave, QToolButton#btnUpdateStyle, QToolButton#btnSetVersion, -QToolButton#btnAssignTask, QToolButton#btnCheckDB, QToolButton#btnRepare, QToolButton#btnDocsUpdating, +QToolButton#btnSave, QToolButton#btnUpdateStyle, QToolButton#btnSetVersion, QToolButton#btnDocsUpdating, +QToolButton#btnAssignTask, QToolButton#btnAssign { width: 100px; height: 55px; } -QToolButton#btnCheckDB, QToolButton#btnUpdateDocs { - width: 100px; +QToolButton#btnCheckDB, QToolButton#btnUpdateDocs, QToolButton#btnRepare { + width: 150px; height: 55px; } @@ -113,33 +111,28 @@ QToolButton#btnViewPassword, QToolButton#btnChangePassword { QPushButton:flat, QToolButton:flat { border: none; /* no border for a flat push button */ } +QPushButton:disabled, QToolButton:disabled { + background-color: #777777; +} QPushButton:default, QToolButton:default { - border-color: /*darkblue*/#2d5585; /*make the default button prominent */ + border-color: white; /*make the default button prominent */ + border-width: 4px; + border: 3px outset #2d5585; } QPushButton:hover , QToolButton:hover { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #fafafa, stop: 0.4 #f4f4f4, - stop: 0.5 #e7e7e7, stop: 1.0 #fafafa); + background-color: #9dc5f5; } QPushButton:pressed, QToolButton:pressed { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #dadbde, stop: 1 #f6f7fa); + background-color: #8db5e5; border-style: inset; } QPushButton:checked, QToolButton:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #dadbde, stop: 1 #f6f7fa); + background-color: #9dc5f5; + background-color: #8db5e5; border-style: inset; } -/* -QDialogButtonBox { - border: 2px solid #8f8f91; - border-style: outset; - border-radius: 5px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #f6f7fa, stop: 1 #dadbde); -} -*/ QCheckBox { @@ -148,7 +141,6 @@ QCheckBox { QCheckBox#checkAutoStart, QCheckBox#checkLocalhost { spacing: 0px; } - QCheckBox::indicator:checked { width: 24px; height: 24px; @@ -160,22 +152,18 @@ QCheckBox::indicator:!checked { image: url(:/resources/icons/chekNo.png); } + 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; */ @@ -200,18 +188,14 @@ QTreeWidget::branch:open:has-children:has-siblings { QTreeWidget::item:hover, QTreeWidget::branch:hover { - background: #aee1ff; - background: #C0EEEE; + background: #EEEEEE; } QTreeWidget::item:selected { - /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc);*/ - background: #6ea1f1; - background: #A0CECE; + background: #9dc5f5; color: #000000; } - QTreeWidget::indicator:checked { width: 24px; height: 24px; @@ -225,34 +209,23 @@ QTreeWidget::indicator:!checked { QHeaderView::section { - /* - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #c1c1c1, stop: 0.5 #505050, - stop: 0.6 #434343, stop:1 #656565);*/ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #A0CECE, stop: 1 #FFFFFF); - color: black; + stop: 0 #2d5585, stop: 1 #9dc5f5); + color: white; padding-left: 4px; border: 1px solid #6c6c6c; - border-radius: 2px; - + border-radius: 2px; font-size: 13pt; } QTabWidget::pane { /* The tab widget frame */ border-top: 1px solid #C2C7CB; - /*background-image: url(:/resources/icons/messengerPrint.png);*/ + border: 1px solid #C2C7CB; } QTabWidget::pane#tabWidgetTasks { /* The tab widget frame */ border-top: 1px solid #C2C7CB; - /*background-image: url(:/resources/icons/messengerPrint.png);*/ - /* - padding-left: -18px; - padding-right: -18px; - padding-top: -8px; - padding-bottom: -8px; - */ + border: 1px solid #C2C7CB; } QTabWidget::tab-bar { left: 0px; /* move to the right by 0px */ @@ -262,41 +235,37 @@ QTabBar::tab { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3); + border: 2px solid #C4C4C3; border-bottom-color: #C2C7CB; /* same as the pane color */ border-top-left-radius: 4px; border-top-right-radius: 4px; min-width: 40ex; - padding: 2px; - - font-size: 12pt; - + padding: 2px; + font-size: 12pt; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0CECE, stop: 1 #FFFFFF); + + background-color: #5d85B5; + color: black; + height: 20px; +} + +QTabBar::tab:selected { + border-style: outset; + background: #8db5e5; } - - -/* -QTabBar::tab:selected { - border-color: #9B9B9B; - border-bottom-color: #C2C7CB; - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc); - color: #ffffff; -} -*/ -QTabBar::tab:selected { - /*background: #ffffff;*/ -} QTabBar::tab:!selected { - margin-top: 10px; /* make non-selected tabs look smaller */ - /*background: #ffffff;*/ + border-style: inset; + background: #aaaaaa; } - QTabBar::tab:hover { background: #aee1ff; - background: #C0EEEE; + background: #EEEEEE; + background-color: #9dc5f5; + background: #8db5e5; } QTabBar::scroller { /* the width of the scroll buttons */ @@ -310,73 +279,79 @@ QTabBar QToolButton { /* the scroll buttons are tool buttons */ } QListWidget::item { - /*padding: -5px;*/ + } QListWidget#oneDialogMessenger { - /*background: #ddeeff;*/ - - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #B0DEDE, stop: 1 #FFFFFF); - + background-color: white; border: 1px solid gray; border-radius: 2px; } +QListWidget::item:selected { + color: #000000; +} +QListWidget#oneDialogMessenger::item:selected { + color: #000000; + background: #ffffff; +} +QListWidget::item:hover { + background: #EEEEEE; +} +QListWidget#oneDialogMessenger::item:hover { + background: #ffffff; +} QListWidget#subProcItemListWidget::item:hover { background: #ffffff; } +QListWidget { + selection-background-color: #9dc5f5;; /* Цвет выделенного элемента */ + selection-color: black; /* Цвет текста выделенного элемента */ + show-decoration-selected: false; /* Показывать выделение на выбранном элементе */ + outline: none; /* Без выделения фокуса */ +} + + QTextEdit { padding: -20px; font-size: 12pt; } QTextEdit#editMsg { - height: 65px; /**/ - background: #ddeeff; + height: 65px; background: #ffffff; } QTextEdit#MsgWidgetEditTextLocal { - /*background: tlightgreen;*/ - background: #ddffdd; + background: #EEEEEE; border-radius: 8px; } QTextEdit#MsgWidgetEditTextRemote { - /*background: lightblue;*/ - /*background: #ddeeff;*/ - background: #ffffff; + background: #9dc5f5; border-radius: 8px; } QLabel#MsgWidgetLblTimeLocal { font-size: 9pt; - /*background: yellow;*/ } QLabel#MsgWidgetLblTimeRemote { font-size: 9pt; - /*background: yellow;*/ } QLabel#MsgWidgetLblNameLocal { font-size: 9pt; - /*background: yellow;*/ } QLabel#MsgWidgetLblNameRemote { font-size: 9pt; - /*background: yellow;*/ } QLabel#MsgWidgetLblAvatar { - /*background: pink;*/ -} +} QLabel#MessangerWidgetLblUser { background: #ddeeff; padding-left: 4px; border-radius: 4px; - - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #A0CECE, stop: 1 #FFFFFF); + background: #9dc5f5; } QLabel#MessangerWidgetLblAvatar { @@ -385,9 +360,9 @@ QLabel#MessangerWidgetLblLoggedIn { } - QLabel#PersonalCard_lblName { font-size: 16pt; + color: #2d5585; } QLabel#ReportFimWidget_label_MMEL, QLabel#ActionWidget_lbl_Type { @@ -433,22 +408,29 @@ QPlainTextEdit#ActionWidget_plainTextEdit_Comment{ background: #FEFEFE; } -QWidget { - /*border-radius: 5px; - border: 1px solid gray;*/ -} - -QWidget#widgetControl { - background: #E0E0E0; -} - QPlainTextEdit#plainText{ /*Репорт*/ margin-left: 50pt; margin-right: 100pt; } -/**/ -QComboBox { - /*background: #ffffff; - border-radius: 5px;*/ + +QComboBox::drop-down { + subcontrol-position: right center; /*Выравнивание стрелки по центру */ + width: 20px; /* Ширина области со стрелкой */ + border: none; + border-left: 1px solid gray; + background: #E0E0E0; +} +QComboBox::down-arrow { + image: url(:/resources/icons/branch-open.png); /* Подставляем свою картинку стрелки */ + width: 16px; /* Размер иконки */ + height: 16px; +} + +QComboBox QAbstractItemView { + selection-background-color: #9dc5f5;; /* Цвет выделенного элемента */ + selection-color: black; /* Цвет текста выделенного элемента */ + alternate-background-color: lightgrey; /* Чередующиеся строки */ + show-decoration-selected: true; /* Показывать выделение на выбранном элементе */ + outline: none; /* Без выделения фокуса */ } diff --git a/LibServer/settings/dialogsettingstray.ui b/LibServer/settings/dialogsettingstray.ui index 148d274..b6f3ea7 100644 --- a/LibServer/settings/dialogsettingstray.ui +++ b/LibServer/settings/dialogsettingstray.ui @@ -7,13 +7,13 @@ 0 0 650 - 400 + 450 650 - 400 + 450