Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[GUI Apps] Added eCAL and Qt runtime and compile-time versions to the about dialog #1492

Merged
merged 2 commits into from
Mar 27, 2024
Merged

[GUI Apps] Added eCAL and Qt runtime and compile-time versions to the about dialog #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fccd516
[GUI Apps] Added eCAL and Qt runtime and compile-time versions to the…
FlorianReimold Mar 27, 2024
029a7d1
replaced include with old-style include of Qt5
FlorianReimold Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/mon/mon_gui/src/widgets/about_dialog/about_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,23 @@
#include "about_dialog.h"
#include "ecalmon_globals.h"

#include <ecal/ecal_defs.h>
#include <ecal/ecal.h>

#include <QPushButton>
#include <QtGlobal>

AboutDialog::AboutDialog(QWidget *parent)
: QDialog(parent)
{
ui_.setupUi(this);
ui_.version_label->setText("Version: " + QString(EcalmonGlobals::VERSION_STRING));
ui_.ecalversion_label->setText("eCAL " + QString(ECAL_VERSION) + " (" + QString(ECAL_DATE) + ")");

ui_.ecal_runtime_version_string_label->setText(QString(eCAL::GetVersionString()) + " (" + QString(eCAL::GetVersionDateString()) + ")");
ui_.ecal_compiletime_versin_string_label->setText(QString(ECAL_VERSION) + " (" + QString(ECAL_DATE) + ")");
ui_.qt_runtime_version_string_label->setText(QString(qVersion()));
ui_.qt_compiletime_version_string_label->setText(QString(QT_VERSION_STR));

connect(ui_.button_box->button(QDialogButtonBox::StandardButton::Ok), SIGNAL(clicked()), this, SLOT(close()));
}

Expand Down
67 changes: 64 additions & 3 deletions app/mon/mon_gui/src/widgets/about_dialog/about_dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>326</width>
<height>209</height>
<width>304</width>
<height>312</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -62,7 +62,6 @@ Advanced Engineering Department

Developed by Florian Reimold
Based on work by Rex Schilasky, Ileana Zepa

</string>
</property>
<property name="textFormat">
Expand All @@ -73,6 +72,68 @@ Based on work by Rex Schilasky, Ileana Zepa
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="lib_versions_groupbox">
<layout class="QFormLayout" name="lib_vresions_groupbox_layout">
<item row="2" column="0">
<widget class="QLabel" name="qt_runtime_rowlabel">
<property name="text">
<string>Qt runtime version:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="qt_runtime_version_string_label">
<property name="text">
<string>qt-runtime-version</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="ecal_runtime_rowlabel">
<property name="text">
<string>eCAL runtime version:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="ecal_runtime_version_string_label">
<property name="text">
<string>ecal-runtime-version</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="ecal_compiletime_rowlabel">
<property name="text">
<string>eCAL compile-time version:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="ecal_compiletime_versin_string_label">
<property name="text">
<string>ecal-compiletime-version</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="qt_compiletime_rowlabel">
<property name="text">
<string>Qt compile-time version:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="qt_compiletime_version_string_label">
<property name="text">
<string>qt-compiletime-version</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
Expand Down
9 changes: 8 additions & 1 deletion app/play/play_gui/src/widgets/about_dialog/about_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,23 @@
#include "about_dialog.h"
#include "ecal_play_globals.h"

#include <ecal/ecal_defs.h>
#include <ecal/ecal.h>

#include <QPushButton>
#include <QtGlobal>

AboutDialog::AboutDialog(QWidget *parent)
: QDialog(parent)
{
ui_.setupUi(this);
ui_.version_label->setText("Version: " + QString(EcalPlayGlobals::VERSION_STRING));
ui_.ecalversion_label->setText("eCAL " + QString(ECAL_VERSION) + " (" + QString(ECAL_DATE) + ")");

ui_.ecal_runtime_version_string_label->setText(QString(eCAL::GetVersionString()) + " (" + QString(eCAL::GetVersionDateString()) + ")");
ui_.ecal_compiletime_versin_string_label->setText(QString(ECAL_VERSION) + " (" + QString(ECAL_DATE) + ")");
ui_.qt_runtime_version_string_label->setText(QString(qVersion()));
ui_.qt_compiletime_version_string_label->setText(QString(QT_VERSION_STR));

connect(ui_.button_box->button(QDialogButtonBox::StandardButton::Ok), SIGNAL(clicked()), this, SLOT(close()));
}

Expand Down
63 changes: 62 additions & 1 deletion app/play/play_gui/src/widgets/about_dialog/about_dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ Advanced Engineering Department

Developed by Florian Reimold
Based on work by Claudiu Vasilescu, Andreea Popa

