GUI style updates

gui/helpwidget.ui

@@ -15,7 +15,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="label_supertitle">
      <property name="font">
       <font>
        <family>Arial</family>

gui/mainwindow.cpp

@@ -34,6 +34,10 @@ void MainWindow::Init() {
 
     setupWindowBackgroundAndMask(1);
     setupMenuHoverWidget();
+
+    changeFontSizeRecursive(100, this);
+    updateGeometry();
+
     show();
 }
 
@@ -65,31 +69,31 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
-void MainWindow::on_menuentry_1_clicked()
+void MainWindow::on_menuentry_1_common_clicked()
 {
     hideAllContentWidgets();
     status_frame->show();
 }
 
-void MainWindow::on_menuentry_2_clicked()
+void MainWindow::on_menuentry_2_common_clicked()
 {
     hideAllContentWidgets();
     settings_frame->show();
 }
 
-void MainWindow::on_menuentry_3_clicked()
+void MainWindow::on_menuentry_3_common_clicked()
 {
     hideAllContentWidgets();
     rusification_frame->show();
 }
 
-void MainWindow::on_menuentry_4_clicked()
+void MainWindow::on_menuentry_4_common_clicked()
 {
     hideAllContentWidgets();
     news_frame->show();
 }
 
-void MainWindow::on_menuentry_5_clicked()
+void MainWindow::on_menuentry_5_common_clicked()
 {
     hideAllContentWidgets();
     help_frame->show();
@@ -103,9 +107,12 @@ void MainWindow::onHoverMenuentry()
 void MainWindow::setupWindowBackgroundAndMask(int bg_id)
 {
     QPixmap maskPix(":/assets/bg" + QString::number(bg_id) + ".png");
-    maskPix = maskPix.scaled(width(), height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+    maskPix = maskPix.scaled(width(), height(), Qt::IgnoreAspectRatio, Qt::FastTransformation);
     setMask(maskPix.mask());
-    ui->centralWidget->setStyleSheet("border-image: url(:/assets/bg" + QString::number(bg_id) + ".png)");
+
+    QPalette palette;
+    palette.setBrush(QPalette::Window, maskPix);
+    setPalette(palette);
 }
 
 void MainWindow::setupMenuHoverWidget()
@@ -114,13 +121,13 @@ void MainWindow::setupMenuHoverWidget()
     menuHoverWidget->setStyleSheet("background-color: rgba(55, 37, 31, 250);");
     menuHoverWidget->resize(0, 0);
 
-    connect(ui->menuentry_1, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
-    connect(ui->menuentry_2, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
-    connect(ui->menuentry_3, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
-    connect(ui->menuentry_4, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
-    connect(ui->menuentry_5, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
+    connect(ui->menuentry_1_common, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
+    connect(ui->menuentry_2_common, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
+    connect(ui->menuentry_3_common, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
+    connect(ui->menuentry_4_common, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
+    connect(ui->menuentry_5_common, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
 
-    MenuEntry::setActiveLabel(ui->menuentry_1);
+    MenuEntry::setActiveLabel(ui->menuentry_1_common);
     menu_hover_checker_timer.setInterval(500);
     connect(&menu_hover_checker_timer, &QTimer::timeout, this, &MainWindow::checkMenuIsHovered);
     menu_hover_checker_timer.start();
@@ -143,11 +150,11 @@ void MainWindow::moveMenuHoverWidget(MenuEntry *target)
         menuHoverWidgetAnimation->start();
     }
 
-    ui->menuentry_1->raise();
-    ui->menuentry_2->raise();
-    ui->menuentry_3->raise();
-    ui->menuentry_4->raise();
-    ui->menuentry_5->raise();
+    ui->menuentry_1_common->raise();
+    ui->menuentry_2_common->raise();
+    ui->menuentry_3_common->raise();
+    ui->menuentry_4_common->raise();
+    ui->menuentry_5_common->raise();
 
 }
 
@@ -171,6 +178,32 @@ void MainWindow::hideAllContentWidgets()
     help_frame->hide();
 }
 
+void MainWindow::changeFontSizeRecursive(size_t percent, QWidget *widget)
+{
+    if (!widget)
+        return;
+    QFont widget_font = widget->font();
+    QString widget_name = widget->objectName();
+
+    if (widget_name.contains("_common"))
+        widget_font.setPixelSize(common_font_size * percent / 100);
+    if (widget_name.contains("_title"))
+        widget_font.setPixelSize(title_font_size * percent / 100);
+    if (widget_name.contains("_supertitle"))
+        widget_font.setPixelSize(supertitle_font_size * percent / 100);
+    if (widget_name.contains("_bigbutton"))
+        widget_font.setPixelSize(bigbutton_font_size * percent / 100);
+
+    widget->setFont(widget_font);
+
+    for (QObject* child : widget->children())
+        if (child->isWidgetType()) {
+            QWidget* w = qobject_cast<QWidget *>(child);
+            changeFontSizeRecursive(percent, w);
+            w->resize(w->sizeHint());
+        }
+}
+
 void MainWindow::on_closeButton_clicked()
 {
     qApp->quit();

gui/mainwindow.h

@@ -25,6 +25,7 @@ class MainWindow : public QMainWindow
 public:
     explicit MainWindow(LegacyApp *app = 0, QWidget *parent = 0);
     void Init();
+    void changeFontSizeRecursive(size_t percent, QWidget* widget);
     ~MainWindow();
 
 protected:
@@ -33,15 +34,15 @@ protected:
     void resizeEvent(QResizeEvent *event) override;
 
 private slots:
-    void on_menuentry_1_clicked();
+    void on_menuentry_1_common_clicked();
 
-    void on_menuentry_2_clicked();
+    void on_menuentry_2_common_clicked();
 
-    void on_menuentry_3_clicked();
+    void on_menuentry_3_common_clicked();
 
-    void on_menuentry_4_clicked();
+    void on_menuentry_4_common_clicked();
 
-    void on_menuentry_5_clicked();
+    void on_menuentry_5_common_clicked();
 
     void onHoverMenuentry();
 
@@ -77,6 +78,11 @@ private:
     SettingsWidget *settings_frame;
     NewsWidget *news_frame;
     HelpWidget *help_frame;
+
+    const size_t common_font_size = 15;
+    const size_t title_font_size = 16;
+    const size_t supertitle_font_size = 32;
+    const size_t bigbutton_font_size = 22;
 };
 
 #endif // MAINWINDOW_H

gui/mainwindow.ui

@@ -16,12 +16,6 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>800</width>
-    <height>600</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>ВКО: Наследие</string>
   </property>
@@ -81,7 +75,7 @@
       </property>
       <property name="minimumSize">
        <size>
-        <width>300</width>
+        <width>0</width>
         <height>120</height>
        </size>
       </property>
@@ -158,7 +152,7 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="MenuEntry" name="menuentry_1">
+           <widget class="MenuEntry" name="menuentry_1_common">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
@@ -178,11 +172,10 @@
              <enum>Qt::LeftToRight</enum>
             </property>
             <property name="styleSheet">
-             <string notr="true">color:rgb(255, 255, 255);
-font: 15px &quot;Trebuchet MS&quot;;</string>
+             <string notr="true">color:rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>СТАТУС</string>
+             <string>  СТАТУС  </string>
             </property>
             <property name="scaledContents">
              <bool>true</bool>
@@ -199,7 +192,7 @@ font: 15px &quot;Trebuchet MS&quot;;</string>
            </widget>
           </item>
           <item>
-           <widget class="MenuEntry" name="menuentry_2">
+           <widget class="MenuEntry" name="menuentry_2_common">
             <property name="enabled">
              <bool>true</bool>
             </property>
@@ -213,11 +206,10 @@ font: 15px &quot;Trebuchet MS&quot;;</string>
              <bool>true</bool>
             </property>
             <property name="styleSheet">
-             <string notr="true">color:rgb(255, 255, 255);
-font: 15px &quot;Trebuchet MS&quot;;</string>
+             <string notr="true">color:rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>НАСТРОЙКИ</string>
+             <string>  НАСТРОЙКИ  </string>
             </property>
             <property name="scaledContents">
              <bool>true</bool>
@@ -231,7 +223,7 @@ font: 15px &quot;Trebuchet MS&quot;;</string>
            </widget>
           </item>
           <item>
-           <widget class="MenuEntry" name="menuentry_3">
+           <widget class="MenuEntry" name="menuentry_3_common">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
               <horstretch>0</horstretch>
@@ -248,8 +240,7 @@ font: 15px &quot;Trebuchet MS&quot;;</string>
              <bool>true</bool>
             </property>
             <property name="styleSheet">
-             <string notr="true">color:rgb(255, 255, 255); font: 15px &quot;Trebuchet MS&quot;;
-</string>
+             <string notr="true">color:rgb(255, 255, 255)</string>
             </property>
             <property name="text">
              <string notr="true">  РУСИФИКАЦИЯ  </string>
@@ -266,7 +257,7 @@ font: 15px &quot;Trebuchet MS&quot;;</string>
            </widget>
           </item>
           <item>
-           <widget class="MenuEntry" name="menuentry_4">
+           <widget class="MenuEntry" name="menuentry_4_common">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
@@ -283,11 +274,10 @@ font: 15px &quot;Trebuchet MS&quot;;</string>
              <bool>true</bool>
             </property>
             <property name="styleSheet">
-             <string notr="true">color:rgb(255, 255, 255);
-font: 15px &quot;Trebuchet MS&quot;;</string>
+             <string notr="true">color:rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>НОВОСТИ</string>
+             <string>  НОВОСТИ  </string>
             </property>
             <property name="scaledContents">
              <bool>true</bool>
@@ -301,7 +291,7 @@ font: 15px &quot;Trebuchet MS&quot;;</string>
            </widget>
           </item>
           <item>
-           <widget class="MenuEntry" name="menuentry_5">
+           <widget class="MenuEntry" name="menuentry_5_common">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
@@ -321,11 +311,10 @@ font: 15px &quot;Trebuchet MS&quot;;</string>
              <enum>Qt::LeftToRight</enum>
             </property>
             <property name="styleSheet">
-             <string notr="true">color:rgb(255, 255, 255);
-font: 15px &quot;Trebuchet MS&quot;;</string>
+             <string notr="true">color:rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>ПОМОЩЬ</string>
+             <string>  ПОМОЩЬ  </string>
             </property>
             <property name="scaledContents">
              <bool>true</bool>
@@ -414,9 +403,12 @@ QPushButton#closeButton:hover { border-image: url(:/assets/close.png) 0 0 0 0 st
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>100</width>
+              <width>20</width>
               <height>20</height>
              </size>
             </property>

gui/newswidget.ui

@@ -15,7 +15,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="label_supertitle">
      <property name="font">
       <font>
        <family>Arial</family>

gui/rusificationwidget.cpp

@@ -1,6 +1,6 @@
 #include "gui\rusificationwidget.h"
 #include "ui_rusificationwidget.h"
-
+#include "legacyapp.h"
 
 void doStuffWithEveryItemInMyTree( QTreeWidgetItem *item )
 {
@@ -15,9 +15,11 @@ RusificationWidget::RusificationWidget(LegacyApp *_app, QWidget *parent) :
     app(_app)
 {
     ui->setupUi(this);
-    ui->treeWidget->expandAll();
+    ui->treeWidget_title->expandAll();
     hide_all_import_widgets();
-    doStuffWithEveryItemInMyTree(ui->treeWidget->invisibleRootItem());
+    ui->database_import_widget->show();
+
+    doStuffWithEveryItemInMyTree(ui->treeWidget_title->invisibleRootItem());
 }
 
 RusificationWidget::~RusificationWidget()
@@ -32,19 +34,19 @@ void RusificationWidget::hide_all_import_widgets()
     ui->textfragment_import_widget->hide();
 }
 
-void RusificationWidget::on_database_import_radiobutton_clicked()
+void RusificationWidget::on_database_import_radiobutton_common_clicked()
 {
     hide_all_import_widgets();
     ui->database_import_widget->show();
 }
 
-void RusificationWidget::on_file_import_radiobutton_clicked()
+void RusificationWidget::on_file_import_radiobutton_common_clicked()
 {
     hide_all_import_widgets();
     ui->file_import_widget->show();
 }
 
-void RusificationWidget::on_textfragment_import_radiobutton_clicked()
+void RusificationWidget::on_textfragment_import_radiobutton_common_clicked()
 {
     hide_all_import_widgets();
     ui->textfragment_import_widget->show();

gui/rusificationwidget.h

@@ -21,11 +21,11 @@ private:
     void hide_all_import_widgets();
 
 private slots:
-    void on_database_import_radiobutton_clicked();
+    void on_database_import_radiobutton_common_clicked();
 
-    void on_file_import_radiobutton_clicked();
+    void on_file_import_radiobutton_common_clicked();
 
-    void on_textfragment_import_radiobutton_clicked();
+    void on_textfragment_import_radiobutton_common_clicked();
 
 private:
     Ui::RusificationWidget *ui;

gui/settingswidget.cpp

@@ -1,6 +1,7 @@
 #include "gui\settingswidget.h"
 #include "ui_settingswidget.h"
 #include "legacyapp.h"
+#include <QDebug>
 
 SettingsWidget::SettingsWidget(LegacyApp *_app, QWidget *parent) :
     QWidget(parent),
@@ -30,13 +31,9 @@ void SettingsWidget::on_download_restrict_slider_valueChanged(int value)
     }
 }
 
-void SettingsWidget::on_interface_scale_slider_valueChanged(int value)
+void SettingsWidget::on_interface_scale_combobox_common_currentIndexChanged(const QString &arg1)
 {
-    ui->interface_scale_value_common->setText(QString::number(value) + "%");
+    int value = arg1.left(arg1.length() - 1).toInt();
+    app->window.changeFontSizeRecursive(value, &app->window);
     app->window.resize(900 * value / 100, 650 * value / 100);
 }
-
-void SettingsWidget::on_fonts_scale_slider_valueChanged(int value)
-{
-    ui->fonts_scale_value_common->setText(QString::number(value) + "%");
-}

gui/settingswidget.h

@@ -22,9 +22,7 @@ private slots:
 
     void on_download_restrict_slider_valueChanged(int value);
 
-    void on_interface_scale_slider_valueChanged(int value);
-
-    void on_fonts_scale_slider_valueChanged(int value);
+    void on_interface_scale_combobox_common_currentIndexChanged(const QString &arg1);
 
 private:
     Ui::SettingsWidget *ui;

gui/settingswidget.ui

@@ -60,8 +60,8 @@ background-color: rgba(30, 0, 0, 100);</string>
          </sizepolicy>
         </property>
         <property name="styleSheet">
-         <string notr="true">
-background-color: none;</string>
+         <string notr="true">background-color: none;
+font: 18px &quot;Trebuchet MS&quot;;</string>
         </property>
         <property name="text">
          <string>Основные</string>
@@ -244,7 +244,7 @@ background-color: none;</string>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="patch_all_button">
+       <widget class="QPushButton" name="patch_all_button_common">
         <property name="styleSheet">
          <string notr="true">QPushButton {
 	color: black;
@@ -255,9 +255,9 @@ background-color: none;</string>
     min-width: 80px;
 }
  
-QPushButton: pressed {
+QPushButton:pressed {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                      stop: 0 #dadbde, stop: 1 #f6f7fa);
+                                      stop: 0 #caccd3, stop: 1 #f6f7fa);
 }
  
 QPushButton:flat {
@@ -274,7 +274,7 @@ QPushButton:default {
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="restore_button">
+       <widget class="QPushButton" name="restore_button_common">
         <property name="autoFillBackground">
          <bool>false</bool>
         </property>
@@ -288,9 +288,9 @@ QPushButton:default {
     min-width: 80px;
 }
  
-QPushButton: pressed {
+QPushButton:pressed {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                      stop: 0 #dadbde, stop: 1 #f6f7fa);
+                                      stop: 0 #caccd3, stop: 1 #f6f7fa);
 }
  
 QPushButton:flat {
@@ -360,106 +360,74 @@ background-color: none;</string>
           </widget>
          </item>
          <item>
-          <widget class="QSlider" name="interface_scale_slider">
+          <widget class="QComboBox" name="interface_scale_combobox_common">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
-             <width>200</width>
+             <width>60</width>
              <height>0</height>
             </size>
            </property>
-           <property name="minimum">
-            <number>75</number>
-           </property>
-           <property name="maximum">
-            <number>150</number>
-           </property>
-           <property name="value">
-            <number>100</number>
-           </property>
-           <property name="tracking">
-            <bool>true</bool>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="invertedControls">
-            <bool>false</bool>
-           </property>
-           <property name="tickPosition">
-            <enum>QSlider::NoTicks</enum>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="interface_scale_value_common">
-           <property name="text">
-            <string>100%</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="widget_5" native="true">
-        <property name="styleSheet">
-         <string notr="true">
-background-color: none;</string>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
-         <item>
-          <widget class="QLabel" name="fonts_scale_common">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Размер шрифтов:</string>
-           </property>
+           <property name="styleSheet">
+            <string notr="true">color: black;</string>
+           </property>
+           <property name="currentIndex">
+            <number>2</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>50%</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>75%</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>100%</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>125%</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>150%</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>175%</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>200%</string>
+            </property>
+           </item>
           </widget>
          </item>
          <item>
-          <widget class="QSlider" name="fonts_scale_slider">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="minimum">
-            <number>75</number>
-           </property>
-           <property name="maximum">
-            <number>150</number>
-           </property>
-           <property name="value">
-            <number>100</number>
-           </property>
+          <spacer name="horizontalSpacer_3">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="fonts_scale_value_common">
-           <property name="text">
-            <string>100%</string>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
            </property>
-          </widget>
+          </spacer>
          </item>
         </layout>
        </widget>
@@ -481,7 +449,7 @@ background-color: rgba(30, 0, 0, 100);</string>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
-       <widget class="QLabel" name="folder_label_title">
+       <widget class="QLabel" name="folder_label_common">
         <property name="styleSheet">
          <string notr="true">
 background-color: none;</string>

gui/statuswidget.ui

@@ -13,8 +13,37 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
+  <layout class="QGridLayout" name="gridLayout_3" rowstretch="1,0,4">
    <item row="0" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="1">
+    <spacer name="verticalSpacer_2">
+     <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 row="0" column="2" rowspan="3">
     <widget class="QWidget" name="right_column_widget" native="true">
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0" colspan="2">
@@ -31,13 +60,13 @@ background-color: rgba(30, 0, 0, 100);</string>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_4">
             <item>
-             <widget class="QLabel" name="label_4_title">
+             <widget class="QLabel" name="label_4_common">
               <property name="font">
                <font>
-                <family>Arial</family>
+                <family>Trebuchet MS</family>
                 <pointsize>8</pointsize>
-                <weight>75</weight>
-                <bold>true</bold>
+                <weight>50</weight>
+                <bold>false</bold>
                </font>
               </property>
               <property name="styleSheet">
@@ -52,7 +81,7 @@ background-color: rgba(30, 0, 0, 100);</string>
              <widget class="QLabel" name="label_5_common">
               <property name="font">
                <font>
-                <family>Arial</family>
+                <family>Trebuchet MS</family>
                </font>
               </property>
               <property name="styleSheet">
@@ -96,13 +125,10 @@ background-color: rgba(30, 0, 0, 100);</string>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_5">
             <item>
-             <widget class="QLabel" name="label_8_title">
+             <widget class="QLabel" name="label_8_common">
               <property name="font">
                <font>
-                <family>Arial</family>
-                <pointsize>8</pointsize>
-                <weight>75</weight>
-                <bold>true</bold>
+                <family>Trebuchet MS</family>
                </font>
               </property>
               <property name="styleSheet">
@@ -117,7 +143,7 @@ background-color: rgba(30, 0, 0, 100);</string>
              <widget class="QLabel" name="label_9_common">
               <property name="font">
                <font>
-                <family>Arial</family>
+                <family>Trebuchet MS</family>
                </font>
               </property>
               <property name="styleSheet">
@@ -158,13 +184,13 @@ background-color: rgba(30, 0, 0, 100);</string>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_6">
             <item>
-             <widget class="QLabel" name="label_2_title">
+             <widget class="QLabel" name="label_2_common">
               <property name="font">
                <font>
-                <family>Arial</family>
+                <family>Trebuchet MS</family>
                 <pointsize>8</pointsize>
-                <weight>75</weight>
-                <bold>true</bold>
+                <weight>50</weight>
+                <bold>false</bold>
                </font>
               </property>
               <property name="styleSheet">
@@ -179,7 +205,7 @@ background-color: rgba(30, 0, 0, 100);</string>
              <widget class="QLabel" name="label_3_common">
               <property name="font">
                <font>
-                <family>Arial</family>
+                <family>Trebuchet MS</family>
                </font>
               </property>
               <property name="styleSheet">
@@ -220,13 +246,13 @@ background-color: rgba(30, 0, 0, 100);</string>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_7">
             <item>
-             <widget class="QLabel" name="label_6_title">
+             <widget class="QLabel" name="label_6_common">
               <property name="font">
                <font>
-                <family>Arial</family>
+                <family>Trebuchet MS</family>
                 <pointsize>8</pointsize>
-                <weight>75</weight>
-                <bold>true</bold>
+                <weight>50</weight>
+                <bold>false</bold>
                </font>
               </property>
               <property name="styleSheet">
@@ -241,7 +267,7 @@ background-color: rgba(30, 0, 0, 100);</string>
              <widget class="QLabel" name="label_7_common">
               <property name="font">
                <font>
-                <family>Arial</family>
+                <family>Trebuchet MS</family>
                </font>
               </property>
               <property name="styleSheet">
@@ -346,8 +372,9 @@ background-color: rgba(30, 0, 0, 100);</string>
            <property name="font">
             <font>
              <family>Times New Roman</family>
-             <pointsize>12</pointsize>
+             <pointsize>-1</pointsize>
              <weight>75</weight>
+             <italic>false</italic>
              <bold>true</bold>
             </font>
            </property>
@@ -356,7 +383,9 @@ background-color: rgba(30, 0, 0, 100);</string>
            </property>
            <property name="styleSheet">
             <string notr="true">border-image: url(:/assets/gray-button-hi.png);
-color: rgb(85, 0, 0);</string>
+color: rgb(85, 0, 0);
+font: 24px &quot;Times New Roman&quot;;
+font-weight: bold;</string>
            </property>
            <property name="text">
             <string notr="true">    ИГРАТЬ    </string>
@@ -381,7 +410,7 @@ color: rgb(85, 0, 0);</string>
      </layout>
     </widget>
    </item>
-   <item row="0" column="0">
+   <item row="1" column="1">
     <widget class="QWidget" name="left_column_widget" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -389,21 +418,33 @@ color: rgb(85, 0, 0);</string>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0" columnstretch="0,0,0">
-      <item row="0" column="0">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QWidget" name="status_image_widget" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <property name="sizeHint" stdset="0">
+        <property name="minimumSize">
          <size>
-          <width>31</width>
-          <height>249</height>
+          <width>200</width>
+          <height>200</height>
          </size>
         </property>
-       </spacer>
+        <property name="baseSize">
+         <size>
+          <width>200</width>
+          <height>200</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">image: url(:/assets/info.png);</string>
+        </property>
+       </widget>
       </item>
-      <item row="1" column="0" rowspan="4" colspan="3">
+      <item>
        <widget class="QWidget" name="status_label_widget" native="true">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -423,13 +464,15 @@ color: rgb(85, 0, 0);</string>
            <property name="font">
             <font>
              <family>Times New Roman</family>
-             <pointsize>16</pointsize>
+             <pointsize>28</pointsize>
              <weight>75</weight>
+             <italic>false</italic>
              <bold>true</bold>
             </font>
            </property>
            <property name="styleSheet">
-            <string notr="true">color: rgb(85, 170, 255); </string>
+            <string notr="true">color: rgb(85, 170, 255);
+</string>
            </property>
            <property name="text">
             <string>В РАБОТЕ</string>
@@ -442,47 +485,25 @@ color: rgb(85, 0, 0);</string>
         </layout>
        </widget>
       </item>
-      <item row="0" column="2">
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>31</width>
-          <height>249</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="1" rowspan="2">
-       <widget class="QWidget" name="status_image_widget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>200</width>
-          <height>200</height>
-         </size>
-        </property>
-        <property name="baseSize">
-         <size>
-          <width>200</width>
-          <height>200</height>
-         </size>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">border-image: url(:/assets/info.png);</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
+   <item row="1" column="0">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>

include/menuentry.h

@@ -32,8 +32,8 @@ private slots:
 private:
     static MenuEntry *active_label;
     static MenuEntry *hover_label;
-    const QString default_stylesheet = "color:rgb(255, 255, 255);\nfont:15px \"Trebuchet MS\";";
-    const QString active_stylesheet = "color:rgb(200, 200, 200);\nfont:15px \"Trebuchet MS\";";
+    const QString default_stylesheet = "color:rgb(255, 255, 255);";
+    const QString active_stylesheet = "color:rgb(200, 200, 200);";
 };
 
 #endif // CLICKABLELABEL_H