github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-24 06:12:52 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Ide: polishing package menu.

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15150 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2020-09-26 18:35:09 +00:00
parent 4c324907d6
commit eeef00f81f
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
uppsrc/ide/UppWspc.cpp
View file

@ -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));