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

.ide MacroManager now doesn't show local macros when they don't exist in current project.

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11197 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2017-06-23 20:13:35 +00:00
parent ce8316fb7e
commit c8f1cce1b1
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/ide/MacroManager.cpp
View file

@ -19,7 +19,6 @@ MacroManagerWindow::MacroManagerWindow(const Workspace& wspc)
exportButton.Disable();
globalNode = macrosTree.Add(0, Image(), 0, t_("Global macros"));
localNode = macrosTree.Add(0, Image(), 0, t_("Local macros (Read only)"));
LoadMacros();
macrosTree.OpenDeep(0);
@ -235,6 +234,8 @@ void MacroManagerWindow::ReloadGlobalMacros()
void MacroManagerWindow::ReloadLocalMacros()
{
int localNode = macrosTree.Find(1);
for(int i = 0; i < wspc.GetCount(); i++) {
const Package& package = wspc.GetPackage(i);
int packageNode = -1;
@ -248,6 +249,9 @@ void MacroManagerWindow::ReloadLocalMacros()
if (list.GetCount() == 0)
continue;
if(localNode == -1)
localNode = macrosTree.Add(0, Image(), 1, t_("Local macros (Read only)"));
if(packageNode == -1)
packageNode = macrosTree.Add(localNode, Image(), 0, wspc[i]);

1
uppsrc/ide/MacroManager.h
View file

@ -97,5 +97,4 @@ private:
CodeEditor editor;
int globalNode;
int localNode;
};