From d620961c34ceb8ca747ab675042abb3abf8c341a Mon Sep 17 00:00:00 2001 From: bubnikv Date: Thu, 10 May 2018 18:37:57 +0200 Subject: [PATCH 1/2] Fixed the version number. We have an alpha state as of today. --- xs/src/libslic3r/libslic3r.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xs/src/libslic3r/libslic3r.h b/xs/src/libslic3r/libslic3r.h index 4aef4d5c16..e7b858e8b8 100644 --- a/xs/src/libslic3r/libslic3r.h +++ b/xs/src/libslic3r/libslic3r.h @@ -14,7 +14,7 @@ #include #define SLIC3R_FORK_NAME "Slic3r Prusa Edition" -#define SLIC3R_VERSION "1.40.0" +#define SLIC3R_VERSION "1.40.0-alpha" #define SLIC3R_BUILD "UNKNOWN" typedef int32_t coord_t; From e91ebddeea4da1f6062546ee354573119c22f89b Mon Sep 17 00:00:00 2001 From: YuSanka Date: Fri, 11 May 2018 09:53:35 +0200 Subject: [PATCH 2/2] Added possibility of select all TextCtrl context using Ctrl+A --- xs/src/slic3r/GUI/Field.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xs/src/slic3r/GUI/Field.cpp b/xs/src/slic3r/GUI/Field.cpp index 623e20b45c..0fcf480e31 100644 --- a/xs/src/slic3r/GUI/Field.cpp +++ b/xs/src/slic3r/GUI/Field.cpp @@ -194,6 +194,14 @@ namespace Slic3r { namespace GUI { temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent) { on_change_field(); }), temp->GetId()); + // select all text using Ctrl+A + temp->Bind(wxEVT_CHAR, ([temp](wxKeyEvent& event) + { + if (wxGetKeyState(wxKeyCode('A')) && wxGetKeyState(WXK_CONTROL)) + temp->SetSelection(-1, -1); //select all + event.Skip(); + })); + // recast as a wxWindow to fit the calling convention window = dynamic_cast(temp); }