github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-31 22:02:58 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Advanced menu now local too

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6697 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-12-26 10:53:10 +00:00
parent e761007338
commit db4703df6c
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/ide/Insert.cpp
View file

@ -151,9 +151,15 @@ void Ide::InsertMenu(Bar& bar)
bar.Add("Insert file path..", THISBACK(InsertFilePath));
}
void Ide::EditorMenu(Bar& bar)
void Ide::InsertAdvanced(Bar& bar)
{
bar.Add("Insert", THISBACK(InsertMenu));
bar.Add("Advanced", THISBACK(EditSpecial));
}
void Ide::EditorMenu(Bar& bar)
{
InsertAdvanced(bar);
bar.MenuSeparator();
editor.StdBar(bar);
}

1
uppsrc/ide/ide.h
View file

@ -869,6 +869,7 @@ public:
void InsertCString();
void InsertFilePath();
void InsertMenu(Bar& bar);
void InsertAdvanced(Bar& bar);
void EditorMenu(Bar& bar);
void SearchMenu(Bar& bar);

6
uppsrc/ide/idebar.cpp
View file

@ -212,10 +212,8 @@ void Ide::Edit(Bar& menu) {
if(menu.IsMenuBar())
menu.Add("Find and Replace", THISBACK(SearchMenu));
if(!designer && menu.IsMenuBar()) {
menu.Add("Insert", THISBACK(InsertMenu));
menu.Add("Advanced", THISBACK(EditSpecial));
}
if(!designer && menu.IsMenuBar())
InsertAdvanced(menu);
if(editor.GetLineCount() && editor.GetUtf8Line(0) == "$uvs: PENDING CONFLICT") {
menu.MenuSeparator();