Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Стилизация окна версий

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-06-04 14:35:01 +03:00
parent 7a491a1cd5
commit cbc1c1d516
12 changed files with 304 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -1,8 +1,9 @@
#include "connectortoserver.h" #include "connectortoserver.h"
#include <QThread> #include <QThread>
ConnectorToServer::ConnectorToServer(QObject *parent) : ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) :
QObject(parent), QObject(parent),
parentWidget(parentWidget),
connectionThread(nullptr), connectionThread(nullptr),
client(nullptr), client(nullptr),
dataParser(nullptr), dataParser(nullptr),
@@ -453,7 +454,7 @@ void ConnectorToServer::createObjects()
notifyController = new NotifyController; notifyController = new NotifyController;
versionContainer = new VersionContainer; versionContainer = new VersionContainer;
versionSelectWidget = new VersionSelectWidget; versionSelectWidget = new VersionSelectWidget(parentWidget);
versionSelectWidget->initialize(sendSystem,versionContainer,notifyController); versionSelectWidget->initialize(sendSystem,versionContainer,notifyController);
QMovie *movie = new QMovie(":/resources/icons/762.gif"); QMovie *movie = new QMovie(":/resources/icons/762.gif");

3
InstructorsAndTrainees/connectorToServer/connectortoserver.h
View File

@@ -21,7 +21,7 @@ class ConnectorToServer : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit ConnectorToServer(QObject *parent = nullptr); explicit ConnectorToServer(QWidget* parentWidget, QObject *parent = nullptr);
bool authorizationInstructorLocal(QString login, QString password); bool authorizationInstructorLocal(QString login, QString password);
bool deAuthorizationInstructorLocal(QString login); bool deAuthorizationInstructorLocal(QString login);
@@ -117,6 +117,7 @@ private:
void createObjects(); void createObjects();
private: private:
QWidget* parentWidget;
QThread *connectionThread; QThread *connectionThread;
TCPClient *client; TCPClient *client;
DataParser *dataParser; DataParser *dataParser;

2
InstructorsAndTrainees/dialogsettings.ui
View File

@@ -27,7 +27,7 @@
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/resources/icons/settings.png</normaloff>:/resources/icons/settings.png</iconset> <normaloff>:/resources/icons/lms.png</normaloff>:/resources/icons/lms.png</iconset>
</property> </property>
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>false</bool> <bool>false</bool>

2
InstructorsAndTrainees/instructors/dialogauthorizationinstructor.ui
View File

@@ -21,7 +21,7 @@
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../resources.qrc"> <iconset resource="../resources.qrc">
<normaloff>:/icons/login-user.png</normaloff>:/icons/login-user.png</iconset> <normaloff>:/resources/icons/lms.png</normaloff>:/resources/icons/lms.png</iconset>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">

1
InstructorsAndTrainees/resources.qrc
View File

@@ -51,5 +51,6 @@
<file>resources/icons/style.png</file> <file>resources/icons/style.png</file>
<file>resources/icons/updateVersion.png</file> <file>resources/icons/updateVersion.png</file>
<file>resources/icons/editorDB.png</file> <file>resources/icons/editorDB.png</file>
<file>resources/icons/lms.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
InstructorsAndTrainees/resources/icons/lms.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm
View File

Binary file not shown.

168
InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts
View File

