Merge branch 'bugfix-version-info' into merge-task-and-verController

InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp

@@ -11,6 +11,6 @@ void NotifyController::showWarning(QString text)
     warning.setText(text);
 
     warning.setIcon(QMessageBox::Warning);
-    warning.setWindowTitle(tr("Ошибка"));
+    warning.setWindowTitle(tr("Error"));
     warning.exec();
 }

InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp

@@ -364,17 +364,17 @@ void RecognizeSystem::xmlParser(QByteArray array)
 
                     if (value == "BASEDELETETRY")
                     {
-                        emit sigNotify(tr("Нельзя удалять базовую версию"));
+                        emit sigNotify(tr("You cannot delete the basic version!"));
                     }
 
                     if (value == "TRYACTIVEDELETE")
                     {
-                        emit sigNotify(tr("Нельзя удалять активную версию"));
+                        emit sigNotify(tr("You cannot delete the active version"));
                     }
 
                     if (value == "DUPLICATEVERNAME")
                     {
-                        emit sigNotify(tr("Такое имя уже существет"));
+                        emit sigNotify(tr("This name already exists"));
                     }
                 }
             }

InstructorsAndTrainees/instructorsandtraineeswidget.cpp

@@ -171,7 +171,7 @@ void InstructorsAndTraineesWidget::checkLoginResult(ServerAuthorization *serverA
         ui->btnAuthorizationInstructor->setText(tr("Deauthorization Instructor"));
 
         updateLabelLoggedInInstructor(serverAuth->Login, serverAuth->ClientName);
-        connectorToServer->setLoginName(loginInstructorLoggedInLocal);
+        connectorToServer->setLoginName(nameInstructorLoggedInLocal);
         QMessageBox::information(this, tr("Instructor authorization"), tr("Successfully!"));
     }
     else

InstructorsAndTrainees/widgets/newversionwidget.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>325</width>
+    <width>344</width>
     <height>200</height>
    </rect>
   </property>
@@ -61,18 +61,24 @@
         <item>
          <widget class="QLabel" name="prevVerTitle">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
-           <string>Базовая версия:</string>
+           <string>Basic version:</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="prevVerValue">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>150</horstretch>
+            <verstretch>30</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>TextLabel</string>
           </property>
@@ -92,15 +98,27 @@
          <number>5</number>
         </property>
         <property name="rightMargin">
-         <number>20</number>
+         <number>5</number>
         </property>
         <property name="bottomMargin">
          <number>5</number>
         </property>
         <item>
          <widget class="QLabel" name="newNameVersionTitle">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>99</horstretch>
+            <verstretch>40</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="text">
-           <string>Новое название:</string>
+           <string>New name version:</string>
           </property>
          </widget>
         </item>
@@ -108,8 +126,8 @@
          <widget class="QLineEdit" name="lineEdit">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
+            <horstretch>150</horstretch>
+            <verstretch>30</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
@@ -126,6 +144,19 @@
           </property>
          </widget>
         </item>
+        <item>
+         <spacer name="horizontalSpacer_4">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </item>
       <item>
@@ -158,7 +189,7 @@
            </sizepolicy>
           </property>
           <property name="text">
-           <string>Создать</string>
+           <string>Create</string>
           </property>
          </widget>
         </item>
@@ -187,7 +218,7 @@
            </sizepolicy>
           </property>
           <property name="text">
-           <string>Отмена</string>
+           <string>Cancel</string>
           </property>
          </widget>
         </item>

InstructorsAndTrainees/widgets/versionselectwidget.cpp

@@ -22,7 +22,7 @@ void VersionSelectWidget::initialize(SendSystem *sendSystem,VersionContainer *ve
     connect(this,&VersionSelectWidget::sigSendNotify,notifyController,&NotifyController::showWarning,Qt::AutoConnection);
     this->versionContainer = versionContainer;
     hide();
-    setWindowTitle(tr("Управление версиями"));
+    setWindowTitle(tr("Version control"));
 }
 
 void VersionSelectWidget::fillView(QList<StreamingVersionData *> *serverData)
