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

Merge master into released #6774

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Merge master into released #6774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added resources/images/splash_images/heron.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 8 additions & 4 deletions src/webots/gui/WbUpdatedDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>

#include "WbApplicationInfo.hpp"
#include "WbUpdatedDialog.hpp"
#include "WbVersion.hpp"

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

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

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

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