Bump 13.06.2019 - finished base structure impl

src/Legacy/legacyapplication.cpp

@@ -1,5 +1,10 @@
 #include "legacyapplication.h"
 
+#include <QLockFile>
+#include <QMessageBox>
+#include <QResource>
+#include <QFontDatabase>
+
 LegacyApplication::LegacyApplication(int &argc, char **argv)
     : QApplication(argc, argv)
     , lotro_dat_manager(nullptr)
@@ -9,10 +14,6 @@ LegacyApplication::LegacyApplication(int &argc, char **argv)
 {
 }
 
-LegacyApplication::~LegacyApplication()
-{
-}
-
 bool LegacyApplication::init()
 {
     qDebug() << __func__ << "Starting initialisation...";
@@ -64,5 +65,7 @@ bool LegacyApplication::init()
     gui = new MainWindow(patch_list);
     qDebug() << __func__ << "Legacy Initialization finished!";
 
+    patch_list->startAutoUpdate();
+    patch_list->initialize();
     return true;
 }

src/Legacy/legacyapplication.h

@@ -1,16 +1,8 @@
 #ifndef LEGACYAPPLICATION_H
 #define LEGACYAPPLICATION_H
 
-#include <QObject>
 #include <QApplication>
 #include <QThread>
-#include <QMessageBox>
-#include <QLockFile>
-#include <QDir>
-#include <QTextCodec>
-#include <QDebug>
-#include <QResource>
-#include <QFontDatabase>
 
 #include "models/lotrodatmanager.h"
 #include "models/patchlist.h"
@@ -18,10 +10,8 @@
 
 class LegacyApplication : public QApplication
 {
-
 public:
     LegacyApplication(int &argc, char** argv);
-    virtual ~LegacyApplication() final;
 
     bool init();
 

src/Legacy/models/downloader.cpp

@@ -59,7 +59,7 @@ quint64 Downloader::getBytesDownloaded()
 
 quint64 Downloader::getElapsedTime()
 {
-    return (getBytesTotal() - getBytesDownloaded()) / qMax(quint64(1), getCurrentSpeed());
+    return (getBytesTotal() - getBytesDownloaded()) / qMax(quint64(1), getAverageSpeed());
 }
 
 quint64 Downloader::getCurrentSpeed()

src/Legacy/models/downloader.h

@@ -15,25 +15,24 @@ class Downloader : public QObject
 
 public:
     struct Status {
-        bool running;
-        double percent;
-
-        quint64 total_bytes;
-        quint64 downloaded_bytes;
-        quint64 current_speed;
-        quint64 average_speed;
-        quint64 elapsed_time;
+        bool running = false;
+        double percent = 0.0;
+
+        quint64 total_bytes = 0;
+        quint64 downloaded_bytes = 0;
+        quint64 current_speed = 0;
+        quint64 average_speed = 0;
+        quint64 elapsed_time = 0;
     };
 
     friend Status operator+(const Status& a, const Status &b) {
-        Status result = {
-            a.running || b.running,
-            (a.percent + b.percent) / 2.0,
-            a.total_bytes + b.total_bytes,
-            a.downloaded_bytes + b.downloaded_bytes,
-            a.average_speed + b.average_speed,
-            qMax(a.elapsed_time, b.elapsed_time)
-        };
+        Status result;
+        result.running = a.running || b.running;
+        result.percent = (a.percent + b.percent) / 2.0;
+        result.total_bytes = a.total_bytes + b.total_bytes;
+        result.downloaded_bytes = a.downloaded_bytes + b.downloaded_bytes;
+        result.average_speed = a.average_speed + b.average_speed;
+        result.elapsed_time = qMax(a.elapsed_time, b.elapsed_time);
         return result;
     }
 

src/Legacy/models/lotrodatmanager.h

@@ -22,6 +22,13 @@ public:
         DatStatus::DAT_STATUS status;
         double percent;
         QString dbg_message;
+
+        Status()
+            : status(DatStatus::DAT_STATUS::E_FREE)
+            , percent(0)
+            , dbg_message("")
+        {
+        }
     };
 
     friend bool operator !=(const Status& a, const Status& b) {

src/Legacy/models/patch/patch.h

@@ -22,13 +22,25 @@ public:
     };
 
     struct InstallationStatus {
-        CurrentProcess process;
-        int current_part; // Ex. "installation (current_part/total_parts) percent%"
-        int total_parts;
-        double percent;
-        QString debug_msg;
+        CurrentProcess process = CurrentProcess::E_FINISHED;
+        int current_part = 0; // Ex. "installation (current_part/total_parts) percent%"
+        int total_parts = 0;
+        double percent = 0;
+        QString debug_msg = "";
     };
 
