[dongle commit] r669 - trunk/OptionHouse
codesite...@google.com
Date: Thu Apr 24 21:56:21 2008
New Revision: 669
Modified:
trunk/OptionHouse/OH_Configuration.lua
trunk/OptionHouse/OptionHouse.lua
trunk/OptionHouse/OptionHouse.toc
Log:
* You can now open OH through the API's while in combat
* When using standalone, you can set the OH frame to hide in combat by
default it won't
* Fixed positioning when using standalone, will account for scale
correctly now
Modified: trunk/OptionHouse/OH_Configuration.lua
==============================================================================
--- trunk/OptionHouse/OH_Configuration.lua (original)
+++ trunk/OptionHouse/OH_Configuration.lua Thu Apr 24 21:56:21 2008
@@ -12,6 +12,7 @@
["CHILDREN_ENABLE"] = "Enable children addons from management panel",
["GENERAL"] = "General",
["LOCK"] = "Lock OptionHouse frame",
+ ["HIDE_COMBAT"] = "Hide OptionHouse when entering combat",
}
function OHConfig:Enable()
@@ -32,6 +33,7 @@
perfFontSize = 10,
manageFontSize = 10,
locked = true,
+ combatHide = false,
}
self.db = setmetatable(OptionHouseDB, {
@@ -46,6 +48,7 @@
if( self.db.enablePerf ) then
OHPerformance:Register()
+ --OHPerfGraph:Register()
end
end
@@ -79,20 +82,36 @@
end
end )
+ -- COMBAT HIDING
+ self.hideOH = CreateFrame("CheckButton", "OHConfigUIHide", frame, "OptionsCheckButtonTemplate")
+ self.hideOH:SetWidth(32)
+ self.hideOH:SetHeight(32)
+ self.hideOH:SetPoint("TOPLEFT", 5, -35)
+ OHConfigUIHideText:SetText(L["HIDE_COMBAT"])
+ self.hideOH:SetScript("OnClick", function(self)
+ if( self:GetChecked() ) then
+ OHConfig.db.combatHide = true
+ else
+ OHConfig.db.combatHide = false
+ end
+ end )
+
-- ENABLE PERFORMANCE TAB
self.perfCheck = CreateFrame("CheckButton", "OHConfigUIPerformance", frame, "OptionsCheckButtonTemplate")
self.perfCheck:SetWidth(32)
self.perfCheck:SetHeight(32)
- self.perfCheck:SetPoint("TOPLEFT", 5, -35)
+ self.perfCheck:SetPoint("TOPLEFT", 5, -65)
OHConfigUIPerformanceText:SetText(L["ENABLE_PERFORMANCE"])
self.perfCheck:SetScript("OnClick", function(self)
if( self:GetChecked() ) then
OHConfig.db.enablePerf = true
OHPerformance:Register()
+ OHPerfGraph:Register()
else
OHConfig.db.enablePerf = false
OHPerformance:Unregister()
+ OHPerfGraph:Unregister()
end
end )
@@ -102,7 +121,7 @@
self.perfSize:SetHeight(20)
self.perfSize:SetWidth(75)
self.perfSize:SetNumeric(true)
- self.perfSize:SetPoint("TOPLEFT", 15, -70)
+ self.perfSize:SetPoint("TOPLEFT", 15, -96)
self.perfSize:SetScript("OnTextChanged", function(self)
OHConfig.db.perfFontSize = self:GetNumber()
OHPerformance:Reload()
@@ -116,7 +135,7 @@
self.manageCheck = CreateFrame("CheckButton", "OHConfigUIManage", frame, "OptionsCheckButtonTemplate")
self.manageCheck:SetWidth(32)
self.manageCheck:SetHeight(32)
- self.manageCheck:SetPoint("TOPLEFT", 5, -93)
+ self.manageCheck:SetPoint("TOPLEFT", 5, -125)
OHConfigUIManageText:SetText( L["ENABLE_MANAGEMENT"])
self.manageCheck:SetScript("OnClick", function(self)
if( self:GetChecked() ) then
@@ -134,7 +153,7 @@
self.manageSize:SetHeight(20)
self.manageSize:SetWidth(75)
self.manageSize:SetNumeric(true)
- self.manageSize:SetPoint("TOPLEFT", 15, -125)
+ self.manageSize:SetPoint("TOPLEFT", 15, -155)
self.manageSize:SetScript("OnTextChanged", function(self)
OHConfig.db.manageFontSize = self:GetNumber()
OHManage:Reload()
@@ -146,7 +165,7 @@
-- DROPDOWN FOR DEPENDENCY
self.dependMode = CreateFrame("Frame", "OHConfigUIDepMode", frame, "UIDropDownMenuTemplate")
- self.dependMode:SetPoint("TOPLEFT", -10, -155)
+ self.dependMode:SetPoint("TOPLEFT", -10, -190)
self.dependMode:SetScript("OnShow", function(self)
UIDropDownMenu_Initialize(self, OHConfig.InitDepDropdown)
UIDropDownMenu_SetSelectedValue(OHConfigUIDepMode, OHConfig.db.dependMode)
@@ -158,7 +177,7 @@
-- DROPDOWN FOR CHILDREN
self.childMode = CreateFrame("Frame", "OHConfigUIChildMode", frame, "UIDropDownMenuTemplate")
- self.childMode:SetPoint("TOPLEFT", -10, -190)
+ self.childMode:SetPoint("TOPLEFT", -10, -220)
self.childMode:SetScript("OnShow", function(self)
UIDropDownMenu_Initialize(self, OHConfig.InitChildDropdown)
UIDropDownMenu_SetSelectedValue(OHConfigUIChildMode, OHConfig.db.childMode)
Modified: trunk/OptionHouse/OptionHouse.lua
==============================================================================
--- trunk/OptionHouse/OptionHouse.lua (original)
+++ trunk/OptionHouse/OptionHouse.lua Thu Apr 24 21:56:21 2008
@@ -960,20 +960,11 @@
end)
frame:SetScript("OnShow", function(self)
if( OptionHouseDB and OptionHouseDB.position ) then
+ local scale = self:GetEffectiveScale()
+
self:ClearAllPoints()
- self:SetPoint("TOPLEFT", nil, "BOTTOMLEFT",
OptionHouseDB.position.x, OptionHouseDB.position.y)
- end
-
- --[[
- -- Check if we're secure
- if( self:IsProtected() ) then
- self:SetTexCoord(0, 0.25, 0, 1)
- self.tooltip = L["SECURE_FRAME"]
- else
- self:SetTexCoord(0.25, 0.50, 0, 1)
- self.tooltip = L["INSECURE_FRAME"]
+ self:SetPoint("TOPLEFT", nil, "BOTTOMLEFT",
OptionHouseDB.position.x / scale, OptionHouseDB.position.y / scale)
end
- ]]
end)
@@ -1019,10 +1010,12 @@
mover:SetScript("OnMouseUp", function(self)
if( self.isMoving ) then
local parent = self:GetParent()
- parent:StopMovingOrSizing()
- OptionHouseDB.position = {x = parent:GetLeft(), y = parent:GetTop()}
-
+ local scale = parent:GetEffectiveScale()
+
self.isMoving = nil
+ parent:StopMovingOrSizing()
+
+ OptionHouseDB.position = {x = parent:GetLeft() * scale, y =
parent:GetTop() * scale}
end
end)
@@ -1169,11 +1162,6 @@
end
function OptionHouse:Open(addonName, parentCat, childCat)
- if( InCombatLockdown() ) then
- DEFAULT_CHAT_FRAME:AddMessage(L["IN_COMBAT"])
- return
- end
-
argcheck(addonName, 1, "string", "nil")
argcheck(parentCat, 2, "string", "nil")
argcheck(childCat, 3, "string", "nil")
@@ -1195,11 +1183,6 @@
end
function OptionHouse:OpenTab(id)
- if( InCombatLockdown() ) then
- DEFAULT_CHAT_FRAME:AddMessage(L["IN_COMBAT"])
- return
- end
-
argcheck(id, 1, "number")
createOHFrame()
@@ -1332,11 +1315,12 @@
-- Secure headers are supported so don't want the window stuck open
in combat
evtFrame = CreateFrame("Frame")
evtFrame:RegisterEvent("PLAYER_REGEN_DISABLED")
- evtFrame:RegisterEvent("ADDON_LOADED")
evtFrame:SetScript("OnEvent",function(self, event)
if( event == "PLAYER_REGEN_DISABLED" and frame and frame:IsShown()
) then
- HideUIPanel(frame)
- DEFAULT_CHAT_FRAME:AddMessage(L["ENTERED_COMBAT"])
+ if( not OptionHouseDB or ( OptionHouseDB and
OptionHouseDB.combatHide ) ) then
+ HideUIPanel(frame)
+ DEFAULT_CHAT_FRAME:AddMessage(L["ENTERED_COMBAT"])
+ end
end
end)
Modified: trunk/OptionHouse/OptionHouse.toc
==============================================================================
--- trunk/OptionHouse/OptionHouse.toc (original)
+++ trunk/OptionHouse/OptionHouse.toc Thu Apr 24 21:56:21 2008
@@ -3,8 +3,8 @@
## Author: Dongle Dev Team
## SavedVariables: OptionHouseDB
-LibStub.lua
OptionHouse.lua
+
OH_Configuration.lua
OH_AddOns.lua
-OH_PerfMon.lua
+OH_PerfMon.lua
\ No newline at end of file