@@ -4,27 +4,27 @@
<context> <context>
<name>AMMtasksWidget</name> <name>AMMtasksWidget</name>
<message> <message>
<location filename="../tasks/ammtaskswidget.ui" line="20"/> <location filename="../tasks/ammtaskswidget.ui" line="26"/>
<source>Form</source> <source>Form</source>
<translation>Форма</translation> <translation>Форма</translation>
</message> </message>
<message> <message>
<location filename="../tasks/ammtaskswidget.ui" line="41"/> <location filename="../tasks/ammtaskswidget.ui" line="47"/>
<source>Assign</source> <source>Assign</source>
<translation>Назначить</translation> <translation>Назначить</translation>
</message> </message>
<message> <message>
<location filename="../tasks/ammtaskswidget.ui" line="67"/> <location filename="../tasks/ammtaskswidget.ui" line="73"/>
<source>Аvailable</source> <source>Аvailable</source>
<translation>Доступные</translation> <translation>Доступные</translation>
</message> </message>
<message> <message>
<location filename="../tasks/ammtaskswidget.ui" line="96"/> <location filename="../tasks/ammtaskswidget.ui" line="102"/>
<source>Check</source> <source>Check</source>
<translation>Проверить</translation> <translation>Проверить</translation>
</message> </message>
<message> <message>
<location filename="../tasks/ammtaskswidget.ui" line="122"/> <location filename="../tasks/ammtaskswidget.ui" line="128"/>
<source>Delete</source> <source>Delete</source>
<translation>Удалить</translation> <translation>Удалить</translation>
</message> </message>
@@ -189,17 +189,17 @@ The status will be set: &apos;completed&apos;</source>
<translation>Пароль</translation> <translation>Пароль</translation>
</message> </message>
<message> <message>
<location filename="../instructors/dialogeditinstructor.ui" line="99"/> <location filename="../instructors/dialogeditinstructor.ui" line="109"/>
<source>Administrator</source> <source>Administrator</source>
<translation>Администратор</translation> <translation>Администратор</translation>
</message> </message>
<message> <message>
<location filename="../instructors/dialogeditinstructor.ui" line="126"/> <location filename="../instructors/dialogeditinstructor.ui" line="136"/>
<source>Archived</source> <source>Archived</source>
<translation>Архивный</translation> <translation>Архивный</translation>
</message> </message>
<message> <message>
<location filename="../instructors/dialogeditinstructor.ui" line="153"/> <location filename="../instructors/dialogeditinstructor.ui" line="163"/>
<source>Logged</source> <source>Logged</source>
<translation>Залогирован</translation> <translation>Залогирован</translation>
</message> </message>
@@ -227,12 +227,12 @@ The status will be set: &apos;completed&apos;</source>
<translation>Пароль</translation> <translation>Пароль</translation>
</message> </message>
<message> <message>
<location filename="../trainees/dialogedittrainee.ui" line="135"/> <location filename="../trainees/dialogedittrainee.ui" line="145"/>
<source>Archived</source> <source>Archived</source>
<translation>Архивный</translation> <translation>Архивный</translation>
</message> </message>
<message> <message>
<location filename="../trainees/dialogedittrainee.ui" line="162"/> <location filename="../trainees/dialogedittrainee.ui" line="172"/>
<source>Logged</source> <source>Logged</source>
<translation>Залогирован</translation> <translation>Залогирован</translation>
</message> </message>
@@ -569,22 +569,22 @@ The changes will not be accepted.</source>
<context> <context>
<name>FIMtasksWidget</name> <name>FIMtasksWidget</name>
<message> <message>
<location filename="../tasks/fimtaskswidget.ui" line="14"/> <location filename="../tasks/fimtaskswidget.ui" line="20"/>
<source>Form</source> <source>Form</source>
<translation>Форма</translation> <translation>Форма</translation>
</message> </message>
<message> <message>
<location filename="../tasks/fimtaskswidget.ui" line="35"/> <location filename="../tasks/fimtaskswidget.ui" line="41"/>
<source>Assign</source> <source>Assign</source>
<translation>Назначить</translation> <translation>Назначить</translation>
</message> </message>
<message> <message>
<location filename="../tasks/fimtaskswidget.ui" line="61"/> <location filename="../tasks/fimtaskswidget.ui" line="67"/>
<source>Check</source> <source>Check</source>
<translation>Проверить</translation> <translation>Проверить</translation>
</message> </message>
<message> <message>
<location filename="../tasks/fimtaskswidget.ui" line="87"/> <location filename="../tasks/fimtaskswidget.ui" line="93"/>
<source>Delete</source> <source>Delete</source>
<translation>Удалить</translation> <translation>Удалить</translation>
</message> </message>
@@ -651,112 +651,127 @@ Delete it anyway?</source>
<context> <context>
<name>InstructorsAndTraineesWidget</name> <name>InstructorsAndTraineesWidget</name>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="20"/> <location filename="../instructorsandtraineeswidget.ui" line="26"/>
<source>Form</source> <source>Form</source>
<translation>Форма</translation> <translation>Форма</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="43"/> <location filename="../instructorsandtraineeswidget.ui" line="51"/>
<source>Connection</source> <source>Connection</source>
<translation>Подключение</translation> <translation>Подключение</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="72"/> <location filename="../instructorsandtraineeswidget.ui" line="80"/>
<source>Authorization</source> <source>Authorization</source>
<translation>Авторизация</translation> <translation>Авторизация</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="120"/> <location filename="../instructorsandtraineeswidget.ui" line="128"/>
<source>Server: </source> <source>Server: </source>
<translation>Сервер: </translation> <translation>Сервер: </translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="165"/> <location filename="../instructorsandtraineeswidget.ui" line="173"/>
<source>Logged in Instructor: </source> <source>Logged in Instructor: </source>
<translation>Вошедший в систему инструктор: </translation> <translation>Вошедший в систему инструктор: </translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="210"/> <location filename="../instructorsandtraineeswidget.ui" line="218"/>
<source>ChangeVersion</source> <source>ChangeVersion</source>
<translation>Изменение версии</translation> <translation>Изменение версии</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="223"/> <location filename="../instructorsandtraineeswidget.ui" line="231"/>
<source>Editor Trainees</source> <source>Editor Trainees</source>
<translation>Редактор Обучаемых</translation> <translation>Редактор Обучаемых</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="249"/> <location filename="../instructorsandtraineeswidget.ui" line="257"/>
<source>Editor Instructors</source> <source>Editor Instructors</source>
<translation>Редактор Инструкторов</translation> <translation>Редактор Инструкторов</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="275"/> <location filename="../instructorsandtraineeswidget.ui" line="283"/>
<source>Settings</source> <source>Settings</source>
<translation>Настройки</translation> <translation>Настройки</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="320"/> <location filename="../instructorsandtraineeswidget.ui" line="320"/>
<source>Trainees</source>
<translation>Обучаемые</translation>
</message>
<message>
<location filename="../instructorsandtraineeswidget.ui" line="342"/>
<source>Tasks</source> <source>Tasks</source>
<translation>Задачи</translation> <translation>Задачи</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="332"/> <location filename="../instructorsandtraineeswidget.ui" line="360"/>
<source>AMM</source> <source>AMM</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="342"/> <location filename="../instructorsandtraineeswidget.ui" line="376"/>
<source>FIM</source> <source>FIM</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.ui" line="127"/> <location filename="../instructorsandtraineeswidget.ui" line="402"/>
<location filename="../instructorsandtraineeswidget.ui" line="184"/> <source>Messenger</source>
<location filename="../instructorsandtraineeswidget.cpp" line="292"/> <translation>Мессенджер</translation>
<location filename="../instructorsandtraineeswidget.cpp" line="412"/> </message>
<location filename="../instructorsandtraineeswidget.cpp" line="428"/> <message>
<location filename="../instructorsandtraineeswidget.ui" line="420"/>
<source>Instructors</source>
<translation>Инструкторы</translation>
</message>
<message>
<location filename="../instructorsandtraineeswidget.ui" line="135"/>
<location filename="../instructorsandtraineeswidget.ui" line="192"/>
<location filename="../instructorsandtraineeswidget.cpp" line="331"/>
<location filename="../instructorsandtraineeswidget.cpp" line="451"/>
<location filename="../instructorsandtraineeswidget.cpp" line="467"/>
<source>none</source> <source>none</source>
<translation>нет</translation> <translation>нет</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="176"/> <location filename="../instructorsandtraineeswidget.cpp" line="215"/>
<source>Attention!</source> <source>Attention!</source>
<translation>Внимание!</translation> <translation>Внимание!</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="176"/> <location filename="../instructorsandtraineeswidget.cpp" line="215"/>
<source>The file could not be opened </source> <source>The file could not be opened </source>
<translation>Файл не может быть открыт </translation> <translation>Файл не может быть открыт </translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="268"/> <location filename="../instructorsandtraineeswidget.cpp" line="307"/>
<source>Instructor deauthorization</source> <source>Instructor deauthorization</source>
<translation>Деавторизация инструктора</translation> <translation>Деавторизация инструктора</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="268"/> <location filename="../instructorsandtraineeswidget.cpp" line="307"/>
<source>Error!</source> <source>Error!</source>
<translation>Ошибка!</translation> <translation>Ошибка!</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="308"/> <location filename="../instructorsandtraineeswidget.cpp" line="347"/>
<source>Warning!</source> <source>Warning!</source>
<translation>Внимание!</translation> <translation>Внимание!</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="308"/> <location filename="../instructorsandtraineeswidget.cpp" line="347"/>
<source>The server is disabled</source> <source>The server is disabled</source>
<translation>Сервер отключен</translation> <translation>Сервер отключен</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="238"/> <location filename="../instructorsandtraineeswidget.cpp" line="277"/>
<location filename="../instructorsandtraineeswidget.cpp" line="315"/> <location filename="../instructorsandtraineeswidget.cpp" line="354"/>
<source>Instructor authorization</source> <source>Instructor authorization</source>
<translation>Авторизация инструктора</translation> <translation>Авторизация инструктора</translation>
</message> </message>
<message> <message>
<location filename="../instructorsandtraineeswidget.cpp" line="238"/> <location filename="../instructorsandtraineeswidget.cpp" line="277"/>
<source>Invalid login or password!</source> <source>Invalid login or password!</source>
<translation>Неправильный логин или пароль!</translation> <translation>Неправильный логин или пароль!</translation>
</message> </message>
@@ -821,22 +836,17 @@ Delete it anyway?</source>
<translation>Форма</translation> <translation>Форма</translation>
</message> </message>
<message> <message>
<location filename="../messanger/messangerwidget.ui" line="28"/> <location filename="../messanger/messangerwidget.ui" line="105"/>
<source>Messenger</source>
<translation>Мессенджер</translation>
</message>
<message>
<location filename="../messanger/messangerwidget.ui" line="81"/>
<source>Send</source> <source>Send</source>
<translation>Отправить</translation> <translation>Отправить</translation>
</message> </message>
<message> <message>
<location filename="../messanger/messangerwidget.ui" line="120"/> <location filename="../messanger/messangerwidget.ui" line="43"/>
<source>Tab 1</source> <source>Tab 1</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../messanger/messangerwidget.ui" line="125"/> <location filename="../messanger/messangerwidget.ui" line="48"/>
<source>Tab 2</source> <source>Tab 2</source>
<translation></translation> <translation></translation>
</message> </message>
@@ -858,38 +868,38 @@ Delete it anyway?</source>
<name>NewVersionWidget</name> <name>NewVersionWidget</name>
<message> <message>
<location filename="../widgets/newversionwidget.ui" line="20"/> <location filename="../widgets/newversionwidget.ui" line="20"/>
<source>Создать копию...</source> <source>Create copy...</source>
<translation type="unfinished"></translation> <translation>Создать копию...</translation>
</message> </message>
<message> <message>
<location filename="../widgets/newversionwidget.ui" line="70"/> <location filename="../widgets/newversionwidget.ui" line="70"/>
<source>Basic version:</source> <source>Basic version:</source>
<translation type="unfinished"></translation> <translation>Базовая версия:</translation>
</message> </message>
<message> <message>
<location filename="../widgets/newversionwidget.ui" line="83"/> <location filename="../widgets/newversionwidget.ui" line="83"/>
<source>TextLabel</source> <source>TextLabel</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../widgets/newversionwidget.ui" line="121"/> <location filename="../widgets/newversionwidget.ui" line="121"/>
<source>New name version:</source> <source>New name version:</source>
<translation type="unfinished"></translation> <translation>Имя копии:</translation>
</message> </message>
<message> <message>
<location filename="../widgets/newversionwidget.ui" line="195"/> <location filename="../widgets/newversionwidget.ui" line="195"/>
<source>Create</source> <source>Create</source>
<translation type="unfinished"></translation> <translation>Создать</translation>
</message> </message>
<message> <message>
<location filename="../widgets/newversionwidget.ui" line="224"/> <location filename="../widgets/newversionwidget.ui" line="224"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation>Отменить</translation>
</message> </message>
<message> <message>
<location filename="../widgets/newversionwidget.cpp" line="43"/> <location filename="../widgets/newversionwidget.cpp" line="43"/>
<source>Only Latin letters and numbers</source> <source>Only Latin letters and numbers</source>
<translation type="unfinished"></translation> <translation>Только латинские буквы и цифры</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -897,7 +907,7 @@ Delete it anyway?</source>
<message> <message>
<location filename="../connectorToServer/Core/notifycontroller.cpp" line="14"/> <location filename="../connectorToServer/Core/notifycontroller.cpp" line="14"/>
<source>Error</source> <source>Error</source>
<translation type="unfinished"></translation> <translation>Ошибка</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -915,17 +925,17 @@ Delete it anyway?</source>
<message> <message>
<location filename="../connectorToServer/Core/recognizesystem.cpp" line="368"/> <location filename="../connectorToServer/Core/recognizesystem.cpp" line="368"/>
<source>You cannot delete the basic version!</source> <source>You cannot delete the basic version!</source>
<translation type="unfinished"></translation> <translation>Вы не можете удалить базовую версию!</translation>
</message> </message>
<message> <message>
<location filename="../connectorToServer/Core/recognizesystem.cpp" line="373"/> <location filename="../connectorToServer/Core/recognizesystem.cpp" line="373"/>
<source>You cannot delete the active version</source> <source>You cannot delete the active version</source>
<translation type="unfinished"></translation> <translation>Вы не можете удалить активную версию</translation>
</message> </message>
<message> <message>
<location filename="../connectorToServer/Core/recognizesystem.cpp" line="378"/> <location filename="../connectorToServer/Core/recognizesystem.cpp" line="378"/>
<source>This name already exists</source> <source>This name already exists</source>
<translation type="unfinished"></translation> <translation>Это имя уже существует</translation>
</message> </message>
</context> </context>
<context> <context>
@@ -1016,82 +1026,82 @@ Delete it anyway?</source>
<message> <message>
<location filename="../widgets/versionselectwidget.ui" line="20"/> <location filename="../widgets/versionselectwidget.ui" line="20"/>
<source>Form</source> <source>Form</source>
<translation type="unfinished">Форма</translation> <translation>Форма</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.ui" line="59"/> <location filename="../widgets/versionselectwidget.ui" line="59"/>
<source>Available versions on the server:</source> <source>Available versions on the server:</source>
<translation type="unfinished"></translation> <translation>Доступные версии на сервере:</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.ui" line="106"/> <location filename="../widgets/versionselectwidget.ui" line="106"/>
<source>Create copy</source> <source>Create copy</source>
<translation type="unfinished"></translation> <translation>Создать копию</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.ui" line="130"/> <location filename="../widgets/versionselectwidget.ui" line="130"/>
<source>Delete</source> <source>Delete</source>
<translation type="unfinished">Удалить</translation> <translation>Удалить</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.ui" line="150"/> <location filename="../widgets/versionselectwidget.ui" line="150"/>
<source>Change server version</source> <source>Change server version</source>
<translation type="unfinished"></translation> <translation>Изменить версию на сервере</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.ui" line="178"/> <location filename="../widgets/versionselectwidget.ui" line="178"/>
<source>Info:</source> <source>Info:</source>
<translation type="unfinished"></translation> <translation>Информация:</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.ui" line="188"/> <location filename="../widgets/versionselectwidget.ui" line="188"/>
<source>Double click on the version to see information...</source> <source>Double click on the version to see information...</source>
<translation type="unfinished"></translation> <translation>Двойной клик на версии для просмотра информации...</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.ui" line="223"/> <location filename="../widgets/versionselectwidget.ui" line="223"/>
<source>Current server version:</source> <source>Current server version:</source>
<translation type="unfinished"></translation> <translation>Текущая версия:</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.ui" line="230"/> <location filename="../widgets/versionselectwidget.ui" line="230"/>
<source>none</source> <source>none</source>
<translation type="unfinished">нет</translation> <translation>нет</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.cpp" line="25"/> <location filename="../widgets/versionselectwidget.cpp" line="25"/>
<source>Version control</source> <source>Version control</source>
<translation type="unfinished"></translation> <translation>Управление версиями</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.cpp" line="47"/> <location filename="../widgets/versionselectwidget.cpp" line="47"/>
<source>Version name: </source> <source>Version name: </source>
<translation type="unfinished"></translation> <translation>Имя версии: </translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.cpp" line="48"/> <location filename="../widgets/versionselectwidget.cpp" line="48"/>
<source>Created: </source> <source>Created: </source>
<translation type="unfinished"></translation> <translation>Создан: </translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.cpp" line="49"/> <location filename="../widgets/versionselectwidget.cpp" line="49"/>
<source>Changeable: </source> <source>Changeable: </source>
<translation type="unfinished"></translation> <translation>Изменен: </translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.cpp" line="50"/> <location filename="../widgets/versionselectwidget.cpp" line="50"/>
<source>Author: </source> <source>Author: </source>
<translation type="unfinished"></translation> <translation>Автор: </translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.cpp" line="59"/> <location filename="../widgets/versionselectwidget.cpp" line="59"/>
<source>Yes</source> <source>Yes</source>
<translation type="unfinished"></translation> <translation>Да</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.cpp" line="60"/> <location filename="../widgets/versionselectwidget.cpp" line="60"/>
<source>No</source> <source>No</source>
<translation type="unfinished"></translation> <translation>Нет</translation>
</message> </message>
<message> <message>
<location filename="../widgets/versionselectwidget.cpp" line="69"/> <location filename="../widgets/versionselectwidget.cpp" line="69"/>
@@ -1099,19 +1109,18 @@ Delete it anyway?</source>
<location filename="../widgets/versionselectwidget.cpp" line="96"/> <location filename="../widgets/versionselectwidget.cpp" line="96"/>
<location filename="../widgets/versionselectwidget.cpp" line="107"/> <location filename="../widgets/versionselectwidget.cpp" line="107"/>
<source>Version not selected</source> <source>Version not selected</source>
<translation type="unfinished"></translation> <translation>Версия не выбрана</translation>
</message> </message>
</context> </context>
<context> <context>
<name>ViewerInstructors</name> <name>ViewerInstructors</name>
<message> <message>
<location filename="../instructors/viewerinstructors.ui" line="20"/> <location filename="../instructors/viewerinstructors.ui" line="20"/>
<location filename="../instructors/viewerinstructors.ui" line="33"/>
<source>Instructors</source> <source>Instructors</source>
<translation>Инструкторы</translation> <translation>Инструкторы</translation>
</message> </message>
<message> <message>
<location filename="../instructors/viewerinstructors.ui" line="55"/> <location filename="../instructors/viewerinstructors.ui" line="44"/>
<source>Editor of Instructors</source> <source>Editor of Instructors</source>
<translation>Редактор инструкторов</translation> <translation>Редактор инструкторов</translation>
</message> </message>
@@ -1125,12 +1134,11 @@ Delete it anyway?</source>
<name>ViewerTrainees</name> <name>ViewerTrainees</name>
<message> <message>
<location filename="../trainees/viewertrainees.ui" line="20"/> <location filename="../trainees/viewertrainees.ui" line="20"/>
<location filename="../trainees/viewertrainees.ui" line="33"/>
<source>Trainees</source> <source>Trainees</source>
<translation>Обучаемые</translation> <translation>Обучаемые</translation>
</message> </message>
<message> <message>
<location filename="../trainees/viewertrainees.ui" line="68"/> <location filename="../trainees/viewertrainees.ui" line="55"/>
<source>Editor of Trainees</source> <source>Editor of Trainees</source>
<translation>Редактор обучаемых</translation> <translation>Редактор обучаемых</translation>
</message> </message>

