Jelajahi Sumber

Bump 15.05.2019 (fonts fix awaited)

Ivan Arkhipov 5 tahun lalu
induk
melakukan
a516fc8f67

+ 9 - 7
src/Legacy/Legacy.pro

@@ -19,6 +19,8 @@ SOURCES += \
     models/filesystem.cpp \
     models/lotrodatmanager.cpp \
     models/patchdownloader.cpp \
+    models/selfupdater.cpp \
+    models/internallogicmanager.cpp \
     widgets/helpwidget.cpp \
     widgets/mainwindow.cpp \
     widgets/menuentry.cpp \
@@ -28,18 +30,19 @@ SOURCES += \
     widgets/newslistwidget.cpp \
     widgets/newspiece.cpp \
     widgets/serverstatuswidget.cpp \
-    models/selfupdater.cpp \
     widgets/chooseversiondialog.cpp \
     widgets/weeklycodewidget.cpp \
     widgets/dialogwindow.cpp \
-    fonts.cpp \
-    models/internallogicmanager.cpp
+    widgets/qsmoothscrollarea.cpp \
+    fonts.cpp
 
 HEADERS += \
     models/downloader.h \
     models/filesystem.h \
     models/lotrodatmanager.h \
     models/patchdownloader.h \
+    models/selfupdater.h \
+    models/internallogicmanager.h \
     widgets/helpwidget.h \
     widgets/mainwindow.h \
     widgets/menuentry.h \
@@ -49,13 +52,12 @@ HEADERS += \
     widgets/newslistwidget.h \
     widgets/newspiece.h \
     widgets/serverstatuswidget.h \
-    models/selfupdater.h \
     widgets/chooseversiondialog.h \
     widgets/weeklycodewidget.h \
-    constants.h \
     widgets/dialogwindow.h \
-    fonts.h \
-    models/internallogicmanager.h
+    widgets/qsmoothscrollarea.h \
+    constants.h \
+    fonts.h
 
 FORMS += \
     widgets/helpwidget.ui \

+ 36 - 36
src/Legacy/fonts.cpp

