# HG changeset patch
# User Nenue
# Date 1473554393 14400
# Node ID 41f367b832a2f2bcbb2fd237c7842952cfffc2a6
# Parent  556e075983a6c36244cb5780e6903121ff2758f0
SecureTemplate attribute names and values match up with reality

diff -r 556e075983a6 -r 41f367b832a2 SkeletonKey/ActionTemplates.lua
--- a/SkeletonKey/ActionTemplates.lua	Sat Sep 10 19:08:19 2016 -0400
+++ b/SkeletonKey/ActionTemplates.lua	Sat Sep 10 20:39:53 2016 -0400
@@ -141,29 +141,30 @@
     local buttonActionKey, buttonActionValue = "*"..actionType.."-"..name, actionID
     local button = key
     if actionType == 'spell' then
-      buttonTypeKey = "*type-"..name
+      buttonTypeKey = name
       buttonTypeValue = actionType
       buttonActionKey = "*"..actionType.."-"..name
       buttonActionValue = name
     elseif actionType == 'item' then
-      buttonTypeKey = "*type-"..name
+      buttonTypeKey = name
       buttonTypeValue = actionType
       buttonActionKey = "*"..actionType.."-"..name
       buttonActionValue = actionID
     elseif actionType == 'macro' then
       button = macro
-      buttonTypeKey = "*macro-"..macroName
-      buttonTypeValue = actionID
-      buttonActionKey = nil
+      buttonTypeKey = macroName
+      buttonTypeValue = "macro"
+      buttonActionKey = "*macro-" .. macroName
+      buttonActionValue = name
     else
       button = macro
-      buttonTypeKey = "*macrotext-"..macroName
+      buttonTypeKey = macroName
       buttonTypeValue = macroText
       buttonActionKey = nil
     end
 
     --cprint(actionType, actionID, name)
-    kb.SecureAttribute(button, buttonTypeKey, buttonTypeValue)
+    kb.SecureAttribute(button, "*type-"..buttonTypeKey, buttonTypeValue)
     if buttonActionKey then
       --cprint(button:GetName(), buttonActionKey,'=', buttonActionValue)
       kb.SecureAttribute(button, buttonActionKey, buttonActionValue)
@@ -246,7 +247,7 @@
   for index = 1, GetNumMacros() do
     local name = GetMacroInfo(index)
     kb.SecureAttribute(KeyBinderMacro, "*type-macro_"..tostring(name), 'macro')
-    kb.SecureAttribute(KeyBinderMacro, "*macro-macro_"..tostring(name), i)
+    kb.SecureAttribute(KeyBinderMacro, "*macro-macro_"..tostring(name), index)
   end
 end