Dump 05.05.2021

common.pri

@@ -1,3 +1,7 @@
+# COMMENT THIS FOR MAKE PRODUCTION BUILDS
+# DEFINES += DEBUG
+# DEFINES += DEBUG_EXPIRE=1609448400 # 01.01.2021 00:00:00
+
 # ================================================== #
 message(================QT INFO====================)
 message(Qt version: $$[QT_VERSION])
@@ -44,11 +48,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-
-# COMMENT THIS FOR MAKE PRODUCTION BUILDS
-# DEFINES += DEBUG
-# DEFINES += DEBUG_EXPIRE=1609448400 # 01.01.2021 00:00:00
-
 win32 {
     # Installing manifests
 

src/Legacy/fonts.cpp

@@ -47,17 +47,28 @@ int pixels_in_7_pt = 11;//8;
 int pixels_in_6_pt = 10;//7;
 
 void constructFonts() {
-    garamond_6pt = QFont("EB Garamond");
-    garamond_7pt = QFont("EB Garamond");
-    garamond_8pt = QFont("EB Garamond");
-    garamond_9pt = QFont("EB Garamond");
-    garamond_10pt = QFont("EB Garamond");
-    garamond_11pt = QFont("EB Garamond");
-    garamond_12pt = QFont("EB Garamond");
-    garamond_13pt = QFont("EB Garamond");
-    garamond_14pt = QFont("EB Garamond");
-    garamond_15pt = QFont("EB Garamond");
-    garamond_16pt = QFont("EB Garamond");
+//    garamond_6pt = QFont("EB Garamond");
+//    garamond_7pt = QFont("EB Garamond");
+//    garamond_8pt = QFont("EB Garamond");
+//    garamond_9pt = QFont("EB Garamond");
+//    garamond_10pt = QFont("EB Garamond");
+//    garamond_11pt = QFont("EB Garamond");
+//    garamond_12pt = QFont("EB Garamond");
+//    garamond_13pt = QFont("EB Garamond");
+//    garamond_14pt = QFont("EB Garamond");
+//    garamond_15pt = QFont("EB Garamond");
+//    garamond_16pt = QFont("EB Garamond");
+    garamond_6pt = QFont("Open Sans");
+    garamond_7pt = QFont("Open Sans");
+    garamond_8pt = QFont("Open Sans");
+    garamond_9pt = QFont("Open Sans");
+    garamond_10pt = QFont("Open Sans");
+    garamond_11pt = QFont("Open Sans");
+    garamond_12pt = QFont("Open Sans");
+    garamond_13pt = QFont("Open Sans");
+    garamond_14pt = QFont("Open Sans");
+    garamond_15pt = QFont("Open Sans");
+    garamond_16pt = QFont("Open Sans");
 
 //    garamond_6pt.setStyleStrategy(QFont::PreferAntialias);
 //    garamond_7pt.setStyleStrategy(QFont::PreferAntialias);
@@ -83,13 +94,20 @@ void constructFonts() {
     garamond_15pt.setLetterSpacing(QFont::AbsoluteSpacing, 1);
     garamond_16pt.setLetterSpacing(QFont::AbsoluteSpacing, 1);
 
-    trajan_6pt = QFont("Trpro");
-    trajan_7pt = QFont("Trpro");
-    trajan_8pt = QFont("Trpro");
-    trajan_9pt = QFont("Trpro");
-    trajan_10pt = QFont("Trpro");
-    trajan_11pt = QFont("Trpro");
-    trajan_12pt = QFont("Trpro");
+    trajan_6pt = QFont("Ubuntu Condensed");
+    trajan_7pt = QFont("Ubuntu Condensed");
+    trajan_8pt = QFont("Ubuntu Condensed");
+    trajan_9pt = QFont("Ubuntu Condensed");
+    trajan_10pt = QFont("Ubuntu Condensed");
+    trajan_11pt = QFont("Ubuntu Condensed");
+    trajan_12pt = QFont("Ubuntu Condensed");
+//    trajan_6pt = QFont("Trpro");
+//    trajan_7pt = QFont("Trpro");
+//    trajan_8pt = QFont("Trpro");
+//    trajan_9pt = QFont("Trpro");
+//    trajan_10pt = QFont("Trpro");
+//    trajan_11pt = QFont("Trpro");
+//    trajan_12pt = QFont("Trpro");
 
 //    trajan_6pt.setStyleStrategy(QFont::PreferAntialias);
 //    trajan_7pt.setStyleStrategy(QFont::PreferAntialias);
@@ -99,17 +117,17 @@ void constructFonts() {
 //    trajan_11pt.setStyleStrategy(QFont::PreferAntialias);
 //    trajan_12pt.setStyleStrategy(QFont::PreferAntialias);
 
-    crimson_6pt = QFont("Crimson Text");
-    crimson_7pt = QFont("Crimson Text");
-    crimson_8pt = QFont("Crimson Text");
-    crimson_9pt = QFont("Crimson Text");
-    crimson_10pt = QFont("Crimson Text");
-    crimson_11pt = QFont("Crimson Text");
-    crimson_12pt = QFont("Crimson Text");
-    crimson_13pt = QFont("Crimson Text");
-    crimson_14pt = QFont("Crimson Text");
-    crimson_15pt = QFont("Crimson Text");
-    crimson_16pt = QFont("Crimson Text");
+    crimson_6pt = QFont("Open Sans");
+    crimson_7pt = QFont("Open Sans");
+    crimson_8pt = QFont("Open Sans");
+    crimson_9pt = QFont("Open Sans");
+    crimson_10pt = QFont("Open Sans");
+    crimson_11pt = QFont("Open Sans");
+    crimson_12pt = QFont("Open Sans");
+    crimson_13pt = QFont("Open Sans");
+    crimson_14pt = QFont("Open Sans");
+    crimson_15pt = QFont("Open Sans");
+    crimson_16pt = QFont("Open Sans");
 
 //    crimson_6pt.setStyleStrategy(QFont::PreferAntialias);
 //    crimson_7pt.setStyleStrategy(QFont::PreferAntialias);
@@ -149,13 +167,13 @@ void updateFonts(double coefficient) {
     garamond_15pt.setPixelSize(pixels_in_14_pt);
     garamond_16pt.setPixelSize(pixels_in_14_pt);
 
-    trajan_6pt.setPixelSize(pixels_in_6_pt);
-    trajan_7pt.setPixelSize(pixels_in_7_pt);
-    trajan_8pt.setPixelSize(pixels_in_8_pt);
-    trajan_9pt.setPixelSize(pixels_in_9_pt);
-    trajan_10pt.setPixelSize(pixels_in_10_pt);
-    trajan_11pt.setPixelSize(pixels_in_11_pt);
-    trajan_12pt.setPixelSize(pixels_in_12_pt);
+    trajan_6pt.setPixelSize(pixels_in_8_pt);
+    trajan_7pt.setPixelSize(pixels_in_9_pt);
+    trajan_8pt.setPixelSize(pixels_in_10_pt);
+    trajan_9pt.setPixelSize(pixels_in_11_pt);
+    trajan_10pt.setPixelSize(pixels_in_11_pt);
+    trajan_11pt.setPixelSize(pixels_in_13_pt);
+    trajan_12pt.setPixelSize(pixels_in_13_pt);
 
     crimson_6pt.setPixelSize(pixels_in_6_pt);
     crimson_7pt.setPixelSize(pixels_in_7_pt);

src/Legacy/legacyapplication.cpp

@@ -59,6 +59,8 @@ bool LegacyApplication::init() {
     QFontDatabase::addApplicationFont(":/fonts/CrimsonText.ttf");
     QFontDatabase::addApplicationFont(":/fonts/EBGaramond.ttf");
     QFontDatabase::addApplicationFont(":/fonts/aniron.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/OpenSans-Regular.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/UbuntuCondensed-Regular.ttf");
 
     qDebug() << "Starting Patch managers initialization...";
 

src/Legacy/models/patchinstaller.cpp

@@ -82,6 +82,7 @@ PatchInstaller::AppliedPatchesInfo PatchInstaller::getPatchesInfo() {
 }
 
 void PatchInstaller::installPatch(QString patch_name, LOTRO_DAT::Database* database) {
+    qInfo() << "PatchInstaller: Installing patch " << patch_name;
     const QString locale_prefix = Settings::getValue("Lotro/original_locale").toString();
     const QString database_path = QApplication::applicationDirPath() + "/data/" + patch_name + "_" + locale_prefix + "_orig.db";
     const QString database_path_old = QApplication::applicationDirPath() + "/data/" + patch_name + "_orig.db";
@@ -194,7 +195,8 @@ void PatchInstaller::installOriginalPatch(QString patch_name)
     }
 
     DatOriginalFilesDatabase orig_db(database_path);
-
+    qDebug() << "Opened original database " << database_path << ", beginning installation";
+    qDebug() << "Files in database: " << orig_db.getRowsCount();
     DatOriginalFilesDatabase::FileOperation operation = [this](int file_id, int dat_id, int version, int iteration, const LOTRO_DAT::SubfileData& data) {
         int original_file_version = 0;
         if (dat_id == E_CLIENT_LOCAL) {
@@ -542,6 +544,7 @@ void PatchInstaller::startPatchInstallationChain(bool force_reinstall_patches) {
         }
         patch_databases[patch] = db;
         current_status.total_parts += db->CountRows();
+        qInfo() << "Adding patch " << patch << " to install queue. Total parts to be installed: " << current_status.total_parts;
     }
 
     // Parsing info about patches which original versions should be installed
@@ -573,20 +576,21 @@ void PatchInstaller::startPatchInstallationChain(bool force_reinstall_patches) {
             continue;
         }
         patches_to_be_installed_orig_versions.append(patch);
-        DatOriginalFilesDatabase db(QApplication::applicationDirPath() + "/data/" + patch + "_orig.db");
+        const QString locale_prefix = Settings::getValue("Lotro/original_locale").toString();
+        const QString database_path = QApplication::applicationDirPath() + "/data/" + patch + "_" + locale_prefix + "_orig.db";
+        DatOriginalFilesDatabase db(database_path);
         current_status.total_parts += db.getRowsCount();
+        qInfo() << "Adding patch " << patch << " to original versions install queue. Total parts to be installed: " << current_status.total_parts;
     }
 
     emit progressChanged(current_status);
     for (const QString& patch_name: patch_databases.keys()) {
-        qInfo() << "PatchInstaller: Installing patch " << patch_name;
         installPatch(patch_name, patch_databases[patch_name]);
         patch_databases[patch_name]->CloseDatabase();
         delete patch_databases[patch_name];
     }
 
     for (const QString& patch_name : patches_to_be_installed_orig_versions) {
-        qInfo() << "PatchInstaller: Installing original version of patch " << patch_name;
         installOriginalPatch(patch_name);
     }
 

src/Legacy/widgets/aboutwidget.ui

@@ -20,7 +20,7 @@
    <property name="geometry">
     <rect>
      <x>45</x>
-     <y>33</y>
+     <y>30</y>
      <width>180</width>
      <height>21</height>
     </rect>

src/Legacy/widgets/gamesettings.cpp

@@ -39,11 +39,11 @@ GameSettings::~GameSettings()
 
 void GameSettings::updateFontsSizes()
 {
-    ui->sub_entry_1_title->setFont(crimson_12pt);
-    ui->game_folder_path->setFont(crimson_11pt);
-    ui->game_folder_label->setFont(crimson_11pt);
-    ui->lotro_base_language_label->setFont(crimson_11pt);
-    ui->lotro_base_language_combobox->setFont(crimson_11pt);
+    ui->sub_entry_1_title->setFont(trajan_12pt);
+    ui->game_folder_path->setFont(crimson_8pt);
+    ui->game_folder_label->setFont(crimson_8pt);
+    ui->lotro_base_language_label->setFont(crimson_8pt);
+    ui->lotro_base_language_combobox->setFont(crimson_8pt);
 }
 
 void GameSettings::resizeEvent(QResizeEvent*)

src/Legacy/widgets/gamesettings.ui

@@ -43,13 +43,13 @@
     <widget class="QWidget" name="widget_2" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="leftMargin">
-       <number>0</number>
+       <number>11</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>11</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
@@ -147,13 +147,13 @@ background-color: none;</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <property name="leftMargin">
-       <number>0</number>
+       <number>11</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>11</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>

src/Legacy/widgets/mainwindow.ui

@@ -102,9 +102,9 @@
     <property name="styleSheet">
      <string notr="true">border-image:transparent;</string>
     </property>
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="6,0,6,0,5">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="6,0,0,6,5">
      <property name="spacing">
-      <number>24</number>
+      <number>0</number>
      </property>
      <property name="sizeConstraint">
       <enum>QLayout::SetDefaultConstraint</enum>
@@ -156,7 +156,7 @@
         <string notr="true">color: rgb(255, 255, 255);</string>
        </property>
        <property name="text">
-        <string>  русификация  </string>
+        <string>    РУСИФИКАЦИЯ    </string>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
@@ -172,8 +172,24 @@
        </property>
       </widget>
      </item>
+     <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="MenuEntry" name="menuentry_2">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
          <horstretch>0</horstretch>
@@ -207,7 +223,7 @@
         <string notr="true">color: rgb(255, 255, 255);</string>
        </property>
        <property name="text">
-        <string>  как это работает?  </string>
+        <string/>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
@@ -258,7 +274,7 @@
         <string notr="true">color: rgb(255, 255, 255);</string>
        </property>
        <property name="text">
-        <string>  о наследии  </string>
+        <string>  О ПРОГРАММЕ  </string>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
@@ -271,19 +287,6 @@
        </property>
       </widget>
      </item>
-     <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="QWidget" name="widget" native="true">
        <property name="sizePolicy">
@@ -297,7 +300,7 @@
          <number>5</number>
         </property>
         <property name="leftMargin">
-         <number>24</number>
+         <number>40</number>
         </property>
         <property name="topMargin">
          <number>0</number>

src/Legacy/widgets/serverstatuswidget.cpp

@@ -45,7 +45,7 @@ void ServerStatusWidget::updateFontsSizes()
             qDebug() << "Error! Cannot find server widget " << server_name;
             continue;
         }
-        label->setFont(trajan_9pt);
+        label->setFont(crimson_10pt);
     }
 }
 
@@ -126,13 +126,13 @@ void ServerStatusWidget::updateTechWorksMessage()
         return;
     }
 
-    QString time_beginning = "<span style =\"font-family:Trajan Pro 3\">" + list[0] + "</span>";
-    QString time_end = "<span style =\"font-family:Trajan Pro 3\">" + list[1] + "</span>";
-    QString day = "<span style =\"font-family:Trajan Pro 3\">" + list[2] + "</span>";
-    QString month = QString(" " + list[3]).toUpper();
+    QString time_beginning = list[0];
+    QString time_end = list[1];
+    QString day = list[2];
+    QString month = list[3];
 
     if (!servers_disabled) {
-        server_status_tooltip_ = "Планируется отключение серверов игры " + day + month + " с " + time_beginning + " до " + time_end+ " (мск).";
+        server_status_tooltip_ = "Сайт игры сообщает об отключении игровых серверов\n" + day + " " + month + " с " + time_beginning + " до " + time_end+ " (мск).";
     } else {
         server_status_tooltip_ = "Серверы игры отключены на профилактику<br>Время проф. работ: " + day + month + " с " + time_beginning + " до " + time_end + " (мск).";
     }

src/Legacy/widgets/serverstatuswidget.ui

@@ -42,7 +42,19 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_9">
       <property name="spacing">
-       <number>8</number>
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
       </property>
       <item>
        <widget class="QLabel" name="anor">
@@ -296,22 +308,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>10</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item>
        <widget class="QLabel" name="bullroarer">
         <property name="font">

src/Legacy/widgets/statuswidget.cpp

@@ -74,7 +74,6 @@ StatusWidget::StatusWidget(QWidget *parent)
     _components_status_opacity_animation->setDuration(1000);
 
     ui->b_components_status->setGraphicsEffect(_components_status_opacity_effect);
-    setToolTipMessage("Запускаем Наследие...", E_INFO);
 }
 
 StatusWidget::~StatusWidget()
@@ -87,7 +86,7 @@ StatusWidget::~StatusWidget()
 
 void StatusWidget::updateFontsSizes()
 {
-    ui->game_button->setFont(trajan_11pt);
+    ui->game_button->setFont(crimson_12pt);
     ui->news_label->setFont(trajan_10pt);
 }
 
@@ -360,7 +359,7 @@ void StatusWidget::createTooltipMessageWidget(QString tooltip_id)
     tooltip_widgets_[tooltip_id] = new QLabel(this);
     tooltip_widgets_[tooltip_id]->setGeometry(ui->galadriel_tooltip_example->geometry());
     tooltip_widgets_[tooltip_id]->setStyleSheet(ui->galadriel_tooltip_example->styleSheet());
-    tooltip_widgets_[tooltip_id]->setFont(ui->galadriel_tooltip_example->font());
+    tooltip_widgets_[tooltip_id]->setFont(crimson_10pt);
     tooltip_widgets_[tooltip_id]->setWordWrap(true);
     tooltip_widgets_[tooltip_id]->setOpenExternalLinks(true);
 
@@ -421,19 +420,19 @@ void StatusWidget::onTranslationComponentsNoNeedToPatch() {
 
 void StatusWidget::updateButtonStatus() {
     if (_need_to_forcely_patch) {
-        ui->game_button->setText("ОБНОВИТЬ");
+        ui->game_button->setText("Обновить");
         ui->game_button->setStyleSheet("QPushButton#game_button { \n	color: white;\n	border-image: url(:/buttons/button_big_yellow.png);\n}\n\nQPushButton#game_button:hover {\n	color: white;\n	border-image: url(:/buttons/button_big_yellow_over.png);\n}\n\nQPushButton#game_button:pressed {\n	color: white;\n	border-image: url(:/buttons/button_big_yellow_pressed.png);\n}\n\nQPushButton#game_button:disabled {\n	color: white;\n	border-image: url(:/buttons/button_big_disabled.png);\n}\n");
         setToolTipMessage("Произошло обновление игры.\nЧасть данных перезаписана и нуждается в обновлении.", ToolTipState::E_INFO);
     } else if (_need_to_repair_game_files) {
-        ui->game_button->setText("исправить");
+        ui->game_button->setText("Исправить");
         ui->game_button->setStyleSheet("QPushButton#game_button { \n	color: white;\n	border-image: url(:/buttons/button_big_yellow.png);\n}\n\nQPushButton#game_button:hover {\n	color: white;\n	border-image: url(:/buttons/button_big_yellow_over.png);\n}\n\nQPushButton#game_button:pressed {\n	color: white;\n	border-image: url(:/buttons/button_big_yellow_pressed.png);\n}\n\nQPushButton#game_button:disabled {\n	color: white;\n	border-image: url(:/buttons/button_big_disabled.png);\n}\n");
     } else if (_need_to_install_patches) {
         setToolTipMessage("Были изменены параметры русификации.\nНажмите \"Применить\", чтобы зафиксировать изменения.", ToolTipState::E_INFO);
-        ui->game_button->setText("применить");
+        ui->game_button->setText("Применить");
         ui->game_button->setStyleSheet("QPushButton#game_button { \n	color: white;\n	border-image: url(:/buttons/button_big_yellow.png);\n}\n\nQPushButton#game_button:hover {\n	color: white;\n	border-image: url(:/buttons/button_big_yellow_over.png);\n}\n\nQPushButton#game_button:pressed {\n	color: white;\n	border-image: url(:/buttons/button_big_yellow_pressed.png);\n}\n\nQPushButton#game_button:disabled {\n	color: white;\n	border-image: url(:/buttons/button_big_disabled.png);\n}\n");
     } else if (_need_to_update) {
         setToolTipMessage("Доступны обновления русификации.\nНажмите \"Обновить\", чтобы начать загрузку.", ToolTipState::E_INFO);
-        ui->game_button->setText("ОБНОВИТЬ");
+        ui->game_button->setText("Обновить");
         ui->game_button->setStyleSheet("QPushButton#game_button { \n	color: white;\n	border-image: url(:/buttons/button_big_yellow.png);\n}\n\nQPushButton#game_button:hover {\n	color: white;\n	border-image: url(:/buttons/button_big_yellow_over.png);\n}\n\nQPushButton#game_button:pressed {\n	color: white;\n	border-image: url(:/buttons/button_big_yellow_pressed.png);\n}\n\nQPushButton#game_button:disabled {\n	color: white;\n	border-image: url(:/buttons/button_big_disabled.png);\n}\n");
     } else {
         if (!PatchInstaller::instance().getPatchesInfo().has_no_patch_mark) {
@@ -441,7 +440,7 @@ void StatusWidget::updateButtonStatus() {
         } else {
             setToolTipMessage("Добро пожаловать в Наследие!\nВыберите компоненты русификации для установки.", ToolTipState::E_INFO);
         }
-        ui->game_button->setText("ИГРАТЬ");
+        ui->game_button->setText("Играть");
         ui->game_button->setStyleSheet("QPushButton#game_button { \n	color: white;\n	border-image: url(:/buttons/button_big_normal.png);\n}\n\nQPushButton#game_button:hover {\n	color: white;\n	border-image: url(:/buttons/button_big_over.png);\n}\n\nQPushButton#game_button:pressed {\n	color: white;\n	border-image: url(:/buttons/button_big_pressed.png);\n}\n\nQPushButton#game_button:disabled {\n	color: white;\n	border-image: url(:/buttons/button_big_disabled.png);\n}\n");
     }
 }

src/Legacy/widgets/statuswidget.ui

@@ -29,7 +29,7 @@ color: white;
    <property name="geometry">
     <rect>
      <x>45</x>
-     <y>33</y>
+     <y>30</y>
      <width>180</width>
      <height>21</height>
     </rect>
@@ -42,16 +42,16 @@ color: white;
     </font>
    </property>
    <property name="text">
-    <string>новости проекта</string>
+    <string>НОВОСТИ ПРОЕКТА</string>
    </property>
   </widget>
   <widget class="ServerStatusWidget" name="server_status_widget" native="true">
    <property name="geometry">
     <rect>
-     <x>820</x>
-     <y>120</y>
-     <width>155</width>
-     <height>320</height>
+     <x>854</x>
+     <y>79</y>
+     <width>121</width>
+     <height>371</height>
     </rect>
    </property>
    <property name="cursor">
@@ -127,7 +127,7 @@ QPushButton#game_button:disabled {
 </string>
    </property>
    <property name="text">
-    <string notr="true">    ИГРАТЬ    </string>
+    <string notr="true">Играть</string>
    </property>
    <property name="iconSize">
     <size>
@@ -164,13 +164,6 @@ QPushButton#game_button:disabled {
      <height>111</height>
     </rect>
    </property>
-   <property name="font">
-    <font>
-     <family>EB Garamond</family>
-     <pointsize>12</pointsize>
-     <italic>false</italic>
-    </font>
-   </property>
    <property name="styleSheet">
     <string notr="true">padding-bottom:2px</string>
    </property>

src/Legacy/widgets/translationcomponents.cpp

@@ -53,12 +53,12 @@ TranslationComponents::~TranslationComponents()
 
 void TranslationComponents::updateFontsSizes()
 {
-    ui->sub_entry_3_title->setFont(crimson_12pt);
-    ui->audio_block_label->setFont(crimson_12pt);
-    ui->texts_block_label->setFont(crimson_12pt);
-    ui->video_block_label->setFont(crimson_12pt);
-    ui->graphics_block_label->setFont(crimson_12pt);
-    ui->loadscreens_block_label->setFont(crimson_12pt);
+    ui->sub_entry_3_title->setFont(trajan_12pt);
+    ui->audio_block_label->setFont(crimson_8pt);
+    ui->texts_block_label->setFont(crimson_8pt);
+    ui->video_block_label->setFont(crimson_8pt);
+    ui->graphics_block_label->setFont(crimson_8pt);
+    ui->loadscreens_block_label->setFont(crimson_8pt);
 }
 
 void TranslationComponents::resizeEvent(QResizeEvent *)

src/Legacy/widgets/translationcomponents.ui

@@ -52,7 +52,7 @@
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>11</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
@@ -133,7 +133,7 @@
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>11</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
@@ -214,7 +214,7 @@
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>11</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
@@ -295,7 +295,7 @@
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>11</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
@@ -376,7 +376,7 @@
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>11</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>

src/Legacy/widgets/weeklycodewidget.ui

@@ -74,7 +74,7 @@ border: 2px solid qlineargradient(spread:reflect, x1:1, y1:1, x2:0, y2:1, stop:0
          <string notr="true">color:white</string>
         </property>
         <property name="text">
-         <string>код недели:</string>
+         <string>Код недели:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>