@@ -44,10 +44,10 @@ void VersionSelectWidget::on_verListView_itemDoubleClicked(QListWidgetItem *item
     {
         if(data->getViewName() == item->text())
         {
-            QString info = "Имя версии: " + data->getViewName() + "\n";
-            info.append("Создан: " + data->getCreateData().toString() + "\n");
-            info.append("Изменяемый: " + changableText(data->getIsChangeable()) + "\n");
-            info.append("Автор: " + data->getAuthor());
+            QString info = tr("Version name: ") + data->getViewName() + "\n";
+            info.append(tr("Created: ") + data->getCreateData().toString() + "\n");
+            info.append(tr("Changeable: ") + changableText(data->getIsChangeable()) + "\n");
+            info.append(tr("Author: ") + data->getAuthor());
             ui->infoValue->setText(info);
             selectedVersion = data;
         }
@@ -56,8 +56,8 @@ void VersionSelectWidget::on_verListView_itemDoubleClicked(QListWidgetItem *item
 
 QString VersionSelectWidget::changableText(bool flag)
 {
-    if(flag) return tr("Да");
-    else return tr("Нет");
+    if(flag) return tr("Yes");
+    else return tr("No");
 }
 
 
@@ -74,7 +74,7 @@ void VersionSelectWidget::sendCopyEmit(QString newName)
 
     if (selectedVersion == nullptr)
     {
-        sigSendNotify(tr("Версия не выбрана"));
+        sigSendNotify(tr("Version not selected"));
         return;
     }
 
@@ -86,7 +86,7 @@ void VersionSelectWidget::on_DeleteVersionButton_clicked()
 {
     if (selectedVersion == nullptr)
     {
-        sigSendNotify(tr("Версия не выбрана"));
+        sigSendNotify(tr("Version not selected"));
         return;
     }
 
@@ -97,7 +97,7 @@ void VersionSelectWidget::on_switchServerVersionButton_clicked()
 {
     if (selectedVersion == nullptr)
     {
-        sigSendNotify(tr("Версия не выбрана"));
+        sigSendNotify(tr("Version not selected"));
         return;
     }
 

InstructorsAndTrainees/widgets/versionselectwidget.ui

@@ -48,15 +48,15 @@
      <widget class="QLabel" name="verListTitle">
       <property name="font">
        <font>
-        <family>Calibri</family>
-        <pointsize>12</pointsize>
+        <family>MS Shell Dlg 2</family>
+        <pointsize>8</pointsize>
        </font>
       </property>
       <property name="contextMenuPolicy">
        <enum>Qt::PreventContextMenu</enum>
       </property>
       <property name="text">
-       <string>Доступные версии на сервере</string>
+       <string>Available versions on the server:</string>
       </property>
      </widget>
     </item>
@@ -103,7 +103,7 @@
          </font>
         </property>
         <property name="text">
-         <string>Создать копию</string>
+         <string>Create copy</string>
         </property>
        </widget>
       </item>
@@ -127,7 +127,7 @@
          </font>
         </property>
         <property name="text">
-         <string>Удалить</string>
+         <string>Delete</string>
         </property>
        </widget>
       </item>
@@ -147,7 +147,7 @@
        </font>
       </property>
       <property name="text">
-       <string>Переключить версию сервера</string>
+       <string>Change server version</string>
       </property>
      </widget>
     </item>
@@ -175,7 +175,7 @@
        </sizepolicy>
       </property>
       <property name="text">
-       <string>Информация:</string>
+       <string>Info:</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -185,7 +185,7 @@
     <item>
      <widget class="QLabel" name="infoValue">
       <property name="text">
-       <string>Тут будет информация о версии...</string>
+       <string>Double click on the version to see information...</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -220,7 +220,7 @@
     <item>
      <widget class="QLabel" name="verTitle">
       <property name="text">
-       <string>Текущая версия сервера:</string>
+       <string>Current server version:</string>
       </property>
      </widget>
     </item>