From c68cadbefa3e2eefd89c6b71e8313c34d7110c79 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Fri, 4 May 2018 22:35:47 -0500 Subject: [PATCH] Properly pull slic3r version string from libslic3r --- src/GUI/MainFrame.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/GUI/MainFrame.cpp b/src/GUI/MainFrame.cpp index 029471f49..fe7fba502 100644 --- a/src/GUI/MainFrame.cpp +++ b/src/GUI/MainFrame.cpp @@ -4,6 +4,7 @@ #include #include "AboutDialog.hpp" +#include "libslic3r.h" namespace Slic3r { namespace GUI { @@ -29,8 +30,11 @@ MainFrame::MainFrame(const wxString& title, const wxPoint& pos, const wxSize& si wxToolTip::SetAutoPop(TOOLTIP_TIMER); // initialize status bar + // we call SetStatusBar() here because MainFrame is the direct owner. this->statusbar = new ProgressStatusBar(this, -1); - this->statusbar->SetStatusText("Version $Slic3r::VERSION - Remember to check for updates at http://slic3r.org/"); + wxString welcome_text {_("Version SLIC3R_VERSION_REPLACE - Remember to check for updates at http://slic3r.org/")}; + welcome_text.Replace("SLIC3R_VERSION_REPLACE", wxString(SLIC3R_VERSION)); + this->statusbar->SetStatusText(welcome_text); this->SetStatusBar(this->statusbar); this->loaded = 1;