</string>
</property>
<property name="textFormat">
Expand All @@ -73,6 +72,68 @@ Based on work by Claudiu Vasilescu, Andreea Popa
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="lib_versions_groupbox">
<layout class="QFormLayout" name="lib_vresions_groupbox_layout">
<item row="2" column="0">
<widget class="QLabel" name="qt_runtime_rowlabel">
<property name="text">
<string>Qt runtime version:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="qt_runtime_version_string_label">
<property name="text">
<string>qt-runtime-version</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="ecal_runtime_rowlabel">
<property name="text">
<string>eCAL runtime version:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="ecal_runtime_version_string_label">
<property name="text">
<string>ecal-runtime-version</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="ecal_compiletime_rowlabel">
<property name="text">
<string>eCAL compile-time version:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="ecal_compiletime_versin_string_label">
<property name="text">
<string>ecal-compiletime-version</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="qt_compiletime_rowlabel">
<property name="text">
<string>Qt compile-time version:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="qt_compiletime_version_string_label">
<property name="text">
<string>qt-compiletime-version</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
Expand Down
9 changes: 8 additions & 1 deletion app/rec/rec_gui/src/widgets/about_dialog/about_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,23 @@
#include "about_dialog.h"
#include "rec_client_core/ecal_rec_defs.h"

#include <ecal/ecal_defs.h>
#include <ecal/ecal.h>

#include <QPushButton>
#include <QtGlobal>

AboutDialog::AboutDialog(QWidget *parent)
: QDialog(parent)
{
ui_.setupUi(this);
ui_.version_label->setText("Version: " + QString(ECAL_REC_VERSION_STRING));
ui_.ecalversion_label->setText("eCAL " + QString(ECAL_VERSION) + " (" + QString(ECAL_DATE) + ")");

ui_.ecal_runtime_version_string_label->setText(QString(eCAL::GetVersionString()) + " (" + QString(eCAL::GetVersionDateString()) + ")");
ui_.ecal_compiletime_versin_string_label->setText(QString(ECAL_VERSION) + " (" + QString(ECAL_DATE) + ")");
ui_.qt_runtime_version_string_label->setText(QString(qVersion()));
ui_.qt_compiletime_version_string_label->setText(QString(QT_VERSION_STR));

connect(ui_.button_box->button(QDialogButtonBox::StandardButton::Ok), SIGNAL(clicked()), this, SLOT(close()));
}

Expand Down
65 changes: 64 additions & 1 deletion app/rec/rec_gui/src/widgets/about_dialog/about_dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
© 2019 Continental AG
Advanced Engineering Department

Developed by Florian Reimold</string>
Developed by Florian Reimold
</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
Expand All @@ -70,6 +71,68 @@ Developed by Florian Reimold</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="lib_versions_groupbox">
<layout class="QFormLayout" name="lib_vresions_groupbox_layout">
<item row="2" column="0">
<widget class="QLabel" name="qt_runtime_rowlabel">
<property name="text">
<string>Qt runtime version:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="qt_runtime_version_string_label">
<property name="text">
<string>qt-runtime-version</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="ecal_runtime_rowlabel">
<property name="text">
<string>eCAL runtime version:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="ecal_runtime_version_string_label">
<property name="text">
<string>ecal-runtime-version</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="ecal_compiletime_rowlabel">
<property name="text">
<string>eCAL compile-time version:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="ecal_compiletime_versin_string_label">
<property name="text">
<string>ecal-compiletime-version</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="qt_compiletime_rowlabel">
<property name="text">
<string>Qt compile-time version:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="qt_compiletime_version_string_label">
<property name="text">
<string>qt-compiletime-version</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
Expand Down
13 changes: 10 additions & 3 deletions app/sys/sys_gui/src/widgets/about_dialog/about_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,25 @@

#include "about_dialog.h"
#include "ecalsys/esys_defs.h"
#include <ecal/ecal_defs.h>

#include <ecal/ecal.h>

#include <QPushButton>
#include <QtGlobal>

AboutDialog::AboutDialog(QWidget *parent)
: QDialog(parent)
{
ui_.setupUi(this);
ui_.version_label->setText("Version: " + QString(ECAL_SYS_VERSION_STRING));
ui_.ecalversion_label->setText("eCAL " + QString(ECAL_VERSION) + " (" + QString(ECAL_DATE) + ")");
connect(ui_.button_box->button(QDialogButtonBox::StandardButton::Ok), SIGNAL(clicked()), this, SLOT(close()));
}

ui_.ecal_runtime_version_string_label->setText(QString(eCAL::GetVersionString()) + " (" + QString(eCAL::GetVersionDateString()) + ")");
ui_.ecal_compiletime_versin_string_label->setText(QString(ECAL_VERSION) + " (" + QString(ECAL_DATE) + ")");
ui_.qt_runtime_version_string_label->setText(QString(qVersion()));
ui_.qt_compiletime_version_string_label->setText(QString(QT_VERSION_STR));

connect(ui_.button_box->button(QDialogButtonBox::StandardButton::Ok), SIGNAL(clicked()), this, SLOT(close()));}

AboutDialog::~AboutDialog()
{
Expand Down
Loading
Loading