diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
index 1464ea2..98f43fb 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp
@@ -22,8 +22,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->setupUi(this);
ui->btnSettings->setObjectName("btnSettings");
- ui->tabWidgetTasks->setObjectName("tabWidgetTasks");
- ui->widgetTop->setObjectName("widgetTop");
+ ui->tabWidget_Tasks->setObjectName("tabWidgetTasks");
+ ui->widget_Top->setObjectName("widgetTop");
#ifndef PROJECT_TYPE_DEBUG
ui->btnUpdateStyleSheet->setVisible(false);
@@ -77,12 +77,25 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
connect(connectorToServer,&ConnectorToServer::signal_msgFromClientReady,messangerWidget,&MessangerWidget::slot_msgFromClientReady);
- ui->horizontalLayout_3->addWidget(viewerTrainees);
+ //Размещение
+ ui->verticalLayout_Trainees->addWidget(viewerTrainees);
+
+ ui->verticalLayout_AMM->addWidget(ammTasksWidget);
+ ui->verticalLayout_FIM->addWidget(fimTasksWidget);
+
+ ui->verticalLayout_Messenger->addWidget(messangerWidget);
+
+ ui->verticalLayout_Instructors->addWidget(viewerInstructors);
+
+
+
+
+ /*
QWidget* wGB2 = new QWidget(this);
QHBoxLayout* lGB2 = new QHBoxLayout(this);
wGB2->setLayout(lGB2);
- lGB2->addWidget(ui->groupBox_2);
+ lGB2->addWidget(ui->groupBox_Tasks);
ui->horizontalLayout_3->addWidget(wGB2);
ui->verticalLayout_41->addWidget(ammTasksWidget);
@@ -91,26 +104,35 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->verticalLayout_2->addWidget(messangerWidget);
ui->verticalLayout_2->addWidget(viewerInstructors);
+ */
- ui->btnSetVersion->hide();
- viewerTrainees->setMinimumSize(500, 500);
+ viewerTrainees->setMinimumSize(900, 500);
viewerTrainees->setMaximumWidth(1050);
- wGB2->setMinimumSize(500, 500);
+
+ /*wGB2->setMinimumSize(500, 500);*/
//wGB2->setMaximumWidth(1050);
- viewerInstructors->setMinimumSize(400, 400);
+ ammTasksWidget->setMinimumSize(900, 500);
+ ammTasksWidget->setMaximumWidth(1050);
+ fimTasksWidget->setMinimumSize(900, 500);
+ fimTasksWidget->setMaximumWidth(1050);
+
+ viewerInstructors->setMinimumSize(450, 400);
viewerInstructors->setMaximumWidth(500);
viewerInstructors->setMaximumHeight(400);
- messangerWidget->setMinimumSize(400, 500);
+ messangerWidget->setMinimumSize(450, 700);
messangerWidget->setMaximumWidth(500);
+
ui->btnAuthorizationInstructor->setEnabled(false);
ui->btnEditorTrainees->setEnabled(false);
ui->btnEditorInstructors->setEnabled(false);
+
+ ui->btnSetVersion->hide();
}
InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget()
diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/InstructorsAndTrainees/instructorsandtraineeswidget.ui
index 85fb427..f0b4a4b 100644
--- a/InstructorsAndTrainees/instructorsandtraineeswidget.ui
+++ b/InstructorsAndTrainees/instructorsandtraineeswidget.ui
@@ -20,293 +20,363 @@
Form
- -
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 130
- 58
-
-
-
- Connection
-
-
-
- :/resources/icons/connectDB.png:/resources/icons/connectDB.png
-
-
-
- 32
- 32
-
-
-
- false
-
-
- Qt::ToolButtonTextUnderIcon
-
-
-
- -
-
-
-
- 130
- 58
-
-
-
- Authorization
-
-
-
- :/resources/icons/login-user.png:/resources/icons/login-user.png
-
-
-
- 32
- 32
-
-
-
- true
-
-
- Qt::ToolButtonTextUnderIcon
-
-
-
- -
-
-
-
- 32
- 32
-
-
-
-
- 32
- 32
-
-
-
-
-
-
- :/resources/icons/circleGray.png
-
-
- true
-
-
-
- -
-
-
- Server:
-
-
-
- -
-
-
- none
-
-
-
- -
-
-
-
- 32
- 32
-
-
-
-
- 32
- 32
-
-
-
-
-
-
- :/resources/icons/circleGray.png
-
-
- true
-
-
-
- -
-
-
-
- 16777215
- 40
-
-
-
- Logged in Instructor:
-
-
- Qt::AutoText
-
-
- false
-
-
-
- -
-
-
-
- 16777215
- 40
-
-
-
- none
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 58
- 58
-
-
-
- ChangeVersion
-
-
-
- -
-
-
-
- 58
- 58
-
-
-
- Editor Trainees
-
-
-
- :/resources/icons/DB-trainees.png:/resources/icons/DB-trainees.png
-
-
-
- 32
- 32
-
-
-
- Qt::ToolButtonTextUnderIcon
-
-
-
- -
-
-
-
- 58
- 58
-
-
-
- Editor Instructors
-
-
-
- :/resources/icons/DB-instructors.png:/resources/icons/DB-instructors.png
-
-
-
- 32
- 32
-
-
-
- Qt::ToolButtonTextUnderIcon
-
-
-
- -
-
-
-
- 58
- 58
-
-
-
- Settings
-
-
-
- :/resources/icons/settings.png:/resources/icons/settings.png
-
-
-
- 32
- 32
-
-
-
- Qt::ToolButtonTextUnderIcon
-
-
-
-
-
-
+
+
+ -
+
+
-
+
+
+
+ 130
+ 58
+
+
+
+ Connection
+
+
+
+ :/resources/icons/connectDB.png:/resources/icons/connectDB.png
+
+
+
+ 32
+ 32
+
+
+
+ false
+
+
+ Qt::ToolButtonTextUnderIcon
+
+
+
+ -
+
+
+
+ 130
+ 58
+
+
+
+ Authorization
+
+
+
+ :/resources/icons/login-user.png:/resources/icons/login-user.png
+
+
+
+ 32
+ 32
+
+
+
+ true
+
+
+ Qt::ToolButtonTextUnderIcon
+
+
+
+ -
+
+
+
+ 32
+ 32
+
+
+
+
+ 32
+ 32
+
+
+
+
+
+
+ :/resources/icons/circleGray.png
+
+
+ true
+
+
+
+ -
+
+
+ Server:
+
+
+
+ -
+
+
+ none
+
+
+
+ -
+
+
+
+ 32
+ 32
+
+
+
+
+ 32
+ 32
+
+
+
+
+
+
+ :/resources/icons/circleGray.png
+
+
+ true
+
+
+
+ -
+
+
+
+ 16777215
+ 40
+
+
+
+ Logged in Instructor:
+
+
+ Qt::AutoText
+
+
+ false
+
+
+
+ -
+
+
+
+ 16777215
+ 40
+
+
+
+ none
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 58
+ 58
+
+
+
+ ChangeVersion
+
+
+
+ -
+
+
+
+ 58
+ 58
+
+
+
+ Editor Trainees
+
+
+
+ :/resources/icons/DB-trainees.png:/resources/icons/DB-trainees.png
+
+
+
+ 32
+ 32
+
+
+
+ Qt::ToolButtonTextUnderIcon
+
+
+
+ -
+
+
+
+ 58
+ 58
+
+
+
+ Editor Instructors
+
+
+
+ :/resources/icons/DB-instructors.png:/resources/icons/DB-instructors.png
+
+
+
+ 32
+ 32
+
+
+
+ Qt::ToolButtonTextUnderIcon
+
+
+
+ -
+
+
+
+ 58
+ 58
+
+
+
+ Settings
+
+
+
+ :/resources/icons/settings.png:/resources/icons/settings.png
+
+
+
+ 32
+ 32
+
+
+
+ Qt::ToolButtonTextUnderIcon
+
+
-
-
+
+
+
+
+ -
+
-
-
+
-
-
+
-
-
+
+
+ Trainees
+
+
+
-
+
+
+
+
+
+ -
+
+
+ Tasks
+
+
+
-
+
+
-
+
+
+ 0
+
+
+
+ AMM
+
+
+
-
+
+
+
+
+
+
+ FIM
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
-
-
+
+
+ Messenger
+
+
+
-
+
+
+
+
+
+ -
+
+
+ Instructors
+
+
+
-
+
+
+
+
@@ -314,46 +384,6 @@
- -
-
-
- Tasks
-
-
-
-
-
-
-
-
-
- 1
-
-
-
- AMM
-
-
-
-
-
-
-
-
-
-
- FIM
-
-
- -
-
-
-
-
-
-
-
-
-
-
-