+    friend InstallationStatus operator+(const InstallationStatus &a, const InstallationStatus &b) {
+        InstallationStatus result = {
+            CurrentProcess::E_INSTALL,
+            a.current_part + b.current_part,
+            a.total_parts + b.total_parts,
+            (100.0 * double(a.current_part - 1 + b.current_part - 1) + a.percent + b.percent) / double(a.total_parts + b.total_parts),
+            QString()
+        };
+
+        return result;
+    }
+
 public:
     explicit Patch(QString patch_name, LotroDatManager* mgr, QObject *parent);
 

src/Legacy/models/patchlist.cpp

@@ -2,8 +2,10 @@
 
 #include <QDebug>
 
-PatchList::PatchList(LotroDatManager *mgr, QObject *parent)
+PatchList::PatchList(LotroDatManager *mgr, QObject *parent) : QObject(parent)
 {
+    lotro_mgr_ = mgr;
+
     texts_patch_ = new TextsPatch(mgr);
     graphics_patch_ = new GraphicsPatch(mgr);
     sounds_patch_ = new SoundsPatch(mgr);
@@ -24,44 +26,67 @@ PatchList::PatchList(LotroDatManager *mgr, QObject *parent)
     sounds_patch_->moveToThread(sounds_patch_thread_);
     videos_patch_->moveToThread(videos_patch_thread_);
 
+    connect(texts_patch_, &TextsPatch::operationStarted, this, &PatchList::onPatchOperationStarted, Qt::QueuedConnection);
+    connect(graphics_patch_, &GraphicsPatch::operationStarted, this, &PatchList::onPatchOperationStarted, Qt::QueuedConnection);
+    connect(sounds_patch_, &SoundsPatch::operationStarted, this, &PatchList::onPatchOperationStarted, Qt::QueuedConnection);
+    connect(videos_patch_, &VideosPatch::operationStarted, this, &PatchList::onPatchOperationStarted, Qt::QueuedConnection);
+
+    connect(texts_patch_, &TextsPatch::operationFinished, this, &PatchList::onPatchOperationFinished, Qt::QueuedConnection);
+    connect(graphics_patch_, &GraphicsPatch::operationFinished, this, &PatchList::onPatchOperationFinished, Qt::QueuedConnection);
+    connect(sounds_patch_, &SoundsPatch::operationFinished, this, &PatchList::onPatchOperationFinished, Qt::QueuedConnection);
+    connect(videos_patch_, &VideosPatch::operationFinished, this, &PatchList::onPatchOperationFinished, Qt::QueuedConnection);
+
+    connect(texts_patch_, &TextsPatch::downloadStatusChanged, this, &PatchList::onPatchDownloadStatusChanged, Qt::QueuedConnection);
+    connect(graphics_patch_, &GraphicsPatch::downloadStatusChanged, this, &PatchList::onPatchDownloadStatusChanged, Qt::QueuedConnection);
+    connect(sounds_patch_, &SoundsPatch::downloadStatusChanged, this, &PatchList::onPatchDownloadStatusChanged, Qt::QueuedConnection);
+    connect(videos_patch_, &VideosPatch::downloadStatusChanged, this, &PatchList::onPatchDownloadStatusChanged, Qt::QueuedConnection);
+
+    connect(texts_patch_, &TextsPatch::installStatusChanged, this, &PatchList::onPatchInstallStatusChanged, Qt::QueuedConnection);
+    connect(graphics_patch_, &GraphicsPatch::installStatusChanged, this, &PatchList::onPatchInstallStatusChanged, Qt::QueuedConnection);
+    connect(sounds_patch_, &SoundsPatch::installStatusChanged, this, &PatchList::onPatchInstallStatusChanged, Qt::QueuedConnection);
+    connect(videos_patch_, &VideosPatch::installStatusChanged, this, &PatchList::onPatchInstallStatusChanged, Qt::QueuedConnection);
+
+    connect(lotro_mgr_, &LotroDatManager::operationFinished, this, &PatchList::onLotroManagerOperationFinished, Qt::QueuedConnection);
+
     texts_patch_thread_->start();
     graphics_patch_thread_->start();
     sounds_patch_thread_->start();
     videos_patch_thread_->start();
 
     patch_update_timer.setInterval(10 * 60 * 1000); // 10 minutes
-    connect(&patch_update_timer, &QTimer::timeout, this, &PatchList::onUpdateTimerTimeout);
-}
-
-const TextsPatch *PatchList::getTextsPatch()
-{
-    return texts_patch_;
-}
-
-const GraphicsPatch *PatchList::getGraphicsPatch()
-{
-    return graphics_patch_;
+    connect(&patch_update_timer, &QTimer::timeout, this, &PatchList::update);
 }
 
