1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-09 17:07:43 +02:00

Bugfix for Bug 530 - Export and Import of XML file now handle the lists too.

This commit is contained in:
james.k.crook@gmail.com 2013-08-20 21:53:18 +00:00
parent 1351caba69
commit ccec954f06

View File

@ -693,7 +693,8 @@ int CommandManager::NewIdentifier(wxString name, wxString label, wxMenu *menu,
mCommandList.Add(tmpEntry); mCommandList.Add(tmpEntry);
mCommandIDHash[tmpEntry->id] = tmpEntry; mCommandIDHash[tmpEntry->id] = tmpEntry;
if (index == 0 || !multi) { // if (index == 0 || !multi) {
{
#if defined(__WXDEBUG__) #if defined(__WXDEBUG__)
CommandListEntry *prev = mCommandNameHash[name]; CommandListEntry *prev = mCommandNameHash[name];
if (prev) { if (prev) {
@ -1257,7 +1258,7 @@ void CommandManager::WriteXML(XMLWriter &xmlFile)
xmlFile.WriteAttr(wxT("audacityversion"), AUDACITY_VERSION_STRING); xmlFile.WriteAttr(wxT("audacityversion"), AUDACITY_VERSION_STRING);
for(j=0; j<mCommandList.GetCount(); j++) { for(j=0; j<mCommandList.GetCount(); j++) {
if (!mCommandList[j]->multi) { //if (!mCommandList[j]->multi) {
wxString label = mCommandList[j]->label; wxString label = mCommandList[j]->label;
label = wxMenuItem::GetLabelFromText(label.BeforeFirst(wxT('\t'))); label = wxMenuItem::GetLabelFromText(label.BeforeFirst(wxT('\t')));
@ -1267,7 +1268,7 @@ void CommandManager::WriteXML(XMLWriter &xmlFile)
xmlFile.WriteAttr(wxT("label"), label); xmlFile.WriteAttr(wxT("label"), label);
xmlFile.WriteAttr(wxT("key"), mCommandList[j]->key); xmlFile.WriteAttr(wxT("key"), mCommandList[j]->key);
xmlFile.EndTag(wxT("command")); xmlFile.EndTag(wxT("command"));
} //}
} }
xmlFile.EndTag(wxT("audacitykeyboard")); xmlFile.EndTag(wxT("audacitykeyboard"));