From c36f87a3b651cedd5960f29cced8d403440b2543 Mon Sep 17 00:00:00 2001 From: tercio Date: Sun, 22 Jun 2014 19:46:55 -0300 Subject: [PATCH] v1.17.0a --- boot.lua | 2 +- framework/button.lua | 2 +- framework/dropdown.lua | 8 ++++++-- framework/textentry.lua | 2 +- gumps/janela_custom.lua | 8 ++++++++ locales/Details-enUS.lua | 11 +++++++++++ 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/boot.lua b/boot.lua index 412648bd..04571463 100644 --- a/boot.lua +++ b/boot.lua @@ -8,7 +8,7 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0", "LibHotCorners") - _detalhes.userversion = "v1.17.0" + _detalhes.userversion = "v1.17.0a" _detalhes.version = "Alpha 020" _detalhes.realversion = 20 diff --git a/framework/button.lua b/framework/button.lua index ec34d8f9..fc575caa 100644 --- a/framework/button.lua +++ b/framework/button.lua @@ -471,7 +471,7 @@ local ButtonMetaFunctions = {} end if (button.MyObject.have_tooltip) then - _detalhes:CooltipPreset (1) + _detalhes:CooltipPreset (2) GameCooltip:AddLine (button.MyObject.have_tooltip) GameCooltip:ShowCooltip (button, "tooltip") end diff --git a/framework/dropdown.lua b/framework/dropdown.lua index 45d15aba..2d390da7 100644 --- a/framework/dropdown.lua +++ b/framework/dropdown.lua @@ -492,12 +492,15 @@ end function DetailsDropDownOptionOnEnter (frame) if (frame.table.desc) then - _detalhes:CooltipPreset (1) + _detalhes:CooltipPreset (2) GameCooltip:AddLine (frame.table.desc) if (frame.table.descfont) then GameCooltip:SetOption ("TextFont", frame.table.descfont) end - GameCooltip:ShowCooltip(frame:GetParent():GetParent():GetParent(), "tooltip") + + GameCooltip:SetHost (frame, "topleft", "topright", 10, 0) + + GameCooltip:ShowCooltip (nil, "tooltip") frame.tooltip = true end frame:GetParent().mouseover:SetPoint ("left", frame) @@ -725,6 +728,7 @@ function DetailsDropDownOnEnter (self) GameCooltip:Reset() GameCooltip:SetType ("tooltip") GameCooltip:SetColor ("main", "transparent") + _detalhes:CooltipPreset (2) GameCooltip:AddLine (self.MyObject.have_tooltip) GameCooltip:SetOwner (self) GameCooltip:ShowCooltip() diff --git a/framework/textentry.lua b/framework/textentry.lua index 36a2db32..389331c4 100644 --- a/framework/textentry.lua +++ b/framework/textentry.lua @@ -283,7 +283,7 @@ local TextEntryMetaFunctions = {} end if (textentry.MyObject.have_tooltip) then - _detalhes:CooltipPreset (1) + _detalhes:CooltipPreset (2) GameCooltip:AddLine (textentry.MyObject.have_tooltip) GameCooltip:ShowCooltip (textentry, "tooltip") end diff --git a/gumps/janela_custom.lua b/gumps/janela_custom.lua index 9e07ffe7..9cadf8c0 100644 --- a/gumps/janela_custom.lua +++ b/gumps/janela_custom.lua @@ -736,6 +736,7 @@ local name_field = gump:NewTextEntry (box0, nil, "$parentNameEntry", "nameentry", 200, 20) name_field:SetPoint ("left", name_label, "left", 62, 0) + name_field.tooltip = Loc ["STRING_CUSTOM_NAME_DESC"] custom_window.name_field = name_field --author @@ -744,6 +745,7 @@ local author_field = gump:NewTextEntry (box0, nil, "$parentAuthorEntry", "authorentry", 200, 20) author_field:SetPoint ("left", author_label, "left", 62, 0) + author_field.tooltip = Loc ["STRING_CUSTOM_AUTHOR_DESC"] author_field:SetText (UnitName ("player") .. "-" .. GetRealmName()) custom_window.author_field = author_field @@ -753,6 +755,7 @@ local desc_field = gump:NewTextEntry (box0, nil, "$parentDescEntry", "descentry", 200, 20) desc_field:SetPoint ("left", desc_label, "left", 62, 0) + desc_field.tooltip = Loc ["STRING_CUSTOM_DESCRIPTION_DESC"] custom_window.desc_field = desc_field --icon @@ -820,6 +823,7 @@ local build_source_list = function() return targeting_options end local source_dropdown = gump:NewDropDown (box1, nil, "$parentSourceDropdown", "sourcedropdown", 178, 20, build_source_list, 1) source_dropdown:SetPoint ("left", source_label, "left", 62, 0) + source_dropdown.tooltip = Loc ["STRING_CUSTOM_SOURCE_DESC"] custom_window.source_dropdown = source_dropdown local source_field = gump:NewTextEntry (box1, nil, "$parentSourceEntry", "sourceentry", 201, 20) @@ -1048,6 +1052,7 @@ local build_target_list = function() return targeting_options end local target_dropdown = gump:NewDropDown (box1, nil, "$parentTargetDropdown", "targetdropdown", 178, 20, build_target_list, 1) target_dropdown:SetPoint ("left", target_label, "left", 62, 0) + target_dropdown.tooltip = Loc ["STRING_CUSTOM_TARGET_DESC"] custom_window.target_dropdown = target_dropdown local target_field = gump:NewTextEntry (box1, nil, "$parentTargetEntry", "targetentry", 201, 20) @@ -1243,6 +1248,7 @@ local spellid_entry = gump:NewSpellEntry (box1, function()end, 178, 20, nil, nil, "spellidentry", "$parentSpellIdEntry") spellid_entry:SetPoint ("left", spellid_label, "left", 62, 0) + spellid_entry.tooltip = Loc ["STRING_CUSTOM_SPELLID_DESC"] custom_window.spellid_entry = spellid_entry local spell_id_boss = CreateFrame ("frame", nil, box1) @@ -1424,11 +1430,13 @@ --edit main code local maincode_button = gump:NewButton (box2, nil, "$parentMainCodeButton", "maiccodebutton", 160, 20, DetailsCustomPanel.StartEditCode, 1, nil, nil, Loc ["STRING_CUSTOM_EDIT_SEARCH_CODE"]) maincode_button:SetPoint ("topleft", box2, "topleft", 10, -25) + maincode_button.tooltip = Loc ["STRING_CUSTOM_EDITCODE_DESC"] maincode_button:InstallCustomTexture() --edit tooltip code local tooltipcode_button = gump:NewButton (box2, nil, "$parentTooltipCodeButton", "tooltipcodebutton", 160, 20, DetailsCustomPanel.StartEditCode, 2, nil, nil, Loc ["STRING_CUSTOM_EDIT_TOOLTIP_CODE"]) tooltipcode_button:SetPoint ("topleft", maincode_button, "bottomleft", 0, -10) + tooltipcode_button.tooltip = Loc ["STRING_CUSTOM_EDITTOOLTIP_DESC"] tooltipcode_button:InstallCustomTexture() box2:Hide() diff --git a/locales/Details-enUS.lua b/locales/Details-enUS.lua index 5fe10ced..174356ab 100644 --- a/locales/Details-enUS.lua +++ b/locales/Details-enUS.lua @@ -171,6 +171,17 @@ if not Loc then return end Loc ["STRING_CUSTOM_HEALTHSTONE_DEFAULT"] = "Healthstone Used" Loc ["STRING_CUSTOM_HEALTHSTONE_DEFAULT_DESC"] = "Show who in your raid group used the healthstone." + Loc ["STRING_CUSTOM_NAME_DESC"] = "Insert the name of your new custom display." + Loc ["STRING_CUSTOM_AUTHOR_DESC"] = "Who created this display." + Loc ["STRING_CUSTOM_DESCRIPTION_DESC"] = "Description about what this display does." + + Loc ["STRING_CUSTOM_SOURCE_DESC"] = "Who is triggering the effect.\n\nThe button in the right shows a list of npcs from raid encounters." + Loc ["STRING_CUSTOM_TARGET_DESC"] = "This is the target of the source.\n\nThe button in the right shows a list of npcs from raid encounters." + Loc ["STRING_CUSTOM_SPELLID_DESC"] = "Opcional, is the spell used by the source to apply the effect on the target.\n\nThe button in the right shows a list of spells from raid encounters." + + Loc ["STRING_CUSTOM_EDITCODE_DESC"] = "This is a advanced function where the user can create its own display code." + Loc ["STRING_CUSTOM_EDITTOOLTIP_DESC"] = "This is the code which runs after the used hover over a row using this display." + --> Switch Window Loc ["STRING_SWITCH_CLICKME"] = "left click me"