-const SoundsPatch *PatchList::getSoundsPatch()
+QList<Patch *> PatchList::getPatchList()
 {
-    return sounds_patch_;
-}
-
-const VideosPatch *PatchList::getVideosPatch()
-{
-    return videos_patch_;
+    return {texts_patch_, graphics_patch_, sounds_patch_, videos_patch_};
 }
 
 void PatchList::onPatchOperationStarted(QString operation_name, Patch *patch)
 {
+    patch_update_timer.stop();
+    if (active_operations_num_ == 0) {
+        emit patchOperationsStarted();
+    }
+    ++active_operations_num_;
+
     qDebug() << "Operation " << operation_name << " started of patchset " << patch->getPatchName();
 }
 
 void PatchList::onPatchOperationFinished(QString operation_name, Patch *patch, bool result)
 {
     qDebug() << "Operation " << operation_name << " finished of patchset " << patch->getPatchName() << ", result = " << result;
+    --active_operations_num_;
+
     if (!result) {
+        if (active_operations_num_ == 0) {
+            if (auto_updates_enabled_) {
+                patch_update_timer.start();
+            }
+            qDebug() << __FUNCTION__ << "All patch operations successfully finished!";
+            emit patchOperationsFinished();
+        }
+
         return; // Do not continue operations chain, if error occured
     }
 
@@ -76,10 +101,79 @@ void PatchList::onPatchOperationFinished(QString operation_name, Patch *patch, b
     if (operation_name == "install") {
         QMetaObject::invokeMethod(patch, &Patch::activate, Qt::QueuedConnection);
     }
+
+    if (operation_name == "activate" && active_operations_num_ == 0) {
+        emit patchOperationsFinished();
+    }
+
+    if (active_operations_num_ == 0) {
+        if (auto_updates_enabled_) {
+            patch_update_timer.start();
+        }
+        qDebug() << __FUNCTION__ << "All patch operations successfully finished!";
+        emit patchOperationsFinished();
+    }
+}
+
+void PatchList::onPatchDownloadStatusChanged(Patch *patch, Downloader::Status status)
+{
+    patches_download_status_[patch] = status;
+    Downloader::Status total_status;
+
+    foreach (Downloader::Status st, patches_download_status_) {
+        total_status = total_status + st;
+    }
+
+    emit downloadTotalStatusChanged(total_status);
+}
+
+void PatchList::onPatchInstallStatusChanged(Patch *patch, Patch::InstallationStatus status)
+{
+    patches_installation_status_[patch] = status;
+    Patch::InstallationStatus total_status;
+
+    foreach (Patch::InstallationStatus st, patches_installation_status_) {
+        total_status = total_status + st;
+    }
+
+    emit installTotalStatusChanged(total_status);
+}
+
+void PatchList::onLotroManagerOperationFinished(QString operation_name, QVector<QVariant>, bool result)
+{
+    if (operation_name == "initializeManager") {
+        --active_operations_num_;
+
+        if (active_operations_num_ == 0) {
+            emit patchOperationsFinished();
+        }
+
+//        if (result == true) {
+            update();
+//        }
+    }
+}
+
+void PatchList::startAutoUpdate()
+{
+    auto_updates_enabled_ = true;
+    patch_update_timer.start();
+}
+
+void PatchList::initialize() {
+    ++active_operations_num_;
+    emit patchOperationsStarted();
+    QMetaObject::invokeMethod(lotro_mgr_, &LotroDatManager::initializeManager, Qt::QueuedConnection);
 }
 
-void PatchList::onUpdateTimerTimeout()
+void PatchList::update()
 {
+    if (active_operations_num_ != 0) {
+        qDebug() << __FUNCTION__ << "Tried to start update, while other operations weren't finished yet!";
+        return;
+    }
+
+    qDebug() << __FUNCTION__ << "Starting update!";
     QMetaObject::invokeMethod(texts_patch_, &TextsPatch::checkForUpdates, Qt::QueuedConnection);
     QMetaObject::invokeMethod(graphics_patch_, &GraphicsPatch::checkForUpdates, Qt::QueuedConnection);
     QMetaObject::invokeMethod(sounds_patch_, &SoundsPatch::checkForUpdates, Qt::QueuedConnection);

src/Legacy/models/patchlist.h

@@ -4,6 +4,7 @@
 #include <QObject>
 #include <QTimer>
 #include <QThread>
+#include <QList>
 
 #include "models/patch/patch.h"
 #include "models/patch/textspatch.h"
@@ -17,35 +18,56 @@ class PatchList : public QObject
 public:
     explicit PatchList(LotroDatManager* mgr, QObject *parent = nullptr);
 
-    const TextsPatch *getTextsPatch();
+    QList<Patch *> getPatchList();
 
-    const GraphicsPatch *getGraphicsPatch();
+signals:
+    void patchOperationsFinished();
 
-    const SoundsPatch *getSoundsPatch();
+    void patchOperationsStarted();
 
-    const VideosPatch *getVideosPatch();
+    void downloadTotalStatusChanged(Downloader::Status status);
 
+    void installTotalStatusChanged(Patch::InstallationStatus status);
 
 public slots:
+    void startAutoUpdate();
+
+    void update();
+
+    void initialize();
+
+private slots:
     void onPatchOperationStarted(QString operation_name, Patch* patch);
 
     void onPatchOperationFinished(QString operation_name, Patch* patch, bool result);
 
-    void onUpdateTimerTimeout();
+    void onPatchDownloadStatusChanged(Patch* patch, Downloader::Status status);
+
+    void onPatchInstallStatusChanged(Patch* patch, Patch::InstallationStatus status);
+
+    void onLotroManagerOperationFinished(QString operation_name, QVector<QVariant> args, bool result);
 
 private:
-    TextsPatch *texts_patch_;
-    GraphicsPatch *graphics_patch_;
-    SoundsPatch *sounds_patch_;
-    VideosPatch *videos_patch_;
+    LotroDatManager *lotro_mgr_ = nullptr;
+    bool lotro_mgr_initialised_ = false;
+
+    TextsPatch *texts_patch_ = nullptr;
+    GraphicsPatch *graphics_patch_ = nullptr;
+    SoundsPatch *sounds_patch_ = nullptr;
+    VideosPatch *videos_patch_ = nullptr;
 
     QThread *texts_patch_thread_;
-    QThread *graphics_patch_thread_;
-    QThread *sounds_patch_thread_;
-    QThread *videos_patch_thread_;
+    QThread *graphics_patch_thread_ = nullptr;
+    QThread *sounds_patch_thread_ = nullptr;
+    QThread *videos_patch_thread_ = nullptr;
 
-private:
-    QTimer patch_update_timer;
+    QMap<Patch*, Downloader::Status> patches_download_status_;
+    QMap<Patch*, Patch::InstallationStatus> patches_installation_status_;
+
+    quint32 active_operations_num_ = 0;
+    bool auto_updates_enabled_ = false;
+
+    QTimer patch_update_timer;    
 };
 
 #endif // PATCHLIST_H

src/Legacy/widgets/mainwindow.cpp

@@ -4,6 +4,7 @@
 
 #include "widgets/chooseversiondialog.h"
 #include "widgets/dialogwindow.h"
+#include "models/patchlist.h"
 
 #include <QBitmap>
 #include <QPainter>
@@ -187,9 +188,29 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
-void MainWindow::showMessageDialog(QString title, QString message, QString ok_button_text, QString cancel_button_text)
+void MainWindow::showMessageDialog(QObject* emitter, QString message, QString ok_button_text, QString cancel_button_text)
 {
+    QMessageBox msg_box;
+    msg_box.setText(message);
+    msg_box.setStandardButtons(QMessageBox::NoButton);
 
+    QPushButton* ok_button = nullptr;
+    QPushButton* cancel_button = nullptr;
+
+    if (!ok_button_text.isEmpty()) {
+        ok_button = new QPushButton(&msg_box);
+        ok_button->setText(ok_button_text);
+        msg_box.addButton(ok_button, QMessageBox::AcceptRole);
+    }
+
+    if (!cancel_button_text.isEmpty()) {
+        cancel_button = new QPushButton(&msg_box);
+        cancel_button->setText(cancel_button_text);
+        msg_box.addButton(cancel_button, QMessageBox::RejectRole);
+    }
+
+    int result = msg_box.exec();
+    emit messageDialogFinished(emitter, result);
 }
 
 void MainWindow::on_menuentry_1_clicked()
@@ -240,8 +261,20 @@ void MainWindow::setupWindowBackgroundAndMask(QPixmap background)
     setPalette(palette);
 }
 
