فهرست منبع

Font fixes, background change update

Ivan Arkhipov 5 سال پیش
والد
کامیت
fe8e64ec37

+ 2 - 6
src/Legacy/models/lotrodatmanager.h

@@ -22,6 +22,8 @@ public:
 
 
     bool IsRusificationActive();
     bool IsRusificationActive();
 
 
+    int getPercent();
+
 public slots:
 public slots:
     void InitialiseManager();
     void InitialiseManager();
 
 
@@ -56,15 +58,9 @@ private:
     void ApplySounds();
     void ApplySounds();
 
 
 signals:
 signals:
-    void textStatusChanged();
-    void imagesStatusChanged();
-    void soundsStatusChanged();
-    void generalStatusChanged();
-
     // general signals. First argument is process_name, second - processed values
     // general signals. First argument is process_name, second - processed values
     void processStarted();
     void processStarted();
     void processFinished();
     void processFinished();
-    void processUpdated(QString, QVector<QVariant>);
     void caughtError(QString, QVector<QVariant>);
     void caughtError(QString, QVector<QVariant>);
 
 
 private:
 private:

+ 19 - 14
src/Legacy/widgets/mainwindow.cpp

@@ -64,8 +64,7 @@ MainWindow::MainWindow(QWidget *parent) :
     hideAllContentWidgets();
     hideAllContentWidgets();
     status_widget->show();
     status_widget->show();
 
 
-    qDebug() << "Making fonts and making background";
-    changeFontSizeRecursive(100, this);
+    qDebug() << "Making background";
 
 
     qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
     qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
     current_bg_id = qrand() % MAX_PIXMAP_ID + 1;
     current_bg_id = qrand() % MAX_PIXMAP_ID + 1;
@@ -89,6 +88,10 @@ MainWindow::MainWindow(QWidget *parent) :
     qDebug() << "Installing event filters to clickable objects";
     qDebug() << "Installing event filters to clickable objects";
     setEventFilterRecursive(this);
     setEventFilterRecursive(this);
 
 
+    qDebug() << "Adopting elements and fonts to window size";
+    resize(size());
+
+
     qDebug() << "Finishing main frame initialisation";
     qDebug() << "Finishing main frame initialisation";
     show();
     show();
 }
 }
@@ -115,14 +118,14 @@ void MainWindow::resizeEvent(QResizeEvent * event)
     int width = event->size().width();
     int width = event->size().width();
     int height = event->size().height();
     int height = event->size().height();
 
 
-    ui->menu_widget->move(width * 300 / 900, height * 35 / 650);
-    ui->menu_widget->resize(width * 570 / 900, height * 50 / 650);
+    ui->menu_widget->move(width * 320 / 1000, height * 34 / 648);
+    ui->menu_widget->resize(width * 650 / 1000, height * 53 / 648);
 
 
-    ui->content_area->move(0, height * 110 / 650);
-    ui->content_area->resize(width * 900 / 900, height * 515 / 650);
+    ui->content_area->move(0, height * 110 / 648);
+    ui->content_area->resize(width * 1000 / 1000, height * 520 / 648);
     setupWindowBackgroundAndMask(current_bg);
     setupWindowBackgroundAndMask(current_bg);
-//    choose_locale_dialog->move(this->rect().center() - choose_locale_dialog->rect().center());
     choose_locale_dialog->resize(size());
     choose_locale_dialog->resize(size());
+    changeFontSizeRecursive(100, this);
 }
 }
 
 
 void MainWindow::randomChangeBackground()
 void MainWindow::randomChangeBackground()
