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

2026-03-28 19:55:48 +03:00 · 2025-06-04 14:35:01 +03:00
parent 7a491a1cd5
commit cbc1c1d516
12 changed files with 304 additions and 303 deletions
--- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
+++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
@@ -1,8 +1,9 @@
 #include "connectortoserver.h"
 #include <QThread>

-ConnectorToServer::ConnectorToServer(QObject *parent) :
+ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) :
    QObject(parent),
+    parentWidget(parentWidget),
    connectionThread(nullptr),
    client(nullptr),
    dataParser(nullptr),
@@ -453,7 +454,7 @@ void ConnectorToServer::createObjects()

    notifyController = new NotifyController;
    versionContainer = new VersionContainer;
-    versionSelectWidget = new VersionSelectWidget;
+    versionSelectWidget = new VersionSelectWidget(parentWidget);
    versionSelectWidget->initialize(sendSystem,versionContainer,notifyController);

    QMovie *movie = new QMovie(":/resources/icons/762.gif");
--- a/InstructorsAndTrainees/connectorToServer/connectortoserver.h
+++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.h
@@ -21,7 +21,7 @@ class ConnectorToServer : public QObject
 {
    Q_OBJECT
 public:
-    explicit ConnectorToServer(QObject *parent = nullptr);
+    explicit ConnectorToServer(QWidget* parentWidget, QObject *parent = nullptr);

    bool authorizationInstructorLocal(QString login, QString password);
    bool deAuthorizationInstructorLocal(QString login);
@@ -117,6 +117,7 @@ private:
    void createObjects();

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

-    NewVersionWidget *newVersionWidget = new NewVersionWidget;
+    NewVersionWidget *newVersionWidget = new NewVersionWidget();
    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();
 }

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