+void MainWindow::onPatchOperationsStarted()
+{
+    show_warning_on_close = true;
+}
+
+void MainWindow::onPatchOperationsFinished()
+{
+    show_warning_on_close = false;
+}
+
 void MainWindow::makeConnections()
 {
+    connect(legacy_patches_, &PatchList::patchOperationsStarted, this, &MainWindow::onPatchOperationsStarted);
+    connect(legacy_patches_, &PatchList::patchOperationsFinished, this, &MainWindow::onPatchOperationsFinished);
 }
 
 void MainWindow::setupMenuHoverWidget()
@@ -313,7 +346,16 @@ void MainWindow::updateFontSizes()
 
 void MainWindow::on_closeButton_clicked()
 {
-    qApp->quit();
+    if (show_warning_on_close) {
+        auto result = QMessageBox::question(this, "Подтвердите действие", "Внимание! В настоящий момент выполняются процессы установки/обновления.\n"
+                                                            "Выход из приложения может привести к ошибкам и повреждению файлов игры.\n\n"
+                                                            "Вы уверены, что хотите прервать работу Наследия?");
+        if (result == QMessageBox::Yes) {
+            qApp->quit();
+        }
+    } else {
+        qApp->quit();
+    }
 }
 
 void MainWindow::on_minimizeButton_clicked()

