From 457a9c202e7cc99bbc9abb41e55b5a31a67f0dfe Mon Sep 17 00:00:00 2001 From: krivoshein Date: Mon, 2 Jun 2025 13:24:18 +0300 Subject: [PATCH] Style5 --- InstructorsAndTrainees/dialogsettings.ui | 38 ++-- .../instructors/viewerinstructors.ui | 90 ++++---- .../instructorsandtraineeswidget.cpp | 41 +++- .../instructorsandtraineeswidget.ui | 128 +++++++---- .../messanger/messangerwidget.ui | 209 +++++++++--------- .../tasks/ammtaskswidget.ui | 6 + .../tasks/fimtaskswidget.ui | 6 + .../trainees/viewertrainees.ui | 112 ++++------ 8 files changed, 333 insertions(+), 297 deletions(-) diff --git a/InstructorsAndTrainees/dialogsettings.ui b/InstructorsAndTrainees/dialogsettings.ui index 19690f7..6ccc348 100644 --- a/InstructorsAndTrainees/dialogsettings.ui +++ b/InstructorsAndTrainees/dialogsettings.ui @@ -34,17 +34,17 @@ - + - + Main - + - + @@ -71,24 +71,24 @@ - + Server - + - + - + Address - + Qt::Horizontal @@ -116,16 +116,16 @@ - + - + Port - + Qt::Horizontal @@ -159,16 +159,16 @@ - + - + Auto start - + Qt::Horizontal @@ -195,7 +195,7 @@ - + @@ -230,13 +230,13 @@ - + Additional - + @@ -290,7 +290,7 @@ - + Qt::Vertical diff --git a/InstructorsAndTrainees/instructors/viewerinstructors.ui b/InstructorsAndTrainees/instructors/viewerinstructors.ui index e8e12bf..e21ea15 100644 --- a/InstructorsAndTrainees/instructors/viewerinstructors.ui +++ b/InstructorsAndTrainees/instructors/viewerinstructors.ui @@ -23,58 +23,44 @@ - - - - 10 - - - - Instructors - - - - - - - - - - - - - false - - - - 130 - 58 - - - - Editor of Instructors - - - - :/resources/icons/DB-instructors.png:/resources/icons/DB-instructors.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - - + + + + + + + + + + false + + + + 130 + 58 + + + + Editor of Instructors + + + + :/resources/icons/DB-instructors.png:/resources/icons/DB-instructors.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 98f43fb..128bed3 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -25,6 +25,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->tabWidget_Tasks->setObjectName("tabWidgetTasks"); ui->widget_Top->setObjectName("widgetTop"); + ui->groupBox_Trainees->setObjectName("groupBox_Trainees"); + #ifndef PROJECT_TYPE_DEBUG ui->btnUpdateStyleSheet->setVisible(false); #endif @@ -49,7 +51,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : connect(connectorToServer,&ConnectorToServer::sigLoginResult,this,&InstructorsAndTraineesWidget::checkLoginResult); connect(connectorToServer,&ConnectorToServer::sigDeLoginResult,this,&InstructorsAndTraineesWidget::checkDeLoginResult); - viewerTrainees = new ViewerTrainees(connectorToServer, this); + viewerTrainees = new ViewerTrainees(connectorToServer, this); viewerInstructors = new ViewerInstructors(connectorToServer, this); connect(this, &InstructorsAndTraineesWidget::signal_NeedUpdateUI, viewerTrainees, &ViewerTrainees::slot_NeedUpdateUI); connect(this, &InstructorsAndTraineesWidget::signal_NeedUpdateUI, viewerInstructors, &ViewerInstructors::slot_NeedUpdateUI); @@ -107,24 +109,39 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : */ - viewerTrainees->setMinimumSize(900, 500); - viewerTrainees->setMaximumWidth(1050); + //viewerTrainees->setMinimumSize(900, 500); + //viewerTrainees->setMaximumWidth(1050); /*wGB2->setMinimumSize(500, 500);*/ //wGB2->setMaximumWidth(1050); - ammTasksWidget->setMinimumSize(900, 500); - ammTasksWidget->setMaximumWidth(1050); - fimTasksWidget->setMinimumSize(900, 500); - fimTasksWidget->setMaximumWidth(1050); + //ammTasksWidget->setMinimumSize(1000, 500); + //ammTasksWidget->setMaximumWidth(2000); + //fimTasksWidget->setMinimumSize(1000, 500); + //fimTasksWidget->setMaximumWidth(2000); + //ui->tabWidget_Tasks->setMaximumWidth(2000); + //ui->groupBox_Tasks->setMaximumWidth(2000); - viewerInstructors->setMinimumSize(450, 400); - viewerInstructors->setMaximumWidth(500); - viewerInstructors->setMaximumHeight(400); + //viewerInstructors->setMinimumSize(450, 400); + //viewerInstructors->setMaximumWidth(500); + //viewerInstructors->setMaximumHeight(400); - messangerWidget->setMinimumSize(450, 700); - messangerWidget->setMaximumWidth(500); + //messangerWidget->setMinimumSize(450, 700); + //messangerWidget->setMaximumWidth(500); + + ui->groupBox_Messenger->setMaximumWidth(500); + ui->groupBox_Instructors->setMaximumWidth(500); + + ui->groupBox_Messenger->setMinimumWidth(500); + ui->groupBox_Instructors->setMinimumWidth(500); + + ui->groupBox_Messenger->setMinimumHeight(600); + ui->groupBox_Instructors->setMinimumHeight(400); + ui->groupBox_Instructors->setMaximumHeight(400); + + ui->groupBox_Trainees->setMinimumWidth(700); + ui->groupBox_Tasks->setMinimumWidth(700); ui->btnAuthorizationInstructor->setEnabled(false); diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/InstructorsAndTrainees/instructorsandtraineeswidget.ui index f0b4a4b..e18d4ce 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.ui +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.ui @@ -10,6 +10,12 @@ 901 + + + 0 + 0 + + Tahoma @@ -24,6 +30,12 @@ + + + 0 + 0 + + @@ -298,6 +310,12 @@ + + + 0 + 0 + + Trainees @@ -308,54 +326,78 @@ - - - - Tasks - - - - - - - - 0 - - - - AMM - - - - - - - - - - FIM - - - - - - - - - - - - - - + + + + + 0 + 0 + + + + Tasks + + + + + + + + 1 + + + + + 0 + 0 + + + + AMM + + + + + + + + + + + 0 + 0 + + + + FIM + + + + + + + + + + + + + + + + + 0 + 0 + + Messenger @@ -368,6 +410,12 @@ + + + 0 + 0 + + Instructors diff --git a/InstructorsAndTrainees/messanger/messangerwidget.ui b/InstructorsAndTrainees/messanger/messangerwidget.ui index ff637d9..3e3db99 100644 --- a/InstructorsAndTrainees/messanger/messangerwidget.ui +++ b/InstructorsAndTrainees/messanger/messangerwidget.ui @@ -21,116 +21,107 @@ - - - - - Messenger + + + + + QLayout::SetDefaultConstraint - - - - - QLayout::SetDefaultConstraint - - - - - - 0 - 0 - - - - - 0 - 70 - - - - - 16777215 - 1000 - - - - - - - - - - - 0 - 0 - - - - - 65 - 58 - - - - - 1000 - 1000 - - - - Send - - - - :/resources/icons/sendMsg.png:/resources/icons/sendMsg.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - - - - QLayout::SetDefaultConstraint - - - - - - 0 - 0 - - - - 0 - - - - Tab 1 - - - - - Tab 2 - - - - - - - - + + + + + 0 + 0 + + + + 0 + + + + Tab 1 + + + + + Tab 2 + + + + + + + + + + QLayout::SetDefaultConstraint + + + + + + 0 + 0 + + + + + 0 + 70 + + + + + 16777215 + 1000 + + + + + + + + + + + 0 + 0 + + + + + 65 + 58 + + + + + 1000 + 1000 + + + + Send + + + + :/resources/icons/sendMsg.png:/resources/icons/sendMsg.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.ui b/InstructorsAndTrainees/tasks/ammtaskswidget.ui index a657174..0bb88e1 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.ui +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.ui @@ -10,6 +10,12 @@ 300 + + + 0 + 0 + + Tahoma diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.ui b/InstructorsAndTrainees/tasks/fimtaskswidget.ui index e827cee..654b15d 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.ui +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.ui @@ -10,6 +10,12 @@ 472 + + + 0 + 0 + + Form diff --git a/InstructorsAndTrainees/trainees/viewertrainees.ui b/InstructorsAndTrainees/trainees/viewertrainees.ui index 4c44d3c..6086340 100644 --- a/InstructorsAndTrainees/trainees/viewertrainees.ui +++ b/InstructorsAndTrainees/trainees/viewertrainees.ui @@ -20,74 +20,56 @@ Trainees - - + + - - - - 10 - - - - Trainees - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - 130 - 58 - - - - Editor of Trainees - - - - :/resources/icons/DB-trainees.png:/resources/icons/DB-trainees.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - + + + + + + - - - + + + + + + + + + + + + + false + + + + 130 + 58 + + + + Editor of Trainees + + + + :/resources/icons/DB-trainees.png:/resources/icons/DB-trainees.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + +