This commit is contained in:
2025-06-02 10:21:00 +03:00
parent 1782f15603
commit e6d1c568f7
2 changed files with 378 additions and 326 deletions

View File

@@ -22,8 +22,8 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
ui->btnSettings->setObjectName("btnSettings"); ui->btnSettings->setObjectName("btnSettings");
ui->tabWidgetTasks->setObjectName("tabWidgetTasks"); ui->tabWidget_Tasks->setObjectName("tabWidgetTasks");
ui->widgetTop->setObjectName("widgetTop"); ui->widget_Top->setObjectName("widgetTop");
#ifndef PROJECT_TYPE_DEBUG #ifndef PROJECT_TYPE_DEBUG
ui->btnUpdateStyleSheet->setVisible(false); ui->btnUpdateStyleSheet->setVisible(false);
@@ -77,12 +77,25 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
connect(connectorToServer,&ConnectorToServer::signal_msgFromClientReady,messangerWidget,&MessangerWidget::slot_msgFromClientReady); 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); QWidget* wGB2 = new QWidget(this);
QHBoxLayout* lGB2 = new QHBoxLayout(this); QHBoxLayout* lGB2 = new QHBoxLayout(this);
wGB2->setLayout(lGB2); wGB2->setLayout(lGB2);
lGB2->addWidget(ui->groupBox_2); lGB2->addWidget(ui->groupBox_Tasks);
ui->horizontalLayout_3->addWidget(wGB2); ui->horizontalLayout_3->addWidget(wGB2);
ui->verticalLayout_41->addWidget(ammTasksWidget); ui->verticalLayout_41->addWidget(ammTasksWidget);
@@ -91,26 +104,35 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
ui->verticalLayout_2->addWidget(messangerWidget); ui->verticalLayout_2->addWidget(messangerWidget);
ui->verticalLayout_2->addWidget(viewerInstructors); ui->verticalLayout_2->addWidget(viewerInstructors);
*/
ui->btnSetVersion->hide();
viewerTrainees->setMinimumSize(500, 500); viewerTrainees->setMinimumSize(900, 500);
viewerTrainees->setMaximumWidth(1050); viewerTrainees->setMaximumWidth(1050);
wGB2->setMinimumSize(500, 500);
/*wGB2->setMinimumSize(500, 500);*/
//wGB2->setMaximumWidth(1050); //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->setMaximumWidth(500);
viewerInstructors->setMaximumHeight(400); viewerInstructors->setMaximumHeight(400);
messangerWidget->setMinimumSize(400, 500); messangerWidget->setMinimumSize(450, 700);
messangerWidget->setMaximumWidth(500); messangerWidget->setMaximumWidth(500);
ui->btnAuthorizationInstructor->setEnabled(false); ui->btnAuthorizationInstructor->setEnabled(false);
ui->btnEditorTrainees->setEnabled(false); ui->btnEditorTrainees->setEnabled(false);
ui->btnEditorInstructors->setEnabled(false); ui->btnEditorInstructors->setEnabled(false);
ui->btnSetVersion->hide();
} }
InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget() InstructorsAndTraineesWidget::~InstructorsAndTraineesWidget()

View File

@@ -20,293 +20,363 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_0"> <layout class="QVBoxLayout" name="verticalLayout_Main">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_3"> <widget class="QWidget" name="widget_Top" native="true">
<item> <layout class="QGridLayout" name="gridLayout_6">
<widget class="QWidget" name="widgetTop" native="true"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_6"> <layout class="QHBoxLayout" name="horizontalLayout_Top">
<item row="0" column="0"> <item>
<layout class="QVBoxLayout" name="verticalLayout_4"> <widget class="QToolButton" name="btnConnectionToServer">
<item> <property name="minimumSize">
<layout class="QHBoxLayout" name="horizontalLayout_1"> <size>
<item> <width>130</width>
<widget class="QToolButton" name="btnConnectionToServer"> <height>58</height>
<property name="minimumSize"> </size>
<size> </property>
<width>130</width> <property name="text">
<height>58</height> <string>Connection</string>
</size> </property>
</property> <property name="icon">
<property name="text"> <iconset resource="resources.qrc">
<string>Connection</string> <normaloff>:/resources/icons/connectDB.png</normaloff>:/resources/icons/connectDB.png</iconset>
</property> </property>
<property name="icon"> <property name="iconSize">
<iconset resource="resources.qrc"> <size>
<normaloff>:/resources/icons/connectDB.png</normaloff>:/resources/icons/connectDB.png</iconset> <width>32</width>
</property> <height>32</height>
<property name="iconSize"> </size>
<size> </property>
<width>32</width> <property name="checkable">
<height>32</height> <bool>false</bool>
</size> </property>
</property> <property name="toolButtonStyle">
<property name="checkable"> <enum>Qt::ToolButtonTextUnderIcon</enum>
<bool>false</bool> </property>
</property> </widget>
<property name="toolButtonStyle"> </item>
<enum>Qt::ToolButtonTextUnderIcon</enum> <item>
</property> <widget class="QToolButton" name="btnAuthorizationInstructor">
</widget> <property name="minimumSize">
</item> <size>
<item> <width>130</width>
<widget class="QToolButton" name="btnAuthorizationInstructor"> <height>58</height>
<property name="minimumSize"> </size>
<size> </property>
<width>130</width> <property name="text">
<height>58</height> <string>Authorization</string>
</size> </property>
</property> <property name="icon">
<property name="text"> <iconset resource="resources.qrc">
<string>Authorization</string> <normaloff>:/resources/icons/login-user.png</normaloff>:/resources/icons/login-user.png</iconset>
</property> </property>
<property name="icon"> <property name="iconSize">
<iconset resource="resources.qrc"> <size>
<normaloff>:/resources/icons/login-user.png</normaloff>:/resources/icons/login-user.png</iconset> <width>32</width>
</property> <height>32</height>
<property name="iconSize"> </size>
<size> </property>
<width>32</width> <property name="checkable">
<height>32</height> <bool>true</bool>
</size> </property>
</property> <property name="toolButtonStyle">
<property name="checkable"> <enum>Qt::ToolButtonTextUnderIcon</enum>
<bool>true</bool> </property>
</property> </widget>
<property name="toolButtonStyle"> </item>
<enum>Qt::ToolButtonTextUnderIcon</enum> <item>
</property> <widget class="QLabel" name="lblDBisConnected">
</widget> <property name="minimumSize">
</item> <size>
<item> <width>32</width>
<widget class="QLabel" name="lblDBisConnected"> <height>32</height>
<property name="minimumSize"> </size>
<size> </property>
<width>32</width> <property name="maximumSize">
<height>32</height> <size>
</size> <width>32</width>
</property> <height>32</height>
<property name="maximumSize"> </size>
<size> </property>
<width>32</width> <property name="text">
<height>32</height> <string/>
</size> </property>
</property> <property name="pixmap">
<property name="text"> <pixmap resource="resources.qrc">:/resources/icons/circleGray.png</pixmap>
<string/> </property>
</property> <property name="scaledContents">
<property name="pixmap"> <bool>true</bool>
<pixmap resource="resources.qrc">:/resources/icons/circleGray.png</pixmap> </property>
</property> </widget>
<property name="scaledContents"> </item>
<bool>true</bool> <item>
</property> <widget class="QLabel" name="lblServerPrefix">
</widget> <property name="text">
</item> <string>Server: </string>
<item> </property>
<widget class="QLabel" name="lblServerPrefix"> </widget>
<property name="text"> </item>
<string>Server: </string> <item>
</property> <widget class="QLabel" name="lblServer">
</widget> <property name="text">
</item> <string>none</string>
<item> </property>
<widget class="QLabel" name="lblServer"> </widget>
<property name="text"> </item>
<string>none</string> <item>
</property> <widget class="QLabel" name="lblLoggedIn">
</widget> <property name="minimumSize">
</item> <size>
<item> <width>32</width>
<widget class="QLabel" name="lblLoggedIn"> <height>32</height>
<property name="minimumSize"> </size>
<size> </property>
<width>32</width> <property name="maximumSize">
<height>32</height> <size>
</size> <width>32</width>
</property> <height>32</height>
<property name="maximumSize"> </size>
<size> </property>
<width>32</width> <property name="text">
<height>32</height> <string/>
</size> </property>
</property> <property name="pixmap">
<property name="text"> <pixmap resource="resources.qrc">:/resources/icons/circleGray.png</pixmap>
<string/> </property>
</property> <property name="scaledContents">
<property name="pixmap"> <bool>true</bool>
<pixmap resource="resources.qrc">:/resources/icons/circleGray.png</pixmap> </property>
</property> </widget>
<property name="scaledContents"> </item>
<bool>true</bool> <item>
</property> <widget class="QLabel" name="lblLoggedInPrefix">
</widget> <property name="maximumSize">
</item> <size>
<item> <width>16777215</width>
<widget class="QLabel" name="lblLoggedInPrefix"> <height>40</height>
<property name="maximumSize"> </size>
<size> </property>
<width>16777215</width> <property name="text">
<height>40</height> <string>Logged in Instructor: </string>
</size> </property>
</property> <property name="textFormat">
<property name="text"> <enum>Qt::AutoText</enum>
<string>Logged in Instructor: </string> </property>
</property> <property name="scaledContents">
<property name="textFormat"> <bool>false</bool>
<enum>Qt::AutoText</enum> </property>
</property> </widget>
<property name="scaledContents"> </item>
<bool>false</bool> <item>
</property> <widget class="QLabel" name="lblLoggedInInstructor">
</widget> <property name="maximumSize">
</item> <size>
<item> <width>16777215</width>
<widget class="QLabel" name="lblLoggedInInstructor"> <height>40</height>
<property name="maximumSize"> </size>
<size> </property>
<width>16777215</width> <property name="text">
<height>40</height> <string>none</string>
</size> </property>
</property> </widget>
<property name="text"> </item>
<string>none</string> <item>
</property> <spacer name="horizontalSpacer">
</widget> <property name="orientation">
</item> <enum>Qt::Horizontal</enum>
<item> </property>
<spacer name="horizontalSpacer"> <property name="sizeHint" stdset="0">
<property name="orientation"> <size>
<enum>Qt::Horizontal</enum> <width>40</width>
</property> <height>20</height>
<property name="sizeHint" stdset="0"> </size>
<size> </property>
<width>40</width> </spacer>
<height>20</height> </item>
</size> <item>
</property> <widget class="QToolButton" name="btnSetVersion">
</spacer> <property name="minimumSize">
</item> <size>
<item> <width>58</width>
<widget class="QToolButton" name="btnSetVersion"> <height>58</height>
<property name="minimumSize"> </size>
<size> </property>
<width>58</width> <property name="text">
<height>58</height> <string>ChangeVersion</string>
</size> </property>
</property> </widget>
<property name="text"> </item>
<string>ChangeVersion</string> <item>
</property> <widget class="QToolButton" name="btnEditorTrainees">
</widget> <property name="minimumSize">
</item> <size>
<item> <width>58</width>
<widget class="QToolButton" name="btnEditorTrainees"> <height>58</height>
<property name="minimumSize"> </size>
<size> </property>
<width>58</width> <property name="text">
<height>58</height> <string>Editor Trainees</string>
</size> </property>
</property> <property name="icon">
<property name="text"> <iconset resource="resources.qrc">
<string>Editor Trainees</string> <normaloff>:/resources/icons/DB-trainees.png</normaloff>:/resources/icons/DB-trainees.png</iconset>
</property> </property>
<property name="icon"> <property name="iconSize">
<iconset resource="resources.qrc"> <size>
<normaloff>:/resources/icons/DB-trainees.png</normaloff>:/resources/icons/DB-trainees.png</iconset> <width>32</width>
</property> <height>32</height>
<property name="iconSize"> </size>
<size> </property>
<width>32</width> <property name="toolButtonStyle">
<height>32</height> <enum>Qt::ToolButtonTextUnderIcon</enum>
</size> </property>
</property> </widget>
<property name="toolButtonStyle"> </item>
<enum>Qt::ToolButtonTextUnderIcon</enum> <item>
</property> <widget class="QToolButton" name="btnEditorInstructors">
</widget> <property name="minimumSize">
</item> <size>
<item> <width>58</width>
<widget class="QToolButton" name="btnEditorInstructors"> <height>58</height>
<property name="minimumSize"> </size>
<size> </property>
<width>58</width> <property name="text">
<height>58</height> <string>Editor Instructors</string>
</size> </property>
</property> <property name="icon">
<property name="text"> <iconset resource="resources.qrc">
<string>Editor Instructors</string> <normaloff>:/resources/icons/DB-instructors.png</normaloff>:/resources/icons/DB-instructors.png</iconset>
</property> </property>
<property name="icon"> <property name="iconSize">
<iconset resource="resources.qrc"> <size>
<normaloff>:/resources/icons/DB-instructors.png</normaloff>:/resources/icons/DB-instructors.png</iconset> <width>32</width>
</property> <height>32</height>
<property name="iconSize"> </size>
<size> </property>
<width>32</width> <property name="toolButtonStyle">
<height>32</height> <enum>Qt::ToolButtonTextUnderIcon</enum>
</size> </property>
</property> </widget>
<property name="toolButtonStyle"> </item>
<enum>Qt::ToolButtonTextUnderIcon</enum> <item>
</property> <widget class="QToolButton" name="btnSettings">
</widget> <property name="minimumSize">
</item> <size>
<item> <width>58</width>
<widget class="QToolButton" name="btnSettings"> <height>58</height>
<property name="minimumSize"> </size>
<size> </property>
<width>58</width> <property name="text">
<height>58</height> <string>Settings</string>
</size> </property>
</property> <property name="icon">
<property name="text"> <iconset resource="resources.qrc">
<string>Settings</string> <normaloff>:/resources/icons/settings.png</normaloff>:/resources/icons/settings.png</iconset>
</property> </property>
<property name="icon"> <property name="iconSize">
<iconset resource="resources.qrc"> <size>
<normaloff>:/resources/icons/settings.png</normaloff>:/resources/icons/settings.png</iconset> <width>32</width>
</property> <height>32</height>
<property name="iconSize"> </size>
<size> </property>
<width>32</width> <property name="toolButtonStyle">
<height>32</height> <enum>Qt::ToolButtonTextUnderIcon</enum>
</size> </property>
</property> </widget>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </item>
</item> </layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_Bottom">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_L">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_1"> <layout class="QHBoxLayout" name="horizontalLayout_L">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"/> <widget class="QGroupBox" name="groupBox_Trainees">
<property name="title">
<string>Trainees</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_Trainees"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_Tasks">
<property name="title">
<string>Tasks</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="2" column="0">
<layout class="QVBoxLayout" name="verticalLayout_Tasks">
<item>
<widget class="QTabWidget" name="tabWidget_Tasks">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab_AMM">
<attribute name="title">
<string>AMM</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_AMM"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_FIM">
<attribute name="title">
<string>FIM</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_FIM"/>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_R">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"/> <widget class="QGroupBox" name="groupBox_Messenger">
<property name="title">
<string>Messenger</string>
</property>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_Messenger"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_Instructors">
<property name="title">
<string>Instructors</string>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_Instructors"/>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@@ -314,46 +384,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Tasks</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="2" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTabWidget" name="tabWidgetTasks">
<property name="currentIndex">
<number>1</number>
</property>
<widget class="QWidget" name="tab_1">
<attribute name="title">
<string>AMM</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_41"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>FIM</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_42"/>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>