From 7a2babcd05bfb7a9388c8b8b06b2c6e473ea25e8 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 21 Oct 2022 00:43:21 +0800 Subject: [PATCH] update SoftFever version number --- src/libslic3r/libslic3r_version.h.in | 1 + src/slic3r/GUI/AboutDialog.cpp | 7 ++----- src/slic3r/GUI/GUI_App.cpp | 21 +++++++++++---------- version.inc | 1 + 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/libslic3r/libslic3r_version.h.in b/src/libslic3r/libslic3r_version.h.in index 15f5803db57..d05746b8e86 100644 --- a/src/libslic3r/libslic3r_version.h.in +++ b/src/libslic3r/libslic3r_version.h.in @@ -4,6 +4,7 @@ #define SLIC3R_APP_NAME "@SLIC3R_APP_NAME@" #define SLIC3R_APP_KEY "@SLIC3R_APP_KEY@" #define SLIC3R_VERSION "@SLIC3R_VERSION@" +#define SoftFever_VERSION "@SoftFever_VERSION@" #define SLIC3R_BUILD_ID "@SLIC3R_BUILD_ID@" //#define SLIC3R_RC_VERSION "@SLIC3R_VERSION@" #define BBL_RELEASE_TO_PUBLIC @BBL_RELEASE_TO_PUBLIC@ diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index 2a09ae18058..848e59fea1a 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -244,11 +244,8 @@ 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 + + auto version_string = _L("SoftFever Version") + " " + std::string(SLIC3R_VERSION); 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 e6695207b74..c9f4ad8f202 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -280,14 +280,15 @@ class BBLSplashScreen : public wxSplashScreen memDc.SetTextForeground(wxColor(134, 134, 134)); memDc.DrawLabel(m_constant_text.version, version_rect, wxALIGN_LEFT | wxALIGN_BOTTOM); -#if BBL_INTERNAL_TESTING - wxSize text_rect = memDc.GetTextExtent("Internal Version"); +// #if BBL_INTERNAL_TESTING + auto sf_version = wxString::Format("SoftFever %s",std::string(SoftFever_VERSION)).ToStdString(); + wxSize text_rect = memDc.GetTextExtent(sf_version); int start_x = (title_rect.GetLeft() + version_rect.GetRight()) / 2 - text_rect.GetWidth(); int start_y = version_rect.GetBottom() + 10; wxRect internal_sign_rect(wxPoint(start_x, start_y), wxSize(text_rect)); - memDc.SetFont(m_constant_text.title_font); - memDc.DrawLabel("Internal Version", internal_sign_rect, wxALIGN_TOP | wxALIGN_LEFT); -#endif + memDc.SetFont(m_constant_text.version_font); + memDc.DrawLabel(sf_version, internal_sign_rect, wxALIGN_CENTER); +// #endif // load bitmap for logo BitmapCache bmp_cache; @@ -554,11 +555,11 @@ class SplashScreen : public wxSplashScreen 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 +// #if BBL_INTERNAL_TESTING + // version = _L("Internal Version") + " " + std::string(SLIC3R_VERSION); +// #else + version = _L("SoftFever Version") + " " + std::string(SoftFever_VERSION); +// #endif // credits infornation credits = title; diff --git a/version.inc b/version.inc index 02813d839fa..7dd575bf172 100644 --- a/version.inc +++ b/version.inc @@ -11,3 +11,4 @@ if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "1") endif() set(SLIC3R_VERSION "01.03.00.12") +set(SoftFever_VERSION "1.3.0")