src/Legacy/widgets/mainwindow.h

@@ -35,11 +35,11 @@ public:
     int getLastDialogResult();
 
 public slots:
-    void showMessageDialog(QString title, QString message, QString ok_button_text = "Ок", QString cancel_button_text = "Отмена");
+    void showMessageDialog(QObject* emitter, QString message, QString ok_button_text = "Ок", QString cancel_button_text = "Отмена");
     void updateFontSizes();
 
 signals:
-    void messageDialogFinished();
+    void messageDialogFinished(QObject* emitter, int result);
 
 protected:
     void mouseMoveEvent(QMouseEvent *event) override;
@@ -66,8 +66,12 @@ private slots:
 
     void setupWindowBackgroundAndMask(QPixmap background);
 
+    void onPatchOperationsStarted();
+
+    void onPatchOperationsFinished();
+
 private:
-    void makeConnections(); // TODO
+    void makeConnections();
 
     void setupMenuHoverWidget();
 
@@ -82,6 +86,8 @@ private:
     void setEventFilterRecursive(QObject* widget);
 
 private:
+    bool show_warning_on_close = false;
+
     PatchList *legacy_patches_;
 
     Ui::MainWindow *ui;

src/Legacy/widgets/statuswidget.cpp

@@ -63,6 +63,18 @@ StatusWidget::StatusWidget(PatchList *legacy_patches, QWidget *parent)
 
     active_tooltip = nullptr;
     resetToolTip();
+
+    connect(legacy_patches_, &PatchList::downloadTotalStatusChanged, this, &StatusWidget::onDownloadTotalStatusChanged);
+    connect(legacy_patches_, &PatchList::installTotalStatusChanged, this, &StatusWidget::onInstallTotalStatusChanged);
+    connect(legacy_patches_, &PatchList::patchOperationsStarted, this, &StatusWidget::onPatchOperationsStarted);
+    connect(legacy_patches_, &PatchList::patchOperationsFinished, this, &StatusWidget::onPatchOperationsFinished);
+
+    foreach (Patch* patch, legacy_patches_->getPatchList()) {
+        connect(patch, &Patch::downloadStatusChanged, this, &StatusWidget::onPatchDownloadStatusChanged);
+        connect(patch, &Patch::installStatusChanged, this, &StatusWidget::onPatchInstallStatusChanged);
+        connect(patch, &Patch::operationFinished, this, &StatusWidget::onPatchOperationFinished);
+        connect(patch, &Patch::operationStarted, this, &StatusWidget::onPatchOperationStarted);
+    }
 }
 
 StatusWidget::~StatusWidget()
