From 9a1e342ea37299b52d2a219c7cc47ef4ef34f1dc Mon Sep 17 00:00:00 2001 From: tercio Date: Fri, 15 Aug 2014 14:23:53 -0300 Subject: [PATCH] - Added new skin: ElvUI Frame Style (Black White). - Align With Right Chat Window option now check if the window have statusbar enabled. - New API: instance:UngroupInstance() remove the instance from any group. --- boot.lua | 11 +- classes/classe_instancia.lua | 4 + functions/skins.lua | 188 ++++++++++++++++++++++++++++-- gumps/janela_options.lua | 1 + images/classes_small_alpha_bw.tga | Bin 0 -> 39760 bytes startup.lua | 2 +- 6 files changed, 191 insertions(+), 15 deletions(-) create mode 100644 images/classes_small_alpha_bw.tga diff --git a/boot.lua b/boot.lua index 8bc9467b..30cb00a0 100644 --- a/boot.lua +++ b/boot.lua @@ -4,8 +4,8 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.build_counter = 32 --it's 37 for release - _detalhes.userversion = "v1.22.3" + _detalhes.build_counter = 38 --it's 38 for release + _detalhes.userversion = "v1.22.4" _detalhes.realversion = 25 _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" @@ -19,7 +19,9 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ -|cFFFFFF00a1.22.3 (|cFFFFCC00Ago 14, 2014|r|cFFFFFF00)|r:\n\n +|cFFFFFF00a1.22.0 (|cFFFFCC00Ago 15, 2014|r|cFFFFFF00)|r:\n\n +|cFFFFFF00-|r Added new skin: ElvUI Frame Style (Black White).\n\n +|cFFFFFF00-|r Align With Right Chat Window option now check if the window have statusbar enabled.\n\n |cFFFFFF00-|r Added support for hotcorners.\n\n |cFFFFFF00-|r Few improvements on report for Deaths and Spells over Player Detail Window.\n\n |cFFFFFF00-|r Added option for disable window groups.\n\n @@ -27,10 +29,9 @@ do |cFFFFFF00-|r Added option for select the icon pack to use, also added black white icon pack.\n\n |cFFFFFF00-|r Fixed many bugs involving skins and profiles, thing should run more smooth now.\n\n |cFFFFFF00-|r Plugin Time Attack now correctly saves the attempt when pressing the big save button.\n\n - --]] - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00a1.22.3 (|cFFFFCC00Ago 14, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Few improvements on report for Deaths and Spells over Player Detail Window.\n\n|cFFFFFF00-|r Added option to disable reset button (reset only using its tooltip menu).\n\n|cFFFFFF00-|r Added option for disable window groups.\n\n|cFFFFFF00-|r Added option for select the icon pack to use, also added black white icon pack.\n\n|cFFFFFF00-|r Fixed many bugs involving skins and profiles, thing should run more smooth now.\n\n|cFFFFFF00-|r Plugin Time Attack now correctly saves the attempt when pressing the big save button.\n\n|cFFFFFF00-|r Added support for hotcorners.\n\n|cFFFFFF00v1.21.4 (|cFFFFCC00Ago 9, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added Shaman's Ancestral Guidance on cooldowns list |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r Added a profile selection screen when Details! are running for the first time on a character.\n\n|cFFFFFF00-|r Added Menu Text Size option over miscellaneous section on options panel |cFF999999(thanks @ Revi-mmochampion forum)|r.\n\n|cFFFFFF00-|r Fixed a bug over Healing Player Details Window where pets wasn't being shown |cFF999999(thanks @Mystery2012-mmochampion forum)|r.\n\n|cFFFFFF00-|r Fixed issue with summoning pets with unknown owners where it was breaking the summon of all the others pets. |cFF999999(thanks @ThunderLost-curse website)|r.\n\n|cFFFFFF00-|r Hot Corners isn't no more a part of Details!, instead of that, Hot Corner is now a standalone addon which needs to be installed separately for who wants to use it.\n\n|cFFFFFF00-|r Skin data is now stored inside the profiles, many code parts got rewrite, still may have few bugs but it's more reliable then before.\n\n|cFFFFFF00-|r Rework on Auras and Voidzones: now shows damage, dps and percentage. Also its tooltip got fixes and now shows the correct damage done to players.\n\n|cFFFFFF00-|r Tooltip for Enemies now shows damage taken from players |cFF999999(thanks @Arieth-mmochampion forum)|r.\n\n|cFFFFFF00-|r Right clicking a real-time enemy bar, makes it back to Enemies display instead of show Bookmark panel |cFF999999(thanks @Arieth-mmochampion forum)|r.\n\n|cFFFFFF00-|r Tank comparison from previous segment now uses the same percentage method from player comparison panel.\n\n|cFFFFFF00-|r Fix bug with the slash command 'show' where was ignoring the window limit set on options panel |cFF999999(thanks @Castiel-US-Azralon realm)|r.\n\n|cFFFFFF00-|r Fixed few bugs with scroll bars, including scrolls on dropdown menu and player detail window |cFF999999(thanks @Revi-mmochampion forum)|r.\n\n|cFFFFFF00v1.20.2 (|cFFFFCC00Aug 1, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added a option under Miscellaneous section to provide spell link instead of spell name for helpful spells when reporting a death |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r Improvements done on how deaths are handled, now latest events before death will be more precise.\n\n|cFFFFFF00-|r Implemented Damage Taken from environment like lava, gravity, etc.\n\n|cFFFFFF00-|r Added Warlock's Fire and Brimstone spell on customized spells.\n\n|cFFFFFF00-|r Added dwarf racial Stone Form on cooldown list |cFF999999(thanks @Mystery2012-mmochampion forum)|r.\n\n|cFFFFFF00-|r Bookmark now are shared between all characters.\n\n|cFFFFFF00-|r Fixed few inconsistencies with trash recognition.\n\n|cFFFFFF00-|r Fixed Cloud Capture where sometimes it wasn't sharing.\n\n|cFFFFFF00-|r Fixed report where it wasn't sharing for guild and raid when the player name box were empty.\n\n|cFFFFFF00-|r Report box now also saves the position and the last channel used to report |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r You Are Not Prepared plugin now have tooltips for spells and its window auto opens after a boss encounter.\n\n|cFFFFFF00-|r Advanced Death Logs plugin got full rewrite (and still are in development).\n\n|cFFFFFF00v1.19.0 - v1.19.1 - v1.19.2 (|cFFFFCC00Jul 21, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Details! is now able to be translated by its community for all supported languages through Curse Forge Web Site:\n\n|cFFFFFF00http://wow.curseforge.com/addons/details/localization/|r\n\n|cFFFFFF00-|r Slash commands now are multi language, accepting both english and the localized language.\n\n|cFFFFFF00-|r Added Data Broker for: Combat Time, Player Dps and Player Hps.\n\n|cFFFFFF00-|r Rework on plugins: Timeline, You Are Not Prepared, Tiny Threat, Encounter Details. All those plugins got a options panel and few improvaments.\n\n|cFFFFFF00-|r Trash segments won't be saved anymore.\n\n|cFFFFFF00-|r Added support for plugins options.\n\n|cFFFFFF00-|r Revamp on Deaths report lines, adding links for harmful spells and changing the text order |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r Modified the percentage used on Comparison panel |cFF999999(thanks @Mystery2012-mmochampion forum)|r.\n\n|cFFFFFF00-|r Fixed the Raid Dps and Hps data exported by Data Broker |cFF999999(thanks @Arieth-mmochampion forum)|r.\n\n|cFFFFFF00v1.18.4 - v1.18.5 - v1.18.6 (|cFFFFCC00Jul 13, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added option to customize the bar left text.\n\n|cFFFFFF00-|r Added option for show or hide bar placement number.\n\n|cFFFFFF00-|r Spell icon is shown in the bar when the enemy character is a environment spell type.\n\n|cFFFFFF00-|r Changed the non-player enemy icon (monsters).\n\n|cFFFFFF00-|r Fixed bug on flex performance profile |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r Added new version tracker which should alert you when a newer Details! version is found.\n\n|cFFFFFF00-|r Added Enemy Damage Taken by clicking with middle mouse button over a enemy bar (enemies display).\n\n|cFFFFFF00-|r Added import/export for saved skins and custom displays created.\n\n|cFFFFFF00-|r Small changes on ElvUI Frame Style skin (need reaply).\n\n|cFFFFFF00-|r Fixed the death recognition for bosses, now it should show the correct color over segments menu.\n\n|cFFFFFF00-|r Fixed Dps inacuracy when plyaing solo (no party or raid group).\n\n|cFFFFFF00-|r Fixed the duration time of buffs applied before the pull, like pre-potions.\n\n|cFFFFFF00v1.17.5 (|cFFFFCC00Jun 30, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Shortcut panel is now known as Bookmarks and a revamp has done on its panel.\n\n|cFFFFFF00-|r NickTag now doesnt check anymore if a received nickname from other guild member is invalid.\n\n|cFFFFFF00-|r Healthstone now is considered a cooldown.\n\n|cFFFFFF00-|r Few improvements on Default Skin, Minimalistic Skin and ElvUI Frame Style Skin.\n\n|cFFFFFF00-|r Revamp on Image Editor, many bugs solves and now it is usable.\n\n|cFFFFFF00-|r 'Hide' slash command now hides all opened windows; 'Show', open all closed windows and 'New' create a new window.\n\n|cFFFFFF00-|r Added Devotion Aura, Rallying Cry as cooldowns.\n\n|cFFFFFF00-|r Added options for lock, unlock, break snap, close, reopen and create new window.\n\n|cFFFFFF00-|r Added a options panel for HotCorners, access it through options button or slash hotcorner command.\n\n|cFFFFFF00-|r Added 'Logos' and 'Raid & Dungeons' sections for Wallpapers. \n\n|cFFFFFF00-|r Added a option to load a image from the computer to use as wallpaper.\n\n|cFFFFFF00-|r Fixed the percent issue with Healing Done and HPS while in combat.\n\n|cFFFFFF00-|r Fixed non-combat switch by role where changing role wasnt changing the shown attribute.\n\n|cFFFFFF00-|r Fixed 'While in Combat' hiding schema |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r Fixed several bugs on Interact Auto Transparency.\n\n|cFFFFFF00-|r Fixed the report window alert when opening the report window and it already is opened |cFF999999(thanks @Rasstapp-mmochampion forum)|r.\n\n|cFFFFFF00-|r Fixed the gap between last row created and the end of the window.\n\n|cFFFFFF00-|r Fixed all tooltips bugs on Wallpaper Section on Options Panel.\n\n|cFFFFFF00a1.17.0 (|cFFFFCC00Jun 21, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Support for Custom Displays has been rewrited, to access the new panel go to Sword Menu -> Custom -> Create New Display.\n\n|cFFFFFF00-|r Added a custom display for show potion usage.\n\n|cFFFFFF00-|r Fixed a bug where the player pet wasnt being tracked after logon in the game. This bug was affecting directly classes with pets playing out of a raid group." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00a1.22.4 (|cFFFFCC00Ago 15, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added new skin: ElvUI Frame Style (Black White).\n\n|cFFFFFF00-|r Align With Right Chat Window option now check if the window have statusbar enabled.\n\n|cFFFFFF00-|r Few improvements on report for Deaths and Spells over Player Detail Window.\n\n|cFFFFFF00-|r Added option to disable reset button (reset only using its tooltip menu).\n\n|cFFFFFF00-|r Added option for disable window groups.\n\n|cFFFFFF00-|r Added option for select the icon pack to use, also added black white icon pack.\n\n|cFFFFFF00-|r Fixed many bugs involving skins and profiles, thing should run more smooth now.\n\n|cFFFFFF00-|r Plugin Time Attack now correctly saves the attempt when pressing the big save button.\n\n|cFFFFFF00-|r Added support for hotcorners.\n\n|cFFFFFF00v1.21.4 (|cFFFFCC00Ago 9, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added Shaman's Ancestral Guidance on cooldowns list |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r Added a profile selection screen when Details! are running for the first time on a character.\n\n|cFFFFFF00-|r Added Menu Text Size option over miscellaneous section on options panel |cFF999999(thanks @ Revi-mmochampion forum)|r.\n\n|cFFFFFF00-|r Fixed a bug over Healing Player Details Window where pets wasn't being shown |cFF999999(thanks @Mystery2012-mmochampion forum)|r.\n\n|cFFFFFF00-|r Fixed issue with summoning pets with unknown owners where it was breaking the summon of all the others pets. |cFF999999(thanks @ThunderLost-curse website)|r.\n\n|cFFFFFF00-|r Hot Corners isn't no more a part of Details!, instead of that, Hot Corner is now a standalone addon which needs to be installed separately for who wants to use it.\n\n|cFFFFFF00-|r Skin data is now stored inside the profiles, many code parts got rewrite, still may have few bugs but it's more reliable then before.\n\n|cFFFFFF00-|r Rework on Auras and Voidzones: now shows damage, dps and percentage. Also its tooltip got fixes and now shows the correct damage done to players.\n\n|cFFFFFF00-|r Tooltip for Enemies now shows damage taken from players |cFF999999(thanks @Arieth-mmochampion forum)|r.\n\n|cFFFFFF00-|r Right clicking a real-time enemy bar, makes it back to Enemies display instead of show Bookmark panel |cFF999999(thanks @Arieth-mmochampion forum)|r.\n\n|cFFFFFF00-|r Tank comparison from previous segment now uses the same percentage method from player comparison panel.\n\n|cFFFFFF00-|r Fix bug with the slash command 'show' where was ignoring the window limit set on options panel |cFF999999(thanks @Castiel-US-Azralon realm)|r.\n\n|cFFFFFF00-|r Fixed few bugs with scroll bars, including scrolls on dropdown menu and player detail window |cFF999999(thanks @Revi-mmochampion forum)|r.\n\n|cFFFFFF00v1.20.2 (|cFFFFCC00Aug 1, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added a option under Miscellaneous section to provide spell link instead of spell name for helpful spells when reporting a death |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r Improvements done on how deaths are handled, now latest events before death will be more precise.\n\n|cFFFFFF00-|r Implemented Damage Taken from environment like lava, gravity, etc.\n\n|cFFFFFF00-|r Added Warlock's Fire and Brimstone spell on customized spells.\n\n|cFFFFFF00-|r Added dwarf racial Stone Form on cooldown list |cFF999999(thanks @Mystery2012-mmochampion forum)|r.\n\n|cFFFFFF00-|r Bookmark now are shared between all characters.\n\n|cFFFFFF00-|r Fixed few inconsistencies with trash recognition.\n\n|cFFFFFF00-|r Fixed Cloud Capture where sometimes it wasn't sharing.\n\n|cFFFFFF00-|r Fixed report where it wasn't sharing for guild and raid when the player name box were empty.\n\n|cFFFFFF00-|r Report box now also saves the position and the last channel used to report |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r You Are Not Prepared plugin now have tooltips for spells and its window auto opens after a boss encounter.\n\n|cFFFFFF00-|r Advanced Death Logs plugin got full rewrite (and still are in development).\n\n|cFFFFFF00v1.19.0 - v1.19.1 - v1.19.2 (|cFFFFCC00Jul 21, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Details! is now able to be translated by its community for all supported languages through Curse Forge Web Site:\n\n|cFFFFFF00http://wow.curseforge.com/addons/details/localization/|r\n\n|cFFFFFF00-|r Slash commands now are multi language, accepting both english and the localized language.\n\n|cFFFFFF00-|r Added Data Broker for: Combat Time, Player Dps and Player Hps.\n\n|cFFFFFF00-|r Rework on plugins: Timeline, You Are Not Prepared, Tiny Threat, Encounter Details. All those plugins got a options panel and few improvaments.\n\n|cFFFFFF00-|r Trash segments won't be saved anymore.\n\n|cFFFFFF00-|r Added support for plugins options.\n\n|cFFFFFF00-|r Revamp on Deaths report lines, adding links for harmful spells and changing the text order |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r Modified the percentage used on Comparison panel |cFF999999(thanks @Mystery2012-mmochampion forum)|r.\n\n|cFFFFFF00-|r Fixed the Raid Dps and Hps data exported by Data Broker |cFF999999(thanks @Arieth-mmochampion forum)|r.\n\n|cFFFFFF00v1.18.4 - v1.18.5 - v1.18.6 (|cFFFFCC00Jul 13, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added option to customize the bar left text.\n\n|cFFFFFF00-|r Added option for show or hide bar placement number.\n\n|cFFFFFF00-|r Spell icon is shown in the bar when the enemy character is a environment spell type.\n\n|cFFFFFF00-|r Changed the non-player enemy icon (monsters).\n\n|cFFFFFF00-|r Fixed bug on flex performance profile |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r Added new version tracker which should alert you when a newer Details! version is found.\n\n|cFFFFFF00-|r Added Enemy Damage Taken by clicking with middle mouse button over a enemy bar (enemies display).\n\n|cFFFFFF00-|r Added import/export for saved skins and custom displays created.\n\n|cFFFFFF00-|r Small changes on ElvUI Frame Style skin (need reaply).\n\n|cFFFFFF00-|r Fixed the death recognition for bosses, now it should show the correct color over segments menu.\n\n|cFFFFFF00-|r Fixed Dps inacuracy when plyaing solo (no party or raid group).\n\n|cFFFFFF00-|r Fixed the duration time of buffs applied before the pull, like pre-potions.\n\n|cFFFFFF00v1.17.5 (|cFFFFCC00Jun 30, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Shortcut panel is now known as Bookmarks and a revamp has done on its panel.\n\n|cFFFFFF00-|r NickTag now doesnt check anymore if a received nickname from other guild member is invalid.\n\n|cFFFFFF00-|r Healthstone now is considered a cooldown.\n\n|cFFFFFF00-|r Few improvements on Default Skin, Minimalistic Skin and ElvUI Frame Style Skin.\n\n|cFFFFFF00-|r Revamp on Image Editor, many bugs solves and now it is usable.\n\n|cFFFFFF00-|r 'Hide' slash command now hides all opened windows; 'Show', open all closed windows and 'New' create a new window.\n\n|cFFFFFF00-|r Added Devotion Aura, Rallying Cry as cooldowns.\n\n|cFFFFFF00-|r Added options for lock, unlock, break snap, close, reopen and create new window.\n\n|cFFFFFF00-|r Added a options panel for HotCorners, access it through options button or slash hotcorner command.\n\n|cFFFFFF00-|r Added 'Logos' and 'Raid & Dungeons' sections for Wallpapers. \n\n|cFFFFFF00-|r Added a option to load a image from the computer to use as wallpaper.\n\n|cFFFFFF00-|r Fixed the percent issue with Healing Done and HPS while in combat.\n\n|cFFFFFF00-|r Fixed non-combat switch by role where changing role wasnt changing the shown attribute.\n\n|cFFFFFF00-|r Fixed 'While in Combat' hiding schema |cFF999999(thanks @skmzarn-mmochampion forum)|r.\n\n|cFFFFFF00-|r Fixed several bugs on Interact Auto Transparency.\n\n|cFFFFFF00-|r Fixed the report window alert when opening the report window and it already is opened |cFF999999(thanks @Rasstapp-mmochampion forum)|r.\n\n|cFFFFFF00-|r Fixed the gap between last row created and the end of the window.\n\n|cFFFFFF00-|r Fixed all tooltips bugs on Wallpaper Section on Options Panel.\n\n|cFFFFFF00a1.17.0 (|cFFFFCC00Jun 21, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Support for Custom Displays has been rewrited, to access the new panel go to Sword Menu -> Custom -> Create New Display." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " --> startup diff --git a/classes/classe_instancia.lua b/classes/classe_instancia.lua index 90f5ed53..f7552f2c 100644 --- a/classes/classe_instancia.lua +++ b/classes/classe_instancia.lua @@ -851,6 +851,10 @@ function _detalhes:agrupar_janelas (lados) end +function _detalhes:UngroupInstance() + return self:Desagrupar (-1) +end + function _detalhes:Desagrupar (instancia, lado) if (self.meu_id) then --> significa que self é uma instancia diff --git a/functions/skins.lua b/functions/skins.lua index f5816a22..9212d52e 100644 --- a/functions/skins.lua +++ b/functions/skins.lua @@ -421,26 +421,50 @@ local _ local instance1 = _detalhes.tabela_instancias [1] local instance2 = _detalhes.tabela_instancias [2] + local instance3 = _detalhes.tabela_instancias [3] + if (not instance2) then instance2 = _detalhes:CriarInstancia() - instance2:ChangeSkin ("ElvUI Frame Style") + instance2:ChangeSkin (instance1.skin) elseif (not instance2.ativa) then instance2:AtivarInstancia() - instance2:ChangeSkin ("ElvUI Frame Style") + instance2:ChangeSkin (instance1.skin) end + + if (instance3) then + instance3:ShutDown() + end + + instance1:UngroupInstance() + instance2:UngroupInstance() instance1.baseframe:ClearAllPoints() instance2.baseframe:ClearAllPoints() - instance1.baseframe:SetSize (wight/2 - 4, height-20-21-8) - instance2.baseframe:SetSize (wight/2 - 4, height-20-21-8) + local statusbar_enabled1 = instance1.show_statusbar + local statusbar_enabled2 = instance2.show_statusbar - instance1.baseframe:SetPoint ("bottomleft", RightChatDataPanel, "topleft", 1, 1) - instance2.baseframe:SetPoint ("bottomright", RightChatToggleButton, "topright", -1, 1) + _detalhes.move_janela_func (instance1.baseframe, true, instance1) + _detalhes.move_janela_func (instance1.baseframe, false, instance1) + _detalhes.move_janela_func (instance2.baseframe, true, instance2) + _detalhes.move_janela_func (instance2.baseframe, false, instance2) + + instance1.baseframe:SetSize (wight/2 - 4, height-20-21-8 - (statusbar_enabled1 and 14 or 0)) + instance2.baseframe:SetSize (wight/2 - 4, height-20-21-8 - (statusbar_enabled2 and 14 or 0)) + + table.wipe (instance1.snap); table.wipe (instance2.snap) + instance1.snap [3] = 2; instance2.snap [1] = 1; + instance1.horizontalSnap = true; instance2.horizontalSnap = true + + instance1.baseframe:SetPoint ("bottomleft", RightChatDataPanel, "topleft", 1, 1 + (statusbar_enabled1 and 14 or 0)) + instance2.baseframe:SetPoint ("bottomright", RightChatToggleButton, "topright", -1, 1 + (statusbar_enabled2 and 14 or 0)) + + instance1:LockInstance (true) + instance2:LockInstance (true) instance1:SaveMainWindowPosition() instance2:SaveMainWindowPosition() - + end @@ -514,13 +538,14 @@ local _ row_info = { texture = "Details Serenity", texture_class_colors = true, - alpha = 1, + alpha = 0.80, texture_background_class_color = false, texture_background = "Details D'ictum", fixed_texture_color = {0, 0, 0}, fixed_texture_background_color = {0, 0, 0, 0.471}, space = {left = 1, right = -2, between = 1}, - backdrop = {enabled = true, size = 4, color = {0, 0, 0, 1}, texture = "Details BarBorder 2"} + backdrop = {enabled = true, size = 4, color = {0, 0, 0, 1}, texture = "Details BarBorder 2"}, + icon_file = [[Interface\AddOns\Details\images\classes_small_alpha]] }, wallpaper = { @@ -540,5 +565,150 @@ local _ } }) + _detalhes:InstallSkin ("ElvUI Frame Style BW", { + file = [[Interface\AddOns\Details\images\skins\elvui]], + author = "Details!", + version = "1.0", + site = "unknown", + desc = "skin based on ElvUI addon.", + + --general + can_change_alpha_head = true, + + --icon anchors + icon_anchor_main = {-4, -5}, + icon_anchor_plugins = {-7, -13}, + icon_plugins_size = {19, 18}, + + --micro frames + micro_frames = {color = {0.525490, 0.525490, 0.525490, 1}, font = "Arial Narrow", size = 11}, + + -- the four anchors (for when the toolbar is on the top side) + icon_point_anchor = {-35, -0.5}, + left_corner_anchor = {-107, 0}, + right_corner_anchor = {96, 0}, + + -- the four anchors (for when the toolbar is on the bottom side) + icon_point_anchor_bottom = {-37, 12}, + left_corner_anchor_bottom = {-107, 0}, + right_corner_anchor_bottom = {96, 0}, + + --[[ callback function execute after all changes on the window, first argument is this skin table, second is the instance where the skin was applied --]] + callback = function (self, instance) end, + --[[ control_script is a OnUpdate script, it start right after all changes on the window and also after the callback --]] + --[[ control_script_on_start run before the control_script, use it to reset values if needed --]] + control_script_on_start = nil, + control_script = nil, + + --instance overwrites + --[[ when a skin is selected, all customized properties of the window is reseted and then the overwrites are applied]] + --[[ for the complete cprop list see the file classe_instancia_include.lua]] + instance_cprops = { + + closebutton_config = {size = {20, 20}, alpha = 0.60, anchor = {1, 2}}, + instancebutton_config = {size = {20, 16}, anchor = {8, 0}, textcolor = {.7, .7, .7, 1}, textsize = 10, textfont = "Friz Quadrata TT", highlight_texture = [[Interface\Buttons\UI-Panel-MinimizeButton-Highlight]]}, + resetbutton_config = {size = {12, 12}, anchor = {4, 0}, normal_texture = [[Interface\Addons\Details\Images\reset_button2]], highlight_texture = [[Interface\Addons\Details\Images\reset_button2]]}, + + --resetbutton_config = {size = {8, 16}, anchor = {2, 0}}, + + menu_icons_size = 0.80, + menu2_icons_size = 1.10, + menu_anchor = {-58, 0, side = 2}, + menu_anchor_down = {-60, 0}, + menu2_anchor = {32, 3}, + menu2_anchor_down = {32, 3}, + plugins_grow_direction = 1, + + attribute_text = {enabled = true, anchor = {-20, 4}, text_face = "Friz Quadrata TT", text_size = 10, text_color = {1, 1, 1, .7}, side = 1, shadow = true}, + + hide_icon = true, + desaturated_menu = true, + desaturated_menu2 = true, + + bg_alpha = 0.51, + bg_r = 0.3294, + bg_g = 0.3294, + bg_b = 0.3294, + show_statusbar = false, + + row_info = { + ["textR_outline"] = false, + ["textL_outline"] = true, + ["icon_file"] = "Interface\\AddOns\\Details\\images\\classes_small_alpha_bw", + ["percent_type"] = 1, + ["texture_highlight"] = "Interface\\FriendsFrame\\UI-FriendsList-Highlight", + ["texture_background_file"] = "Interface\\AddOns\\Details\\images\\bar_serenity", + ["textR_enable_custom_text"] = false, + ["texture_background_class_color"] = false, + ["textL_enable_custom_text"] = false, + ["textL_show_number"] = true, + ["space"] = { + ["right"] = -2, + ["left"] = 1, + ["between"] = 2, + }, + ["fixed_texture_background_color"] = { + 0, -- [1] + 0, -- [2] + 0, -- [3] + 0.20, -- [4] + }, + ["textR_custom_text"] = "{data1} ({data2}, {data3}%)", + ["start_after_icon"] = true, + ["font_face_file"] = "Fonts\\ARIALN.TTF", + ["fixed_text_color"] = { + 0.9058823529411765, -- [1] + 0.9058823529411765, -- [2] + 0.9058823529411765, -- [3] + 1, -- [4] + }, + ["backdrop"] = { + ["enabled"] = true, + ["size"] = 20, + ["color"] = { + 0, -- [1] + 0, -- [2] + 0, -- [3] + 1, -- [4] + }, + ["texture"] = "Details BarBorder 2", + }, + ["textL_class_colors"] = false, + ["textL_custom_text"] = "{data1}. {data3}{data2}", + ["textR_class_colors"] = false, + ["alpha"] = 0.3999999761581421, + ["no_icon"] = false, + ["font_size"] = 10, + ["texture_background"] = "Details Serenity", + ["font_face"] = "Arial Narrow", + ["texture_class_colors"] = false, + ["height"] = 14, + ["texture_file"] = "Interface\\AddOns\\Details\\images\\bar4", + ["texture"] = "Details D'ictum", + ["fixed_texture_color"] = { + 0.8627450980392157, -- [1] + 0.8627450980392157, -- [2] + 0.8627450980392157, -- [3] + 1, -- [4] + }, + }, + + wallpaper = { + overlay = {1, 1, 1}, + width = 256, + texcoord = {49/1024, 305/1024, 646/1024, 774/1024}, + enabled = true, + anchor = "all", + height = 128, + alpha = 0.8, + texture = [[Interface\AddOns\Details\images\skins\elvui]], + } + }, + + skin_options = { + {type = "button", label = "", text = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1"], func = align_right_chat, desc = Loc ["STRING_OPTIONS_SKIN_ELVUI_BUTTON1_DESC"]} + } + }) + --alpha = 0.4980392451398075, \ No newline at end of file diff --git a/gumps/janela_options.lua b/gumps/janela_options.lua index 99a8be6c..ab6b4af6 100644 --- a/gumps/janela_options.lua +++ b/gumps/janela_options.lua @@ -4607,6 +4607,7 @@ function window:CreateFrame4() {value = [[Interface\AddOns\Details\images\classes_small]], label = Loc ["STRING_OPTIONS_BAR_ICONFILE2"], onclick = OnSelectIconFile, icon = icontexture, texcoord = iconcoords, iconsize = iconsize}, {value = [[Interface\AddOns\Details\images\classes_small_bw]], label = Loc ["STRING_OPTIONS_BAR_ICONFILE3"], onclick = OnSelectIconFile, icon = icontexture, texcoord = iconcoords, iconsize = iconsize}, {value = [[Interface\AddOns\Details\images\classes_small_alpha]], label = Loc ["STRING_OPTIONS_BAR_ICONFILE4"], onclick = OnSelectIconFile, icon = icontexture, texcoord = iconcoords, iconsize = iconsize}, + {value = [[Interface\AddOns\Details\images\classes_small_alpha_bw]], label = Loc ["STRING_OPTIONS_BAR_ICONFILE6"], onclick = OnSelectIconFile, icon = icontexture, texcoord = iconcoords, iconsize = iconsize}, {value = [[Interface\AddOns\Details\images\classes]], label = Loc ["STRING_OPTIONS_BAR_ICONFILE5"], onclick = OnSelectIconFile, icon = icontexture, texcoord = iconcoords, iconsize = iconsize}, } local BuiltIconList = function() diff --git a/images/classes_small_alpha_bw.tga b/images/classes_small_alpha_bw.tga new file mode 100644 index 0000000000000000000000000000000000000000..c40f7d01437e4a343d12e0cda29950dc3e3d41ff GIT binary patch literal 39760 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 iTCIJ9M}H1K?6043#DUK{@HvO