Skip to content

Commit 35492c2

Browse files
authored
Merge pull request #6771 from cyberbotics/sync-master-c6793d8f7
Merge master into develop
2 parents 60b25d3 + f57f4e1 commit 35492c2

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed
64.4 KB
Loading

src/webots/gui/WbUpdatedDialog.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
#include <QtWidgets/QLabel>
1919
#include <QtWidgets/QPushButton>
2020

21+
#include "WbApplicationInfo.hpp"
2122
#include "WbUpdatedDialog.hpp"
23+
#include "WbVersion.hpp"
2224

2325
WbUpdatedDialog::WbUpdatedDialog(QWidget *parent) : QDialog(parent) {
24-
setWindowTitle(tr("Welcome to Webots R2025a"));
26+
setWindowTitle(tr("Welcome to Webots %1").arg(WbApplicationInfo::version().toString()));
2527

2628
QPixmap webotsLogo("images:webots.png");
2729
QLabel *image = new QLabel(this);
@@ -31,7 +33,7 @@ WbUpdatedDialog::WbUpdatedDialog(QWidget *parent) : QDialog(parent) {
3133

3234
QLabel *label = new QLabel(this);
3335
label->setGeometry(QRect(75, 30, 330, 30));
34-
label->setText(tr("<b>Thank you for using Webots R2025a.</b>"));
36+
label->setText(tr("<b>Thank you for using Webots %1.</b>").arg(WbApplicationInfo::version().toString()));
3537
label->setStyleSheet("font-size: 15px;");
3638
label->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignTop);
3739
label->setWordWrap(true);
@@ -56,8 +58,10 @@ WbUpdatedDialog::WbUpdatedDialog(QWidget *parent) : QDialog(parent) {
5658

5759
label = new QLabel(this);
5860
label->setGeometry(QRect(35, 200, 283, 44));
59-
label->setText(tr("Find out the new features, enhancements and bug fixes of Webots R2025a in the <a style='color: #5DADE2;' "
60-
"href='https://cyberbotics.com/doc/reference/changelog-r2023'>changelog</a>."));
61+
label->setText(tr("Find out the new features, enhancements and bug fixes of Webots %1 in the <a style='color: #5DADE2;' "
62+
"href='https://cyberbotics.com/doc/reference/changelog-r%2'>changelog</a>.")
63+
.arg(WbApplicationInfo::version().toString())
64+
.arg(WbApplicationInfo::version().majorNumber()));
6165
label->setOpenExternalLinks(true);
6266
label->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignTop);
6367
label->setWordWrap(true);

0 commit comments

Comments
 (0)