10
InstructorsAndTrainees/widgets/newversionwidget.ui
View File

@@ -17,7 +17,11 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Создать копию...</string> <string>Create copy...</string>
</property>
<property name="windowIcon">
<iconset resource="../resources.qrc">
<normaloff>:/resources/icons/lms.png</normaloff>:/resources/icons/lms.png</iconset>
</property> </property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>true</bool> <bool>true</bool>
@@ -248,6 +252,8 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="../resources.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

14
InstructorsAndTrainees/widgets/versionselectwidget.cpp
View File

@@ -70,8 +70,20 @@ void VersionSelectWidget::on_createDuplicateButton_clicked()
return; return;
} }
NewVersionWidget *newVersionWidget = new NewVersionWidget; NewVersionWidget *newVersionWidget = new NewVersionWidget();
newVersionWidget->initialize(this,selectedVersion->getViewName()); newVersionWidget->initialize(this,selectedVersion->getViewName());
/*
QDialog* dialog = new QDialog(this);
QHBoxLayout *layout = new QHBoxLayout(dialog);
layout->addWidget(newVersionWidget);
dialog->setWindowTitle(tr("Editor of instructors"));
dialog->setMinimumSize(200, 100);
dialog->setStyleSheet(this->styleSheet());
dialog->exec();
delete newVersionWidget;
*/
newVersionWidget->show(); newVersionWidget->show();
} }

