From 2a244f2aab3a61ee5a9741d657208a8bd521f4a4 Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Fri, 21 Dec 2018 12:48:05 +0100 Subject: [PATCH] KBShortcutsDialog: Add symbols for Command and Option on Mac --- cmake/modules/FindTBB.cmake | 1 + src/slic3r/GUI/KBShortcutsDialog.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake index e5115ab44..543cd74eb 100644 --- a/cmake/modules/FindTBB.cmake +++ b/cmake/modules/FindTBB.cmake @@ -216,6 +216,7 @@ if(NOT TBB_FOUND) if(";${TBB_FIND_COMPONENTS};tbb;" MATCHES ";${_comp};") # Search for the libraries + message(WARNING "find_library: TBB_${_comp}_LIBRARY_RELEASE -> ${_comp}${TBB_STATIC_SUFFIX}") find_library(TBB_${_comp}_LIBRARY_RELEASE ${_comp}${TBB_STATIC_SUFFIX} HINTS ${TBB_LIBRARY} ${TBB_SEARCH_DIR} PATHS ${TBB_DEFAULT_SEARCH_DIR} ENV LIBRARY_PATH diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index 6ebb1ef66..303f3dae8 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -88,8 +88,8 @@ KBShortcutsDialog::KBShortcutsDialog() void KBShortcutsDialog::fill_shortcuts() { #ifdef __WXOSX__ - const std::string ctrl = "Cmd+"; // #ys_FIXME_cmd_smb // Change it for the accorded symbol - const std::string alt = "Alt+"; // #ys_FIXME_cmd_smb // Change it for the accorded symbol + const std::string ctrl = "⌘"; + const std::string alt = "⌥"; #else const std::string ctrl = "Ctrl+"; const std::string alt = "Alt+";