From bc3cd0f9753daedc65a24dca7d8c54aa86d42613 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 20 Jan 2019 17:56:22 +0000
Subject: [PATCH] ide: Removed Insert hotkeys in Cocoa

git-svn-id: svn://ultimatepp.org/upp/trunk@12688 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/cocotodo.txt    | 12 ++++++------
 uppsrc/ide/Browser/TopicWin.cpp |  6 +++++-
 uppsrc/ide/SelectPkg.cpp        |  7 ++++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/uppsrc/CtrlCore/cocotodo.txt b/uppsrc/CtrlCore/cocotodo.txt
index eaf9f7a80..3cd2a7b41 100644
--- a/uppsrc/CtrlCore/cocotodo.txt
+++ b/uppsrc/CtrlCore/cocotodo.txt
@@ -5,19 +5,14 @@ sooner:
 
 - Warning: Terminal '/usr/bin/xterm' not found, executing in background.
 
-- Topic++, menu at topics, New topic has wrong hotkey
-- New assembly - wrong hotkey (?)
-
 - cursor problem after local menu invocation (better, but still...)
 - icondes - rightclick on image in the list, then move mouse over color ramp - weird focus issue happens
 
-- Uword cursor is blinking even in background
-
 - UHD problem with tabbar
 - UHD problem with Prompt text size ([g ?)
 - fix package organiser link options (joining link options missing space)
 
-- download .scd files (or put to bundle)
+- download .ucd files (or put to bundle)
 
 * apple debugger
 
@@ -69,6 +64,11 @@ later:
 
 done:
 
+- New assembly - wrong hotkey (?)
+
+- Topic++, menu at topics, New topic has wrong hotkey
+
+- Uword cursor is blinking even in background
 
 - .iml D&D does not work
 
diff --git a/uppsrc/ide/Browser/TopicWin.cpp b/uppsrc/ide/Browser/TopicWin.cpp
index 6a754beec..47b50725f 100644
--- a/uppsrc/ide/Browser/TopicWin.cpp
+++ b/uppsrc/ide/Browser/TopicWin.cpp
@@ -215,7 +215,11 @@ void TopicEditor::TopicMenu(Bar& bar)
 	if(IsNull(grouppath))
 		return;
 	bar.Add("New topic..", THISBACK(NewTopic))
-	   .Key(K_CTRL_N).Key(K_ALT_INSERT);
+	   .Key(K_CTRL_N)
+#ifndef PLATFORM_COCOA
+	   .Key(K_ALT_INSERT)
+#endif
+	;
 	bar.Add(topics_list.IsCursor(), "Move topic..", THISBACK(MoveTopic));
 	bar.Add(topics_list.IsCursor(), "Delete topic", THISBACK(RemoveTopic))
 	   .Key(K_ALT_DELETE);
diff --git a/uppsrc/ide/SelectPkg.cpp b/uppsrc/ide/SelectPkg.cpp
index e0a94ab48..587bb160f 100644
--- a/uppsrc/ide/SelectPkg.cpp
+++ b/uppsrc/ide/SelectPkg.cpp
@@ -342,7 +342,12 @@ void SelectPackageDlg::SyncSvnDirs()
 void SelectPackageDlg::ToolBase(Bar& bar)
 {
 	bar.Add("New assembly..", THISBACK(OnBaseAdd))
-		.Key(K_INSERT);
+#ifdef PLATFORM_COCOA
+		.Key(K_CTRL_N)
+#else
+		.Key(K_INSERT)
+#endif
+	;
 	bar.Add(base.IsCursor(), "Edit assembly..", THISBACK(OnBaseEdit))
 		.Key(K_CTRL_ENTER);
 	bar.Add(base.IsCursor(), "Remove assembly", THISBACK(OnBaseRemove))