diff --git a/DB_IaT/Debug64/.ninja_deps b/DB_IaT/Debug64/.ninja_deps index b0a700f..f17fa97 100644 Binary files a/DB_IaT/Debug64/.ninja_deps and b/DB_IaT/Debug64/.ninja_deps differ diff --git a/DB_IaT/Debug64/.ninja_log b/DB_IaT/Debug64/.ninja_log index 634eeba..28eaddc 100644 --- a/DB_IaT/Debug64/.ninja_log +++ b/DB_IaT/Debug64/.ninja_log @@ -1,120 +1,148 @@ # ninja log v5 -19 79 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -1397 1442 7562185733292276 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 79 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -1449 4667 7562185765460068 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 -2795 5474 7562185773619164 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 -19 79 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -19 79 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -1486 4450 7562185763238083 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj eaab4dd1a4821d3d -1447 4310 7562185761692219 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 -56 1392 7562186916162575 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 -1451 3904 7562185757168875 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 -19 79 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 79 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -19 79 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -33 46 0 clean 9c4b4372737ab8da -1472 4011 7562185758418586 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc -1493 4360 7562185762220800 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de -1392 2140 7562186923027494 libInstructorsAndTrainees.dll.a c1e915765a645e23 -4310 4673 7562185765569772 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -19 79 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 79 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -1466 4944 7562185768300098 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 -1469 4703 7562185765879679 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b -1397 1442 7562185733292276 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -1476 3888 7562185757325089 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f93eecf151ea8490 -9 33 0 CMakeFiles/clean.additional 7155004b3956b606 -1460 4865 7562185767511131 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 -1392 2140 7562186923027494 libInstructorsAndTrainees.dll c1e915765a645e23 -19 79 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 79 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -1483 4644 7562185765225118 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj c57be72ccb40ac81 -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 79 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 79 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -2983 5676 7562185775629348 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 +15 1513 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +1514 1651 7562929761759219 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +15 1513 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +1658 5182 7562929797050763 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 +4162 6040 7562929805633297 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 +15 1513 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +15 1513 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +1697 4932 7562929794542405 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj eaab4dd1a4821d3d +1656 4563 7562929790410375 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 +4355 6588 7562929811103633 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 +1661 4240 7562929787365213 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 +15 1513 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +15 1513 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +15 1513 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +40 51 0 clean 9c4b4372737ab8da +1682 4360 7562929788411984 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc +1706 4873 7562929793832094 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de +6588 7587 7562929820361701 libInstructorsAndTrainees.dll.a c1e915765a645e23 +4360 4793 7562929792963173 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +15 1513 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +15 1513 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +1675 4913 7562929794342105 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 +1679 4984 7562929795054880 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b +1514 1651 7562929761759219 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +1686 4251 7562929787511214 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f93eecf151ea8490 +10 40 0 CMakeFiles/clean.additional 7155004b3956b606 +1669 4658 7562929791561020 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 +6588 7587 7562929820361701 libInstructorsAndTrainees.dll c1e915765a645e23 +15 1513 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +15 1513 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +1693 4355 7562929788291183 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj c57be72ccb40ac81 +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +15 1513 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +15 1513 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +4203 6125 7562929806502435 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 15 276 7561325213655047 build.ninja 76aa11f472515be0 -1463 4604 7562185764773974 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b -19 79 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -1456 2794 7562185746233931 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj d6745e62ffbfb46 -1454 3977 7562185757949940 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 580c1c7cd7084a9f -1444 5526 7562185774112124 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 -19 79 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -3977 5731 7562185776173792 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj bec4c837d4b193f1 -1442 4910 7562185767936384 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -3904 5762 7562185776498595 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -1479 5014 7562185768998234 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -1490 2982 7562185748264707 CMakeFiles/InstructorsAndTrainees.dir/docTasks/module.cpp.obj 7e450168ba24c81a -19 79 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -3888 6063 7562185779482776 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d +1672 4874 7562929793891935 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b +15 1513 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +1666 4162 7562929786514543 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj d6745e62ffbfb46 +1663 4203 7562929786912311 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 580c1c7cd7084a9f +1654 5390 7562929799143126 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 +15 1513 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +4251 5894 7562929804192378 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj bec4c837d4b193f1 +1651 5145 7562929796667862 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +4241 6043 7562929805683150 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +1689 4872 7562929793822121 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +1702 4208 7562929786615251 CMakeFiles/InstructorsAndTrainees.dir/docTasks/module.cpp.obj 7e450168ba24c81a +15 1513 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +4208 6313 7562929808343516 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d +22 88 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +22 88 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +22 88 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 10 34 0 CMakeFiles/clean.additional 7155004b3956b606 34 45 0 clean 9c4b4372737ab8da -14 1409 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -14 1409 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -14 1409 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -1410 1456 7562252711652337 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -1410 1456 7562252711652337 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -1471 3382 7562252730167306 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj d6745e62ffbfb46 -1505 3804 7562252734385068 CMakeFiles/InstructorsAndTrainees.dir/docTasks/module.cpp.obj 7e450168ba24c81a -1490 4064 7562252737186684 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f93eecf151ea8490 -1486 4129 7562252738044397 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc -1466 4134 7562252737944664 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 -1498 4139 7562252737984552 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj c57be72ccb40ac81 -1468 4145 7562252738004505 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 580c1c7cd7084a9f -1461 4232 7562252739138503 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 -1474 4430 7562252740856848 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 -1477 4548 7562252742106556 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b -1509 4576 7562252742575193 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de -4145 4622 7562252743275950 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b -1463 4641 7562252743459684 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 -1480 4962 7562252746695834 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 -1494 4976 7562252746827831 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 -1456 4981 7562252746867720 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de -1502 5003 7562252747089486 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj eaab4dd1a4821d3d -1483 5161 7562252748687626 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b -1459 5663 7562252753696723 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 -4134 5786 7562252754962380 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj bec4c837d4b193f1 -3382 5886 7562252755942112 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 -3804 5904 7562252756133696 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 -4129 5999 7562252757080903 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf -4065 6191 7562252759007834 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d -4140 6382 7562252760919076 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 -6382 7150 7562252768013484 libInstructorsAndTrainees.dll c1e915765a645e23 -6382 7150 7562252768013484 libInstructorsAndTrainees.dll.a c1e915765a645e23 +15 1401 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +15 1401 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +15 1401 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +1401 1448 7562961331722758 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +1401 1448 7562961331722758 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +1496 2832 7562961345077548 CMakeFiles/InstructorsAndTrainees.dir/docTasks/module.cpp.obj 7e450168ba24c81a +1462 2941 7562961346164180 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj d6745e62ffbfb46 +1457 3895 7562961355773552 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 +1460 4035 7562961357434498 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 580c1c7cd7084a9f +1478 4075 7562961357479762 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc +1481 4482 7562961361883871 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f93eecf151ea8490 +1452 4519 7562961362085327 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 +1505 4563 7562961362689585 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de +1468 4582 7562961362891291 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b +1455 4727 7562961364298129 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 +1465 4813 7562961365098022 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 +4519 4928 7562961366329252 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b +1471 4937 7562961366568615 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 +1489 4945 7562961366626985 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj c57be72ccb40ac81 +1492 4961 7562961366828853 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj eaab4dd1a4821d3d +1485 5200 7562961369220089 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 +1474 5381 7562961371053505 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b +1450 5427 7562961371483456 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 +1448 5641 7562961373632024 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de +2832 5656 7562961373782799 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 +2941 5711 7562961374343318 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 +4075 5892 7562961376163067 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj bec4c837d4b193f1 +4035 6008 7562961377333880 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf +3895 6292 7562961380152174 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d +4483 6547 7562961382693854 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 +6547 7308 7562961389702279 libInstructorsAndTrainees.dll c1e915765a645e23 +6547 7308 7562961389702279 libInstructorsAndTrainees.dll.a c1e915765a645e23 diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj index 97f4ea5..6f5e039 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj index a1faa59..60b05a4 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj index 542209c..11478c3 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj index e5f7bdf..f83b1fe 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj index 6852448..0e06719 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj index 6e886e1..31497bf 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj index 940cd59..102f30a 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj index a8b8ccd..4a9207f 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj index 36f6291..3a6969d 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj index a81b3b3..a0f2c8a 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj index 5c26f3f..2a628c9 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj differ diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogauthorizationinstructor.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogauthorizationinstructor.h index f3c3dd8..60def1e 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogauthorizationinstructor.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogauthorizationinstructor.h @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -28,10 +29,11 @@ public: QGridLayout *gridLayout; QVBoxLayout *verticalLayout; QHBoxLayout *horizontalLayout; - QLabel *label; - QLineEdit *editLogin; - QHBoxLayout *horizontalLayout_2; + QVBoxLayout *verticalLayout_2; + QLabel *label_1; QLabel *label_2; + QVBoxLayout *verticalLayout_3; + QLineEdit *editLogin; QLineEdit *editPassword; QDialogButtonBox *buttonBox; @@ -44,45 +46,53 @@ public: font.setFamily(QString::fromUtf8("Tahoma")); font.setPointSize(10); DialogAuthorizationInstructor->setFont(font); + QIcon icon; + icon.addFile(QString::fromUtf8(":/icons/login-user.png"), QSize(), QIcon::Normal, QIcon::Off); + DialogAuthorizationInstructor->setWindowIcon(icon); gridLayout = new QGridLayout(DialogAuthorizationInstructor); gridLayout->setObjectName(QString::fromUtf8("gridLayout")); verticalLayout = new QVBoxLayout(); verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); horizontalLayout = new QHBoxLayout(); horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); - label = new QLabel(DialogAuthorizationInstructor); - label->setObjectName(QString::fromUtf8("label")); + verticalLayout_2 = new QVBoxLayout(); + verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); + label_1 = new QLabel(DialogAuthorizationInstructor); + label_1->setObjectName(QString::fromUtf8("label_1")); QFont font1; font1.setPointSize(10); - label->setFont(font1); + label_1->setFont(font1); - horizontalLayout->addWidget(label); + verticalLayout_2->addWidget(label_1); - editLogin = new QLineEdit(DialogAuthorizationInstructor); - editLogin->setObjectName(QString::fromUtf8("editLogin")); - editLogin->setFont(font1); - - horizontalLayout->addWidget(editLogin); - - - verticalLayout->addLayout(horizontalLayout); - - horizontalLayout_2 = new QHBoxLayout(); - horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); label_2 = new QLabel(DialogAuthorizationInstructor); label_2->setObjectName(QString::fromUtf8("label_2")); label_2->setFont(font1); - horizontalLayout_2->addWidget(label_2); + verticalLayout_2->addWidget(label_2); + + + horizontalLayout->addLayout(verticalLayout_2); + + verticalLayout_3 = new QVBoxLayout(); + verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); + editLogin = new QLineEdit(DialogAuthorizationInstructor); + editLogin->setObjectName(QString::fromUtf8("editLogin")); + editLogin->setFont(font1); + + verticalLayout_3->addWidget(editLogin); editPassword = new QLineEdit(DialogAuthorizationInstructor); editPassword->setObjectName(QString::fromUtf8("editPassword")); editPassword->setFont(font1); - horizontalLayout_2->addWidget(editPassword); + verticalLayout_3->addWidget(editPassword); - verticalLayout->addLayout(horizontalLayout_2); + horizontalLayout->addLayout(verticalLayout_3); + + + verticalLayout->addLayout(horizontalLayout); buttonBox = new QDialogButtonBox(DialogAuthorizationInstructor); buttonBox->setObjectName(QString::fromUtf8("buttonBox")); @@ -107,9 +117,9 @@ public: void retranslateUi(QDialog *DialogAuthorizationInstructor) { DialogAuthorizationInstructor->setWindowTitle(QCoreApplication::translate("DialogAuthorizationInstructor", "Instructor authorization", nullptr)); - label->setText(QCoreApplication::translate("DialogAuthorizationInstructor", "Login", nullptr)); - editLogin->setText(QCoreApplication::translate("DialogAuthorizationInstructor", "admin", nullptr)); + label_1->setText(QCoreApplication::translate("DialogAuthorizationInstructor", "Login", nullptr)); label_2->setText(QCoreApplication::translate("DialogAuthorizationInstructor", "Password", nullptr)); + editLogin->setText(QCoreApplication::translate("DialogAuthorizationInstructor", "admin", nullptr)); editPassword->setText(QCoreApplication::translate("DialogAuthorizationInstructor", "admin", nullptr)); } // retranslateUi diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogeditinstructor.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogeditinstructor.h index e29c47a..ac6c818 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogeditinstructor.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogeditinstructor.h @@ -30,13 +30,13 @@ public: QGridLayout *gridLayout; QVBoxLayout *verticalLayout; QHBoxLayout *horizontalLayout; + QVBoxLayout *verticalLayout_2; QLabel *label_2; - QLineEdit *editName; - QHBoxLayout *horizontalLayout_2; QLabel *label_3; - QLineEdit *editLogin; - QHBoxLayout *horizontalLayout_3; QLabel *label_4; + QVBoxLayout *verticalLayout_3; + QLineEdit *editName; + QLineEdit *editLogin; QLineEdit *editPassword; QHBoxLayout *horizontalLayout_5; QCheckBox *checkIsAdmin; @@ -61,54 +61,54 @@ public: verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); horizontalLayout = new QHBoxLayout(); horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); + verticalLayout_2 = new QVBoxLayout(); + verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); label_2 = new QLabel(DialogEditInstructor); label_2->setObjectName(QString::fromUtf8("label_2")); QFont font1; font1.setPointSize(10); label_2->setFont(font1); - horizontalLayout->addWidget(label_2); + verticalLayout_2->addWidget(label_2); - editName = new QLineEdit(DialogEditInstructor); - editName->setObjectName(QString::fromUtf8("editName")); - editName->setEnabled(true); - - horizontalLayout->addWidget(editName); - - - verticalLayout->addLayout(horizontalLayout); - - horizontalLayout_2 = new QHBoxLayout(); - horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); label_3 = new QLabel(DialogEditInstructor); label_3->setObjectName(QString::fromUtf8("label_3")); label_3->setFont(font1); - horizontalLayout_2->addWidget(label_3); + verticalLayout_2->addWidget(label_3); - editLogin = new QLineEdit(DialogEditInstructor); - editLogin->setObjectName(QString::fromUtf8("editLogin")); - - horizontalLayout_2->addWidget(editLogin); - - - verticalLayout->addLayout(horizontalLayout_2); - - horizontalLayout_3 = new QHBoxLayout(); - horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); label_4 = new QLabel(DialogEditInstructor); label_4->setObjectName(QString::fromUtf8("label_4")); label_4->setFont(font1); - horizontalLayout_3->addWidget(label_4); + verticalLayout_2->addWidget(label_4); + + + horizontalLayout->addLayout(verticalLayout_2); + + verticalLayout_3 = new QVBoxLayout(); + verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); + editName = new QLineEdit(DialogEditInstructor); + editName->setObjectName(QString::fromUtf8("editName")); + editName->setEnabled(true); + + verticalLayout_3->addWidget(editName); + + editLogin = new QLineEdit(DialogEditInstructor); + editLogin->setObjectName(QString::fromUtf8("editLogin")); + + verticalLayout_3->addWidget(editLogin); editPassword = new QLineEdit(DialogEditInstructor); editPassword->setObjectName(QString::fromUtf8("editPassword")); - horizontalLayout_3->addWidget(editPassword); + verticalLayout_3->addWidget(editPassword); - verticalLayout->addLayout(horizontalLayout_3); + horizontalLayout->addLayout(verticalLayout_3); + + + verticalLayout->addLayout(horizontalLayout); horizontalLayout_5 = new QHBoxLayout(); horizontalLayout_5->setObjectName(QString::fromUtf8("horizontalLayout_5")); diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogedittrainee.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogedittrainee.h index 97a6fca..336686a 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogedittrainee.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_dialogedittrainee.h @@ -31,13 +31,13 @@ public: QDialogButtonBox *buttonBox; QVBoxLayout *verticalLayout; QHBoxLayout *horizontalLayout; + QVBoxLayout *verticalLayout_2; QLabel *label_2; - QLineEdit *editName; - QHBoxLayout *horizontalLayout_2; QLabel *label_3; - QLineEdit *editLogin; - QHBoxLayout *horizontalLayout_3; QLabel *label_4; + QVBoxLayout *verticalLayout_3; + QLineEdit *editName; + QLineEdit *editLogin; QLineEdit *editPassword; QHBoxLayout *horizontalLayout_4; QCheckBox *checkArchived; @@ -73,54 +73,54 @@ public: verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); horizontalLayout = new QHBoxLayout(); horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); + verticalLayout_2 = new QVBoxLayout(); + verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); label_2 = new QLabel(DialogEditTrainee); label_2->setObjectName(QString::fromUtf8("label_2")); label_2->setFont(font1); - horizontalLayout->addWidget(label_2); + verticalLayout_2->addWidget(label_2); - editName = new QLineEdit(DialogEditTrainee); - editName->setObjectName(QString::fromUtf8("editName")); - editName->setFont(font1); - - horizontalLayout->addWidget(editName); - - - verticalLayout->addLayout(horizontalLayout); - - horizontalLayout_2 = new QHBoxLayout(); - horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); label_3 = new QLabel(DialogEditTrainee); label_3->setObjectName(QString::fromUtf8("label_3")); label_3->setFont(font1); - horizontalLayout_2->addWidget(label_3); + verticalLayout_2->addWidget(label_3); + + label_4 = new QLabel(DialogEditTrainee); + label_4->setObjectName(QString::fromUtf8("label_4")); + label_4->setFont(font1); + + verticalLayout_2->addWidget(label_4); + + + horizontalLayout->addLayout(verticalLayout_2); + + verticalLayout_3 = new QVBoxLayout(); + verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); + editName = new QLineEdit(DialogEditTrainee); + editName->setObjectName(QString::fromUtf8("editName")); + editName->setFont(font1); + + verticalLayout_3->addWidget(editName); editLogin = new QLineEdit(DialogEditTrainee); editLogin->setObjectName(QString::fromUtf8("editLogin")); editLogin->setFont(font1); - horizontalLayout_2->addWidget(editLogin); - - - verticalLayout->addLayout(horizontalLayout_2); - - horizontalLayout_3 = new QHBoxLayout(); - horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); - label_4 = new QLabel(DialogEditTrainee); - label_4->setObjectName(QString::fromUtf8("label_4")); - label_4->setFont(font1); - - horizontalLayout_3->addWidget(label_4); + verticalLayout_3->addWidget(editLogin); editPassword = new QLineEdit(DialogEditTrainee); editPassword->setObjectName(QString::fromUtf8("editPassword")); editPassword->setFont(font1); - horizontalLayout_3->addWidget(editPassword); + verticalLayout_3->addWidget(editPassword); - verticalLayout->addLayout(horizontalLayout_3); + horizontalLayout->addLayout(verticalLayout_3); + + + verticalLayout->addLayout(horizontalLayout); horizontalLayout_4 = new QHBoxLayout(); horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4")); diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_doctaskswidget.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_doctaskswidget.h index cbeb49d..470df80 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_doctaskswidget.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_doctaskswidget.h @@ -63,6 +63,7 @@ public: editCode = new QLineEdit(groupBox); editCode->setObjectName(QString::fromUtf8("editCode")); + editCode->setReadOnly(true); horizontalLayout_3->addWidget(editCode); diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_editorinstructors.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_editorinstructors.h index 236c6c3..7c16f13 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_editorinstructors.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_editorinstructors.h @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -26,8 +25,6 @@ class Ui_EditorInstructors { public: QGridLayout *gridLayout_2; - QWidget *widget; - QGridLayout *gridLayout; QHBoxLayout *horizontalLayout_1; QVBoxLayout *verticalLayout_1; QVBoxLayout *verticalLayout_2; @@ -38,7 +35,7 @@ public: QSpacerItem *verticalSpacer; QToolButton *btnArchive; - void setupUi(QDialog *EditorInstructors) + void setupUi(QWidget *EditorInstructors) { if (EditorInstructors->objectName().isEmpty()) EditorInstructors->setObjectName(QString::fromUtf8("EditorInstructors")); @@ -49,12 +46,6 @@ public: EditorInstructors->setFont(font); gridLayout_2 = new QGridLayout(EditorInstructors); gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); - widget = new QWidget(EditorInstructors); - widget->setObjectName(QString::fromUtf8("widget")); - widget->setFont(font); - widget->setStyleSheet(QString::fromUtf8("background-color: rgb(240, 240, 240);")); - gridLayout = new QGridLayout(widget); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); horizontalLayout_1 = new QHBoxLayout(); horizontalLayout_1->setObjectName(QString::fromUtf8("horizontalLayout_1")); verticalLayout_1 = new QVBoxLayout(); @@ -64,7 +55,7 @@ public: verticalLayout_2 = new QVBoxLayout(); verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); - btnNewInstructor = new QToolButton(widget); + btnNewInstructor = new QToolButton(EditorInstructors); btnNewInstructor->setObjectName(QString::fromUtf8("btnNewInstructor")); QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); sizePolicy.setHorizontalStretch(0); @@ -81,7 +72,7 @@ public: verticalLayout_2->addWidget(btnNewInstructor); - btnDeleteInstructor = new QToolButton(widget); + btnDeleteInstructor = new QToolButton(EditorInstructors); btnDeleteInstructor->setObjectName(QString::fromUtf8("btnDeleteInstructor")); sizePolicy.setHeightForWidth(btnDeleteInstructor->sizePolicy().hasHeightForWidth()); btnDeleteInstructor->setSizePolicy(sizePolicy); @@ -95,7 +86,7 @@ public: verticalLayout_2->addWidget(btnDeleteInstructor); - btnToOrFromArchive = new QToolButton(widget); + btnToOrFromArchive = new QToolButton(EditorInstructors); btnToOrFromArchive->setObjectName(QString::fromUtf8("btnToOrFromArchive")); btnToOrFromArchive->setMinimumSize(QSize(160, 55)); btnToOrFromArchive->setFont(font); @@ -107,7 +98,7 @@ public: verticalLayout_2->addWidget(btnToOrFromArchive); - btnEdit = new QToolButton(widget); + btnEdit = new QToolButton(EditorInstructors); btnEdit->setObjectName(QString::fromUtf8("btnEdit")); sizePolicy.setHeightForWidth(btnEdit->sizePolicy().hasHeightForWidth()); btnEdit->setSizePolicy(sizePolicy); @@ -125,7 +116,7 @@ public: verticalLayout_2->addItem(verticalSpacer); - btnArchive = new QToolButton(widget); + btnArchive = new QToolButton(EditorInstructors); btnArchive->setObjectName(QString::fromUtf8("btnArchive")); sizePolicy.setHeightForWidth(btnArchive->sizePolicy().hasHeightForWidth()); btnArchive->setSizePolicy(sizePolicy); @@ -144,10 +135,7 @@ public: horizontalLayout_1->addLayout(verticalLayout_2); - gridLayout->addLayout(horizontalLayout_1, 0, 0, 1, 1); - - - gridLayout_2->addWidget(widget, 0, 0, 1, 1); + gridLayout_2->addLayout(horizontalLayout_1, 0, 0, 1, 1); retranslateUi(EditorInstructors); @@ -155,7 +143,7 @@ public: QMetaObject::connectSlotsByName(EditorInstructors); } // setupUi - void retranslateUi(QDialog *EditorInstructors) + void retranslateUi(QWidget *EditorInstructors) { EditorInstructors->setWindowTitle(QCoreApplication::translate("EditorInstructors", "List instructors", nullptr)); btnNewInstructor->setText(QCoreApplication::translate("EditorInstructors", "New instructor", nullptr)); diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_editortrainees.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_editortrainees.h index 8c5fe7c..812a48f 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_editortrainees.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_editortrainees.h @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -26,12 +25,8 @@ class Ui_EditorTrainees { public: QGridLayout *gridLayout_2; - QWidget *widget; - QGridLayout *gridLayout; QHBoxLayout *horizontalLayout_1; QVBoxLayout *verticalLayout_1; - QWidget *widget_2; - QGridLayout *gridLayout_3; QVBoxLayout *verticalLayout_2; QToolButton *btnNewGroup; QToolButton *btnDeleteGroup; @@ -42,7 +37,7 @@ public: QSpacerItem *verticalSpacer; QToolButton *btnArchive; - void setupUi(QDialog *EditorTrainees) + void setupUi(QWidget *EditorTrainees) { if (EditorTrainees->objectName().isEmpty()) EditorTrainees->setObjectName(QString::fromUtf8("EditorTrainees")); @@ -53,12 +48,6 @@ public: EditorTrainees->setFont(font); gridLayout_2 = new QGridLayout(EditorTrainees); gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); - widget = new QWidget(EditorTrainees); - widget->setObjectName(QString::fromUtf8("widget")); - widget->setFont(font); - widget->setStyleSheet(QString::fromUtf8("background-color: rgb(240, 240, 240);")); - gridLayout = new QGridLayout(widget); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); horizontalLayout_1 = new QHBoxLayout(); horizontalLayout_1->setObjectName(QString::fromUtf8("horizontalLayout_1")); verticalLayout_1 = new QVBoxLayout(); @@ -66,27 +55,15 @@ public: horizontalLayout_1->addLayout(verticalLayout_1); - widget_2 = new QWidget(widget); - widget_2->setObjectName(QString::fromUtf8("widget_2")); - QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(widget_2->sizePolicy().hasHeightForWidth()); - widget_2->setSizePolicy(sizePolicy); - widget_2->setMinimumSize(QSize(130, 0)); - widget_2->setFont(font); - widget_2->setStyleSheet(QString::fromUtf8("background-color: rgb(180, 180, 180);")); - gridLayout_3 = new QGridLayout(widget_2); - gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3")); verticalLayout_2 = new QVBoxLayout(); verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); - btnNewGroup = new QToolButton(widget_2); + btnNewGroup = new QToolButton(EditorTrainees); btnNewGroup->setObjectName(QString::fromUtf8("btnNewGroup")); - QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed); - sizePolicy1.setHorizontalStretch(0); - sizePolicy1.setVerticalStretch(0); - sizePolicy1.setHeightForWidth(btnNewGroup->sizePolicy().hasHeightForWidth()); - btnNewGroup->setSizePolicy(sizePolicy1); + QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(btnNewGroup->sizePolicy().hasHeightForWidth()); + btnNewGroup->setSizePolicy(sizePolicy); btnNewGroup->setMinimumSize(QSize(170, 55)); btnNewGroup->setFont(font); btnNewGroup->setStyleSheet(QString::fromUtf8("")); @@ -98,10 +75,10 @@ public: verticalLayout_2->addWidget(btnNewGroup); - btnDeleteGroup = new QToolButton(widget_2); + btnDeleteGroup = new QToolButton(EditorTrainees); btnDeleteGroup->setObjectName(QString::fromUtf8("btnDeleteGroup")); - sizePolicy1.setHeightForWidth(btnDeleteGroup->sizePolicy().hasHeightForWidth()); - btnDeleteGroup->setSizePolicy(sizePolicy1); + sizePolicy.setHeightForWidth(btnDeleteGroup->sizePolicy().hasHeightForWidth()); + btnDeleteGroup->setSizePolicy(sizePolicy); btnDeleteGroup->setMinimumSize(QSize(170, 55)); btnDeleteGroup->setFont(font); QIcon icon1; @@ -112,10 +89,10 @@ public: verticalLayout_2->addWidget(btnDeleteGroup); - btnNewTrainee = new QToolButton(widget_2); + btnNewTrainee = new QToolButton(EditorTrainees); btnNewTrainee->setObjectName(QString::fromUtf8("btnNewTrainee")); - sizePolicy1.setHeightForWidth(btnNewTrainee->sizePolicy().hasHeightForWidth()); - btnNewTrainee->setSizePolicy(sizePolicy1); + sizePolicy.setHeightForWidth(btnNewTrainee->sizePolicy().hasHeightForWidth()); + btnNewTrainee->setSizePolicy(sizePolicy); btnNewTrainee->setMinimumSize(QSize(170, 55)); btnNewTrainee->setFont(font); QIcon icon2; @@ -126,10 +103,10 @@ public: verticalLayout_2->addWidget(btnNewTrainee); - btnDeleteTrainee = new QToolButton(widget_2); + btnDeleteTrainee = new QToolButton(EditorTrainees); btnDeleteTrainee->setObjectName(QString::fromUtf8("btnDeleteTrainee")); - sizePolicy1.setHeightForWidth(btnDeleteTrainee->sizePolicy().hasHeightForWidth()); - btnDeleteTrainee->setSizePolicy(sizePolicy1); + sizePolicy.setHeightForWidth(btnDeleteTrainee->sizePolicy().hasHeightForWidth()); + btnDeleteTrainee->setSizePolicy(sizePolicy); btnDeleteTrainee->setMinimumSize(QSize(170, 55)); btnDeleteTrainee->setFont(font); QIcon icon3; @@ -140,10 +117,10 @@ public: verticalLayout_2->addWidget(btnDeleteTrainee); - btnToOrFromArchiveTrainee = new QToolButton(widget_2); + btnToOrFromArchiveTrainee = new QToolButton(EditorTrainees); btnToOrFromArchiveTrainee->setObjectName(QString::fromUtf8("btnToOrFromArchiveTrainee")); - sizePolicy1.setHeightForWidth(btnToOrFromArchiveTrainee->sizePolicy().hasHeightForWidth()); - btnToOrFromArchiveTrainee->setSizePolicy(sizePolicy1); + sizePolicy.setHeightForWidth(btnToOrFromArchiveTrainee->sizePolicy().hasHeightForWidth()); + btnToOrFromArchiveTrainee->setSizePolicy(sizePolicy); btnToOrFromArchiveTrainee->setMinimumSize(QSize(170, 55)); btnToOrFromArchiveTrainee->setFont(font); QIcon icon4; @@ -154,10 +131,10 @@ public: verticalLayout_2->addWidget(btnToOrFromArchiveTrainee); - btnEdit = new QToolButton(widget_2); + btnEdit = new QToolButton(EditorTrainees); btnEdit->setObjectName(QString::fromUtf8("btnEdit")); - sizePolicy1.setHeightForWidth(btnEdit->sizePolicy().hasHeightForWidth()); - btnEdit->setSizePolicy(sizePolicy1); + sizePolicy.setHeightForWidth(btnEdit->sizePolicy().hasHeightForWidth()); + btnEdit->setSizePolicy(sizePolicy); btnEdit->setMinimumSize(QSize(170, 55)); btnEdit->setFont(font); QIcon icon5; @@ -172,10 +149,10 @@ public: verticalLayout_2->addItem(verticalSpacer); - btnArchive = new QToolButton(widget_2); + btnArchive = new QToolButton(EditorTrainees); btnArchive->setObjectName(QString::fromUtf8("btnArchive")); - sizePolicy1.setHeightForWidth(btnArchive->sizePolicy().hasHeightForWidth()); - btnArchive->setSizePolicy(sizePolicy1); + sizePolicy.setHeightForWidth(btnArchive->sizePolicy().hasHeightForWidth()); + btnArchive->setSizePolicy(sizePolicy); btnArchive->setMinimumSize(QSize(170, 55)); btnArchive->setFont(font); QIcon icon6; @@ -188,16 +165,10 @@ public: verticalLayout_2->addWidget(btnArchive); - gridLayout_3->addLayout(verticalLayout_2, 0, 0, 1, 1); + horizontalLayout_1->addLayout(verticalLayout_2); - horizontalLayout_1->addWidget(widget_2); - - - gridLayout->addLayout(horizontalLayout_1, 0, 0, 1, 1); - - - gridLayout_2->addWidget(widget, 0, 0, 1, 1); + gridLayout_2->addLayout(horizontalLayout_1, 0, 0, 1, 1); retranslateUi(EditorTrainees); @@ -205,7 +176,7 @@ public: QMetaObject::connectSlotsByName(EditorTrainees); } // setupUi - void retranslateUi(QDialog *EditorTrainees) + void retranslateUi(QWidget *EditorTrainees) { EditorTrainees->setWindowTitle(QCoreApplication::translate("EditorTrainees", "List trainees", nullptr)); btnNewGroup->setText(QCoreApplication::translate("EditorTrainees", "New group", nullptr)); diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_messangerwidget.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_messangerwidget.h index 467c062..f5f63f7 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_messangerwidget.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_messangerwidget.h @@ -66,7 +66,7 @@ public: sizePolicy.setVerticalStretch(0); sizePolicy.setHeightForWidth(editMsg->sizePolicy().hasHeightForWidth()); editMsg->setSizePolicy(sizePolicy); - editMsg->setMinimumSize(QSize(0, 58)); + editMsg->setMinimumSize(QSize(0, 70)); editMsg->setMaximumSize(QSize(16777215, 1000)); horizontalLayout->addWidget(editMsg); diff --git a/DB_IaT/Debug64/libInstructorsAndTrainees.dll b/DB_IaT/Debug64/libInstructorsAndTrainees.dll index c4b8fc5..e5079a0 100644 Binary files a/DB_IaT/Debug64/libInstructorsAndTrainees.dll and b/DB_IaT/Debug64/libInstructorsAndTrainees.dll differ diff --git a/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a b/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a index 55b2c61..73cf639 100644 Binary files a/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a and b/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a differ diff --git a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user b/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user index 85f1cf9..683bb06 100644 --- a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user +++ b/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/DB_IaT/InstructorsAndTrainees/commonview.cpp b/DB_IaT/InstructorsAndTrainees/commonview.cpp index 9c50d41..aa7ab43 100644 --- a/DB_IaT/InstructorsAndTrainees/commonview.cpp +++ b/DB_IaT/InstructorsAndTrainees/commonview.cpp @@ -38,32 +38,3 @@ void CommonView::setItemColor(QTreeWidgetItem *item, QColor color) for (int i = 0; i < item->columnCount(); i++) item->setBackground(i, color); } - -void CommonView::updateMyStyleSheet() -{ - QString styleSheet = loadStyleSheet(); - styleSheet = styleSheet.replace("\n", ""); - treeWidget->setStyleSheet(styleSheet); - - //QString style = treeWidget->styleSheet(); - //int i = 0; -} - -QString CommonView::loadStyleSheet() -{ - QString fileName = "./styleSheetTreeWidget.css"; - QFile styleSheetTreeWidgetFile(fileName); - if (!styleSheetTreeWidgetFile.open(QFile::ReadOnly | QFile::Text)) - { - QMessageBox::critical(this, tr("Attention!"), tr("The file could not be opened ") + fileName); - return QStringLiteral(""); - } - else - { - QByteArray byteArray = styleSheetTreeWidgetFile.readAll(); - styleSheetTreeWidgetFile.close(); - - QString style = byteArray; - return style; - } -} diff --git a/DB_IaT/InstructorsAndTrainees/commonview.h b/DB_IaT/InstructorsAndTrainees/commonview.h index f5b215f..ea9e755 100644 --- a/DB_IaT/InstructorsAndTrainees/commonview.h +++ b/DB_IaT/InstructorsAndTrainees/commonview.h @@ -55,12 +55,6 @@ protected: void setItemColor(QTreeWidgetItem* item, QColor color); -public: - void updateMyStyleSheet(); - -private: - QString loadStyleSheet(); - protected: ConnectorToServer* connectorToServer; QTreeWidget* treeWidget; diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp b/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp index e969d4e..c783632 100644 --- a/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp +++ b/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp @@ -220,10 +220,6 @@ void DocTasksWidget::preparationTreeWidget() reSetHeadTreeWidget(); - //treeWidget->header()->setStyleSheet(QStringLiteral("font-size: 10pt;")); - treeWidget->setStyleSheet(QStringLiteral("font-size: 10pt;" - "font-family: Tahoma;")); - treeWidget->setColumnWidth(ColumnsTree::clmn_ID, 80); treeWidget->setColumnWidth(ColumnsTree::clmn_PMorDM, 900); diff --git a/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.ui b/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.ui index 6457f3e..f71f8af 100644 --- a/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.ui +++ b/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.ui @@ -41,7 +41,11 @@ - + + + true + + diff --git a/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui b/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui index a895722..055ba53 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui +++ b/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui @@ -19,62 +19,70 @@ Instructor authorization + + + :/icons/login-user.png:/icons/login-user.png + - - - - 10 - - - - Login - - + + + + + + 10 + + + + Login + + + + + + + + 10 + + + + Password + + + + - - - - 10 - - - - admin - - - - - - - - - - - - 10 - - - - Password - - - - - - - - 10 - - - - admin - - + + + + + + 10 + + + + admin + + + + + + + + 10 + + + + admin + + + + @@ -100,7 +108,9 @@ - + + + buttonBox diff --git a/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.ui b/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.ui index b423f22..7f2bba0 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.ui +++ b/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.ui @@ -25,61 +25,61 @@ - - - - 10 - - - - Name - - + + + + + + 10 + + + + Name + + + + + + + + 10 + + + + Login + + + + + + + + 10 + + + + Password + + + + - - - true - - - - - - - - - - - - 10 - - - - Login - - - - - - - - - - - - - - - 10 - - - - Password - - - - - + + + + + true + + + + + + + + + + diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp index 841c2d5..b5a587c 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp @@ -7,7 +7,7 @@ EditorInstructors::EditorInstructors(ConnectorToServer* connectorToServer, bool InstructorsView(connectorToServer, CommonView::TypeView::control, parent), ui(new Ui::EditorInstructors) { - ui->setupUi((QDialog*)this); + ui->setupUi(this); connect(treeWidget, &QTreeWidget::currentItemChanged, this, &EditorInstructors::on_treeWidget_currentItemChanged); diff --git a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.ui b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.ui index 2386702..5198cb8 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.ui +++ b/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.ui @@ -1,7 +1,7 @@ EditorInstructors - + 0 @@ -21,230 +21,215 @@ - - - - Tahoma - 10 - - - - background-color: rgb(240, 240, 240); - - - - - - - - - - - - - - 0 - 0 - - - - - 160 - 55 - - - - - Tahoma - 10 - - - - New instructor - - - - :/icons/addInstructor.png:/icons/addInstructor.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 0 - 0 - - - - - 160 - 55 - - - - - Tahoma - 10 - - - - Delete instructor - - - - :/icons/deleteInstructor.png:/icons/deleteInstructor.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 160 - 55 - - - - - Tahoma - 10 - - - - To archive - - - - :/icons/instructorArchive.png:/icons/instructorArchive.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 0 - 0 - - - - - 160 - 55 - - - - - Tahoma - 10 - - - - Edit - - - - :/icons/edit.png:/icons/edit.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - - 160 - 55 - - - - - Tahoma - 10 - - - - Show archive - - - - :/icons/archive.png:/icons/archive.png - - - - 32 - 32 - - - - true - - - Qt::ToolButtonTextUnderIcon - - - - - - - - - + + + + + + + + + + + 0 + 0 + + + + + 160 + 55 + + + + + Tahoma + 10 + + + + New instructor + + + + :/icons/addInstructor.png:/icons/addInstructor.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 0 + 0 + + + + + 160 + 55 + + + + + Tahoma + 10 + + + + Delete instructor + + + + :/icons/deleteInstructor.png:/icons/deleteInstructor.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 160 + 55 + + + + + Tahoma + 10 + + + + To archive + + + + :/icons/instructorArchive.png:/icons/instructorArchive.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 0 + 0 + + + + + 160 + 55 + + + + + Tahoma + 10 + + + + Edit + + + + :/icons/edit.png:/icons/edit.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + + 160 + 55 + + + + + Tahoma + 10 + + + + Show archive + + + + :/icons/archive.png:/icons/archive.png + + + + 32 + 32 + + + + true + + + Qt::ToolButtonTextUnderIcon + + + + + + diff --git a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp b/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp index e4ce535..c72d8e9 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp @@ -47,6 +47,7 @@ void ViewerInstructors::on_btnEditorInstructors_clicked() layout->addWidget(&editorInstructors); dialog->setWindowTitle(tr("Editor of instructors")); dialog->setMinimumSize(1600, 800); + dialog->setStyleSheet(this->styleSheet()); dialog->exec(); loadInstructorsFromDB(); diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 886ead3..559b6f5 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -64,7 +64,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : viewerTrainees->setMinimumHeight(800); viewerInstructors->setMinimumSize(1800, 300); messangerWidget->setMinimumSize(400, 600); - messangerWidget->setMaximumWidth(400); + messangerWidget->setMaximumWidth(800); ui->btnAuthorizationInstructor->setEnabled(false); diff --git a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp b/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp index e1fafa0..9877d84 100644 --- a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp +++ b/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp @@ -16,13 +16,6 @@ MessangerWidget::MessangerWidget(QWidget *parent) : ui->tabWidget->removeTab(0); ui->btnSend->setObjectName("btnSend"); - - /* - ui->tabWidget->setStyleSheet("QTabBar::tab:selected " - "{background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc);" - "color: #ffffff;}");*/ - - //updateMyStyleSheet(); } MessangerWidget::~MessangerWidget() @@ -78,7 +71,7 @@ void MessangerWidget::addTabDialogMessenger(Trainee trainee) //Добавляем новую вкладку диалога QListWidget* listWidget = new QListWidget(); listWidget->setWordWrap(true); - listWidget->setItemAlignment(Qt::AlignmentFlag::AlignTop); + //listWidget->setItemAlignment(Qt::AlignmentFlag::AlignTop); int index = ui->tabWidget->addTab(listWidget, /*login + ": " +*/ trainee.getName()); if(trainee.getLoggedIn()) @@ -91,34 +84,6 @@ void MessangerWidget::addTabDialogMessenger(Trainee trainee) listTabDialogMessenger.append(dialogMsg); } -void MessangerWidget::updateMyStyleSheet() -{ - QString styleSheet = loadStyleSheet(); - styleSheet = styleSheet.replace("\n", ""); - - foreach(TabDialogMessenger dialogMsg, listTabDialogMessenger) - dialogMsg.getListWidget()->setStyleSheet(styleSheet); -} - -QString MessangerWidget::loadStyleSheet() -{ - QString fileName = "./styleSheetListWidget.css"; - QFile styleSheetFile(fileName); - if (!styleSheetFile.open(QFile::ReadOnly | QFile::Text)) - { - QMessageBox::critical(this, tr("Attention!"), tr("The file could not be opened ") + fileName); - return QStringLiteral(""); - } - else - { - QByteArray byteArray = styleSheetFile.readAll(); - styleSheetFile.close(); - - QString style = byteArray; - return style; - } -} - void MessangerWidget::on_btnSend_clicked() { QString text = ui->editMsg->toPlainText(); @@ -138,7 +103,7 @@ void MessangerWidget::on_btnSend_clicked() ui->tabWidget->setCurrentIndex(dialogMsg.getIndexTab()); QListWidgetItem* item = new QListWidgetItem(QIcon(":/icons/instructor.png"), prefix + text); - item->setBackground(QBrush(QColor(200, 255, 200))); + //item->setBackground(QBrush(QColor(200, 255, 200))); dialogMsg.getListWidget()->addItem(item); return; diff --git a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h b/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h index a21e1a0..388927f 100644 --- a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h +++ b/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h @@ -51,11 +51,6 @@ public: void addMsg(Trainee trainee, QString text, ETypeMsg typeMsg); void addTabDialogMessenger(Trainee trainee); -public: - void updateMyStyleSheet(); -private: - QString loadStyleSheet(); - private slots: void on_btnSend_clicked(); void on_tabWidget_currentChanged(int index); diff --git a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.ui b/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.ui index 50c4a28..c8a9788 100644 --- a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.ui +++ b/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.ui @@ -44,7 +44,7 @@ 0 - 58 + 70 diff --git a/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.ui b/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.ui index e0c679e..0a4f1a8 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.ui +++ b/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.ui @@ -47,75 +47,75 @@ - - - - 10 - - - - Name - - + + + + + + 10 + + + + Name + + + + + + + + 10 + + + + Login + + + + + + + + 10 + + + + Password + + + + - - - - 10 - - - - - - - - - - - - - 10 - - - - Login - - - - - - - - 10 - - - - - - - - - - - - - 10 - - - - Password - - - - - - - - 10 - - - + + + + + + 10 + + + + + + + + + 10 + + + + + + + + + 10 + + + + + diff --git a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp index 0677a9b..da77a28 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp @@ -8,7 +8,7 @@ EditorTrainees::EditorTrainees(ConnectorToServer* connectorToServer, bool adminM TraineesView(connectorToServer, CommonView::TypeView::control, parent), ui(new Ui::EditorTrainees) { - ui->setupUi((QDialog*)this); + ui->setupUi(this); connect(treeWidget, &QTreeWidget::currentItemChanged, this, &EditorTrainees::on_treeWidget_currentItemChanged); diff --git a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.ui b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.ui index ae8ba7d..6f3466e 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.ui +++ b/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.ui @@ -1,7 +1,7 @@ EditorTrainees - + 0 @@ -21,342 +21,300 @@ - - - - Tahoma - 10 - - - - background-color: rgb(240, 240, 240); - - - - - - - - - - - - 0 - 0 - - - - - 130 - 0 - - - - - Tahoma - 10 - - - - background-color: rgb(180, 180, 180); - - - - - - - - - 0 - 0 - - - - - 170 - 55 - - - - - Tahoma - 10 - - - - - - - New group - - - - :/icons/newGroup.png:/icons/newGroup.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 0 - 0 - - - - - 170 - 55 - - - - - Tahoma - 10 - - - - Delete group - - - - :/icons/deleteGroup.png:/icons/deleteGroup.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 0 - 0 - - - - - 170 - 55 - - - - - Tahoma - 10 - - - - New trainee - - - - :/icons/addTrainee.png:/icons/addTrainee.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 0 - 0 - - - - - 170 - 55 - - - - - Tahoma - 10 - - - - Delete trainee - - - - :/icons/deleteTrainee.png:/icons/deleteTrainee.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 0 - 0 - - - - - 170 - 55 - - - - - Tahoma - 10 - - - - To archive - - - - :/icons/traineeArchive.png:/icons/traineeArchive.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - - 0 - 0 - - - - - 170 - 55 - - - - - Tahoma - 10 - - - - Edit - - - - :/icons/edit.png:/icons/edit.png - - - - 32 - 32 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - - 170 - 55 - - - - - Tahoma - 10 - - - - Show archive - - - - :/icons/archive.png:/icons/archive.png - - - - 32 - 32 - - - - true - - - Qt::ToolButtonTextUnderIcon - - - - - - - - - - - - + + + + + + + + + + + 0 + 0 + + + + + 170 + 55 + + + + + Tahoma + 10 + + + + + + + New group + + + + :/icons/newGroup.png:/icons/newGroup.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 0 + 0 + + + + + 170 + 55 + + + + + Tahoma + 10 + + + + Delete group + + + + :/icons/deleteGroup.png:/icons/deleteGroup.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 0 + 0 + + + + + 170 + 55 + + + + + Tahoma + 10 + + + + New trainee + + + + :/icons/addTrainee.png:/icons/addTrainee.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 0 + 0 + + + + + 170 + 55 + + + + + Tahoma + 10 + + + + Delete trainee + + + + :/icons/deleteTrainee.png:/icons/deleteTrainee.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 0 + 0 + + + + + 170 + 55 + + + + + Tahoma + 10 + + + + To archive + + + + :/icons/traineeArchive.png:/icons/traineeArchive.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + + 0 + 0 + + + + + 170 + 55 + + + + + Tahoma + 10 + + + + Edit + + + + :/icons/edit.png:/icons/edit.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + + 170 + 55 + + + + + Tahoma + 10 + + + + Show archive + + + + :/icons/archive.png:/icons/archive.png + + + + 32 + 32 + + + + true + + + Qt::ToolButtonTextUnderIcon + + + + + + diff --git a/DB_LMS/DataBaseLMS/CMakeLists.txt.user b/DB_LMS/DataBaseLMS/CMakeLists.txt.user index 51f54ec..7daf0d6 100644 --- a/DB_LMS/DataBaseLMS/CMakeLists.txt.user +++ b/DB_LMS/DataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/GUIdataBaseLMS/Debug64/.ninja_deps b/GUIdataBaseLMS/Debug64/.ninja_deps index a0a8047..3bf2b3e 100644 Binary files a/GUIdataBaseLMS/Debug64/.ninja_deps and b/GUIdataBaseLMS/Debug64/.ninja_deps differ diff --git a/GUIdataBaseLMS/Debug64/.ninja_log b/GUIdataBaseLMS/Debug64/.ninja_log index 045d05b..50224da 100644 --- a/GUIdataBaseLMS/Debug64/.ninja_log +++ b/GUIdataBaseLMS/Debug64/.ninja_log @@ -1,59 +1,35 @@ # ninja log v5 +47 1438 7562303856364044 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +12 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +24 454 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +12 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +24 454 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 +12 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +456 505 7551837947273032 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 +12 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +45 1368 7562303855683027 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +12 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +513 565 7551837947891396 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj f3adc5dfd1a45619 441 482 7549320531460357 testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 10 32 0 CMakeFiles/clean.additional 7155004b3956b606 -1518 1673 7562095797909082 GUIdataBaseLMS.exe dadb916a9424404 -66 1366 7562095794857401 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c -12 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -456 505 7551837947273032 GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 -2188 2534 7549968971818713 testDBpgSQL.exe 2cffdb60e2e039f +1438 1580 7562303857778674 GUIdataBaseLMS.exe dadb916a9424404 +43 1339 7562303855371107 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +12 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 32 39 0 clean 9c4b4372737ab8da -24 454 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -12 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -24 454 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -12 43 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -71 1518 7562095796371584 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 -513 565 7551837947891396 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj f3adc5dfd1a45619 -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -69 1393 7562095795122235 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -456 505 7551837947273032 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -12 42 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -12 42 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -12 42 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -12 42 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -12 42 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -12 42 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -12 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -12 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -12 43 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -12 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -12 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -12 43 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -13 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -13 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -13 43 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -12 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -12 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -12 43 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +2188 2534 7549968971818713 testDBpgSQL.exe 2cffdb60e2e039f +456 505 7551837947273032 GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 13 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 13 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 13 43 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f 13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f 13 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 13 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 13 43 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f @@ -72,15 +48,45 @@ 12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -13 42 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -13 42 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -13 42 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -13 42 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -13 42 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -13 42 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -17 55 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -17 55 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -17 55 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -17 55 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -17 55 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -17 55 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +27 74 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +27 74 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +27 74 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +27 74 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +27 74 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +27 74 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 43 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +13 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +12 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +12 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +12 43 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +14 45 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +14 45 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +14 45 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +14 45 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +14 45 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +14 45 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +15 53 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +15 53 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +15 53 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +15 53 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +15 53 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +15 53 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f diff --git a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe index 927a6b3..4b0d1e3 100644 Binary files a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe and b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe differ diff --git a/GUIdataBaseLMS/Debug64/chekNo.png b/GUIdataBaseLMS/Debug64/chekNo.png new file mode 100644 index 0000000..85940d2 Binary files /dev/null and b/GUIdataBaseLMS/Debug64/chekNo.png differ diff --git a/GUIdataBaseLMS/Debug64/chekYes.png b/GUIdataBaseLMS/Debug64/chekYes.png new file mode 100644 index 0000000..05c86d1 Binary files /dev/null and b/GUIdataBaseLMS/Debug64/chekYes.png differ diff --git a/GUIdataBaseLMS/Debug64/circleGray.png b/GUIdataBaseLMS/Debug64/circleGray.png new file mode 100644 index 0000000..c2cf426 Binary files /dev/null and b/GUIdataBaseLMS/Debug64/circleGray.png differ diff --git a/GUIdataBaseLMS/Debug64/circleGreen.png b/GUIdataBaseLMS/Debug64/circleGreen.png new file mode 100644 index 0000000..bcbce3d Binary files /dev/null and b/GUIdataBaseLMS/Debug64/circleGreen.png differ diff --git a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll index c4b8fc5..e5079a0 100644 Binary files a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll and b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll differ diff --git a/GUIdataBaseLMS/Debug64/rectGray.png b/GUIdataBaseLMS/Debug64/rectGray.png new file mode 100644 index 0000000..85940d2 Binary files /dev/null and b/GUIdataBaseLMS/Debug64/rectGray.png differ diff --git a/GUIdataBaseLMS/Debug64/rectGreen.png b/GUIdataBaseLMS/Debug64/rectGreen.png new file mode 100644 index 0000000..ad00eb8 Binary files /dev/null and b/GUIdataBaseLMS/Debug64/rectGreen.png differ diff --git a/GUIdataBaseLMS/Debug64/styleSheetListWidget.css b/GUIdataBaseLMS/Debug64/styleSheetListWidget.css.bak similarity index 100% rename from GUIdataBaseLMS/Debug64/styleSheetListWidget.css rename to GUIdataBaseLMS/Debug64/styleSheetListWidget.css.bak diff --git a/GUIdataBaseLMS/Debug64/styleSheetMain.css b/GUIdataBaseLMS/Debug64/styleSheetMain.css index c283007..cbfc38d 100644 --- a/GUIdataBaseLMS/Debug64/styleSheetMain.css +++ b/GUIdataBaseLMS/Debug64/styleSheetMain.css @@ -1,172 +1,116 @@ -*[mandatoryField="true"] { background-color: pink } +/*Обязательные поля*/ +*[mandatoryField="true"] { + background-color: #fff2fb +} + +/*Общие настройки виджетов*/ QWidget { font-family: Tahoma; font-size: 14pt; icon-size: 24px; } -QWidget::title { - text-align: left; - background: white; - padding-left: 10px; -} - QLineEdit, QTextEdit { border: 1px solid gray; - border-radius: 5px; - padding: 0 8px; + border-radius: 4px; + padding: 0px 8px; background: white; - selection-background-color: darkgray; - + selection-background-color: darkgray; } QLineEdit[echoMode="2"] { - lineedit-password-character: 9679; + lineedit-password-character: 9679; /*Сокрытие пароля*/ +} +QLineEdit:read-only { + background: lightblue; } -/* -QTextEdit { - border: 1px solid gray; - border-radius: 5px; - padding: 0 8px; - background: yellow; - selection-background-color: darkgray; - max-height: 55px; -}*/ QGroupBox { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #E0E0E0, stop: 1 #FFFFFF); + background: #E0E0E0; border: 1px solid gray; border-radius: 5px; margin-top: 5ex; /* leave space at the top for the title */ } - QGroupBox::title { border: 1px solid gray; border-bottom: none; border-radius: 5px; subcontrol-origin: margin; - subcontrol-position: top left; /* position at the top center */ + subcontrol-position: top left; padding-left: 10px; padding-right: 10px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #FF0ECE, stop: 1 #FFFFFF); + stop: 0 #A0CECE, stop: 1 #FFFFFF); } -/* -QToolButton, QPushButton { - background-color: lightblue; - border-style: outset; - border-width: 2px; - border-radius: 10px; - border-color: beige; - font: bold 14px; - - padding: 1px; - height: 50px; -} -QPushButton { - min-width: 80px; -} -QToolButton#btnSend { - width: 50px; -} -QToolButton:pressed { - background-color: blue; - border-style: inset; -} -QToolButton:hover { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #fafafa, stop: 0.4 #f4f4f4, - stop: 0.5 #e7e7e7, stop: 1.0 #fafafa); -} -*/ - QPushButton, QToolButton { border: 2px solid #8f8f91; border-style: outset; - border-radius: 6px; + border-radius: 5px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f6f7fa, stop: 1 #dadbde); min-width: 80px; - height: 50px; + height: 60px; padding: 1px; } QPushButton { - height: 30px; + height: 25px; +} +QToolButton { + width: 200px; +} +QToolButton#btnSend { /*Кнопка Send Мессенджера*/ + width: 60px; } - - - QPushButton:flat, QToolButton:flat { border: none; /* no border for a flat push button */ } - QPushButton:default, QToolButton:default { border-color: navy; /* make the default button prominent */ } - QPushButton:hover , QToolButton:hover { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fafafa, stop: 0.4 #f4f4f4, stop: 0.5 #e7e7e7, stop: 1.0 #fafafa); } - QPushButton:pressed, QToolButton:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #dadbde, stop: 1 #f6f7fa); border-style: inset; } - - - - -QMessageBox { - background-color: yellow; - title-font: bold 14px; +QPushButton:checked, QToolButton:checked { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #dadbde, stop: 1 #f6f7fa); + border-style: inset; } -QHeaderView::section { - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #616161, stop: 0.5 #505050, - stop: 0.6 #434343, stop:1 #656565); - color: white; - padding-left: 4px; - border: 1px solid #6c6c6c; +QCheckBox { + spacing: 20px; +} +QCheckBox::indicator:checked { + width: 24px; + height: 24px; + image: url(chekYes.png); +} +QCheckBox::indicator:!checked { + width: 24px; + height: 24px; + image: url(chekNo.png); } - - - -/*Содержимое*/ QTreeWidget { -font-size: 12pt; -font-family: Tahoma; -icon-size: 24px; + font-size: 12pt; + font-family: Tahoma; + icon-size: 24px; } QTreeWidget::item { - -height: 30px; - + height: 30px; } -/* -QIcon { - size: 64px 64px; -}*/ - -/*Заголовок -QHeaderView { -font-size: 16pt; -font-family: Tahoma; -}*/ - - - /*Бранчи*/ QTreeWidget::branch:has-siblings:!adjoins-item { border-image: url(vline.png) 0; @@ -195,25 +139,28 @@ QTreeWidget::branch:hover { background: #aee1ff; } -QTreeWidget::item:selected, -QTreeWidget::branch:selected { +QTreeWidget::item:selected { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc); - color: #ffffff; + color: #ffff00; } +QHeaderView::section { + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #c1c1c1, stop: 0.5 #505050, + stop: 0.6 #434343, stop:1 #656565); + color: white; + padding-left: 4px; + border: 1px solid #6c6c6c; +} QTabWidget::pane { /* The tab widget frame */ - border-top: 2px solid #C2C7CB; + border-top: 1px solid #C2C7CB; } - QTabWidget::tab-bar { - left: 5px; /* move to the right by 5px */ + left: 0px; /* move to the right by 0px */ } - -/* Style the tab using the tab sub-control. Note that - it reads QTabBar _not_ QTabWidget */ QTabBar::tab { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, @@ -226,38 +173,33 @@ QTabBar::tab { padding: 2px; } -QTabBar::tab:selected, QTabBar::tab:hover { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #fafafa, stop: 0.4 #f4f4f4, - stop: 0.5 #e7e7e7, stop: 1.0 #fafafa); -} QTabBar::tab:selected { border-color: #9B9B9B; border-bottom-color: #C2C7CB; /* same as pane color */ -} - -QTabBar::tab:!selected { - margin-top: 2px; /* make non-selected tabs look smaller */ -} - -/* make use of negative margins for overlapping tabs */ -QTabBar::tab:selected { - /* expand/overlap to the left and right by 4px */ + /* expand/overlap to the left and right by 4px */ margin-left: -4px; margin-right: -4px; background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc); color: #ffffff; } - -QTabBar::tab:first:selected { - margin-left: 0; /* the first selected tab has nothing to overlap with on the left */ +QTabBar::tab:!selected { + margin-top: 5px; /* make non-selected tabs look smaller */ + background: #ffffff; +} +QTabBar::tab:hover { + background: #aee1ff; } -QTabBar::tab:last:selected { - margin-right: 0; /* the last selected tab has nothing to overlap with on the right */ +QTabBar::scroller { /* the width of the scroll buttons */ + width: 80px; +} +QTabBar QToolButton { /* the scroll buttons are tool buttons */ + min-width: 30px; + width: 30px; + padding: 0px; } -QTabBar::tab:only-one { - margin: 0; /* if there is only one tab, we don't want overlapping margins */ +QListWidget::item { + border: 1px solid #C4C4C3; } diff --git a/GUIdataBaseLMS/Debug64/styleSheetTreeWidget.css b/GUIdataBaseLMS/Debug64/styleSheetTreeWidget.css.bak similarity index 100% rename from GUIdataBaseLMS/Debug64/styleSheetTreeWidget.css rename to GUIdataBaseLMS/Debug64/styleSheetTreeWidget.css.bak diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user b/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user index a908be4..2fd4c96 100644 --- a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user +++ b/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-17T09-55-21-0212.json b/ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-19T06-13-10-0206.json similarity index 100% rename from ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-17T09-55-21-0212.json rename to ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-19T06-13-10-0206.json diff --git a/ServerLMS/Debug64/.ninja_log b/ServerLMS/Debug64/.ninja_log index c7ecac1..d08b4b7 100644 --- a/ServerLMS/Debug64/.ninja_log +++ b/ServerLMS/Debug64/.ninja_log @@ -1,28 +1,28 @@ # ninja log v5 -2165 2722 7561312843381972 libServerLMS.dll.a 2f530586cec8163 -19 57 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -19 57 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -15 261 7561325211231519 build.ninja 80e6aedf30bdcc22 -519 3662 7561248889527328 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc -1168 3150 7548373207023899 CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj 8dd57f666ed5ecf4 -19 57 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -522 3214 7561248885071641 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 -1336 1423 7561244909394494 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj f93621c79a78fad0 -19 57 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -19 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -1212 1297 7561244908126083 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 57 2165 7561312838276686 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +1212 1297 7561244908126083 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 +19 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +19 57 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +522 3214 7561248885071641 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 +19 57 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +1168 3150 7548373207023899 CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj 8dd57f666ed5ecf4 +1336 1423 7561244909394494 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj f93621c79a78fad0 +519 3662 7561248889527328 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc +15 261 7562919901049594 build.ninja 80e6aedf30bdcc22 +19 57 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +19 57 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +2165 2722 7561312843381972 libServerLMS.dll.a 2f530586cec8163 41 51 0 clean 9c4b4372737ab8da -539 3249 7561248885416221 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 -1212 1297 7561244908126083 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 -1313 2503 7561244920193719 CMakeFiles/ServerLMS.dir/Systems/logger.cpp.obj 68e3223fc0caab27 -524 3164 7561248884567065 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c -19 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -1328 2657 7561244921730483 CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj 81bfa701d65b5429 -62 2385 7561264081554617 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf -529 3359 7561248886416239 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 -14 41 0 CMakeFiles/clean.additional 7155004b3956b606 -2165 2722 7561312843381972 libServerLMS.dll 2f530586cec8163 -527 3580 7561248888706914 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 -1332 2625 7561244921398015 CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj f56962914220ed2d 517 3634 7561248889253351 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 +1332 2625 7561244921398015 CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj f56962914220ed2d +527 3580 7561248888706914 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 +2165 2722 7561312843381972 libServerLMS.dll 2f530586cec8163 +1328 2657 7561244921730483 CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj 81bfa701d65b5429 +14 41 0 CMakeFiles/clean.additional 7155004b3956b606 +529 3359 7561248886416239 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 +62 2385 7561264081554617 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +19 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +524 3164 7561248884567065 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c +1313 2503 7561244920193719 CMakeFiles/ServerLMS.dir/Systems/logger.cpp.obj 68e3223fc0caab27 +1212 1297 7561244908126083 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 +539 3249 7561248885416221 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 diff --git a/ServerLMS/ServerLMS/CMakeLists.txt.user b/ServerLMS/ServerLMS/CMakeLists.txt.user index f44cb69..8807671 100644 --- a/ServerLMS/ServerLMS/CMakeLists.txt.user +++ b/ServerLMS/ServerLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/TestServerLMS/Debug64/ListInstructors.xml b/TestServerLMS/Debug64/ListInstructors.xml index 2c2927c..4c7d6a8 100644 --- a/TestServerLMS/Debug64/ListInstructors.xml +++ b/TestServerLMS/Debug64/ListInstructors.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/ListTrainees.xml b/TestServerLMS/Debug64/ListTrainees.xml index 63e74b3..f4b716c 100644 --- a/TestServerLMS/Debug64/ListTrainees.xml +++ b/TestServerLMS/Debug64/ListTrainees.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/StaticData/save.xml b/TestServerLMS/Debug64/StaticData/save.xml index 163b3d3..4902929 100644 --- a/TestServerLMS/Debug64/StaticData/save.xml +++ b/TestServerLMS/Debug64/StaticData/save.xml @@ -1,2 +1,2 @@ - + diff --git a/TestServerLMS/TestServerLMS/CMakeLists.txt.user b/TestServerLMS/TestServerLMS/CMakeLists.txt.user index 7092c71..ee40d39 100644 --- a/TestServerLMS/TestServerLMS/CMakeLists.txt.user +++ b/TestServerLMS/TestServerLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId