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

Bazaar/XMLMenu : updated to new UPP and fixed some bugs

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12148 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
micio 2018-08-05 18:05:43 +00:00
parent ee1e357fc1
commit 90fa5e186d
6 changed files with 58 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
bazaar/XMLMenu/XMLMenuEditor.cpp
View file

@ -219,15 +219,15 @@ void XMLBarEditor::fieldsModCb(void)
return;
if(i == 0)
{
bar->SetName(itemPane.label);
bar->SetName(~itemPane.label);
barTree.SetRoot(Null, itemPane.label);
return;
}
XMLToolBarItem item(ValueTo<XMLToolBarItem>(barTree.Get(i)), 0);
item.label = itemPane.label;
item.commandId = itemPane.cmdId;
item.tooltip = itemPane.tooltip;
item.label = ~itemPane.label;
item.commandId = ~itemPane.cmdId;
item.tooltip = ~itemPane.tooltip;
item.icon = curIcon;
TreeCtrl::Node node(item.GetIcon(), RawDeepToValue(item), item.GetLabel());
barTree.SetNode(i, node);
@ -469,7 +469,7 @@ void XMLBarsEditor::barContextAddCb(void)
add.Close();
if(res == IDOK)
{
toolBars.Add(~add.barName, XMLToolBar());
toolBars.AddPick(~add.barName, XMLToolBar());
barListPane.barList.Add(~add.barName);
barListPane.barList.SetCursor(barListPane.barList.GetCount() - 1);
}
@ -646,7 +646,7 @@ void XMLMenuEditor::cmdContextAddCb(void)
edit.Close();
if(res == IDOK)
{
commands.Add(edit.cmdId, edit.cmdStr);
commands.Add(~edit.cmdId, ~edit.cmdStr);
FillCmdList();
cmdPane.commandList.SetCursor(cmdPane.commandList.Find(~edit.cmdId));
}
@ -662,7 +662,7 @@ void XMLMenuEditor::cmdContextEditCb(void)
if(res == IDOK)
{
int idx = commands.Find(~edit.cmdId);
commands[idx].SetCommandString(edit.cmdStr);
commands[idx].SetCommandString(~edit.cmdStr);
FillCmdList();
cmdPane.commandList.SetCursor(cmdPane.commandList.Find(~edit.cmdId));
}