diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index 52085ecf..5323e6e1 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -1,5 +1,5 @@ -local dversion = 22 +local dversion = 24 local major, minor = "DetailsFramework-1.0", dversion local DF, oldminor = LibStub:NewLibrary (major, minor) diff --git a/Libs/DF/normal_bar.lua b/Libs/DF/normal_bar.lua index 5e45915b..d676c8c6 100644 --- a/Libs/DF/normal_bar.lua +++ b/Libs/DF/normal_bar.lua @@ -509,12 +509,12 @@ local BarMetaFunctions = _G [DF.GlobalWidgetControlNames ["normal_bar"]] --> timer function BarMetaFunctions:OnTimerEnd() - if (self.OnTimerEndHook) then - local interrupt = self.OnTimerEndHook (self) - if (interrupt) then - return - end + local capsule = self + local kill = capsule:RunHooksForWidget ("OnTimerEnd", self.widget, button, capsule) + if (kill) then + return end + self.timer_texture:Hide() self.timer_textureR:Hide() self.div_timer:Hide() @@ -720,6 +720,7 @@ function DF:NewBar (parent, container, name, member, w, h, value, texture_name) OnShow = {}, OnMouseDown = {}, OnMouseUp = {}, + OnTimerEnd = {}, } BarObject.statusbar:SetScript ("OnEnter", OnEnter) diff --git a/boot.lua b/boot.lua index e208d79c..976ca3eb 100644 --- a/boot.lua +++ b/boot.lua @@ -3,8 +3,8 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.build_counter = 2692 --it's 2692 for release - _detalhes.userversion = "v5.9" + _detalhes.build_counter = 2694 --it's 2694 for release + _detalhes.userversion = "v5.10" _detalhes.realversion = 109 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" Details = _detalhes @@ -21,12 +21,12 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ -|cFFFFFF00v5.8 (|cFFFFCC00July 11, 2016|r|cFFFFFF00)|r:\n\n -|cFFFFFF00-|r Big framework update. May have some bugs, please report to us if you find any.\n\n +|cFFFFFF00v5.9 (|cFFFFCC00July 19, 2016|r|cFFFFFF00)|r:\n\n +|cFFFFFF00-|r Using .BLP format for images. If you have FPS drops, delete ALL .TGA files inside the folder Details/Images/\n\n --]] -- - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v5.8 (|cFFFFCC00July 11, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Big framework update. May have some bugs, please report to us if you find any.\n\n|cFFFFFF00v5.8 (|cFFFFCC00June 27, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Energy and Resources are working properly now.\n\n|cFFFFFF00-|r Added raid information for The Emerald Nightmare.\n\n|cFFFFFF00v5.7 (|cFFFFCC00June 16, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Most of the raid plugins got added on this version.\n\n|cFFFFFF00-|r Plugin 'Damage, The Game!' also got damage goals updated.\n\n|cFFFFFF00v5.5 (|cFFFFCC00June 03, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Default skin is now 'Safe Skin Legion Beta' which helps a little with the disabled texture issue.\n|cFFFFFF00-|r If you're using another skin, you may change at the options panel /details options > Skin Selection.\n|cFFFFFF00-|r You also can disable the class icons at Bars: General > Icon File.\n\n|cFFFFFF00v5.4 (|cFFFFCC00May 19, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Tracking spec for Demon Hunters is now implemented, you may see spec icons for demon hunters now.\n\n|cFFFFFF00-|r Fix some issues with Healing display.\n\n|cFFFFFF00v5.3a (|cFFFFCC00May 16, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed tooltip spell icons.\n\n|cFFFFFF00-|r Fixed some issues with demon hunter class icons." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v5.10 (|cFFFFCC00July 19, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Using .BLP format for images. If you have FPS drops caused by Details!, delete ALL .TGA files inside the folder Details/Images/\n\n|cFFFFFF00v5.8 (|cFFFFCC00July 11, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Big framework update. May have some bugs, please report to us if you find any.\n\n|cFFFFFF00v5.8 (|cFFFFCC00June 27, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Energy and Resources are working properly now.\n\n|cFFFFFF00-|r Added raid information for The Emerald Nightmare.\n\n|cFFFFFF00v5.7 (|cFFFFCC00June 16, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Most of the raid plugins got added on this version.\n\n|cFFFFFF00-|r Plugin 'Damage, The Game!' also got damage goals updated.\n\n|cFFFFFF00v5.5 (|cFFFFCC00June 03, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Default skin is now 'Safe Skin Legion Beta' which helps a little with the disabled texture issue.\n|cFFFFFF00-|r If you're using another skin, you may change at the options panel /details options > Skin Selection.\n|cFFFFFF00-|r You also can disable the class icons at Bars: General > Icon File.\n\n|cFFFFFF00v5.4 (|cFFFFCC00May 19, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Tracking spec for Demon Hunters is now implemented, you may see spec icons for demon hunters now.\n\n|cFFFFFF00-|r Fix some issues with Healing display.\n\n|cFFFFFF00v5.3a (|cFFFFCC00May 16, 2016|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed tooltip spell icons.\n\n|cFFFFFF00-|r Fixed some issues with demon hunter class icons." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " diff --git a/images/BantoBar.tga b/images/BantoBar.blp similarity index 100% rename from images/BantoBar.tga rename to images/BantoBar.blp diff --git a/images/atributos_captures.tga b/images/atributos_captures.blp similarity index 100% rename from images/atributos_captures.tga rename to images/atributos_captures.blp diff --git a/images/atributos_icones.tga b/images/atributos_icones.blp similarity index 100% rename from images/atributos_icones.tga rename to images/atributos_icones.blp diff --git a/images/atributos_icones_damage.tga b/images/atributos_icones_damage.blp similarity index 100% rename from images/atributos_icones_damage.tga rename to images/atributos_icones_damage.blp diff --git a/images/atributos_icones_energyze.tga b/images/atributos_icones_energyze.blp similarity index 100% rename from images/atributos_icones_energyze.tga rename to images/atributos_icones_energyze.blp diff --git a/images/atributos_icones_heal.tga b/images/atributos_icones_heal.blp similarity index 100% rename from images/atributos_icones_heal.tga rename to images/atributos_icones_heal.blp diff --git a/images/atributos_icones_misc.tga b/images/atributos_icones_misc.blp similarity index 100% rename from images/atributos_icones_misc.tga rename to images/atributos_icones_misc.blp diff --git a/images/autoshot.tga b/images/autoshot.blp similarity index 100% rename from images/autoshot.tga rename to images/autoshot.blp diff --git a/images/background.tga b/images/background.blp similarity index 100% rename from images/background.tga rename to images/background.blp diff --git a/images/bar4.tga b/images/bar4.blp similarity index 100% rename from images/bar4.tga rename to images/bar4.blp diff --git a/images/bar4_glass.tga b/images/bar4_glass.blp similarity index 100% rename from images/bar4_glass.tga rename to images/bar4_glass.blp diff --git a/images/bar4_reverse.tga b/images/bar4_reverse.blp similarity index 100% rename from images/bar4_reverse.tga rename to images/bar4_reverse.blp diff --git a/images/bar4_vidro.tga b/images/bar4_vidro.blp similarity index 100% rename from images/bar4_vidro.tga rename to images/bar4_vidro.blp diff --git a/images/bar_background.tga b/images/bar_background.blp similarity index 100% rename from images/bar_background.tga rename to images/bar_background.blp diff --git a/images/bar_background2.tga b/images/bar_background2.blp similarity index 100% rename from images/bar_background2.tga rename to images/bar_background2.blp diff --git a/images/bar_detalhes2.tga b/images/bar_detalhes2.blp similarity index 100% rename from images/bar_detalhes2.tga rename to images/bar_detalhes2.blp diff --git a/images/bar_detalhes2_end.tga b/images/bar_detalhes2_end.blp similarity index 100% rename from images/bar_detalhes2_end.tga rename to images/bar_detalhes2_end.blp diff --git a/images/bar_flat.tga b/images/bar_flat.blp similarity index 100% rename from images/bar_flat.tga rename to images/bar_flat.blp diff --git a/images/bar_serenity.tga b/images/bar_serenity.blp similarity index 100% rename from images/bar_serenity.tga rename to images/bar_serenity.blp diff --git a/images/bar_skyline.tga b/images/bar_skyline.blp similarity index 100% rename from images/bar_skyline.tga rename to images/bar_skyline.blp diff --git a/images/border_1.tga b/images/border_1.blp similarity index 100% rename from images/border_1.tga rename to images/border_1.blp diff --git a/images/border_2.tga b/images/border_2.blp similarity index 100% rename from images/border_2.tga rename to images/border_2.blp diff --git a/images/border_3.tga b/images/border_3.blp similarity index 100% rename from images/border_3.tga rename to images/border_3.blp diff --git a/images/border_welcome.tga b/images/border_welcome.blp similarity index 100% rename from images/border_welcome.tga rename to images/border_welcome.blp diff --git a/images/button_disable_overlay.tga b/images/button_disable_overlay.blp similarity index 100% rename from images/button_disable_overlay.tga rename to images/button_disable_overlay.blp diff --git a/images/classes.tga b/images/classes.blp similarity index 100% rename from images/classes.tga rename to images/classes.blp diff --git a/images/classes_plus.tga b/images/classes_plus.blp similarity index 100% rename from images/classes_plus.tga rename to images/classes_plus.blp diff --git a/images/classes_small.tga b/images/classes_small.blp similarity index 100% rename from images/classes_small.tga rename to images/classes_small.blp diff --git a/images/classes_small_alpha.tga b/images/classes_small_alpha.blp similarity index 100% rename from images/classes_small_alpha.tga rename to images/classes_small_alpha.blp diff --git a/images/classes_small_alpha_bw.tga b/images/classes_small_alpha_bw.blp similarity index 100% rename from images/classes_small_alpha_bw.tga rename to images/classes_small_alpha_bw.blp diff --git a/images/classes_small_bw.tga b/images/classes_small_bw.blp similarity index 100% rename from images/classes_small_bw.tga rename to images/classes_small_bw.blp diff --git a/images/clock.tga b/images/clock.blp similarity index 100% rename from images/clock.tga rename to images/clock.blp diff --git a/images/cooltip_selected.tga b/images/cooltip_selected.blp similarity index 100% rename from images/cooltip_selected.tga rename to images/cooltip_selected.blp diff --git a/images/copy.tga b/images/copy.blp similarity index 100% rename from images/copy.tga rename to images/copy.blp diff --git a/images/custom_bg.tga b/images/custom_bg.blp similarity index 100% rename from images/custom_bg.tga rename to images/custom_bg.blp diff --git a/images/custom_icones.tga b/images/custom_icones.blp similarity index 100% rename from images/custom_icones.tga rename to images/custom_icones.blp diff --git a/images/default_button.tga b/images/default_button.blp similarity index 100% rename from images/default_button.tga rename to images/default_button.blp diff --git a/images/espadas.tga b/images/espadas.blp similarity index 100% rename from images/espadas.tga rename to images/espadas.blp diff --git a/images/highlight_leftright.tga b/images/highlight_leftright.blp similarity index 100% rename from images/highlight_leftright.tga rename to images/highlight_leftright.blp diff --git a/images/highlight_updown.tga b/images/highlight_updown.blp similarity index 100% rename from images/highlight_updown.tga rename to images/highlight_updown.blp diff --git a/images/icone_bg.tga b/images/icone_bg.blp similarity index 100% rename from images/icone_bg.tga rename to images/icone_bg.blp diff --git a/images/icone_bg_fundo.tga b/images/icone_bg_fundo.blp similarity index 100% rename from images/icone_bg_fundo.tga rename to images/icone_bg_fundo.blp diff --git a/images/icones_barra.tga b/images/icones_barra.blp similarity index 100% rename from images/icones_barra.tga rename to images/icones_barra.blp diff --git a/images/icons.tga b/images/icons.blp similarity index 100% rename from images/icons.tga rename to images/icons.blp diff --git a/images/icons2.tga b/images/icons2.blp similarity index 100% rename from images/icons2.tga rename to images/icons2.blp diff --git a/images/info_window_background.tga b/images/info_window_background.blp similarity index 100% rename from images/info_window_background.tga rename to images/info_window_background.blp diff --git a/images/info_window_damagetaken.tga b/images/info_window_damagetaken.blp similarity index 100% rename from images/info_window_damagetaken.tga rename to images/info_window_damagetaken.blp diff --git a/images/key_alt.tga b/images/key_alt.blp similarity index 100% rename from images/key_alt.tga rename to images/key_alt.blp diff --git a/images/key_ctrl.tga b/images/key_ctrl.blp similarity index 100% rename from images/key_ctrl.tga rename to images/key_ctrl.blp diff --git a/images/key_shift.tga b/images/key_shift.blp similarity index 100% rename from images/key_shift.tga rename to images/key_shift.blp diff --git a/images/knob.tga b/images/knob.blp similarity index 100% rename from images/knob.tga rename to images/knob.blp diff --git a/images/logotipo.tga b/images/logotipo.blp similarity index 100% rename from images/logotipo.tga rename to images/logotipo.blp diff --git a/images/melee.tga b/images/melee.blp similarity index 100% rename from images/melee.tga rename to images/melee.blp diff --git a/images/minimap.tga b/images/minimap.blp similarity index 100% rename from images/minimap.tga rename to images/minimap.blp diff --git a/images/modo_icones.tga b/images/modo_icones.blp similarity index 100% rename from images/modo_icones.tga rename to images/modo_icones.blp diff --git a/images/options_window.tga b/images/options_window.tga deleted file mode 100644 index 37431183..00000000 Binary files a/images/options_window.tga and /dev/null differ diff --git a/images/overlay_detalhes.tga b/images/overlay_detalhes.blp similarity index 100% rename from images/overlay_detalhes.tga rename to images/overlay_detalhes.blp diff --git a/images/report_button.tga b/images/report_button.blp similarity index 100% rename from images/report_button.tga rename to images/report_button.blp diff --git a/images/report_frame_icons.tga b/images/report_frame_icons.blp similarity index 100% rename from images/report_frame_icons.tga rename to images/report_frame_icons.blp diff --git a/images/reset_button2.tga b/images/reset_button2.blp similarity index 100% rename from images/reset_button2.tga rename to images/reset_button2.blp diff --git a/images/skins/classic_skin.tga b/images/skins/classic_skin.blp similarity index 100% rename from images/skins/classic_skin.tga rename to images/skins/classic_skin.blp diff --git a/images/skins/classic_skin_v1.tga b/images/skins/classic_skin_v1.blp similarity index 100% rename from images/skins/classic_skin_v1.tga rename to images/skins/classic_skin_v1.blp diff --git a/images/skins/default_skin.tga b/images/skins/default_skin.blp similarity index 100% rename from images/skins/default_skin.tga rename to images/skins/default_skin.blp diff --git a/images/skins/elvui.tga b/images/skins/elvui.blp similarity index 100% rename from images/skins/elvui.tga rename to images/skins/elvui.blp diff --git a/images/skins/elvui_opaque.tga b/images/skins/elvui_opaque.blp similarity index 100% rename from images/skins/elvui_opaque.tga rename to images/skins/elvui_opaque.blp diff --git a/images/skins/flat_skin.tga b/images/skins/flat_skin.blp similarity index 100% rename from images/skins/flat_skin.tga rename to images/skins/flat_skin.blp diff --git a/images/skins/imperial_skin.blp b/images/skins/imperial_skin.blp new file mode 100644 index 00000000..2946ad0c Binary files /dev/null and b/images/skins/imperial_skin.blp differ diff --git a/images/skins/overwatch.tga b/images/skins/overwatch.blp similarity index 100% rename from images/skins/overwatch.tga rename to images/skins/overwatch.blp diff --git a/images/skins/simplygray_skin.tga b/images/skins/simplygray_skin.blp similarity index 100% rename from images/skins/simplygray_skin.tga rename to images/skins/simplygray_skin.blp diff --git a/images/small_icons.tga b/images/small_icons.blp similarity index 100% rename from images/small_icons.tga rename to images/small_icons.blp diff --git a/images/spec_icons_normal.tga b/images/spec_icons_normal.blp similarity index 100% rename from images/spec_icons_normal.tga rename to images/spec_icons_normal.blp diff --git a/images/spec_icons_normal_alpha.tga b/images/spec_icons_normal_alpha.blp similarity index 100% rename from images/spec_icons_normal_alpha.tga rename to images/spec_icons_normal_alpha.blp diff --git a/images/toolbar_icons.tga b/images/toolbar_icons.blp similarity index 100% rename from images/toolbar_icons.tga rename to images/toolbar_icons.blp diff --git a/images/toolbar_icons_shadow.tga b/images/toolbar_icons_shadow.blp similarity index 100% rename from images/toolbar_icons_shadow.tga rename to images/toolbar_icons_shadow.blp diff --git a/images/verticalline.tga b/images/verticalline.blp similarity index 100% rename from images/verticalline.tga rename to images/verticalline.blp