@@ -72,27 +84,18 @@ StatusWidget::~StatusWidget()
 
 void StatusWidget::updateFontsSizes()
 {
-    QFont pt10_font = QFont(ui->news_label->font());
-    pt10_font.setPixelSize(pixels_in_10_pt);
-    QFont pt9_font = QFont(ui->progress_label->font());
-    pt9_font.setPixelSize(pixels_in_9_pt);
-    QFont pt11_font = QFont(ui->game_button->font());
-    pt11_font.setPixelSize(pixels_in_11_pt);
-    QFont pt8_font = QFont(ui->images_label->font());
-    pt8_font.setPixelSize(pixels_in_8_pt);
-
     ui->progress_label->setFont(crimson_10pt);
     ui->game_button->setFont(trajan_11pt);
     ui->news_label->setFont(trajan_10pt);
 
-    ui->images_label->setFont(crimson_11pt);
-    ui->images_status->setFont(crimson_11pt);
-    ui->sounds_label->setFont(crimson_11pt);
-    ui->sounds_status->setFont(crimson_11pt);
-    ui->texts_label->setFont(crimson_11pt);
-    ui->texts_status->setFont(crimson_11pt);
-    ui->videos_label->setFont(crimson_11pt);
-    ui->videos_status->setFont(crimson_11pt);
+    ui->graphicspatch_label->setFont(crimson_11pt);
+    ui->graphicspatch_status->setFont(crimson_11pt);
+    ui->soundspatch_label->setFont(crimson_11pt);
+    ui->soundspatch_status->setFont(crimson_11pt);
+    ui->textspatch_label->setFont(crimson_11pt);
+    ui->textspatch_status->setFont(crimson_11pt);
+    ui->videospatch_label->setFont(crimson_11pt);
+    ui->videospatch_status->setFont(crimson_11pt);
 
     ui->news_tooltip->setFont(garamond_11pt);
     ui->weekly_code_tooltip_1->setFont(garamond_11pt);
@@ -179,3 +182,84 @@ void StatusWidget::fadeBetweenToolTips(QWidget* next_tooltip)
 
     active_tooltip = next_tooltip;
 }
+
+void StatusWidget::onPatchOperationsStarted()
+{
+    ui->game_button->setEnabled(false);
+    ui->progress_label->setText("Выполение операций....");
+    ui->progressBar->setValue(0);
+}
+
+void StatusWidget::onPatchOperationsFinished()
+{
+    ui->game_button->setEnabled(true);
+    ui->progress_label->setText("Все операции завершены.");
+    ui->progressBar->setValue(100);
+}
+
+void StatusWidget::onDownloadTotalStatusChanged(Downloader::Status status)
+{
+    last_download_status_ = status;
+    
+    QString text = "Выполнение операций...";
+    if (last_download_status_.running) {
+        text += "\nЗагрузка данных: " + QString::number(last_download_status_.percent, 'f', 1) + "%, осталось примерно: " + Downloader::getElapsedTimeFormatted(last_download_status_.elapsed_time);
+    }
+    
+    if (last_install_status_.process != Patch::CurrentProcess::E_FINISHED) {
+        text += "\nПрименение патчей: " + QString::number(last_install_status_.percent + 100.0 * (last_install_status_.current_part - 1) / (100 * last_install_status_.total_parts), 'f', 1) + "%";
+    }
+
+    ui->progress_label->setText(text);
+
+}
+
+void StatusWidget::onInstallTotalStatusChanged(Patch::InstallationStatus status)
+{
+    last_install_status_ = status;
+
+    QString text = "Выполнение операций...";
+    if (last_download_status_.running) {
+        text += "\nЗагрузка данных: " + QString::number(last_download_status_.percent, 'f', 1) + "%, осталось примерно: " + Downloader::getElapsedTimeFormatted(last_download_status_.elapsed_time);
+    }
+
+    if (last_install_status_.process != Patch::CurrentProcess::E_FINISHED) {
+        text += "\nПрименение патчей: " + QString::number(last_install_status_.percent + 100.0 * (last_install_status_.current_part - 1) / (100 * last_install_status_.total_parts), 'f', 1) + "%";
+    }
+
+    ui->progress_label->setText(text);
+}
+
+void StatusWidget::onPatchOperationStarted(QString operation_name, Patch *patch)
+{
+    QLabel* patch_status_label = findChild<QLabel*>(patch->getPatchName().toLower() + "_status");
+    if (!patch_status_label) {
+        qDebug() << "Cannot find status label for patch " << patch->getPatchName();
+        return;
+    }
+
+    patch_status_label->setText(operation_name);
+}
+
+void StatusWidget::onPatchOperationFinished(QString operation_name, Patch *patch)
+{
+    QLabel* patch_status_label = findChild<QLabel*>(patch->getPatchName().toLower() + "_status");
+    if (!patch_status_label) {
+        qDebug() << "Cannot find status label for patch " << patch->getPatchName();
+        return;
+    }
+
+    patch_status_label->setText("Завершено");
+}
+
+void StatusWidget::onPatchDownloadStatusChanged(Patch *patch, Downloader::Status status)
+{
+
+}
+
+void StatusWidget::onPatchInstallStatusChanged(Patch *patch, Patch::InstallationStatus status)
+{
+
+}
+
+

