Qt6 migration: LtsWidgets API fixes, LtsWebSocket logger init, RTI Docker install
- LtsWidgets: Fixed Qt6 API compatibility issues - QWheelEvent::delta() → angleDelta().y() - QStyleOption::init() → initFrom() - QComboBox activated signal signature change - QTextCodec removal (UTF-8 default in Qt6) - Missing widget includes added - LtsWebSocket: Fixed m_logger reference initialization - Added NGLLoggerBootstrap includes - Proper initialization in constructor initializer lists - CMake: Added BUILD_LTSWEBSOCKET option for temporary exclusion - Docker: RTI Connext permanent installation script added - ci/install-rti-in-docker.sh for persistent RTI setup - Removes need for volume mounting RTI into container - BUILD options: FilterManagement, RTI, Codification, Grantlee, LtsWebSocket can be disabled for partial builds during migration Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
69 files changed
+12765
-14202
No files matched your search
Executable → Regular
+70
-84
@@ -1,137 +1,123 @@
|
||||
|
||||
|
||||
|
||||
#include "lts_background_widget.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QFile>
|
||||
#include <QPaintEvent>
|
||||
#include <QPainter>
|
||||
#include <QDebug>
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#include <QtPlatformHeaders/qwindowswindowfunctions.h>
|
||||
#endif
|
||||
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
|
||||
LtsBackgroundWidget::LtsBackgroundWidget(QWidget *parent)
|
||||
: QDialog(parent)
|
||||
, m_isUltraWide(false)
|
||||
LtsBackgroundWidget::LtsBackgroundWidget(QWidget* parent) : QDialog(parent), m_isUltraWide(false)
|
||||
{
|
||||
setMouseTracking(true);
|
||||
setWindowFlags(windowFlags() | Qt::FramelessWindowHint );
|
||||
setWindowTitle(QStringLiteral("Splash"));
|
||||
setMouseTracking(true);
|
||||
setWindowFlags(windowFlags() | Qt::FramelessWindowHint);
|
||||
setWindowTitle(QStringLiteral("Splash"));
|
||||
|
||||
setBackground();
|
||||
setBackground();
|
||||
}
|
||||
|
||||
|
||||
void LtsBackgroundWidget::setBackground()
|
||||
{
|
||||
static const auto backgroundFiles =
|
||||
{
|
||||
QStringLiteral(":/project/background.png"),
|
||||
QStringLiteral(":/project/background.jpg"),
|
||||
};
|
||||
static const auto backgroundFilesWide =
|
||||
{
|
||||
QStringLiteral(":/project/background_wide.png"),
|
||||
QStringLiteral(":/project/background_wide.jpg"),
|
||||
};
|
||||
static const auto backgroundFiles = {
|
||||
QStringLiteral(":/project/background.png"),
|
||||
QStringLiteral(":/project/background.jpg"),
|
||||
};
|
||||
static const auto backgroundFilesWide = {
|
||||
QStringLiteral(":/project/background_wide.png"),
|
||||
QStringLiteral(":/project/background_wide.jpg"),
|
||||
};
|
||||
|
||||
m_pixmap = QPixmap();
|
||||
for (const QString& f : m_isUltraWide ? backgroundFilesWide : backgroundFiles)
|
||||
{
|
||||
if (!QFile::exists(f))
|
||||
continue;
|
||||
m_pixmap = QPixmap(f);
|
||||
if (m_pixmap.isNull())
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
|
||||
m_pixmap = QPixmap();
|
||||
for (const QString &f : m_isUltraWide ? backgroundFilesWide : backgroundFiles)
|
||||
{
|
||||
if (!QFile::exists(f))
|
||||
continue;
|
||||
m_pixmap = QPixmap(f);
|
||||
if (m_pixmap.isNull())
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
|
||||
if (m_pixmap.isNull())
|
||||
{
|
||||
if (m_isUltraWide)
|
||||
{
|
||||
m_isUltraWide = false;
|
||||
setBackground();
|
||||
if (m_isUltraWide)
|
||||
{
|
||||
m_isUltraWide = false;
|
||||
setBackground();
|
||||
}
|
||||
else
|
||||
{
|
||||
qWarning() << "BackgroundWidget::c_tor: file missing or is not a valid image ':/project/background.png'";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
qWarning() << "BackgroundWidget::c_tor: file missing or is not a valid image ':/project/background.png'";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void LtsBackgroundWidget::setUltraWide(bool set)
|
||||
{
|
||||
if (set == m_isUltraWide)
|
||||
return;
|
||||
if (set == m_isUltraWide)
|
||||
return;
|
||||
|
||||
m_isUltraWide = set;
|
||||
setBackground();
|
||||
update();
|
||||
m_isUltraWide = set;
|
||||
setBackground();
|
||||
update();
|
||||
}
|
||||
|
||||
|
||||
void LtsBackgroundWidget::resizeEvent(QResizeEvent *e)
|
||||
void LtsBackgroundWidget::resizeEvent(QResizeEvent* e)
|
||||
{
|
||||
setUltraWide(width() > 3000);
|
||||
QDialog::resizeEvent(e);
|
||||
setUltraWide(width() > 3000);
|
||||
QDialog::resizeEvent(e);
|
||||
}
|
||||
|
||||
|
||||
void LtsBackgroundWidget::paintEvent(QPaintEvent *e)
|
||||
void LtsBackgroundWidget::paintEvent(QPaintEvent* e)
|
||||
{
|
||||
if (!m_pixmap.isNull())
|
||||
{
|
||||
QPainter painter(this);
|
||||
painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
|
||||
painter.drawPixmap(0, 0, width(), height(), m_pixmap);
|
||||
}
|
||||
QDialog::paintEvent(e);
|
||||
if (!m_pixmap.isNull())
|
||||
{
|
||||
QPainter painter(this);
|
||||
painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
|
||||
painter.drawPixmap(0, 0, width(), height(), m_pixmap);
|
||||
}
|
||||
QDialog::paintEvent(e);
|
||||
}
|
||||
|
||||
|
||||
bool LtsBackgroundWidget::event(QEvent *e)
|
||||
bool LtsBackgroundWidget::event(QEvent* e)
|
||||
{
|
||||
if (e->type() == QEvent::KeyPress ||
|
||||
e->type() == QEvent::MouseButtonPress ||
|
||||
e->type() == QEvent::MouseButtonRelease ||
|
||||
e->type() == QEvent::MouseMove)
|
||||
{
|
||||
|
||||
emit signalOperatorAction();
|
||||
e->ignore();
|
||||
return true;
|
||||
}
|
||||
if (e->type() == QEvent::KeyPress || e->type() == QEvent::MouseButtonPress ||
|
||||
e->type() == QEvent::MouseButtonRelease || e->type() == QEvent::MouseMove)
|
||||
{
|
||||
|
||||
return QDialog::event(e);
|
||||
emit signalOperatorAction();
|
||||
e->ignore();
|
||||
return true;
|
||||
}
|
||||
|
||||
return QDialog::event(e);
|
||||
}
|
||||
|
||||
|
||||
void LtsBackgroundWidget::showFullScreen()
|
||||
{
|
||||
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
winId();
|
||||
QWindowsWindowFunctions::setHasBorderInFullScreen(windowHandle(), true);
|
||||
winId();
|
||||
QWindowsWindowFunctions::setHasBorderInFullScreen(windowHandle(), true);
|
||||
#endif
|
||||
QDialog::showFullScreen();
|
||||
raise();
|
||||
QDialog::showFullScreen();
|
||||
raise();
|
||||
}
|
||||
|
||||
|
||||
void LtsBackgroundWidget::closeEvent(QCloseEvent *e)
|
||||
void LtsBackgroundWidget::closeEvent(QCloseEvent* e)
|
||||
{
|
||||
#ifdef DEVEL
|
||||
deleteLater();
|
||||
deleteLater();
|
||||
#else
|
||||
e->ignore();
|
||||
e->ignore();
|
||||
#endif
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace LtsWidgets
|
||||
Reference in new issue
Block a user