diff --git a/FILES/CSS/styleSheetMain.css b/FILES/CSS/styleSheetMain.css index 9cdb8a3..13b63c0 100644 --- a/FILES/CSS/styleSheetMain.css +++ b/FILES/CSS/styleSheetMain.css @@ -92,13 +92,13 @@ QToolButton { } QToolButton#btnSend, QToolButton#btnDelete, QToolButton#btnCheck, QToolButton#btnOnlyActive, QToolButton#btnStatus, -QToolButton#btnSave, QToolButton#btnUpdateStyle, QToolButton#btnSetVersion, QToolButton#btnDocsUpdating, +QToolButton#btnUpdateStyle, QToolButton#btnSetVersion, QToolButton#btnDocsUpdating, QToolButton#btnAssignTask, QToolButton#btnAssign { width: 100px; height: 55px; } -QToolButton#btnCheckDB, QToolButton#btnUpdateDocs, QToolButton#btnRepare { +QToolButton#btnCheckDB, QToolButton#btnUpdateDocs, QToolButton#btnRepare, QToolButton#btnSave { width: 150px; height: 55px; } diff --git a/FILES/config_ProgramAWSinstructorMTD/settings.xml b/FILES/config_ProgramAWSinstructorMTD/settings.xml index 0b063a7..a40319f 100644 --- a/FILES/config_ProgramAWSinstructorMTD/settings.xml +++ b/FILES/config_ProgramAWSinstructorMTD/settings.xml @@ -1,4 +1,4 @@ - + diff --git a/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc b/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc index 54493e6..d6bb16c 100644 --- a/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc +++ b/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc @@ -4,9 +4,6 @@ resources/icons/addTrainee.png resources/icons/admin.png resources/icons/archive.png - resources/icons/branch-closed.png - resources/icons/branch-end.png - resources/icons/branch-more.png resources/icons/branch-open.png resources/icons/chekNo.png resources/icons/chekYes.png @@ -18,7 +15,6 @@ resources/icons/deleteGroup.png resources/icons/deleteInstructor.png resources/icons/deleteTrainee.png - resources/icons/docTasks.png resources/icons/edit.png resources/icons/group.png resources/icons/instructor.png @@ -33,7 +29,6 @@ resources/icons/trainee.png resources/icons/traineeArchive.png resources/icons/traineeFromArchive.png - resources/icons/vline.png resources/icons/sign.png resources/icons/procedure.png resources/icons/malfunction.png @@ -47,7 +42,6 @@ resources/icons/settings.png resources/icons/style.png resources/icons/updateVersion.png - resources/icons/editorDB.png resources/icons/lms.png resources/icons/critical.png resources/icons/warning.png @@ -55,7 +49,8 @@ resources/icons/personalCard.png resources/icons/eye.png resources/icons/exchange.png - resources/icons/link.png resources/icons/new.png + resources/icons/branch-closed.png + resources/icons/save.png diff --git a/LibInstructorsAndTrainees/connectorToServer/Core/dataparser.cpp b/LibInstructorsAndTrainees/connectorToServer/Core/dataparser.cpp index 946ae72..0ff30c5 100644 --- a/LibInstructorsAndTrainees/connectorToServer/Core/dataparser.cpp +++ b/LibInstructorsAndTrainees/connectorToServer/Core/dataparser.cpp @@ -440,11 +440,6 @@ ServerSettings *DataParser::getServerSettings() if(name == "Language"){ settings->Language = value; } - - if(name == "AutoStart"){ - settings->isAutoStart = value.toInt(); - } - } } } diff --git a/LibInstructorsAndTrainees/connectorToServer/Datas.h b/LibInstructorsAndTrainees/connectorToServer/Datas.h index 2b1beda..c9b31a6 100644 --- a/LibInstructorsAndTrainees/connectorToServer/Datas.h +++ b/LibInstructorsAndTrainees/connectorToServer/Datas.h @@ -9,7 +9,6 @@ public: QString Address; QString Port; QString Language; - bool isAutoStart; }; class ServerAuthorization{ diff --git a/LibInstructorsAndTrainees/resources/icons/admin.png b/LibInstructorsAndTrainees/resources/icons/admin.png index 558f0ac..fe18485 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/admin.png and b/LibInstructorsAndTrainees/resources/icons/admin.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/archive.png b/LibInstructorsAndTrainees/resources/icons/archive.png index b39b27e..58f7954 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/archive.png and b/LibInstructorsAndTrainees/resources/icons/archive.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/assignTask.png b/LibInstructorsAndTrainees/resources/icons/assignTask.png index ae8b318..02f11ad 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/assignTask.png and b/LibInstructorsAndTrainees/resources/icons/assignTask.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/check.png b/LibInstructorsAndTrainees/resources/icons/check.png index f787975..7d7521c 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/check.png and b/LibInstructorsAndTrainees/resources/icons/check.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/delete.png b/LibInstructorsAndTrainees/resources/icons/delete.png index 7e9d848..8addaaf 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/delete.png and b/LibInstructorsAndTrainees/resources/icons/delete.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/exchange.png b/LibInstructorsAndTrainees/resources/icons/exchange.png index 072e765..55a812b 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/exchange.png and b/LibInstructorsAndTrainees/resources/icons/exchange.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/filter.png b/LibInstructorsAndTrainees/resources/icons/filter.png index c78e44f..ebe9fb9 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/filter.png and b/LibInstructorsAndTrainees/resources/icons/filter.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/login-user.png b/LibInstructorsAndTrainees/resources/icons/login-user.png index d8f0237..b03ccdc 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/login-user.png and b/LibInstructorsAndTrainees/resources/icons/login-user.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/Bell/bell.png b/LibInstructorsAndTrainees/resources/icons/old/Bell/bell.png new file mode 100644 index 0000000..6bbaf39 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/Bell/bell.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/Bell/bell.psd b/LibInstructorsAndTrainees/resources/icons/old/Bell/bell.psd new file mode 100644 index 0000000..00f3070 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/Bell/bell.psd differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/Bell/bell24.png b/LibInstructorsAndTrainees/resources/icons/old/Bell/bell24.png new file mode 100644 index 0000000..2d58c0b Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/Bell/bell24.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/DB-instructors.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/DB-instructors.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/DB-instructors.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/DB-instructors.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/DB-trainees.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/DB-trainees.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/DB-trainees.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/DB-trainees.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/addInstructor.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/addInstructor.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/addInstructor.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/addInstructor.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/addTrainee.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/addTrainee.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/addTrainee.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/addTrainee.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/admin.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/admin.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/admin.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/admin.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/archive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/archive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/archive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/archive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/assignTask.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/assignTask.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/assignTask.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/assignTask.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/check.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/check.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/check.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/check.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/chekNo.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/chekNo.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/chekNo.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/chekNo.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/chekYes.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/chekYes.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/chekYes.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/chekYes.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/circleGray.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/circleGray.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/circleGray.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/circleGray.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/circleGreen.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/circleGreen.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/circleGreen.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/circleGreen.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/circleRed.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/circleRed.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/circleRed.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/circleRed.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/circleYellow.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/circleYellow.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/circleYellow.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/circleYellow.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/connectDB.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/connectDB.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/connectDB.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/connectDB.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/delete.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/delete.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/delete.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/delete.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/deleteGroup.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/deleteGroup.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/deleteGroup.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/deleteGroup.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/deleteInstructor.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/deleteInstructor.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/deleteInstructor.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/deleteInstructor.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/deleteTrainee.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/deleteTrainee.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/deleteTrainee.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/deleteTrainee.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/docTasks.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/docTasks.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/docTasks.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/docTasks.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/edit.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/edit.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/edit.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/edit.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/editorDB.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/editorDB.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/editorDB.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/editorDB.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/filter.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/filter.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/filter.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/filter.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/group.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/group.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/group.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/group.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/instructor.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/instructor.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/instructor.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/instructor.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/instructorAdmin.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/instructorAdmin.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/instructorAdmin.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/instructorAdmin.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/instructorArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/instructorArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/instructorArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/instructorArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/instructorFromArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/instructorFromArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/instructorFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/instructorFromArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/lms.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/lms.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/lms.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/lms.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/login-user.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/login-user.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/login-user.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/login-user.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/malfunction.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/malfunction.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/malfunction.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/malfunction.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/newGroup.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/newGroup.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/newGroup.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/newGroup.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/rectGray.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/rectGray.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/rectGray.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/rectGray.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/rectGreen.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/rectGreen.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/rectGreen.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/rectGreen.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/sendMsg.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/sendMsg.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/sendMsg.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/sendMsg.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/settings.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/settings.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/settings.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/settings.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/sign.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/sign.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/sign.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/sign.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/style.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/style.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/style.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/style.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/task.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/task.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/task.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/task.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/trainee.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/trainee.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/trainee.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/trainee.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/traineeArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/traineeArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/traineeArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/traineeArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/traineeFromArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/traineeFromArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/traineeFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/traineeFromArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG/updateVersion.png b/LibInstructorsAndTrainees/resources/icons/old/PNG/updateVersion.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG/updateVersion.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG/updateVersion.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/DB-instructors.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/DB-instructors.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/DB-instructors.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/DB-instructors.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/DB-trainees.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/DB-trainees.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/DB-trainees.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/DB-trainees.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/addInstructor.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/addInstructor.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/addInstructor.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/addInstructor.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/addTrainee.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/addTrainee.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/addTrainee.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/addTrainee.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/admin.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/admin.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/admin.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/admin.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/archive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/archive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/archive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/archive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/assignTask.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/assignTask.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/assignTask.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/assignTask.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/check.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/check.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/check.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/check.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/chekNo.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/chekNo.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/chekNo.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/chekNo.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/chekYes.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/chekYes.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/chekYes.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/chekYes.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/circleGray.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/circleGray.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/circleGray.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/circleGray.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/circleGreen.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/circleGreen.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/circleGreen.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/circleGreen.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/circleRed.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/circleRed.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/circleRed.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/circleRed.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/circleYellow.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/circleYellow.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/circleYellow.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/circleYellow.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/connectDB.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/connectDB.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/connectDB.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/connectDB.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/delete.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/delete.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/delete.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/delete.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/deleteGroup.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/deleteGroup.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/deleteGroup.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/deleteGroup.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/deleteInstructor.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/deleteInstructor.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/deleteInstructor.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/deleteInstructor.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/deleteTrainee.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/deleteTrainee.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/deleteTrainee.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/deleteTrainee.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/docTasks.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/docTasks.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/docTasks.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/docTasks.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/edit.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/edit.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/edit.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/edit.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/editorDB.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/editorDB.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/editorDB.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/editorDB.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/filter.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/filter.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/filter.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/filter.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/group.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/group.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/group.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/group.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/instructor.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/instructor.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/instructor.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/instructor.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/instructorAdmin.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/instructorAdmin.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/instructorAdmin.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/instructorAdmin.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/instructorArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/instructorArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/instructorArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/instructorArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/instructorFromArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/instructorFromArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/instructorFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/instructorFromArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/lms.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/lms.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/lms.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/lms.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/login-user.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/login-user.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/login-user.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/login-user.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/malfunction.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/malfunction.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/malfunction.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/malfunction.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/newGroup.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/newGroup.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/newGroup.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/newGroup.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/rectGray.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/rectGray.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/rectGray.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/rectGray.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/rectGreen.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/rectGreen.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/rectGreen.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/rectGreen.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/sendMsg.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/sendMsg.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/sendMsg.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/sendMsg.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/settings.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/settings.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/settings.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/settings.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/sign.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/sign.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/sign.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/sign.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/style.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/style.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/style.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/style.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/task.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/task.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/task.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/task.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/trainee.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/trainee.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/trainee.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/trainee.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/traineeArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/traineeArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/traineeArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/traineeArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/traineeFromArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/traineeFromArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/traineeFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/traineeFromArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG24/updateVersion.png b/LibInstructorsAndTrainees/resources/icons/old/PNG24/updateVersion.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG24/updateVersion.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG24/updateVersion.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/DB-instructors.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/DB-instructors.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/DB-instructors.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/DB-instructors.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/DB-trainees.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/DB-trainees.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/DB-trainees.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/DB-trainees.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/addInstructor.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/addInstructor.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/addInstructor.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/addInstructor.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/addTrainee.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/addTrainee.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/addTrainee.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/addTrainee.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/admin.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/admin.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/admin.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/admin.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/archive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/archive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/archive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/archive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/assignTask.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/assignTask.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/assignTask.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/assignTask.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/check.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/check.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/check.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/check.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/chekNo.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/chekNo.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/chekNo.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/chekNo.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/chekYes.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/chekYes.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/chekYes.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/chekYes.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/circleGray.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/circleGray.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/circleGray.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/circleGray.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/circleGreen.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/circleGreen.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/circleGreen.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/circleGreen.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/circleRed.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/circleRed.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/circleRed.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/circleRed.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/circleYellow.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/circleYellow.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/circleYellow.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/circleYellow.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/connectDB.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/connectDB.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/connectDB.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/connectDB.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/delete.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/delete.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/delete.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/delete.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/deleteGroup.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/deleteGroup.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/deleteGroup.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/deleteGroup.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/deleteInstructor.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/deleteInstructor.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/deleteInstructor.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/deleteInstructor.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/deleteTrainee.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/deleteTrainee.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/deleteTrainee.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/deleteTrainee.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/docTasks.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/docTasks.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/docTasks.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/docTasks.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/edit.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/edit.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/edit.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/edit.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/editorDB.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/editorDB.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/editorDB.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/editorDB.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/filter.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/filter.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/filter.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/filter.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/group.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/group.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/group.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/group.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/instructor.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/instructor.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/instructor.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/instructor.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/instructorAdmin.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/instructorAdmin.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/instructorAdmin.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/instructorAdmin.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/instructorArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/instructorArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/instructorArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/instructorArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/instructorFromArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/instructorFromArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/instructorFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/instructorFromArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/lms.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/lms.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/lms.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/lms.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/login-user.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/login-user.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/login-user.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/login-user.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/malfunction.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/malfunction.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/malfunction.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/malfunction.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/newGroup.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/newGroup.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/newGroup.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/newGroup.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/rectGray.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/rectGray.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/rectGray.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/rectGray.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/rectGreen.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/rectGreen.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/rectGreen.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/rectGreen.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/sendMsg.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/sendMsg.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/sendMsg.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/sendMsg.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/settings.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/settings.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/settings.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/settings.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/sign.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/sign.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/sign.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/sign.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/style.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/style.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/style.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/style.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/task.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/task.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/task.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/task.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/trainee.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/trainee.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/trainee.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/trainee.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/traineeArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/traineeArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/traineeArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/traineeArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/traineeFromArchive.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/traineeFromArchive.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/traineeFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/traineeFromArchive.png diff --git a/LibInstructorsAndTrainees/resources/icons/PNG32/updateVersion.png b/LibInstructorsAndTrainees/resources/icons/old/PNG32/updateVersion.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/PNG32/updateVersion.png rename to LibInstructorsAndTrainees/resources/icons/old/PNG32/updateVersion.png diff --git a/LibInstructorsAndTrainees/resources/icons/old/admin.png b/LibInstructorsAndTrainees/resources/icons/old/admin.png new file mode 100644 index 0000000..558f0ac Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/admin.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/assignTask.png b/LibInstructorsAndTrainees/resources/icons/old/assignTask.png new file mode 100644 index 0000000..ae8b318 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/assignTask.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/branch-end.png b/LibInstructorsAndTrainees/resources/icons/old/branch-end.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/branch-end.png rename to LibInstructorsAndTrainees/resources/icons/old/branch-end.png diff --git a/LibInstructorsAndTrainees/resources/icons/branch-more.png b/LibInstructorsAndTrainees/resources/icons/old/branch-more.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/branch-more.png rename to LibInstructorsAndTrainees/resources/icons/old/branch-more.png diff --git a/LibInstructorsAndTrainees/resources/icons/old/check.png b/LibInstructorsAndTrainees/resources/icons/old/check.png new file mode 100644 index 0000000..f787975 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/check.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/delete.png b/LibInstructorsAndTrainees/resources/icons/old/delete.png index 12329f3..7e9d848 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/old/delete.png and b/LibInstructorsAndTrainees/resources/icons/old/delete.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/delete_.png b/LibInstructorsAndTrainees/resources/icons/old/delete_.png new file mode 100644 index 0000000..12329f3 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/delete_.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/docTasks.png b/LibInstructorsAndTrainees/resources/icons/old/docTasks.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/docTasks.png rename to LibInstructorsAndTrainees/resources/icons/old/docTasks.png diff --git a/LibInstructorsAndTrainees/resources/icons/editorDB.png b/LibInstructorsAndTrainees/resources/icons/old/editorDB.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/editorDB.png rename to LibInstructorsAndTrainees/resources/icons/old/editorDB.png diff --git a/LibInstructorsAndTrainees/resources/icons/old/exchange___.png b/LibInstructorsAndTrainees/resources/icons/old/exchange___.png new file mode 100644 index 0000000..072e765 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/exchange___.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/filter.png b/LibInstructorsAndTrainees/resources/icons/old/filter.png index 0efea9e..fe824f3 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/old/filter.png and b/LibInstructorsAndTrainees/resources/icons/old/filter.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/link.png b/LibInstructorsAndTrainees/resources/icons/old/link.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/link.png rename to LibInstructorsAndTrainees/resources/icons/old/link.png diff --git a/LibInstructorsAndTrainees/resources/icons/old/login-user.png b/LibInstructorsAndTrainees/resources/icons/old/login-user.png index 05b2207..d8f0237 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/old/login-user.png and b/LibInstructorsAndTrainees/resources/icons/old/login-user.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/settings.png b/LibInstructorsAndTrainees/resources/icons/old/settings.png new file mode 100644 index 0000000..07376fe Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/settings.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/sign — копия.png b/LibInstructorsAndTrainees/resources/icons/old/sign — копия.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/sign — копия.png rename to LibInstructorsAndTrainees/resources/icons/old/sign — копия.png diff --git a/LibInstructorsAndTrainees/resources/icons/old/sign.png b/LibInstructorsAndTrainees/resources/icons/old/sign.png new file mode 100644 index 0000000..2b1f8c4 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/sign.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/sign_.png b/LibInstructorsAndTrainees/resources/icons/old/sign_.png new file mode 100644 index 0000000..1e9cb7b Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/sign_.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/updateVersion.png b/LibInstructorsAndTrainees/resources/icons/old/updateVersion.png new file mode 100644 index 0000000..1e4963d Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/updateVersion.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/vline.png b/LibInstructorsAndTrainees/resources/icons/old/vline.png similarity index 100% rename from LibInstructorsAndTrainees/resources/icons/vline.png rename to LibInstructorsAndTrainees/resources/icons/old/vline.png diff --git a/LibInstructorsAndTrainees/resources/icons/save.png b/LibInstructorsAndTrainees/resources/icons/save.png new file mode 100644 index 0000000..5e5103c Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/save.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/settings.png b/LibInstructorsAndTrainees/resources/icons/settings.png index 07376fe..b065a54 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/settings.png and b/LibInstructorsAndTrainees/resources/icons/settings.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/updateVersion.png b/LibInstructorsAndTrainees/resources/icons/updateVersion.png index 1e4963d..6b42dfe 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/updateVersion.png and b/LibInstructorsAndTrainees/resources/icons/updateVersion.png differ diff --git a/LibInstructorsAndTrainees/settings/dialogsettings.cpp b/LibInstructorsAndTrainees/settings/dialogsettings.cpp index 30ca444..07d8d9b 100644 --- a/LibInstructorsAndTrainees/settings/dialogsettings.cpp +++ b/LibInstructorsAndTrainees/settings/dialogsettings.cpp @@ -19,7 +19,6 @@ DialogSettings::DialogSettings(ConnectorToServer* connectorToServer, bool instru ui->btnUpdateStyle->setObjectName("btnUpdateStyle"); ui->btnSetVersion->setObjectName("btnSetVersion"); ui->btnSave->setObjectName("btnSave"); - ui->checkAutoStart->setObjectName("checkAutoStart"); #ifndef PROJECT_TYPE_DEBUG ui->btnUpdateStyle->setVisible(false); @@ -57,7 +56,6 @@ DialogSettings::DialogSettings(ConnectorToServer* connectorToServer, bool instru ui->editAddress->setText(settings->Address); ui->editPort->setText(settings->Port); - ui->checkAutoStart->setChecked(settings->isAutoStart); } ui->btnSetVersion->setEnabled(false); @@ -68,9 +66,6 @@ DialogSettings::DialogSettings(ConnectorToServer* connectorToServer, bool instru ui->btnSetVersion->setEnabled(true); } - ui->label_AutoStart->setVisible(false); - ui->checkAutoStart->setVisible(false); - ui->btnSave->setEnabled(false); flSettingsServerChanged = false; } @@ -154,11 +149,6 @@ bool DialogSettings::loadSettings(ServerSettings *settings) if(name == "Language"){ settings->Language = value; } - - if(name == "AutoStart"){ - settings->isAutoStart = value.toInt(); - } - } } } @@ -189,7 +179,6 @@ bool DialogSettings::saveSettings() xmlWriter.writeAttribute("Address", settings->Address); xmlWriter.writeAttribute("Port", settings->Port); xmlWriter.writeAttribute("Language", settings->Language); - xmlWriter.writeAttribute("AutoStart", QString::number(settings->isAutoStart)); xmlWriter.writeEndElement(); xmlWriter.writeEndElement(); @@ -214,7 +203,6 @@ void DialogSettings::on_btnSave_clicked() settings->Address = ui->editAddress->text(); settings->Port = ui->editPort->text(); - settings->isAutoStart = ui->checkAutoStart->isChecked(); saveSettings(); diff --git a/LibInstructorsAndTrainees/settings/dialogsettings.ui b/LibInstructorsAndTrainees/settings/dialogsettings.ui index d9a5734..07e5218 100644 --- a/LibInstructorsAndTrainees/settings/dialogsettings.ui +++ b/LibInstructorsAndTrainees/settings/dialogsettings.ui @@ -7,11 +7,11 @@ 0 0 500 - 350 + 300 - + 0 0 @@ -19,7 +19,7 @@ 500 - 350 + 300 @@ -184,43 +184,6 @@ - - - - - - false - - - Auto start - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - - - - - - @@ -246,8 +209,8 @@ Save - - :/resources/icons/circleGreen.png:/resources/icons/circleGreen.png + + :/resources/icons/save.png:/resources/icons/save.png @@ -375,6 +338,7 @@ + diff --git a/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp b/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp index 7878933..c65a41c 100644 --- a/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -471,7 +471,7 @@ void FIMtasksWidget::setCurrentTask(int id) treeWidget->setCurrentItem(item); //treeWidget->itemClicked(item, 0); //treeWidget->itemChanged(item, 0); - treeWidget->setItemSelected(item, true); + //treeWidget->setItemSelected(item, true); return; } } diff --git a/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp b/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp index 28e8a4d..b71666b 100644 --- a/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp +++ b/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp @@ -707,6 +707,7 @@ void TaskAMMFIMTreePreparation::slot_prepareFIMListItemsForTrainee(QListsetFlags(itemMalfunction->flags() ^ Qt::ItemIsSelectable); itemMalfunction->setText(ColumnsTreeFIM::clmnFIM_Title, malfunction.description); itemMalfunction->setText(ColumnsTreeFIM::clmnFIM_Device, malfunction.objName); @@ -726,6 +727,7 @@ void TaskAMMFIMTreePreparation::slot_prepareFIMListItemsForTrainee(QListsetFlags(itemSign->flags() ^ Qt::ItemIsSelectable); itemSign->setText(ColumnsTreeFIM::clmnFIM_Title, sign.description); //itemSign->setFlags(itemSign->flags() | Qt::ItemIsUserCheckable); diff --git a/LibServer/Server.qrc b/LibServer/Server.qrc index 8a65201..09da0c9 100644 --- a/LibServer/Server.qrc +++ b/LibServer/Server.qrc @@ -3,24 +3,20 @@ resources/blankXML/ListGroups.xml resources/blankXML/ListInstructors.xml resources/blankXML/ListTrainees.xml - resources/icons/switchOff.png - resources/icons/switchOn.png resources/blankXML/ListTasksAMM.xml resources/blankXML/ListTasksFIM.xml resources/icons/circleGreen.png resources/icons/circleRed.png resources/icons/lock.png - resources/icons/unlock.png - resources/icons/open.png resources/icons/rocket.png resources/icons/stop.png resources/icons/settings.png resources/icons/circleGray.png - resources/icons/checkDB.png resources/icons/editorDB.png - resources/icons/procedure.png - resources/icons/exchange.png resources/blankXML/ListSubProc.xml resources/icons/PngServerRRJ.png + resources/icons/reparation.png + resources/icons/save.png + resources/icons/stoped.png diff --git a/LibServer/resources/icons/checkDB.png b/LibServer/resources/icons/checkDB.png deleted file mode 100644 index 91895c2..0000000 Binary files a/LibServer/resources/icons/checkDB.png and /dev/null differ diff --git a/LibServer/resources/icons/circleGray.png b/LibServer/resources/icons/circleGray.png index 74c2897..c2cf426 100644 Binary files a/LibServer/resources/icons/circleGray.png and b/LibServer/resources/icons/circleGray.png differ diff --git a/LibServer/resources/icons/circleGreen.png b/LibServer/resources/icons/circleGreen.png index 62281b1..bcbce3d 100644 Binary files a/LibServer/resources/icons/circleGreen.png and b/LibServer/resources/icons/circleGreen.png differ diff --git a/LibServer/resources/icons/circleRed.png b/LibServer/resources/icons/circleRed.png index 9f4f1cb..9be2b42 100644 Binary files a/LibServer/resources/icons/circleRed.png and b/LibServer/resources/icons/circleRed.png differ diff --git a/LibServer/resources/icons/editorDB.png b/LibServer/resources/icons/editorDB.png index bb4ab4e..2560a5d 100644 Binary files a/LibServer/resources/icons/editorDB.png and b/LibServer/resources/icons/editorDB.png differ diff --git a/LibServer/resources/icons/lock.png b/LibServer/resources/icons/lock.png index 0cd09ca..bf9e7b2 100644 Binary files a/LibServer/resources/icons/lock.png and b/LibServer/resources/icons/lock.png differ diff --git a/LibServer/resources/icons/old/circleGray.png b/LibServer/resources/icons/old/circleGray.png new file mode 100644 index 0000000..74c2897 Binary files /dev/null and b/LibServer/resources/icons/old/circleGray.png differ diff --git a/LibServer/resources/icons/old/circleGreen.png b/LibServer/resources/icons/old/circleGreen.png new file mode 100644 index 0000000..62281b1 Binary files /dev/null and b/LibServer/resources/icons/old/circleGreen.png differ diff --git a/LibServer/resources/icons/old/circleRed.png b/LibServer/resources/icons/old/circleRed.png new file mode 100644 index 0000000..9f4f1cb Binary files /dev/null and b/LibServer/resources/icons/old/circleRed.png differ diff --git a/LibServer/resources/icons/old/diskette.png b/LibServer/resources/icons/old/diskette.png new file mode 100644 index 0000000..3eeab89 Binary files /dev/null and b/LibServer/resources/icons/old/diskette.png differ diff --git a/LibServer/resources/icons/old/editorDB.png b/LibServer/resources/icons/old/editorDB.png new file mode 100644 index 0000000..bb4ab4e Binary files /dev/null and b/LibServer/resources/icons/old/editorDB.png differ diff --git a/LibServer/resources/icons/exchange.png b/LibServer/resources/icons/old/exchange.png similarity index 100% rename from LibServer/resources/icons/exchange.png rename to LibServer/resources/icons/old/exchange.png diff --git a/LibServer/resources/icons/old/lock.png b/LibServer/resources/icons/old/lock.png index e970b1e..0cd09ca 100644 Binary files a/LibServer/resources/icons/old/lock.png and b/LibServer/resources/icons/old/lock.png differ diff --git a/LibServer/resources/icons/old/lock_.png b/LibServer/resources/icons/old/lock_.png new file mode 100644 index 0000000..9e8c47a Binary files /dev/null and b/LibServer/resources/icons/old/lock_.png differ diff --git a/LibServer/resources/icons/open.png b/LibServer/resources/icons/old/open.png similarity index 100% rename from LibServer/resources/icons/open.png rename to LibServer/resources/icons/old/open.png diff --git a/LibServer/resources/icons/procedure.png b/LibServer/resources/icons/old/procedure.png similarity index 100% rename from LibServer/resources/icons/procedure.png rename to LibServer/resources/icons/old/procedure.png diff --git a/LibServer/resources/icons/old/rocket.png b/LibServer/resources/icons/old/rocket.png new file mode 100644 index 0000000..894013b Binary files /dev/null and b/LibServer/resources/icons/old/rocket.png differ diff --git a/LibServer/resources/icons/old/save.png b/LibServer/resources/icons/old/save.png new file mode 100644 index 0000000..e65e54c Binary files /dev/null and b/LibServer/resources/icons/old/save.png differ diff --git a/LibServer/resources/icons/old/settings.png b/LibServer/resources/icons/old/settings.png new file mode 100644 index 0000000..07376fe Binary files /dev/null and b/LibServer/resources/icons/old/settings.png differ diff --git a/LibServer/resources/icons/old/settings_.png b/LibServer/resources/icons/old/settings_.png new file mode 100644 index 0000000..91dfee9 Binary files /dev/null and b/LibServer/resources/icons/old/settings_.png differ diff --git a/LibServer/resources/icons/old/stop.png b/LibServer/resources/icons/old/stop.png index d9122fd..897318a 100644 Binary files a/LibServer/resources/icons/old/stop.png and b/LibServer/resources/icons/old/stop.png differ diff --git a/LibServer/resources/icons/switchOff.png b/LibServer/resources/icons/old/switchOff.png similarity index 100% rename from LibServer/resources/icons/switchOff.png rename to LibServer/resources/icons/old/switchOff.png diff --git a/LibServer/resources/icons/switchOn.png b/LibServer/resources/icons/old/switchOn.png similarity index 100% rename from LibServer/resources/icons/switchOn.png rename to LibServer/resources/icons/old/switchOn.png diff --git a/LibServer/resources/icons/unlock.png b/LibServer/resources/icons/old/unlock.png similarity index 100% rename from LibServer/resources/icons/unlock.png rename to LibServer/resources/icons/old/unlock.png diff --git a/LibServer/resources/icons/reparation.png b/LibServer/resources/icons/reparation.png new file mode 100644 index 0000000..83bdaa4 Binary files /dev/null and b/LibServer/resources/icons/reparation.png differ diff --git a/LibServer/resources/icons/rocket.png b/LibServer/resources/icons/rocket.png index 894013b..c0b18e8 100644 Binary files a/LibServer/resources/icons/rocket.png and b/LibServer/resources/icons/rocket.png differ diff --git a/LibServer/resources/icons/save.png b/LibServer/resources/icons/save.png new file mode 100644 index 0000000..5e5103c Binary files /dev/null and b/LibServer/resources/icons/save.png differ diff --git a/LibServer/resources/icons/settings.png b/LibServer/resources/icons/settings.png index 07376fe..b065a54 100644 Binary files a/LibServer/resources/icons/settings.png and b/LibServer/resources/icons/settings.png differ diff --git a/LibServer/resources/icons/stop.png b/LibServer/resources/icons/stop.png index 286e53f..9cd06dc 100644 Binary files a/LibServer/resources/icons/stop.png and b/LibServer/resources/icons/stop.png differ diff --git a/LibServer/resources/icons/stoped.png b/LibServer/resources/icons/stoped.png new file mode 100644 index 0000000..286e53f Binary files /dev/null and b/LibServer/resources/icons/stoped.png differ diff --git a/LibServer/serverlmswidget.cpp b/LibServer/serverlmswidget.cpp index 51c9c17..72d133b 100644 --- a/LibServer/serverlmswidget.cpp +++ b/LibServer/serverlmswidget.cpp @@ -472,7 +472,7 @@ void ServerLMSWidget::updateStateOnlyServer() else { ui->lblOnOffText->setText(tr("stoped")); - ui->lblOnOff->setPixmap(QPixmap(QStringLiteral(":/resources/icons/stop.png"))); + ui->lblOnOff->setPixmap(QPixmap(QStringLiteral(":/resources/icons/stoped.png"))); } emit signal_updateStateServer(server->getStateServer(), server->getStateBlockAutorization()); diff --git a/LibServer/serverlmswidget.ui b/LibServer/serverlmswidget.ui index cf72489..05ffb3d 100644 --- a/LibServer/serverlmswidget.ui +++ b/LibServer/serverlmswidget.ui @@ -250,7 +250,7 @@ - :/resources/icons/circleGray.png + :/resources/icons/stoped.png true diff --git a/LibServer/settings/dialogcheckdb.ui b/LibServer/settings/dialogcheckdb.ui index c046dc4..d8a349d 100644 --- a/LibServer/settings/dialogcheckdb.ui +++ b/LibServer/settings/dialogcheckdb.ui @@ -81,7 +81,7 @@ - :/resources/icons/circleGray.png + :/resources/icons/circleGray.png @@ -152,7 +152,7 @@ - :/resources/icons/circleGray.png + :/resources/icons/circleGray.png @@ -223,7 +223,7 @@ - :/resources/icons/circleGray.png + :/resources/icons/circleGray.png @@ -259,8 +259,8 @@ Repare - - :/resources/icons/procedure.png:/resources/icons/procedure.png + + :/resources/icons/reparation.png:/resources/icons/reparation.png @@ -280,7 +280,8 @@ - + + diff --git a/LibServer/settings/dialogsettingstray.cpp b/LibServer/settings/dialogsettingstray.cpp index f8dcff7..afe0c04 100644 --- a/LibServer/settings/dialogsettingstray.cpp +++ b/LibServer/settings/dialogsettingstray.cpp @@ -303,6 +303,7 @@ void DialogSettingsTray::on_btnCheckDB_clicked() dlg.setWindowIcon(QIcon(QStringLiteral(":/resources/icons/PngServerRRJ.png"))); dlg.setWindowTitle(tr("Superuser PostgreSQL authorization")); dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint); + dlg.setMinimumWidth(350); dlg.setStyleSheet(this->styleSheet()); dlg.setLogin("postgres"); dlg.setPassword(""); diff --git a/LibServer/settings/dialogsettingstray.ui b/LibServer/settings/dialogsettingstray.ui index 387e726..516abc1 100644 --- a/LibServer/settings/dialogsettingstray.ui +++ b/LibServer/settings/dialogsettingstray.ui @@ -254,8 +254,8 @@ Save - - :/resources/icons/circleGreen.png:/resources/icons/circleGreen.png + + :/resources/icons/save.png:/resources/icons/save.png @@ -365,6 +365,7 @@ +