diff --git a/GUIdataBaseLMS/mainwindow.ui b/GUIdataBaseLMS/mainwindow.ui index 31e0896..ccc1a91 100644 --- a/GUIdataBaseLMS/mainwindow.ui +++ b/GUIdataBaseLMS/mainwindow.ui @@ -17,6 +17,18 @@ :/resources/lms.png:/resources/lms.png + + Qt::ToolButtonIconOnly + + + false + + + false + + + QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks + diff --git a/InstructorsAndTrainees/dialogsettings.cpp b/InstructorsAndTrainees/dialogsettings.cpp index fd372fb..ee0cab2 100644 --- a/InstructorsAndTrainees/dialogsettings.cpp +++ b/InstructorsAndTrainees/dialogsettings.cpp @@ -15,7 +15,7 @@ DialogSettings::DialogSettings(ConnectorToServer* connectorToServer, bool instru ui->btnUpdateStyle->setObjectName("btnUpdateStyle"); ui->btnSetVersion->setObjectName("btnSetVersion"); ui->btnSave->setObjectName("btnSave"); - ui->btnSave->setObjectName("checkAutoStart"); + ui->checkAutoStart->setObjectName("checkAutoStart"); this->connectorToServer = connectorToServer; diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 839c4b1..8b44103 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -21,6 +21,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : ui->setupUi(this); ui->btnSettings->setObjectName("btnSettings"); + ui->tabWidgetTasks->setObjectName("tabWidgetTasks"); #ifndef PROJECT_TYPE_DEBUG ui->btnUpdateStyleSheet->setVisible(false); #endif diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/InstructorsAndTrainees/instructorsandtraineeswidget.ui index d3ec39d..e0a9850 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.ui +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.ui @@ -67,6 +67,35 @@ + + + + + 170 + 58 + + + + Authorization Instructor + + + + :/resources/icons/login-user.png:/resources/icons/login-user.png + + + + 32 + 32 + + + + true + + + Qt::ToolButtonTextUnderIcon + + + @@ -106,35 +135,6 @@ - - - - - 170 - 58 - - - - Authorization Instructor - - - - :/resources/icons/login-user.png:/resources/icons/login-user.png - - - - 32 - 32 - - - - true - - - Qt::ToolButtonTextUnderIcon - - - @@ -328,7 +328,7 @@ - + 1 diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp index 40d28a5..6a5cd3b 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp @@ -57,11 +57,22 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty ui->btnAssignTask->setObjectName("btnAssignTask"); ui->btnAssignTask->setEnabled(false); if(type == TypeList::listCommon) + { + ui->horizontalLayout_3->addWidget(ui->btnAssignTask); + ui->horizontalLayout_3->addWidget(ui->btnOnlyActive); + ui->horizontalLayout_3->addWidget(ui->btnCheck); + ui->horizontalLayout_3->addWidget(ui->btnDelete); + + ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft); + ui->btnDelete->setVisible(false); + } else { ui->btnOnlyActive->setVisible(false); ui->btnAssignTask->setVisible(false); + + ui->verticalLayout->setAlignment(Qt::AlignmentFlag::AlignBottom); } ui->btnCheck->setVisible(false); diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.ui b/InstructorsAndTrainees/tasks/ammtaskswidget.ui index 35f2583..a657174 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.ui +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.ui @@ -21,131 +21,129 @@ - + - + + + + + + + + + + + 50 + 50 + + + + Assign + + + + :/resources/icons/assignTask.png:/resources/icons/assignTask.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 50 + 50 + + + + Аvailable + + + + :/resources/icons/filter.png:/resources/icons/filter.png + + + + 32 + 32 + + + + true + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 50 + 50 + + + + Check + + + + :/resources/icons/check.png:/resources/icons/check.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 50 + 50 + + + + Delete + + + + :/resources/icons/delete.png:/resources/icons/delete.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + - + - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 50 - 50 - - - - Аvailable - - - - :/resources/icons/filter.png:/resources/icons/filter.png - - - - 32 - 32 - - - - true - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 50 - 50 - - - - Assign - - - - :/resources/icons/assignTask.png:/resources/icons/assignTask.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 50 - 50 - - - - Check - - - - :/resources/icons/check.png:/resources/icons/check.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 50 - 50 - - - - Delete - - - - :/resources/icons/delete.png:/resources/icons/delete.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - + diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index 46206f7..f439f30 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -50,6 +50,12 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty if(type == TypeList::listCommon) { + ui->horizontalLayout_3->addWidget(ui->btnAssignTask); + ui->horizontalLayout_3->addWidget(ui->btnCheck); + ui->horizontalLayout_3->addWidget(ui->btnDelete); + + ui->horizontalLayout_3->setAlignment(Qt::AlignmentFlag::AlignLeft); + ui->btnDelete->setVisible(false); ui->btnCheck->setVisible(false); } @@ -64,6 +70,8 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty else { ui->btnAssignTask->setVisible(false); + + ui->verticalLayout->setAlignment(Qt::AlignmentFlag::AlignBottom); } } diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.ui b/InstructorsAndTrainees/tasks/fimtaskswidget.ui index 76865ba..e827cee 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.ui +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.ui @@ -15,102 +15,100 @@ - + - + + + + + + + + + + + 50 + 50 + + + + Assign + + + + :/resources/icons/assignTask.png:/resources/icons/assignTask.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 50 + 50 + + + + Check + + + + :/resources/icons/check.png:/resources/icons/check.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 50 + 50 + + + + Delete + + + + :/resources/icons/delete.png:/resources/icons/delete.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + - + - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 50 - 50 - - - - Assign - - - - :/resources/icons/assignTask.png:/resources/icons/assignTask.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 50 - 50 - - - - Check - - - - :/resources/icons/check.png:/resources/icons/check.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 50 - 50 - - - - Delete - - - - :/resources/icons/delete.png:/resources/icons/delete.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - +