Fonts & graphics improvements.

src/Legacy/main.cpp

@@ -31,6 +31,7 @@ int main(int argc, char *argv[])
     QResource::registerResource(QApplication::applicationDirPath() + "/data02.gtr");
 
     QFontDatabase::addApplicationFont(":/assets/fonts/trajan.ttf");
+    QFontDatabase::addApplicationFont(":/assets/fonts/trajan_bold.otf");
     QFontDatabase::addApplicationFont(":/assets/fonts/viking.ttf");
     QFontDatabase::addApplicationFont(":/assets/fonts/title.ttf");
 

src/Legacy/widgets/mainwindow.cpp

@@ -147,9 +147,9 @@ void MainWindow::randomChangeBackground()
     current_bg_id = next_pixmap_id;
 
     QtConcurrent::run([cur_bg, new_bg, this](){
-        const int iterations_num = 150;
+        const int iterations_num = 100;
         const int iteration_sleep = 17;
-        const int starting_opacity_percent = 50;
+        const int starting_opacity_percent = 0;
 
         for (int i = 0; i < iterations_num - starting_opacity_percent && qApp; i++) {
             QPixmap composited_bg(*cur_bg);

src/Legacy/widgets/mainwindow.h

@@ -102,10 +102,10 @@ private:
 
     const int MAX_PIXMAP_ID = 14;
 
-    const size_t small_font_size = 13;
-    const size_t common_font_size = 15;
-    const size_t menuentry_font_size = 13;
-    const size_t title_font_size = 17;
+    const size_t small_font_size = 13; // Trajan Pro 3
+    const size_t common_font_size = 18; // EB Garamond
+    const size_t menuentry_font_size = 14; // Trajan Pro 3
+    const size_t title_font_size = 17; // Trajan Pro 3
     const size_t supertitle_font_size = 32;
     const size_t bigbutton_font_size = 22;
 };

src/Legacy/widgets/mainwindow.ui

@@ -155,7 +155,7 @@
         <enum>Qt::LeftToRight</enum>
        </property>
        <property name="styleSheet">
-        <string notr="true">color:rgb(255, 255, 255);</string>
+        <string notr="true">color: rgb(210, 210, 210);</string>
        </property>
        <property name="text">
         <string>ГЛАВНАЯ</string>
@@ -188,13 +188,15 @@
        <property name="font">
         <font>
          <family>Trajan Pro 3</family>
+         <weight>50</weight>
+         <bold>false</bold>
         </font>
        </property>
        <property name="mouseTracking">
         <bool>true</bool>
        </property>
        <property name="styleSheet">
-        <string notr="true">color:rgb(255, 255, 255);</string>
+        <string notr="true">color: rgb(210, 210, 210);</string>
        </property>
        <property name="text">
         <string>  НАСТРОЙКИ  </string>
@@ -227,13 +229,15 @@
        <property name="font">
         <font>
          <family>Trajan Pro 3</family>
+         <weight>50</weight>
+         <bold>false</bold>
         </font>
        </property>
        <property name="mouseTracking">
         <bool>true</bool>
        </property>
        <property name="styleSheet">
-        <string notr="true">color:rgb(255, 255, 255)</string>
+        <string notr="true">color: rgb(210, 210, 210);</string>
        </property>
        <property name="text">
         <string notr="true">РУСИФИКАЦИЯ</string>
@@ -266,6 +270,8 @@
        <property name="font">
         <font>
          <family>Trajan Pro 3</family>
+         <weight>50</weight>
+         <bold>false</bold>
         </font>
        </property>
        <property name="mouseTracking">
@@ -275,7 +281,7 @@
         <enum>Qt::LeftToRight</enum>
        </property>
        <property name="styleSheet">
-        <string notr="true">color:rgb(255, 255, 255);</string>
+        <string notr="true">color: rgb(210, 210, 210);</string>
        </property>
        <property name="text">
         <string>  О НАСЛЕДИИ  </string>

src/Legacy/widgets/newspiece.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>656</width>
-    <height>383</height>
+    <height>423</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -152,6 +152,7 @@ background-color:rgba(0,0,0,0);
            <property name="font">
             <font>
              <family>Trajan Pro 3</family>
+             <pointsize>8</pointsize>
              <weight>50</weight>
              <bold>false</bold>
             </font>

src/Legacy/widgets/settingswidget.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>630</width>
+    <width>709</width>
     <height>540</height>
    </rect>
   </property>
@@ -127,6 +127,11 @@
          </property>
          <item>
           <widget class="QLabel" name="label_common">
+           <property name="font">
+            <font>
+             <family>EB Garamond</family>
+            </font>
+           </property>
            <property name="text">
             <string>Какую версию игры локализовать?</string>
            </property>
@@ -134,6 +139,11 @@
          </item>
          <item>
           <widget class="QComboBox" name="lotro_patch_language_combobox_common">
+           <property name="font">
+            <font>
+             <family>EB Garamond</family>
+            </font>
+           </property>
            <property name="styleSheet">
             <string notr="true">color: black;</string>
            </property>
@@ -197,13 +207,18 @@ background-color: none;</string>
        </widget>
       </item>
       <item row="4" column="0" colspan="3">
-       <widget class="QPushButton" name="patch_all_button_common">
+       <widget class="QPushButton" name="patch_all_button_small">
         <property name="minimumSize">
          <size>
           <width>84</width>
           <height>25</height>
          </size>
         </property>
+        <property name="font">
+         <font>
+          <family>Trajan Pro 3</family>
+         </font>
+        </property>
         <property name="styleSheet">
          <string notr="true">QPushButton {
 	color: black;
@@ -232,36 +247,60 @@ QPushButton:default {
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLabel" name="folder_value_common">
+      <item row="0" column="0" colspan="3">
+       <widget class="QLabel" name="management_title_2">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="font">
+         <font>
+          <family>Trajan Pro 3</family>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
         <property name="styleSheet">
          <string notr="true">
 background-color: none;</string>
         </property>
         <property name="text">
-         <string>(не выбрана)</string>
+         <string>Управление:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="3">
-       <widget class="QLabel" name="management_common_2">
+      <item row="1" column="0">
+       <widget class="QLabel" name="folder_label_common">
+        <property name="font">
+         <font>
+          <family>EB Garamond</family>
+         </font>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">
+background-color: none;</string>
+        </property>
+        <property name="text">
+         <string>Папка с данными игры:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLabel" name="folder_value_common">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="font">
          <font>
-          <family>Aniron</family>
-          <weight>75</weight>
-          <bold>true</bold>
+          <family>EB Garamond</family>
          </font>
         </property>
         <property name="styleSheet">
@@ -269,21 +308,19 @@ background-color: none;</string>
 background-color: none;</string>
         </property>
         <property name="text">
-         <string>Управление:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
+         <string>(не выбрана)</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="folder_label_common">
-        <property name="styleSheet">
-         <string notr="true">
-background-color: none;</string>
+      <item row="3" column="0" colspan="3">
+       <widget class="QCheckBox" name="nosplashscreen_common">
+        <property name="font">
+         <font>
+          <family>EB Garamond</family>
+         </font>
         </property>
         <property name="text">
-         <string>Папка с данными игры:</string>
+         <string>Пропускать заставочный экран при запуске игры</string>
         </property>
        </widget>
       </item>
@@ -307,12 +344,12 @@ background-color: rgba(30, 0, 0, 100);</string>
        <number>0</number>
       </property>
       <item>
-       <widget class="QLabel" name="label_common_5">
+       <widget class="QLabel" name="label_title">
         <property name="font">
          <font>
-          <family>Aniron</family>
-          <weight>75</weight>
-          <bold>true</bold>
+          <family>Trajan Pro 3</family>
+          <weight>50</weight>
+          <bold>false</bold>
          </font>
         </property>
         <property name="styleSheet">
@@ -354,6 +391,11 @@ background-color: none;</string>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="font">
+            <font>
+             <family>EB Garamond</family>
+            </font>
+           </property>
            <property name="text">
             <string>Масштаб интерфейса:</string>
            </property>
@@ -373,6 +415,11 @@ background-color: none;</string>
              <height>0</height>
             </size>
            </property>
+           <property name="font">
+            <font>
+             <family>EB Garamond</family>
+            </font>
+           </property>
            <property name="styleSheet">
             <string notr="true">color: black;</string>
            </property>
@@ -452,7 +499,7 @@ background-color: rgba(30, 0, 0, 100);</string>
        <number>11</number>
       </property>
       <item>
-       <widget class="QLabel" name="management_common">
+       <widget class="QLabel" name="management_title">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -461,9 +508,9 @@ background-color: rgba(30, 0, 0, 100);</string>
         </property>
         <property name="font">
          <font>
-          <family>Aniron</family>
-          <weight>75</weight>
-          <bold>true</bold>
+          <family>Trajan Pro 3</family>
+          <weight>50</weight>
+          <bold>false</bold>
          </font>
         </property>
         <property name="styleSheet">
@@ -504,6 +551,11 @@ background-color: none;</string>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="font">
+            <font>
+             <family>EB Garamond</family>
+            </font>
+           </property>
            <property name="styleSheet">
             <string notr="true">
 background-color: none;</string>
@@ -524,6 +576,11 @@ background-color: none;</string>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="font">
+            <font>
+             <family>EB Garamond</family>
+            </font>
+           </property>
            <property name="styleSheet">
             <string notr="true">
 background-color: none;</string>
@@ -565,6 +622,11 @@ background-color: none;</string>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="font">
+            <font>
+             <family>EB Garamond</family>
+            </font>
+           </property>
            <property name="styleSheet">
             <string notr="true">
 background-color: none;</string>
@@ -585,6 +647,11 @@ background-color: none;</string>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="font">
+            <font>
+             <family>EB Garamond</family>
+            </font>
+           </property>
            <property name="styleSheet">
             <string notr="true">
 background-color: none;</string>
@@ -626,6 +693,11 @@ background-color: none;</string>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="font">
+            <font>
+             <family>EB Garamond</family>
+            </font>
+           </property>
            <property name="styleSheet">
             <string notr="true">
 background-color: none;</string>
@@ -646,6 +718,11 @@ background-color: none;</string>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="font">
+            <font>
+             <family>EB Garamond</family>
+            </font>
+           </property>
            <property name="styleSheet">
             <string notr="true">
 background-color: none;</string>
@@ -692,7 +769,12 @@ background-color: none;</string>
           <number>0</number>
          </property>
          <item>
-          <widget class="QPushButton" name="restore_button_common_3">
+          <widget class="QPushButton" name="restore_button_small">
+           <property name="font">
+            <font>
+             <family>Trajan Pro 3</family>
+            </font>
+           </property>
            <property name="autoFillBackground">
             <bool>false</bool>
            </property>
@@ -725,7 +807,12 @@ QPushButton:default {
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="restore_button_common_2">
+          <widget class="QPushButton" name="restore_button_small_3">
+           <property name="font">
+            <font>
+             <family>Trajan Pro 3</family>
+            </font>
+           </property>
            <property name="autoFillBackground">
             <bool>false</bool>
            </property>
@@ -758,7 +845,12 @@ QPushButton:default {
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="restore_button_common_4">
+          <widget class="QPushButton" name="restore_button_small_2">
+           <property name="font">
+            <font>
+             <family>Trajan Pro 3</family>
+            </font>
+           </property>
            <property name="autoFillBackground">
             <bool>false</bool>
            </property>

src/Legacy/widgets/statuswidget.ui

@@ -74,8 +74,8 @@ color: white;
       <font>
        <family>Trajan Pro 3</family>
        <pointsize>12</pointsize>
-       <weight>50</weight>
-       <bold>false</bold>
+       <weight>75</weight>
+       <bold>true</bold>
       </font>
      </property>
      <property name="cursor">
@@ -281,7 +281,10 @@ color: white;
         </property>
         <property name="font">
          <font>
-          <pointsize>-1</pointsize>
+          <family>Trajan Pro 3</family>
+          <pointsize>7</pointsize>
+          <weight>50</weight>
+          <bold>false</bold>
          </font>
         </property>
         <property name="mouseTracking">
@@ -293,7 +296,6 @@ border: 1px solid silver;
 border-radius: 7px;
 background-color: rgba(30, 0, 0, 220);
 color: white;
-font-size: 12px;
 }
 
 QPushButton:hover{
@@ -330,6 +332,8 @@ color: white;
          <font>
           <family>Trajan Pro 3</family>
           <pointsize>7</pointsize>
+          <weight>50</weight>
+          <bold>false</bold>
          </font>
         </property>
         <property name="mouseTracking">
@@ -374,6 +378,8 @@ color: white;
          <font>
           <family>Trajan Pro 3</family>
           <pointsize>7</pointsize>
+          <weight>50</weight>
+          <bold>false</bold>
          </font>
         </property>
         <property name="mouseTracking">
@@ -418,6 +424,8 @@ color: white;
          <font>
           <family>Trajan Pro 3</family>
           <pointsize>7</pointsize>
+          <weight>50</weight>
+          <bold>false</bold>
          </font>
         </property>
         <property name="mouseTracking">
@@ -462,6 +470,8 @@ color: white;
          <font>
           <family>Trajan Pro 3</family>
           <pointsize>7</pointsize>
+          <weight>50</weight>
+          <bold>false</bold>
          </font>
         </property>
         <property name="mouseTracking">
@@ -507,6 +517,10 @@ color: white;
          <font>
           <family>Trajan Pro 3</family>
           <pointsize>7</pointsize>
+          <weight>50</weight>
+          <bold>false</bold>
+          <stylestrategy>PreferDefault</stylestrategy>
+          <kerning>true</kerning>
          </font>
         </property>
         <property name="mouseTracking">
@@ -684,7 +698,7 @@ QPushButton#game_button:pressed {
           <number>11</number>
          </property>
          <item>
-          <widget class="QLabel" name="announcements_title_common">
+          <widget class="QLabel" name="announcements_title">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
              <horstretch>0</horstretch>
@@ -916,7 +930,7 @@ QScrollBar:vertical {
               <number>0</number>
              </property>
              <item>
-              <widget class="QLabel" name="status_title_common">
+              <widget class="QLabel" name="status_title">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                  <horstretch>0</horstretch>
@@ -953,7 +967,7 @@ QScrollBar:vertical {
                  <widget class="ServerStatusWidget" name="server_status_widget" native="true"/>
                 </item>
                 <item row="0" column="0" colspan="2">
-                 <widget class="QLabel" name="status_title_common_2">
+                 <widget class="QLabel" name="status_title_2">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                     <horstretch>0</horstretch>