refact ui

FILES/CSS/styleSheetMain.css

@@ -67,8 +67,9 @@ QGroupBox::title {
 
 
 QPushButton, QToolButton {
-    border: 3px solid #8f8f91;
+	border: 3px outset   /*#2d5585*/gray;
-	border-style: outset;
+    /*border: 3px solid #8f8f91;
+	border-style: outset;*/
     border-radius: 5px;
     background-color: #5d85B5;									  
     min-width: 75px;
@@ -113,11 +114,10 @@ QPushButton:flat, QToolButton:flat {
 }
 QPushButton:disabled, QToolButton:disabled {
 	background-color: #777777;
+	/*border-color: gray;*/
 }
 QPushButton:default, QToolButton:default {
-    border-color: white;  /*make the default button prominent */
+	border-color: #2d5585;
-	border-width: 4px;
-	border: 3px outset   #2d5585;
 }
 QPushButton:hover , QToolButton:hover {
 	background-color: #9dc5f5;
@@ -127,9 +127,6 @@ QPushButton:pressed, QToolButton:pressed {
 	border-style: inset;
 }
 QPushButton:checked, QToolButton:checked {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-									  stop: 0 #dadbde, stop: 1 #f6f7fa);
-	background-color: #9dc5f5;
 	background-color: #8db5e5;
 	border-style: inset;
 }
@@ -189,6 +186,8 @@ QTreeWidget::branch:open:has-children:has-siblings  {
 QTreeWidget::item:hover,
 QTreeWidget::branch:hover {
 	background: #EEEEEE;
+	/*border: 1px solid #6c6c6c;*/
+	/*border-radius: 3px;*/	
 }
 
 QTreeWidget::item:selected {

LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp

@@ -19,6 +19,10 @@ DialogVersionControl::DialogVersionControl(ConnectorToServer* connectorToServer,
 {
     ui->setupUi(this);    
 
+    ui->createDuplicateButton->setObjectName("createDuplicateButton");
+    ui->deleteVersionButton->setObjectName("deleteVersionButton");
+    ui->switchServerVersionButton->setObjectName("switchServerVersionButton");
+
     setMinimumSize(500, 300);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     setWindowTitle(tr("Version control"));

LibInstructorsAndTrainees/settings/dialogversioncontrol.ui

@@ -34,19 +34,25 @@
        <item>
         <layout class="QVBoxLayout" name="actualServerListLayout">
          <property name="leftMargin">
-          <number>5</number>
+          <number>0</number>
          </property>
          <property name="topMargin">
-          <number>5</number>
+          <number>0</number>
          </property>
          <property name="rightMargin">
-          <number>5</number>
+          <number>0</number>
          </property>
          <property name="bottomMargin">
-          <number>5</number>
+          <number>0</number>
          </property>
          <item>
           <widget class="QLabel" name="verListTitle">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="font">
             <font>
              <family>MS Shell Dlg 2</family>
@@ -59,10 +65,26 @@
            <property name="text">
             <string>Available versions on the server:</string>
            </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           </property>
           </widget>
          </item>
          <item>
-          <widget class="QListWidget" name="verListView"/>
+          <widget class="QListWidget" name="verListView">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>250</width>
+             <height>0</height>
+            </size>
+           </property>
+          </widget>
          </item>
         </layout>
        </item>
@@ -90,26 +112,13 @@
          <item>
           <widget class="QLabel" name="infoValue">
            <property name="text">
-            <string>Double click on the version to see information...</string>
+            <string>InfoValue</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>
@@ -117,6 +126,9 @@
              <property name="text">
               <string>Current server version:</string>
              </property>
+             <property name="alignment">
+              <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+             </property>
             </widget>
            </item>
            <item>
@@ -124,6 +136,9 @@
              <property name="text">
               <string>none</string>
              </property>
+             <property name="alignment">
+              <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+             </property>
             </widget>
            </item>
           </layout>
@@ -133,10 +148,23 @@
       </layout>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="ButtonLayout" stretch="0,0,0">
+      <layout class="QHBoxLayout" name="ButtonLayout" stretch="0,0,0,0,0">
        <property name="spacing">
         <number>6</number>
        </property>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item>
         <widget class="QPushButton" name="createDuplicateButton">
          <property name="sizePolicy">
@@ -197,6 +225,19 @@
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <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>
     </layout>

LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.ui

@@ -36,7 +36,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="resources.qrc">:/resources/icons/circleGray.png</pixmap>
+          <pixmap resource="../InstructorsAndTrainees.qrc">:/resources/icons/circleGray.png</pixmap>
          </property>
         </widget>
        </item>
@@ -110,7 +110,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="resources.qrc"/>
+  <include location="../InstructorsAndTrainees.qrc"/>
  </resources>
  <connections/>
 </ui>

LibServer/Server.qrc

@@ -21,5 +21,6 @@
         <file>resources/icons/procedure.png</file>
         <file>resources/icons/exchange.png</file>
         <file>resources/blankXML/ListSubProc.xml</file>
+        <file>resources/icons/PngServerRRJ.png</file>
     </qresource>
 </RCC>

LibServer/Systems/assetsmanager.cpp

@@ -288,10 +288,15 @@ void AssetsManager::writeVersionsToFile(QList<StreamingVersionData*> version,boo
 
         if(isFirst)
         {            
-            attribute3 = {"isChangeable",QString::number(false)};
             QString author = tr("LLC Constanta-Design");
             attribute4 = {"author",author};
             ver->setAuthor(author);
+
+            if(ver->getViewName() == "base")
+                attribute3 = {"isChangeable",QString::number(false)};
+            else
+                attribute3 = {"isChangeable",QString::number(true)};
+
         }else
         {
             attribute3 ={"isChangeable",QString::number(ver->getIsChangeable())};

LibServer/settings/dialogsettingstray.cpp

@@ -300,6 +300,7 @@ void DialogSettingsTray::on_btnCheckDB_clicked()
     QString PasswordPostgres;
 
     DialogAuthorization dlg(this);
+    dlg.setWindowIcon(QIcon(QStringLiteral(":/resources/icons/PngServerRRJ.png")));
     dlg.setWindowTitle(tr("Superuser PostgreSQL authorization"));
     dlg.setWindowFlags(dlg.windowFlags() & ~Qt::WindowContextHelpButtonHint);
     dlg.setStyleSheet(this->styleSheet());
@@ -343,14 +344,18 @@ void DialogSettingsTray::on_btnCheckDB_clicked()
         if(settings->HostName == "localhost")
             SpecMsgBox::CriticalClose(this, tr("Error connecting to PostgreSQL!") + "\n\n" +
                                         tr("Possible reasons:") + "\n" +
-                                        tr("*superuser PostgreSQL login or password is incorrect;") + "\n" +
+                                        tr("superuser PostgreSQL login or password is incorrect;") + "\n" +
-                                        tr("*Port is incorrect."));
+                                        tr("port is incorrect;") + "\n" +
+                                        tr("PostgreSQL is not installed.")
+                                      );
         else
             SpecMsgBox::CriticalClose(this, tr("Error connecting to PostgreSQL!") + "\n\n" +
                                         tr("Possible reasons:") + "\n" +
-                                        tr("*superuser PostgreSQL login or password is incorrect;") + "\n" +
+                                        tr("superuser PostgreSQL login or password is incorrect;") + "\n" +
-                                        tr("*Port is incorrect;") + "\n" +
+                                        tr("port is incorrect;") + "\n" +
-                                        tr("*file 'pg_hba.conf' does not contain an entry for the IP address:") + settings->HostName + ".");
+                                        tr("file 'pg_hba.conf' does not contain an entry for the IP address:") + settings->HostName + ";" + "\n" +
+                                        tr("PostgreSQL is not installed.")
+                                      );
         return;
     }
 }

LibServer/settings/dialogsettingstray.ui

@@ -301,8 +301,8 @@
              <string>Check DB</string>
             </property>
             <property name="icon">
-             <iconset resource="../Server.qrc">
+             <iconset resource="../../LibInstructorsAndTrainees/InstructorsAndTrainees.qrc">
-              <normaloff>:/resources/icons/checkDB.png</normaloff>:/resources/icons/checkDB.png</iconset>
+              <normaloff>:/resources/icons/editorDB.png</normaloff>:/resources/icons/editorDB.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -365,7 +365,6 @@
  </widget>
  <resources>
   <include location="../../LibInstructorsAndTrainees/InstructorsAndTrainees.qrc"/>
-  <include location="../Server.qrc"/>
  </resources>
  <connections/>
 </ui>

readMy.txt

@@ -0,0 +1,3 @@
+Для обновления переводов в PS от Администратора:
+
+lupdate -no-obsolete -recursive .\LibInstructorsAndTrainees .\LibServer .\ProgramAWSinstructorMTD .\ProgramServerMTD -ts .\translations\RRJServer_ru_RU.ts

translations/RRJServer_ru_RU.ts

@@ -177,27 +177,27 @@ Delete it anyway?</source>
         <translation>Новая</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="159"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="160"/>
         <source>completed</source>
         <translation>выполнена</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="164"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="165"/>
         <source>failed</source>
         <translation>неверно</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="169"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="170"/>
         <source>checkup</source>
         <translation>на проверке</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="174"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="175"/>
         <source>new</source>
         <translation>новая</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="201"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="202"/>
         <source>Change task status?
 The status will be set:
 &apos;failed&apos;</source>
@@ -206,8 +206,8 @@ The status will be set:
 &apos;неверно&apos;</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="251"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="252"/>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="257"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="258"/>
         <source>Change task status?
 The status will be set:
 &apos;new&apos;</source>
@@ -216,7 +216,7 @@ The status will be set:
 &apos;новая&apos;</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="279"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="280"/>
         <source>Change task status?
 The status will be set:
 &apos;checkup&apos;</source>
@@ -225,8 +225,8 @@ The status will be set:
 &apos;на проверке&apos;</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="223"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="224"/>
-        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="229"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/checkertask.cpp" line="230"/>
         <source>Change task status?
 The status will be set:
 &apos;completed&apos;</source>
@@ -238,55 +238,60 @@ The status will be set:
 <context>
     <name>CommonView</name>
     <message>
-        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="110"/>
+        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="110"/>
+        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/>
         <source>Login</source>
         <translation>Логин</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="110"/>
+        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="110"/>
+        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/>
         <source>Class</source>
         <translation>Класс</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="110"/>
+        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/>
         <source>Computer</source>
         <translation>Компьютер</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="110"/>
+        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/>
         <source>IP address</source>
         <translation>IP адрес</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="110"/>
+        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/>
         <source>Administrator</source>
         <translation>Администратор</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="110"/>
+        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/>
         <source>Archived</source>
         <translation>Архивный</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="110"/>
+        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/>
         <source>Online</source>
         <translation>В сети</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="110"/>
+        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
+    <message>
+        <location filename="../LibInstructorsAndTrainees/commonview.cpp" line="113"/>
+        <source>Messages</source>
+        <translation>Сообщения</translation>
+    </message>
 </context>
 <context>
     <name>DeviceWidget</name>
@@ -301,12 +306,12 @@ The status will be set:
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/devicewidget.ui" line="56"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/devicewidget.ui" line="59"/>
         <source>ObjName</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/tasks/devicewidget.ui" line="66"/>
+        <location filename="../LibInstructorsAndTrainees/tasks/devicewidget.ui" line="69"/>
         <source>Code</source>
         <translation></translation>
     </message>
@@ -672,42 +677,42 @@ The status will be set:
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="98"/>
+        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="102"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="108"/>
+        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="112"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="145"/>
+        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="149"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="191"/>
+        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="195"/>
         <source>Auto start</source>
         <translation>Авто старт</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="242"/>
+        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="246"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="281"/>
+        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="285"/>
         <source>Additional</source>
         <translation>Расширенные</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="301"/>
+        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="305"/>
         <source>Version</source>
         <translation>Версия</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="333"/>
+        <location filename="../LibInstructorsAndTrainees/settings/dialogsettings.ui" line="337"/>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
@@ -715,72 +720,72 @@ The status will be set:
 <context>
     <name>DialogSettingsTray</name>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="14"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="20"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="22"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="28"/>
         <source>Main</source>
         <translation>Основные</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="32"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="38"/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="67"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="73"/>
         <source>Database</source>
         <translation>База данных</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="77"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="83"/>
         <source>Local</source>
         <translation>Локальная</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="108"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="114"/>
         <source>IP address</source>
         <translation>IP адрес</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="132"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="138"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="156"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="162"/>
         <source>Database name</source>
         <translation>Имя базы данных</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="183"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="189"/>
         <source>User name</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="210"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="216"/>
         <source>User password</source>
         <translation>Пароль пользователя</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="248"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="254"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="281"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="287"/>
         <source>Additional</source>
         <translation>Расширенные</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="295"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="301"/>
         <source>Check DB</source>
         <translation>Проверить БД</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.ui" line="334"/>
+        <location filename="../LibServer/settings/dialogsettingstray.ui" line="340"/>
         <source>Update Docs</source>
         <translation>Обновить Docs</translation>
     </message>
@@ -790,42 +795,44 @@ The status will be set:
         <translation>Драйвер PostgreSQL не установлен!</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="303"/>
+        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="304"/>
         <source>Superuser PostgreSQL authorization</source>
         <translation>Авторизация суперпользователя PostgreSQL</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="344"/>
+        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="345"/>
-        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="349"/>
+        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="352"/>
         <source>Error connecting to PostgreSQL!</source>
         <translation>Ошибка соединения с PostgreSQL!</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="345"/>
+        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="346"/>
-        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="350"/>
+        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="353"/>
         <source>Possible reasons:</source>
         <translation>Возможные причины:</translation>
     </message>
-    <message>
-        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="346"/>
-        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="351"/>
-        <source>*superuser PostgreSQL login or password is incorrect;</source>
-        <translation>*логин или пароль суперпользователя PostgreSQL некорректен;</translation>
-    </message>
     <message>
         <location filename="../LibServer/settings/dialogsettingstray.cpp" line="347"/>
-        <source>*Port is incorrect.</source>
+        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="354"/>
-        <translation>*Порт некорректен.</translation>
+        <source>superuser PostgreSQL login or password is incorrect;</source>
+        <translation>неверный логин или пароль суперпользователя PostgreSQL;</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="352"/>
+        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="348"/>
-        <source>*Port is incorrect;</source>
+        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="355"/>
-        <translation>*Порт некорректен;</translation>
+        <source>port is incorrect;</source>
+        <translation>порт некорректен;</translation>
     </message>
     <message>
-        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="353"/>
+        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="349"/>
-        <source>*file &apos;pg_hba.conf&apos; does not contain an entry for the IP address:</source>
+        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="357"/>
-        <translation>*файл &apos;pg_hba.conf не содержит записи доступа для IP адреса:</translation>
+        <source>PostgreSQL is not installed.</source>
+        <translation>PostgreSQL не установлен.</translation>
+    </message>
+    <message>
+        <location filename="../LibServer/settings/dialogsettingstray.cpp" line="356"/>
+        <source>file &apos;pg_hba.conf&apos; does not contain an entry for the IP address:</source>
+        <translation>файл &apos;pg_hba.conf&apos; не содержит запись для IP-адреса:</translation>
     </message>
 </context>
 <context>
@@ -1506,7 +1513,7 @@ Please reconnect to the server.</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../LibInstructorsAndTrainees/messanger/msgwidget.ui" line="155"/>
+        <location filename="../LibInstructorsAndTrainees/messanger/msgwidget.ui" line="158"/>
         <source>--:--</source>
         <translation>--:--</translation>
     </message>
@@ -1762,7 +1769,7 @@ The server will be restarted.</source>
     <message>
         <location filename="../LibServer/serverlmswidget.cpp" line="490"/>
         <source>connected</source>
-        <translation>подключен</translation>
+        <translation>подключена</translation>
     </message>
     <message>
         <location filename="../LibServer/serverlmswidget.cpp" line="499"/>