Skip to content

Commit

Permalink
Bump version to R2023b-rev1 (#6296)
Browse files Browse the repository at this point in the history
* Bump version to R2023b-rev1

* clangoformat
  • Loading branch information
Benjamin Délèze committed Jul 5, 2023
1 parent 281e6a9 commit 618a6bd
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<key>CFBundleExecutable</key>
<string>webots</string>
<key>CFBundleGetInfoString</key>
<string>Webots R2023b, Copyright 1998-2023 Cyberbotics Ltd.</string>
<string>Webots R2023b revision 1, Copyright 1998-2023 Cyberbotics Ltd.</string>
<key>CFBundleIconFile</key>
<string>webots_icon</string>
<key>CFBundleIdentifier</key>
Expand All @@ -47,11 +47,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>R2023b</string>
<string>R2023b revision 1</string>
<key>CFBundleSignature</key>
<string>wbt </string>
<key>CFBundleVersion</key>
<string>R2023b</string>
<string>R2023b revision 1</string>
<key>LSMinimumSystemVersion</key>
<string>10.14</string>
<key>CSResourcesFileMapped</key>
Expand Down
4 changes: 2 additions & 2 deletions docs/js/showdown-extensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ showdown.extension('wbVariables', function() {
major: 'R2023b',
// full is equal to major for the first major version
// and contains the revision number for subsequent versions
full: 'R2023b',
package: 'R2023b'
full: 'R2023b revision 1',
package: 'R2023b-rev1'
}
},
date: {
Expand Down
2 changes: 1 addition & 1 deletion resources/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
R2023b
R2023b revision 1
2 changes: 1 addition & 1 deletion scripts/packaging/webots_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
R2023b
R2023b revision 1
2 changes: 1 addition & 1 deletion src/webots/core/WbApplicationInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const WbVersion &WbApplicationInfo::version() {
static bool firstCall = true;

if (firstCall) {
static QString webotsVersionString = "R2023b"; // updated by script
static QString webotsVersionString = "R2023b revision 1"; // updated by script
bool success = webotsVersion.fromString(webotsVersionString);
if (!success)
WbLog::fatal(QObject::tr("Internal error: the Webots version is not computable."));
Expand Down
9 changes: 5 additions & 4 deletions src/webots/gui/WbUpdatedDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "WbUpdatedDialog.hpp"

WbUpdatedDialog::WbUpdatedDialog(QWidget *parent) : QDialog(parent) {
setWindowTitle(tr("Welcome to Webots R2023b"));
setWindowTitle(tr("Welcome to Webots R2023b revision 1"));

QPixmap webotsLogo("images:webots.png");
QLabel *image = new QLabel(this);
Expand All @@ -31,7 +31,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 R2023b.</b>"));
label->setText(tr("<b>Thank you for using Webots R2023b revision 1.</b>"));
label->setStyleSheet("font-size: 15px;");
label->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignTop);
label->setWordWrap(true);
Expand All @@ -56,8 +56,9 @@ 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 R2023b 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 R2023b revision 1 in the <a style='color: #5DADE2;' "
"href='https://cyberbotics.com/doc/reference/changelog-r2023'>changelog</a>."));
label->setOpenExternalLinks(true);
label->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignTop);
label->setWordWrap(true);
Expand Down

0 comments on commit 618a6bd

Please sign in to comment.