mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
new branch
This commit is contained in:
@@ -20,6 +20,7 @@ endif()
|
||||
find_package(Qt5 COMPONENTS Widgets REQUIRED)
|
||||
find_package(Qt5 COMPONENTS Sql REQUIRED)
|
||||
find_package(Qt5 COMPONENTS LinguistTools REQUIRED)
|
||||
find_package(Qt5 COMPONENTS Xml REQUIRED)
|
||||
|
||||
add_library(InstructorsAndTrainees SHARED
|
||||
instructorsAndTrainees_global.h
|
||||
@@ -61,15 +62,22 @@ add_library(InstructorsAndTrainees SHARED
|
||||
tasks/taskswidget.cpp
|
||||
tasks/taskswidget.h
|
||||
tasks/taskswidget.ui
|
||||
docTasks/doctaskswidget.cpp
|
||||
docTasks/doctaskswidget.h
|
||||
docTasks/doctaskswidget.ui
|
||||
docTasks/module.cpp
|
||||
docTasks/module.h
|
||||
resources.qrc
|
||||
)
|
||||
|
||||
target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/instructors)
|
||||
target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/trainees)
|
||||
target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/tasks)
|
||||
target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/docTasks)
|
||||
|
||||
target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Widgets)
|
||||
target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Sql)
|
||||
target_link_libraries(InstructorsAndTrainees PRIVATE Qt5::Xml)
|
||||
|
||||
target_compile_definitions(InstructorsAndTrainees PRIVATE INSTRUCTORSANDTRAINEES_LIBRARY)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 4.11.1, 2024-11-25T15:15:00. -->
|
||||
<!-- Written by QtCreator 4.11.1, 2024-11-27T09:30:24. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#include "instructorsandtraineeswidget.h"
|
||||
#include "ui_instructorsandtraineeswidget.h"
|
||||
#include "dialogauthorizationinstructor.h"
|
||||
#include "doctaskswidget.h"
|
||||
|
||||
InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
@@ -406,3 +407,14 @@ void InstructorsAndTraineesWidget::updateLabelLoggedInInstructor()
|
||||
|
||||
mtxAccess.unlock();
|
||||
}
|
||||
|
||||
void InstructorsAndTraineesWidget::on_btnDocTasks_clicked()
|
||||
{
|
||||
DocTasksWidget docTasks(this);
|
||||
QDialog* dialog = new QDialog(this);
|
||||
QHBoxLayout *layout = new QHBoxLayout(dialog);
|
||||
layout->addWidget(&docTasks);
|
||||
dialog->setWindowTitle(tr("Doc tasks"));
|
||||
dialog->setMinimumSize(1200, 800);
|
||||
dialog->exec();
|
||||
}
|
||||
|
||||
@@ -64,6 +64,8 @@ private Q_SLOTS:
|
||||
void on_btnConnectionToDB_clicked();
|
||||
void on_btnAuthorizationInstructor_clicked();
|
||||
|
||||
void on_btnDocTasks_clicked();
|
||||
|
||||
private:
|
||||
void updateLabelLoggedInInstructor();
|
||||
|
||||
|
||||
@@ -126,6 +126,35 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="btnDocTasks">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>140</width>
|
||||
<height>58</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Doc tasks</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="resources.qrc">
|
||||
<normaloff>:/icons/docTasks.png</normaloff>:/icons/docTasks.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string>Ctrl+Shift+S</string>
|
||||
</property>
|
||||
<property name="toolButtonStyle">
|
||||
<enum>Qt::ToolButtonTextUnderIcon</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
|
||||
@@ -25,5 +25,6 @@
|
||||
<file>icons/DB-trainees.png</file>
|
||||
<file>icons/connectDB.png</file>
|
||||
<file>icons/login-user.png</file>
|
||||
<file>icons/docTasks.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
Reference in New Issue
Block a user