From 35d2e91d68ae911db73ebc08e42e1a3304dbfa4f Mon Sep 17 00:00:00 2001 From: Stone Li Date: Tue, 13 Sep 2022 17:44:11 +0800 Subject: [PATCH] NEW: support to display internal Version Change-Id: If074529312fe3f5e32f061280b8c8914fdcaf7e0 Signed-off-by: Stone Li --- src/libslic3r/libslic3r_version.h.in | 1 + src/slic3r/GUI/AboutDialog.cpp | 4 ++++ src/slic3r/GUI/GUI_App.cpp | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/src/libslic3r/libslic3r_version.h.in b/src/libslic3r/libslic3r_version.h.in index dc843d723..15f5803db 100644 --- a/src/libslic3r/libslic3r_version.h.in +++ b/src/libslic3r/libslic3r_version.h.in @@ -7,5 +7,6 @@ #define SLIC3R_BUILD_ID "@SLIC3R_BUILD_ID@" //#define SLIC3R_RC_VERSION "@SLIC3R_VERSION@" #define BBL_RELEASE_TO_PUBLIC @BBL_RELEASE_TO_PUBLIC@ +#define BBL_INTERNAL_TESTING @BBL_INTERNAL_TESTING@ #endif /* __SLIC3R_VERSION_H */ diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index fa99b15f7..2a09ae180 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -244,7 +244,11 @@ AboutDialog::AboutDialog() // version { vesizer->Add(0, FromDIP(165), 1, wxEXPAND, FromDIP(5)); +#if BBL_INTERNAL_TESTING + auto version_string = _L("Internal Version") + " " + std::string(SLIC3R_VERSION); +#else auto version_string = _L("Version") + " " + std::string(SLIC3R_VERSION); +#endif wxStaticText* version = new wxStaticText(this, wxID_ANY, version_string.c_str(), wxDefaultPosition, wxDefaultSize); wxFont version_font = GetFont(); #ifdef __WXMSW__ diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index c8916730b..6aabbc0e9 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -554,7 +554,11 @@ private: title = wxGetApp().is_editor() ? SLIC3R_APP_FULL_NAME : GCODEVIEWER_APP_NAME; // dynamically get the version to display +#if BBL_INTERNAL_TESTING + version = _L("Internal Version") + " " + std::string(SLIC3R_VERSION); +#else version = _L("Version") + " " + std::string(SLIC3R_VERSION); +#endif // credits infornation credits = title;