From eeef00f81f01c8ab90ed290686c8e0162152ffb2 Mon Sep 17 00:00:00 2001
From: klugier <klugier@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 26 Sep 2020 18:35:09 +0000
Subject: [PATCH] Ide: polishing package menu.

git-svn-id: svn://ultimatepp.org/upp/trunk@15150 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/UppWspc.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/uppsrc/ide/UppWspc.cpp b/uppsrc/ide/UppWspc.cpp
index 2cc60e717..0aa65f136 100644
--- a/uppsrc/ide/UppWspc.cpp
+++ b/uppsrc/ide/UppWspc.cpp
@@ -814,18 +814,18 @@ bool WorkspaceWork::IsAux()
 void WorkspaceWork::InsertSpecialMenu(Bar& menu)
 {
 	bool isaux = IsAux();
-	menu.Add("Insert any file(s)", THISBACK1(AddFile, ANY_FILE))
+	menu.Add("Insert any file(s)..", THISBACK1(AddFile, ANY_FILE))
 		.Key(K_SHIFT|K_CTRL_I)
 		.Help("Insert files from anywhere on disk (discouraged in portable packages)");
-	menu.Add(isaux && GetOutputDir().GetCount(), "Insert output directory file(s)", THISBACK1(AddFile, OUTPUT_FILE))
+	menu.Add(isaux && GetOutputDir().GetCount(), "Insert output directory file(s)..", THISBACK1(AddFile, OUTPUT_FILE))
 		.Help("Open file selector in output / intermediate directory for current package");
 #ifdef PLATFORM_POSIX
-	menu.Add(isaux && GetConfigDir().GetCount(), "Insert config directory file(s)", THISBACK1(AddFile, CONFIG_FILE))
+	menu.Add(isaux && GetConfigDir().GetCount(), "Insert config directory file(s)..", THISBACK1(AddFile, CONFIG_FILE))
 		.Help("Open file selector in output / intermediate directory for current package");
 #endif
-	menu.Add(isaux, "Insert Local directory file(s)", THISBACK1(AddFile, LOCAL_FILE))
+	menu.Add(isaux, "Insert Local directory file(s)..", THISBACK1(AddFile, LOCAL_FILE))
 		.Help("Open file selector in Local directory for current package");
-	menu.Add("Insert home directory file(s)", THISBACK1(AddFile, HOME_FILE))
+	menu.Add("Insert home directory file(s)..", THISBACK1(AddFile, HOME_FILE))
 		.Help("Open file selector in current user's HOME directory");
 }
 
@@ -854,14 +854,16 @@ void WorkspaceWork::FileMenu(Bar& menu)
 		InsertSpecialMenu(menu);
 	else {
 		menu.Add("New package file..", IdeCommonImg::PageAdd(), [=] { NewPackageFile(); });
-		menu.Add(!isaux, "Insert package directory file(s)", THISBACK1(AddFile, PACKAGE_FILE))
+		menu.Add(!isaux, "Insert package directory file(s)..", THISBACK1(AddFile, PACKAGE_FILE))
 			.Help("Insert file relative to current package");
-		menu.Add(!isaux, "Insert topic++ group", THISBACK(AddTopicGroup));
-		menu.Add("Special", THISBACK(SpecialFileMenu))
+		menu.Add(!isaux, "Insert topic++ group..", TopicImg::IGroup(), THISBACK(AddTopicGroup));
+	}
+	menu.Add("Insert separator..", IdeImg::Separator(), [=] { AddSeparator(); })
+		.Help("Add text separator line");
+	if(!isaux) {
+		menu.Add("Insert special", THISBACK(SpecialFileMenu))
 		    .Help("Less frequently used methods of adding files to the package");
 	}
-	menu.Add("Insert separator", IdeImg::Separator(), [=] { AddSeparator(); })
-		.Help("Add text separator line");
 	menu.Separator();
 	if(!organizer) {
 		if(sel)
@@ -878,7 +880,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(), "Delete", sel ? THISBACK(RemoveFile) : 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));