comparison ReAction.lua @ 305:0211bcdfab70 stable

Merge 1.1 beta 12 to stable
author Flick
date Wed, 14 Nov 2012 16:47:27 -0800
parents 0cb6a9944497
children
comparison
equal deleted inserted replaced
294:30c9bdaad7a3 305:0211bcdfab70
93 end 93 end
94 94
95 -- It's fairly normal to use the Blizzard vehicle bar, and to have 95 -- It's fairly normal to use the Blizzard vehicle bar, and to have
96 -- your regular buttons in the same location. If you do this, and don't 96 -- your regular buttons in the same location. If you do this, and don't
97 -- bother to hide your buttons, they'll obscure some parts of the vehicle bar. 97 -- bother to hide your buttons, they'll obscure some parts of the vehicle bar.
98 VehicleMenuBar:SetFrameLevel(VehicleMenuBar:GetFrameLevel()+3) 98 -- VehicleMenuBar:SetFrameLevel(VehicleMenuBar:GetFrameLevel()+3)
99 99
100 self.callbacks = LibStub("CallbackHandler-1.0"):New(self) 100 self.callbacks = LibStub("CallbackHandler-1.0"):New(self)
101 101
102 LKB.RegisterCallback(self,"LIBKEYBOUND_ENABLED") 102 LKB.RegisterCallback(self,"LIBKEYBOUND_ENABLED")
103 LKB.RegisterCallback(self,"LIBKEYBOUND_DISABLED") 103 LKB.RegisterCallback(self,"LIBKEYBOUND_DISABLED")
352 352
353 function ReAction:ManageBlizzardBars() 353 function ReAction:ManageBlizzardBars()
354 for _, f in pairs(blizzFrames) do 354 for _, f in pairs(blizzFrames) do
355 ManageBlizzFrame(f, self.db.profile.options.hideBlizzardBars) 355 ManageBlizzFrame(f, self.db.profile.options.hideBlizzardBars)
356 end 356 end
357 ManageBlizzFrame(VehicleMenuBar, self.db.profile.options.hideBlizzardVehicleBar) 357 --ManageBlizzFrame(VehicleMenuBar, self.db.profile.options.hideBlizzardVehicleBar)
358 end 358 end
359 359
360 function ReAction:RegisterBarType( class, isDefault ) 360 function ReAction:RegisterBarType( class, isDefault )
361 local name = class:GetButtonTypeID() 361 local name = class:GetButtonTypeID()
362 self.barTypes[name] = class 362 self.barTypes[name] = class