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

Expor globals is not active when there is no global macros in ide. Thanks Omari! #1781

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11417 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2017-10-26 20:39:02 +00:00
parent fca6f9202e
commit c814bcb925
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
uppsrc/ide/MacroManager/MacroManager.cpp
View file

@ -47,7 +47,7 @@ void MacroManagerWindow::InitToolBar()
newGlobalLabel.Enable();
importGlobalsLabel.Enable();
exportGlobalsLabel.Enable();
exportGlobalsLabel.Enable(globalTree.GetChildCount(0));
}
void MacroManagerWindow::InitToolButton(
@ -223,14 +223,25 @@ void MacroManagerWindow::OnNewMacroFile()
fileName << ".usc";
String fullPath = AppendFileName(GetLocalDir(), fileName);
RealizeDirectory(GetLocalDir());
if(FileExists(fullPath)) {
PromptOK(String() << t_("file") << " \"" << fileName << "\" " << t_("already exists!"));
return;
}
SaveFile(fullPath, "macro \"" + GetFileTitle(fileName) + "\" {}");
ReloadGlobalMacros(); // TODO: This is a little bit overkill we add one element to the tree and we reload all tree...
globalTree.FindSetCursor(fileName);
if(!SaveFile(fullPath, "macro \"" + GetFileTitle(fileName) + "\" {}")) {
PromptOK(String() << t_("Error occured while saving file") << " \"" << fileName << "\"");
return;
}
int fileNode = globalTree.Add(0, Image(), fullPath, fileName);
auto list = UscFileParser(fullPath).Parse();
for(const auto& element : list) {
globalTree.Add(fileNode, element.GetImage(), RawToValue(element), element.name);
}
globalTree.OpenDeep(fileNode);
globalTree.FindSetCursor(fullPath);
OnGlobalMacrosChanged();
}
@ -238,7 +249,7 @@ void MacroManagerWindow::OnNewMacroFile()
void MacroManagerWindow::OnDeleteMacroFile()
{
auto fileName = static_cast<String>(globalTree.GetValue());
if(!PromptOKCancel(t_("Are you sure you want to remove followin macro file \"" + fileName + "\"?")))
if(!PromptOKCancel(t_("Are you sure you want to remove following macro file \"" + fileName + "\"?")))
return;
FileDelete(AppendFileName(GetLocalDir(), fileName));
@ -250,6 +261,7 @@ void MacroManagerWindow::OnDeleteMacroFile()
void MacroManagerWindow::OnGlobalMacrosChanged()
{
exportGlobalsLabel.Enable(globalTree.GetChildCount(0));
globalMacrosChanged = true;
}