@@ -145,16 +148,18 @@ void MainWindow::randomChangeBackground()
 
 
     QtConcurrent::run([cur_bg, new_bg, this](){
     QtConcurrent::run([cur_bg, new_bg, this](){
         const int iterations_num = 150;
         const int iterations_num = 150;
-        const int iteration_sleep = 75;
+        const int iteration_sleep = 17;
+        const int starting_opacity_percent = 50;
 
 
-        for (int i = 0; i < iterations_num && qApp; i++) {
+        for (int i = 0; i < iterations_num - starting_opacity_percent && qApp; i++) {
+            QPixmap composited_bg(*cur_bg);
             QPainter painter;
             QPainter painter;
-            painter.begin(cur_bg);
-            painter.setOpacity(double(10 + i) / double(iterations_num));
+            painter.begin(&composited_bg);
+            painter.setOpacity(double(starting_opacity_percent + i) / double(iterations_num));
             painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
             painter.setCompositionMode(QPainter::CompositionMode_SourceIn);
             painter.drawPixmap(0,0, *new_bg);
             painter.drawPixmap(0,0, *new_bg);
             painter.end();
             painter.end();
-            QMetaObject::invokeMethod(this, "setupWindowBackgroundAndMask", Qt::QueuedConnection, Q_ARG(QPixmap, *cur_bg));
+            QMetaObject::invokeMethod(this, "setupWindowBackgroundAndMask", Qt::QueuedConnection, Q_ARG(QPixmap, composited_bg));
             QThread::msleep(iteration_sleep);
             QThread::msleep(iteration_sleep);
         }
         }
         delete cur_bg;
         delete cur_bg;
@@ -278,11 +283,12 @@ void MainWindow::changeFontSizeRecursive(size_t percent, QWidget *widget)
 {
 {
     if (!widget)
     if (!widget)
         return;
         return;
+
     QFont widget_font = widget->font();
     QFont widget_font = widget->font();
     QString widget_name = widget->objectName();
     QString widget_name = widget->objectName();
 
 
     if (widget_name.contains("menuentry"))
     if (widget_name.contains("menuentry"))
-        widget_font.setPixelSize(small_font_size * percent / 100);
+        widget_font.setPixelSize(menuentry_font_size * percent / 100);
     if (widget_name.contains("_small"))
     if (widget_name.contains("_small"))
         widget_font.setPixelSize(small_font_size * percent / 100);
         widget_font.setPixelSize(small_font_size * percent / 100);
     if (widget_name.contains("_common"))
     if (widget_name.contains("_common"))
@@ -300,7 +306,6 @@ void MainWindow::changeFontSizeRecursive(size_t percent, QWidget *widget)
         if (child->isWidgetType()) {
         if (child->isWidgetType()) {
             QWidget* w = qobject_cast<QWidget *>(child);
             QWidget* w = qobject_cast<QWidget *>(child);
             changeFontSizeRecursive(percent, w);
             changeFontSizeRecursive(percent, w);
-            w->resize(w->sizeHint());
         }
         }
 }
 }
 
 

+ 2 - 2
src/Legacy/widgets/mainwindow.h

@@ -103,8 +103,8 @@ private:
     const int MAX_PIXMAP_ID = 14;
     const int MAX_PIXMAP_ID = 14;
 
 
     const size_t small_font_size = 13;
     const size_t small_font_size = 13;
-    const size_t common_font_size = 14;
-    const size_t menuentry_font_size = 16;
+    const size_t common_font_size = 15;
+    const size_t menuentry_font_size = 13;
     const size_t title_font_size = 17;
     const size_t title_font_size = 17;
     const size_t supertitle_font_size = 32;
     const size_t supertitle_font_size = 32;
     const size_t bigbutton_font_size = 22;
     const size_t bigbutton_font_size = 22;

+ 15 - 15
src/Legacy/widgets/mainwindow.ui

@@ -6,8 +6,8 @@
    <rect>
    <rect>
     <x>0</x>
     <x>0</x>
     <y>0</y>
     <y>0</y>
-    <width>900</width>
-    <height>650</height>
+    <width>1000</width>
+    <height>648</height>
    </rect>
    </rect>
   </property>
   </property>
   <property name="sizePolicy">
   <property name="sizePolicy">
@@ -46,8 +46,8 @@
      <rect>
      <rect>
       <x>0</x>
       <x>0</x>
       <y>110</y>
       <y>110</y>
-      <width>900</width>
-      <height>515</height>
+      <width>1000</width>
+      <height>520</height>
      </rect>
      </rect>
     </property>
     </property>
     <property name="sizePolicy">
     <property name="sizePolicy">
@@ -90,10 +90,10 @@
    <widget class="QWidget" name="menu_widget" native="true">
    <widget class="QWidget" name="menu_widget" native="true">
     <property name="geometry">
     <property name="geometry">
      <rect>
      <rect>
-      <x>300</x>
-      <y>35</y>
-      <width>570</width>
-      <height>50</height>
+      <x>320</x>
+      <y>34</y>
+      <width>650</width>
+      <height>53</height>
      </rect>
      </rect>
     </property>
     </property>
     <property name="sizePolicy">
     <property name="sizePolicy">
@@ -108,7 +108,7 @@
     <property name="styleSheet">
     <property name="styleSheet">
      <string notr="true">border-image:transparent;</string>
      <string notr="true">border-image:transparent;</string>
     </property>
     </property>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="6,7,8,6,5">
      <property name="spacing">
      <property name="spacing">
       <number>10</number>
       <number>10</number>
      </property>
      </property>
@@ -116,7 +116,7 @@
       <enum>QLayout::SetDefaultConstraint</enum>
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
      </property>
      <property name="leftMargin">
      <property name="leftMargin">
-      <number>0</number>
+      <number>35</number>
      </property>
      </property>
      <property name="topMargin">
      <property name="topMargin">
       <number>0</number>
       <number>0</number>
@@ -143,7 +143,7 @@
        </property>
        </property>
        <property name="font">
        <property name="font">
         <font>
         <font>
-         <family>Constantia</family>
+         <family>Trajan Pro 3</family>
          <weight>50</weight>
          <weight>50</weight>
          <bold>false</bold>
          <bold>false</bold>
         </font>
         </font>
@@ -187,7 +187,7 @@
        </property>
        </property>
        <property name="font">
        <property name="font">
         <font>
         <font>
-         <family>Constantia</family>
+         <family>Trajan Pro 3</family>
         </font>
         </font>
        </property>
        </property>
        <property name="mouseTracking">
        <property name="mouseTracking">
@@ -226,7 +226,7 @@
        </property>
        </property>
        <property name="font">
        <property name="font">
         <font>
         <font>
-         <family>Constantia</family>
+         <family>Trajan Pro 3</family>
         </font>
         </font>
        </property>
        </property>
        <property name="mouseTracking">
        <property name="mouseTracking">
@@ -265,7 +265,7 @@
        </property>
        </property>
        <property name="font">
        <property name="font">
         <font>
         <font>
-         <family>Constantia</family>
+         <family>Trajan Pro 3</family>
         </font>
         </font>
        </property>
        </property>
        <property name="mouseTracking">
        <property name="mouseTracking">
@@ -310,7 +310,7 @@
          <number>5</number>
          <number>5</number>
         </property>
         </property>
         <property name="leftMargin">
         <property name="leftMargin">
-         <number>0</number>
+         <number>10</number>
         </property>
         </property>
         <property name="topMargin">
         <property name="topMargin">
          <number>0</number>
          <number>0</number>

+ 2 - 2
src/Legacy/widgets/newslistwidget.cpp

@@ -8,7 +8,7 @@
 NewsListWidget::NewsListWidget(QWidget *parent) : QWidget(parent)
 NewsListWidget::NewsListWidget(QWidget *parent) : QWidget(parent)
 {
 {
     news_downloader.targetBytearray = &news_data;
     news_downloader.targetBytearray = &news_data;
-    news_downloader.setUrl(QUrl("http://translate.lotros.ru/groupware/launcher_news/50/1"));
+    news_downloader.setUrl(QUrl("http://translate.lotros.ru/groupware/launcher_news/30/1"));
 
 
     news_layout = new QVBoxLayout(this);
     news_layout = new QVBoxLayout(this);
     news_layout->setSpacing(7);
     news_layout->setSpacing(7);
@@ -18,7 +18,7 @@ NewsListWidget::NewsListWidget(QWidget *parent) : QWidget(parent)
     connect(&news_update_timer, &QTimer::timeout, &news_downloader, &Downloader::start);
     connect(&news_update_timer, &QTimer::timeout, &news_downloader, &Downloader::start);
     connect(&news_downloader, &Downloader::downloadFinished, this, &NewsListWidget::updateNews);
     connect(&news_downloader, &Downloader::downloadFinished, this, &NewsListWidget::updateNews);
     emit news_downloader.start();
     emit news_downloader.start();
-    news_update_timer.setInterval(1000 * 60); // 60 seconds;
+    news_update_timer.setInterval(1000 * 63); // 63 seconds;
     news_update_timer.start();
     news_update_timer.start();
 
 
     setMouseTracking(true);
     setMouseTracking(true);

+ 2 - 2
src/Legacy/widgets/newspiece.cpp

@@ -25,7 +25,7 @@ void NewsPiece::setDate(const QString &date)
 
 
 void NewsPiece::setContents(const QString &contents)
 void NewsPiece::setContents(const QString &contents)
 {
 {
-    ui->news_content_small->setText(QString(contents).remove("\n"));
+    ui->news_content_common->setText(QString(contents).remove("\n"));
     resize(sizeHint());
     resize(sizeHint());
 }
 }
 
 
@@ -51,7 +51,7 @@ QString NewsPiece::getDate()
 
 
 QString NewsPiece::getContents()
 QString NewsPiece::getContents()
 {
 {
-    return ui->news_content_small->text();
+    return ui->news_content_common->text();
 }
 }
 
 
 QPixmap NewsPiece::getIcon()
 QPixmap NewsPiece::getIcon()

+ 25 - 11
src/Legacy/widgets/newspiece.ui

@@ -2,6 +2,14 @@
 <ui version="4.0">
 <ui version="4.0">
  <class>NewsPiece</class>
  <class>NewsPiece</class>
  <widget class="QWidget" name="NewsPiece">
  <widget class="QWidget" name="NewsPiece">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>656</width>
+    <height>383</height>
+   </rect>
+  </property>
   <property name="sizePolicy">
   <property name="sizePolicy">
    <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
    <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <horstretch>0</horstretch>
@@ -69,9 +77,12 @@ background-color:rgba(0,0,0,0);
       <property name="bottomMargin">
       <property name="bottomMargin">
        <number>5</number>
        <number>5</number>
       </property>
       </property>
-      <property name="spacing">
+      <property name="horizontalSpacing">
        <number>11</number>
        <number>11</number>
       </property>
       </property>
+      <property name="verticalSpacing">
+       <number>0</number>
+      </property>
       <item row="0" column="1" rowspan="2" colspan="3">
       <item row="0" column="1" rowspan="2" colspan="3">
        <widget class="QWidget" name="widget" native="true">
        <widget class="QWidget" name="widget" native="true">
         <property name="sizePolicy">
         <property name="sizePolicy">
@@ -109,10 +120,11 @@ background-color:rgba(0,0,0,0);
            </property>
            </property>
            <property name="font">
            <property name="font">
             <font>
             <font>
-             <family>Aniron</family>
-             <pointsize>7</pointsize>
-             <weight>75</weight>
-             <bold>true</bold>
+             <family>Trajan Pro 3</family>
+             <pointsize>9</pointsize>
+             <weight>50</weight>
+             <italic>false</italic>
+             <bold>false</bold>
             </font>
             </font>
            </property>
            </property>
            <property name="styleSheet">
            <property name="styleSheet">
@@ -140,7 +152,6 @@ background-color:rgba(0,0,0,0);
            <property name="font">
            <property name="font">
             <font>
             <font>
              <family>Trajan Pro 3</family>
              <family>Trajan Pro 3</family>
-             <pointsize>7</pointsize>
              <weight>50</weight>
              <weight>50</weight>
              <bold>false</bold>
              <bold>false</bold>
             </font>
             </font>
@@ -163,7 +174,7 @@ background-color:rgba(0,0,0,0);
        </widget>
        </widget>
       </item>
       </item>
       <item row="2" column="0" colspan="4">
       <item row="2" column="0" colspan="4">
-       <widget class="QLabel" name="news_content_small">
+       <widget class="QLabel" name="news_content_common">
         <property name="sizePolicy">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
           <horstretch>0</horstretch>
           <horstretch>0</horstretch>
@@ -172,15 +183,18 @@ background-color:rgba(0,0,0,0);
         </property>
         </property>
         <property name="font">
         <property name="font">
          <font>
          <font>
-          <family>Trajan Pro 3</family>
-          <pointsize>7</pointsize>
+          <family>EB Garamond</family>
+          <pointsize>11</pointsize>
+          <italic>false</italic>
          </font>
          </font>
         </property>
         </property>
         <property name="styleSheet">
         <property name="styleSheet">
-         <string notr="true"/>
+         <string notr="true">color: rgb(210, 210, 210);</string>
         </property>
         </property>
         <property name="text">
         <property name="text">
-         <string>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin congue porttitor semper. Maecenas tellus nisl, iaculis ut ipsum in, posuere consequat ligula. Sed id nulla a massa viverra imperdiet at vel nibh. Morbi in mauris lorem. Mauris tellus libero, placerat et tristique in, suscipit eget mauris. Donec fringilla dictum velit eget posuere. Nunc vitae tortor auctor, posuere velit quis, tempor felis. Nullam et justo vel nunc rhoncus mollis. Mauris cursus erat eget risus feugiat, non ornare erat vestibulum. In cursus sodales turpis, accumsan euismod arcu suscipit sed. Sed vitae mi sollicitudin arcu iaculis efficitur id ac mauris. Pellentesque facilisis mauris a mauris tempus tincidunt. Praesent eget egestas libero. Nunc consequat mattis sapien eget sodales.
+         <string>Съешь ещё этих мягких французских булок, да выпей же чаю. — мем, порождённый русскоязычной версией Windows (вернее, программой fontview.exe, которая входит в дефолтную поставку, начиная аж с незапамятных времён Windows 95).
+
+Таким хитроумным способом Винда демонстрирует юзеру, каким образом выглядят буквы в кириллических шрифтах для пользователей перевода Windows для России (болгарам же и другим пользователям кириллических шрифтов на эти ваши булки положить с прибором). Выбор именно этой фразы оправдывается тем, что в ней содержатся все буквы русского алфавита, а также запятая и точка (такие фразы именуются «панграммами»).
 
 
 </string>
 </string>
         </property>
         </property>

+ 1 - 2
src/Legacy/widgets/settingswidget.cpp

@@ -32,8 +32,7 @@ void SettingsWidget::on_interface_scale_combobox_common_currentIndexChanged(cons
     }
     }
 
 
     int value = arg1.left(arg1.length() - 1).toInt();
     int value = arg1.left(arg1.length() - 1).toInt();
-    window->changeFontSizeRecursive(value, window);
-    window->resize(900 * value / 100, 650 * value / 100);
+    window->resize(1000 * value / 100, 648 * value / 100);
     app_settings->setValue("general/ui_scale", value);
     app_settings->setValue("general/ui_scale", value);
 }
 }
 
 

+ 1 - 1
src/Legacy/widgets/settingswidget.h

@@ -35,7 +35,7 @@ private slots:
     void on_create_backup_common_clicked();
     void on_create_backup_common_clicked();
     
     
     void on_restore_backup_common_clicked();
     void on_restore_backup_common_clicked();
-    
+        
 private:
 private:
     QSettings* app_settings;
     QSettings* app_settings;
     PatchDownloader* patch_updater;
     PatchDownloader* patch_updater;

+ 62 - 79
src/Legacy/widgets/settingswidget.ui

@@ -98,85 +98,6 @@
       <property name="verticalSpacing">
       <property name="verticalSpacing">
        <number>3</number>
        <number>3</number>
       </property>
       </property>
-      <item row="1" column="2">
-       <widget class="QPushButton" name="change_folder_button">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>36</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="cursor">
-         <cursorShape>PointingHandCursor</cursorShape>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">border-image: url(:/buttons/folder.png);
-background-color: none;</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0" colspan="3">
-       <widget class="QPushButton" name="patch_all_button_common">
-        <property name="minimumSize">
-         <size>
-          <width>84</width>
-          <height>25</height>
-         </size>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">QPushButton {
-	color: black;
-    border: 2px solid #8f8f91;
-    border-radius: 6px;
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                      stop: 0 #f6f7fa, stop: 1 #dadbde);
-    min-width: 80px;
-}
- 
-QPushButton:pressed {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                      stop: 0 #caccd3, stop: 1 #f6f7fa);
-}
- 
-QPushButton:flat {
-    border: none; /* no border for a flat push button */
-}
- 
-QPushButton:default {
-    border-color: navy; /* make the default button prominent */
-}</string>
-        </property>
-        <property name="text">
-         <string>Переустановить русификацию</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="3">
-       <widget class="QCheckBox" name="restrict_download_speed_checkbox_common_2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">
-background-color: none;</string>
-        </property>
-        <property name="text">
-         <string>Показывать всплывающие подсказки при наведении</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="0" colspan="3">
       <item row="2" column="0" colspan="3">
        <widget class="QWidget" name="widget_5" native="true">
        <widget class="QWidget" name="widget_5" native="true">
         <property name="sizePolicy">
         <property name="sizePolicy">
@@ -249,6 +170,68 @@ background-color: none;</string>
         </layout>
         </layout>
        </widget>
        </widget>
       </item>
       </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="change_folder_button">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>36</width>
+          <height>32</height>
+         </size>
+        </property>
+        <property name="cursor">
+         <cursorShape>PointingHandCursor</cursorShape>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">border-image: url(:/buttons/folder.png);
+background-color: none;</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="3">
+       <widget class="QPushButton" name="patch_all_button_common">
+        <property name="minimumSize">
+         <size>
+          <width>84</width>
+          <height>25</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">QPushButton {
+	color: black;
+    border: 2px solid #8f8f91;
+    border-radius: 6px;
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                      stop: 0 #f6f7fa, stop: 1 #dadbde);
+    min-width: 80px;
+}
+ 
+QPushButton:pressed {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                      stop: 0 #caccd3, stop: 1 #f6f7fa);
+}
+ 
+QPushButton:flat {
+    border: none; /* no border for a flat push button */
+}
+ 
+QPushButton:default {
+    border-color: navy; /* make the default button prominent */
+}</string>
+        </property>
+        <property name="text">
+         <string>Переустановить русификацию</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="1">
       <item row="1" column="1">
        <widget class="QLabel" name="folder_value_common">
        <widget class="QLabel" name="folder_value_common">
         <property name="sizePolicy">
         <property name="sizePolicy">

+ 1 - 2
src/Legacy/widgets/statuswidget.cpp

@@ -10,7 +10,7 @@
 #include <QMessageBox>
 #include <QMessageBox>
 
 
 StatusWidget::StatusWidget(QSettings* settings, PatchDownloader* patch_downloader, LotroDatManager* lotro_dat_manager, QWidget *parent) :
 StatusWidget::StatusWidget(QSettings* settings, PatchDownloader* patch_downloader, LotroDatManager* lotro_dat_manager, QWidget *parent) :
-    QWidget(parent), lotro_manager(lotro_dat_manager),
+    QWidget(parent), patch_updater(patch_downloader), lotro_manager(lotro_dat_manager), app_settings(settings),
     ui(new Ui::StatusWidget)
     ui(new Ui::StatusWidget)
 {
 {
 
 
@@ -19,7 +19,6 @@ StatusWidget::StatusWidget(QSettings* settings, PatchDownloader* patch_downloade
     connect(ui->server_status_flag, &StatusFlagWidget::flagIdChanged, this, &StatusWidget::changeCentralWidget);
     connect(ui->server_status_flag, &StatusFlagWidget::flagIdChanged, this, &StatusWidget::changeCentralWidget);
     ui->status_widget->hide();
     ui->status_widget->hide();
 
 
-    patch_updater = patch_downloader;
     connect(patch_updater, &PatchDownloader::downloadStarted, this, &StatusWidget::onPatchDownloaderStarted, Qt::QueuedConnection);
     connect(patch_updater, &PatchDownloader::downloadStarted, this, &StatusWidget::onPatchDownloaderStarted, Qt::QueuedConnection);
     connect(patch_updater, &PatchDownloader::progressChanged, this, &StatusWidget::onPatchDownloaderProgressChanged, Qt::QueuedConnection);
     connect(patch_updater, &PatchDownloader::progressChanged, this, &StatusWidget::onPatchDownloaderProgressChanged, Qt::QueuedConnection);
     connect(patch_updater, &PatchDownloader::downloadCompleted, this, &StatusWidget::onPatchDownloaderFinished, Qt::QueuedConnection);
     connect(patch_updater, &PatchDownloader::downloadCompleted, this, &StatusWidget::onPatchDownloaderFinished, Qt::QueuedConnection);

+ 64 - 16
src/Legacy/widgets/statuswidget.ui

@@ -72,7 +72,7 @@ color: white;
      </property>
      </property>
      <property name="font">
      <property name="font">
       <font>
       <font>
-       <family>a_AlgeriusNr</family>
+       <family>Trajan Pro 3</family>
        <pointsize>12</pointsize>
        <pointsize>12</pointsize>
        <weight>50</weight>
        <weight>50</weight>
        <bold>false</bold>
        <bold>false</bold>
@@ -279,6 +279,11 @@ color: white;
           <height>20</height>
           <height>20</height>
          </size>
          </size>
         </property>
         </property>
+        <property name="font">
+         <font>
+          <pointsize>-1</pointsize>
+         </font>
+        </property>
         <property name="mouseTracking">
         <property name="mouseTracking">
          <bool>true</bool>
          <bool>true</bool>
         </property>
         </property>
@@ -288,6 +293,7 @@ border: 1px solid silver;
 border-radius: 7px;
 border-radius: 7px;
 background-color: rgba(30, 0, 0, 220);
 background-color: rgba(30, 0, 0, 220);
 color: white;
 color: white;
+font-size: 12px;
 }
 }
 
 
 QPushButton:hover{
 QPushButton:hover{
@@ -320,6 +326,12 @@ color: white;
           <height>20</height>
           <height>20</height>
          </size>
          </size>
         </property>
         </property>
+        <property name="font">
+         <font>
+          <family>Trajan Pro 3</family>
+          <pointsize>7</pointsize>
+         </font>
+        </property>
         <property name="mouseTracking">
         <property name="mouseTracking">
          <bool>true</bool>
          <bool>true</bool>
         </property>
         </property>
@@ -358,6 +370,12 @@ color: white;
           <height>20</height>
           <height>20</height>
          </size>
          </size>
         </property>
         </property>
+        <property name="font">
+         <font>
+          <family>Trajan Pro 3</family>
+          <pointsize>7</pointsize>
+         </font>
+        </property>
         <property name="mouseTracking">
         <property name="mouseTracking">
          <bool>true</bool>
          <bool>true</bool>
         </property>
         </property>
@@ -396,6 +414,12 @@ color: white;
           <height>20</height>
           <height>20</height>
          </size>
          </size>
         </property>
         </property>
+        <property name="font">
+         <font>
+          <family>Trajan Pro 3</family>
+          <pointsize>7</pointsize>
+         </font>
+        </property>
         <property name="mouseTracking">
         <property name="mouseTracking">
          <bool>true</bool>
          <bool>true</bool>
         </property>
         </property>
@@ -431,9 +455,15 @@ color: white;
         <property name="minimumSize">
         <property name="minimumSize">
          <size>
          <size>
           <width>0</width>
           <width>0</width>
-          <height>20</height>
+          <height>40</height>
          </size>
          </size>
         </property>
         </property>
+        <property name="font">
+         <font>
+          <family>Trajan Pro 3</family>
+          <pointsize>7</pointsize>
+         </font>
+        </property>
         <property name="mouseTracking">
         <property name="mouseTracking">
          <bool>true</bool>
          <bool>true</bool>
         </property>
         </property>
@@ -460,7 +490,8 @@ color: white;
 }</string>
 }</string>
         </property>
         </property>
         <property name="text">
         <property name="text">
-         <string>  Сообщить об ошибке  </string>
+         <string>Сообщить
+об ошибке</string>
         </property>
         </property>
        </widget>
        </widget>
       </item>
       </item>
@@ -472,6 +503,12 @@ color: white;
           <height>20</height>
           <height>20</height>
          </size>
          </size>
         </property>
         </property>
+        <property name="font">
+         <font>
+          <family>Trajan Pro 3</family>
+          <pointsize>7</pointsize>
+         </font>
+        </property>
         <property name="mouseTracking">
         <property name="mouseTracking">
          <bool>true</bool>
          <bool>true</bool>
         </property>
         </property>
@@ -558,14 +595,20 @@ color: white;
           <height>60</height>
           <height>60</height>
          </size>
          </size>
         </property>
         </property>
+        <property name="font">
+         <font>
+          <family>Trajan Pro 3</family>
+          <pointsize>9</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
         <property name="autoFillBackground">
         <property name="autoFillBackground">
          <bool>false</bool>
          <bool>false</bool>
         </property>
         </property>
         <property name="styleSheet">
         <property name="styleSheet">
          <string notr="true">QPushButton#game_button { 
          <string notr="true">QPushButton#game_button { 
 	color: white;
 	color: white;
-	font: 14px &quot;TRAJAN PRO 3&quot;;
-	font-weight: bold;
 	border-image: url(:/buttons/button_big_normal.png);
 	border-image: url(:/buttons/button_big_normal.png);
 }
 }
 
 
