diff --git a/DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-11-28T12-54-14-0343.json b/DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-11-29T06-02-25-0515.json similarity index 100% rename from DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-11-28T12-54-14-0343.json rename to DB_IaT/Debug64/.cmake/api/v1/reply/index-2024-11-29T06-02-25-0515.json diff --git a/DB_IaT/Debug64/.ninja_deps b/DB_IaT/Debug64/.ninja_deps index 312d0e2..63c0bf7 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 7bf559a..4978352 100644 --- a/DB_IaT/Debug64/.ninja_log +++ b/DB_IaT/Debug64/.ninja_log @@ -1,112 +1,116 @@ # ninja log v5 -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -1033 3760 7544920366409035 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj 42a4e1ce7a8816ef -1037 3839 7544920367114724 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj fd99c106f9513402 -59 1141 7545028120807371 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj 55d0b6fc5b3b11b4 -19 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -1260 1652 7545029624384486 libInstructorsAndTrainees.dll.a df6929ab83dae889 -19 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -63 1217 7545029620057420 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 39df8cbdac33ce35 -19 60 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -1015 3316 7544920361959125 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj c43df6b375cdff7b -53 1490 7545020346346914 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 292dc993acccb16a -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -1003 3247 7544920361211755 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 8735e9c834b0329c -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -990 3606 7544920364855127 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj c76e9d885a71ec35 +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 1040 2368 7544920351793205 CMakeFiles/InstructorsAndTrainees.dir/docTasks/module.cpp.obj 6844afc0a996bca4 -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -1025 3214 7544920360834131 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj 72b890f7503ce83b -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -1008 3793 7544920366741220 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj 37aaa363a444660 -19 60 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -1018 3694 7544920365733534 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj 7d3ec639be3b100f -57 109 7545016544521343 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -57 109 7545016544521343 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -19 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -1000 3183 7544920360218675 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj efc351b55e068067 -60 1260 7545029620494759 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj bf1e777c97db5d0b -3 731 7545016543032501 build.ninja 76aa11f472515be0 -1005 2299 7544920351414216 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj 3b334823afe234b7 -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -19 60 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -39 50 0 clean 9c4b4372737ab8da -1021 3237 7544920361086235 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 92264628f7aa472b +369 1941 7545682412840805 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj c76e9d885a71ec35 +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 1012 3479 7520793522676004 CMakeFiles/InstructorsAndTrainees.dir/instructorsAndTrainees.cpp.obj ff3fcdc370580ca2 109 277 7545016546216445 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 6bb046bc4c0980dc -19 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -1260 1652 7545029624384486 libInstructorsAndTrainees.dll df6929ab83dae889 -19 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 60 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -19 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 60 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -19 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -997 3637 7544920365157760 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 3c5f63b90320820c -19 60 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +379 2012 7545682413556808 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj 37aaa363a444660 15 39 0 CMakeFiles/clean.additional 7155004b3956b606 -20 60 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -20 60 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -20 60 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -61 1241 7545032271191927 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj bf1e777c97db5d0b -1241 1633 7545032275092678 libInstructorsAndTrainees.dll df6929ab83dae889 -1241 1633 7545032275092678 libInstructorsAndTrainees.dll.a df6929ab83dae889 -19 59 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 59 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 59 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -61 1219 7545034637213925 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 39df8cbdac33ce35 -59 1265 7545034637668919 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj bf1e777c97db5d0b -1265 1662 7545034641626459 libInstructorsAndTrainees.dll df6929ab83dae889 -1265 1662 7545034641626459 libInstructorsAndTrainees.dll.a df6929ab83dae889 +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +57 109 7545016544521343 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +1003 3247 7544920361211755 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 8735e9c834b0329c +1037 3839 7544920367114724 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj fd99c106f9513402 +54 1214 7545797128785628 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj 55d0b6fc5b3b11b4 +33 89 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +33 89 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +33 89 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +33 89 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +1025 3214 7544920360834131 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj 72b890f7503ce83b +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +1033 3760 7544920366409035 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj 42a4e1ce7a8816ef +1633 2344 7548254672274402 libInstructorsAndTrainees.dll df6929ab83dae889 +33 89 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +33 89 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +376 2004 7545682413454647 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 3c5f63b90320820c +1021 3237 7544920361086235 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 92264628f7aa472b +39 50 0 clean 9c4b4372737ab8da +387 1934 7545682412770351 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj 7d3ec639be3b100f +57 109 7545016544521343 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +89 1633 7548254665194200 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj c43df6b375cdff7b +33 89 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +33 89 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +1633 2344 7548254672274402 libInstructorsAndTrainees.dll.a df6929ab83dae889 +3 731 7545633454329639 build.ninja 76aa11f472515be0 +55 1241 7545869135552135 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj bf1e777c97db5d0b +1005 2299 7544920351414216 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj 3b334823afe234b7 +58 1483 7545682787291963 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 292dc993acccb16a +63 1217 7545861289494028 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 39df8cbdac33ce35 +33 89 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +33 89 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +1000 3183 7544920360218675 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj efc351b55e068067 +33 89 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +33 89 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +33 89 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +33 89 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +33 89 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 382 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 382 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 382 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +399 1863 7548282945033674 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj c43df6b375cdff7b +392 1955 7548282945921307 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj 37aaa363a444660 +405 1958 7548282945951225 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 39df8cbdac33ce35 +388 1985 7548282946250420 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj 55d0b6fc5b3b11b4 +402 2031 7548282946719166 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj 7d3ec639be3b100f +396 2068 7548282947088181 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj bf1e777c97db5d0b +390 2162 7548282948025699 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 3c5f63b90320820c +382 2176 7548282948175278 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj c76e9d885a71ec35 +385 2376 7548282950168771 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 292dc993acccb16a +2376 2771 7548282954093869 libInstructorsAndTrainees.dll df6929ab83dae889 +2376 2771 7548282954093869 libInstructorsAndTrainees.dll.a df6929ab83dae889 +19 57 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +19 57 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 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 35032f2..0276a13 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 a46acc6..9fc2f7e 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/instructors/viewerinstructors.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj index 5d7e8ea..cf8efb0 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 c3e4a3b..89b44cd 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/trainees/traineesview.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj index d85bd95..ffc364f 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt index aa1145e..407a2e5 100644 --- a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt +++ b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt @@ -1,11 +1,12 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp + uic:ui_viewerinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp + uic:ui_doctaskswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h + mmc:Q_OBJECT uic:ui_dialogeditinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp - uic:ui_editorinstructors.h -D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp - uic:ui_taskswidget.h D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.h mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h @@ -23,21 +24,6 @@ D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp - uic:ui_dialogedittrainee.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h - mmc:Q_OBJECT - uic:ui_dialogauthorizationinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h - mmc:Q_OBJECT - uic:ui_dialogeditinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp - uic:ui_doctaskswidget.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp - uic:ui_viewerinstructors.h D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp uic:ui_viewertrainees.h D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h @@ -59,3 +45,17 @@ D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp + uic:ui_taskswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp + uic:ui_editorinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp + uic:ui_dialogeditinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp + uic:ui_dialogedittrainee.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h + mmc:Q_OBJECT + uic:ui_dialogauthorizationinstructor.h diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp index d4bb52d..c81f74d 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/moc_instructorsandtraineeswidget.cpp @@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_InstructorsAndTraineesWidget_t { - QByteArrayData data[19]; - char stringdata0[356]; + QByteArrayData data[20]; + char stringdata0[378]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -51,7 +51,8 @@ QT_MOC_LITERAL(14, 232, 12), // "listTrainees" QT_MOC_LITERAL(15, 245, 20), // "slot_LanguageChanged" QT_MOC_LITERAL(16, 266, 28), // "on_btnConnectionToDB_clicked" QT_MOC_LITERAL(17, 295, 37), // "on_btnAuthorizationInstructor..." -QT_MOC_LITERAL(18, 333, 22) // "on_btnDocTasks_clicked" +QT_MOC_LITERAL(18, 333, 22), // "on_btnDocTasks_clicked" +QT_MOC_LITERAL(19, 356, 21) // "on_toolButton_clicked" }, "InstructorsAndTraineesWidget\0" @@ -64,7 +65,7 @@ QT_MOC_LITERAL(18, 333, 22) // "on_btnDocTasks_clicked" "listTrainees\0slot_LanguageChanged\0" "on_btnConnectionToDB_clicked\0" "on_btnAuthorizationInstructor_clicked\0" - "on_btnDocTasks_clicked" + "on_btnDocTasks_clicked\0on_toolButton_clicked" }; #undef QT_MOC_LITERAL @@ -74,7 +75,7 @@ static const uint qt_meta_data_InstructorsAndTraineesWidget[] = { 8, // revision 0, // classname 0, 0, // classinfo - 10, 14, // methods + 11, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -82,18 +83,19 @@ static const uint qt_meta_data_InstructorsAndTraineesWidget[] = { 6, // signalCount // signals: name, argc, parameters, tag, flags - 1, 1, 64, 2, 0x06 /* Public */, - 4, 2, 67, 2, 0x06 /* Public */, - 7, 1, 72, 2, 0x06 /* Public */, - 9, 1, 75, 2, 0x06 /* Public */, - 11, 1, 78, 2, 0x06 /* Public */, - 12, 1, 81, 2, 0x06 /* Public */, + 1, 1, 69, 2, 0x06 /* Public */, + 4, 2, 72, 2, 0x06 /* Public */, + 7, 1, 77, 2, 0x06 /* Public */, + 9, 1, 80, 2, 0x06 /* Public */, + 11, 1, 83, 2, 0x06 /* Public */, + 12, 1, 86, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 15, 1, 84, 2, 0x0a /* Public */, - 16, 0, 87, 2, 0x08 /* Private */, - 17, 0, 88, 2, 0x08 /* Private */, - 18, 0, 89, 2, 0x08 /* Private */, + 15, 1, 89, 2, 0x0a /* Public */, + 16, 0, 92, 2, 0x08 /* Private */, + 17, 0, 93, 2, 0x08 /* Private */, + 18, 0, 94, 2, 0x08 /* Private */, + 19, 0, 95, 2, 0x08 /* Private */, // signals: parameters QMetaType::Void, QMetaType::QString, 3, @@ -107,6 +109,7 @@ static const uint qt_meta_data_InstructorsAndTraineesWidget[] = { QMetaType::Void, QMetaType::QString, 3, QMetaType::Void, QMetaType::Void, + QMetaType::Void, QMetaType::Void, 0 // eod @@ -128,6 +131,7 @@ void InstructorsAndTraineesWidget::qt_static_metacall(QObject *_o, QMetaObject:: case 7: _t->on_btnConnectionToDB_clicked(); break; case 8: _t->on_btnAuthorizationInstructor_clicked(); break; case 9: _t->on_btnDocTasks_clicked(); break; + case 10: _t->on_toolButton_clicked(); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -206,13 +210,13 @@ int InstructorsAndTraineesWidget::qt_metacall(QMetaObject::Call _c, int _id, voi if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 10) + if (_id < 11) qt_static_metacall(this, _c, _id, _a); - _id -= 10; + _id -= 11; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 10) + if (_id < 11) *reinterpret_cast(_a[0]) = -1; - _id -= 10; + _id -= 11; } return _id; } diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h index 108bc46..d666530 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h @@ -41,6 +41,7 @@ public: QLabel *lblLoggedInInstructor; QSpacerItem *horizontalSpacer; QToolButton *btnDocTasks; + QToolButton *toolButton; void setupUi(QWidget *InstructorsAndTraineesWidget) { @@ -140,6 +141,12 @@ public: horizontalLayout_2->addWidget(btnDocTasks); + toolButton = new QToolButton(groupBox); + toolButton->setObjectName(QString::fromUtf8("toolButton")); + toolButton->setMinimumSize(QSize(58, 58)); + + horizontalLayout_2->addWidget(toolButton); + verticalLayout_2->addLayout(horizontalLayout_2); @@ -172,6 +179,7 @@ public: #if QT_CONFIG(shortcut) btnDocTasks->setShortcut(QCoreApplication::translate("InstructorsAndTraineesWidget", "Ctrl+Shift+S", nullptr)); #endif // QT_CONFIG(shortcut) + toolButton->setText(QCoreApplication::translate("InstructorsAndTraineesWidget", "Update StyleSheet", nullptr)); } // retranslateUi }; diff --git a/DB_IaT/Debug64/libInstructorsAndTrainees.dll b/DB_IaT/Debug64/libInstructorsAndTrainees.dll index a538173..73c8a2c 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 c9a46f2..94afa72 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 63530df..3e89253 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 df90375..1f5d3e8 100644 --- a/DB_IaT/InstructorsAndTrainees/commonview.cpp +++ b/DB_IaT/InstructorsAndTrainees/commonview.cpp @@ -1,4 +1,6 @@ #include "commonview.h" +#include +#include CommonView::CommonView(InterfaceDataBaseLMS* dbLMS, TypeView type, QWidget *parent): @@ -13,11 +15,35 @@ CommonView::CommonView(InterfaceDataBaseLMS* dbLMS, TypeView type, QWidget *pare { treeWidget = new QTreeWidget(); + //QString name = treeWidget->objectName(); + //treeWidget->setObjectName("onlyView"); + //treeWidget->setAccessibleName("onlyView"); + //treeWidget->header()->setStyleSheet(QStringLiteral("font-size: 10pt;")); - treeWidget->setStyleSheet(QStringLiteral("font-size: 10pt;" - "font-family: Tahoma;")); + //treeWidget->setStyleSheet(QStringLiteral("font-size: 10pt;" + // "font-family: Tahoma;")); treeWidget->setIconSize(QSize(20, 20)); + treeWidget->setFocusPolicy(Qt::FocusPolicy::NoFocus); + + /* + treeWidget->setStyleSheet("QTreeWidget {font-size: 10pt; font-family: Tahoma;}" + "QTreeWidget::item:selected {" + "background-color: #ddffdd; " + "border-style: solid solid solid solid; " + "color: #000000;}" + "QTreeWidgetItem::item:selected {" + "background-color: #ddaadd; " + "border-style: solid solid solid solid; " + "color: #000000;}"); + + treeWidget->setStyleSheet("QTreeWidget {font-size: 10pt; font-family: Tahoma;}" + "QTreeWidget::item:selected {" + "background-color: #ddffdd; " + "border-style: solid solid solid solid; " + "color: #000000;}");*/ + + updateMyStyleSheet(); } void CommonView::setItemColorArchive(QTreeWidgetItem *item) @@ -37,3 +63,32 @@ 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 6d40d17..acfb5d1 100644 --- a/DB_IaT/InstructorsAndTrainees/commonview.h +++ b/DB_IaT/InstructorsAndTrainees/commonview.h @@ -48,6 +48,12 @@ protected: void setItemColor(QTreeWidgetItem* item, QColor color); +public: + void updateMyStyleSheet(); + +private: + QString loadStyleSheet(); + protected: InterfaceDataBaseLMS* dbLMS; QTreeWidget* treeWidget; diff --git a/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp b/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp index d86e3a7..bf92c24 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp @@ -68,7 +68,7 @@ void InstructorsView::preparationTreeWidget(/*QTreeWidget* tree*/) else archiveVisible = false; - notLoggedInVisible = true; + notLoggedInVisible = true; } else {//control diff --git a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp b/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp index 56c9be6..a569039 100644 --- a/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp @@ -11,6 +11,8 @@ ViewerInstructors::ViewerInstructors(InterfaceDataBaseLMS* db, QWidget *parent) ui->horizontalLayout_1->addWidget(treeWidget); + treeWidget->setSelectionMode(QAbstractItemView::NoSelection); + preparationTreeWidget(/*ui->treeWidget*/); setNotLoggedInVisible(true); } diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index be71f34..0c5e6e9 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -430,3 +430,9 @@ void InstructorsAndTraineesWidget::on_btnDocTasks_clicked() dialog->setMinimumSize(1200, 800); dialog->exec(); } + +void InstructorsAndTraineesWidget::on_toolButton_clicked() +{ + viewerTrainees->updateMyStyleSheet(); + viewerInstructors->updateMyStyleSheet(); +} diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h index 27ebaa9..764d189 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h @@ -66,6 +66,8 @@ private Q_SLOTS: void on_btnDocTasks_clicked(); + void on_toolButton_clicked(); + private: void updateLabelLoggedInInstructor(); diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui index f4da71e..fc0e77f 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.ui @@ -223,6 +223,19 @@ + + + + + 58 + 58 + + + + Update StyleSheet + + + diff --git a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp index 465d4d9..e6ce499 100644 --- a/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp +++ b/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp @@ -117,6 +117,7 @@ void TraineesView::loadTraineesFromDB() for(Group group : listGroups) { //Группа + int cntChildsNotArchived = 0; QTreeWidgetItem *ItemGroup = new QTreeWidgetItem(treeWidget); ItemGroup->setText(ColumnsTreeTrainees::clmn_ID, QString::number(group.getID())); ItemGroup->setText(ColumnsTreeTrainees::clmn_Trainee, group.getName()); @@ -155,6 +156,7 @@ void TraineesView::loadTraineesFromDB() ItemTrainee->setText(ColumnsTreeTrainees::clmn_Archived, tr("no")); ItemTrainee->setIcon(ColumnsTreeTrainees::clmn_Trainee, QIcon(QStringLiteral(":/icons/trainee.png"))); setItemColorNoArchive(ItemTrainee); + cntChildsNotArchived++; } if(trainee.getLoggedIn()) @@ -187,6 +189,9 @@ void TraineesView::loadTraineesFromDB() if(! notLoggedInVisible) ItemTrainee->setHidden(true); } + + if(! archiveVisible && cntChildsNotArchived == 0) + delete ItemGroup; } treeWidget->expandAll(); diff --git a/DB_LMS/DataBaseLMS/CMakeLists.txt.user b/DB_LMS/DataBaseLMS/CMakeLists.txt.user index 8b7a430..fe210f4 100644 --- a/DB_LMS/DataBaseLMS/CMakeLists.txt.user +++ b/DB_LMS/DataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/DB_LMS/DataBaseLMS/interfacedatabaselms.cpp b/DB_LMS/DataBaseLMS/interfacedatabaselms.cpp index ff3adca..850e84e 100644 --- a/DB_LMS/DataBaseLMS/interfacedatabaselms.cpp +++ b/DB_LMS/DataBaseLMS/interfacedatabaselms.cpp @@ -25,7 +25,7 @@ bool InterfaceDataBaseLMS::ConnectionToDB() } else { - QMessageBox::information(this, dbName, tr("Connection is successful!")); + //QMessageBox::information(this, dbName, tr("Connection is successful!")); return true; } } @@ -33,7 +33,7 @@ bool InterfaceDataBaseLMS::ConnectionToDB() bool InterfaceDataBaseLMS::DisConnectionFromDB() { deleteConnection(); - QMessageBox::information(this, dbName, tr("Disconnection is successful!")); + //QMessageBox::information(this, dbName, tr("Disconnection is successful!")); return true; } diff --git a/DB_LMS/Debug64/.ninja_deps b/DB_LMS/Debug64/.ninja_deps index ca94044..b1150b7 100644 Binary files a/DB_LMS/Debug64/.ninja_deps and b/DB_LMS/Debug64/.ninja_deps differ diff --git a/DB_LMS/Debug64/.ninja_log b/DB_LMS/Debug64/.ninja_log index d071e6d..1a409fa 100644 --- a/DB_LMS/Debug64/.ninja_log +++ b/DB_LMS/Debug64/.ninja_log @@ -57,3 +57,14 @@ 27 76 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 27 76 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 27 76 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +6 39 0 CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +6 39 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +6 39 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +6 39 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +39 1025 7545043969270534 CMakeFiles/DataBaseLMS.dir/interfacedatabaselms.cpp.obj d76eac97fda56f5b +1025 1270 7545043971704383 libDataBaseLMS.dll 31a19f1f3436f66b +1025 1270 7545043971704383 libDataBaseLMS.dll.a 31a19f1f3436f66b +32 79 0 CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +32 79 0 DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 +32 79 0 D:/LMS/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen b8e538c54fdbce20 +32 79 0 D:/LMS/DB_LMS/Debug64/DataBaseLMS_autogen/mocs_compilation.cpp b8e538c54fdbce20 diff --git a/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/interfacedatabaselms.cpp.obj b/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/interfacedatabaselms.cpp.obj index 11bfc68..0c7576a 100644 Binary files a/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/interfacedatabaselms.cpp.obj and b/DB_LMS/Debug64/CMakeFiles/DataBaseLMS.dir/interfacedatabaselms.cpp.obj differ diff --git a/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen.dir/ParseCache.txt b/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen.dir/ParseCache.txt index c799791..c82c0f4 100644 --- a/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen.dir/ParseCache.txt +++ b/DB_LMS/Debug64/CMakeFiles/DataBaseLMS_autogen.dir/ParseCache.txt @@ -1,23 +1,23 @@ # Generated by CMake. Changes will be overwritten. +D:/LMS/DB_LMS/DataBaseLMS/databaselms.cpp +D:/LMS/DB_LMS/DataBaseLMS/DataBaseLMS_global.h +D:/LMS/DB_LMS/DataBaseLMS/group.cpp +D:/LMS/DB_LMS/DataBaseLMS/group.h +D:/LMS/DB_LMS/DataBaseLMS/task.cpp +D:/LMS/DB_LMS/DataBaseLMS/interfacedatabaselms.h + mmc:Q_OBJECT +D:/LMS/DB_LMS/DataBaseLMS/interfacedatabaselms.cpp +D:/LMS/DB_LMS/DataBaseLMS/user.cpp D:/LMS/DB_LMS/DataBaseLMS/databaselms.h D:/LMS/DB_LMS/DataBaseLMS/computer.h D:/LMS/DB_LMS/DataBaseLMS/instructor.cpp D:/LMS/DB_LMS/DataBaseLMS/classroom.h -D:/LMS/DB_LMS/DataBaseLMS/basicentity.h D:/LMS/DB_LMS/DataBaseLMS/computer.cpp +D:/LMS/DB_LMS/DataBaseLMS/basicentity.h D:/LMS/DB_LMS/DataBaseLMS/user.h D:/LMS/DB_LMS/DataBaseLMS/basicentity.cpp D:/LMS/DB_LMS/DataBaseLMS/trainee.cpp -D:/LMS/DB_LMS/DataBaseLMS/classroom.cpp D:/LMS/DB_LMS/DataBaseLMS/task.h +D:/LMS/DB_LMS/DataBaseLMS/classroom.cpp D:/LMS/DB_LMS/DataBaseLMS/trainee.h D:/LMS/DB_LMS/DataBaseLMS/instructor.h -D:/LMS/DB_LMS/DataBaseLMS/user.cpp -D:/LMS/DB_LMS/DataBaseLMS/interfacedatabaselms.cpp -D:/LMS/DB_LMS/DataBaseLMS/interfacedatabaselms.h - mmc:Q_OBJECT -D:/LMS/DB_LMS/DataBaseLMS/task.cpp -D:/LMS/DB_LMS/DataBaseLMS/group.h -D:/LMS/DB_LMS/DataBaseLMS/group.cpp -D:/LMS/DB_LMS/DataBaseLMS/DataBaseLMS_global.h -D:/LMS/DB_LMS/DataBaseLMS/databaselms.cpp diff --git a/DB_LMS/Debug64/libDataBaseLMS.dll b/DB_LMS/Debug64/libDataBaseLMS.dll index 9890f9a..2ce067c 100644 Binary files a/DB_LMS/Debug64/libDataBaseLMS.dll and b/DB_LMS/Debug64/libDataBaseLMS.dll differ diff --git a/DB_LMS/Debug64/libDataBaseLMS.dll.a b/DB_LMS/Debug64/libDataBaseLMS.dll.a index b84802f..38580d8 100644 Binary files a/DB_LMS/Debug64/libDataBaseLMS.dll.a and b/DB_LMS/Debug64/libDataBaseLMS.dll.a differ diff --git a/ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-11-28T08-19-02-0834.json b/ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-02T06-06-10-0007.json similarity index 100% rename from ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-11-28T08-19-02-0834.json rename to ServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-02T06-06-10-0007.json diff --git a/ServerLMS/Debug64/.ninja_deps b/ServerLMS/Debug64/.ninja_deps index 1b43d5c..35b7a50 100644 Binary files a/ServerLMS/Debug64/.ninja_deps and b/ServerLMS/Debug64/.ninja_deps differ diff --git a/ServerLMS/Debug64/.ninja_log b/ServerLMS/Debug64/.ninja_log index bffd053..5b057a1 100644 --- a/ServerLMS/Debug64/.ninja_log +++ b/ServerLMS/Debug64/.ninja_log @@ -1,70 +1,49 @@ # ninja log v5 -1057 1116 7544209827016857 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 -67 3061 7544803901720801 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 6b4c8466e478058e -18 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -18 57 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -53 3359 7544803904674314 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 34b9d8b027d1f720 -18 57 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -51 2051 7544803891621730 CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj 789e376ca71a7e01 -1153 1225 7544209828118281 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj fa7a3cb9a2d99f6c -18 57 0 ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 -57 2314 7544845134796410 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 7f4281861236c54a -18 57 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -18 57 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -2314 2793 7544845139560351 libServerLMS.dll.a 72d9d1ee4784dd54 -24 33 0 clean 9c4b4372737ab8da -18 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 -46 3439 7544803905498726 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj eb70d58e6f45eec0 -58 3440 7544803905508710 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj bbd7d88fa5ab3d77 -2314 2793 7544845139560351 libServerLMS.dll 72d9d1ee4784dd54 -1149 2617 7544209842015891 CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj 34f4a0bc045a7588 +27 66 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 +433 3955 7548262455856733 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj eb70d58e6f45eec0 +446 3448 7548262450773290 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj bbd7d88fa5ab3d77 +1381 1865 7548263683416971 libServerLMS.dll 72d9d1ee4784dd54 3 24 0 CMakeFiles/clean.additional 7155004b3956b606 -61 3417 7544803905183196 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj 776415479484c26f -64 3704 7544803908142867 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj 51dcd51461a6b016 -18 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -56 3205 7544803903143413 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj dcabea84c2f6d917 +449 3634 7548262452634180 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj 776415479484c26f +452 3571 7548262451973409 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj 51dcd51461a6b016 +1149 2617 7544209842015891 CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj 34f4a0bc045a7588 +27 66 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +443 3887 7548262455164476 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj dcabea84c2f6d917 1135 2602 7544209841873585 CMakeFiles/ServerLMS.dir/Systems/logger.cpp.obj 221815863f31cd21 -1057 1116 7544209827016857 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 -70 3375 7544803904835274 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj 14cab83113898849 -14 534 7544851427923966 build.ninja 80e6aedf30bdcc22 -27 94 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -27 94 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -27 94 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -27 94 0 ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 -27 94 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -27 94 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -27 94 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -27 94 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 -94 147 7544851429804906 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 94 147 7544851429804906 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 +460 3746 7548262453724637 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj 14cab83113898849 +24 33 0 clean 9c4b4372737ab8da +1381 1865 7548263683416971 libServerLMS.dll.a 72d9d1ee4784dd54 +27 66 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +27 66 0 ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 +27 66 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +436 3975 7548262456057165 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 7f4281861236c54a +14 534 7548227699202450 build.ninja 80e6aedf30bdcc22 150 225 7544851430604052 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj fa7a3cb9a2d99f6c -147 2448 7544851452825842 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 7f4281861236c54a -2448 2927 7544851457586440 libServerLMS.dll 72d9d1ee4784dd54 -2448 2927 7544851457586440 libServerLMS.dll.a 72d9d1ee4784dd54 -19 76 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -19 76 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -19 76 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -19 76 0 ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 -19 76 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -19 76 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -19 76 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -19 76 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 -14 54 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -14 54 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -14 54 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -14 54 0 ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 -14 54 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -14 54 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -14 54 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -14 54 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 -54 2313 7544855350119233 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 7f4281861236c54a -2313 2797 7544855354926013 libServerLMS.dll 72d9d1ee4784dd54 -2313 2797 7544855354926013 libServerLMS.dll.a 72d9d1ee4784dd54 -8 55 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -8 55 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -8 55 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -8 55 0 ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 -8 55 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -8 55 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -8 55 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -8 55 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 +66 1381 7548263678592584 CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj 789e376ca71a7e01 +27 66 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +441 3755 7548262453764239 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 34b9d8b027d1f720 +27 66 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +27 66 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +94 147 7544851429804906 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 +456 3777 7548262454064233 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 6b4c8466e478058e +19 56 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +19 56 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +19 56 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +19 56 0 ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 +19 56 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +19 56 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +19 56 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +19 56 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_messangerwidget.h a1ba014d73005738 +61 2013 7548331148879437 CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj 789e376ca71a7e01 +82 3373 7548331162475788 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 6b4c8466e478058e +64 3410 7548331162834809 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 34b9d8b027d1f720 +77 3448 7548331163233740 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj 776415479484c26f +73 3470 7548331163443183 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj bbd7d88fa5ab3d77 +56 3483 7548331163572835 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj eb70d58e6f45eec0 +67 3545 7548331164181212 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj dcabea84c2f6d917 +86 3562 7548331164370710 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj 14cab83113898849 +59 3610 7548331164844796 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 7f4281861236c54a +79 3667 7548331165331204 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj 51dcd51461a6b016 +3667 4181 7548331170537227 libServerLMS.dll 72d9d1ee4784dd54 +3667 4181 7548331170537227 libServerLMS.dll.a 72d9d1ee4784dd54 diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj index 526aba3..8995f44 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj index 62c366e..74e3664 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt index def8d04..ef95841 100644 --- a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt +++ b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt @@ -1,38 +1,38 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp - uic:ui_serverlmswidget.h -D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h -D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h -D:/LMS/ServerLMS/ServerLMS/messangerwidget.cpp - uic:ui_messangerwidget.h -D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp -D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.cpp -D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp -D:/LMS/ServerLMS/ServerLMS/Client.h -D:/LMS/ServerLMS/ServerLMS/multithreadserver.h - mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/messangerwidget.h mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.h +D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp +D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp +D:/LMS/ServerLMS/ServerLMS/messangerwidget.cpp + uic:ui_messangerwidget.h +D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h +D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h +D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/clienthandler.h +D:/LMS/ServerLMS/ServerLMS/multithreadserver.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/tools.h -D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h +D:/LMS/ServerLMS/ServerLMS/Client.h +D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp + uic:ui_serverlmswidget.h +D:/LMS/ServerLMS/ServerLMS/Systems/logger.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Systems/tools.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h +D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/tools.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/logger.h +D:/LMS/ServerLMS/ServerLMS/Systems/tools.h +D:/LMS/ServerLMS/ServerLMS/clienthandler.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.cpp +D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp diff --git a/ServerLMS/Debug64/libServerLMS.dll b/ServerLMS/Debug64/libServerLMS.dll index 95636e9..a7da149 100644 Binary files a/ServerLMS/Debug64/libServerLMS.dll and b/ServerLMS/Debug64/libServerLMS.dll differ diff --git a/ServerLMS/Debug64/libServerLMS.dll.a b/ServerLMS/Debug64/libServerLMS.dll.a index e1eb141..80e823e 100644 Binary files a/ServerLMS/Debug64/libServerLMS.dll.a and b/ServerLMS/Debug64/libServerLMS.dll.a differ diff --git a/ServerLMS/ServerLMS/CMakeLists.txt.user b/ServerLMS/ServerLMS/CMakeLists.txt.user index 407bb75..175f8ee 100644 --- a/ServerLMS/ServerLMS/CMakeLists.txt.user +++ b/ServerLMS/ServerLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/ServerLMS/ServerLMS/messangerwidget.cpp b/ServerLMS/ServerLMS/messangerwidget.cpp index abe337c..a6985cd 100644 --- a/ServerLMS/ServerLMS/messangerwidget.cpp +++ b/ServerLMS/ServerLMS/messangerwidget.cpp @@ -1,5 +1,6 @@ #include #include +#include #include "messangerwidget.h" #include "ui_messangerwidget.h" @@ -12,7 +13,9 @@ MessangerWidget::MessangerWidget(QWidget *parent) : ui->tabWidget->removeTab(1); ui->tabWidget->removeTab(0); - ui->tabWidget->setStyleSheet("QTabBar::tab:selected {background-color: #AAAAAA;}"); + ui->tabWidget->setStyleSheet("QTabBar::tab:selected " + "{background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc);" + "color: #ffffff;}"); } MessangerWidget::~MessangerWidget() @@ -140,6 +143,14 @@ void MessangerWidget::slot_InitMessanger(QList listTrainees) } } +void MessangerWidget::keyPressEvent(QKeyEvent *event) +{ + if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) + { + ui->btnSend->click(); + } +} + void MessangerWidget::changeEvent(QEvent *event) { // В случае получения события изменения языка приложения diff --git a/ServerLMS/ServerLMS/messangerwidget.h b/ServerLMS/ServerLMS/messangerwidget.h index ea5fa33..be0b78b 100644 --- a/ServerLMS/ServerLMS/messangerwidget.h +++ b/ServerLMS/ServerLMS/messangerwidget.h @@ -68,6 +68,9 @@ public slots: //слот обработки сигнала об инициализации мессенджера void slot_InitMessanger(QList listTrainees); +private: + virtual void keyPressEvent(QKeyEvent *event); + private: QList listDialogMsg; @@ -75,6 +78,8 @@ private: Ui::MessangerWidget *ui; QTranslator qtLanguageTranslator; + + }; #endif // MESSANGERWIDGET_H diff --git a/TestServerLMS/Debug64/.ninja_deps b/TestServerLMS/Debug64/.ninja_deps index d96404f..03e9563 100644 Binary files a/TestServerLMS/Debug64/.ninja_deps and b/TestServerLMS/Debug64/.ninja_deps differ diff --git a/TestServerLMS/Debug64/.ninja_log b/TestServerLMS/Debug64/.ninja_log index 65acaa7..f9f80a4 100644 --- a/TestServerLMS/Debug64/.ninja_log +++ b/TestServerLMS/Debug64/.ninja_log @@ -1,71 +1,29 @@ # ninja log v5 551 596 7544209929621808 TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp 7826208a1b187af8 604 642 7544209930105010 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp.obj 1d7027b225e05bfc -13 43 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -47 2260 7544804014595305 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj 4bc2eca6dcd8a69e -13 43 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 43 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +20 50 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +51 2280 7548292475273953 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj 4bc2eca6dcd8a69e +20 50 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +20 50 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 34 41 0 clean 9c4b4372737ab8da 9 34 0 CMakeFiles/clean.additional 7155004b3956b606 -2271 2461 7544890012845873 TestServerLMS.exe 66dadfaf4d2d246e -13 43 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +2472 2644 7548292478904229 TestServerLMS.exe 66dadfaf4d2d246e +20 50 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 551 596 7544209929621808 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp 7826208a1b187af8 -50 2251 7544804014503408 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1bd2a04151a0ba14 -65 2271 7544890010958098 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj 365b2bb39da65578 -13 43 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 43 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +53 2306 7548292475533545 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1bd2a04151a0ba14 12 229 7544209455417163 build.ninja ac221dfe1922250d -15 45 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -15 45 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -15 45 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -15 45 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -15 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -15 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 45 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 45 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 45 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 43 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 43 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 43 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 43 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 43 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 43 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 44 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 44 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 44 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 44 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 44 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 44 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -14 45 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -14 45 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -14 45 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -14 45 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -14 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -14 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 45 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 45 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 45 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -8 38 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -8 38 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -8 38 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -8 38 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -8 38 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -8 38 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 43 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 43 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 43 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 43 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 43 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 43 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 43 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 43 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 43 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 43 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 43 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 43 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +20 50 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +20 50 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +55 2472 7548292477189648 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj 365b2bb39da65578 +19 50 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +19 50 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +19 50 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +19 50 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +19 50 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +19 50 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +14 44 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +14 44 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +14 44 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +14 44 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +14 44 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +14 44 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 diff --git a/TestServerLMS/Debug64/TestServerLMS.exe b/TestServerLMS/Debug64/TestServerLMS.exe index e84eef0..a18e036 100644 Binary files a/TestServerLMS/Debug64/TestServerLMS.exe and b/TestServerLMS/Debug64/TestServerLMS.exe differ diff --git a/TestServerLMS/Debug64/branch-closed.png b/TestServerLMS/Debug64/branch-closed.png new file mode 100644 index 0000000..213ffdd Binary files /dev/null and b/TestServerLMS/Debug64/branch-closed.png differ diff --git a/TestServerLMS/Debug64/branch-end.png b/TestServerLMS/Debug64/branch-end.png new file mode 100644 index 0000000..54915b3 Binary files /dev/null and b/TestServerLMS/Debug64/branch-end.png differ diff --git a/TestServerLMS/Debug64/branch-more.png b/TestServerLMS/Debug64/branch-more.png new file mode 100644 index 0000000..664ad44 Binary files /dev/null and b/TestServerLMS/Debug64/branch-more.png differ diff --git a/TestServerLMS/Debug64/branch-open.png b/TestServerLMS/Debug64/branch-open.png new file mode 100644 index 0000000..e8cad95 Binary files /dev/null and b/TestServerLMS/Debug64/branch-open.png differ diff --git a/TestServerLMS/Debug64/libDataBaseLMS.dll b/TestServerLMS/Debug64/libDataBaseLMS.dll index 9890f9a..2ce067c 100644 Binary files a/TestServerLMS/Debug64/libDataBaseLMS.dll and b/TestServerLMS/Debug64/libDataBaseLMS.dll differ diff --git a/TestServerLMS/Debug64/libInstructorsAndTrainees.dll b/TestServerLMS/Debug64/libInstructorsAndTrainees.dll index a538173..73c8a2c 100644 Binary files a/TestServerLMS/Debug64/libInstructorsAndTrainees.dll and b/TestServerLMS/Debug64/libInstructorsAndTrainees.dll differ diff --git a/TestServerLMS/Debug64/libServerLMS.dll b/TestServerLMS/Debug64/libServerLMS.dll index 95636e9..a7da149 100644 Binary files a/TestServerLMS/Debug64/libServerLMS.dll and b/TestServerLMS/Debug64/libServerLMS.dll differ diff --git a/TestServerLMS/Debug64/styleSheetTreeWidget.css b/TestServerLMS/Debug64/styleSheetTreeWidget.css new file mode 100644 index 0000000..a3ff50a --- /dev/null +++ b/TestServerLMS/Debug64/styleSheetTreeWidget.css @@ -0,0 +1,74 @@ +/*Содержимое*/ +QTreeWidget { +font-size: 10pt; +font-family: Tahoma; +} + +/*Заголовок*/ +QHeaderView { +font-size: 12pt; +font-family: Tahoma; +} + + + +/*Бранчи*/ +QTreeWidget::branch:has-siblings:!adjoins-item { + border-image: url(vline.png) 0; + +} +QTreeWidget::branch:has-siblings:adjoins-item { + border-image: url(branch-more.png) 0; + +} +QTreeWidget::branch:!has-children:!has-siblings:adjoins-item { + border-image: url(branch-end.png) 0; +} +QTreeWidget::branch:closed:has-children:!has-siblings, +QTreeWidget::branch:closed:has-children:has-siblings { + border-image: none; + image: url(branch-closed.png); +} +QTreeWidget::branch:open:has-children:!has-siblings, +QTreeWidget::branch:open:has-children:has-siblings { + border-image: none; + image: url(branch-open.png); +} + +/*Выделение Групп при наведении курсора*/ +QTreeWidget::item:has-children:hover { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #88cc88, stop: 1 #88cc88); +} +/*Выделение Обучаемых/Инструкторов при наведении курсора*/ +QTreeWidget::item:!has-children:hover { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e7effd, stop: 1 #cbdaf1); +} + +/*Выделение Групп*/ +QTreeWidget::item:has-children, +QTreeWidget::branch:has-children { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #88aa88, stop: 1 #88bb88); +} +QTreeWidget::item:has-children:selected { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #55aa55, stop: 1 #55bb55); +} + +/*Выделение Обучаемых/Инструкторов*/ +QTreeWidget::branch:!has-children { + background: transparent; +} +QTreeWidget::branch:!has-children:selected{ + background: transparent; +} +QTreeWidget::item:!has-children:selected{ + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc); + color: #ffffff; + +} + +/*Разделение ячеек Обучаемых +QTreeWidget::item:!has-children:has-siblings { + border-bottom: 1px solid #bfcde4; +}*/ + + diff --git a/TestServerLMS/Debug64/styleSheetTreeWidget.txt b/TestServerLMS/Debug64/styleSheetTreeWidget.txt new file mode 100644 index 0000000..58ec02e --- /dev/null +++ b/TestServerLMS/Debug64/styleSheetTreeWidget.txt @@ -0,0 +1,35 @@ +QTreeWidget { +font-size: 14pt; +font-family: TimesNewRoman; +} + +QTreeWidget { + alternate-background-color: yellow; +} + +QTreeWidget { + show-decoration-selected: 1; +} + +QTreeWidget::item { + border: 1px solid #d9d9d9; + border-top-color: transparent; + border-bottom-color: transparent; +} + +QTreeWidget::item:hover { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e7effd, stop: 1 #cbdaf1); + border: 1px solid #bfcde4; +} + +QTreeWidget::item:selected { + border: 1px solid #567dbc; +} + +QTreeWidget::item:selected:active{ + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6ea1f1, stop: 1 #567dbc); +} + +QTreeWidget::item:selected:!active { + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6b9be8, stop: 1 #577fbf); +} \ No newline at end of file diff --git a/TestServerLMS/TestServerLMS/CMakeLists.txt.user b/TestServerLMS/TestServerLMS/CMakeLists.txt.user index 11df541..3dc6fc4 100644 --- a/TestServerLMS/TestServerLMS/CMakeLists.txt.user +++ b/TestServerLMS/TestServerLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/testDB/Debug64/.ninja_deps b/testDB/Debug64/.ninja_deps index 9ecbdd9..4a86a1a 100644 Binary files a/testDB/Debug64/.ninja_deps and b/testDB/Debug64/.ninja_deps differ diff --git a/testDB/Debug64/.ninja_log b/testDB/Debug64/.ninja_log index 3c2d13b..b8eceff 100644 --- a/testDB/Debug64/.ninja_log +++ b/testDB/Debug64/.ninja_log @@ -43,3 +43,13 @@ 74 1228 7545013335504939 CMakeFiles/testDBpgSQL.dir/main.cpp.obj 7c6bf829703494a2 76 1330 7545013336513354 CMakeFiles/testDBpgSQL.dir/mainwindow.cpp.obj a213cdc2d21087f1 1330 1480 7545013338000960 testDBpgSQL.exe 481e73a84a688916 +28 75 0 CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 +28 75 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 +28 75 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +28 75 0 D:/LMS/testDB/Debug64/CMakeFiles/testDBpgSQL_autogen d08ec0c05fa072d8 +28 75 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 +28 75 0 D:/LMS/testDB/Debug64/testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +75 1206 7548331220556291 CMakeFiles/testDBpgSQL.dir/testDBpgSQL_autogen/mocs_compilation.cpp.obj 223f91fdbeaff3f0 +77 1208 7548331220585925 CMakeFiles/testDBpgSQL.dir/main.cpp.obj 7c6bf829703494a2 +80 1309 7548331221594805 CMakeFiles/testDBpgSQL.dir/mainwindow.cpp.obj a213cdc2d21087f1 +1309 1457 7548331223054503 testDBpgSQL.exe 481e73a84a688916 diff --git a/testDB/Debug64/testDBpgSQL.exe b/testDB/Debug64/testDBpgSQL.exe index 0770430..b2b956f 100644 Binary files a/testDB/Debug64/testDBpgSQL.exe and b/testDB/Debug64/testDBpgSQL.exe differ diff --git a/testDB/testDBpgSQL/CMakeLists.txt.user b/testDB/testDBpgSQL/CMakeLists.txt.user index 1302f23..7a7ca23 100644 --- a/testDB/testDBpgSQL/CMakeLists.txt.user +++ b/testDB/testDBpgSQL/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId