Bug fixes & improve functionality view window

Legacy_v2.pro

@@ -16,9 +16,7 @@ TEMPLATE = subdirs
 SUBDIRS += \
     src/Launcher \
     src/Legacy \ 
-    src/Legacy-advanced \
-    src/Legacy-advanced \
-    src/Launcher
+    src/Legacy-advanced
 
 RESOURCES += \
     src/Legacy/common.qrc

src/Legacy-advanced/Legacy-advanced.pro

@@ -29,7 +29,7 @@ SOURCES += \
     main.cpp \
     models\downloader.cpp \
     models\filesystem.cpp \
-    models\lotromanager.cpp \
+    models\lotrodatmanager.cpp \
     widgets\browsewidget.cpp \
     widgets\exportwidget.cpp \
     widgets\importwidget.cpp \
@@ -42,7 +42,7 @@ SOURCES += \
 HEADERS += \
     models\downloader.h \
     models\filesystem.h \
-    models\lotromanager.h \
+    models\lotrodatmanager.h \
     widgets\browsewidget.h \
     widgets\exportwidget.h \
     widgets\importwidget.h \

src/Legacy-advanced/main.cpp

@@ -3,7 +3,7 @@
 #include <QLockFile>
 #include <QDir>
 
-#include "models/lotromanager.h"
+#include "models/lotrodatmanager.h"
 
 #include "widgets/browsewidget.h"
 #include "widgets/exportwidget.h"

src/Legacy-advanced/models/lotromanager.cpp → src/Legacy-advanced/models/lotrodatmanager.cpp

@@ -1,4 +1,4 @@
-#include "lotromanager.h"
+#include "lotrodatmanager.h"
 #include "filesystem.h"
 #include "LotroDat/Subfiles/TextSubFile.h"
 
@@ -14,14 +14,14 @@
 Q_DECLARE_METATYPE(LOTRO_DAT::FILE_TYPE)
 Q_DECLARE_METATYPE(LOTRO_DAT::SubfileData)
 
-LotroManager::LotroManager(QSettings* app_settings_, QObject *parent) :
+LotroDatManager::LotroDatManager(QSettings* app_settings_, QObject *parent) :
     QObject(parent), app_settings(app_settings_) {
 
     qRegisterMetaType<LOTRO_DAT::FILE_TYPE>();
     qRegisterMetaType<LOTRO_DAT::SubfileData>();
 }
 
