Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorremi durand <remi-j.durand@thalesgroup.com>2021-06-10 23:29:12 +0300
committerremi durand <remi-j.durand@thalesgroup.com>2021-06-10 23:29:12 +0300
commit50f2cd5c5223161b342c6a096bc07604d8281c47 (patch)
treee6a8b058e155dc33aa9f3fec9f08ac63cb6a8982
parentea2aea4c37dc9c2db451d7e98908d8776c77b9fb (diff)
fix reprapfirmware2.3.56.4b
and a shortcut help text
-rw-r--r--src/libslic3r/PrintConfig.hpp3
-rw-r--r--src/slic3r/GUI/KBShortcutsDialog.cpp4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
index c11c5c8cb..e9a0fcd45 100644
--- a/src/libslic3r/PrintConfig.hpp
+++ b/src/libslic3r/PrintConfig.hpp
@@ -193,7 +193,8 @@ template<> inline const t_config_enum_values& ConfigOptionEnum<WipeAlgo>::get_en
template<> inline const t_config_enum_values& ConfigOptionEnum<GCodeFlavor>::get_enum_values() {
static t_config_enum_values keys_map = {
- {"reprap", gcfRepRap},
+ {"reprapfirmware", gcfRepRap},
+ {"reprap", gcfSprinter},
{"repetier", gcfRepetier},
{"teacup", gcfTeacup},
{"makerware", gcfMakerWare},
diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp
index 6a5c235dd..42a92b8f1 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.cpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.cpp
@@ -109,7 +109,11 @@ void KBShortcutsDialog::fill_shortcuts()
{ "0-6", L("Camera view") },
{ "E", L("Show/Hide object/instance labels") },
// Configuration
+#ifdef __APPLE__
+ { ctrl + ",", L("Preferences") },
+#else
{ ctrl + "P", L("Preferences") },
+#endif
// Help
{ "?", L("Show keyboard shortcuts list") }
};