diff --git a/Titan/LDBToTitan.lua b/Titan/LDBToTitan.lua index 8974c32..71f75f6 100644 --- a/Titan/LDBToTitan.lua +++ b/Titan/LDBToTitan.lua @@ -109,7 +109,7 @@ local iconTitanDefault = "Interface\\PVPFrame\\\PVP-ArenaPoints-Icon"; -- Events we want for LDBToTitan LDBToTitan:RegisterEvent("PLAYER_LOGIN") -LDBToTitan:RegisterEvent("PLAYER_ENTERING_WORLD") +--LDBToTitan:RegisterEvent("PLAYER_ENTERING_WORLD") local function If_Show_Tooltip() local use_mod = TitanAllGetVar("UseTooltipModifer") @@ -459,10 +459,15 @@ function TitanLDBShowText(name) end -- Check for display text - val1 = (ldb.text or "") + -- Check for display text -- .text is required to show -- .value is the text of the value - 100.0 in 100.0 FPS -- .suffix is the text after the value - FPS in 100.0 FPS + if TitanGetVar(name, "ShowRegularText") then + val1 = (ldb.text or "") + else + val1 = "" + end else -- return values will be empty strings end @@ -700,12 +705,14 @@ function LDBToTitan:TitanLDBCreateObject(_, name, obj) controlVariables = { ShowIcon = true, ShowLabelText = true, + ShowRegularText = false, ShowColoredText = false, DisplayOnRightSide = true }, savedVariables = { ShowIcon = true, ShowLabelText = true, + ShowRegularText = true, ShowColoredText = false, DisplayOnRightSide = false }, @@ -759,13 +766,17 @@ function LDBToTitan:TitanLDBCreateObject(_, name, obj) -- one interpretation of the LDB spec is launchers -- should always have an icon. registry["controlVariables"].ShowIcon = true; + registry["controlVariables"].ShowRegularText = false; -- no text -- defaults + registry["savedVariables"].ShowRegularText = false; registry["savedVariables"].DisplayOnRightSide = true; -- start on right side end if obj.type == DATA_SOURCE then -- controls + registry["controlVariables"].ShowRegularText = true; -- defaults + registry["savedVariables"].ShowRegularText = true; end -- @@ -882,9 +893,11 @@ LDBToTitan:SetScript("OnEvent", function(self, event, ...) --TitanDebug("Registered "..name.."."); end end - + +--[[ if (event == "PLAYER_ENTERING_WORLD") then self:UnregisterEvent("PLAYER_ENTERING_WORLD") end +--]] end ) \ No newline at end of file diff --git a/Titan/Titan.toc b/Titan/Titan.toc index e6219b6..dee6a1e 100644 --- a/Titan/Titan.toc +++ b/Titan/Titan.toc @@ -1,7 +1,7 @@ ## Interface: 100000 -## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa006.00.06.100000|r +## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa006.00.07.100000|r ## Author: Titan Panel Development Team -## Version: 6.00.06.100000 +## Version: 6.00.07.100000 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat ## OptionalDeps: Ace3, AceGUI-3.0-SharedMediaWidgets, LibSharedMedia-3.0, LibQTip-1.0, !LibUIDropDownMenu ## Notes: Adds a display bar on the top and/or bottom of the screen. Allows users to show and control information/launcher plugins. diff --git a/Titan/TitanConfig.lua b/Titan/TitanConfig.lua index b516790..3e709d5 100644 --- a/Titan/TitanConfig.lua +++ b/Titan/TitanConfig.lua @@ -1616,7 +1616,7 @@ local function TitanUpdateConfigAddons() end, } end ---[[ + --ShowRegularText (LDB data sources only atm) if plug_in.controlVariables and plug_in.controlVariables.ShowRegularText then args[plug_in.id].args.regular_text = @@ -1631,7 +1631,7 @@ local function TitanUpdateConfigAddons() end, } end ---]] + --ShowColoredText if plug_in.controlVariables and plug_in.controlVariables.ShowColoredText then args[plug_in.id].args.color_text = { diff --git a/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc index 9a76253..af73dc4 100644 --- a/TitanBag/TitanBag.toc +++ b/TitanBag/TitanBag.toc @@ -1,10 +1,10 @@ ## Interface: 100000 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa006.00.06.100000|r +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa006.00.07.100000|r ## Notes: Adds bag and free slot information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 6.00.06.100000 +## Version: 6.00.07.100000 ## X-Child-Of: Titan TitanBag.lua diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc index d9a3943..22b2c87 100644 --- a/TitanClock/TitanClock.toc +++ b/TitanClock/TitanClock.toc @@ -1,10 +1,10 @@ ## Interface: 100000 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa006.00.06.100000|r +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa006.00.07.100000|r ## Notes: Adds a clock to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 6.00.06.100000 +## Version: 6.00.07.100000 ## X-Child-Of: Titan TitanClock.lua diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc index 5778f0f..3eef8e7 100644 --- a/TitanGold/TitanGold.toc +++ b/TitanGold/TitanGold.toc @@ -1,10 +1,10 @@ ## Interface: 100000 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa006.00.06.100000|r +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa006.00.07.100000|r ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis. ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: GoldSave ## OptionalDeps: ## Dependencies: Titan -## Version: 6.00.06.100000 +## Version: 6.00.07.100000 ## X-Child-Of: Titan TitanGold.lua diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc index fb71e23..cb2cc16 100644 --- a/TitanLocation/TitanLocation.toc +++ b/TitanLocation/TitanLocation.toc @@ -1,10 +1,10 @@ ## Interface: 100000 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa006.00.06.100000|r +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa006.00.07.100000|r ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 6.00.06.100000 +## Version: 6.00.07.100000 ## X-Child-Of: Titan TitanLocation.lua diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc index 0c78673..63a5386 100644 --- a/TitanLootType/TitanLootType.toc +++ b/TitanLootType/TitanLootType.toc @@ -1,10 +1,10 @@ ## Interface: 100000 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa006.00.06.100000|r +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa006.00.07.100000|r ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 6.00.06.100000 +## Version: 6.00.07.100000 ## X-Child-Of: Titan TitanLootType.lua diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc index 48027ea..dd8e57b 100644 --- a/TitanPerformance/TitanPerformance.toc +++ b/TitanPerformance/TitanPerformance.toc @@ -1,10 +1,10 @@ ## Interface: 100000 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa006.00.06.100000|r +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa006.00.07.100000|r ## Notes: Adds FPS and Garbage collection information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 6.00.06.100000 +## Version: 6.00.07.100000 ## X-Child-Of: Titan TitanPerformance.lua diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc index 3a93184..c07b32d 100644 --- a/TitanRepair/TitanRepair.toc +++ b/TitanRepair/TitanRepair.toc @@ -1,10 +1,10 @@ ## Interface: 100000 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa006.00.06.100000|r +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa006.00.07.100000|r ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 6.00.06.100000 +## Version: 6.00.07.100000 ## X-Child-Of: Titan TitanRepair.lua diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc index 62300a0..caaf54b 100644 --- a/TitanVolume/TitanVolume.toc +++ b/TitanVolume/TitanVolume.toc @@ -1,10 +1,10 @@ ## Interface: 100000 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa006.00.06.23.7.100000|r +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa006.00.07.23.7.100000|r ## Notes: Adds a volume control icon on your Titan Bar ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 6.00.06.100000 +## Version: 6.00.07.100000 ## X-Child-Of: Titan TitanVolume.lua diff --git a/TitanXP/TitanXP.lua b/TitanXP/TitanXP.lua index 44f1452..04bf4af 100644 --- a/TitanXP/TitanXP.lua +++ b/TitanXP/TitanXP.lua @@ -543,10 +543,6 @@ local function Create_Frames() TitanPanelXPButton_OnShow() TitanPanelButton_OnShow(self) end) - window:SetScript("OnEnter", function(self) - TitanPanelVolumeButton_OnEnter() - TitanPanelButton_OnEnter(self) - end) window:SetScript("OnEvent", function(self, event, ...) TitanPanelXPButton_OnEvent(self, event, ...) end) diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc index f6e4d08..3ba6ae4 100644 --- a/TitanXP/TitanXP.toc +++ b/TitanXP/TitanXP.toc @@ -1,10 +1,10 @@ ## Interface: 100000 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa006.00.06.100000|r +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa006.00.07.100000|r ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 6.00.06.100000 +## Version: 6.00.07.100000 ## X-Child-Of: Titan TitanXP.lua