-void LotroManager::initialiseDatFile(QString file_path) {
+void LotroDatManager::initialiseDatFile(QString file_path) {
     emit processStarted("initialiseDatFile", {file_path});
 
     qDebug() << "Initialising file " << file_path;
@@ -36,7 +36,7 @@ void LotroManager::initialiseDatFile(QString file_path) {
     emit processFinished("initialiseDatFile", {QString("Success"), file_path});
 }
 
-void LotroManager::deinitialiseDatFile()
+void LotroDatManager::deinitialiseDatFile()
 {
     emit processStarted("deintialiseDatFile", {});
     qDebug() << "Deinitialising file...";
@@ -44,7 +44,7 @@ void LotroManager::deinitialiseDatFile()
     emit processFinished("deinitialiseDatFile", {});
 }
 
-void LotroManager::changeLocale() {
+void LotroDatManager::changeLocale() {
     qDebug() << "Changing locale of dat file...";
     // Setting locale, opposite to current
     auto current_locale = file.GetLocaleManager().GetCurrentLocale();
@@ -70,11 +70,12 @@ void LotroManager::changeLocale() {
     }
 }
 
-void LotroManager::getLocaleFileContents(long long file_id, int locale) {
+void LotroDatManager::getLocaleFileContents(long long file_id, int locale) {
     emit processStarted("getLocaleFileContents", {file_id, locale});
 
     auto getfile_op = file.GetLocaleManager().GetLocaleFile(file_id, (LOTRO_DAT::DatLocaleManager::LOCALE)locale);
-    if (!getfile_op.result) {
+
+    if (!getfile_op.result && locale != LOTRO_DAT::DatLocaleManager::ORIGINAL) {
         emit caughtError("getLocaleFileContents", {"Файл не найден!", QString("Не удаётся найти файл с id ") + QString::number(file_id)});
         emit processFinished("getLocaleFileContents", {"Error"});
         return;
@@ -83,7 +84,7 @@ void LotroManager::getLocaleFileContents(long long file_id, int locale) {
     LOTRO_DAT::SubFile subfile = getfile_op.value;
 
     auto getrealfile_op = file.GetFileSystem().GetFile(file_id);
-    if (!getfile_op.result) {
+    if (!getrealfile_op.result) {
         emit caughtError("getLocaleFileContents", {"Файл не найден!", QString("Не удаётся найти в словаре файл с id ") + QString::number(file_id)});
         emit processFinished("getLocaleFileContents", {"Error"});
         return;
@@ -95,11 +96,17 @@ void LotroManager::getLocaleFileContents(long long file_id, int locale) {
         return;
     }
 
+
+    // If there's no locale file in ORIGINAL locale, but id is correct - then use it from
+    // FileManager dictionary
+    if (!getfile_op.result)
+        subfile = *(getrealfile_op.value);
+
     LOTRO_DAT::TextSubFile text_subfile(subfile);
 
     auto getfiledata_op = file.GetFileSystem().GetFileData(subfile, 8);
 
-    if (getfile_op.result == LOTRO_DAT::ERROR) {
+    if (getfiledata_op.result == LOTRO_DAT::ERROR) {
         emit caughtError("getLocaleFileContents", {"Ошибка извлечения!", QString("Обнаружены некорректные данные файла в словаре! Файл ресурсов мог быть повреждён!\nid = ") + QString::number(file_id) + ", locale_id = " + QString::number(locale)});
         emit processFinished("getLocaleFileContents", {"Error"});
         return;
@@ -110,7 +117,7 @@ void LotroManager::getLocaleFileContents(long long file_id, int locale) {
     emit processFinished("getLocaleFileContents", {"Success", file_id, locale});
 }
 
-void LotroManager::importFilesFromDatabase(QString database_path) {
+void LotroDatManager::importFilesFromDatabase(QString database_path) {
     emit processStarted("importFilesFromDatabase", {database_path});
 
     if (!FileSystem::fileExists(database_path)) {
@@ -137,7 +144,7 @@ void LotroManager::importFilesFromDatabase(QString database_path) {
     }
 }
 
-void LotroManager::importFile(long long file_id, QString file_path) {
+void LotroDatManager::importFile(long long file_id, QString file_path) {
     emit processStarted("importFile", {file_id, file_path});
 
     if (!FileSystem::fileExists(file_path)) {
@@ -202,7 +209,7 @@ void LotroManager::importFile(long long file_id, QString file_path) {
     return;
 }
 
-void LotroManager::importTextFragment(long long file_id, long long fragment_id,
+void LotroDatManager::importTextFragment(long long file_id, long long fragment_id,
                                QString fragment_contents, QString arguments) {
     emit processStarted("importTextFragment", {file_id, fragment_id});
 
@@ -261,7 +268,7 @@ void LotroManager::importTextFragment(long long file_id, long long fragment_id,
     }
 }
 
-void LotroManager::getTextFragment(long long file_id, long long fragment_id) {
+void LotroDatManager::getTextFragment(long long file_id, long long fragment_id) {
     emit processStarted("getTextFragment", {file_id, fragment_id});
 
     auto getfile_op = file.GetFileSystem().GetFile(file_id);
@@ -315,7 +322,7 @@ void LotroManager::getTextFragment(long long file_id, long long fragment_id) {
     emit processFinished("getTextFragment", {"Success"});
 }
 
-void LotroManager::createCoreStatusFile(QString output_filename) {
+void LotroDatManager::createCoreStatusFile(QString output_filename) {
     emit processStarted("createCoreStatusFile", {output_filename});
     auto gatherinfo_op = file.GatherInformation(output_filename.toStdString());
 
@@ -327,7 +334,7 @@ void LotroManager::createCoreStatusFile(QString output_filename) {
     }
 }
 
-void LotroManager::extractSingleFile(QString output_filename, long long file_id) {
+void LotroDatManager::extractSingleFile(QString output_filename, long long file_id) {
     emit processStarted("extractSingleFile", {output_filename, file_id});
     auto extractfile_op = file.GetExporter().ExtractFileById(file_id, output_filename.toStdString());
     if (extractfile_op.result == LOTRO_DAT::SUCCESS) {
@@ -338,7 +345,7 @@ void LotroManager::extractSingleFile(QString output_filename, long long file_id)
     }
 }
 
-void LotroManager::extractSingleFileToDatabase(QString database_path, long long file_id) {
+void LotroDatManager::extractSingleFileToDatabase(QString database_path, long long file_id) {
     emit processStarted("extractSingleFileToDatabase", {database_path, file_id});
     LOTRO_DAT::Database db;
     if (!db.InitDatabase(database_path.toStdString())) {
@@ -357,7 +364,7 @@ void LotroManager::extractSingleFileToDatabase(QString database_path, long long
     }
 }
 
-void LotroManager::extractGrouppedFiles(QString output_foldername, LOTRO_DAT::FILE_TYPE type) {
+void LotroDatManager::extractGrouppedFiles(QString output_foldername, LOTRO_DAT::FILE_TYPE type) {
     emit processStarted("extractGrouppedFiles", {output_foldername, type});
     auto extractfile_op = file.GetExporter().ExtractAllFilesByType(type, output_foldername.toStdString());
     if (extractfile_op.result == LOTRO_DAT::SUCCESS) {
@@ -368,7 +375,7 @@ void LotroManager::extractGrouppedFiles(QString output_foldername, LOTRO_DAT::FI
     }
 }
 
-void LotroManager::extractGrouppedFilesToDatabase(QString database_path, LOTRO_DAT::FILE_TYPE type) {
+void LotroDatManager::extractGrouppedFilesToDatabase(QString database_path, LOTRO_DAT::FILE_TYPE type) {
     emit processStarted(QString("extractGrouppedFilesToDatabase"), {database_path, type});
     LOTRO_DAT::Database db;
     if (!db.InitDatabase(database_path.toStdString())) {
@@ -386,7 +393,7 @@ void LotroManager::extractGrouppedFilesToDatabase(QString database_path, LOTRO_D
     }
 }
 
-void LotroManager::getUnactiveCategories() {
+void LotroDatManager::getUnactiveCategories() {
     emit processStarted("getUnactiveCategories", {});
 
     const std::set<long long>& categories = file.GetLocaleManager().GetInactiveCategories();
@@ -402,7 +409,7 @@ void LotroManager::getUnactiveCategories() {
     emit processFinished("getUnactiveCategories", {"Success"});
 }
 
-void LotroManager::startGame() {
+void LotroDatManager::startGame() {
     emit processStarted("startGame", {});
 
     QStringList args;
@@ -437,17 +444,34 @@ void LotroManager::startGame() {
     }
 }
 
-void LotroManager::getLocaleFileInfo(long long file_id, int locale) {
+void LotroDatManager::getLocaleFileInfo(long long file_id, int locale) {
     emit processStarted("getLocaleFileInfo", {file_id, locale});
 
     auto getfile_op = file.GetLocaleManager().GetLocaleFile(file_id, (LOTRO_DAT::DatLocaleManager::LOCALE)locale);
-    if (!getfile_op.result) {
+
+    // If there's no locale file, but requested locale is original - trying to return file from
+    // FileSystem dictionary
+
+    if (!getfile_op.result && locale != LOTRO_DAT::DatLocaleManager::ORIGINAL) {
         emit caughtError("getLocaleFileInfo", {"Файл не найден!", QString("Не удаётся найти в ресурсах файл с id ") + QString::number(file_id)});
         emit processFinished("getLocaleFileInfo", {"Error"});
         return;
     }
 
-    LOTRO_DAT::SubFile subfile = getfile_op.value;
+    LOTRO_DAT::SubFile subfile;
+    if (getfile_op.result) {
+        subfile = getfile_op.value;
+    } else {
+        auto getdictfile_op = file.GetFileSystem().GetFile(file_id);
+        if (!getdictfile_op.result) {
+            emit caughtError("getLocaleFileInfo", {"Файл не найден!", QString("Не удаётся найти в ресурсах файл с id ") + QString::number(file_id)});
+            emit processFinished("getLocaleFileInfo", {"Error"});
+            return;
+        }
+
+        subfile = *(getdictfile_op.value);
+    }
+
 
     QString result = "Locale file info:\n "
                      "dictionary_offset: " + QString::number(subfile.dictionary_offset()) + "\n"
@@ -465,7 +489,7 @@ void LotroManager::getLocaleFileInfo(long long file_id, int locale) {
     emit processFinished("getLocaleFileInfo", {"Success"});
 }
 
-void LotroManager::getFileInfo(long long file_id) {
+void LotroDatManager::getFileInfo(long long file_id) {
     emit processStarted(QString("getFileInfo"), {file_id});
 
     auto getfile_op = file.GetFileSystem().GetFile(file_id);
@@ -492,7 +516,7 @@ void LotroManager::getFileInfo(long long file_id) {
     emit processFinished("getFileInfo", {"Success"});
 }
 
-void LotroManager::disableCategory(long long category_id)
+void LotroDatManager::disableCategory(long long category_id)
 {
     emit processStarted(QString("disableCategory"), {category_id});
     file.GetLocaleManager().DisableCategory(category_id);
@@ -502,7 +526,7 @@ void LotroManager::disableCategory(long long category_id)
     emit processFinished("disableCategory", {"Success"});
 }
 
-void LotroManager::enableCategory(long long category_id)
+void LotroDatManager::enableCategory(long long category_id)
 {
     emit processStarted(QString("enableCategory"), {category_id});
     file.GetLocaleManager().EnableCategory(category_id);
@@ -512,19 +536,19 @@ void LotroManager::enableCategory(long long category_id)
     emit processFinished("enableCategory", {"Success"});
 }
 
-LOTRO_DAT::DatStatus *LotroManager::getStatusModule()
+LOTRO_DAT::DatStatus *LotroDatManager::getStatusModule()
 {
     return &file.GetStatusModule();
 }
 
-bool LotroManager::initialised() {
+bool LotroDatManager::initialised() {
     return file.Initialized();
 }
 
-int LotroManager::currentLocale() {
+int LotroDatManager::currentLocale() {
     return file.GetLocaleManager().GetCurrentLocale();
 }
 
-bool LotroManager::notPatched() {
+bool LotroDatManager::notPatched() {
     return file.GetStatusModule().CheckIfNotPatched();
 }

src/Legacy-advanced/models/lotromanager.h → src/Legacy-advanced/models/lotrodatmanager.h

@@ -7,12 +7,12 @@
 
 #include <LotroDat/LotroDat.h>
 
-class LotroManager : public QObject
+class LotroDatManager : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit LotroManager(QSettings* app_settings_, QObject *parent = nullptr);
+    explicit LotroDatManager(QSettings* app_settings_, QObject *parent = nullptr);
 
     bool initialised();
 

src/Legacy-advanced/object_script.Legacy-advanced.Debug

@@ -4,7 +4,7 @@ INPUT(
 ./..\..\build\debug\Legacy-advanced\obj\main.o
 ./..\..\build\debug\Legacy-advanced\obj\downloader.o
 ./..\..\build\debug\Legacy-advanced\obj\filesystem.o
-./..\..\build\debug\Legacy-advanced\obj\lotromanager.o
+./..\..\build\debug\Legacy-advanced\obj\lotrodatmanager.o
 ./..\..\build\debug\Legacy-advanced\obj\browsewidget.o
 ./..\..\build\debug\Legacy-advanced\obj\exportwidget.o
 ./..\..\build\debug\Legacy-advanced\obj\importwidget.o
@@ -16,7 +16,7 @@ INPUT(
 ./..\..\build\debug\Legacy-advanced\obj\legacy-advanced_plugin_import.o
 ./..\..\build\debug\Legacy-advanced\obj\moc_downloader.o
 ./..\..\build\debug\Legacy-advanced\obj\moc_filesystem.o
-./..\..\build\debug\Legacy-advanced\obj\moc_lotromanager.o
+./..\..\build\debug\Legacy-advanced\obj\moc_lotrodatmanager.o
 ./..\..\build\debug\Legacy-advanced\obj\moc_browsewidget.o
 ./..\..\build\debug\Legacy-advanced\obj\moc_exportwidget.o
 ./..\..\build\debug\Legacy-advanced\obj\moc_importwidget.o

src/Legacy-advanced/object_script.Legacy-advanced.Release

@@ -2,7 +2,7 @@ INPUT(
 ./..\..\build\release\Legacy-advanced\obj\main.o
 ./..\..\build\release\Legacy-advanced\obj\downloader.o
 ./..\..\build\release\Legacy-advanced\obj\filesystem.o
-./..\..\build\release\Legacy-advanced\obj\lotromanager.o
+./..\..\build\release\Legacy-advanced\obj\lotrodatmanager.o
 ./..\..\build\release\Legacy-advanced\obj\browsewidget.o
 ./..\..\build\release\Legacy-advanced\obj\exportwidget.o
 ./..\..\build\release\Legacy-advanced\obj\importwidget.o
@@ -14,7 +14,7 @@ INPUT(
 ./..\..\build\release\Legacy-advanced\obj\legacy-advanced_plugin_import.o
 ./..\..\build\release\Legacy-advanced\obj\moc_downloader.o
 ./..\..\build\release\Legacy-advanced\obj\moc_filesystem.o
-./..\..\build\release\Legacy-advanced\obj\moc_lotromanager.o
+./..\..\build\release\Legacy-advanced\obj\moc_lotrodatmanager.o
 ./..\..\build\release\Legacy-advanced\obj\moc_browsewidget.o
 ./..\..\build\release\Legacy-advanced\obj\moc_exportwidget.o
 ./..\..\build\release\Legacy-advanced\obj\moc_importwidget.o

src/Legacy-advanced/widgets/browsewidget.cpp

@@ -1,16 +1,16 @@
 #include "browsewidget.h"
 #include "ui_browsewidget.h"
-#include "models/lotromanager.h"
+#include "models/lotrodatmanager.h"
 #include <QMessageBox>
 
-BrowseWidget::BrowseWidget(LotroManager* mgr, QSettings* settings, QWidget *parent) :
+BrowseWidget::BrowseWidget(LotroDatManager* mgr, QSettings* settings, QWidget *parent) :
     QWidget(parent), lotro_manager(mgr), settings(settings),
     ui(new Ui::BrowseWidget)
 {
     ui->setupUi(this);
     //void localeFileInfoReceived(QString);
-    connect(lotro_manager, &LotroManager::localeFileContentsReceived, this, &BrowseWidget::onLotroLocaleFileContentsReceived);
-    connect(lotro_manager, &LotroManager::localeFileInfoReceived, this, &BrowseWidget::onLotroLocaleFileInfoReceived);
+    connect(lotro_manager, &LotroDatManager::localeFileContentsReceived, this, &BrowseWidget::onLotroLocaleFileContentsReceived);
+    connect(lotro_manager, &LotroDatManager::localeFileInfoReceived, this, &BrowseWidget::onLotroLocaleFileInfoReceived);
     resize(parent->size());
 }
 

src/Legacy-advanced/widgets/browsewidget.h

@@ -3,7 +3,7 @@
 
 #include <QWidget>
 #include <QSettings>
-#include <models/lotromanager.h>
+#include <models/lotrodatmanager.h>
 
 namespace Ui {
 class BrowseWidget;
@@ -14,7 +14,7 @@ class BrowseWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit BrowseWidget(LotroManager* mgr, QSettings* settings, QWidget *parent = 0);
+    explicit BrowseWidget(LotroDatManager* mgr, QSettings* settings, QWidget *parent = 0);
     ~BrowseWidget();
 
 private slots:
@@ -25,7 +25,7 @@ private slots:
     void onLotroLocaleFileInfoReceived(int, QString);
 
 private:
-    LotroManager* lotro_manager;
+    LotroDatManager* lotro_manager;
     QSettings* settings;
     Ui::BrowseWidget *ui;
 };

src/Legacy-advanced/widgets/exportwidget.cpp

@@ -1,11 +1,11 @@
 #include "exportwidget.h"
 #include "ui_exportwidget.h"
-#include "models/lotromanager.h"
+#include "models/lotrodatmanager.h"
 
 #include <QFileDialog>
 #include <QDebug>
 
-ExportWidget::ExportWidget(LotroManager* mgr, QSettings* settings, QWidget *parent) :
+ExportWidget::ExportWidget(LotroDatManager* mgr, QSettings* settings, QWidget *parent) :
     QWidget(parent), lotro_manager(mgr), settings(settings),
     ui(new Ui::ExportWidget)
 {
@@ -20,8 +20,8 @@ ExportWidget::~ExportWidget()
 
 void ExportWidget::addConnections()
 {
-    connect(lotro_manager, &LotroManager::processStarted, this, &ExportWidget::on_lotromanager_process_started, Qt::BlockingQueuedConnection);
-    connect(lotro_manager, &LotroManager::processFinished, this, &ExportWidget::on_lotromanager_process_finished, Qt::BlockingQueuedConnection);
+    connect(lotro_manager, &LotroDatManager::processStarted, this, &ExportWidget::on_lotromanager_process_started, Qt::BlockingQueuedConnection);
+    connect(lotro_manager, &LotroDatManager::processFinished, this, &ExportWidget::on_lotromanager_process_finished, Qt::BlockingQueuedConnection);
 }
 
 void ExportWidget::on_lotromanager_process_started(QString, QVector<QVariant>)

src/Legacy-advanced/widgets/exportwidget.h

@@ -8,14 +8,14 @@ namespace Ui {
 class ExportWidget;
 }
 
-class LotroManager;
+class LotroDatManager;
 
 class ExportWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit ExportWidget(LotroManager* mgr, QSettings* settings, QWidget *parent = 0);
+    explicit ExportWidget(LotroDatManager* mgr, QSettings* settings, QWidget *parent = 0);
     ~ExportWidget();
 
 private:
@@ -33,7 +33,7 @@ private slots:
     void on_extract_button_common_clicked();
 
 private:
-    LotroManager* lotro_manager;
+    LotroDatManager* lotro_manager;
     QSettings* settings;
     Ui::ExportWidget *ui;
 

src/Legacy-advanced/widgets/exportwidget.ui

@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>630</width>
-    <height>561</height>
+    <width>811</width>
+    <height>620</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+   <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -25,6 +25,9 @@
 }</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QWidget" name="info_widget" native="true">
      <property name="sizePolicy">
@@ -54,7 +57,7 @@
          </font>
         </property>
         <property name="mouseTracking">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="styleSheet">
          <string notr="true"/>
@@ -136,6 +139,22 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QRadioButton" name="filesbytype_radio_common">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Всех файлов заданного типа</string>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="1">
        <widget class="QWidget" name="widget_13" native="true">
         <layout class="QHBoxLayout" name="horizontalLayout_6">
@@ -190,22 +209,6 @@
         </layout>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QRadioButton" name="filesbytype_radio_common">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Всех файлов заданного типа</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="1">
        <widget class="QWidget" name="widget_14" native="true">
         <layout class="QGridLayout" name="gridLayout_11">
@@ -221,14 +224,14 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <item row="1" column="1">
-          <widget class="QCheckBox" name="filetype_jpg_common">
+         <item row="1" column="2">
+          <widget class="QCheckBox" name="filetype_ogg_common">
            <property name="text">
-            <string>JPG</string>
+            <string>OGG</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="1">
+         <item row="3" column="1">
           <widget class="QCheckBox" name="filetype_dds_common">
            <property name="text">
             <string>DDS</string>
@@ -248,14 +251,28 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="1">
-          <widget class="QCheckBox" name="filetype_ogg_common">
+         <item row="1" column="1">
+          <widget class="QCheckBox" name="filetype_jpg_common">
            <property name="text">
-            <string>OGG</string>
+            <string>JPG</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2">
+          <widget class="QCheckBox" name="filetype_wav_common">
+           <property name="text">
+            <string>WAV</string>
            </property>
           </widget>
          </item>
-         <item row="0" column="3" rowspan="7">
+         <item row="0" column="1">
+          <widget class="QCheckBox" name="filetype_txt_common">
+           <property name="text">
+            <string>TXT</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="5" rowspan="8">
           <spacer name="horizontalSpacer_10">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -268,28 +285,14 @@
            </property>
           </spacer>
          </item>
-         <item row="0" column="1">
-          <widget class="QCheckBox" name="filetype_txt_common">
-           <property name="text">
-            <string>TXT</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="2">
-          <widget class="QCheckBox" name="filetype_wav_common">
-           <property name="text">
-            <string>WAV</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="2">
+         <item row="0" column="3">
           <widget class="QCheckBox" name="filetype_fontbin_common">
            <property name="text">
             <string>FONTBIN</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="2">
+         <item row="1" column="3">
           <widget class="QCheckBox" name="filetype_unknown_common">
            <property name="text">
             <string>UNKNOWN</string>
@@ -326,14 +329,59 @@
       </item>
       <item>
        <widget class="QPushButton" name="extract_button_common">
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>60</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>150</width>
+          <height>60</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">QPushButton#extract_button_common { 
+	color: white;
+	font: 14px &quot;TRAJAN PRO 3&quot;;
+	font-weight: bold;
+	border-image: url(:/buttons/button_big_normal.png);
+}
+
+QPushButton#extract_button_common:hover {
+	color: white;
+	border-image: url(:/buttons/button_big_over.png);
+}
+
+QPushButton#extract_button_common:pressed {
+	color: white;
+	border-image: url(:/buttons/button_big_pressed.png);
+}
+
+</string>
+        </property>
         <property name="text">
-         <string>Экспортировать!</string>
+         <string>  Экспорт  </string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>1</width>
+       <height>1</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>

src/Legacy-advanced/widgets/importwidget.cpp

@@ -1,18 +1,18 @@
 #include "importwidget.h"
 #include "ui_importwidget.h"
-#include "models/lotromanager.h"
+#include "models/lotrodatmanager.h"
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QTextEdit>
 #include <QDebug>
 
-ImportWidget::ImportWidget(LotroManager* mgr, QSettings* settings, QWidget *parent) :
+ImportWidget::ImportWidget(LotroDatManager* mgr, QSettings* settings, QWidget *parent) :
     QWidget(parent), lotro_manager(mgr), settings(settings),
     ui(new Ui::ImportWidget)
 {
     ui->setupUi(this);
     ui->database_import_radiobutton_common->click();
-    connect(lotro_manager, &LotroManager::textFragmentReceived, this, &ImportWidget::onTextFragmentContentsReceived, Qt::QueuedConnection);
+    connect(lotro_manager, &LotroDatManager::textFragmentReceived, this, &ImportWidget::onTextFragmentContentsReceived, Qt::QueuedConnection);
 }
 
 ImportWidget::~ImportWidget()

src/Legacy-advanced/widgets/importwidget.h

@@ -8,14 +8,14 @@ namespace Ui {
 class ImportWidget;
 }
 
-class LotroManager;
+class LotroDatManager;
 
 class ImportWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit ImportWidget(LotroManager* mgr, QSettings* settings, QWidget *parent = 0);
+    explicit ImportWidget(LotroDatManager* mgr, QSettings* settings, QWidget *parent = 0);
     ~ImportWidget();
 
     void hideAllImportOptions();
@@ -38,7 +38,7 @@ private slots:
     void on_textfragment_import_common_clicked();
 
 private:
-    LotroManager* lotro_manager;
+    LotroDatManager* lotro_manager;
     QSettings* settings;
     Ui::ImportWidget* ui;
 };

src/Legacy-advanced/widgets/importwidget.ui

@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1037</width>
-    <height>985</height>
+    <width>952</width>
+    <height>1261</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -18,11 +24,11 @@
 	color: white;
 }</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <item>
     <widget class="QWidget" name="import_widget" native="true">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+      <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -46,10 +52,10 @@
       <property name="spacing">
        <number>0</number>
       </property>
-      <item row="1" column="1">
-       <widget class="QWidget" name="file_import_widget" native="true">
+      <item row="0" column="1">
+       <widget class="QWidget" name="database_import_widget" native="true">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -63,12 +69,9 @@
         <property name="styleSheet">
          <string notr="true"/>
         </property>
-        <layout class="QGridLayout" name="gridLayout_2">
-         <property name="verticalSpacing">
-          <number>0</number>
-         </property>
-         <item row="0" column="0" colspan="2">
-          <widget class="QLabel" name="info_common">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="QLabel" name="info_common_4">
            <property name="font">
             <font>
              <family>Trajan Pro 3</family>
@@ -78,7 +81,7 @@
             <bool>true</bool>
            </property>
            <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Импортируйте в игру отдельные файлы данных, заменяя ими текущие версии &lt;span style=&quot; color:#ff7700;&quot;&gt;(требуется указание ID файла)&lt;/span&gt;&lt;/p&gt;&lt;p&gt;О формате файлов, используемых в игре можно узнать в гайде на сайте русификации.&lt;br/&gt;&lt;br/&gt;&lt;span style=&quot; font-weight:600; color:#ffff00;&quot;&gt;Внимание!&lt;/span&gt;&lt;br/&gt;После установки файлов версия данных автоматически сменится на &amp;quot;русифицированную&amp;quot;!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Импортируйте в игру ресурсы из заранее подготовенной базы данных Наследия &lt;/p&gt;&lt;p&gt;О формате базы данных Наследия можно узнать в гайде на сайте русификации.&lt;br/&gt;&lt;br/&gt;&lt;span style=&quot; font-weight:600; color:#ffff00;&quot;&gt;Внимание!&lt;/span&gt;&lt;br/&gt;После установки файлов версия данных автоматически сменится на &amp;quot;русифицированную&amp;quot;!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="textFormat">
             <enum>Qt::RichText</enum>
@@ -91,6 +94,88 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QWidget" name="apply_widget_3" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout_7">
+            <item>
+             <spacer name="horizontalSpacer_8">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>554</width>
+                <height>14</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QPushButton" name="database_import_button_common">
+              <property name="minimumSize">
+               <size>
+                <width>150</width>
+                <height>60</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>150</width>
+                <height>60</height>
+               </size>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">QPushButton#database_import_button_common { 
+	color: white;
+	font: 14px &quot;TRAJAN PRO 3&quot;;
+	font-weight: bold;
+	border-image: url(:/buttons/button_big_normal.png);
+}
+
+QPushButton#database_import_button_common:hover {
+	color: white;
+	border-image: url(:/buttons/button_big_over.png);
+}
+
+QPushButton#database_import_button_common:pressed {
+	color: white;
+	border-image: url(:/buttons/button_big_pressed.png);
+}
+
+</string>
+              </property>
+              <property name="text">
+               <string>Импорт</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QWidget" name="file_import_widget" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_2">
+         <property name="verticalSpacing">
+          <number>0</number>
+         </property>
          <item row="1" column="0" colspan="2">
           <widget class="QWidget" name="widget" native="true">
            <property name="minimumSize">
@@ -163,31 +248,87 @@
             </item>
             <item>
              <widget class="QPushButton" name="file_import_button_common">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>150</width>
+                <height>60</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>150</width>
+                <height>60</height>
+               </size>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">QPushButton#file_import_button_common { 
+	color: white;
+	font: 14px &quot;TRAJAN PRO 3&quot;;
+	font-weight: bold;
+	border-image: url(:/buttons/button_big_normal.png);
+}
+
+QPushButton#file_import_button_common:hover {
+	color: white;
+	border-image: url(:/buttons/button_big_over.png);
+}
+
+QPushButton#file_import_button_common:pressed {
+	color: white;
+	border-image: url(:/buttons/button_big_pressed.png);
+}
+
+</string>
+              </property>
               <property name="text">
-               <string>Импортировать</string>
+               <string>Импорт</string>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
+         <item row="0" column="0" colspan="2">
+          <widget class="QLabel" name="info_common">
+           <property name="font">
+            <font>
+             <family>Trajan Pro 3</family>
+            </font>
+           </property>
+           <property name="mouseTracking">
+            <bool>true</bool>
+           </property>
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Импортируйте в игру отдельные файлы данных, заменяя ими текущие версии &lt;span style=&quot; color:#ff7700;&quot;&gt;(требуется указание ID файла)&lt;/span&gt;&lt;/p&gt;&lt;p&gt;О формате файлов, используемых в игре можно узнать в гайде на сайте русификации.&lt;br/&gt;&lt;br/&gt;&lt;span style=&quot; font-weight:600; color:#ffff00;&quot;&gt;Внимание!&lt;/span&gt;&lt;br/&gt;После установки файлов версия данных автоматически сменится на &amp;quot;русифицированную&amp;quot;!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::RichText</enum>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+           <property name="openExternalLinks">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QWidget" name="textfragment_import_widget" native="true">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>100</height>
-         </size>
-        </property>
         <property name="styleSheet">
          <string notr="true"/>
         </property>
@@ -206,7 +347,7 @@
             </font>
            </property>
            <property name="mouseTracking">
-            <bool>false</bool>
+            <bool>true</bool>
            </property>
            <property name="text">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Используйте форму для быстрой замены текстового фрагмента в игре. Чтобы получить текущие данные введите id файла и id фрагмента и нажмите кнопку &amp;quot;Найти&amp;quot;&lt;/p&gt;&lt;p&gt;О формате текстовых фрагментов можно узнать в соответствующем гайде на сайте русификации.&lt;br/&gt;&lt;br/&gt;&lt;span style=&quot; font-weight:600; color:#ffff00;&quot;&gt;Внимание!&lt;/span&gt;&lt;br/&gt;После установки файлов версия данных автоматически сменится на &amp;quot;русифицированную&amp;quot;!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -261,6 +402,9 @@
             </item>
             <item>
              <widget class="QPushButton" name="get_file_fragments_button_common">
+              <property name="styleSheet">
+               <string notr="true"/>
+              </property>
               <property name="text">
                <string>Найти</string>
               </property>
@@ -377,8 +521,40 @@ p, li { white-space: pre-wrap; }
             </item>
             <item>
              <widget class="QPushButton" name="textfragment_import_common">
+              <property name="minimumSize">
+               <size>
+                <width>150</width>
+                <height>60</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>150</width>
+                <height>60</height>
+               </size>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">QPushButton#textfragment_import_common { 
+	color: white;
+	font: 14px &quot;TRAJAN PRO 3&quot;;
+	font-weight: bold;
+	border-image: url(:/buttons/button_big_normal.png);
+}
+
+QPushButton#textfragment_import_common:hover {
+	color: white;
+	border-image: url(:/buttons/button_big_over.png);
+}
+
+QPushButton#textfragment_import_common:pressed {
+	color: white;
+	border-image: url(:/buttons/button_big_pressed.png);
+}
+
+</string>
+              </property>
               <property name="text">
-               <string>Импортировать</string>
+               <string>Импорт</string>
               </property>
              </widget>
             </item>
@@ -388,97 +564,27 @@ p, li { white-space: pre-wrap; }
         </layout>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QWidget" name="database_import_widget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+      <item row="3" column="1">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
         </property>
-        <property name="minimumSize">
+        <property name="sizeHint" stdset="0">
          <size>
-          <width>0</width>
-          <height>0</height>
+          <width>20</width>
+          <height>40</height>
          </size>
         </property>
-        <property name="styleSheet">
-         <string notr="true"/>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <item>
-          <widget class="QLabel" name="info_common_4">
-           <property name="font">
-            <font>
-             <family>Trajan Pro 3</family>
-            </font>
-           </property>
-           <property name="mouseTracking">
-            <bool>false</bool>
-           </property>
-           <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Импортируйте в игру ресурсы из заранее подготовенной базы данных Наследия &lt;/p&gt;&lt;p&gt;О формате базы данных Наследия можно узнать в гайде на сайте русификации.&lt;br/&gt;&lt;br/&gt;&lt;span style=&quot; font-weight:600; color:#ffff00;&quot;&gt;Внимание!&lt;/span&gt;&lt;br/&gt;После установки файлов версия данных автоматически сменится на &amp;quot;русифицированную&amp;quot;!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="textFormat">
-            <enum>Qt::RichText</enum>
-           </property>
-           <property name="wordWrap">
-            <bool>true</bool>
-           </property>
-           <property name="openExternalLinks">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="apply_widget_3" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_7">
-            <item>
-             <spacer name="horizontalSpacer_8">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>554</width>
-                <height>14</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QPushButton" name="database_import_button_common">
-              <property name="text">
-               <string>Импортировать</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
+       </spacer>
       </item>
-      <item row="0" column="0" rowspan="3">
+      <item row="0" column="0" rowspan="4">
        <widget class="QWidget" name="radio_import_widget" native="true">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>50</height>
-         </size>
-        </property>
         <layout class="QVBoxLayout" name="verticalLayout">
          <item>
           <widget class="QRadioButton" name="database_import_radiobutton_common">
@@ -523,19 +629,6 @@ p, li { white-space: pre-wrap; }
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <resources/>

src/Legacy-advanced/widgets/lotroprogresswidget.cpp

@@ -2,9 +2,9 @@
 #include "ui_lotroprogresswidget.h"
 
 #include <QTextCodec>
-#include "models/lotromanager.h"
+#include "models/lotrodatmanager.h"
 
-LotroProgressWidget::LotroProgressWidget(LotroManager* mgr, QSettings* settings, QWidget *parent) :
+LotroProgressWidget::LotroProgressWidget(LotroDatManager* mgr, QSettings* settings, QWidget *parent) :
     QWidget(parent), lotro_manager(mgr), settings(settings), ui_update_timer(new QTimer(this)),
     ui(new Ui::LotroProgressWidget)
 {

src/Legacy-advanced/widgets/lotroprogresswidget.h

@@ -5,7 +5,7 @@
 #include <QSettings>
 #include <QTimer>
 
-class LotroManager;
+class LotroDatManager;
 
 namespace Ui {
 class LotroProgressWidget;
@@ -16,14 +16,14 @@ class LotroProgressWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit LotroProgressWidget(LotroManager* mgr, QSettings* settings, QWidget *parent = 0);
+    explicit LotroProgressWidget(LotroDatManager* mgr, QSettings* settings, QWidget *parent = 0);
     ~LotroProgressWidget();
 public slots:
     void updateUI();
 
 private:
     Ui::LotroProgressWidget *ui;
-    LotroManager* lotro_manager;
+    LotroDatManager* lotro_manager;
     QSettings* settings;
     QTimer* ui_update_timer;
 };

src/Legacy-advanced/widgets/mainwindow.cpp

@@ -1,6 +1,6 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include "models/lotromanager.h"
+#include "models/lotrodatmanager.h"
 
 #include <QBitmap>
 #include <QPainter>
@@ -24,7 +24,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     qDebug() << "Creating lotro manager instance & thread";
     lotro_mgr_thread = new QThread();
-    lotro_manager = new LotroManager(settings);
+    lotro_manager = new LotroDatManager(settings);
     QObject::connect(lotro_mgr_thread, &QThread::finished, lotro_manager, &QObject::deleteLater, Qt::QueuedConnection);
     lotro_manager->moveToThread(lotro_mgr_thread);
     lotro_mgr_thread->start();
@@ -245,9 +245,9 @@ void MainWindow::onLotroManagerErrorOccured(QString, QVector<QVariant> info) {
 
 void MainWindow::makeConnections()
 {
-    connect(lotro_manager, &LotroManager::processStarted, this, &MainWindow::onLotroManagerStarted, Qt::QueuedConnection);
-    connect(lotro_manager, &LotroManager::processFinished, this, &MainWindow::onLotroManagerFinished, Qt::QueuedConnection);
-    connect(lotro_manager, &LotroManager::caughtError, this, &MainWindow::onLotroManagerErrorOccured, Qt::QueuedConnection);
+    connect(lotro_manager, &LotroDatManager::processStarted, this, &MainWindow::onLotroManagerStarted, Qt::QueuedConnection);
+    connect(lotro_manager, &LotroDatManager::processFinished, this, &MainWindow::onLotroManagerFinished, Qt::QueuedConnection);
+    connect(lotro_manager, &LotroDatManager::caughtError, this, &MainWindow::onLotroManagerErrorOccured, Qt::QueuedConnection);
 }
 
 void MainWindow::setupMenuHoverWidget()

src/Legacy-advanced/widgets/mainwindow.h

@@ -18,7 +18,7 @@ class MainWindow;
 }
 
 class MenuEntry;
-class LotroManager;
+class LotroDatManager;
 
 class MainWindow : public QMainWindow
 {
@@ -77,7 +77,7 @@ private:
 private:
     Ui::MainWindow *ui;
 
-    LotroManager* lotro_manager;
+    LotroDatManager* lotro_manager;
     QThread *lotro_mgr_thread;
 
     ExportWidget *export_widget;

src/Legacy-advanced/widgets/managewidget.cpp

@@ -1,18 +1,18 @@
 #include "managewidget.h"
 #include "ui_managewidget.h"
-#include "models/lotromanager.h"
+#include "models/lotrodatmanager.h"
 #include "models/filesystem.h"
 #include "widgets/mainwindow.h"
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QDebug>
 
-ManageWidget::ManageWidget(LotroManager* mgr, QSettings* settings, QWidget *parent) :
+ManageWidget::ManageWidget(LotroDatManager* mgr, QSettings* settings, QWidget *parent) :
     QWidget(parent), lotro_manager(mgr), settings(settings), ui(new Ui::ManageWidget)
 {
     ui->setupUi(this);
-    connect(lotro_manager, &LotroManager::processFinished, this, &ManageWidget::onLotroManagerProcessFinished, Qt::QueuedConnection);
-    connect(lotro_manager, &LotroManager::unactiveCategoriesReceived, this, &ManageWidget::onLotroManagerInactiveCateroiesListUpdated);
+    connect(lotro_manager, &LotroDatManager::processFinished, this, &ManageWidget::onLotroManagerProcessFinished, Qt::QueuedConnection);
+    connect(lotro_manager, &LotroDatManager::unactiveCategoriesReceived, this, &ManageWidget::onLotroManagerInactiveCateroiesListUpdated);
 }
 
 ManageWidget::~ManageWidget()

src/Legacy-advanced/widgets/managewidget.h

@@ -9,14 +9,14 @@ namespace Ui {
 class ManageWidget;
 }
 
-class LotroManager;
+class LotroDatManager;
 
 class ManageWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit ManageWidget(LotroManager* mgr, QSettings* settings, QWidget *parent = 0);
+    explicit ManageWidget(LotroDatManager* mgr, QSettings* settings, QWidget *parent = 0);
     ~ManageWidget();
 
 signals:
@@ -46,7 +46,7 @@ private slots:
     void on_deactivate_category_button_clicked();
 
 private:
-    LotroManager* lotro_manager;
+    LotroDatManager* lotro_manager;
     QSettings* settings;
     Ui::ManageWidget *ui;
 

src/Legacy-advanced/widgets/messagedialog.cpp

@@ -3,7 +3,7 @@
 #include <QPixmap>
 #include <QBitmap>
 #include <QMouseEvent>
-#include "models/lotromanager.h"
+#include "models/lotrodatmanager.h"
 #include <QTextCodec>
 using namespace LOTRO_DAT;