@@ -650,10 +693,10 @@ QPushButton#game_button:pressed {
            </property>
            </property>
            <property name="font">
            <property name="font">
             <font>
             <font>
-             <family>Aniron</family>
+             <family>Trajan Pro 3</family>
              <pointsize>10</pointsize>
              <pointsize>10</pointsize>
-             <weight>75</weight>
-             <bold>true</bold>
+             <weight>50</weight>
+             <bold>false</bold>
              <kerning>true</kerning>
              <kerning>true</kerning>
             </font>
             </font>
            </property>
            </property>
@@ -738,7 +781,7 @@ QScrollBar:vertical {
               <x>0</x>
               <x>0</x>
               <y>0</y>
               <y>0</y>
               <width>590</width>
               <width>590</width>
-              <height>462</height>
+              <height>471</height>
              </rect>
              </rect>
             </property>
             </property>
             <property name="sizePolicy">
             <property name="sizePolicy">
@@ -850,7 +893,7 @@ QScrollBar:vertical {
               <x>0</x>
               <x>0</x>
               <y>0</y>
               <y>0</y>
               <width>590</width>
               <width>590</width>
-              <height>503</height>
+              <height>502</height>
              </rect>
              </rect>
             </property>
             </property>
             <property name="sizePolicy">
             <property name="sizePolicy">
@@ -882,10 +925,10 @@ QScrollBar:vertical {
                </property>
                </property>
                <property name="font">
                <property name="font">
                 <font>
                 <font>
-                 <family>Aniron</family>
+                 <family>Trajan Pro 3</family>
                  <pointsize>10</pointsize>
                  <pointsize>10</pointsize>
-                 <weight>75</weight>
-                 <bold>true</bold>
+                 <weight>50</weight>
+                 <bold>false</bold>
                  <kerning>true</kerning>
                  <kerning>true</kerning>
                 </font>
                 </font>
                </property>
                </property>
@@ -919,10 +962,10 @@ QScrollBar:vertical {
                   </property>
                   </property>
                   <property name="font">
                   <property name="font">
                    <font>
                    <font>
-                    <family>Aniron</family>
+                    <family>Trajan Pro 3</family>
                     <pointsize>10</pointsize>
                     <pointsize>10</pointsize>
-                    <weight>75</weight>
-                    <bold>true</bold>
+                    <weight>50</weight>
+                    <bold>false</bold>
                     <kerning>true</kerning>
                     <kerning>true</kerning>
                    </font>
                    </font>
                   </property>
                   </property>
@@ -1016,6 +1059,11 @@ margin-bottom:7px;
              <verstretch>0</verstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
             </sizepolicy>
            </property>
            </property>
+           <property name="font">
+            <font>
+             <family>Montserrat</family>
+            </font>
+           </property>
            <property name="text">
            <property name="text">
             <string>Установка чего-то - 50%</string>
             <string>Установка чего-то - 50%</string>
            </property>
            </property>