refact0

InstructorsAndTrainees/settings/dialogsettings.cpp

@@ -78,7 +78,11 @@ DialogSettings::DialogSettings(ConnectorToServer* connectorToServer, bool instru
 DialogSettings::~DialogSettings()
 {
     if(dlgVersionControl)
+    {
         dlgVersionControl->close();
+        delete dlgVersionControl;
+        dlgVersionControl = nullptr;
+    }
 
     delete ui;
     delete settings;
@@ -101,6 +105,11 @@ ServerSettings DialogSettings::getSettings()
     return *settings;
 }
 
+bool DialogSettings::settingsServerIsChanged()
+{
+    return flSettingsServerChanged;
+}
+
 void DialogSettings::changeEvent(QEvent *event)
 {
     // В случае получения события изменения языка приложения

InstructorsAndTrainees/settings/dialogsettings.h

@@ -24,7 +24,7 @@ public:
 
     ServerSettings getSettings();
 
-    bool settingsServerIsChanged(){ return flSettingsServerChanged;}
+    bool settingsServerIsChanged();
 
     static bool loadSettings(ServerSettings *settings);
 

InstructorsAndTrainees/settings/dialogversioncontrol.ui

@@ -193,7 +193,7 @@
           </font>
          </property>
          <property name="text">
-          <string>Change server version</string>
+          <string>Change version</string>
          </property>
         </widget>
        </item>

InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts

@@ -275,6 +275,11 @@ The status will be set:
         <source>Log in</source>
         <translation>Войти</translation>
     </message>
+    <message>
+        <location filename="../authorization/dialogauthorization.cpp" line="64"/>
+        <source>Only Latin letters and numbers</source>
+        <translation>Только латинские буквы и цифры</translation>
+    </message>
 </context>
 <context>
     <name>DialogCardTrainee</name>
@@ -350,14 +355,19 @@ The status will be set:
     </message>
     <message>
         <location filename="../instructors/dialogeditinstructor.ui" line="195"/>
-        <source>Logged</source>
+        <source>Online</source>
-        <translation>Залогирован</translation>
+        <translation>В сети</translation>
     </message>
     <message>
         <location filename="../instructors/dialogeditinstructor.ui" line="233"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
+    <message>
+        <location filename="../instructors/dialogeditinstructor.cpp" line="151"/>
+        <source>Only Latin letters and numbers</source>
+        <translation>Только латинские буквы и цифры</translation>
+    </message>
 </context>
 <context>
     <name>DialogEditTrainee</name>
@@ -394,14 +404,19 @@ The status will be set:
     </message>
     <message>
         <location filename="../trainees/dialogedittrainee.ui" line="176"/>
-        <source>Logged</source>
+        <source>Online</source>
-        <translation>Залогирован</translation>
+        <translation>В сети</translation>
     </message>
     <message>
         <location filename="../trainees/dialogedittrainee.ui" line="214"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
+    <message>
+        <location filename="../trainees/dialogedittrainee.cpp" line="144"/>
+        <source>Only Latin letters and numbers</source>
+        <translation>Только латинские буквы и цифры</translation>
+    </message>
 </context>
 <context>
     <name>DialogListSubProc</name>
@@ -424,6 +439,49 @@ The status will be set:
         <translation>Сохранить</translation>
     </message>
 </context>
+<context>
+    <name>DialogNewVersion</name>
+    <message>
+        <location filename="../settings/dialognewversion.ui" line="20"/>
+        <source>Create copy...</source>
+        <translation>Создать копию...</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialognewversion.ui" line="58"/>
+        <source>Basic version:</source>
+        <translation>Базовая версия:</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialognewversion.ui" line="71"/>
+        <source>TextLabel</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../settings/dialognewversion.ui" line="109"/>
+        <source>New name version:</source>
+        <translation>Имя копии:</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialognewversion.ui" line="196"/>
+        <source>Create</source>
+        <translation>Создать</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialognewversion.ui" line="225"/>
+        <source>Cancel</source>
+        <translation>Отменить</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialognewversion.cpp" line="16"/>
+        <source>New version</source>
+        <translation>Новая версия</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialognewversion.cpp" line="49"/>
+        <source>Only Latin letters and numbers</source>
+        <translation>Только латинские буквы и цифры</translation>
+    </message>
+</context>
 <context>
     <name>DialogRedactorInstructors</name>
     <message>
@@ -506,6 +564,97 @@ The status will be set:
         <translation>Просмотршик списка процедур</translation>
     </message>
 </context>
+<context>
+    <name>DialogVersionControl</name>
+    <message>
+        <location filename="../settings/dialogversioncontrol.ui" line="20"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.ui" line="60"/>
+        <source>Available versions on the server:</source>
+        <translation>Доступные версии на сервере:</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.ui" line="83"/>
+        <source>Info:</source>
+        <translation>Информация:</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.ui" line="93"/>
+        <source>Double click on the version to see information...</source>
+        <translation>Двойной клик на версии для просмотра информации...</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.ui" line="118"/>
+        <source>Current server version:</source>
+        <translation>Текущая версия:</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.ui" line="125"/>
+        <source>none</source>
+        <translation>нет</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.ui" line="154"/>
+        <source>Create copy</source>
+        <translation>Создать копию</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.ui" line="178"/>
+        <source>Delete</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.ui" line="196"/>
+        <source>Change version</source>
+        <translation>Изменить версию</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.cpp" line="24"/>
+        <source>Version control</source>
+        <translation>Управление версиями</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.cpp" line="90"/>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.cpp" line="91"/>
+        <source>No</source>
+        <translation>Нет</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.cpp" line="100"/>
+        <source>Version name: </source>
+        <translation>Имя версии: </translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.cpp" line="101"/>
+        <source>Created: </source>
+        <translation>Создан: </translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.cpp" line="102"/>
+        <source>Changeable: </source>
+        <translation>Изменен: </translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.cpp" line="103"/>
+        <source>Author: </source>
+        <translation>Автор: </translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogversioncontrol.cpp" line="116"/>
+        <location filename="../settings/dialogversioncontrol.cpp" line="129"/>
+        <location filename="../settings/dialogversioncontrol.cpp" line="162"/>
+        <location filename="../settings/dialogversioncontrol.cpp" line="174"/>
+        <source>Version not selected</source>
+        <translation>Версия не выбрана</translation>
+    </message>
+</context>
 <context>
     <name>EditorInstructors</name>
     <message>
@@ -744,32 +893,32 @@ The changes will not be accepted.</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../tasks/fimtaskswidget.cpp" line="303"/>
+        <location filename="../tasks/fimtaskswidget.cpp" line="307"/>
-        <location filename="../tasks/fimtaskswidget.cpp" line="305"/>
+        <location filename="../tasks/fimtaskswidget.cpp" line="309"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="../tasks/fimtaskswidget.cpp" line="303"/>
+        <location filename="../tasks/fimtaskswidget.cpp" line="307"/>
-        <location filename="../tasks/fimtaskswidget.cpp" line="305"/>
+        <location filename="../tasks/fimtaskswidget.cpp" line="309"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="../tasks/fimtaskswidget.cpp" line="303"/>
+        <location filename="../tasks/fimtaskswidget.cpp" line="307"/>
-        <location filename="../tasks/fimtaskswidget.cpp" line="305"/>
+        <location filename="../tasks/fimtaskswidget.cpp" line="309"/>
         <source>Procedure FIM</source>
         <translation>Процедура FIM</translation>
     </message>
     <message>
-        <location filename="../tasks/fimtaskswidget.cpp" line="392"/>
+        <location filename="../tasks/fimtaskswidget.cpp" line="396"/>
         <source>The deletion will be irrevocable.
 Delete it anyway?</source>
         <translation>Удаление будет безвозвратным.
 Всё равно удалить?</translation>
     </message>
     <message>
-        <location filename="../tasks/fimtaskswidget.cpp" line="436"/>
+        <location filename="../tasks/fimtaskswidget.cpp" line="440"/>
         <source>Assign this task?</source>
         <translation>Назначить эту задачу?</translation>
     </message>
@@ -844,57 +993,62 @@ Delete it anyway?</source>
     <message>
         <location filename="../instructorsandtraineeswidget.ui" line="369"/>
         <location filename="../instructorsandtraineeswidget.ui" line="443"/>
-        <location filename="../instructorsandtraineeswidget.cpp" line="419"/>
+        <location filename="../instructorsandtraineeswidget.cpp" line="500"/>
         <source>none</source>
         <translation>нет</translation>
     </message>
     <message>
-        <location filename="../instructorsandtraineeswidget.cpp" line="137"/>
+        <location filename="../instructorsandtraineeswidget.cpp" line="162"/>
         <source>The file could not be opened </source>
         <translation>Файл не может быть открыт </translation>
     </message>
     <message>
-        <location filename="../instructorsandtraineeswidget.cpp" line="201"/>
+        <location filename="../instructorsandtraineeswidget.cpp" line="226"/>
         <source>Instructor authorization.</source>
         <translation>Авторизация инструктора.</translation>
     </message>
     <message>
-        <location filename="../instructorsandtraineeswidget.cpp" line="227"/>
+        <location filename="../instructorsandtraineeswidget.cpp" line="252"/>
         <source>Instructor deauthorization</source>
         <translation>Деавторизация инструктора</translation>
     </message>
     <message>
-        <location filename="../instructorsandtraineeswidget.cpp" line="227"/>
+        <location filename="../instructorsandtraineeswidget.cpp" line="252"/>
         <source>Error!</source>
         <translation>Ошибка!</translation>
     </message>
     <message>
-        <location filename="../instructorsandtraineeswidget.cpp" line="269"/>
+        <location filename="../instructorsandtraineeswidget.cpp" line="328"/>
         <source>The server is not available!</source>
         <translation>Сервер недоступен!</translation>
     </message>
     <message>
-        <location filename="../instructorsandtraineeswidget.cpp" line="432"/>
+        <location filename="../instructorsandtraineeswidget.cpp" line="512"/>
+        <source>Connection attempt</source>
+        <translation>Попытка соединения</translation>
+    </message>
+    <message>
+        <location filename="../instructorsandtraineeswidget.cpp" line="519"/>
         <source>connected</source>
         <translation>подключен</translation>
     </message>
     <message>
-        <location filename="../instructorsandtraineeswidget.cpp" line="435"/>
+        <location filename="../instructorsandtraineeswidget.cpp" line="522"/>
         <source>not connected</source>
         <translation>не подключен</translation>
     </message>
     <message>
-        <location filename="../instructorsandtraineeswidget.cpp" line="476"/>
+        <location filename="../instructorsandtraineeswidget.cpp" line="563"/>
         <source>Server settings have been changed. Please reconnect to the server.</source>
         <translation>Настройки сервера изменены. Выполните переподключение к серверу.</translation>
     </message>
     <message>
-        <location filename="../instructorsandtraineeswidget.cpp" line="316"/>
+        <location filename="../instructorsandtraineeswidget.cpp" line="385"/>
         <source>Instructor authorization</source>
         <translation>Авторизация инструктора</translation>
     </message>
     <message>
-        <location filename="../instructorsandtraineeswidget.cpp" line="201"/>
+        <location filename="../instructorsandtraineeswidget.cpp" line="226"/>
         <source>Invalid login or password!</source>
         <translation>Неправильный логин или пароль!</translation>
     </message>
@@ -1005,44 +1159,6 @@ Delete it anyway?</source>
         <translation>--:--</translation>
     </message>
 </context>
-<context>
-    <name>NewVersionWidget</name>
-    <message>
-        <location filename="../widgets/newversionwidget.ui" line="20"/>
-        <source>Create copy...</source>
-        <translation>Создать копию...</translation>
-    </message>
-    <message>
-        <location filename="../widgets/newversionwidget.ui" line="74"/>
-        <source>Basic version:</source>
-        <translation>Базовая версия:</translation>
-    </message>
-    <message>
-        <location filename="../widgets/newversionwidget.ui" line="87"/>
-        <source>TextLabel</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../widgets/newversionwidget.ui" line="125"/>
-        <source>New name version:</source>
-        <translation>Имя копии:</translation>
-    </message>
-    <message>
-        <location filename="../widgets/newversionwidget.ui" line="199"/>
-        <source>Create</source>
-        <translation>Создать</translation>
-    </message>
-    <message>
-        <location filename="../widgets/newversionwidget.ui" line="228"/>
-        <source>Cancel</source>
-        <translation>Отменить</translation>
-    </message>
-    <message>
-        <location filename="../widgets/newversionwidget.cpp" line="43"/>
-        <source>Only Latin letters and numbers</source>
-        <translation>Только латинские буквы и цифры</translation>
-    </message>
-</context>
 <context>
     <name>PersonalCardTrainee</name>
     <message>
@@ -1218,28 +1334,28 @@ Delete it anyway?</source>
     <message>
         <location filename="../tasks/tasktreepreparation.cpp" line="512"/>
         <location filename="../tasks/tasktreepreparation.cpp" line="585"/>
-        <location filename="../tasks/tasktreepreparation.cpp" line="676"/>
+        <location filename="../tasks/tasktreepreparation.cpp" line="678"/>
         <source>completed</source>
         <translation>выполнена</translation>
     </message>
     <message>
         <location filename="../tasks/tasktreepreparation.cpp" line="517"/>
         <location filename="../tasks/tasktreepreparation.cpp" line="590"/>
-        <location filename="../tasks/tasktreepreparation.cpp" line="681"/>
+        <location filename="../tasks/tasktreepreparation.cpp" line="683"/>
         <source>failed</source>
         <translation>неверно</translation>
     </message>
     <message>
         <location filename="../tasks/tasktreepreparation.cpp" line="522"/>
         <location filename="../tasks/tasktreepreparation.cpp" line="595"/>
-        <location filename="../tasks/tasktreepreparation.cpp" line="686"/>
+        <location filename="../tasks/tasktreepreparation.cpp" line="688"/>
         <source>checkup</source>
         <translation>на проверке</translation>
     </message>
     <message>
         <location filename="../tasks/tasktreepreparation.cpp" line="527"/>
         <location filename="../tasks/tasktreepreparation.cpp" line="600"/>
-        <location filename="../tasks/tasktreepreparation.cpp" line="691"/>
+        <location filename="../tasks/tasktreepreparation.cpp" line="693"/>
         <source>new</source>
         <translation>новая</translation>
     </message>
@@ -1257,97 +1373,6 @@ Delete it anyway?</source>
         <translation>нет</translation>
     </message>
 </context>
-<context>
-    <name>VersionSelectWidget</name>
-    <message>
-        <location filename="../widgets/versionselectwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Форма</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.ui" line="60"/>
-        <source>Available versions on the server:</source>
-        <translation>Доступные версии на сервере:</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.ui" line="154"/>
-        <source>Create copy</source>
-        <translation>Создать копию</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.ui" line="178"/>
-        <source>Delete</source>
-        <translation>Удалить</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.ui" line="196"/>
-        <source>Change server version</source>
-        <translation>Изменить версию на сервере</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.ui" line="83"/>
-        <source>Info:</source>
-        <translation>Информация:</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.ui" line="93"/>
-        <source>Double click on the version to see information...</source>
-        <translation>Двойной клик на версии для просмотра информации...</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.ui" line="118"/>
-        <source>Current server version:</source>
-        <translation>Текущая версия:</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.ui" line="125"/>
-        <source>none</source>
-        <translation>нет</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.cpp" line="38"/>
-        <source>Version control</source>
-        <translation>Управление версиями</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.cpp" line="60"/>
-        <source>Version name: </source>
-        <translation>Имя версии: </translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.cpp" line="61"/>
-        <source>Created: </source>
-        <translation>Создан: </translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.cpp" line="62"/>
-        <source>Changeable: </source>
-        <translation>Изменен: </translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.cpp" line="63"/>
-        <source>Author: </source>
-        <translation>Автор: </translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.cpp" line="72"/>
-        <source>Yes</source>
-        <translation>Да</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.cpp" line="73"/>
-        <source>No</source>
-        <translation>Нет</translation>
-    </message>
-    <message>
-        <location filename="../widgets/versionselectwidget.cpp" line="82"/>
-        <location filename="../widgets/versionselectwidget.cpp" line="109"/>
-        <location filename="../widgets/versionselectwidget.cpp" line="121"/>
-        <location filename="../widgets/versionselectwidget.cpp" line="132"/>
-        <source>Version not selected</source>
-        <translation>Версия не выбрана</translation>
-    </message>
-</context>
 <context>
     <name>ViewerInstructors</name>
     <message>