From ce0312acbd6f33331e4451233f4226ff0d12e163 Mon Sep 17 00:00:00 2001 From: enricoturri1966 <enricoturri@seznam.cz> Date: Wed, 7 Oct 2020 16:02:01 +0200 Subject: [PATCH] Fixed gcodeviewer application title on Linux and Mac --- src/libslic3r/libslic3r.h | 3 +++ src/libslic3r/libslic3r_version.h.in | 4 ---- version.inc | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/libslic3r/libslic3r.h b/src/libslic3r/libslic3r.h index 76ff27136..a404d230d 100644 --- a/src/libslic3r/libslic3r.h +++ b/src/libslic3r/libslic3r.h @@ -2,6 +2,9 @@ #define _libslic3r_h_ #include "libslic3r_version.h" +#define GCODEVIEWER_APP_NAME "PrusaSlicer G-code Viewer" +#define GCODEVIEWER_APP_KEY "PrusaSlicerGcodeViewer" +#define GCODEVIEWER_BUILD_ID std::string("PrusaSlicer G-code Viewer-") + std::string(SLIC3R_VERSION) + std::string("-UNKNOWN") // this needs to be included early for MSVC (listing it in Build.PL is not enough) #include <memory> diff --git a/src/libslic3r/libslic3r_version.h.in b/src/libslic3r/libslic3r_version.h.in index f65d0637e..26a67362b 100644 --- a/src/libslic3r/libslic3r_version.h.in +++ b/src/libslic3r/libslic3r_version.h.in @@ -6,8 +6,4 @@ #define SLIC3R_VERSION "@SLIC3R_VERSION@" #define SLIC3R_BUILD_ID "@SLIC3R_BUILD_ID@" -#define GCODEVIEWER_APP_NAME "@GCODEVIEWER_APP_NAME@" -#define GCODEVIEWER_APP_KEY "@GCODEVIEWER_APP_KEY@" -#define GCODEVIEWER_BUILD_ID "@GCODEVIEWER_BUILD_ID@" - #endif /* __SLIC3R_VERSION_H */ diff --git a/version.inc b/version.inc index 9f7a105b2..30b373bdf 100644 --- a/version.inc +++ b/version.inc @@ -7,7 +7,3 @@ set(SLIC3R_VERSION "2.3.0-alpha0") set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN") set(SLIC3R_RC_VERSION "2,3,0,0") set(SLIC3R_RC_VERSION_DOTS "2.3.0.0") - -set(GCODEVIEWER_APP_NAME "Prusa GCode Viewer") -set(GCODEVIEWER_APP_KEY "PrusaGCodeViewer") -set(GCODEVIEWER_BUILD_ID "Prusa GCode Viewer-${SLIC3R_VERSION}+UNKNOWN")