3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

update SoftFever version number

Browse source
This commit is contained in:
SoftFever 2022-10-21 00:43:21 +08:00
parent d41f0a0a40
commit 7a2babcd05
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libslic3r/libslic3r_version.h.in
View file

@ -4,6 +4,7 @@
#define SLIC3R_APP_NAME "@SLIC3R_APP_NAME@" #define SLIC3R_APP_NAME "@SLIC3R_APP_NAME@"
#define SLIC3R_APP_KEY "@SLIC3R_APP_KEY@" #define SLIC3R_APP_KEY "@SLIC3R_APP_KEY@"
#define SLIC3R_VERSION "@SLIC3R_VERSION@" #define SLIC3R_VERSION "@SLIC3R_VERSION@"
#define SoftFever_VERSION "@SoftFever_VERSION@"
#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@

7
src/slic3r/GUI/AboutDialog.cpp
View file

@ -244,11 +244,8 @@ 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); auto version_string = _L("SoftFever 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); 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__

21
src/slic3r/GUI/GUI_App.cpp
View file

@ -280,14 +280,15 @@ public:
memDc.SetTextForeground(wxColor(134, 134, 134)); memDc.SetTextForeground(wxColor(134, 134, 134));
memDc.DrawLabel(m_constant_text.version, version_rect, wxALIGN_LEFT | wxALIGN_BOTTOM); memDc.DrawLabel(m_constant_text.version, version_rect, wxALIGN_LEFT | wxALIGN_BOTTOM);
#if BBL_INTERNAL_TESTING // #if BBL_INTERNAL_TESTING
wxSize text_rect = memDc.GetTextExtent("Internal Version"); 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_x = (title_rect.GetLeft() + version_rect.GetRight()) / 2 - text_rect.GetWidth();
int start_y = version_rect.GetBottom() + 10; int start_y = version_rect.GetBottom() + 10;
wxRect internal_sign_rect(wxPoint(start_x, start_y), wxSize(text_rect)); wxRect internal_sign_rect(wxPoint(start_x, start_y), wxSize(text_rect));
memDc.SetFont(m_constant_text.title_font); memDc.SetFont(m_constant_text.version_font);
memDc.DrawLabel("Internal Version", internal_sign_rect, wxALIGN_TOP | wxALIGN_LEFT); memDc.DrawLabel(sf_version, internal_sign_rect, wxALIGN_CENTER);
#endif // #endif
// load bitmap for logo // load bitmap for logo
BitmapCache bmp_cache; BitmapCache bmp_cache;
@ -554,11 +555,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 // #if BBL_INTERNAL_TESTING
version = _L("Internal Version") + " " + std::string(SLIC3R_VERSION); // version = _L("Internal Version") + " " + std::string(SLIC3R_VERSION);
#else // #else
version = _L("Version") + " " + std::string(SLIC3R_VERSION); version = _L("SoftFever Version") + " " + std::string(SoftFever_VERSION);
#endif // #endif
// credits infornation // credits infornation
credits = title; credits = title;

1
version.inc
View file

@ -11,3 +11,4 @@ if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "1") set(BBL_INTERNAL_TESTING "1")
endif() endif()
set(SLIC3R_VERSION "01.03.00.12") set(SLIC3R_VERSION "01.03.00.12")
set(SoftFever_VERSION "1.3.0")