Session 022: Migrate Lts/Tools (72 submodules) to Qt6
- Copied complete Lts/Tools directory from qt5-before to qt6-after - Updated 32 CMakeLists.txt files (Qt5:: → Qt6::) - Tools subdirectory already included in parent Lts/CMakeLists.txt - All 72 tool submodules now present in qt6-migrated-legatus - Includes: Adler, ArAssets, ConfigX, DBAdministration, DBUpdate, DdsView, InfrastructureManagement, and 67 more tools - C++17 standard (RTI 7.7.0 compatibility maintained) - Tests deferred until final validation phase Migration progress: ✅ Lts/Application (68 files) ✅ Lts/DDS (verified Qt6-ready) ✅ Lts/Plugins (60 submodules, verified) ✅ Lts/Projects (5 submodules, verified) ✅ Lts/Proxies (13 submodules, verified) ✅ Lts/Services (47 submodules, verified) ✅ Lts/Tools (72 submodules, copied + CMake updated) ✅ Lts/Viewer (LtsFileDialog, LtsReportDisplay, SituationMap) 🟡 TetraIF (partial) 🟡 Z (partial: nglwidgets, QtSingleApplication, qsql_informix, WMS_Interface)
This commit is contained in:
1 parent
01dce5fe52
commit
d5c13033e2
1792 files changed
+982018
No files matched your search
@@ -0,0 +1,29 @@
|
||||
#
|
||||
# Application that shows a splash, similar to that of the OpApp, signalizing the user
|
||||
# that the server is starting up (for ABT's local server)
|
||||
#
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
#
|
||||
# Created by Mike Wille, NLE, 2019-06-20
|
||||
#
|
||||
|
||||
SET(Splash_SRCS
|
||||
main.cpp
|
||||
Splash.cpp
|
||||
Splash.h
|
||||
)
|
||||
|
||||
NGL_ADD_EXECUTABLE(WS Splash ${Splash_SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(Splash
|
||||
Qt6::Widgets
|
||||
LtsPluginManager
|
||||
LtsPluginLoader
|
||||
LtsWidgets # Splash
|
||||
nglapplication
|
||||
NGLLogger
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(Splash)
|
||||
@@ -0,0 +1,35 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Splash Manager
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*
|
||||
* Created by Mike Wille, NLE, 2019-06-21
|
||||
*/
|
||||
|
||||
#include "Splash.h"
|
||||
|
||||
#include <LtsWidgets/lts_splash.h>
|
||||
|
||||
#include <QApplication>
|
||||
|
||||
|
||||
Splash::Splash(const QString &lang)
|
||||
: QObject(nullptr)
|
||||
{
|
||||
LtsWidgets::Splash::getInstance()->show();
|
||||
|
||||
QString message(QStringLiteral("Starting local server ..."));
|
||||
|
||||
if (lang == QStringLiteral("de_DE"))
|
||||
message = QStringLiteral("Lokaler Server wird gestartet ...");
|
||||
|
||||
LtsWidgets::Splash::getInstance()->setMessage(message);
|
||||
}
|
||||
|
||||
|
||||
Splash::~Splash()
|
||||
{
|
||||
LtsWidgets::Splash::getInstance()->done();
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Splash Manager
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*
|
||||
* Created by Mike Wille, NLE, 2019-06-21
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
class Splash : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Splash(const QString &lang);
|
||||
~Splash();
|
||||
|
||||
private:
|
||||
|
||||
};
|
||||
@@ -0,0 +1,67 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Splash Application
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*
|
||||
* Created by Mike Wille, NLE, 2019-06-21
|
||||
*/
|
||||
|
||||
#include "Splash.h"
|
||||
|
||||
#include <LtsPluginManager/lts_plugin_manager.h>
|
||||
#include <LtsPluginManager/lts_plugin_loader.h>
|
||||
#include <nglapplication/nglapplication.h>
|
||||
#include <nglapplication/nglloggerhandler.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
NGLApplication app(argc, argv);
|
||||
app.createLogger("Splash");
|
||||
//QNetworkProxy::setApplicationProxy(QNetworkProxy());
|
||||
|
||||
QStringList args(QApplication::arguments());
|
||||
QStringList langs({ QStringLiteral("en_GB"), QStringLiteral("en_US"), QStringLiteral("de_DE") });
|
||||
|
||||
if (args.count() < 3)
|
||||
{
|
||||
qWarning() << "usage:" << QApplication::arguments().at(0) << "<branding> <language "<<langs<<">]";
|
||||
return -1;
|
||||
}
|
||||
|
||||
const QString &lang = args.at(2);
|
||||
if (!args.contains(lang))
|
||||
{
|
||||
qWarning() << "unknown language iso code - available iso codes:" << langs;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
// Load Plugins
|
||||
LtsPluginManager::LtsPluginLoader *pluginLoader = LtsPluginManager::LtsPluginLoader::getInstance();
|
||||
|
||||
QString projectPluginName = QApplication::arguments().at(1);
|
||||
|
||||
if (projectPluginName.isEmpty())
|
||||
{
|
||||
qWarning() << "No Project Plugin Iid specified - abort.";
|
||||
return -1;
|
||||
}
|
||||
|
||||
// load project plugin
|
||||
if (!pluginLoader->loadPlugins(LtsPluginManager::PluginType::PROJECT, nullptr, {projectPluginName}))
|
||||
{
|
||||
qWarning() << "Error loading Project Plugin - abort.";
|
||||
return -1;
|
||||
}
|
||||
|
||||
QScopedPointer<Splash> s(new Splash(lang));
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
Reference in new issue
Block a user