Mercurial > wow > reaction

changeset 264:d2e55b61e5e6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 1.1 beta 6 to stable
author Flick
date Fri, 06 May 2011 15:52:21 -0700
parents a7d2efb6ffc9 (current diff) e0071c480445 (diff)
children c5b945c4209c
files .hgtags
diffstat 20 files changed, 133 insertions(+), 86 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Apr 12 16:07:21 2011 -0700
+++ b/.hgtags	Fri May 06 15:52:21 2011 -0700
@@ -3,3 +3,4 @@
 3e451836ce6dfa758794c27a4b3a2a1f12595e83 1.1 Beta 3
 47818b3938c912c19018419cb5738d4013107167 1.1 beta 4
 455ef506f9695045737410a6529c9c6eb7d33022 1.1 beta 5
+b2e401183d36cd1283df64eef68a92a9ce08cc46 1.1 beta 6
--- a/ActionButton.lua	Tue Apr 12 16:07:21 2011 -0700
+++ b/ActionButton.lua	Fri May 06 15:52:21 2011 -0700
@@ -230,9 +230,7 @@
   f:SetScript("OnReceiveDrag", function(frame) self:OnReceiveDrag() end)
 
   -- event registration
-  f:EnableMouse(true)
   f:RegisterForDrag("LeftButton", "RightButton")
-  f:RegisterForClicks("AnyUp")
   for _, evt in pairs(eventList) do
     f:RegisterEvent(evt)
   end
--- a/BagButton.lua	Tue Apr 12 16:07:21 2011 -0700
+++ b/BagButton.lua	Fri May 06 15:52:21 2011 -0700
@@ -80,8 +80,6 @@
   -- (none)
 
   -- event registration
-  f:EnableMouse(true)
-  f:RegisterForClicks("LeftButtonUp","RightButtonUp")
   f:RegisterEvent("UPDATE_BINDINGS")
 
   -- frame setup
--- a/Button.lua	Tue Apr 12 16:07:21 2011 -0700
+++ b/Button.lua	Fri May 06 15:52:21 2011 -0700
@@ -85,6 +85,10 @@
     return format("%s:%s", bar:GetName(), idx)
   end
 
+  -- mouse and clicking
+  -- set click handlers in subclasses
+  f:EnableMouse(true)
+  f:RegisterForClicks( bar:GetConfig().clickDown and "AnyDown" or "AnyUp" )
   local clickBinding = format("CLICK %s:LeftButton", name)
   function f:GetHotkey()
     return LKB:ToShortKey(GetBindingKey(clickBinding))
--- a/Editor.lua	Tue Apr 12 16:07:21 2011 -0700
+++ b/Editor.lua	Fri May 06 15:52:21 2011 -0700
@@ -255,10 +255,19 @@
               func = function() ReAction:EraseBar(bar) end,
               order = 2
             },