src/Legacy/widgets/statuswidget.h

@@ -8,12 +8,12 @@
 #include <QPropertyAnimation>
 #include <QGraphicsOpacityEffect>
 
+#include "models/patchlist.h"
+
 namespace Ui {
 class StatusWidget;
 }
 
-class PatchList;
-
 class StatusWidget : public QWidget
 {
     Q_OBJECT
@@ -37,7 +37,20 @@ private slots:
 
     void fadeBetweenToolTips(QWidget* next_tooltip);
 
+    void onPatchOperationsStarted();
+    void onPatchOperationsFinished();
+    void onDownloadTotalStatusChanged(Downloader::Status status);
+    void onInstallTotalStatusChanged(Patch::InstallationStatus status);
+    
+    void onPatchOperationStarted(QString operation_name, Patch* patch);
+    void onPatchOperationFinished(QString operation_name, Patch* patch);
+    void onPatchDownloadStatusChanged(Patch* patch, Downloader::Status status);
+    void onPatchInstallStatusChanged(Patch* patch, Patch::InstallationStatus status);
+
 private:
+    Downloader::Status last_download_status_;
+    Patch::InstallationStatus last_install_status_;
+    
     Ui::StatusWidget *ui;
 
     PatchList *legacy_patches_;

src/Legacy/widgets/statuswidget.ui

@@ -286,7 +286,7 @@ border-image: url(:/characters/galadriel_with_text.png);
       </spacer>
      </item>
      <item row="0" column="0">
-      <widget class="QLabel" name="texts_label">
+      <widget class="QLabel" name="textspatch_label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -305,7 +305,7 @@ border-image: url(:/characters/galadriel_with_text.png);
       </widget>
      </item>
      <item row="0" column="2">
-      <widget class="QLabel" name="texts_status">
+      <widget class="QLabel" name="textspatch_status">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -324,7 +324,7 @@ border-image: url(:/characters/galadriel_with_text.png);
       </widget>
      </item>
      <item row="1" column="0">
-      <widget class="QLabel" name="images_label">
+      <widget class="QLabel" name="graphicspatch_label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -343,7 +343,7 @@ border-image: url(:/characters/galadriel_with_text.png);
       </widget>
      </item>
      <item row="1" column="2">
-      <widget class="QLabel" name="images_status">
+      <widget class="QLabel" name="graphicspatch_status">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -362,7 +362,7 @@ border-image: url(:/characters/galadriel_with_text.png);
       </widget>
      </item>
      <item row="2" column="2">
-      <widget class="QLabel" name="sounds_status">
+      <widget class="QLabel" name="soundspatch_status">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -381,7 +381,7 @@ border-image: url(:/characters/galadriel_with_text.png);
       </widget>
      </item>
      <item row="2" column="0">
-      <widget class="QLabel" name="sounds_label">
+      <widget class="QLabel" name="soundspatch_label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -400,7 +400,7 @@ border-image: url(:/characters/galadriel_with_text.png);
       </widget>
      </item>
      <item row="3" column="0">
-      <widget class="QLabel" name="videos_label">
+      <widget class="QLabel" name="videospatch_label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -419,7 +419,7 @@ border-image: url(:/characters/galadriel_with_text.png);
       </widget>
      </item>
      <item row="3" column="2">
-      <widget class="QLabel" name="videos_status">
+      <widget class="QLabel" name="videospatch_status">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>