Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes
- Merged 292 changed files from dlbo snapshot - Fixed IDL enum collisions (PortType, PdmEventType) - Fixed Grantlee template for C++11 scoped enums - Fixed CMake VERSION_GREATER syntax - Added missing directories (THP, LtsRestClient, etc.) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
310 files changed
+2823
-740
No files matched your search
@@ -0,0 +1,10 @@
|
||||
add_library(childGammaGui MODULE child_gamma.cpp child_gamma.h)
|
||||
target_link_libraries(childGammaGui PRIVATE Qt5::Widgets)
|
||||
target_include_directories(childGammaGui PRIVATE ${CMAKE_SOURCE_DIR}/interfaces)
|
||||
|
||||
# Plugin in den Laufzeit-Ordner verschieben
|
||||
set_target_properties(childGammaGui PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_OUTPUT_DIR}"
|
||||
RUNTIME_OUTPUT_DIRECTORY "${PLUGIN_OUTPUT_DIR}"
|
||||
)
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
#include "child_gamma.h"
|
||||
#include <QVBoxLayout>
|
||||
|
||||
namespace DLBO
|
||||
{
|
||||
ChildGamma::ChildGamma()
|
||||
{
|
||||
m_widget = new QWidget();
|
||||
QVBoxLayout *layout = new QVBoxLayout(m_widget);
|
||||
m_widget->setStyleSheet(QStringLiteral("border: 1px solid purple; background-color: #faf0ff; margin: 5px;"));
|
||||
|
||||
QLabel *title = new QLabel(QStringLiteral("Kind-Widget 2"));
|
||||
title->setStyleSheet(QStringLiteral("font-weight: bold; color: purple;"));
|
||||
|
||||
m_staticLabel = new QLabel(QStringLiteral("Warte auf Init-Daten..."));
|
||||
m_liveLabel = new QLabel(QStringLiteral("Warte auf Live-Text..."));
|
||||
|
||||
layout->addWidget(title);
|
||||
layout->addWidget(m_staticLabel);
|
||||
layout->addWidget(m_liveLabel);
|
||||
}
|
||||
|
||||
void ChildGamma::setParentData(const QString &data)
|
||||
{
|
||||
if (m_staticLabel)
|
||||
m_staticLabel->setText(QStringLiteral("Init-Wert: %1").arg(data));
|
||||
}
|
||||
|
||||
void ChildGamma::updateLiveData(const QString &text)
|
||||
{
|
||||
if (m_liveLabel)
|
||||
{
|
||||
m_liveLabel->setText(text.isEmpty() ? QStringLiteral("Warte auf Live-Text...") : QStringLiteral("Gamma Live: ") + text);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
#pragma once
|
||||
|
||||
#include "../../interfaces/child_interface.h"
|
||||
#include <QLabel>
|
||||
#include <QObject>
|
||||
|
||||
namespace DLBO
|
||||
{
|
||||
class ChildGamma
|
||||
: public QObject
|
||||
, public ChildInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "gui:3:ChildInterface")
|
||||
Q_INTERFACES(ChildInterface)
|
||||
|
||||
public:
|
||||
ChildGamma();
|
||||
QString childName() const override { return QStringLiteral("GammaChild"); }
|
||||
QString targetParentName() const override { return QStringLiteral("AlphaParent"); }
|
||||
QWidget *widget() override { return m_widget; }
|
||||
|
||||
void setParentData(const QString &data) override;
|
||||
|
||||
public slots:
|
||||
void updateLiveData(const QString &text) override;
|
||||
|
||||
private:
|
||||
QWidget *m_widget;
|
||||
QLabel *m_staticLabel;
|
||||
QLabel *m_liveLabel;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"Keys": ["child_gamma"]
|
||||
}
|
||||
Reference in new issue
Block a user