NEW: support to display internal Version
Change-Id: If074529312fe3f5e32f061280b8c8914fdcaf7e0 Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
parent
4d70fd0eee
commit
35d2e91d68
|
@ -7,5 +7,6 @@
|
||||||
#define SLIC3R_BUILD_ID "@SLIC3R_BUILD_ID@"
|
#define SLIC3R_BUILD_ID "@SLIC3R_BUILD_ID@"
|
||||||
//#define SLIC3R_RC_VERSION "@SLIC3R_VERSION@"
|
//#define SLIC3R_RC_VERSION "@SLIC3R_VERSION@"
|
||||||
#define BBL_RELEASE_TO_PUBLIC @BBL_RELEASE_TO_PUBLIC@
|
#define BBL_RELEASE_TO_PUBLIC @BBL_RELEASE_TO_PUBLIC@
|
||||||
|
#define BBL_INTERNAL_TESTING @BBL_INTERNAL_TESTING@
|
||||||
|
|
||||||
#endif /* __SLIC3R_VERSION_H */
|
#endif /* __SLIC3R_VERSION_H */
|
||||||
|
|
|
@ -244,7 +244,11 @@ AboutDialog::AboutDialog()
|
||||||
// version
|
// version
|
||||||
{
|
{
|
||||||
vesizer->Add(0, FromDIP(165), 1, wxEXPAND, FromDIP(5));
|
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);
|
auto version_string = _L("Version") + " " + std::string(SLIC3R_VERSION);
|
||||||
|
#endif
|
||||||
wxStaticText* version = new wxStaticText(this, wxID_ANY, version_string.c_str(), wxDefaultPosition, wxDefaultSize);
|
wxStaticText* version = new wxStaticText(this, wxID_ANY, version_string.c_str(), wxDefaultPosition, wxDefaultSize);
|
||||||
wxFont version_font = GetFont();
|
wxFont version_font = GetFont();
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
|
|
|
@ -554,7 +554,11 @@ private:
|
||||||
title = wxGetApp().is_editor() ? SLIC3R_APP_FULL_NAME : GCODEVIEWER_APP_NAME;
|
title = wxGetApp().is_editor() ? SLIC3R_APP_FULL_NAME : GCODEVIEWER_APP_NAME;
|
||||||
|
|
||||||
// dynamically get the version to display
|
// 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);
|
version = _L("Version") + " " + std::string(SLIC3R_VERSION);
|
||||||
|
#endif
|
||||||
|
|
||||||
// credits infornation
|
// credits infornation
|
||||||
credits = title;
|
credits = title;
|
||||||
|
|
Loading…
Reference in New Issue