- Added a Dark skin for the Options Panel.

- Fixed an issue with the Plugin DPS Tuning when reseting data on Details!.
- Removed realm names from player at the Comparison Panel.
- Added new skin preset: 'New Gray'.
This commit is contained in:
Tercioo
2015-12-18 15:02:43 -02:00
parent c26e00cded
commit 14486169c9
11 changed files with 735 additions and 244 deletions
+11 -5
View File
File diff suppressed because one or more lines are too long
+10 -7
View File
@@ -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
+36 -4
View File
@@ -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
+261
View File
@@ -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,
+8 -5
View File
@@ -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 ("")
+356 -190
View File
File diff suppressed because it is too large Load Diff
+9 -32
View File
@@ -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
BIN
View File
Binary file not shown.
Binary file not shown.
@@ -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
@@ -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)