diff --git a/boot.lua b/boot.lua index 222b2f9e..e6eda959 100644 --- a/boot.lua +++ b/boot.lua @@ -3,9 +3,9 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.build_counter = 2105 --it's 2105 for release - _detalhes.userversion = "v4.0.8" - _detalhes.realversion = 76 --core version + _detalhes.build_counter = 2175 --it's 2105 for release + _detalhes.userversion = "v4.1.0" + _detalhes.realversion = 77 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" Details = _detalhes @@ -21,14 +21,20 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ -|cFFFFFF00v4.0.8 (|cFFFFCC00Dec 13, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Framework and functions update for the next version of the Advanced Death Logs plugin.\n\n +|cFFFFFF00v4.1.0 (|cFFFFCC00Dec 18, 2015|r|cFFFFFF00)|r:\n\n +|cFFFFFF00-|r Added a Dark skin for the Options Panel.\n\n +|cFFFFFF00-|r Fixed an issue with the Plugin DPS Tuning when reseting data on Details!.\n\n +|cFFFFFF00-|r Removed realm names from player at the Comparison Panel.\n\n +|cFFFFFF00-|r Added new skin preset: 'New Gray'.\n\n + --]] + -- - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v4.0.8 (|cFFFFCC00Dec 13, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Framework and functions update for the next version of the Advanced Death Logs plugin.\n\n|cFFFFFF00v4.0.7 (|cFFFFCC00Dec 07, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed some corner border for elvui skins.\n\n|cFFFFFF00-|r /run Details.death_tooltip_width = 500 makes the deathlog tooltip be 500 width.\n\n|cFFFFFF00v4.0.6e (|cFFFFCC00Nov 23, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue where sometimes some actors are duplicated at the end of an encounter.\n\n|cFFFFFF00-|r Fixed bookmark for segments (shift+right click).\n\n|cFFFFFF00-|r Fixed an issue with Chat Tab Embed when embeding only one window.\n\n|cFFFFFF00v4.0.6c (|cFFFFCC00Nov 04, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option for numeral system: Western/East Asian.\n\n|cFFFFFF00v4.0.5c (|cFFFFCC00Oct 24, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option to disable the all-displays window (right click on title bar).\n\n|cFFFFFF00-|r Added an option to suppress segment changes after killing a boss encounter (experimental).\n\n|cFFFFFF00-|r Fixed pet battles auto hide.\n\n|cFFFFFF00-|r Fixed an issue with bar animations starting from the middle of the bar.\n\n|cFFFFFF00-|r Fixed buffs and spell cast start on weakauras creator tool.\n\n|cFFFFFF00v4.0.3a (|cFFFFCC00Set 29, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fix for an error on Damage Taken By Spell display.\n\n|cFFFFFF00v4.0.3 (|cFFFFCC00Set 27, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Some improvements on Plugin's icon at the title bar.\n\n|cFFFFFF00v4.0.2 (|cFFFFCC00Set 26, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added 'ShielTronic Shield' on HealthPotion & Stone display.\n\n|cFFFFFF00-|r Improvements done on Vanguard Plugin.\n\n|cFFFFFF00-|r Fixed an alignment issue which was happening with few tooltips.\n\n|cFFFFFF00-|r Fixed a problem where sometimes the addon crashes while doing a /reload during raid.\n\n|cFFFFFF00-|r Fixed the creation of auras for weakauras from the Forge (/details forge).\n\n|cFFFFFF00v4.0.1 (|cFFFFCC00Set 21, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an options to use a customized skin file.\n\n|cFFFFFF00-|r Added an options to use a customized bar texture file.\n\n|cFFFFFF00-|r A Package with photoshop files with examples and the skin file for Minimalistic skin are available at WoW Interface.\n\n|cFFFFFF00-|r Added 'API Custom Displays.txt' on Details! folder, this file explain how to create scripts for custom displays.\n\n|cFFFFFF00v4.0h (|cFFFFCC00Set 19, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Created new plugin 'Target Caller' for RBGs, it's available at Curse.com.\n\n|cFFFFFF00-|r Fixed death display color when not using colored by the player class.\n\n|cFFFFFF00-|r Fixed a rare bug where the window for Encounter Details Plugin won't open when clicking on its icon.\n\n|cFFFFFF00-|r Added officer channel to 'Announce Death' feature.\n\n|cFFFFFF00v4.0f (|cFFFFCC00Set 16, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fix for the title bar encounter timer.\n\n|cFFFFFF00v4.0e (|cFFFFCC00Set 14, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added a custom display for Crowd Control Received.\n\n|cFFFFFF00-|r Weak Aura Creator Tool, now has full support for BigWigs and Dbm time bars.\n\n|cFFFFFF00-|r Auras for interrupt and dispelling has been added on the Weak Aura Creator Tool.\n\n|cFFFFFF00-|r Details! Forge now has support for DBM and BigWigs time bars.\n\n|cFFFFFF00-|r Solo Plugins now has a close button on their panels.\n\n|cFFFFFF00-|r Fixed damage/healing score message after a boss kill.\n\n|cFFFFFF00-|r Now, an alert to open the history panel is shown after killing a boss.\n\n|cFFFFFF00-|r Added a 'all-displays' menu when right clicking title bar.\n\n|cFFFFFF00-|r Removed few texture from bookmarks panel, now it has a more clean appearance.\n\n|cFFFFFF00-|r Updated Details! Framework.\n\n|cFFFFFF00-|r Added option in order to change the bar orientation.\n\n|cFFFFFF00-|r Added an option to make the menus on title bar work with clicks instead of hovering over them.\n\n|cFFFFFF00-|r Healing for battleground enemies is now placed on healing done instead of enemy healing done.\n\n|cFFFFFF00-|r Improvements on our support for Arena battles.\n\n|cFFFFFF00-|r Fixed some issues on the Player Detail Window.\n\n|cFFFFFF00-|r Fixed encounter time on title bar text.\n\n|cFFFFFF00-|r Fixed death display tooltip, wasn't respecting the font and size set on options panel.\n\n|cFFFFFF00v3.18.5 (|cFFFFCC00Aug 19, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Improvements on Weakauras creation from Encounter Details plugin.\n\n|cFFFFFF00-|r Improvements on 'Auto Switch to Current' feature. Details! windows are now more responsible about auto changing a segment while the player, for instance, has the report window opened.\n\n|cFFFFFF00-|r Added slash command '/de wipe'. It ends the raid encounter segment and stop capturing data.\nIf you are the raid leader, all other users of Details! will also stop.\nWorks great for players not make damage padding after a wipe call.\n\n|cFFFFFF00-|r Added the overheal made by pets on tooltip and player details window.\n\n|cFFFFFF00-|r Added an option to disable stretch button and bar highlight.\n\n|cFFFFFF00-|r Disabling nicknames now also disable avatars.\n\n|cFFFFFF00-|r Added 'spinal healing injector' on custom display 'Health Potion & Stone' used.\n\n|cFFFFFF00-|r Fixed title text width when auto-hide menu buttons is enabled.\n\n|cFFFFFF00-|r Fixed item level of timewarped items.\n\n|cFFFFFF00-|r Fixed report for custom display Crowd Control.\n\n|cFFFFFF00-|r Fixed role icons on custom displays.\n\n|cFFFFFF00-|r Fixed an issue with dropdown boxes where wasn't showing all options.\n\n|cFFFFFF00-|r Fixed Ticket #53: background alpha after stretching which wasn't correctly coming back to original color.\n\n|cFFFFFF00-|r Fixed ticket #51: API Call 'GetCombat('overall')' wasn't returning the overall combat object.\n\n|cFFFFFF00-|r Fixed ticket #50: issue opening icon selection frame.\n\n|cFFFFFF00v3.17.12 (|cFFFFCC00Aug 05, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option for lock micro displays. When locked they don't interact with mouse or stay on top of menus.\n\n|cFFFFFF00-|r Fixed ticket #49: death display not working correctly with sort direction bottom-to-top.\n\n|cFFFFFF00-|r Fixed an issue with death display where the text wasn't updating their width correctly.\n\n|cFFFFFF00-|r Fixed an issue with energy and miscellaneous displays type not working correctly with bar animations.\n\n|cFFFFFF00-|r Fixed an issue while loading old profiles wans't updating their values for newer versions of the addon.\n\n|cFFFFFF00-|r Fixed an issue with bookmarks panel not opening correctly.\n\n|cFFFFFF00v3.17.10 (|cFFFFCC00Aug 02, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed ticket #47: Title bar font resets with UI reload / relog.\n\n|cFFFFFF00-|r Fixed ticket #46: Icon select panel wasn't opening.\n\n|cFFFFFF00-|r Fixed ticket #45: Windwalker icon for Mistweaver monks.\n\n|cFFFFFF00-|r Fixed issue with vehicles exchanging ownership, e.g. Soulbound Constructor on HFC raid.\n\n|cFFFFFF00v3.17.6 (|cFFFFCC00Jul 16, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Major improvements on the aura tool creation for WeakAuras.\n\n|cFFFFFF00-|r Fixed some issues with spec icons where sometimes it shows four small icons.\n\n|cFFFFFF00-|r Added an option to show a stopwatch on the title text showing the elapsed time of an encounter.\n\n|cFFFFFF00-|r Window title text now shrinks correctly when isn't enough space for it." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v4.1.0 (|cFFFFCC00Dec 18, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added new skin preset: 'New Gray'.\n\n|cFFFFFF00-|r Added a Dark skin for the Options Panel.\n\n|cFFFFFF00-|r Fixed an issue with the Plugin DPS Tuning when reseting data on Details!.\n\n|cFFFFFF00-|r Removed realm names from player at the Comparison Panel.\n\n|cFFFFFF00v4.0.8 (|cFFFFCC00Dec 13, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Framework and functions update for the next version of the Advanced Death Logs plugin.\n\n|cFFFFFF00v4.0.7 (|cFFFFCC00Dec 07, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed some corner border for elvui skins.\n\n|cFFFFFF00-|r /run Details.death_tooltip_width = 500 makes the deathlog tooltip be 500 width.\n\n|cFFFFFF00v4.0.6e (|cFFFFCC00Nov 23, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue where sometimes some actors are duplicated at the end of an encounter.\n\n|cFFFFFF00-|r Fixed bookmark for segments (shift+right click).\n\n|cFFFFFF00-|r Fixed an issue with Chat Tab Embed when embeding only one window.\n\n|cFFFFFF00v4.0.6c (|cFFFFCC00Nov 04, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option for numeral system: Western/East Asian.\n\n|cFFFFFF00v4.0.5c (|cFFFFCC00Oct 24, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option to disable the all-displays window (right click on title bar).\n\n|cFFFFFF00-|r Added an option to suppress segment changes after killing a boss encounter (experimental).\n\n|cFFFFFF00-|r Fixed pet battles auto hide.\n\n|cFFFFFF00-|r Fixed an issue with bar animations starting from the middle of the bar.\n\n|cFFFFFF00-|r Fixed buffs and spell cast start on weakauras creator tool.\n\n|cFFFFFF00v4.0.3a (|cFFFFCC00Set 29, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fix for an error on Damage Taken By Spell display.\n\n|cFFFFFF00v4.0.3 (|cFFFFCC00Set 27, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Some improvements on Plugin's icon at the title bar.\n\n|cFFFFFF00v4.0.2 (|cFFFFCC00Set 26, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added 'ShielTronic Shield' on HealthPotion & Stone display.\n\n|cFFFFFF00-|r Improvements done on Vanguard Plugin.\n\n|cFFFFFF00-|r Fixed an alignment issue which was happening with few tooltips.\n\n|cFFFFFF00-|r Fixed a problem where sometimes the addon crashes while doing a /reload during raid.\n\n|cFFFFFF00-|r Fixed the creation of auras for weakauras from the Forge (/details forge).\n\n|cFFFFFF00v4.0.1 (|cFFFFCC00Set 21, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an options to use a customized skin file.\n\n|cFFFFFF00-|r Added an options to use a customized bar texture file.\n\n|cFFFFFF00-|r A Package with photoshop files with examples and the skin file for Minimalistic skin are available at WoW Interface.\n\n|cFFFFFF00-|r Added 'API Custom Displays.txt' on Details! folder, this file explain how to create scripts for custom displays.\n\n|cFFFFFF00v4.0h (|cFFFFCC00Set 19, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Created new plugin 'Target Caller' for RBGs, it's available at Curse.com.\n\n|cFFFFFF00-|r Fixed death display color when not using colored by the player class.\n\n|cFFFFFF00-|r Fixed a rare bug where the window for Encounter Details Plugin won't open when clicking on its icon.\n\n|cFFFFFF00-|r Added officer channel to 'Announce Death' feature.\n\n|cFFFFFF00v4.0f (|cFFFFCC00Set 16, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fix for the title bar encounter timer.\n\n|cFFFFFF00v4.0e (|cFFFFCC00Set 14, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added a custom display for Crowd Control Received.\n\n|cFFFFFF00-|r Weak Aura Creator Tool, now has full support for BigWigs and Dbm time bars.\n\n|cFFFFFF00-|r Auras for interrupt and dispelling has been added on the Weak Aura Creator Tool.\n\n|cFFFFFF00-|r Details! Forge now has support for DBM and BigWigs time bars.\n\n|cFFFFFF00-|r Solo Plugins now has a close button on their panels.\n\n|cFFFFFF00-|r Fixed damage/healing score message after a boss kill.\n\n|cFFFFFF00-|r Now, an alert to open the history panel is shown after killing a boss.\n\n|cFFFFFF00-|r Added a 'all-displays' menu when right clicking title bar.\n\n|cFFFFFF00-|r Removed few texture from bookmarks panel, now it has a more clean appearance.\n\n|cFFFFFF00-|r Updated Details! Framework.\n\n|cFFFFFF00-|r Added option in order to change the bar orientation.\n\n|cFFFFFF00-|r Added an option to make the menus on title bar work with clicks instead of hovering over them.\n\n|cFFFFFF00-|r Healing for battleground enemies is now placed on healing done instead of enemy healing done.\n\n|cFFFFFF00-|r Improvements on our support for Arena battles.\n\n|cFFFFFF00-|r Fixed some issues on the Player Detail Window.\n\n|cFFFFFF00-|r Fixed encounter time on title bar text.\n\n|cFFFFFF00-|r Fixed death display tooltip, wasn't respecting the font and size set on options panel.\n\n|cFFFFFF00v3.18.5 (|cFFFFCC00Aug 19, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Improvements on Weakauras creation from Encounter Details plugin.\n\n|cFFFFFF00-|r Improvements on 'Auto Switch to Current' feature. Details! windows are now more responsible about auto changing a segment while the player, for instance, has the report window opened.\n\n|cFFFFFF00-|r Added slash command '/de wipe'. It ends the raid encounter segment and stop capturing data.\nIf you are the raid leader, all other users of Details! will also stop.\nWorks great for players not make damage padding after a wipe call.\n\n|cFFFFFF00-|r Added the overheal made by pets on tooltip and player details window.\n\n|cFFFFFF00-|r Added an option to disable stretch button and bar highlight.\n\n|cFFFFFF00-|r Disabling nicknames now also disable avatars.\n\n|cFFFFFF00-|r Added 'spinal healing injector' on custom display 'Health Potion & Stone' used.\n\n|cFFFFFF00-|r Fixed title text width when auto-hide menu buttons is enabled.\n\n|cFFFFFF00-|r Fixed item level of timewarped items.\n\n|cFFFFFF00-|r Fixed report for custom display Crowd Control.\n\n|cFFFFFF00-|r Fixed role icons on custom displays.\n\n|cFFFFFF00-|r Fixed an issue with dropdown boxes where wasn't showing all options.\n\n|cFFFFFF00-|r Fixed Ticket #53: background alpha after stretching which wasn't correctly coming back to original color.\n\n|cFFFFFF00-|r Fixed ticket #51: API Call 'GetCombat('overall')' wasn't returning the overall combat object.\n\n|cFFFFFF00-|r Fixed ticket #50: issue opening icon selection frame.\n\n|cFFFFFF00v3.17.12 (|cFFFFCC00Aug 05, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option for lock micro displays. When locked they don't interact with mouse or stay on top of menus.\n\n|cFFFFFF00-|r Fixed ticket #49: death display not working correctly with sort direction bottom-to-top.\n\n|cFFFFFF00-|r Fixed an issue with death display where the text wasn't updating their width correctly.\n\n|cFFFFFF00-|r Fixed an issue with energy and miscellaneous displays type not working correctly with bar animations.\n\n|cFFFFFF00-|r Fixed an issue while loading old profiles wans't updating their values for newer versions of the addon.\n\n|cFFFFFF00-|r Fixed an issue with bookmarks panel not opening correctly.\n\n|cFFFFFF00v3.17.10 (|cFFFFCC00Aug 02, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed ticket #47: Title bar font resets with UI reload / relog.\n\n|cFFFFFF00-|r Fixed ticket #46: Icon select panel wasn't opening.\n\n|cFFFFFF00-|r Fixed ticket #45: Windwalker icon for Mistweaver monks.\n\n|cFFFFFF00-|r Fixed issue with vehicles exchanging ownership, e.g. Soulbound Constructor on HFC raid." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " diff --git a/classes/classe_damage.lua b/classes/classe_damage.lua index 74c2aaac..2e565260 100644 --- a/classes/classe_damage.lua +++ b/classes/classe_damage.lua @@ -59,7 +59,7 @@ local FormatTooltipNumber = ToKFunctions [8] local TooltipMaximizedMethod = 1 - local CLASS_ICON_TCOORDS = _G.CLASS_ICON_TCOORDS + --local CLASS_ICON_TCOORDS = _G.CLASS_ICON_TCOORDS local is_player_class = _detalhes.player_class _detalhes.tooltip_key_overlay1 = {1, 1, 1, .2} @@ -2711,13 +2711,13 @@ end texture:SetTexCoord (_unpack (_detalhes.class_specs_coords [self.spec])) texture:SetVertexColor (1, 1, 1) else - texture:SetTexture ([[Interface\AddOns\Details\images\classes_small]]) - texture:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [classe])) + texture:SetTexture (instance.row_info.icon_file or [[Interface\AddOns\Details\images\classes_small]]) + texture:SetTexCoord (_unpack (_detalhes.class_coords [classe])) texture:SetVertexColor (1, 1, 1) end else texture:SetTexture (instance and instance.row_info.icon_file or [[Interface\AddOns\Details\images\classes_small]]) - texture:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [classe])) + texture:SetTexCoord (_unpack (_detalhes.class_coords [classe])) texture:SetVertexColor (1, 1, 1) end end @@ -2779,6 +2779,9 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown) if (owner and owner.classe) then r, g, b = unpack (_detalhes.class_colors [owner.classe]) else + if (not _detalhes.class_colors [self.classe]) then + return print ("Details!: error class not found:", self.classe, "for", self.nome) + end r, g, b = unpack (_detalhes.class_colors [self.classe]) end @@ -3533,8 +3536,8 @@ function atributo_damage:MontaInfoFriendlyFire() barra.icone:SetTexture (info.instancia.row_info.icon_file) - if (CLASS_ICON_TCOORDS [classe]) then - barra.icone:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [classe])) + if (_detalhes.class_coords [classe]) then + barra.icone:SetTexCoord (_unpack (_detalhes.class_coords [classe])) else barra.icone:SetTexture (nil) end @@ -3642,7 +3645,7 @@ function atributo_damage:MontaInfoDamageTaken() self:FocusLock (barra, tabela[1]) - local texCoords = CLASS_ICON_TCOORDS [tabela[4]] + local texCoords = _detalhes.class_coords [tabela[4]] if (not texCoords) then texCoords = _detalhes.class_coords ["UNKNOW"] end diff --git a/core/windows.lua b/core/windows.lua index d807488c..f1cf3175 100644 --- a/core/windows.lua +++ b/core/windows.lua @@ -787,10 +787,18 @@ --> panels --> cooltip presets - local preset2_backdrop = {bgFile = [[Interface\DialogFrame\UI-DialogBox-Background-Dark]], edgeFile = [[Interface\AddOns\Details\images\border_3]], tile=true, + local preset3_backdrop = {bgFile = [[Interface\DialogFrame\UI-DialogBox-Background-Dark]], edgeFile = [[Interface\AddOns\Details\images\border_3]], tile=true, edgeSize = 16, tileSize = 64, insets = {left = 3, right = 3, top = 4, bottom = 4}} - _detalhes.cooltip_preset2_backdrop = preset2_backdrop + + _detalhes.cooltip_preset3_backdrop = preset3_backdrop + local white_table = {1, 1, 1, 1} + local black_table = {0, 0, 0, 1} + local gray_table = {0.37, 0.37, 0.37, 1} + + local preset2_backdrop = {bgFile = [[Interface\AddOns\Details\images\background]], edgeFile = [[Interface\Buttons\WHITE8X8]], tile=true, + edgeSize = 1, tileSize = 64, insets = {left = 0, right = 0, top = 0, bottom = 0}} + _detalhes.cooltip_preset2_backdrop = preset2_backdrop --"Details BarBorder 3" function _detalhes:CooltipPreset (preset) @@ -808,6 +816,30 @@ GameCooltip:SetColor (1, 0.5, 0.5, 0.5, 0.5) elseif (preset == 2) then + GameCooltip:SetOption ("TextFont", "Friz Quadrata TT") + GameCooltip:SetOption ("TextColor", "orange") + GameCooltip:SetOption ("TextSize", 12) + GameCooltip:SetOption ("FixedWidth", 220) + GameCooltip:SetOption ("ButtonsYMod", -4) + GameCooltip:SetOption ("YSpacingMod", -4) + GameCooltip:SetOption ("IgnoreButtonAutoHeight", true) + GameCooltip:SetColor (1, 0, 0, 0, 0) + + GameCooltip:SetBackdrop (1, preset2_backdrop, gray_table, black_table) + + elseif (preset == 2.1) then + GameCooltip:SetOption ("TextFont", "Friz Quadrata TT") + GameCooltip:SetOption ("TextColor", "orange") + GameCooltip:SetOption ("TextSize", 10) + GameCooltip:SetOption ("FixedWidth", 220) + GameCooltip:SetOption ("ButtonsYMod", 0) + GameCooltip:SetOption ("YSpacingMod", -4) + GameCooltip:SetOption ("IgnoreButtonAutoHeight", true) + GameCooltip:SetColor (1, 0, 0, 0, 0) + + GameCooltip:SetBackdrop (1, preset2_backdrop, gray_table, black_table) + + elseif (preset == 3) then GameCooltip:SetOption ("TextFont", "Friz Quadrata TT") GameCooltip:SetOption ("TextColor", "orange") GameCooltip:SetOption ("TextSize", 12) @@ -817,8 +849,8 @@ GameCooltip:SetOption ("IgnoreButtonAutoHeight", true) GameCooltip:SetColor (1, 0.5, 0.5, 0.5, 0.5) - GameCooltip:SetBackdrop (1, preset2_backdrop, nil, white_table) - + GameCooltip:SetBackdrop (1, preset3_backdrop, nil, white_table) + end end diff --git a/functions/skins.lua b/functions/skins.lua index ae646a52..dbca7ea7 100644 --- a/functions/skins.lua +++ b/functions/skins.lua @@ -1819,5 +1819,266 @@ local _ } }) + + _detalhes:InstallSkin ("New Gray", { + file = [[Interface\AddOns\Details\images\skins\classic_skin_v1]], + author = "Details!", + version = "1.0", + site = "unknown", + desc = "Simple skin with soft gray color and half transparent frames.", --\n + + --micro frames + micro_frames = { + color = {1, 1, 1, 1}, + font = "Accidental Presidency", + size = 10, + textymod = 1, + }, + + can_change_alpha_head = true, + icon_anchor_main = {-1, -5}, + icon_anchor_plugins = {-7, -13}, + icon_plugins_size = {19, 18}, + + --anchors: + icon_point_anchor = {-37, 0}, + left_corner_anchor = {-107, 0}, + right_corner_anchor = {96, 0}, + + icon_point_anchor_bottom = {-37, 12}, + left_corner_anchor_bottom = {-107, 0}, + right_corner_anchor_bottom = {96, 0}, + + icon_on_top = true, + icon_ignore_alpha = true, + icon_titletext_position = {3, 3}, + + --overwrites + instance_cprops = { + ["show_statusbar"] = false, + ["menu_icons_size"] = 0.850000023841858, + ["color"] = { + 0.447058823529412, -- [1] + 0.447058823529412, -- [2] + 0.447058823529412, -- [3] + 0.131542265415192, -- [4] + }, + ["menu_anchor"] = { + 16, -- [1] + 0, -- [2] + ["side"] = 2, + }, + ["bg_r"] = 0.0941176470588235, + ["color_buttons"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] + }, + ["bars_sort_direction"] = 1, + ["row_show_animation"] = { + ["anim"] = "Fade", + ["options"] = { + }, + }, + ["total_bar"] = { + ["enabled"] = false, + ["only_in_group"] = true, + ["icon"] = "Interface\\ICONS\\INV_Sigil_Thorim", + ["color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + }, + ["attribute_text"] = { + ["enabled"] = true, + ["shadow"] = false, + ["side"] = 1, + ["text_color"] = { + 0.933333333333333, -- [1] + 0.933333333333333, -- [2] + 0.933333333333333, -- [3] + 1, -- [4] + }, + ["custom_text"] = "{name}", + ["text_face"] = "Accidental Presidency", + ["anchor"] = { + -18, -- [1] + 3, -- [2] + }, + ["show_timer"] = { + true, -- [1] + true, -- [2] + true, -- [3] + }, + ["enable_custom_text"] = false, + ["text_size"] = 12, + }, + ["bars_grow_direction"] = 1, + ["menu_alpha"] = { + ["enabled"] = false, + ["onleave"] = 1, + ["ignorebars"] = false, + ["iconstoo"] = true, + ["onenter"] = 1, + }, + ["bg_b"] = 0.0941176470588235, + ["grab_on_top"] = false, + ["menu_anchor_down"] = { + 16, -- [1] + -3, -- [2] + }, + ["statusbar_info"] = { + ["alpha"] = 0.131542265415192, + ["overlay"] = { + 0.447058823529412, -- [1] + 0.447058823529412, -- [2] + 0.447058823529412, -- [3] + }, + }, + ["hide_in_combat_alpha"] = 0, + ["plugins_grow_direction"] = 1, + ["menu_icons"] = { + true, -- [1] + true, -- [2] + true, -- [3] + true, -- [4] + true, -- [5] + false, -- [6] + ["space"] = -1, + ["shadow"] = false, + }, + ["desaturated_menu"] = true, + ["show_sidebars"] = false, + ["bg_alpha"] = 0.0242124795913696, + ["instance_button_anchor"] = { + -27, -- [1] + 1, -- [2] + }, + ["backdrop_texture"] = "Details Ground", + ["version"] = 3, + ["hide_icon"] = true, + ["skin"] = "Minimalistic", + ["toolbar_side"] = 1, + ["bg_g"] = 0.0941176470588235, + ["micro_displays_side"] = 2, + ["wallpaper"] = { + ["overlay"] = { + 0.999997794628143, -- [1] + 0.999997794628143, -- [2] + 0.999997794628143, -- [3] + 0.498038113117218, -- [4] + }, + ["width"] = 266.000061035156, + ["texcoord"] = { + 0.00100000001490116, -- [1] + 1, -- [2] + 0.00100000001490116, -- [3] + 0.703000030517578, -- [4] + }, + ["enabled"] = false, + ["anchor"] = "all", + ["height"] = 225.999984741211, + ["alpha"] = 0.498039245605469, + ["texture"] = "Interface\\TALENTFRAME\\bg-priest-shadow", + }, + ["stretch_button_side"] = 1, + ["micro_displays_locked"] = true, + ["row_info"] = { + ["textR_outline"] = false, + ["spec_file"] = "Interface\\AddOns\\Details\\images\\spec_icons_normal_alpha", + ["textL_outline"] = true, + ["texture_highlight"] = "Interface\\FriendsFrame\\UI-FriendsList-Highlight", + ["textR_show_data"] = { + true, -- [1] + true, -- [2] + true, -- [3] + }, + ["textL_enable_custom_text"] = false, + ["fixed_text_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + ["space"] = { + ["right"] = 0, + ["left"] = 0, + ["between"] = 0, + }, + ["texture_background_class_color"] = false, + ["start_after_icon"] = false, + ["font_face_file"] = "Interface\\Addons\\Details\\fonts\\Accidental Presidency.ttf", + ["textL_custom_text"] = "{data1}. {data3}{data2}", + ["font_size"] = 10, + ["height"] = 14, + ["texture_file"] = "Interface\\AddOns\\Details\\images\\bar_background", + ["icon_file"] = "Interface\\AddOns\\Details\\images\\classes_small_alpha", + ["textR_bracket"] = "(", + ["texture_custom"] = "", + ["fixed_texture_color"] = { + 0.498039215686275, -- [1] + 0.498039215686275, -- [2] + 0.498039215686275, -- [3] + 1, -- [4] + }, + ["textL_show_number"] = true, + ["use_spec_icons"] = true, + ["textR_custom_text"] = "{data1} ({data2}, {data3}%)", + ["texture"] = "DGround", + ["models"] = { + ["upper_model"] = "Spells\\AcidBreath_SuperGreen.M2", + ["lower_model"] = "World\\EXPANSION02\\DOODADS\\Coldarra\\COLDARRALOCUS.m2", + ["upper_alpha"] = 0.5, + ["lower_enabled"] = false, + ["lower_alpha"] = 0.1, + ["upper_enabled"] = false, + }, + ["texture_custom_file"] = "Interface\\", + ["percent_type"] = 1, + ["textR_enable_custom_text"] = false, + ["fixed_texture_background_color"] = { + 0, -- [1] + 0, -- [2] + 0, -- [3] + 0.150228589773178, -- [4] + }, + ["textR_class_colors"] = false, + ["alpha"] = 0.439999997615814, + ["no_icon"] = false, + ["texture_background_file"] = "Interface\\AddOns\\Details\\images\\bar4_reverse", + ["texture_background"] = "Details D'ictum (reverse)", + ["font_face"] = "Accidental Presidency", + ["texture_class_colors"] = false, + ["textL_class_colors"] = false, + ["fast_ps_update"] = false, + ["textR_separator"] = ",", + ["backdrop"] = { + ["enabled"] = false, + ["texture"] = "Details BarBorder 2", + ["color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] + }, + ["size"] = 12, + }, + }, + ["bars_inverted"] = false, + }, + + callback = function (skin, instance, just_updating) + --none + end, + + skin_options = { + {spacement = true, type = "button", name = "Shadowy Title Bar", func = Minimalistic_Shadow, desc = "Adds shadow on title bar components."}, + {type = "button", name = Loc ["STRING_OPTIONS_SKIN_RESET_TOOLTIP"], func = reset_tooltip, desc = Loc ["STRING_OPTIONS_SKIN_RESET_TOOLTIP_DESC"]}, + {type = "button", name = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3"], func = set_tooltip_elvui2, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON3_DESC"]}, + } + + }) + --alpha = 0.4980392451398075, \ No newline at end of file diff --git a/gumps/janela_info.lua b/gumps/janela_info.lua index 4324fb83..c11e0af5 100644 --- a/gumps/janela_info.lua +++ b/gumps/janela_info.lua @@ -2598,7 +2598,8 @@ function gump:CriaJanelaInfo() local compare_fill = function (tab, player, combat) local players_to_compare = tab.players - DetailsPlayerComparisonBox1.name_label:SetText (player:Name()) + local defaultPlayerName = _detalhes:GetOnlyName (player:Name()) + DetailsPlayerComparisonBox1.name_label:SetText (defaultPlayerName) local label2 = _G ["DetailsPlayerComparisonBox2"].name_label local label3 = _G ["DetailsPlayerComparisonBox3"].name_label @@ -2607,12 +2608,14 @@ function gump:CriaJanelaInfo() local label3_percent = _G ["DetailsPlayerComparisonBox3"].name_label_percent if (players_to_compare [1]) then - label2:SetText (players_to_compare [1]:Name()) - label2_percent:SetText (player:Name() .. " %") + local playerName = _detalhes:GetOnlyName (players_to_compare [1]:Name()) + label2:SetText (playerName) + label2_percent:SetText (defaultPlayerName .. " %") end if (players_to_compare [2]) then - label3:SetText (players_to_compare [2]:Name()) - label3_percent:SetText (player:Name() .. " %") + local playerName = _detalhes:GetOnlyName (players_to_compare [2]:Name()) + label3:SetText (playerName) + label3_percent:SetText (defaultPlayerName .. " %") else label3:SetText ("") label3_percent:SetText ("") diff --git a/gumps/janela_options.lua b/gumps/janela_options.lua index 5ae711e8..bde19b3f 100644 --- a/gumps/janela_options.lua +++ b/gumps/janela_options.lua @@ -200,14 +200,13 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section) window_icon:SetDrawLayer ("background") window_icon:SetTexCoord (0, 0.054199, 0.591308, 0.646972) --605 663 - --> title - local title = g:NewLabel (window, nil, nil, "title", Loc ["STRING_OPTIONS_WINDOW"], "GameFontHighlightLeft", 12, {227/255, 186/255, 4/255}) + local title = g:NewLabel (window, nil, "$parentTitleLabel", "title", Loc ["STRING_OPTIONS_WINDOW"], "GameFontHighlightLeft", 12, {227/255, 186/255, 4/255}) title:SetPoint ("center", window, "center") title:SetPoint ("top", window, "top", 0, -28) --> edit what label - local editing = g:NewLabel (window, nil, nil, "editing", Loc ["STRING_OPTIONS_GENERAL"], "QuestFont_Large", 20, "white") + local editing = g:NewLabel (window, nil, "$parentEditingLabel", "editing", Loc ["STRING_OPTIONS_GENERAL"], "QuestFont_Large", 20, "white") --editing:SetPoint ("topleft", window, "topleft", 90, -57) editing:SetPoint ("topright", window, "topright", -30, -62) editing.options = {Loc ["STRING_OPTIONS_GENERAL"], Loc ["STRING_OPTIONS_APPEARANCE"], Loc ["STRING_OPTIONS_PERFORMANCE"], Loc ["STRING_OPTIONS_PLUGINS"]} @@ -232,7 +231,7 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section) editing.apoio_icone_direito:SetHeight (13) --> close button - local close_button = CreateFrame ("button", nil, window.widget, "UIPanelCloseButton") + local close_button = CreateFrame ("button", "DetailsOptionsWindowCloseButton", window.widget, "UIPanelCloseButton") close_button:SetWidth (32) close_button:SetHeight (32) close_button:SetPoint ("TOPRIGHT", window.widget, "TOPRIGHT", 0, -19) @@ -240,7 +239,7 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section) close_button:SetFrameLevel (close_button:GetFrameLevel()+2) --> desc text (on the right) - local info_text = g:NewLabel (window, nil, nil, "infotext", "", "GameFontNormal", 12) + local info_text = g:NewLabel (window, nil, "$parentInfoTextLabel", "infotext", "", "GameFontNormal", 12) info_text:SetPoint ("topleft", window, "topleft", 560, -109) info_text.width = 300 info_text.height = 380 @@ -272,11 +271,11 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section) local forge_button = g:NewButton (window, _, "$parentForgeButton", "ForgeButton", 90, 20, function() _detalhes:OpenForge(); window:Hide() end, nil, nil, nil, "Open Forge", 1) --, g:GetTemplate ("dropdown", "OPTIONS_DROPDOWN_TEMPLATE") forge_button:SetIcon ([[Interface\AddOns\Details\images\icons]], nil, nil, nil, {396/512, 428/512, 243/512, 273/512}, nil, nil, 2) forge_button:SetPoint ("topleft", 80, -61) - + local history_button = g:NewButton (window, _, "$parentHistoryButton", "HistoryButton", 90, 20, function() _detalhes:OpenRaidHistoryWindow(); window:Hide() end, nil, nil, nil, "Open History", 1) --, g:GetTemplate ("dropdown", "OPTIONS_DROPDOWN_TEMPLATE") history_button:SetIcon ([[Interface\AddOns\Details\images\icons]], nil, nil, nil, {434/512, 466/512, 243/512, 273/512}, nil, nil, 2) history_button:SetPoint ("topleft", 180, -61) - + --> select instance dropbox local onSelectInstance = function (_, _, instance) @@ -359,7 +358,7 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section) GameCooltip:Hide() end) - local instances_string = g:NewLabel (window, nil, nil, "instancetext", Loc ["STRING_OPTIONS_EDITINSTANCE"], "GameFontNormal", 12) + local instances_string = g:NewLabel (window, nil, "$parentInstanceDropdownLabel", "instancetext", Loc ["STRING_OPTIONS_EDITINSTANCE"], "GameFontNormal", 12) instances_string:SetPoint ("right", instances, "left", -2, 1) -- @@ -470,16 +469,22 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section) hide_3d_world:Hide() --> create bars - + + g:NewColor ("C_OptionsButtonOrange", 0.9999, 0.8196, 0, 1) + + local extra_buttons_on_enter = function (self, capsule) + capsule.textcolor = "yellow" + end + local extra_buttons_on_leave = function (self, capsule) + capsule.textcolor = "C_OptionsButtonOrange" + end + local fillbars = g:NewButton (window, _, "$parentCreateExampleBarsButton", nil, 110, 14, _detalhes.CreateTestBars, nil, nil, nil, Loc ["STRING_OPTIONS_TESTBARS"], 1) fillbars:SetPoint ("bottomleft", window.widget, "bottomleft", 41, 12) fillbars.textalign = "left" - fillbars:SetHook ("OnEnter", function() - fillbars:SetTextColor (1, 1, 0) - end) - fillbars:SetHook ("OnLeave", function() - fillbars:SetTextColor (0.9999, 0.8196, 0, 1) - end) + fillbars.textcolor = "C_OptionsButtonOrange" + fillbars:SetHook ("OnEnter", extra_buttons_on_enter) + fillbars:SetHook ("OnLeave", extra_buttons_on_leave) local fillbars_image = g:NewImage (window, [[Interface\Buttons\UI-RADIOBUTTON]], 8, 9, "artwork", {20/64, 27/64, 4/16, 11/16}) fillbars_image:SetPoint ("right", fillbars, "left", -1, 0) @@ -489,12 +494,9 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section) local changelog = g:NewButton (window, _, "$parentOpenChangeLogButton", nil, 110, 14, _detalhes.OpenNewsWindow, "change_log", nil, nil, Loc ["STRING_OPTIONS_CHANGELOG"], 1) changelog:SetPoint ("left", fillbars, "right", 10, 0) changelog.textalign = "left" - changelog:SetHook ("OnEnter", function() - changelog:SetTextColor (1, 1, 0) - end) - changelog:SetHook ("OnLeave", function() - changelog:SetTextColor (0.9999, 0.8196, 0, 1) - end) + changelog.textcolor = "C_OptionsButtonOrange" + changelog:SetHook ("OnEnter", extra_buttons_on_enter) + changelog:SetHook ("OnLeave", extra_buttons_on_leave) local changelog_image = g:NewImage (window, [[Interface\Buttons\UI-RADIOBUTTON]], 8, 9, "artwork", {20/64, 27/64, 4/16, 11/16}) changelog_image:SetPoint ("right", changelog, "left", -1, 0) @@ -504,12 +506,9 @@ function _detalhes:OpenOptionsWindow (instance, no_reopen, section) local feedback_button = g:NewButton (window, _, "$parentOpenFeedbackButton", nil, 80, 14, _detalhes.OpenFeedbackWindow, nil, nil, nil, Loc ["STRING_OPTIONS_SENDFEEDBACK"], 1) feedback_button:SetPoint ("left", changelog, "right", 10, 0) feedback_button.textalign = "left" - feedback_button:SetHook ("OnEnter", function() - feedback_button:SetTextColor (1, 1, 0) - end) - feedback_button:SetHook ("OnLeave", function() - feedback_button:SetTextColor (0.9999, 0.8196, 0, 1) - end) + feedback_button.textcolor = "C_OptionsButtonOrange" + feedback_button:SetHook ("OnEnter", extra_buttons_on_enter) + feedback_button:SetHook ("OnLeave", extra_buttons_on_leave) local feedback_image = g:NewImage (window, [[Interface\Buttons\UI-RADIOBUTTON]], 8, 9, "artwork", {20/64, 27/64, 4/16, 11/16}) feedback_image:SetPoint ("right", feedback_button, "left", -1, 0) @@ -699,51 +698,45 @@ local menus2 = { --> menu anchor textures - --general settings - local g_settings = g:NewButton (window, _, "$parentGeneralSettingsButton", "g_settings", 150, 33, function() end, 0x1) - - g:NewLabel (window, _, "$parentgeneral_settings_text", "GeneralSettingsLabel", Loc ["STRING_OPTIONS_GENERAL"], "GameFontNormal", 12) - window.GeneralSettingsLabel:SetPoint ("topleft", g_settings, "topleft", 35, -11) + local menu_frame = CreateFrame("frame", "DetailsOptionsWindowMenuAnchor", window.widget) + menu_frame:SetPoint ("TopLeft", window.widget, "TopLeft", 0, -90) + menu_frame:SetSize (1, 1) - local g_settings_texture = g:NewImage (window, [[Interface\AddOns\Details\images\options_window]], 160, 33, nil, nil, "GeneralSettingsTexture", "$parentGeneralSettingsTexture") + --general settings + local g_settings = g:NewButton (menu_frame, _, "$parentGeneralSettingsButton", "g_settings", 150, 33, function() end, 0x1) + + g:NewLabel (menu_frame, _, "$parentgeneral_settings_text", "GeneralSettingsLabel", Loc ["STRING_OPTIONS_GENERAL"], "GameFontNormal", 12) + menu_frame.GeneralSettingsLabel:SetPoint ("topleft", g_settings, "topleft", 35, -11) + + local g_settings_texture = g:NewImage (menu_frame, [[Interface\AddOns\Details\images\options_window]], 160, 33, nil, nil, "GeneralSettingsTexture", "$parentGeneralSettingsTexture") g_settings_texture:SetTexCoord (0, 0.15625, 0.685546875, 0.7177734375) g_settings_texture:SetPoint ("topleft", g_settings, "topleft", 0, 0) --apparance - local g_appearance = g:NewButton (window, _, "$parentAppearanceButton", "g_appearance", 150, 33, function() end, 0x2) + local g_appearance = g:NewButton (menu_frame, _, "$parentAppearanceButton", "g_appearance", 150, 33, function() end, 0x2) - g:NewLabel (window, _, "$parentappearance_settings_text", "AppearanceSettingsLabel", Loc ["STRING_OPTIONS_APPEARANCE"], "GameFontNormal", 12) - window.AppearanceSettingsLabel:SetPoint ("topleft", g_appearance, "topleft", 35, -11) + g:NewLabel (menu_frame, _, "$parentappearance_settings_text", "AppearanceSettingsLabel", Loc ["STRING_OPTIONS_APPEARANCE"], "GameFontNormal", 12) + menu_frame.AppearanceSettingsLabel:SetPoint ("topleft", g_appearance, "topleft", 35, -11) - local g_appearance_texture = g:NewImage (window, [[Interface\AddOns\Details\images\options_window]], 160, 33, nil, nil, "AppearanceSettingsTexture", "$parentAppearanceSettingsTexture") + local g_appearance_texture = g:NewImage (menu_frame, [[Interface\AddOns\Details\images\options_window]], 160, 33, nil, nil, "AppearanceSettingsTexture", "$parentAppearanceSettingsTexture") g_appearance_texture:SetTexCoord (0, 0.15625, 0.71875, 0.7509765625) g_appearance_texture:SetPoint ("topleft", g_appearance, "topleft", 0, 0) - - --performance - --[ - --local g_performance = g:NewButton (window, _, "$parentPerformanceButton", "g_appearance", 150, 33, function() end, 0x3) - --g:NewLabel (window, _, "$parentperformance_settings_text", "PerformanceSettingsLabel", Loc ["STRING_OPTIONS_PERFORMANCE"], "GameFontNormal", 12) - --window.PerformanceSettingsLabel:SetPoint ("topleft", g_performance, "topleft", 35, -11) - - --local g_performance_texture = g:NewImage (window, [[Interface\AddOns\Details\images\options_window]], 160, 33, nil, nil, "PerformanceSettingsTexture", "$parentPerformanceSettingsTexture") - --g_performance_texture:SetTexCoord (0, 0.15625, 0.751953125, 0.7841796875) - --g_performance_texture:SetPoint ("topleft", g_performance, "topleft", 0, 0) - --]] --advanced - local g_advanced = g:NewButton (window, _, "$parentAdvancedButton", "g_advanced", 150, 33, function() end, 0x4) + local g_advanced = g:NewButton (menu_frame, _, "$parentAdvancedButton", "g_advanced", 150, 33, function() end, 0x4) - g:NewLabel (window, _, "$parentadvanced_settings_text", "AdvancedSettingsLabel", Loc ["STRING_OPTIONS_ADVANCED"], "GameFontNormal", 12) - window.AdvancedSettingsLabel:SetPoint ("topleft", g_advanced, "topleft", 35, -11) + g:NewLabel (menu_frame, _, "$parentadvanced_settings_text", "AdvancedSettingsLabel", Loc ["STRING_OPTIONS_ADVANCED"], "GameFontNormal", 12) + menu_frame.AdvancedSettingsLabel:SetPoint ("topleft", g_advanced, "topleft", 35, -11) - local g_advanced_texture = g:NewImage (window, [[Interface\AddOns\Details\images\options_window]], 160, 33, nil, nil, "AdvancedSettingsTexture", "$parentAdvancedSettingsTexture") + local g_advanced_texture = g:NewImage (menu_frame, [[Interface\AddOns\Details\images\options_window]], 160, 33, nil, nil, "AdvancedSettingsTexture", "$parentAdvancedSettingsTexture") g_advanced_texture:SetTexCoord (0, 0.15625, 0.8173828125, 0.849609375) g_advanced_texture:SetPoint ("topleft", g_advanced, "topleft", 0, 0) + --> create menus local anchors = {g_settings, g_appearance, g_advanced} --g_performance - local y = -90 + local y = 0 local sub_menu_index = 1 local textcolor = {.8, .8, .8, 1} @@ -773,28 +766,6 @@ local menus2 = { local button_onenter = function (self, capsule) self.MyObject.my_bg_texture:SetVertexColor (1, 1, 1, 1) self.MyObject.textcolor = "yellow" - - --[[ - if (is_appearance [capsule.menu_index]) then - GameCooltip:Reset() - GameCooltip:SetType ("tooltip") - - _detalhes:CooltipPreset (2) - GameCooltip:AddLine (Loc ["STRING_OPTIONS_SKIN_A_DESC"]) - GameCooltip:AddLine (" ") - GameCooltip:AddLine ("Editing Window: 1") - GameCooltip:AddLine ("You may change the editing window at the bottom right corner.") - - GameCooltip:SetOption ("FixedWidth", 200) - --GameCooltip:SetOption ("TextSize", _detalhes.font_sizes.menus) - --GameCooltip:SetOption ("TextFont", _detalhes.font_faces.menus) - GameCooltip:SetOption ("NoLastSelectedBar", true) - GameCooltip:SetWallpaper (1, _detalhes.tooltip.menus_bg_texture, _detalhes.tooltip.menus_bg_coords, _detalhes.tooltip.menus_bg_color, true) - GameCooltip:SetBackdrop (1, _detalhes.tooltip_backdrop, nil, _detalhes.tooltip_border_color) - GameCooltip:SetOwner (self, "topright", "topleft", -5, 0) - GameCooltip:ShowCooltip() - end - --]] end local button_onleave = function (self) self.MyObject.my_bg_texture:SetVertexColor (1, 1, 1, .5) @@ -828,12 +799,12 @@ local menus2 = { for i = 1, amount do - local texture = g:NewImage (window, [[Interface\ARCHEOLOGY\ArchaeologyParts]], 130, 14, nil, nil, nil, "$parentButton_" .. index .. "_" .. i .. "_texture") + local texture = g:NewImage (menu_frame, [[Interface\ARCHEOLOGY\ArchaeologyParts]], 130, 14, nil, nil, nil, "$parentButton_" .. index .. "_" .. i .. "_texture") texture:SetTexCoord (0.146484375, 0.591796875, 0.0546875, 0.26171875) texture:SetPoint (38, y-2) texture:SetVertexColor (1, 1, 1, .5) - local button = g:NewButton (window, _, "$parentButton_" .. index .. "_" .. i, nil, 150, 18, select_options, menus_settings [true_index], true_index, "", menus [index] [i]) + local button = g:NewButton (menu_frame, _, "$parentButton_" .. index .. "_" .. i, nil, 150, 18, select_options, menus_settings [true_index], true_index, "", menus [index] [i]) button:SetPoint (40, y) button.textalign = "<" button.textcolor = textcolor @@ -976,14 +947,14 @@ local menus2 = { container_window.slider:cimaPoint (0, 1) container_window.slider:baixoPoint (0, -3) container_window.wheel_jump = 80 - + container_window.ultimo = 0 container_window.gump = container_slave container_window.container_slave = container_slave return container_window end - + table.insert (window.options [1], window:create_box_no_scroll (1)) table.insert (window.options [2], window:create_box_no_scroll (2)) table.insert (window.options [3], window:create_box_no_scroll (3)) @@ -1252,6 +1223,9 @@ local menus2 = { ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + window.title_y_pos = -30 + window.title_y_pos2 = -50 + window.left_start_at = 30 window.right_start_at = 360 window.top_start_at = -90 @@ -1313,26 +1287,216 @@ local menus2 = { end - --SKINS + --SKINS ~skins ~elvui function window:UseElvUISkin() + + local window_widget = window.widget + + --> title bar + local titlebar = CreateFrame ("frame", window:GetName() .. "OptionsTitleBar", window_widget) + titlebar:SetPoint ("topleft", window_widget, "topleft", 2, -3) + titlebar:SetPoint ("topright", window_widget, "topright", -2, -3) + titlebar:SetHeight (20) + titlebar:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\AddOns\Details\images\background]], tileSize = 64, tile = true}) + titlebar:SetBackdropColor (.5, .5, .5, 1) + titlebar:SetBackdropBorderColor (0, 0, 0, 1) + + --> move the title text to titlebar + title:ClearAllPoints() + title:SetParent (titlebar) + title:SetPoint ("center", titlebar, "center") + --title:SetPoint ("top", titlebar, "top", 0, -6) + + --> move the close button to titlebar + close_button:SetWidth (20) + close_button:SetHeight (20) + close_button:SetPoint ("TOPRIGHT", window_widget, "TOPRIGHT", 0, -3) + close_button:Show() + close_button:GetNormalTexture():SetDesaturated (true) + + --> create a new background texture background:SetTexture ([[Interface\AddOns\Details\images\background]]) background:SetVertexColor (0.27, 0.27, 0.27, 0.7) window:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1}) window:SetBackdropColor (1, 1, 1, 1) window:SetBackdropBorderColor (0, 0, 0, 1) + --> change the icon to a transparent one + window_icon:SetTexCoord (740/1024, 810/1024, 660/1024, 740/1024) + window_icon:SetSize (70, 80) + window_icon:SetParent (titlebar) + window_icon:SetPoint (12, -12) + window_icon:Hide() + + --> decrease the width of menu background + menu_background:SetSize (163, 488) + menu_background:SetPoint ("topleft", window.widget, "topleft", 23, -78) + menu_background:Hide() + sub_background:SetPoint ("topleft", window.widget, "topleft", 192, -80) + sub_background:SetPoint ("bottomright", window.widget, "bottomright", -30, 27) + sub_background:Hide() + + --> hide the dog and other stuff bigdog:Hide() window.descAnchorTopLeftImage:Hide() window.descAnchorBottomLeftImage:Hide() window.descAnchorTopRightImage:Hide() + --> set the point of the editing label + editing:SetPoint ("topright", window, "topright", -12, -62) + editing:SetPoint ("topright", window, "topright", -30, -90) + editing:Hide() + + --> instance selection dropdown + instances:SetPoint ("bottomright", window, "bottomright", -12, 16) + instances:SetTemplate (options_dropdown_template) + + --> buttons: + + --> location + fillbars:SetPoint ("bottomleft", window.widget, "bottomleft", 17, 16) + + forge_button:SetTemplate (options_button_template) + forge_button:SetSize(120, 20) -- + history_button:SetTemplate (options_button_template) + history_button:SetSize(120, 20) + fillbars:SetTemplate (options_button_template) + fillbars:SetSize(120, 20) + changelog:SetTemplate (options_button_template) + changelog:SetSize(120, 20) + feedback_button:SetTemplate (options_button_template) + feedback_button:SetSize(120, 20) + + --feedback_button.textcolor = "white" + --changelog.textcolor = "white" + --fillbars.textcolor = "white" + history_button.textcolor = "C_OptionsButtonOrange" + forge_button.textcolor = "C_OptionsButtonOrange" + + history_button:SetHook ("OnEnter", extra_buttons_on_enter) + history_button:SetHook ("OnLeave", extra_buttons_on_leave) + forge_button:SetHook ("OnEnter", extra_buttons_on_enter) + forge_button:SetHook ("OnLeave", extra_buttons_on_leave) + + feedback_button.textsize = 10 + changelog.textsize = 10 + fillbars.textsize = 10 + history_button.textsize = 10 + forge_button.textsize = 10 + + fillbars:SetIcon ("Interface\\AddOns\\Details\\images\\icons", nil, nil, nil, {323/512, 365/512, 42/512, 78/512}, {1, 1, 1, 0.6}, 4, 2) + changelog:SetIcon ("Interface\\AddOns\\Details\\images\\icons", nil, nil, nil, {367/512, 399/512, 43/512, 76/512}, {1, 1, 1, 0.8}, 4, 2) + feedback_button:SetIcon ("Interface\\FriendsFrame\\UI-Toast-BroadcastIcon", nil, nil, nil, {4/32, 27/32, 5/32, 25/32}, {1, 1, 1, 0.8}, 4, 2) + + changelog_image:Hide() + fillbars_image:Hide() + feedback_image:Hide() + + history_button:ClearAllPoints() + forge_button:ClearAllPoints() + --forge_button:SetPoint ("topright", -17, -47) + forge_button:SetPoint ("bottomleft", fillbars, "topleft", 0, 2) + --history_button:SetPoint ("right", forge_button, "left", -2, 0) + history_button:SetPoint ("bottomleft", changelog, "topleft", 0, 2) + --forge_button:Hide() + --history_button:Hide() + + --group_editing_help:ClearAllPoints() + --group_editing_help:SetPoint ("bottomleft", instances_string.widget, "topleft", -5, 2) + --group_editing:ClearAllPoints() + --group_editing:SetPoint ("left", group_editing_help, "right", 2, 0) + --DetailsOptionsWindowGroupEditingText:ClearAllPoints() + --DetailsOptionsWindowGroupEditingText:SetPoint ("left", group_editing, "right", 2, 0) + DetailsOptionsWindowGroupEditingText:ClearAllPoints() + DetailsOptionsWindowGroupEditingText:SetPoint ("bottomright", instances.widget, "topright", 0, 2) + + _detalhes:SetFontSize (DetailsOptionsWindowGroupEditingText, 10) + instances_string.textsize = 10 + instances_string:SetPoint ("right", instances, "left", -2, 0) + --forge_button.textsize = 10 + + --> menus height + + window.title_y_pos = -8 + window.title_y_pos2 = -28 + window.top_start_at = -90 + + local YMod = 45 + local XMod = 6 + + menu_frame:SetPoint ("TopLeft", window.widget, "TopLeft", -6, -90 + YMod) + + YMod = 42 + + --> modify the scrollbars + for i, container in ipairs (window.options) do + for hash, frame in pairs (container) do + if (frame:GetName():find ("DetailsOptionsWindow") or frame:GetName():find ("ContainerScroll12")) then + + frame:SetPoint ("TOPLEFT", window.widget, "TOPLEFT", 198 + XMod, -88 + YMod) + + local up = frame.cima + local down = frame.baixo + local slider = frame.slider + + slider:SetPoint ("TOPLEFT", frame, "TOPRIGHT", 3, -20) + slider:Altura (429) + + up:SetNormalTexture ([[Interface\Buttons\Arrow-Up-Up]]) + up:SetPushedTexture ([[Interface\Buttons\Arrow-Up-Down]]) + up:SetDisabledTexture ([[Interface\Buttons\Arrow-Up-Disabled]]) + up:GetNormalTexture():ClearAllPoints() + up:GetPushedTexture():ClearAllPoints() + up:GetDisabledTexture():ClearAllPoints() + up:GetNormalTexture():SetPoint ("center", up, "center", 1, 1) + up:GetPushedTexture():SetPoint ("center", up, "center", 1, 1) + up:GetDisabledTexture():SetPoint ("center", up, "center", 1, 1) + up:SetSize (16, 16) + up:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\AddOns\Details\images\background]]}) + up:SetBackdropColor (0, 0, 0, 0.3) + up:SetBackdropBorderColor (0, 0, 0, 1) + + down:SetNormalTexture ([[Interface\Buttons\Arrow-Down-Up]]) + down:SetPushedTexture ([[Interface\Buttons\Arrow-Down-Down]]) + down:SetDisabledTexture ([[Interface\Buttons\Arrow-Down-Disabled]]) + down:GetNormalTexture():ClearAllPoints() + down:GetPushedTexture():ClearAllPoints() + down:GetDisabledTexture():ClearAllPoints() + down:GetNormalTexture():SetPoint ("center", down, "center", 1, -5) + down:GetPushedTexture():SetPoint ("center", down, "center", 1, -5) + down:GetDisabledTexture():SetPoint ("center", down, "center", 1, -5) + down:SetSize (16, 16) + down:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\AddOns\Details\images\background]]}) + down:SetBackdropColor (0, 0, 0, 0.35) + down:SetBackdropBorderColor (0, 0, 0, 1) + + slider:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\AddOns\Details\images\background]]}) + slider:SetBackdropColor (0, 0, 0, 0.35) + slider:SetBackdropBorderColor (0, 0, 0, 1) + + slider:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\AddOns\Details\images\background]]}) + slider:SetBackdropColor (0, 0, 0, 0.35) + slider:SetBackdropBorderColor (0, 0, 0, 1) + + slider:cimaPoint (0, 13) + slider:baixoPoint (0, -13) + slider.thumb:SetTexture ([[Interface\AddOns\Details\images\icons2]]) + slider.thumb:SetTexCoord (482/512, 492/512, 104/512, 120/512) + slider.thumb:SetSize (12, 12) + slider.thumb:SetVertexColor (0.6, 0.6, 0.6, 0.95) + end + end + end + window.using_skin = 2 end - --window:UseElvUISkin() + if (_detalhes.player_details_window.skin == "ElvUI") then + window:UseElvUISkin() + end + --> is the default one, doesn't need to change anything function window:UseClassicSkin() - window.using_skin = 1 end @@ -1344,7 +1508,7 @@ function window:CreateFrame20() local frame20 = window.options [20][1] local titulo_tooltips = g:NewLabel (frame20, _, "$parentTituloTooltipsText", "tooltipsTituloLabel", Loc ["STRING_OPTIONS_TOOLTIPS_TITLE"], "GameFontNormal", 16) - local titulo_tooltips_desc = g:NewLabel (frame20, _, "$parentTituloTooltipsText2", "tooltips2TituloLabel", Loc ["STRING_OPTIONS_TOOLTIPS_TITLE_DESC"], "GameFontNormal", 9, "white") + local titulo_tooltips_desc = g:NewLabel (frame20, _, "$parentTituloTooltipsText2", "tooltips2TituloLabel", Loc ["STRING_OPTIONS_TOOLTIPS_TITLE_DESC"], "GameFontNormal", 10, "white") titulo_tooltips_desc.width = 350 titulo_tooltips_desc.height = 20 @@ -1753,8 +1917,8 @@ function window:CreateFrame20() local x = window.left_start_at - titulo_tooltips:SetPoint (x, -30) - titulo_tooltips_desc:SetPoint (x, -50) + titulo_tooltips:SetPoint (x, window.title_y_pos) + titulo_tooltips_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"TooltipsTextsAnchorLabel", 1, true}, @@ -1772,7 +1936,7 @@ function window:CreateFrame20() {edit_menu_bg, 11, true}, } - window:arrange_menu (frame20, left_side, x, -90) + window:arrange_menu (frame20, left_side, x, window.top_start_at) x = window.right_start_at @@ -1791,7 +1955,7 @@ function window:CreateFrame20() {"BackdropColorLabel", 11}, } - window:arrange_menu (frame20, right_side, x, -90) + window:arrange_menu (frame20, right_side, x, window.top_start_at) end --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -1802,7 +1966,7 @@ function window:CreateFrame19() local frame19 = window.options [19][1] local titulo_externals = g:NewLabel (frame19, _, "$parentTituloExternalsText", "ExternalsTituloLabel", Loc ["STRING_OPTIONS_EXTERNALS_TITLE"], "GameFontNormal", 16) - local titulo_externals_desc = g:NewLabel (frame19, _, "$parentTituloExternalsText2", "Externals2TituloLabel", Loc ["STRING_OPTIONS_EXTERNALS_TITLE2"], "GameFontNormal", 9, "white") + local titulo_externals_desc = g:NewLabel (frame19, _, "$parentTituloExternalsText2", "Externals2TituloLabel", Loc ["STRING_OPTIONS_EXTERNALS_TITLE2"], "GameFontNormal", 10, "white") titulo_externals_desc.width = 350 titulo_externals_desc.height = 20 @@ -1957,8 +2121,8 @@ function window:CreateFrame19() local x = window.left_start_at - titulo_externals:SetPoint (x, -30) - titulo_externals_desc:SetPoint (x, -50) + titulo_externals:SetPoint (x, window.title_y_pos) + titulo_externals_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"minimapAnchorLabel", 1, true}, @@ -1973,7 +2137,7 @@ function window:CreateFrame19() {"ItemLevelLabel", 10} } - window:arrange_menu (frame19, left_side, x, -90) + window:arrange_menu (frame19, left_side, x, window.top_start_at) end @@ -1985,7 +2149,7 @@ function window:CreateFrame18() local frame18 = window.options [18][1] local titulo_misc_settings = g:NewLabel (frame18, _, "$parentTituloMiscSettingsText", "MiscSettingsLabel", Loc ["STRING_OPTIONS_MISCTITLE"], "GameFontNormal", 16) - local titulo_misc_settings_desc = g:NewLabel (frame18, _, "$parentTituloMiscSettingsText2", "Misc2SettingsLabel", Loc ["STRING_OPTIONS_MISCTITLE2"], "GameFontNormal", 9, "white") + local titulo_misc_settings_desc = g:NewLabel (frame18, _, "$parentTituloMiscSettingsText2", "Misc2SettingsLabel", Loc ["STRING_OPTIONS_MISCTITLE2"], "GameFontNormal", 10, "white") titulo_misc_settings_desc.width = 350 titulo_misc_settings_desc.height = 20 @@ -2564,8 +2728,8 @@ function window:CreateFrame18() local x = window.left_start_at - titulo_misc_settings:SetPoint (x, -30) - titulo_misc_settings_desc:SetPoint (x, -50) + titulo_misc_settings:SetPoint (x, window.title_y_pos) + titulo_misc_settings_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"switchesAnchorLabel", 1, true}, @@ -2588,7 +2752,7 @@ function window:CreateFrame18() {"ReportFormatLabel", 14}, } - window:arrange_menu (frame18, left_side, x, -90) + window:arrange_menu (frame18, left_side, x, window.top_start_at) local right_side = { {"instancesMiscLabel", 1, true}, @@ -2607,7 +2771,7 @@ function window:CreateFrame18() } - window:arrange_menu (frame18, right_side, window.right_start_at, -90) + window:arrange_menu (frame18, right_side, window.right_start_at, window.top_start_at) end --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -2618,7 +2782,7 @@ function window:CreateFrame17() local frame17 = window.options [17][1] local titulo_instance_settings = g:NewLabel (frame17, _, "$parentTituloInstanceSettingsText", "InstanceSettingsLabel", Loc ["STRING_OPTIONS_SHOWHIDE"], "GameFontNormal", 16) - local titulo_instance_settings_desc = g:NewLabel (frame17, _, "$parentInstanceSettingsText2", "InstanceSettingsLabel", Loc ["STRING_OPTIONS_SHOWHIDE_DESC"], "GameFontNormal", 9, "white") + local titulo_instance_settings_desc = g:NewLabel (frame17, _, "$parentInstanceSettingsText2", "InstanceSettingsLabel", Loc ["STRING_OPTIONS_SHOWHIDE_DESC"], "GameFontNormal", 10, "white") titulo_instance_settings_desc:SetSize (450, 20) --> combat alpha modifier @@ -2791,8 +2955,8 @@ function window:CreateFrame17() local x = window.left_start_at - titulo_instance_settings:SetPoint (x, -30) - titulo_instance_settings_desc:SetPoint (x, -50) + titulo_instance_settings:SetPoint (x, window.title_y_pos) + titulo_instance_settings_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"hideInCombatAnchor", 1, true}, @@ -2806,7 +2970,7 @@ function window:CreateFrame17() {"menuOnLeaveLabel", 8}, } - window:arrange_menu (frame17, left_side, x, -90) + window:arrange_menu (frame17, left_side, x, window.top_start_at) end --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -2819,7 +2983,7 @@ function window:CreateFrame16() --> title local titulo_datacharts = g:NewLabel (frame16, _, "$parentTituloDataChartsText", "DataChartsLabel", Loc ["STRING_OPTIONS_DATACHARTTITLE"], "GameFontNormal", 16) - local titulo_datacharts_desc = g:NewLabel (frame16, _, "$parentDataChartsText2", "DataCharts2Label", Loc ["STRING_OPTIONS_DATACHARTTITLE_DESC"], "GameFontNormal", 9, "white") + local titulo_datacharts_desc = g:NewLabel (frame16, _, "$parentDataChartsText2", "DataCharts2Label", Loc ["STRING_OPTIONS_DATACHARTTITLE_DESC"], "GameFontNormal", 10, "white") titulo_datacharts_desc.width = 350 --> warning @@ -3239,7 +3403,7 @@ function window:CreateFrame16() --> anchors local start = 25 - capture_name:SetPoint (start, -30) + capture_name:SetPoint (start, window.title_y_pos) capture_icon:SetPoint (start, -55) capture_author:SetPoint (start, -80) capture_version:SetPoint (start, -105) @@ -3259,8 +3423,8 @@ function window:CreateFrame16() --> anchors - titulo_datacharts:SetPoint (10, -10) - titulo_datacharts_desc:SetPoint (10, -30) + titulo_datacharts:SetPoint (10, window.title_y_pos) + titulo_datacharts_desc:SetPoint (10, window.title_y_pos2) panel:SetPoint (10, -70) end @@ -3275,7 +3439,7 @@ function window:CreateFrame15() --> title local titulo_customspells = g:NewLabel (frame15, _, "$parentTituloCustomSpellsText", "customSpellsTextLabel", Loc ["STRING_OPTIONS_CUSTOMSPELLTITLE"], "GameFontNormal", 16) - local titulo_customspells_desc = g:NewLabel (frame15, _, "$parentCustomSpellsText2", "customSpellsText2Label", Loc ["STRING_OPTIONS_CUSTOMSPELLTITLE_DESC"], "GameFontNormal", 9, "white") + local titulo_customspells_desc = g:NewLabel (frame15, _, "$parentCustomSpellsText2", "customSpellsText2Label", Loc ["STRING_OPTIONS_CUSTOMSPELLTITLE_DESC"], "GameFontNormal", 10, "white") titulo_customspells_desc.width = 350 local name_entry_func = function (index, text) @@ -3508,8 +3672,8 @@ function window:CreateFrame15() --> anchors - titulo_customspells:SetPoint (10, -10) - titulo_customspells_desc:SetPoint (10, -30) + titulo_customspells:SetPoint (10, window.title_y_pos) + titulo_customspells_desc:SetPoint (10, window.title_y_pos2) panel:SetPoint (10, -70) end @@ -3524,7 +3688,7 @@ function window:CreateFrame14() local frame14 = window.options [14][1] local titulo_attributetext = g:NewLabel (frame14, _, "$parentTituloAttributeText", "attributeTextLabel", Loc ["STRING_OPTIONS_ATTRIBUTE_TEXT"], "GameFontNormal", 16) - local titulo_attributetext_desc = g:NewLabel (frame14, _, "$parentAttributeText2", "attributeText2Label", Loc ["STRING_OPTIONS_ATTRIBUTE_TEXT_DESC"], "GameFontNormal", 9, "white") + local titulo_attributetext_desc = g:NewLabel (frame14, _, "$parentAttributeText2", "attributeText2Label", Loc ["STRING_OPTIONS_ATTRIBUTE_TEXT_DESC"], "GameFontNormal", 10, "white") titulo_attributetext_desc.width = 350 --attribute text @@ -3743,8 +3907,8 @@ function window:CreateFrame14() local x = window.left_start_at - titulo_attributetext:SetPoint (x, -30) - titulo_attributetext_desc:SetPoint (x, -50) + titulo_attributetext:SetPoint (x, window.title_y_pos) + titulo_attributetext_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"SettingsAnchorLabel", 1, true}, @@ -3760,7 +3924,7 @@ function window:CreateFrame14() {"attributeShadowLabel", 11}, } - window:arrange_menu (frame14, left_side, x, -90) + window:arrange_menu (frame14, left_side, x, window.top_start_at) end @@ -3789,7 +3953,7 @@ function window:CreateFrame1() end local titulo_persona = g:NewLabel (frame1, _, "$parentTituloPersona", "tituloPersonaLabel", Loc ["STRING_OPTIONS_SOCIAL"], "GameFontNormal", 16) - local titulo_persona_desc = g:NewLabel (frame1, _, "$parentTituloPersona2", "tituloPersona2Label", Loc ["STRING_OPTIONS_SOCIAL_DESC"], "GameFontNormal", 9, "white") + local titulo_persona_desc = g:NewLabel (frame1, _, "$parentTituloPersona2", "tituloPersona2Label", Loc ["STRING_OPTIONS_SOCIAL_DESC"], "GameFontNormal", 10, "white") titulo_persona_desc.width = 350 --> persona @@ -3920,7 +4084,7 @@ function window:CreateFrame1() --> Max Segments local titulo_display = g:NewLabel (frame1, _, "$parentTituloDisplay", "tituloDisplayLabel", Loc ["STRING_OPTIONSMENU_DISPLAY"], "GameFontNormal", 16) --> localize-me - local titulo_display_desc = g:NewLabel (frame1, _, "$parentTituloDisplay2", "tituloDisplay2Label", Loc ["STRING_OPTIONSMENU_DISPLAY_DESC"], "GameFontNormal", 9, "white") --> localize-me + local titulo_display_desc = g:NewLabel (frame1, _, "$parentTituloDisplay2", "tituloDisplay2Label", Loc ["STRING_OPTIONSMENU_DISPLAY_DESC"], "GameFontNormal", 10, "white") --> localize-me titulo_display_desc.width = 320 g:NewLabel (frame1, _, "$parentSliderLabel", "segmentsLabel", Loc ["STRING_OPTIONS_MAXSEGMENTS"], "GameFontHighlightLeft") @@ -4094,7 +4258,7 @@ function window:CreateFrame1() --lock unlock g:NewButton (frame1, _, "$parentLockButton", "LockButton", window.buttons_width, window.buttons_height, _detalhes.lock_instance_function, nil, nil, nil, Loc ["STRING_OPTIONS_WC_LOCK"], 1, options_button_template) --frame1.LockButton:InstallCustomTexture (nil, nil, nil, nil, nil, true) - + window:CreateLineBackground2 (frame1, "LockButton", "LockButton", Loc ["STRING_OPTIONS_WC_LOCK_DESC"], nil, {1, 0.8, 0}, button_color_rgb) frame1.LockButton:SetIcon ([[Interface\PetBattles\PetBattle-LockIcon]], nil, nil, nil, {0.0703125, 0.9453125, 0.0546875, 0.9453125}, nil, nil, 2) @@ -4222,12 +4386,12 @@ function window:CreateFrame1() local w_start = 10 - titulo_display:SetPoint (window.left_start_at, -30) - titulo_display_desc:SetPoint (window.left_start_at, -50) + titulo_display:SetPoint (window.left_start_at, window.title_y_pos) + titulo_display_desc:SetPoint (window.left_start_at, window.title_y_pos2) local avatar_x_anchor = window.right_start_at - frame1.GeneralIdentityLabel:SetPoint (avatar_x_anchor, -90) + frame1.GeneralIdentityLabel:SetPoint (avatar_x_anchor, window.top_start_at) frame1.nicknameLabel:SetPoint (avatar_x_anchor, -115) frame1.chooseAvatarButton:SetPoint (avatar_x_anchor+1, -140) @@ -4300,7 +4464,7 @@ function window:CreateFrame2() --> titles local titulo_combattweeks = g:NewLabel (frame2, _, "$parentTituloCombatTweeks", "tituloCombatTweeksLabel", Loc ["STRING_OPTIONS_COMBATTWEEKS"], "GameFontNormal", 16) - local titulo_combattweeks_desc = g:NewLabel (frame2, _, "$parentCombatTweeks2", "tituloCombatTweeks2Label", Loc ["STRING_OPTIONS_COMBATTWEEKS_DESC"], "GameFontNormal", 9, "white") + local titulo_combattweeks_desc = g:NewLabel (frame2, _, "$parentCombatTweeks2", "tituloCombatTweeks2Label", Loc ["STRING_OPTIONS_COMBATTWEEKS_DESC"], "GameFontNormal", 10,"white") titulo_combattweeks_desc.width = 320 @@ -4683,8 +4847,8 @@ function window:CreateFrame2() local x = window.left_start_at - titulo_combattweeks:SetPoint (x, -30) - titulo_combattweeks_desc:SetPoint (x, -50) + titulo_combattweeks:SetPoint (x, window.title_y_pos) + titulo_combattweeks_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"GeneralAnchorLabel", 1, true}, @@ -4722,7 +4886,7 @@ function window:CreateFrame2() {"ShowAllLabel", 12}, } - window:arrange_menu (frame2, right_side, x, -90) + window:arrange_menu (frame2, right_side, x, window.top_start_at) end --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -4735,7 +4899,7 @@ function window:CreateFrame13() --> profiles title local titulo_profiles = g:NewLabel (frame13, _, "$parentTituloProfiles", "tituloProfilesLabel", Loc ["STRING_OPTIONS_PROFILES_TITLE"], "GameFontNormal", 16) - local titulo_profiles_desc = g:NewLabel (frame13, _, "$parentTituloProfiles2", "tituloProfiles2Label", Loc ["STRING_OPTIONS_PROFILES_TITLE_DESC"], "GameFontNormal", 9, "white") + local titulo_profiles_desc = g:NewLabel (frame13, _, "$parentTituloProfiles2", "tituloProfiles2Label", Loc ["STRING_OPTIONS_PROFILES_TITLE_DESC"], "GameFontNormal", 10,"white") titulo_profiles_desc.width = 320 --> current profile @@ -4932,8 +5096,8 @@ function window:CreateFrame13() local x = window.left_start_at - titulo_profiles:SetPoint (x, -30) - titulo_profiles_desc:SetPoint (x, -50) + titulo_profiles:SetPoint (x, window.title_y_pos) + titulo_profiles_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"ProfileAnchorLabel", 1, true}, @@ -5077,7 +5241,7 @@ function window:CreateFrame3() --> Skin local titulo_skin = g:NewLabel (frame3, _, "$parentTituloSkin", "tituloSkinLabel", Loc ["STRING_OPTIONS_SKIN_A"], "GameFontNormal", 16) - local titulo_skin_desc = g:NewLabel (frame3, _, "$parentTituloSkin2", "tituloSkin2Label", Loc ["STRING_OPTIONS_SKIN_A_DESC"], "GameFontNormal", 9, "white") + local titulo_skin_desc = g:NewLabel (frame3, _, "$parentTituloSkin2", "tituloSkin2Label", Loc ["STRING_OPTIONS_SKIN_A_DESC"], "GameFontNormal", 10, "white") titulo_skin_desc.width = 320 --> create functions and frames first: @@ -5542,7 +5706,7 @@ function window:CreateFrame3() --> extra Options -~-extra g:NewLabel (frame3, _, "$parentSkinExtraOptionsAnchor", "SkinExtraOptionsAnchor", Loc ["STRING_OPTIONS_SKIN_EXTRA_OPTIONS_ANCHOR"], "GameFontNormal") --frame3.SkinExtraOptionsAnchor:Hide() - --frame3.SkinExtraOptionsAnchor:SetPoint (window.right_start_at, -90) + --frame3.SkinExtraOptionsAnchor:SetPoint (window.right_start_at, window.top_start_at) frame3.ExtraOptions = {} --> Anchors @@ -5555,8 +5719,8 @@ function window:CreateFrame3() local x = window.left_start_at - titulo_skin:SetPoint (x, -30) - titulo_skin_desc:SetPoint (x, -50) + titulo_skin:SetPoint (x, window.title_y_pos) + titulo_skin_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"SkinSelectionAnchorLabel", 1, true}, @@ -5586,8 +5750,8 @@ function window:CreateFrame3() {"SkinExtraOptionsAnchor", 5, true}, } - window:arrange_menu (frame3, left_side, x, -90) - window:arrange_menu (frame3, right_side, window.right_start_at, -90) + window:arrange_menu (frame3, left_side, x, window.top_start_at) + window:arrange_menu (frame3, right_side, window.right_start_at, window.top_start_at) end --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -5599,7 +5763,7 @@ function window:CreateFrame4() --> bars general local titulo_bars = g:NewLabel (frame4, _, "$parentTituloPersona", "tituloBarsLabel", Loc ["STRING_OPTIONS_BARS"], "GameFontNormal", 16) - local titulo_bars_desc = g:NewLabel (frame4, _, "$parentTituloPersona2", "tituloBars2Label", Loc ["STRING_OPTIONS_BARS_DESC"], "GameFontNormal", 9, "white") + local titulo_bars_desc = g:NewLabel (frame4, _, "$parentTituloPersona2", "tituloBars2Label", Loc ["STRING_OPTIONS_BARS_DESC"], "GameFontNormal", 10, "white") titulo_bars_desc.width = 320 --> general anchor @@ -5778,10 +5942,6 @@ function window:CreateFrame4() frame4.textureDropdown:SetPoint ("left", frame4.textureLabel, "right", 2) window:CreateLineBackground2 (frame4, "textureDropdown", "textureLabel", Loc ["STRING_OPTIONS_BAR_TEXTURE_DESC"]) - - - - --> custom bar texture local custom_texture = g:NewTextEntry (frame4, _, "$parentCustomTextureEntry", "CustomTextureEntry", 120, TEXTENTRY_HEIGHT, nil, nil, nil, nil, nil, options_dropdown_template) local custom_texture_label = g:NewLabel (frame4, _, "$parentCustomTextureLabel", "CustomTextureLabel", Loc ["STRING_OPTIONS_BARS_CUSTOM_TEXTURE"], "GameFontHighlightLeft") @@ -5833,25 +5993,18 @@ function window:CreateFrame4() custom_texture_cancel:SetHook ("OnLeave", function (self, capsule) self:GetNormalTexture():SetBlendMode("BLEND") end) - - - - - - - - - -- row texture color + + -- row texture color local rowcolor_callback = function (button, r, g, b, a) - _G.DetailsOptionsWindow.instance:SetBarSettings (nil, nil, nil, {r, g, b}) _G.DetailsOptionsWindow.instance.row_info.alpha = a + _G.DetailsOptionsWindow.instance:SetBarSettings (nil, nil, nil, {r, g, b}) _G.DetailsOptionsWindow.instance:SetBarSettings (nil, nil, nil, nil, nil, nil, nil, a) if (_detalhes.options_group_edit and not DetailsOptionsWindow.loading_settings) then for _, this_instance in ipairs (_G.DetailsOptionsWindow.instance:GetInstanceGroup()) do if (this_instance ~= _G.DetailsOptionsWindow.instance) then - this_instance:SetBarSettings (nil, nil, nil, {r, g, b}) this_instance.row_info.alpha = a + this_instance:SetBarSettings (nil, nil, nil, {r, g, b}) this_instance:SetBarSettings (nil, nil, nil, nil, nil, nil, nil, a) end end @@ -6248,8 +6401,8 @@ function window:CreateFrame4() --> Anchors: local x = window.left_start_at - titulo_bars:SetPoint (x, -30) - titulo_bars_desc:SetPoint (x, -50) + titulo_bars:SetPoint (x, window.title_y_pos) + titulo_bars_desc:SetPoint (x, window.title_y_pos2) local left_side = { --textures @@ -6286,8 +6439,8 @@ function window:CreateFrame4() {frame4.BackdropBorderTextureLabel, 11}, } - window:arrange_menu (frame4, left_side, x, -90) - window:arrange_menu (frame4, right_side, 360, -90) + window:arrange_menu (frame4, left_side, x, window.top_start_at) + window:arrange_menu (frame4, right_side, 360, window.top_start_at) end @@ -6301,7 +6454,7 @@ function window:CreateFrame5() --> bars text local titulo_texts = g:NewLabel (frame5, _, "$parentTituloPersona", "tituloBarsLabel", Loc ["STRING_OPTIONS_TEXT"], "GameFontNormal", 16) - local titulo_texts_desc = g:NewLabel (frame5, _, "$parentTituloPersona2", "tituloBars2Label", Loc ["STRING_OPTIONS_TEXT_DESC"], "GameFontNormal", 9, "white") + local titulo_texts_desc = g:NewLabel (frame5, _, "$parentTituloPersona2", "tituloBars2Label", Loc ["STRING_OPTIONS_TEXT_DESC"], "GameFontNormal", 10, "white") titulo_texts_desc.width = 320 --> text color @@ -6784,7 +6937,7 @@ function window:CreateFrame5() if (_detalhes.options_group_edit and not DetailsOptionsWindow.loading_settings) then for _, this_instance in ipairs (instance:GetInstanceGroup()) do if (this_instance ~= instance) then - instance:SetBarRightTextSettings (value) + this_instance:SetBarRightTextSettings (value) end end end @@ -6806,7 +6959,7 @@ function window:CreateFrame5() if (_detalhes.options_group_edit and not DetailsOptionsWindow.loading_settings) then for _, this_instance in ipairs (instance:GetInstanceGroup()) do if (this_instance ~= instance) then - instance:SetBarRightTextSettings (nil, value) + this_instance:SetBarRightTextSettings (nil, value) end end end @@ -6829,7 +6982,7 @@ function window:CreateFrame5() if (_detalhes.options_group_edit and not DetailsOptionsWindow.loading_settings) then for _, this_instance in ipairs (instance:GetInstanceGroup()) do if (this_instance ~= instance) then - instance:SetBarRightTextSettings (nil, nil, value) + this_instance:SetBarRightTextSettings (nil, nil, value) end end end @@ -6846,7 +6999,7 @@ function window:CreateFrame5() if (_detalhes.options_group_edit and not DetailsOptionsWindow.loading_settings) then for _, this_instance in ipairs (instance:GetInstanceGroup()) do if (this_instance ~= instance) then - instance:SetBarRightTextSettings (nil, nil, nil, value) + this_instance:SetBarRightTextSettings (nil, nil, nil, value) end end end @@ -6880,7 +7033,7 @@ function window:CreateFrame5() if (_detalhes.options_group_edit and not DetailsOptionsWindow.loading_settings) then for _, this_instance in ipairs (instance:GetInstanceGroup()) do if (this_instance ~= instance) then - instance:SetBarRightTextSettings (nil, nil, nil, nil, value) + this_instance:SetBarRightTextSettings (nil, nil, nil, nil, value) end end end @@ -6923,8 +7076,8 @@ function window:CreateFrame5() local x = window.left_start_at - titulo_texts:SetPoint (x, -30) - titulo_texts_desc:SetPoint (x, -50) + titulo_texts:SetPoint (x, window.title_y_pos) + titulo_texts_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"LeftTextAnchorLabel", 1, true}, @@ -6974,7 +7127,7 @@ function window:CreateFrame6() --> window local titulo_instance = g:NewLabel (frame6, _, "$parentTituloPersona", "tituloBarsLabel", Loc ["STRING_OPTIONS_WINDOW_TITLE"], "GameFontNormal", 16) - local titulo_instance_desc = g:NewLabel (frame6, _, "$parentTituloPersona2", "tituloBars2Label", Loc ["STRING_OPTIONS_WINDOW_TITLE_DESC"], "GameFontNormal", 9, "white") + local titulo_instance_desc = g:NewLabel (frame6, _, "$parentTituloPersona2", "tituloBars2Label", Loc ["STRING_OPTIONS_WINDOW_TITLE_DESC"], "GameFontNormal", 10, "white") titulo_instance_desc.width = 320 --> window color @@ -7553,8 +7706,8 @@ function window:CreateFrame6() local x = window.left_start_at - titulo_instance:SetPoint (x, -30) - titulo_instance_desc:SetPoint (x, -50) + titulo_instance:SetPoint (x, window.title_y_pos) + titulo_instance_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"AdjustmentsAnchorLabel", 1, true}, @@ -7600,7 +7753,7 @@ function window:CreateFrame7() local frame7 = window.options [7][1] local titulo_toolbar = g:NewLabel (frame7, _, "$parentTituloToolbar", "tituloToolbarLabel", Loc ["STRING_OPTIONS_TOOLBAR_SETTINGS"], "GameFontNormal", 16) - local titulo_toolbar_desc = g:NewLabel (frame7, _, "$parentTituloToolbar2", "tituloToolbar2Label", Loc ["STRING_OPTIONS_TOOLBAR_SETTINGS_DESC"], "GameFontNormal", 9, "white") + local titulo_toolbar_desc = g:NewLabel (frame7, _, "$parentTituloToolbar2", "tituloToolbar2Label", Loc ["STRING_OPTIONS_TOOLBAR_SETTINGS_DESC"], "GameFontNormal", 10, "white") titulo_toolbar_desc.width = 320 -- menu anchors @@ -8010,8 +8163,8 @@ function window:CreateFrame7() local x = window.left_start_at - titulo_toolbar:SetPoint (x, -30) - titulo_toolbar_desc:SetPoint (x, -50) + titulo_toolbar:SetPoint (x, window.title_y_pos) + titulo_toolbar_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"LeftMenuAnchorLabel", 1, true}, @@ -8029,7 +8182,7 @@ function window:CreateFrame7() {"pluginIconsDirectionLabel", 12}, } - window:arrange_menu (frame7, left_side, x, -90) + window:arrange_menu (frame7, left_side, x, window.top_start_at) end @@ -8043,7 +8196,7 @@ function window:CreateFrame8() local frame8 = window.options [8][1] local titulo_toolbar = g:NewLabel (frame8, _, "$parentTituloToolbar_buttons", "tituloToolbarLabel", Loc ["STRING_OPTIONS_ROWADV_TITLE"], "GameFontNormal", 16) - local titulo_toolbar_desc = g:NewLabel (frame8, _, "$parentTituloToolbar_buttons", "tituloToolbar2Label", Loc ["STRING_OPTIONS_ROWADV_TITLE_DESC"], "GameFontNormal", 9, "white") + local titulo_toolbar_desc = g:NewLabel (frame8, _, "$parentTituloToolbar_buttons", "tituloToolbar2Label", Loc ["STRING_OPTIONS_ROWADV_TITLE_DESC"], "GameFontNormal", 10, "white") titulo_toolbar_desc.width = 320 --> models @@ -8374,8 +8527,8 @@ function window:CreateFrame8() local x = window.left_start_at - titulo_toolbar:SetPoint (x, -30) - titulo_toolbar_desc:SetPoint (x, -50) + titulo_toolbar:SetPoint (x, window.title_y_pos) + titulo_toolbar_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"ModelUpperAnchor", 1, true}, @@ -8395,7 +8548,7 @@ function window:CreateFrame8() {"totalBarOnlyInGroupLabel", 13}, } - window:arrange_menu (frame8, left_side, x, -90) + window:arrange_menu (frame8, left_side, x, window.top_start_at) local right_side = { {"BarUpdateRateAnchor", 1, true}, @@ -8417,7 +8570,7 @@ function window:CreateFrame9() local frame9 = window.options [9][1] local titulo_wallpaper = g:NewLabel (frame9, _, "$parentTituloPersona", "tituloBarsLabel", Loc ["STRING_OPTIONS_WP"], "GameFontNormal", 16) - local titulo_wallpaper_desc = g:NewLabel (frame9, _, "$parentTituloPersona2", "tituloBars2Label", Loc ["STRING_OPTIONS_WP_DESC"], "GameFontNormal", 9, "white") + local titulo_wallpaper_desc = g:NewLabel (frame9, _, "$parentTituloPersona2", "tituloBars2Label", Loc ["STRING_OPTIONS_WP_DESC"], "GameFontNormal", 10, "white") titulo_wallpaper_desc.width = 320 --> wallpaper @@ -8757,7 +8910,7 @@ function window:CreateFrame9() } local buildBackgroundMenu2 = function() - return subMenu [frame9.backgroundDropdown.value] or {label = "-- -- --", value = 0} + return subMenu [frame9.backgroundDropdown.value] or {label = "", value = 0} end local onSelectMainTexture = function (_, instance, choose) @@ -8969,7 +9122,7 @@ function window:CreateFrame9() preview:SetVertexColor (unpack (w.overlay)) preview:SetAlpha (w.alpha) - frame9.wallpaperCurrentLabel1text.text = w.texture or "-- -- --" + frame9.wallpaperCurrentLabel1text.text = w.texture or "" frame9.wallpaperCurrentLabel2text.text = a frame9.wallpaperCurrentLabel3text.text = red frame9.wallpaperCurrentLabel4text.text = green @@ -9118,8 +9271,8 @@ function window:CreateFrame9() local x = window.left_start_at - titulo_wallpaper:SetPoint (x, -30) - titulo_wallpaper_desc:SetPoint (x, -50) + titulo_wallpaper:SetPoint (x, window.title_y_pos) + titulo_wallpaper_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"WallpaperAnchorLabel", 1, true}, @@ -9143,12 +9296,12 @@ function window:CreateFrame9() frame9.wallpaperCurrentLabel9:SetPoint ("topleft", frame9.wallpaperCurrentLabel8, "bottomleft", 0, downY) - window:arrange_menu (frame9, left_side, x, -90) + window:arrange_menu (frame9, left_side, x, window.top_start_at) local right_side = { {"wallpaperPreviewAnchorLabel", 1, true}, } - window:arrange_menu (frame9, right_side, window.right_start_at, -90) + window:arrange_menu (frame9, right_side, window.right_start_at, window.top_start_at) local right_side2 = { {"WallpaperLoadTitleAnchor", 1, true}, @@ -9170,7 +9323,7 @@ function window:CreateFrame10() local frame11 = window.options [11][1] local titulo_performance_general = g:NewLabel (frame10, _, "$parentTituloPerformance1", "tituloPerformance1Label", Loc ["STRING_OPTIONS_PERFORMANCE1"], "GameFontNormal", 16) - local titulo_performance_general_desc = g:NewLabel (frame10, _, "$parentTituloPersona2", "tituloPersona2Label", Loc ["STRING_OPTIONS_PERFORMANCE1_DESC"], "GameFontNormal", 9, "white") + local titulo_performance_general_desc = g:NewLabel (frame10, _, "$parentTituloPersona2", "tituloPersona2Label", Loc ["STRING_OPTIONS_PERFORMANCE1_DESC"], "GameFontNormal", 10, "white") titulo_performance_general_desc.width = 320 --------------- Max Segments Saved @@ -9481,8 +9634,8 @@ function window:CreateFrame10() local x = window.left_start_at - titulo_performance_general:SetPoint (x, -30) - titulo_performance_general_desc:SetPoint (x, -50) + titulo_performance_general:SetPoint (x, window.title_y_pos) + titulo_performance_general_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"PerformanceProfilesAnchorLabel", 1, true}, @@ -9497,7 +9650,7 @@ function window:CreateFrame10() {"auraCaptureLabel", 10}, } - window:arrange_menu (frame10, left_side, window.left_start_at, -90) + window:arrange_menu (frame10, left_side, window.left_start_at, window.top_start_at) local right_side = { {"PerformanceAnchorLabel", 1, true}, @@ -9507,7 +9660,7 @@ function window:CreateFrame10() {"eraseTrashLabel", 4}, } - window:arrange_menu (frame10, right_side, window.right_start_at, -90) + window:arrange_menu (frame10, right_side, window.right_start_at, window.top_start_at) end @@ -9521,7 +9674,7 @@ function window:CreateFrame11() --> title local titulo1 = g:NewLabel (frame11, _, "$parentTituloRaidTools", "RaidToolsLabel", Loc ["STRING_OPTIONS_RT_TITLE"], "GameFontNormal", 16) - local titulo1_desc = g:NewLabel (frame11, _, "$parentTituloRaidToolsDesc", "RaidToolsDescLabel", Loc ["STRING_OPTIONS_RT_TITLE_DESC"], "GameFontNormal", 9, "white") + local titulo1_desc = g:NewLabel (frame11, _, "$parentTituloRaidToolsDesc", "RaidToolsDescLabel", Loc ["STRING_OPTIONS_RT_TITLE_DESC"], "GameFontNormal", 10, "white") titulo1_desc.width = 320 local text_entry_size = 140 @@ -9945,8 +10098,8 @@ function window:CreateFrame11() local x = window.left_start_at - titulo1:SetPoint (x, -30) - titulo1_desc:SetPoint (x, -50) + titulo1:SetPoint (x, window.title_y_pos) + titulo1_desc:SetPoint (x, window.title_y_pos2) local left_side = { {"AnnouncersInterrupt", 1, true}, @@ -9963,7 +10116,7 @@ function window:CreateFrame11() } - window:arrange_menu (frame11, left_side, window.left_start_at, -90) + window:arrange_menu (frame11, left_side, window.left_start_at, window.top_start_at) local right_side = { {"AnnouncersDeaths", 1, true}, @@ -9976,7 +10129,7 @@ function window:CreateFrame11() {"EnabledFirstHitLabel", 8}, } - window:arrange_menu (frame11, right_side, window.right_start_at, -90) + window:arrange_menu (frame11, right_side, window.right_start_at, window.top_start_at) end @@ -11032,7 +11185,8 @@ end --> if not window --_G.DetailsOptionsWindow6BackgroundColorTexture.MyObject:SetTexture (editing_instance.bg_r, editing_instance.bg_g, editing_instance.bg_b) _G.DetailsOptionsWindow6WindowBackgroundColorPick.MyObject:SetColor (editing_instance.bg_r, editing_instance.bg_g, editing_instance.bg_b, editing_instance.bg_alpha) - _G.DetailsOptionsWindow4RowColorPick.MyObject:SetColor (unpack (editing_instance.row_info.fixed_texture_color)) + local r1, g1, b1 = unpack (editing_instance.row_info.fixed_texture_color) + _G.DetailsOptionsWindow4RowColorPick.MyObject:SetColor ( r1, g1, b1, editing_instance.row_info.alpha) _G.DetailsOptionsWindow5FixedTextColor.MyObject:SetColor (unpack (editing_instance.row_info.fixed_text_color)) @@ -11045,9 +11199,21 @@ end --> if not window else _G.DetailsOptionsWindowInstanceSelectDropdown.MyObject:Select (editing_instance.meu_id, true) GameCooltip:Reset() - --_detalhes:CooltipPreset (1) - GameCooltip:AddLine ("editing window:", editing_instance.meu_id) - GameCooltip:ShowCooltip (_G.DetailsOptionsWindowInstanceSelectDropdown, "tooltip") + + GameCooltip:SetOption ("TextFont", "Friz Quadrata TT") + GameCooltip:SetOption ("TextColor", "orange") + GameCooltip:SetOption ("TextSize", 12) + GameCooltip:SetOption ("FixedWidth", 220) + GameCooltip:SetOption ("ButtonsYMod", -4) + GameCooltip:SetOption ("YSpacingMod", -4) + GameCooltip:SetOption ("IgnoreButtonAutoHeight", true) + GameCooltip:SetColor (1, 0.5, 0.5, 0.5, 0.5) + + GameCooltip:SetBackdrop (1, {edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, tileSize = 64, tile = true}, "black", "white") + + GameCooltip:AddLine ("Editing Window:", editing_instance.meu_id) + GameCooltip:SetOwner (_G.DetailsOptionsWindowInstanceSelectDropdown, "bottom", "top", -212, -6) + GameCooltip:ShowCooltip (nil, "tooltip") if (_G.DetailsOptionsWindow.MyObject.is_window_settings [_G.DetailsOptionsWindow.MyObject.current_selected]) then _G.DetailsOptionsWindowInstanceSelectDropdown.MyObject:Enable() diff --git a/gumps/janela_principal.lua b/gumps/janela_principal.lua index 132aba69..a76f5fe9 100644 --- a/gumps/janela_principal.lua +++ b/gumps/janela_principal.lua @@ -1608,18 +1608,9 @@ local resize_scripts_onenter = function (self) self.texture:SetBlendMode ("ADD") self.mostrando = true - GameCooltip:Reset() - GameCooltip:SetType ("tooltip") + _detalhes:CooltipPreset (2.1) GameCooltip:AddFromTable (resizeTooltip) - GameCooltip:SetOption ("TextSize", _detalhes.font_sizes.menus) - GameCooltip:SetOption ("TextFont", _detalhes.font_faces.menus) - GameCooltip:SetOption ("NoLastSelectedBar", true) - GameCooltip:SetOption ("YSpacingMod", -3) - GameCooltip:SetOption ("FixedHeight", 106) - - GameCooltip:SetWallpaper (1, _detalhes.tooltip.menus_bg_texture, _detalhes.tooltip.menus_bg_coords, _detalhes.tooltip.menus_bg_color, true) - GameCooltip:SetBackdrop (1, _detalhes.tooltip_backdrop, nil, _detalhes.tooltip_border_color) GameCooltip:SetOwner (self) GameCooltip:ShowCooltip() end @@ -1668,18 +1659,10 @@ local lockFunctionOnEnter = function (self) self.label:SetTextColor (1, 1, 1, .6) - GameCooltip:Reset() - GameCooltip:SetType ("tooltip") + _detalhes:CooltipPreset (2.1) + GameCooltip:SetOption ("FixedWidth", 180) GameCooltip:AddFromTable (lockButtonTooltip) - GameCooltip:SetOption ("NoLastSelectedBar", true) - GameCooltip:SetOption ("TextSize", _detalhes.font_sizes.menus) - GameCooltip:SetOption ("TextFont", _detalhes.font_faces.menus) - - GameCooltip:SetOption ("YSpacingMod", -3) - GameCooltip:SetOption ("FixedHeight", 32) - - GameCooltip:SetWallpaper (1, _detalhes.tooltip.menus_bg_texture, _detalhes.tooltip.menus_bg_coords, _detalhes.tooltip.menus_bg_color, true) - GameCooltip:SetBackdrop (1, _detalhes.tooltip_backdrop, nil, _detalhes.tooltip_border_color) + GameCooltip:SetOwner (self) GameCooltip:ShowCooltip() end @@ -1786,16 +1769,10 @@ local unSnapButtonOnEnter = function (self) OnEnterMainWindow (self.instancia, self) self.mostrando = true - GameCooltip:Reset() + _detalhes:CooltipPreset (2.1) + GameCooltip:SetOption ("FixedWidth", 180) GameCooltip:AddFromTable (unSnapButtonTooltip) - GameCooltip:SetOption ("TextSize", _detalhes.font_sizes.menus) - GameCooltip:SetOption ("TextFont", _detalhes.font_faces.menus) - GameCooltip:SetOption ("YSpacingMod", -3) - GameCooltip:SetOption ("FixedHeight", 32) - - GameCooltip:SetWallpaper (1, _detalhes.tooltip.menus_bg_texture, _detalhes.tooltip.menus_bg_coords, _detalhes.tooltip.menus_bg_color, true) - GameCooltip:SetBackdrop (1, _detalhes.tooltip_backdrop, nil, _detalhes.tooltip_border_color) GameCooltip:ShowCooltip (self, "tooltip") end @@ -3525,7 +3502,7 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando) --> alert frame baseframe.alert = CreateAlertFrame (baseframe, instancia) --- resizers & lock button ------------------------------------------------------------------------------------------------------------------------------------------------------------ +-- resizers & lock button ~lock ------------------------------------------------------------------------------------------------------------------------------------------------------------ --> right resizer baseframe.resize_direita = CreateFrame ("button", "Details_Resize_Direita"..ID, baseframe) @@ -4175,9 +4152,9 @@ function _detalhes:SetBarSettings (height, texture, colorclass, fixedcolor, back --> fixed color if (fixedcolor) then - local red, green, blue, alpha = gump:ParseColors (fixedcolor) + local red, green, blue = gump:ParseColors (fixedcolor) local c = self.row_info.fixed_texture_color - c[1], c[2], c[3], c[4] = red, green, blue, alpha + c[1], c[2], c[3], c[4] = red, green, blue, self.row_info.alpha end --> background texture diff --git a/images/icons.tga b/images/icons.tga index 741a315f..d570eb5a 100644 Binary files a/images/icons.tga and b/images/icons.tga differ diff --git a/images/options_window.tga b/images/options_window.tga index 547689da..6953d20b 100644 Binary files a/images/options_window.tga and b/images/options_window.tga differ diff --git a/plugins/Details_DpsTuning/Details_DpsTuning.lua b/plugins/Details_DpsTuning/Details_DpsTuning.lua index 89b52f3c..e9de6cb7 100644 --- a/plugins/Details_DpsTuning/Details_DpsTuning.lua +++ b/plugins/Details_DpsTuning/Details_DpsTuning.lua @@ -123,6 +123,15 @@ local function CreatePluginFrames() elseif (event == "PLUGIN_ENABLED") then --> plugin got enabled on details options panel + + elseif (event == "DETAILS_DATA_RESET") then + --> data on details! got reseted. need to reset the plugin as well + + DpsTuningPlugin:TrackBuffsAtEnd() + DpsTuningPlugin:CancelTicker() + SDF:UnregisterEvent ("COMBAT_LOG_EVENT_UNFILTERED") + + DpsTuningPlugin:OnDataReset (...) end end @@ -755,6 +764,7 @@ local function CreatePluginFrames() end --uptime + local misc = DpsTuningPlugin.CurCombat (DETAILS_ATTRIBUTE_MISC, DpsTuningPlugin.playername) if (misc) then local debuff_uptime = misc.debuff_uptime @@ -1060,6 +1070,34 @@ local function CreatePluginFrames() end end + function DpsTuningPlugin:OnDataReset (...) + DpsTuningPlugin.CurCombat = nil + DpsTuningPlugin.CurPlayer = nil + + table.wipe (spell_activity) + table.wipe (buff_activity) + table.wipe (spell_graphic_data) + table.wipe (buff_graphic_data) + table.wipe (power_amount_chart_table) + + DpsTuningPlugin:ClearBuffBlocks() + + SDF.OpenGraphicButton:Disable() + SDF.OpenGraphicButton2:Disable() + SDF.OpenGraphicButton3:Disable() + + if (DpsTuningPlugin.SpellBars) then + for bar_index = 1, 9 do + local bar = DpsTuningPlugin.SpellBars [bar_index] + if (bar) then + bar:Hide() + end + end + end + + DpsTuningPlugin.FinishedAt = 0 + end + function DpsTuningPlugin:OnCombatStart (...) if (DpsTuningPlugin.FinishedAt+10 > ClockTime()) then @@ -1138,6 +1176,8 @@ local function CreatePluginFrames() end end + + function DpsTuningPlugin:CancelTicker() if (DpsTuningPlugin.TimerTick) then DpsTuningPlugin:CancelTimer (DpsTuningPlugin.TimerTick) @@ -1183,7 +1223,7 @@ function DpsTuningPlugin:OnEvent (_, event, ...) } --> Install plugin inside details - local install = _G._detalhes:InstallPlugin ("SOLO", "Dps Tuning", "Interface\\Icons\\Ability_Racial_RocketBarrage", DpsTuningPlugin, "DETAILS_PLUGIN_DPS_TUNING", MINIMAL_DETAILS_VERSION_REQUIRED, "Details! Team", "v1.01", default_settings) + local install = _G._detalhes:InstallPlugin ("SOLO", "Dps Tuning", "Interface\\Icons\\Ability_Racial_RocketBarrage", DpsTuningPlugin, "DETAILS_PLUGIN_DPS_TUNING", MINIMAL_DETAILS_VERSION_REQUIRED, "Details! Team", "v1.1", default_settings) if (type (install) == "table" and install.error) then print (install.error) end diff --git a/plugins/Details_EncounterDetails/frames.lua b/plugins/Details_EncounterDetails/frames.lua index bd144408..c90aa2f6 100644 --- a/plugins/Details_EncounterDetails/frames.lua +++ b/plugins/Details_EncounterDetails/frames.lua @@ -933,8 +933,11 @@ do BossFrame:SetFrameStrata ("HIGH") BossFrame:SetToplevel (true) + -- ~size BossFrame:SetWidth (698) BossFrame:SetHeight (354) + + BossFrame:EnableMouse (true) BossFrame:SetResizable (false) BossFrame:SetMovable (true)