torstenandCopilot
7173785915
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>
78 lines
2.0 KiB
C++
78 lines
2.0 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Show the current version
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#include "zwmsui_version.h"
|
|
|
|
#include "ui_zwmsui_versionview.h"
|
|
|
|
#ifndef LTS_VERSION_MAJOR
|
|
#define LTS_VERSION_MAJOR "undefined"
|
|
#endif
|
|
#ifndef LTS_VERSION_MINOR
|
|
#define LTS_VERSION_MINOR "undefined"
|
|
#endif
|
|
#ifndef LTS_VERSION_PATCH
|
|
#define LTS_VERSION_PATCH "undefined"
|
|
#endif
|
|
#ifndef LTS_VERSION_DATE
|
|
#define LTS_VERSION_DATE "undefined"
|
|
#endif
|
|
#ifndef JENKINS_BUILD_NUMBER
|
|
#define JENKINS_BUILD_NUMBER "unknown"
|
|
#endif
|
|
static const char ver_major[] = LTS_VERSION_MAJOR;
|
|
static const char ver_minor[] = LTS_VERSION_MINOR;
|
|
static const char ver_patch[] = LTS_VERSION_PATCH;
|
|
static const char ver_date[] = LTS_VERSION_DATE;
|
|
static const char ver_jenkins[] = JENKINS_BUILD_NUMBER;
|
|
|
|
VersionView::VersionView(NGL::Settings *settings, const QString &label, QWidget *parent)
|
|
: NGLDialog(parent)
|
|
, m_ui(new Ui::VersionView)
|
|
, m_settings(settings)
|
|
, m_label(label)
|
|
, m_logger(DdsView::getLogger("VersionView"))
|
|
{
|
|
m_ui->setupUi(this);
|
|
|
|
QFont f = font();
|
|
f.setBold(true);
|
|
m_ui->lblVersion->setFont(f);
|
|
m_ui->lblDate->setFont(f);
|
|
fill();
|
|
connect(m_ui->buttonBox, &NGLDialogButtonBox::onClose, this, &VersionView::accept);
|
|
|
|
}
|
|
|
|
VersionView::~VersionView()
|
|
{
|
|
delete m_ui;
|
|
}
|
|
|
|
void VersionView::fill()
|
|
{
|
|
const QString versionString = QStringLiteral("%1.%2-%3 (rev: %4)")
|
|
.arg(QString::fromLatin1(ver_major),
|
|
QString::fromLatin1(ver_minor),
|
|
QString::fromLatin1(ver_jenkins),
|
|
QString::fromLatin1(ver_patch));
|
|
m_ui->lblVersion->setText(versionString);
|
|
m_ui->lblDate->setText(QString::fromLatin1(ver_date));
|
|
|
|
resize(sizeHint());
|
|
}
|
|
|
|
void VersionView::resizeEvent(QResizeEvent *event)
|
|
{
|
|
QDialog::resizeEvent(event);
|
|
|
|
// Background Logo RDE
|
|
QPixmap pm(m_settings->bitmapPath() + QLatin1String("logo_RDE.svg"));
|
|
pm = pm.scaled(m_ui->lbitmap->width() * 0.9, m_ui->lbitmap->height() * 0.9, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
|
m_ui->lbitmap->setPixmap(pm);
|
|
}
|