401
InstructorsAndTrainees/widgets/versionselectwidget.ui
View File

@@ -6,12 +6,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>606</width> <width>580</width>
<height>229</height> <height>277</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -19,221 +19,192 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<property name="windowIcon">
<iconset resource="../resources.qrc">
<normaloff>:/resources/icons/lms.png</normaloff>:/resources/icons/lms.png</iconset>
</property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
<widget class="QWidget" name="verticalLayoutWidget"> <layout class="QGridLayout" name="gridLayout">
<property name="geometry"> <item row="0" column="0">
<rect> <layout class="QVBoxLayout" name="verticalLayout_Main">
<x>0</x> <item>
<y>0</y> <layout class="QHBoxLayout" name="horizontalLayout_3">
<width>301</width> <item>
<height>171</height> <layout class="QVBoxLayout" name="actualServerListLayout">
</rect> <property name="leftMargin">
</property> <number>5</number>
<layout class="QVBoxLayout" name="actualServerListLayout"> </property>
<property name="leftMargin"> <property name="topMargin">
<number>5</number> <number>5</number>
</property> </property>
<property name="topMargin"> <property name="rightMargin">
<number>5</number> <number>5</number>
</property> </property>
<property name="rightMargin"> <property name="bottomMargin">
<number>5</number> <number>5</number>
</property> </property>
<property name="bottomMargin"> <item>
<number>5</number> <widget class="QLabel" name="verListTitle">
</property> <property name="font">
<item> <font>
<widget class="QLabel" name="verListTitle"> <family>MS Shell Dlg 2</family>
<property name="font"> <pointsize>8</pointsize>
<font> </font>
<family>MS Shell Dlg 2</family> </property>
<pointsize>8</pointsize> <property name="contextMenuPolicy">
</font> <enum>Qt::PreventContextMenu</enum>
</property> </property>
<property name="contextMenuPolicy"> <property name="text">
<enum>Qt::PreventContextMenu</enum> <string>Available versions on the server:</string>
</property> </property>
<property name="text"> </widget>
<string>Available versions on the server:</string> </item>
</property> <item>
</widget> <widget class="QListWidget" name="verListView"/>
</item> </item>
<item> </layout>
<widget class="QListWidget" name="verListView"/> </item>
</item> <item>
</layout> <layout class="QVBoxLayout" name="verticalLayout">
</widget> <property name="sizeConstraint">
<widget class="QWidget" name="horizontalLayoutWidget"> <enum>QLayout::SetDefaultConstraint</enum>
<property name="geometry"> </property>
<rect> <item>
<x>0</x> <widget class="QLabel" name="infoViewTitle">
<y>180</y> <property name="sizePolicy">
<width>601</width> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<height>41</height> <horstretch>0</horstretch>
</rect> <verstretch>0</verstretch>
</property> </sizepolicy>
<layout class="QHBoxLayout" name="ButtonLayout" stretch="0,0"> </property>
<property name="spacing"> <property name="text">
<number>6</number> <string>Info:</string>
</property> </property>
<item> <property name="alignment">
<layout class="QHBoxLayout" name="horizontalLayout"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<property name="sizeConstraint"> </property>
<enum>QLayout::SetMinimumSize</enum> </widget>
</property> </item>
<property name="leftMargin"> <item>
<number>5</number> <widget class="QLabel" name="infoValue">
</property> <property name="text">
<property name="rightMargin"> <string>Double click on the version to see information...</string>
<number>0</number> </property>
</property> <property name="alignment">
<item> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<widget class="QPushButton" name="createDuplicateButton"> </property>
<property name="sizePolicy"> </widget>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> </item>
<horstretch>0</horstretch> <item>
<verstretch>0</verstretch> <spacer name="verticalSpacer">
</sizepolicy> <property name="orientation">
</property> <enum>Qt::Vertical</enum>
<property name="font"> </property>
<font> <property name="sizeHint" stdset="0">
<pointsize>9</pointsize> <size>
</font> <width>20</width>
</property> <height>40</height>
<property name="text"> </size>
<string>Create copy</string> </property>
</property> </spacer>
</widget> </item>
</item> <item>
<item> <layout class="QHBoxLayout" name="ServerInfoLayout">
<widget class="QPushButton" name="DeleteVersionButton"> <item>
<property name="sizePolicy"> <widget class="QLabel" name="verTitle">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <property name="text">
<horstretch>0</horstretch> <string>Current server version:</string>
<verstretch>0</verstretch> </property>
</sizepolicy> </widget>
</property> </item>
<property name="sizeIncrement"> <item>
<size> <widget class="QLabel" name="verValue">
<width>0</width> <property name="text">
<height>0</height> <string>none</string>
</size> </property>
</property> </widget>
<property name="font"> </item>
<font> </layout>
<pointsize>9</pointsize> </item>
</font> </layout>
</property> </item>
<property name="text"> </layout>
<string>Delete</string> </item>
</property> <item>
</widget> <layout class="QHBoxLayout" name="ButtonLayout" stretch="0,0,0">
</item> <property name="spacing">
</layout> <number>6</number>
</item> </property>
<item> <item>
<widget class="QPushButton" name="switchServerVersionButton"> <widget class="QPushButton" name="createDuplicateButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>9</pointsize> <pointsize>9</pointsize>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Change server version</string> <string>Create copy</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</widget> <widget class="QPushButton" name="DeleteVersionButton">
<widget class="QWidget" name="verticalLayoutWidget_2"> <property name="sizePolicy">
<property name="geometry"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<rect> <horstretch>0</horstretch>
<x>310</x> <verstretch>0</verstretch>
<y>0</y> </sizepolicy>
<width>291</width> </property>
<height>131</height> <property name="sizeIncrement">
</rect> <size>
</property> <width>0</width>
<layout class="QVBoxLayout" name="verticalLayout"> <height>0</height>
<property name="sizeConstraint"> </size>
<enum>QLayout::SetDefaultConstraint</enum> </property>
</property> <property name="font">
<item> <font>
<widget class="QLabel" name="infoViewTitle"> <pointsize>9</pointsize>
<property name="sizePolicy"> </font>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> </property>
<horstretch>0</horstretch> <property name="text">
<verstretch>0</verstretch> <string>Delete</string>
</sizepolicy> </property>
</property> </widget>
<property name="text"> </item>
<string>Info:</string> <item>
</property> <widget class="QPushButton" name="switchServerVersionButton">
<property name="alignment"> <property name="sizePolicy">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
</property> <horstretch>0</horstretch>
</widget> <verstretch>0</verstretch>
</item> </sizepolicy>
<item> </property>
<widget class="QLabel" name="infoValue"> <property name="font">
<property name="text"> <font>
<string>Double click on the version to see information...</string> <pointsize>9</pointsize>
</property> </font>
<property name="alignment"> </property>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <property name="text">
</property> <string>Change server version</string>
</widget> </property>
</item> </widget>
<item> </item>
<spacer name="verticalSpacer"> </layout>
<property name="orientation"> </item>
<enum>Qt::Vertical</enum> </layout>
</property> </item>
<property name="sizeHint" stdset="0"> </layout>
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="horizontalLayoutWidget_2">
<property name="geometry">
<rect>
<x>310</x>
<y>140</y>
<width>291</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="ServerInfoLayout">
<item>
<widget class="QLabel" name="verTitle">
<property name="text">
<string>Current server version:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="verValue">
<property name="text">
<string>none</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
<resources/> <resources>
<include location="../resources.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

1
ServerLMS/Systems/sendsystem.cpp
View File

@@ -198,6 +198,7 @@ void SendSystem::sendXmlAnswer(QByteArray array, PacketType packetType)
else else
{ {
socket->write(array); socket->write(array);
socket->waitForBytesWritten();
} }