@@ -59,17 +59,17 @@ void constructFonts() {
     garamond_15pt = QFont("EB Garamond");
     garamond_16pt = QFont("EB Garamond");
 
-    garamond_6pt.setStyleStrategy(QFont::PreferAntialias);
-    garamond_7pt.setStyleStrategy(QFont::PreferAntialias);
-    garamond_8pt.setStyleStrategy(QFont::PreferAntialias);
-    garamond_9pt.setStyleStrategy(QFont::PreferAntialias);
-    garamond_10pt.setStyleStrategy(QFont::PreferAntialias);
-    garamond_11pt.setStyleStrategy(QFont::PreferAntialias);
-    garamond_12pt.setStyleStrategy(QFont::PreferAntialias);
-    garamond_13pt.setStyleStrategy(QFont::PreferAntialias);
-    garamond_14pt.setStyleStrategy(QFont::PreferAntialias);
-    garamond_15pt.setStyleStrategy(QFont::PreferAntialias);
-    garamond_16pt.setStyleStrategy(QFont::PreferAntialias);
+//    garamond_6pt.setStyleStrategy(QFont::PreferAntialias);
+//    garamond_7pt.setStyleStrategy(QFont::PreferAntialias);
+//    garamond_8pt.setStyleStrategy(QFont::PreferAntialias);
+//    garamond_9pt.setStyleStrategy(QFont::PreferAntialias);
+//    garamond_10pt.setStyleStrategy(QFont::PreferAntialias);
+//    garamond_11pt.setStyleStrategy(QFont::PreferAntialias);
+//    garamond_12pt.setStyleStrategy(QFont::PreferAntialias);
+//    garamond_13pt.setStyleStrategy(QFont::PreferAntialias);
+//    garamond_14pt.setStyleStrategy(QFont::PreferAntialias);
+//    garamond_15pt.setStyleStrategy(QFont::PreferAntialias);
+//    garamond_16pt.setStyleStrategy(QFont::PreferAntialias);
 
     garamond_6pt.setLetterSpacing(QFont::AbsoluteSpacing, 1);
     garamond_7pt.setLetterSpacing(QFont::AbsoluteSpacing, 1);
@@ -83,21 +83,21 @@ void constructFonts() {
     garamond_15pt.setLetterSpacing(QFont::AbsoluteSpacing, 1);
     garamond_16pt.setLetterSpacing(QFont::AbsoluteSpacing, 1);
 
-    trajan_6pt = QFont("Trajan Pro 3");
-    trajan_7pt = QFont("Trajan Pro 3");
-    trajan_8pt = QFont("Trajan Pro 3");
-    trajan_9pt = QFont("Trajan Pro 3");
-    trajan_10pt = QFont("Trajan Pro 3");
-    trajan_11pt = QFont("Trajan Pro 3");
-    trajan_12pt = QFont("Trajan Pro 3");
+    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);
-    trajan_8pt.setStyleStrategy(QFont::PreferAntialias);
-    trajan_9pt.setStyleStrategy(QFont::PreferAntialias);
-    trajan_10pt.setStyleStrategy(QFont::PreferAntialias);
-    trajan_11pt.setStyleStrategy(QFont::PreferAntialias);
-    trajan_12pt.setStyleStrategy(QFont::PreferAntialias);
+//    trajan_6pt.setStyleStrategy(QFont::PreferAntialias);
+//    trajan_7pt.setStyleStrategy(QFont::PreferAntialias);
+//    trajan_8pt.setStyleStrategy(QFont::PreferAntialias);
+//    trajan_9pt.setStyleStrategy(QFont::PreferAntialias);
+//    trajan_10pt.setStyleStrategy(QFont::PreferAntialias);
+//    trajan_11pt.setStyleStrategy(QFont::PreferAntialias);
+//    trajan_12pt.setStyleStrategy(QFont::PreferAntialias);
 
     crimson_6pt = QFont("Crimson Text");
     crimson_7pt = QFont("Crimson Text");
@@ -111,17 +111,17 @@ void constructFonts() {
     crimson_15pt = QFont("Crimson Text");
     crimson_16pt = QFont("Crimson Text");
 
-    crimson_6pt.setStyleStrategy(QFont::PreferAntialias);
-    crimson_7pt.setStyleStrategy(QFont::PreferAntialias);
-    crimson_8pt.setStyleStrategy(QFont::PreferAntialias);
-    crimson_9pt.setStyleStrategy(QFont::PreferAntialias);
-    crimson_10pt.setStyleStrategy(QFont::PreferAntialias);
-    crimson_11pt.setStyleStrategy(QFont::PreferAntialias);
-    crimson_12pt.setStyleStrategy(QFont::PreferAntialias);
-    crimson_13pt.setStyleStrategy(QFont::PreferAntialias);
-    crimson_14pt.setStyleStrategy(QFont::PreferAntialias);
-    crimson_15pt.setStyleStrategy(QFont::PreferAntialias);
-    crimson_16pt.setStyleStrategy(QFont::PreferAntialias);
+//    crimson_6pt.setStyleStrategy(QFont::PreferAntialias);
+//    crimson_7pt.setStyleStrategy(QFont::PreferAntialias);
+//    crimson_8pt.setStyleStrategy(QFont::PreferAntialias);
+//    crimson_9pt.setStyleStrategy(QFont::PreferAntialias);
+//    crimson_10pt.setStyleStrategy(QFont::PreferAntialias);
+//    crimson_11pt.setStyleStrategy(QFont::PreferAntialias);
+//    crimson_12pt.setStyleStrategy(QFont::PreferAntialias);
+//    crimson_13pt.setStyleStrategy(QFont::PreferAntialias);
+//    crimson_14pt.setStyleStrategy(QFont::PreferAntialias);
+//    crimson_15pt.setStyleStrategy(QFont::PreferAntialias);
+//    crimson_16pt.setStyleStrategy(QFont::PreferAntialias);
 }
 
 void updateFonts(double coefficient) {

+ 2 - 1
src/Legacy/main.cpp

@@ -34,9 +34,10 @@ int main(int argc, char *argv[])
     QResource::registerResource(QApplication::applicationDirPath() + "/data01.gtr");
     QResource::registerResource(QApplication::applicationDirPath() + "/data02.gtr");
 
-    QFontDatabase::addApplicationFont(":/fonts/trajan.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/trpro.ttf");
     QFontDatabase::addApplicationFont(":/fonts/CrimsonText.ttf");
     QFontDatabase::addApplicationFont(":/fonts/EBGaramond.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/aniron.ttf");
 
     qDebug() << "Starting main frame initialisation...";
 

+ 2 - 1
src/Legacy/models/internallogicmanager.cpp

@@ -1,6 +1,7 @@
 #include "internallogicmanager.h"
+#include "widgets/mainwindow.h"
 
-InternalLogicManager::InternalLogicManager(PatchDownloader *patch_downloader, LotroDatManager *lotro_mgr, QObject *parent)
+InternalLogicManager::InternalLogicManager(MainWindow *gui_, QSettings *settings_, PatchDownloader *patch_downloader_, LotroDatManager *lotro_manager_, QObject *parent)
 {
 
 }

+ 41 - 6
src/Legacy/models/internallogicmanager.h

@@ -2,6 +2,7 @@
 #define INTERNALLOGICMANAGER_H
 
 #include <QObject>
+#include <QSettings>
 
 #include "models/patchdownloader.h"
 #include "models/lotrodatmanager.h"
@@ -37,20 +38,54 @@ Stage 9 - All settings are checked and set. If user is for the first time - show
           Start check for updates. Start check for updates timer.
 */
 
+class MainWindow;
+
 class InternalLogicManager : public QObject
 {
     Q_OBJECT
 public:
-    explicit InternalLogicManager(PatchDownloader* patch_downloader, LotroDatManager *lotro_mgr, QObject *parent = nullptr);
+    explicit InternalLogicManager(MainWindow *gui_, QSettings *settings_, PatchDownloader *patch_downloader_, LotroDatManager *lotro_manager_, QObject *parent = nullptr);
 
 signals:
-
-public slots:
-
-
+    void initPipelineStarted();
+    void initPipelineFinished();
+
+    // Semi-critical sections signals. Example: patch files downloading
+    void semiCriticalSectionEntered();
+    void semiCriticalSectionLeaved();
+
+    // Critical sections. Example: patch applying, game updating, prelauncher files moving
+    void criticalSectionEntered();
+    void criticalSectionLeaved();
+
+//public slots:
+//    void startInitPipeline();
+
+//    // Actions from UI -> general window
+//    void startGame(QString locale = "Original"); // Original/RU
+
+//    // Actions from UI -> settings window
+//    void lotroSettingsUpdated();
+//    void createLotroFilesBackup();
+//    void removeLotroFilesBackup();
+//    void applySelectedPatches();
+//    void updateSettingsChanged();
+
+//private slots:
+//    void checkFirstTimeOpening();
+//    void checkGameFolderCorrectness();
+//    void checkDatFilesExist();
+//    void processLotroManagerInit();
+//    void processPatchDownloaderInit(); // There begins also checkForUpdates cycle;
+//    void checkBackupExist();
+//    void checkUserHasEnteredPatchOptions();
+//    void checkDatFileWasPatched();
 
 private:
-    int state_;
+    PatchDownloader *patch_downloader;
+    LotroDatManager *lotro_manager;
+    QSettings *settings;
+    MainWindow *gui;
 };
 
 #endif // INTERNALLOGICMANAGER_H

+ 6 - 4
src/Legacy/object_script.Legacy.Debug

@@ -6,6 +6,8 @@ INPUT(
 ./..\..\build\debug\Legacy\obj\filesystem.o
 ./..\..\build\debug\Legacy\obj\lotrodatmanager.o
 ./..\..\build\debug\Legacy\obj\patchdownloader.o
+./..\..\build\debug\Legacy\obj\selfupdater.o
+./..\..\build\debug\Legacy\obj\internallogicmanager.o
 ./..\..\build\debug\Legacy\obj\helpwidget.o
 ./..\..\build\debug\Legacy\obj\mainwindow.o
 ./..\..\build\debug\Legacy\obj\menuentry.o
@@ -15,17 +17,18 @@ INPUT(
 ./..\..\build\debug\Legacy\obj\newslistwidget.o
 ./..\..\build\debug\Legacy\obj\newspiece.o
 ./..\..\build\debug\Legacy\obj\serverstatuswidget.o
-./..\..\build\debug\Legacy\obj\selfupdater.o
 ./..\..\build\debug\Legacy\obj\chooseversiondialog.o
 ./..\..\build\debug\Legacy\obj\weeklycodewidget.o
 ./..\..\build\debug\Legacy\obj\dialogwindow.o
+./..\..\build\debug\Legacy\obj\qsmoothscrollarea.o
 ./..\..\build\debug\Legacy\obj\fonts.o
-./..\..\build\debug\Legacy\obj\internallogicmanager.o
 ./..\..\build\debug\Legacy\obj\legacy_plugin_import.o
 ./..\..\build\debug\Legacy\obj\moc_downloader.o
 ./..\..\build\debug\Legacy\obj\moc_filesystem.o
 ./..\..\build\debug\Legacy\obj\moc_lotrodatmanager.o
 ./..\..\build\debug\Legacy\obj\moc_patchdownloader.o
+./..\..\build\debug\Legacy\obj\moc_selfupdater.o
+./..\..\build\debug\Legacy\obj\moc_internallogicmanager.o
 ./..\..\build\debug\Legacy\obj\moc_helpwidget.o
 ./..\..\build\debug\Legacy\obj\moc_mainwindow.o
 ./..\..\build\debug\Legacy\obj\moc_menuentry.o
@@ -35,9 +38,8 @@ INPUT(
 ./..\..\build\debug\Legacy\obj\moc_newslistwidget.o
 ./..\..\build\debug\Legacy\obj\moc_newspiece.o
 ./..\..\build\debug\Legacy\obj\moc_serverstatuswidget.o
-./..\..\build\debug\Legacy\obj\moc_selfupdater.o
 ./..\..\build\debug\Legacy\obj\moc_chooseversiondialog.o
 ./..\..\build\debug\Legacy\obj\moc_weeklycodewidget.o
 ./..\..\build\debug\Legacy\obj\moc_dialogwindow.o
-./..\..\build\debug\Legacy\obj\moc_internallogicmanager.o
+./..\..\build\debug\Legacy\obj\moc_qsmoothscrollarea.o
 );

+ 6 - 4
src/Legacy/object_script.Legacy.Release

@@ -4,6 +4,8 @@ INPUT(
 ./..\..\build\release\Legacy\obj\filesystem.o
 ./..\..\build\release\Legacy\obj\lotrodatmanager.o
 ./..\..\build\release\Legacy\obj\patchdownloader.o
+./..\..\build\release\Legacy\obj\selfupdater.o
+./..\..\build\release\Legacy\obj\internallogicmanager.o
 ./..\..\build\release\Legacy\obj\helpwidget.o
 ./..\..\build\release\Legacy\obj\mainwindow.o
 ./..\..\build\release\Legacy\obj\menuentry.o
@@ -13,17 +15,18 @@ INPUT(
 ./..\..\build\release\Legacy\obj\newslistwidget.o
 ./..\..\build\release\Legacy\obj\newspiece.o
 ./..\..\build\release\Legacy\obj\serverstatuswidget.o
-./..\..\build\release\Legacy\obj\selfupdater.o
 ./..\..\build\release\Legacy\obj\chooseversiondialog.o
 ./..\..\build\release\Legacy\obj\weeklycodewidget.o
 ./..\..\build\release\Legacy\obj\dialogwindow.o
+./..\..\build\release\Legacy\obj\qsmoothscrollarea.o
 ./..\..\build\release\Legacy\obj\fonts.o
-./..\..\build\release\Legacy\obj\internallogicmanager.o
 ./..\..\build\release\Legacy\obj\legacy_plugin_import.o
 ./..\..\build\release\Legacy\obj\moc_downloader.o
 ./..\..\build\release\Legacy\obj\moc_filesystem.o
 ./..\..\build\release\Legacy\obj\moc_lotrodatmanager.o
 ./..\..\build\release\Legacy\obj\moc_patchdownloader.o
+./..\..\build\release\Legacy\obj\moc_selfupdater.o
+./..\..\build\release\Legacy\obj\moc_internallogicmanager.o
 ./..\..\build\release\Legacy\obj\moc_helpwidget.o
 ./..\..\build\release\Legacy\obj\moc_mainwindow.o
 ./..\..\build\release\Legacy\obj\moc_menuentry.o
@@ -33,9 +36,8 @@ INPUT(
 ./..\..\build\release\Legacy\obj\moc_newslistwidget.o
 ./..\..\build\release\Legacy\obj\moc_newspiece.o
 ./..\..\build\release\Legacy\obj\moc_serverstatuswidget.o
-./..\..\build\release\Legacy\obj\moc_selfupdater.o
 ./..\..\build\release\Legacy\obj\moc_chooseversiondialog.o
 ./..\..\build\release\Legacy\obj\moc_weeklycodewidget.o
 ./..\..\build\release\Legacy\obj\moc_dialogwindow.o
-./..\..\build\release\Legacy\obj\moc_internallogicmanager.o
+./..\..\build\release\Legacy\obj\moc_qsmoothscrollarea.o
 );

+ 3 - 3
src/Legacy/widgets/aboutwidget.ui

@@ -204,7 +204,7 @@ border: 1px solid qlineargradient(spread:reflect, x1:1, y1:1, x2:0, y2:1, stop:0
       <property name="font">
        <font>
         <family>Trajan Pro 3</family>
-        <pointsize>8</pointsize>
+        <pointsize>7</pointsize>
        </font>
       </property>
       <property name="text">
@@ -223,7 +223,7 @@ border: 1px solid qlineargradient(spread:reflect, x1:1, y1:1, x2:0, y2:1, stop:0
       <property name="font">
        <font>
         <family>Trajan Pro 3</family>
-        <pointsize>10</pointsize>
+        <pointsize>9</pointsize>
        </font>
       </property>
       <property name="text">
@@ -239,7 +239,7 @@ border: 1px solid qlineargradient(spread:reflect, x1:1, y1:1, x2:0, y2:1, stop:0
       <property name="font">
        <font>
         <family>Trajan Pro 3</family>
-        <pointsize>8</pointsize>
+        <pointsize>7</pointsize>
        </font>
       </property>
       <property name="text">

+ 3 - 146
src/Legacy/widgets/helpwidget.ui

@@ -287,153 +287,13 @@ QPushButton:default {
     </item>
    </layout>
   </widget>
-  <widget class="QProgressBar" name="progressBar">
-   <property name="geometry">
-    <rect>
-     <x>310</x>
-     <y>480</y>
-     <width>501</width>
-     <height>40</height>
-    </rect>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>40</height>
-    </size>
-   </property>
-   <property name="maximumSize">
-    <size>
-     <width>16777215</width>
-     <height>40</height>
-    </size>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">QProgressBar {
-    border: 0px solid grey;
-	border-image: url(:/per.png);
-}
-
-QProgressBar::chunk {
-background-image: url(:/letters.png);
-margin-left:8px;
-margin-right:8px;
-margin-top:7px;
-margin-bottom:7px;
-}
-</string>
-   </property>
-   <property name="maximum">
-    <number>100</number>
-   </property>
-   <property name="value">
-    <number>72</number>
-   </property>
-   <property name="textVisible">
-    <bool>false</bool>
-   </property>
-  </widget>
-  <widget class="QLabel" name="progress_label">
-   <property name="geometry">
-    <rect>
-     <x>310</x>
-     <y>450</y>
-     <width>501</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="font">
-    <font>
-     <family>Trajan Pro 3</family>
-     <pointsize>8</pointsize>
-     <weight>50</weight>
-     <bold>false</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string>Русификация... 72.6%</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-   <property name="wordWrap">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="game_button">
-   <property name="geometry">
-    <rect>
-     <x>830</x>
-     <y>460</y>
-     <width>150</width>
-     <height>60</height>
-    </rect>
-   </property>
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="font">
-    <font>
-     <family>Trajan Pro 3</family>
-     <pointsize>11</pointsize>
-     <weight>50</weight>
-     <bold>false</bold>
-     <kerning>false</kerning>
-    </font>
-   </property>
-   <property name="autoFillBackground">
-    <bool>false</bool>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">QPushButton#game_button { 
-	color: white;
-	border-image: url(:/buttons/button_big_normal.png);
-}
-
-QPushButton#game_button:hover {
-	color: white;
-	border-image: url(:/buttons/button_big_over.png);
-}
-
-QPushButton#game_button:pressed {
-	color: white;
-	border-image: url(:/buttons/button_big_pressed.png);
-}
-
-</string>
-   </property>
-   <property name="text">
-    <string notr="true">    ИГРАТЬ    </string>
-   </property>
-   <property name="iconSize">
-    <size>
-     <width>0</width>
-     <height>0</height>
-    </size>
-   </property>
-   <property name="default">
-    <bool>false</bool>
-   </property>
-   <property name="flat">
-    <bool>true</bool>
-   </property>
-  </widget>
   <widget class="QScrollArea" name="content_scroll_area">
    <property name="geometry">
     <rect>
      <x>330</x>
      <y>10</y>
      <width>651</width>
-     <height>441</height>
+     <height>501</height>
     </rect>
    </property>
    <property name="styleSheet">
@@ -490,9 +350,9 @@ QScrollBar:vertical {
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>0</y>
+      <y>-441</y>
       <width>630</width>
-      <height>2172</height>
+      <height>1941</height>
      </rect>
     </property>
     <property name="sizePolicy">
@@ -699,9 +559,6 @@ background-color: rgba(54, 47, 45, 155)</string>
   <zorder>hover_button_widget</zorder>
   <zorder>order_label</zorder>
   <zorder>checkpoints_list</zorder>
-  <zorder>progressBar</zorder>
-  <zorder>progress_label</zorder>
-  <zorder>game_button</zorder>
   <zorder>content_scroll_area</zorder>
  </widget>
  <resources/>

+ 8 - 23
src/Legacy/widgets/mainwindow.cpp

@@ -46,11 +46,11 @@ MainWindow::MainWindow(QWidget *parent) :
     patch_updater = new PatchDownloader(settings);
     lotro_manager = new LotroDatManager(settings);
 
-    connect(patch_updater, &PatchDownloader::checkForUpdatesStarted, this, &MainWindow::onPatchDownloaderStarted, Qt::BlockingQueuedConnection);
-    connect(patch_updater, &PatchDownloader::checkForUpdatesFinished, this, &MainWindow::onPatchDownloaderFinished, Qt::BlockingQueuedConnection);
-    connect(lotro_manager, &LotroDatManager::processStarted, this, &MainWindow::onLotroManagerStarted, Qt::BlockingQueuedConnection);
-    connect(lotro_manager, &LotroDatManager::processFinished, this, &MainWindow::onLotroManagerFinished, Qt::BlockingQueuedConnection);
-    connect(lotro_manager, &LotroDatManager::caughtError, this, &MainWindow::onLotroManagerErrorOccured, Qt::BlockingQueuedConnection);
+//    connect(patch_updater, &PatchDownloader::checkForUpdatesStarted, this, &MainWindow::onPatchDownloaderStarted, Qt::BlockingQueuedConnection);
+//    connect(patch_updater, &PatchDownloader::checkForUpdatesFinished, this, &MainWindow::onPatchDownloaderFinished, Qt::BlockingQueuedConnection);
+//    connect(lotro_manager, &LotroDatManager::processStarted, this, &MainWindow::onLotroManagerStarted, Qt::BlockingQueuedConnection);
+//    connect(lotro_manager, &LotroDatManager::processFinished, this, &MainWindow::onLotroManagerFinished, Qt::BlockingQueuedConnection);
+//    connect(lotro_manager, &LotroDatManager::caughtError, this, &MainWindow::onLotroManagerErrorOccured, Qt::BlockingQueuedConnection);
 
     connect(lotro_functions_thread, &QThread::finished, patch_updater, &QObject::deleteLater, Qt::QueuedConnection);
     connect(lotro_functions_thread, &QThread::finished, lotro_manager, &QObject::deleteLater, Qt::QueuedConnection);
@@ -104,8 +104,6 @@ MainWindow::MainWindow(QWidget *parent) :
 
     qDebug() << "Finishing main frame initialisation";
     show();
-    dialog_window->show();
-
     QMetaObject::invokeMethod(patch_updater, "checkForUpdates");
 }
 
@@ -133,25 +131,12 @@ void MainWindow::resizeEvent(QResizeEvent * event)
     int width = event->size().width();
     int height = event->size().height();
 
-    double dpi = qApp->desktop()->physicalDpiX();
-    dpi = 96;
-    const double default_dpi = 96;
-    qDebug() << "DPI IS" << dpi;
-
     window_width = width;
     window_height = height;
 
     // window_width * dpi / (default_window_width * default_dpi)
     updateFonts(window_width / default_window_width);
 
-//    qDebug() << "AAAAAAAAAAAAAA: " << pixels_in_6_pt << " " << pixels_in_7_pt << " " << pixels_in_8_pt << " " << pixels_in_9_pt << " " << pixels_in_10_pt << " " << pixels_in_11_pt << " " << pixels_in_12_pt;
-
-//    QMessageBox::information(nullptr, "DEBUG INFO",
-//                             "Window:" + QString::number(window_width) + "x" + QString::number(window_height) + "\n" +
-//                             "Screen:" + QString::number(qApp->desktop()->screenGeometry().width()) + "x" + QString::number(qApp->desktop()->screenGeometry().height()) + "\n" +
-//                             "DPI: " + QString::number(dpi) + "\n" +
-//                             "PixelsIn12Pt: " + QString::number(pixels_in_12_pt));
-
     ui->menu_widget->move(width * 320 / default_window_width, height * 34 / default_window_height);
     ui->menu_widget->resize(width * 650 / default_window_width, height * 53 / default_window_height);
 
@@ -260,9 +245,9 @@ void MainWindow::onPatchDownloaderStarted() {
 void MainWindow::onPatchDownloaderFinished() {
     qDebug() << "Patch downloader finished!";
 
-    if (lotro_manager->Initialised()) {
-        QMetaObject::invokeMethod(lotro_manager, "InstallUpdates", Qt::QueuedConnection);
-    }
+//    if (lotro_manager->Initialised()) {
+//        QMetaObject::invokeMethod(lotro_manager, "InstallUpdates", Qt::QueuedConnection);
+//    }
     return;
 }
 

+ 3 - 0
src/Legacy/widgets/mainwindow.h

@@ -89,8 +89,11 @@ private:
     MenuEntry* currently_hover_entry;
 
     PatchDownloader *patch_updater;
+//    QThread *patch_updater_thread;
+
     LotroDatManager *lotro_manager;
     QThread *lotro_functions_thread;
+//    QThread *lotro_manager_thread;
 
     Ui::MainWindow *ui;
 

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

@@ -18,7 +18,7 @@ NewsListWidget::NewsListWidget(QWidget *parent) : QWidget(parent)
     connect(&news_update_timer, &QTimer::timeout, &news_downloader, &Downloader::start);
     connect(&news_downloader, &Downloader::downloadFinished, this, &NewsListWidget::updateNews);
     news_downloader.start();
-    news_update_timer.setInterval(1000 * 63); // 63 seconds;
+    news_update_timer.setInterval(1000 * 60 * 5); //  5 minutes;
     news_update_timer.start();
 
     setMouseTracking(true);

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

@@ -47,12 +47,8 @@ NewsPiece::~NewsPiece()
 
 void NewsPiece::updateFontsSizes()
 {
-    QFont font8pt = QFont(ui->news_title->font());
-    QFont font7pt = QFont(ui->news_date->font());
-    font8pt.setPixelSize(pixels_in_8_pt);
-    font7pt.setPixelSize(pixels_in_7_pt);
-    ui->news_title->setFont(font8pt);
-    ui->news_date->setFont(font7pt);
+    ui->news_title->setFont(trajan_8pt);
+    ui->news_date->setFont(trajan_7pt);
 }
 
 void NewsPiece::resizeEvent(QResizeEvent *event)

+ 219 - 0
src/Legacy/widgets/qsmoothscrollarea.cpp

@@ -0,0 +1,219 @@
+#include <QWheelEvent>
+#include <QApplication>
+#include <QScrollBar>
+#include <QTimer>
+#include <QDebug>
+#include <QDateTime>
+#include <QQueue>
+#include <qmath.h>
+
+#include "qsmoothscrollarea.h"
+
+QSmoothScrollArea::QSmoothScrollArea(QWidget *parent) :
+    QScrollArea(parent)
+{
+    lastWheelEvent = 0;
+    smoothMoveTimer = new QTimer(this);
+    connect(smoothMoveTimer, SIGNAL(timeout()), this, SLOT(slotSmoothMove()));
+
+    m_fps = 60;
+    m_duration = 500;
+    m_smoothMode = CONSTANT;
+    m_acceleration = 1.5;
+
+    m_smallStepModifier = Qt::SHIFT;
+    m_smallStepRatio = 1.0 / 5.0;
+    m_bigStepModifier = Qt::ALT;
+    m_bigStepRatio = 5.0;
+}
+
+int QSmoothScrollArea::fps()
+{
+    return m_fps;
+}
+
+void QSmoothScrollArea::setFps(int fps)
+{
+    m_fps = fps;
+}
+
+int QSmoothScrollArea::duration()
+{
+    return m_duration;
+}
+
+void QSmoothScrollArea::setDuration(int mesc)
+{
+    m_duration = mesc;
+}
+
+QSmoothScrollArea::SmoothMode QSmoothScrollArea::smoothMode()
+{
+    return m_smoothMode;
+}
+
+void QSmoothScrollArea::setSmoothMode(QSmoothScrollArea::SmoothMode mode)
+{
+    m_smoothMode = mode;
+}
+
+double QSmoothScrollArea::acceration()
+{
+    return m_acceleration;
+}
+
+void QSmoothScrollArea::setAcceration(double acceleration)
+{
+    m_acceleration = acceleration;
+}
+
+double QSmoothScrollArea::smallStepRatio()
+{
+    return m_smallStepRatio;
+}
+
+void QSmoothScrollArea::setSmallStepRatio(double smallStepRatio)
+{
+    m_smallStepRatio = smallStepRatio;
+}
+
+double QSmoothScrollArea::bigStepRatio()
+{
+    return m_bigStepRatio;
+}
+
+void QSmoothScrollArea::setBigStepRatio(double bigStepRatio)
+{
+    m_bigStepRatio = bigStepRatio;
+}
+
+Qt::Modifier QSmoothScrollArea::smallStepModifier()
+{
+    return m_smallStepModifier;
+}
+
+void QSmoothScrollArea::setSmallStepModifier(
+        Qt::Modifier smallStepModifier)
+{
+    m_smallStepModifier = smallStepModifier;
+}
+
+Qt::Modifier QSmoothScrollArea::bigStepModifier()
+{
+    return m_bigStepModifier;
+}
+
+void QSmoothScrollArea::setbigStepModifier(
+        Qt::Modifier bigStepModifier)
+{
+    m_bigStepModifier = bigStepModifier;
+}
+
+void QSmoothScrollArea::wheelEvent(QWheelEvent *e)
+{
+    if (m_smoothMode == NO_SMOOTH) {
+        QScrollArea::wheelEvent(e);
+        return;
+    }
+
+
+    // According to my experiment, a normal person is able to scroll his wheel
+    // at the speed about 36 times per second in average.  Here we use a
+    // conservative value 30: a user can achieve the maximum acceration when he
+    // scrools his wheel at 30 times / second.
+    static QQueue<qint64> scrollStamps;
+    qint64 now = QDateTime::currentDateTime().toMSecsSinceEpoch();
+    scrollStamps.enqueue(now);
+    while (now - scrollStamps.front() > 500)
+        scrollStamps.dequeue();
+    double accerationRatio = qMin(scrollStamps.size() / 15.0, 1.0);
+
+    if (!lastWheelEvent)
+        lastWheelEvent = new QWheelEvent(*e);
+    else
+        *lastWheelEvent = *e;
+
+    stepsTotal = m_fps * m_duration / 1000;
+    double multiplier = 1.0;
+    if (QApplication::keyboardModifiers() & smallStepModifier())
+        multiplier *= smallStepRatio();
+    if (QApplication::keyboardModifiers() & bigStepModifier())
+        multiplier *= bigStepRatio();
+    double delta = e->delta() * multiplier;
+    if (acceration() > 0)
+        delta += delta * acceration() * accerationRatio;
+
+    stepsLeftQueue.push_back(qMakePair(delta, stepsTotal));
+    smoothMoveTimer->start(1000 / m_fps);
+}
+
+void QSmoothScrollArea::slotSmoothMove()
+{
+    double totalDelta = 0;
+
+    for (QList< QPair<double, int> >::Iterator it = stepsLeftQueue.begin();
+         it != stepsLeftQueue.end(); ++it)
+    {
+        totalDelta += subDelta(it->first, it->second);
+        --(it->second);
+    }
+    while (!stepsLeftQueue.empty() && stepsLeftQueue.begin()->second == 0)
+        stepsLeftQueue.pop_front();
+
+    Qt::Orientation orientation = lastWheelEvent->orientation();
+    // By default, when you press ALT, QT will scroll horizontally.  But if we
+    // have defined the use of ALT key, we ignore this setting since horizontal
+    // scroll is not so useful in okular
+    if ((bigStepModifier() & Qt::ALT) || (smallStepModifier() & Qt::ALT))
+        orientation = Qt::Vertical;
+
+    QWheelEvent e(
+                lastWheelEvent->pos(),
+                lastWheelEvent->globalPos(),
+                qRound(totalDelta),
+                lastWheelEvent->buttons(),
+                0,
+                orientation
+    );
+    if (e.orientation() == Qt::Horizontal)
+        QApplication::sendEvent(horizontalScrollBar(), &e);
+    else
+        QApplication::sendEvent(verticalScrollBar(), &e);
+
+    if (stepsLeftQueue.empty()) {
+        smoothMoveTimer->stop();
+    }
+}
+
+double QSmoothScrollArea::subDelta(double delta, int stepsLeft)
+{
+    Q_ASSERT(m_smoothMode != NO_SMOOTH);
+
+    double m = stepsTotal / 2.0;
+    double x = abs(stepsTotal - stepsLeft - m);
+
+    // some mathmatical integral result.
+    switch (m_smoothMode) {
+    case NO_SMOOTH:
+        return 0;
+        break;
+
+    case CONSTANT:
+        return double(delta) / stepsTotal;
+        break;
+
+    case LINEAR:
+        return 2.0*delta/stepsTotal * (m - x) / m;
+        break;
+
+    case QUADRATIC:
+        return 3.0/4.0/m * (1.0 - x*x/m/m) * delta;
+        break;
+
+    case COSINE:
+        return (cos(x * M_PI / m) + 1.0) / (2.0*m) * delta;
+        break;
+    }
+
+    return 0;
+}

+ 77 - 0
src/Legacy/widgets/qsmoothscrollarea.h

@@ -0,0 +1,77 @@
+#ifndef QSMOOTHSCROLLAREA_H
+#define QSMOOTHSCROLLAREA_H
+
+#include <QScrollArea>
+#include <QList>
+#include <QPair>
+#include <Qt>
+
+class QTimer;
+
+class QSmoothScrollArea : public QScrollArea
+{
+    Q_OBJECT
+public:
+    explicit QSmoothScrollArea(QWidget *parent = 0);
+
+    enum SmoothMode {
+        NO_SMOOTH,
+        CONSTANT,
+        LINEAR,
+        QUADRATIC,
+        COSINE
+    };
+    SmoothMode smoothMode();
+    void setSmoothMode(SmoothMode mode);
+
+    int fps();
+    void setFps(int fps);
+
+    // value in millisecond
+    int duration();
+    void setDuration(int mesc);
+
+    double acceration();
+    void setAcceration(double acceleration);
+
+    double smallStepRatio();
+    void setSmallStepRatio(double smallStepRatio);
+
+    double bigStepRatio();
+    void setBigStepRatio(double bigStepRatio);
+
+    Qt::Modifier smallStepModifier();
+    void setSmallStepModifier(Qt::Modifier smallStepModifier);
+
+    Qt::Modifier bigStepModifier();
+    void setbigStepModifier(Qt::Modifier bigStepModifier);
+
+protected:
+    virtual void wheelEvent(QWheelEvent *event);
+
+signals:
+
+public slots:
+    void slotSmoothMove();
+
+private:
+    double subDelta(double delta, int stepsLeft);
+
+    QTimer *smoothMoveTimer;
+    QWheelEvent *lastWheelEvent;
+
+    int m_fps;
+    int m_duration;
+    SmoothMode m_smoothMode;
+
+    double m_acceleration;
+    double m_smallStepRatio;
+    double m_bigStepRatio;
+    Qt::Modifier m_smallStepModifier;
+    Qt::Modifier m_bigStepModifier;
+
+    int stepsTotal;
+    QList< QPair<double, int> > stepsLeftQueue;
+};
+
+#endif // QSMOOTHSCROLLAREA_H

+ 1 - 1
src/Legacy/widgets/serverstatuswidget.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>149</width>
-    <height>385</height>
+    <height>422</height>
    </rect>
   </property>
   <property name="sizePolicy">

+ 23 - 14
src/Legacy/widgets/settingswidget.cpp

@@ -20,9 +20,17 @@ SettingsWidget::SettingsWidget(QSettings* settings, PatchDownloader* patch_downl
         setStatusToBlock(i, E_ERROR);
 
     combobox_scrolling_disabler = new SettingsWidgetPrivate::ComboboxScrollingDisabler();
+    scroller = new SettingsWidgetPrivate::SettingsTabsScroller({ui->sub_entry_1,
+                                                                ui->sub_entry_2,
+                                                                ui->sub_entry_3,
+                                                                ui->sub_entry_4
+                                                               },
+                                                                ui->content_scroll_area
+                                                               );
 
     ui->lotro_base_language_combobox->installEventFilter(combobox_scrolling_disabler);
     ui->interface_scale_combobox->installEventFilter(combobox_scrolling_disabler);
+//    ui->content_scroll_area->verticalScrollBar()->installEventFilter(scroller);
 
     connect(patch_downloader, &PatchDownloader::checkForUpdatesStarted, this, &SettingsWidget::handleCheckForUpdatesStarted, Qt::QueuedConnection);
     connect(patch_downloader, &PatchDownloader::checkForUpdatesFinished, this, &SettingsWidget::handleCheckForUpdatesFinished, Qt::QueuedConnection);
@@ -33,28 +41,27 @@ SettingsWidget::SettingsWidget(QSettings* settings, PatchDownloader* patch_downl
 SettingsWidget::~SettingsWidget()
 {
     delete combobox_scrolling_disabler;
+    delete scroller;
     delete ui;
 }
 
 void SettingsWidget::updateFontsSizes()
 {
     ui->frame_title->setFont(trajan_10pt);
-    ui->group_label_1->setFont(trajan_8pt);
-    ui->group_label_2->setFont(trajan_8pt);
-    ui->group_label_3->setFont(trajan_8pt);
-    ui->group_label_4->setFont(trajan_8pt);
+    ui->group_label_1->setFont(trajan_9pt);
+    ui->group_label_2->setFont(trajan_9pt);
+    ui->group_label_3->setFont(trajan_9pt);
 
     ui->sub_entry_1_title->setFont(garamond_11pt);
     ui->sub_entry_2_title->setFont(garamond_11pt);
     ui->sub_entry_3_title->setFont(garamond_11pt);
-    ui->sub_entry_4_title->setFont(garamond_11pt);
 
     ui->backup_create_button->setFont(trajan_8pt);
     ui->backup_restore_button->setFont(trajan_8pt);
     ui->backup_remove_button->setFont(trajan_8pt);
-    ui->reinstall_rusification_button->setFont(trajan_8pt);
 
-    ui->patch_apply_button->setFont(trajan_11pt);
+    ui->apply_button_entry_1->setFont(trajan_11pt);
+    ui->apply_button_entry_2->setFont(trajan_11pt);
 
     ui->game_folder_label->setFont(crimson_11pt);
     ui->game_folder_path->setFont(crimson_11pt);
@@ -62,9 +69,9 @@ void SettingsWidget::updateFontsSizes()
     ui->lotro_base_language_combobox->setFont(crimson_11pt);
     ui->lotro_base_language_combobox->insertItem(ui->lotro_base_language_combobox->count(), ""); // is needed to invoke elements resize
     ui->lotro_base_language_combobox->removeItem(ui->lotro_base_language_combobox->count() - 1);
-
     ui->skiprawdownload_checkbox->setFont(crimson_11pt);
     ui->nosplashscreen_checkbox->setFont(crimson_11pt);
+
     ui->backup_status_label->setFont(crimson_11pt);
     ui->backup_status_value->setFont(crimson_11pt);
     ui->backup_creation_time_label->setFont(crimson_11pt);
@@ -73,7 +80,6 @@ void SettingsWidget::updateFontsSizes()
     ui->backup_path_value->setFont(crimson_11pt);
 
     ui->patch_emotes_checkbox->setFont(crimson_11pt);
-    ui->patch_fonts_checkbox->setFont(crimson_11pt);
     ui->patch_items_checkbox->setFont(crimson_11pt);
     ui->patch_loadscreens_checkbox->setFont(crimson_11pt);
     ui->patch_maps_checkbox->setFont(crimson_11pt);
@@ -82,9 +88,9 @@ void SettingsWidget::updateFontsSizes()
     ui->patch_video_checkbox->setFont(crimson_11pt);
     ui->patch_texts_checkbox->setFont(crimson_11pt);
 
-    ui->micropatch_checkbox->setFont(crimson_11pt);
-    ui->interface_scale_label->setFont(crimson_11pt);
-    ui->interface_scale_combobox->setFont(crimson_11pt);
+    ui->micropatch_checkbox->setFont(crimson_12pt);
+    ui->interface_scale_label->setFont(crimson_12pt);
+    ui->interface_scale_combobox->setFont(crimson_12pt);
     ui->interface_scale_combobox->insertItem(ui->interface_scale_combobox->count(), "250%"); // is needed to invoke elements resize
     ui->interface_scale_combobox->removeItem(ui->interface_scale_combobox->count() - 1);
 
@@ -118,20 +124,23 @@ void SettingsWidget::resizeEvent(QResizeEvent *event)
     ui->frame_title->resize(QSize(201, 21) * coefficient);
     ui->checkpoints_list->move(QPoint(25, 70) * coefficient);
     ui->checkpoints_list->resize(QSize(265, 321) * coefficient);
+
     ui->content_scroll_area->move(QPoint(310, 0) * coefficient);
     ui->content_scroll_area->resize(QSize(671, 521) * coefficient);
+    ui->content_widget->setMinimumWidth(650 * coefficient);
 
     ui->group_status_icon_1->setMinimumSize(QSize(25, 25) * coefficient);
     ui->group_status_icon_2->setMinimumSize(QSize(25, 25) * coefficient);
     ui->group_status_icon_3->setMinimumSize(QSize(25, 25) * coefficient);
-    ui->group_status_icon_4->setMinimumSize(QSize(25, 25) * coefficient);
 
     ui->change_folder_button->setMinimumSize(QSize(36, 32) * coefficient);
 
     ui->patch_texts_icon->setMinimumSize(QSize(80, 80) * coefficient);
     ui->patch_graphics_icon->setMinimumSize(QSize(80, 80) * coefficient);
     ui->patch_sounds_icon->setMinimumSize(QSize(80, 80) * coefficient);
-    ui->patch_apply_button->setMinimumHeight(double(55) * coefficient);
+
+    ui->apply_button_entry_1->setMinimumHeight(double(55) * coefficient);
+    ui->apply_button_entry_2->setMinimumHeight(double(55) * coefficient);
 }
 
 void SettingsWidget::handleLotroManagerStarted(QString process_name, QVector<QVariant> data)

+ 65 - 0
src/Legacy/widgets/settingswidget.h

@@ -8,6 +8,9 @@
 #include <QPushButton>
 #include <QEvent>
 #include <QDebug>
+#include <QScrollArea>
+#include <QScrollBar>
+#include <QWheelEvent>
 
 namespace Ui {
 class SettingsWidget;
@@ -17,6 +20,7 @@ class PatchDownloader;
 class LotroDatManager;
 
 namespace SettingsWidgetPrivate {
+
 class ComboboxScrollingDisabler : public QObject {
     Q_OBJECT
 
@@ -30,6 +34,66 @@ protected:
         }
     }
 };
+
+class SettingsTabsScroller : public QObject {
+public:
+    SettingsTabsScroller(QList<QWidget*> entries, QScrollArea* target_widget) : target_widget_(target_widget), current_entry_id_(0), entries_(std::move(entries)) {
+        scroll_entries_animation_ = new QPropertyAnimation(target_widget_->verticalScrollBar(), "value");
+        scroll_entries_animation_->setDuration(450);
+        scroll_entries_animation_->setEasingCurve(QEasingCurve::InOutQuart);
+    }
+
+    ~SettingsTabsScroller() {
+        scroll_entries_animation_->deleteLater();
+    }
+
+protected:
+    bool eventFilter(QObject *obj, QEvent *event) override {
+//        if (obj != target_widget_) {
+//            return false;
+//        }
+
+        if (event->type() == QEvent::Wheel) {
+            event->ignore();
+            QWheelEvent *wheel_event = (QWheelEvent*)(event);
+
+            int wheel_angle = wheel_event->angleDelta().y();
+
+            qDebug() << "SCROLL EVENT! " << wheel_event->pixelDelta() << "/" << wheel_event->angleDelta();
+
+            if (scroll_entries_animation_->state() == QPropertyAnimation::Running) {
+                return true;
+            }
+
+            if (wheel_angle < 0 && current_entry_id_ + 1 < entries_.size()) {
+                ++current_entry_id_;
+                scroll_entries_animation_->setStartValue(target_widget_->verticalScrollBar()->value());
+                scroll_entries_animation_->setEndValue(entries_[current_entry_id_]->y());
+                scroll_entries_animation_->start();
+                return true;
+            }
+
+            if (wheel_angle > 0 && current_entry_id_ - 1 >= 0) {
+                 --current_entry_id_;
+                 scroll_entries_animation_->setStartValue(target_widget_->verticalScrollBar()->value());
+                 scroll_entries_animation_->setEndValue(entries_[current_entry_id_]->y());
+                 scroll_entries_animation_->start();
+                 return true;
+            }
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+private:
+    int current_entry_id_;
+    QScrollArea* target_widget_;
+    QList<QWidget*> entries_;
+    QPropertyAnimation* scroll_entries_animation_;
+};
+
 }
 
 class SettingsWidget : public QWidget
@@ -79,6 +143,7 @@ private:
 
     Ui::SettingsWidget *ui;
     SettingsWidgetPrivate::ComboboxScrollingDisabler* combobox_scrolling_disabler;
+    SettingsWidgetPrivate::SettingsTabsScroller* scroller;
 };
 
 #endif // SettingsWidget_H

File diff ditekan karena terlalu besar
+ 352 - 360
src/Legacy/widgets/settingswidget.ui


+ 1 - 1
src/Legacy/widgets/statuswidget.ui

@@ -177,7 +177,7 @@ border-image: url(:/characters/galadriel_with_text.png);
      <string/>
     </property>
     <property name="text">
-     <string>КЛИКНИТЕ ПО ЕЖЕНЕДЕЛЬНОМУ КОДУ, ЧТОБЫ СКОПИРОВАТЬ ЕГО В БУФЕР ОБМЕНА</string>
+     <string>КЛИКНИТЕ ПО ЕЖЕНЕДЕЛЬНОМУ КОДУ, ЧТОБЫ СКОПИРОВАТЬ ЕГО</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignCenter</set>

+ 2 - 8
src/Legacy/widgets/weeklycodewidget.cpp

@@ -34,14 +34,8 @@ WeeklyCodeWidget::~WeeklyCodeWidget()
 
 void WeeklyCodeWidget::updateFontsSizes()
 {
-    QFont font9pt = QFont(ui->title->font());
-    QFont font10pt = QFont(ui->code->font());
-
-    font9pt.setPixelSize(pixels_in_9_pt);
-    font10pt.setPixelSize(pixels_in_10_pt);
-
-    ui->title->setFont(font9pt);
-    ui->code->setFont(font10pt);
+    ui->title->setFont(trajan_9pt);
+    ui->code->setFont(trajan_10pt);
 }
 
 void WeeklyCodeWidget::resizeEvent(QResizeEvent *event)

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini