refact

2026-03-27 19:45:43 +03:00 · 2025-11-20 13:09:40 +03:00
parent 176ced7045
commit 08664989b9
10 changed files with 280 additions and 139 deletions
--- a/ServerLMS/serverlmswidget.h
+++ b/ServerLMS/serverlmswidget.h
@@ -28,6 +28,7 @@
 #include "providerdblms.h"
 #include "docsupdater.h"

+
 namespace Ui {
 class ServerLMSWidget;
 }
@@ -138,6 +139,8 @@ private:
    Ui::ServerLMSWidget *ui;

 private:
+    //WaitAnimationWidget *waitAnimationWidget;
+
    MultiThreadServer *server;
    QThread *updateThread;
    QThread *loggerThread;
--- a/ServerLMS/settings/dialogsettingstray.ui
+++ b/ServerLMS/settings/dialogsettingstray.ui
@@ -242,7 +242,7 @@
                    </size>
                   </property>
                   <property name="text">
-                    <string>Check&amp;&amp;Repare</string>
+                    <string>Check</string>
                   </property>
                   <property name="icon">
                    <iconset resource="../ServerLMS.qrc">
@@ -316,6 +316,12 @@
     </item>
     <item>
      <widget class="QGroupBox" name="groupBox_Additional">
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
       <property name="title">
        <string>Additional</string>
       </property>
--- a/ServerLMS/translations/ServerLMS_ru_RU.qm
+++ b/ServerLMS/translations/ServerLMS_ru_RU.qm
--- a/ServerLMS/translations/ServerLMS_ru_RU.ts
+++ b/ServerLMS/translations/ServerLMS_ru_RU.ts
@@ -148,8 +148,8 @@
    </message>
    <message>
        <location filename="../settings/dialogsettingstray.ui" line="245"/>
-        <source>Check&amp;&amp;Repare</source>
-        <translation>Проверить&amp;&amp;Восстановить</translation>
+        <source>Check</source>
+        <translation>Проверить</translation>
    </message>
    <message>
        <location filename="../settings/dialogsettingstray.ui" line="293"/>
@@ -157,52 +157,62 @@
        <translation>Сохранить</translation>
    </message>
    <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="287"/>
-        <location filename="../settings/dialogsettingstray.cpp" line="339"/>
-        <location filename="../settings/dialogsettingstray.cpp" line="344"/>
+        <location filename="../settings/dialogsettingstray.ui" line="326"/>
+        <source>Additional</source>
+        <translation>Расширенные</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogsettingstray.ui" line="340"/>
+        <source>Update Docs</source>
+        <translation>Обновить Docs</translation>
+    </message>
+    <message>
+        <location filename="../settings/dialogsettingstray.cpp" line="288"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="340"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="345"/>
        <source>Error!</source>
        <translation>Ошибка!</translation>
    </message>
    <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="287"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="288"/>
        <source>Driver PostgreSQL is not installed!</source>
        <translation>Драйвер PostgreSQL не установлен!</translation>
    </message>
    <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="296"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="297"/>
        <source>Superuser PostgreSQL authorization</source>
        <translation>Авторизация суперпользователя PostgreSQL</translation>
    </message>
    <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="339"/>
-        <location filename="../settings/dialogsettingstray.cpp" line="344"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="340"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="345"/>
        <source>Error connecting to PostgreSQL!</source>
        <translation>Ошибка соединения с PostgreSQL!</translation>
    </message>
    <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="340"/>
-        <location filename="../settings/dialogsettingstray.cpp" line="345"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="341"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="346"/>
        <source>Possible reasons:</source>
        <translation>Возможные причины:</translation>
    </message>
    <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="341"/>
-        <location filename="../settings/dialogsettingstray.cpp" line="346"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="342"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="347"/>
        <source>*superuser PostgreSQL login or password is incorrect;</source>
        <translation>*логин или пароль суперпользователя PostgreSQL некорректен;</translation>
    </message>
    <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="342"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="343"/>
        <source>*Port is incorrect.</source>
        <translation>*Порт некорректен.</translation>
    </message>
    <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="347"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="348"/>
        <source>*Port is incorrect;</source>
        <translation>*Порт некорректен;</translation>
    </message>
    <message>
-        <location filename="../settings/dialogsettingstray.cpp" line="348"/>
+        <location filename="../settings/dialogsettingstray.cpp" line="349"/>
        <source>*file &apos;pg_hba.conf&apos; does not contain an entry for the IP address:</source>
        <translation>*файл &apos;pg_hba.conf не содержит записи доступа для IP адреса:</translation>
    </message>
@@ -261,77 +271,77 @@
        <translation>Остановить</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="159"/>
+        <location filename="../serverlmswidget.cpp" line="171"/>
        <source>Server is started!</source>
        <translation>Сервер запущен!</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="172"/>
+        <location filename="../serverlmswidget.cpp" line="184"/>
        <source>Server is stoped!</source>
        <translation>Сервер остановлен!</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="209"/>
-        <location filename="../serverlmswidget.cpp" line="258"/>
+        <location filename="../serverlmswidget.cpp" line="223"/>
+        <location filename="../serverlmswidget.cpp" line="272"/>
        <source>Warning!</source>
        <translation>Внимание!</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="209"/>
+        <location filename="../serverlmswidget.cpp" line="223"/>
        <source>Database settings have been changed.
 The server will be restarted.</source>
        <translation>Настройки Базы Данных были изменены.
 Сервер будет перезапущен.</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="258"/>
+        <location filename="../serverlmswidget.cpp" line="272"/>
        <source>The file could not be opened </source>
        <translation>Файл не может быть открыт </translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="328"/>
-        <location filename="../serverlmswidget.cpp" line="332"/>
+        <location filename="../serverlmswidget.cpp" line="351"/>
+        <location filename="../serverlmswidget.cpp" line="355"/>
        <source>Database connection error!</source>
        <translation>Ошибка подключения Базы данных!</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="182"/>
-        <location filename="../serverlmswidget.cpp" line="332"/>
+        <location filename="../serverlmswidget.cpp" line="194"/>
+        <location filename="../serverlmswidget.cpp" line="355"/>
        <source>Error!</source>
        <translation>Ошибка!</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="113"/>
+        <location filename="../serverlmswidget.cpp" line="115"/>
        <source>Error PostgreSQL!</source>
        <translation>Ошибка PostgreSQL!</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="182"/>
+        <location filename="../serverlmswidget.cpp" line="194"/>
        <source>Settings file could not be opened:</source>
        <translation>Файл настроек не открыт:</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="347"/>
+        <location filename="../serverlmswidget.cpp" line="370"/>
        <source>Database connection OK!</source>
        <translation>База данных подключена!</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="361"/>
+        <location filename="../serverlmswidget.cpp" line="384"/>
        <source>started</source>
        <translation>запущен</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="366"/>
+        <location filename="../serverlmswidget.cpp" line="389"/>
        <source>stoped</source>
        <translation>остановлен</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="386"/>
+        <location filename="../serverlmswidget.cpp" line="409"/>
        <source>connected</source>
        <translation>подключена</translation>
    </message>
    <message>
-        <location filename="../serverlmswidget.cpp" line="395"/>
+        <location filename="../serverlmswidget.cpp" line="418"/>
        <source>not connected</source>
        <translation>не подключена</translation>
    </message>