Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,125 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* TabBar with special stylesheet settings
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "lts_tab_bar.h"
|
||||
|
||||
#include "lts_dialog.h"
|
||||
#include "lts_dialog_helper.h"
|
||||
#include "lts_events.h"
|
||||
#include "lts_tab_widget.h"
|
||||
|
||||
#include <TabBarTabStyle/tab_bar_tab_style.h>
|
||||
#include <QCoreApplication>
|
||||
#include <QMenu>
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
|
||||
LtsTabBar::LtsTabBar(bool isSecondary, QWidget *parent)
|
||||
: QTabBar(parent)
|
||||
, m_secondary(isSecondary)
|
||||
{
|
||||
setDocumentMode(true);
|
||||
setTabsClosable(true);
|
||||
|
||||
connect(this, &LtsTabBar::currentChanged, this, &LtsTabBar::updateCloseButtonColors);
|
||||
|
||||
if (m_secondary)
|
||||
{
|
||||
connect(this, &LtsTabBar::customContextMenuRequested,
|
||||
this, &LtsTabBar::onCustomContextMenuRequested);
|
||||
setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void LtsTabBar::_internal_closeTab() // Do not use.
|
||||
{
|
||||
QObject *object = sender();
|
||||
int tabToClose = -1;
|
||||
|
||||
for (int i = 0; i < count(); i++)
|
||||
{
|
||||
if (tabButton(i, QTabBar::RightSide) == object)
|
||||
{
|
||||
tabToClose = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (tabToClose != -1)
|
||||
emit tabCloseRequested(tabToClose);
|
||||
}
|
||||
|
||||
|
||||
void LtsTabBar::updateCloseButtonColors(int newIndex) // as this does not happen automatically
|
||||
{
|
||||
// tell all buttons if there are selected or not
|
||||
if (newIndex == -1)
|
||||
newIndex = currentIndex(); // TODO: is currentIndex already set when emitting currentChanged ??
|
||||
|
||||
for (int i = 0; i < count(); i++)
|
||||
{
|
||||
QWidget *w = tabButton(i, QTabBar::RightSide);
|
||||
CloseButton *cb = qobject_cast<CloseButton *>(w);
|
||||
|
||||
if (!cb)
|
||||
continue;
|
||||
|
||||
QColor text;
|
||||
|
||||
bool enabled = isTabEnabled(i);
|
||||
bool selected = (i == newIndex);
|
||||
bool secondary = m_secondary;
|
||||
|
||||
if (enabled)
|
||||
{
|
||||
if (selected)
|
||||
text = (secondary) ? Styles::TabBarTabStyle::secondarySelected : Styles::TabBarTabStyle::primarySelected;
|
||||
else
|
||||
text = (secondary) ? Styles::TabBarTabStyle::secondaryNormal : Styles::TabBarTabStyle::primaryNormal;
|
||||
}
|
||||
else
|
||||
text = (secondary) ? Styles::TabBarTabStyle::secondaryDisabled : Styles::TabBarTabStyle::primaryDisabled; // no 'selected' on disabled!
|
||||
|
||||
//qWarning() << "("<<i<<")"<<text<<text.isValid();
|
||||
cb->setFontColor(text);
|
||||
}
|
||||
}
|
||||
|
||||
void LtsTabBar::onCustomContextMenuRequested(const QPoint pos)
|
||||
{
|
||||
if (!m_secondary)
|
||||
return;
|
||||
QMenu m;
|
||||
QAction *a = new QAction(tr("Save as image"));
|
||||
connect(a, &QAction::triggered, this, [this, pos]() { LtsTabBar::onSaveCurrentWidgetAsImage(pos); });
|
||||
m.addAction(a);
|
||||
m.exec(mapToGlobal(pos));
|
||||
}
|
||||
|
||||
void LtsTabBar::onSaveCurrentWidgetAsImage(const QPoint pos)
|
||||
{
|
||||
int curTab = tabAt(pos);
|
||||
if (curTab < 0)
|
||||
curTab = currentIndex();
|
||||
if (curTab < 0)
|
||||
return;
|
||||
LtsTabWidget *tw = qobject_cast<LtsTabWidget*>(parentWidget());
|
||||
QWidget *w = tw ? tw->widget(curTab) : nullptr;
|
||||
if (!w)
|
||||
return;
|
||||
LtsDialogHelper *helper = qobject_cast<LtsDialogHelper*>(w);
|
||||
if (helper)
|
||||
w = helper->getDialog();
|
||||
SaveImageEvent *ev = new SaveImageEvent(w, w->grab());
|
||||
ev->setAccepted(false);
|
||||
QCoreApplication::postEvent(qApp, ev);
|
||||
}
|
||||
|
||||
} // namespace LtsWidgets
|
||||
Reference in new issue
Block a user