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
+76
-103
@@ -1,153 +1,126 @@
|
||||
|
||||
|
||||
|
||||
#include "lts_frameless_dialog.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QRect>
|
||||
#include <QStyle>
|
||||
#include <QSize>
|
||||
#include <QScreen>
|
||||
#include <QScroller>
|
||||
#include <QScrollArea>
|
||||
#include <QDesktopWidget>
|
||||
#include <QScroller>
|
||||
#include <QShowEvent>
|
||||
#include <QSize>
|
||||
#include <QStyle>
|
||||
#include <QTimer>
|
||||
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
LtsFramelessDialog::LtsFramelessDialog(QWidget *parent, const Behaviour &behaviour)
|
||||
: QDialog(parent)
|
||||
LtsFramelessDialog::LtsFramelessDialog(QWidget* parent, const Behaviour& behaviour) : QDialog(parent)
|
||||
{
|
||||
|
||||
|
||||
Qt::WindowFlags wf;
|
||||
|
||||
|
||||
switch (behaviour)
|
||||
{
|
||||
case Behaviour::Modal:
|
||||
Qt::WindowFlags wf;
|
||||
|
||||
switch (behaviour)
|
||||
{
|
||||
case Behaviour::Modal: {
|
||||
|
||||
#ifndef TABLET_MODE
|
||||
setModal(true);
|
||||
wf |= Qt::Dialog;
|
||||
setModal(true);
|
||||
wf |= Qt::Dialog;
|
||||
#else
|
||||
wf |= Qt::Window;
|
||||
wf |= Qt::Window;
|
||||
#endif
|
||||
wf |= Qt::WindowStaysOnTopHint;
|
||||
break;
|
||||
wf |= Qt::WindowStaysOnTopHint;
|
||||
break;
|
||||
}
|
||||
|
||||
case Behaviour::Popup:
|
||||
wf |= Qt::Popup;
|
||||
break;
|
||||
}
|
||||
|
||||
case Behaviour::Popup:
|
||||
wf |= Qt::Popup;
|
||||
break;
|
||||
}
|
||||
setWindowFlags(wf);
|
||||
|
||||
setWindowFlags(wf);
|
||||
|
||||
|
||||
QTimer *t = new QTimer(this);
|
||||
t->setInterval(250);
|
||||
connect(t, &QTimer::timeout,
|
||||
this, [this]()
|
||||
{
|
||||
|
||||
|
||||
|
||||
QSize s = size();
|
||||
setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, s, screenRectFromPoint(QCursor::pos())));
|
||||
});
|
||||
|
||||
QTimer* t = new QTimer(this);
|
||||
t->setInterval(250);
|
||||
connect(t, &QTimer::timeout, this, [this]() {
|
||||
QSize s = size();
|
||||
setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, s, screenRectFromPoint(QCursor::pos())));
|
||||
});
|
||||
}
|
||||
|
||||
LtsFramelessDialog::~LtsFramelessDialog() {}
|
||||
|
||||
LtsFramelessDialog::~LtsFramelessDialog()
|
||||
QRect LtsFramelessDialog::screenRectFromPoint(const QPoint& pos) const
|
||||
{
|
||||
const auto screens = QGuiApplication::screens();
|
||||
for (QScreen* screen : screens)
|
||||
{
|
||||
QRect s = screen->geometry().adjusted(-50, -50, 50, 50);
|
||||
|
||||
bool contains = s.contains(pos);
|
||||
|
||||
if (contains)
|
||||
return screen->geometry();
|
||||
}
|
||||
|
||||
return QRect();
|
||||
}
|
||||
|
||||
|
||||
QRect LtsFramelessDialog::screenRectFromPoint(const QPoint &pos) const
|
||||
void LtsFramelessDialog::showEvent(QShowEvent* event)
|
||||
{
|
||||
const auto screens = QGuiApplication::screens();
|
||||
for (QScreen *screen : screens)
|
||||
{
|
||||
QRect s = screen->geometry().adjusted(-50, -50, 50, 50);
|
||||
|
||||
bool contains = s.contains(pos);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (contains)
|
||||
return screen->geometry();
|
||||
}
|
||||
|
||||
return QRect();
|
||||
}
|
||||
|
||||
|
||||
void LtsFramelessDialog::showEvent(QShowEvent *event)
|
||||
{
|
||||
QDialog::showEvent(event);
|
||||
QTimer::singleShot(0, this, &LtsFramelessDialog::onUpdateGeometry);
|
||||
|
||||
QDialog::showEvent(event);
|
||||
QTimer::singleShot(0, this, &LtsFramelessDialog::onUpdateGeometry);
|
||||
|
||||
#ifdef TABLET_MODE
|
||||
QList<QWidget *> scrollWidgets = findChildren<QWidget *>();
|
||||
QList<QWidget*> scrollWidgets = findChildren<QWidget*>();
|
||||
|
||||
for (auto i = scrollWidgets.begin(); i != scrollWidgets.end(); ++i)
|
||||
{
|
||||
QWidget *widget = *i;
|
||||
for (auto i = scrollWidgets.begin(); i != scrollWidgets.end(); ++i)
|
||||
{
|
||||
QWidget* widget = *i;
|
||||
|
||||
QVariant isConst = widget->property("const");
|
||||
if (isConst.isValid() && isConst.toBool())
|
||||
continue;
|
||||
QVariant isConst = widget->property("const");
|
||||
if (isConst.isValid() && isConst.toBool())
|
||||
continue;
|
||||
|
||||
addTouchScroll(widget);
|
||||
}
|
||||
addTouchScroll(widget);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
void LtsFramelessDialog::addTouchScroll(QWidget *widget)
|
||||
void LtsFramelessDialog::addTouchScroll(QWidget* widget)
|
||||
{
|
||||
if (!widget)
|
||||
return;
|
||||
widget->setAttribute(Qt::WA_AcceptTouchEvents);
|
||||
if (!widget)
|
||||
return;
|
||||
widget->setAttribute(Qt::WA_AcceptTouchEvents);
|
||||
|
||||
QScrollArea *sca = qobject_cast<QScrollArea *>(widget);
|
||||
if (sca)
|
||||
{
|
||||
QScroller::grabGesture(sca->viewport(), QScroller::LeftMouseButtonGesture);
|
||||
return;
|
||||
}
|
||||
QScrollArea* sca = qobject_cast<QScrollArea*>(widget);
|
||||
if (sca)
|
||||
{
|
||||
QScroller::grabGesture(sca->viewport(), QScroller::LeftMouseButtonGesture);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void LtsFramelessDialog::onUpdateGeometry()
|
||||
{
|
||||
QRect r;
|
||||
QWidget *p = parentWidget();
|
||||
QRect r;
|
||||
QWidget* p = parentWidget();
|
||||
|
||||
if (p)
|
||||
{
|
||||
QWidget *window = p->window();
|
||||
QPoint global = window->mapToGlobal(QPoint(0,0));
|
||||
QSize size = window->size();
|
||||
if (p)
|
||||
{
|
||||
QWidget* window = p->window();
|
||||
QPoint global = window->mapToGlobal(QPoint(0, 0));
|
||||
QSize size = window->size();
|
||||
|
||||
r = QRect(global, size);
|
||||
}
|
||||
else
|
||||
{
|
||||
r = QGuiApplication::primaryScreen()->geometry();
|
||||
}
|
||||
r = QRect(global, size);
|
||||
}
|
||||
else
|
||||
{
|
||||
r = QGuiApplication::primaryScreen()->geometry();
|
||||
}
|
||||
|
||||
QSize s = size();
|
||||
setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, s, r));
|
||||
QSize s = size();
|
||||
setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, s, r));
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace LtsWidgets
|
||||
Reference in new issue
Block a user