Mercurial > wow > skeletonkey

diff SkeletonKey/ActionTemplates.lua @ 66:41f367b832a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SecureTemplate attribute names and values match up with reality
author Nenue
date Sat, 10 Sep 2016 20:39:53 -0400
parents 556e075983a6
children ecd6c6116b9c
line wrap: on
line diff
--- 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