+            clickDown = {
+              type = "toggle",
+              name = L["Activate on Down"],
+              desc = L["Activate the button when the key or mouse button is pressed down instead of when it is released"],
+              order = 3,
+              set  = function(info, value) bar:GetConfig().clickDown = value; ReAction:RebuildAll() end,
+              get  = function() return bar:GetConfig().clickDown end,
+            },
             anchor = {
               type = "group",
               name = L["Anchor"],
               inline = true,
+              order = 4,
               args = {
                 frame = {
                   type = "input",
@@ -321,7 +330,6 @@
                   order = 5
                 },
               },
-              order = 3
             },
             alpha = {
               type = "range",
@@ -1015,7 +1023,7 @@
         },
         ordering = {
           name = L["Evaluation Order"],
-          desc = L["State transitions are evaluated in the order listed:\nMove a state up or down to change the order"],
+          desc = L["State transitions are evaluated in the order listed: Move a state up or down to change the order"],
           order = 2,
           type = "group",
           inline = true,
--- a/MultiCastButton.lua	Tue Apr 12 16:07:21 2011 -0700
+++ b/MultiCastButton.lua	Fri May 06 15:52:21 2011 -0700
@@ -395,8 +395,6 @@
   barFrame:WrapScript(f, "OnEnter", _onEnter)
 
   -- event registration
-  f:EnableMouse(true)
-  f:RegisterForClicks("AnyUp")
   for _, evt in pairs(eventList) do
     f:RegisterEvent(evt)
   end
@@ -734,7 +732,8 @@
       b.icon:Show()
       b:SetHighlightTexture("Interface\\Buttons\\ButtonHilight-Square")
       b:GetHighlightTexture():SetBlendMode("ADD")
-      b:RegisterForClicks("AnyUp")
+      b:EnableMouse(true)
+      b:RegisterForClicks(bar:GetConfig().clickDown and "AnyDown" or "AnyUp")
       b:SetScript("OnShow",UpdateFlyoutIcon)
       b:SetScript("OnEnter",ShowFlyoutTooltip)
       b:SetScript("OnLeave",HideFlyoutTooltip)
--- a/PetActionButton.lua	Tue Apr 12 16:07:21 2011 -0700
+++ b/PetActionButton.lua	Fri May 06 15:52:21 2011 -0700
@@ -140,9 +140,7 @@
   barFrame:WrapScript(f, "OnReceiveDrag", _onReceiveDrag)
 
   -- event registration
-  f:EnableMouse(true)
   f:RegisterForDrag("LeftButton", "RightButton")
-  f:RegisterForClicks("AnyUp")
   for _, evt in pairs(eventList) do
     f:RegisterEvent(evt)
   end
--- a/ReAction.toc	Tue Apr 12 16:07:21 2011 -0700
+++ b/ReAction.toc	Fri May 06 15:52:21 2011 -0700
@@ -1,4 +1,4 @@
-## Interface: 40000
+## Interface: 40100
 ## Title: ReAction
 ## Notes: Action button layout and configuration
 ## DefaultState: enabled
--- a/StanceButton.lua	Tue Apr 12 16:07:21 2011 -0700
+++ b/StanceButton.lua	Fri May 06 15:52:21 2011 -0700
@@ -77,8 +77,6 @@
   -- (none)
 
   -- event registration
-  f:EnableMouse(true)
-  f:RegisterForClicks("AnyUp")
   for _, evt in pairs(eventList) do
     f:RegisterEvent(evt)
   end
--- a/VehicleExitButton.lua	Tue Apr 12 16:07:21 2011 -0700
+++ b/VehicleExitButton.lua	Fri May 06 15:52:21 2011 -0700
@@ -48,8 +48,6 @@
   f:SetScript("OnEvent", function(frame, evt, ...) self:OnEvent(evt,...) end)
 
   -- event registration
-  f:EnableMouse(true)
-  f:RegisterForClicks("AnyUp")
   f:RegisterEvent("UPDATE_BINDINGS")
 
   -- attach to skinner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale/deDE.lua	Fri May 06 15:52:21 2011 -0700
@@ -0,0 +1,4 @@
+local L = LibStub("AceLocale-3.0"):NewLocale("ReAction","deDE")
+if not L then return end
+
+--@localization(locale="deDE", format="lua_additive_table")@
--- a/locale/enUS.lua	Tue Apr 12 16:07:21 2011 -0700
+++ b/locale/enUS.lua	Fri May 06 15:52:21 2011 -0700
@@ -1,7 +1,7 @@
 local L = LibStub("AceLocale-3.0"):NewLocale("ReAction","enUS",true)
 if not L then return end
 
-for _, string in pairs({
+for _, s in pairs({
 
 -- ReAction.lua
 "ReAction: name '%s' already in use",
@@ -68,6 +68,8 @@
 "General",
 "Rename Bar",
 "Delete Bar",
+"Activate on Down",
+"Activate the button when the key or mouse button is pressed down instead of when it is released",
 "Anchor",
 "Frame",
 "The frame that the bar is anchored to",
@@ -78,50 +80,35 @@
 "X offset",
 "Y offset",
 "Transparency",
-
--- classes/ActionButton.lua
-"Action Bar",
-"Action ID range is 1-120",
-
--- classes/BagButton.lua --
-"Bag Bar",
-
--- classes/Bar.lua
-"Hidden",
-
--- classes/Button.lua --
-"Button Bar",
-
--- classes/Overlay.lua
-"Hold Shift",
-"Hold Alt",
-"Right-click",
-"Drag",
-"to add/remove buttons:",
-"to resize buttons:",
-"to change spacing:",
-"to change scale:",
-"to move",
-"to anchor to nearby frames",
-"for options...",
-"Currently anchored to",
-"State",
-"State Scale Override",
-
--- classes/MultiCastButton.lua
-"Totem Bar",
-
--- classes/PetActionButton.lua
-"Pet Action Bar",
-"Pet action ID range is 1-10",
-
--- classes/StanceButton.lua
-"Stance Bar",
-
--- classes/VehicleExitButton.lua
-"Exit Vehicle Floater",
-
--- modules/State.lua
+"Action Bars",
+"Hide Empty Buttons",
+"Lock Buttons",
+"Prevents picking up/dragging actions (use SHIFT to override this behavior)",
+"Only in Combat",
+"Only lock the buttons when in combat",
+"# Pages",
+"Use the Dynamic State tab to specify page transitions",
+"Edit Action IDs",
+"Assign",
+"Choose Method...",
+"Individually",
+"All at Once",
+"Row",
+"Rows are numbered top to bottom",
+"Col",
+"Columns are numbered left to right",
+"Page",
+"Action ID",
+"Specify ID 1-120",
+"ID List",
+"Specify a comma-separated list of IDs for each button in the bar (in order). Separate multiple pages with semicolons (;)",
+"Invalid action ID list string",
+"Mind Control Support",
+"When possessing a target (e.g. via Mind Control), map the first 12 buttons of this bar to the possessed target's actions.",
+"Vehicle Support",
+"When on a vehicle, map the first 6 buttons of this bar to the vehicle actions. The vehicle-exit button is mapped to the 7th button. Pitch controls are not supported.",
+"Show Page #",
+"Action Buttons",
 "State named '%s' already exists",
 "Battle Stance",
 "Defensive Stance",
@@ -158,7 +145,7 @@
 "Delete this State",
 "Name",
 "Evaluation Order",
-"State transitions are evaluated in the order listed:\nMove a state up or down to change the order",
+"State transitions are evaluated in the order listed: Move a state up or down to change the order",
 "Up",
 "Down",
 "Properties",
@@ -202,42 +189,7 @@
 "State names must be alphanumeric without spaces",
 "Create State",
 "State named '%s' already exists",
-
--- modules/Action.lua
-"Action Bars",
-"Hide Empty Buttons",
-"Lock Buttons",
-"Prevents picking up/dragging actions (use SHIFT to override this behavior)",
-"Only in Combat",
-"Only lock the buttons when in combat",
-"# Pages",
-"Use the Dynamic State tab to specify page transitions",
-"Edit Action IDs",
-"Assign",
-"Choose Method...",
-"Individually",
-"All at Once",
-"Row",
-"Rows are numbered top to bottom",
-"Col",
-"Columns are numbered left to right",
-"Page",
-"Action ID",
-"Specify ID 1-120",
-"ID List",
-"Specify a comma-separated list of IDs for each button in the bar (in order). Separate multiple pages with semicolons (;)",
-"Invalid action ID list string",
-"Mind Control Support",
-"When possessing a target (e.g. via Mind Control), map the first 12 buttons of this bar to the possessed target's actions.",
-"Vehicle Support",
-"When on a vehicle, map the first 6 buttons of this bar to the vehicle actions. The vehicle-exit button is mapped to the 7th button. Pitch controls are not supported.",
-"Show Page #",
-"Action Buttons",
-
--- modules/PetAction.lua
 "Pet Buttons",
-
--- modules/Stance.lua
 "Stance Buttons",
 "Show Aspects",
 "Show Hunter aspects as stances",
@@ -247,13 +199,52 @@
 "Do not show Death Knight Presences as stances",
 "Hide Auras",
 "Do not show Paladin Auras as stances",
-
--- modules/VehicleExit.lua
 "Exit Vehicle",
 "Show only when passenger",
 "Only show the button when riding as a passenger in a vehicle (no vehicle controls)",
 
+-- ActionButton.lua
+"Action Bar",
+"Action ID range is 1-120",
+
+-- BagButton.lua --
+"Bag Bar",
+
+-- Bar.lua
+"Hidden",
+
+-- Button.lua --
+"Button Bar",
+
+-- Overlay.lua
+"Hold Shift",
+"Hold Alt",
+"Right-click",
+"Drag",
+"to add/remove buttons:",
+"to resize buttons:",
+"to change spacing:",
+"to change scale:",
+"to move",
+"to anchor to nearby frames",
+"for options...",
+"Currently anchored to",
+"State",
+"State Scale Override",
+
+-- MultiCastButton.lua
+"Totem Bar",
+
+-- PetActionButton.lua
+"Pet Action Bar",
+"Pet action ID range is 1-10",
+
+-- StanceButton.lua
+"Stance Bar",
+
+-- VehicleExitButton.lua
+"Exit Vehicle Floater",
 
 }) do
-  L[string] = true
+  L[s] = true
 end
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale/esES.lua	Fri May 06 15:52:21 2011 -0700
@@ -0,0 +1,4 @@
+local L = LibStub("AceLocale-3.0"):NewLocale("ReAction","esES")
+if not L then return end
+
+--@localization(locale="esES", format="lua_additive_table")@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale/esMX.lua	Fri May 06 15:52:21 2011 -0700
@@ -0,0 +1,4 @@
+local L = LibStub("AceLocale-3.0"):NewLocale("ReAction","esMX")
+if not L then return end
+
+--@localization(locale="esMX", format="lua_additive_table")@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale/frFR.lua	Fri May 06 15:52:21 2011 -0700
@@ -0,0 +1,4 @@
+local L = LibStub("AceLocale-3.0"):NewLocale("ReAction","frFR")
+if not L then return end
+
+--@localization(locale="frFR", format="lua_additive_table")@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale/koKR.lua	Fri May 06 15:52:21 2011 -0700
@@ -0,0 +1,4 @@
+local L = LibStub("AceLocale-3.0"):NewLocale("ReAction","koKR")
+if not L then return end
+
+--@localization(locale="koKR", format="lua_additive_table")@
--- a/locale/locale.xml	Tue Apr 12 16:07:21 2011 -0700
+++ b/locale/locale.xml	Fri May 06 15:52:21 2011 -0700
@@ -3,5 +3,13 @@
     xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
 
   <Script file="enUS.lua"/>
+  <Script file="deDE.lua"/>
+  <Script file="esES.lua"/>
+  <Script file="esMX.lua"/>
+  <Script file="frFR.lua"/>
+  <Script file="koKR.lua"/>
+  <Script file="ruRU.lua"/>
+  <Script file="zhCN.lua"/>
+  <Script file="zhTW.lua"/>
 
 </Ui>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale/ruRU.lua	Fri May 06 15:52:21 2011 -0700
@@ -0,0 +1,4 @@
+local L = LibStub("AceLocale-3.0"):NewLocale("ReAction","ruRU")
+if not L then return end
+
+--@localization(locale="ruRU", format="lua_additive_table")@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale/zhCN.lua	Fri May 06 15:52:21 2011 -0700
@@ -0,0 +1,4 @@
+local L = LibStub("AceLocale-3.0"):NewLocale("ReAction","zhCN")
+if not L then return end
+
+--@localization(locale="zhCN", format="lua_additive_table")@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locale/zhTW.lua	Fri May 06 15:52:21 2011 -0700
@@ -0,0 +1,4 @@
+local L = LibStub("AceLocale-3.0"):NewLocale("ReAction","zhTW")
+if not L then return end
+
+--@localization(locale="zhTW", format="lua_additive_table")@