From 340b33e8003a00937be8a2df4caab937fc384608 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 10 Sep 2017 14:20:34 +0000 Subject: [PATCH] ide: Delete now works on separator git-svn-id: svn://ultimatepp.org/upp/trunk@11315 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/src.tpp/CoWork$en-us.tpp | 2 +- uppsrc/ide/UppWspc.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/Core/src.tpp/CoWork$en-us.tpp b/uppsrc/Core/src.tpp/CoWork$en-us.tpp index c8dcc05e5..5d09b6099 100644 --- a/uppsrc/Core/src.tpp/CoWork$en-us.tpp +++ b/uppsrc/Core/src.tpp/CoWork$en-us.tpp @@ -142,7 +142,7 @@ In single`-thread code, a single instance of such model would be used over the whole loop, however in multi`-threaded code, each worker thread, plus thread that created CoWork need its own instance. CoWorkerResources helps to manage such situation.&] -[s0;%% &] +[s3;%% &] [ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&] [s3; &] [s5;:Upp`:`:CoWorkerResources`:`:CoWorkerResources`(`): [* CoWorkerResources]()&] diff --git a/uppsrc/ide/UppWspc.cpp b/uppsrc/ide/UppWspc.cpp index db290f0ab..8f26409ca 100644 --- a/uppsrc/ide/UppWspc.cpp +++ b/uppsrc/ide/UppWspc.cpp @@ -867,7 +867,7 @@ void WorkspaceWork::FileMenu(Bar& menu) menu.Add("Remove", THISBACK(RemoveFile)) .Key(organizer ? K_DELETE : K_ALT_DELETE) .Help("Remove file / separator / topic group from package"); - menu.Add(filelist.IsCursor() && !sel, "Delete", THISBACK(DelFile)) + menu.Add(filelist.IsCursor(), "Delete", sel ? THISBACK(RemoveFile) : THISBACK(DelFile)) .Help("Remove file / topic group reference from package & delete file / folder on disk"); menu.Separator(); menu.Add("Open File Directory",THISBACK(OpenFileFolder));