diff --git a/Libs/DF/button.lua b/Libs/DF/button.lua
index a405655b..17d2ce1a 100644
--- a/Libs/DF/button.lua
+++ b/Libs/DF/button.lua
@@ -966,6 +966,30 @@ end
------------------------------------------------------------------------------------------------------------
--> object constructor
+local build_button = function (self)
+ self:SetSize (100, 20)
+
+ self.text = self:CreateFontString ("$parent_Text", "ARTWORK", "GameFontNormal")
+ self.text:SetJustifyH ("CENTER")
+ DF:SetFontSize (self.text, 10)
+ self.text:SetPoint ("CENTER", self, "CENTER", 0, 0)
+
+ self.texture_disabled = self:CreateTexture ("$parent_TextureDisabled", "OVERLAY")
+ self.texture_disabled:SetAllPoints()
+ self.texture_disabled:Hide()
+ self.texture_disabled:SetTexture ("Interface\\Tooltips\\UI-Tooltip-Background")
+
+ self:SetScript ("OnDisable", function (self)
+ self.texture_disabled:Show()
+ self.texture_disabled:SetVertexColor (0, 0, 0)
+ self.texture_disabled:SetAlpha (.5)
+ end)
+
+ self:SetScript ("OnEnable", function (self)
+ self.texture_disabled:Hide()
+ end)
+end
+
function DF:CreateButton (parent, func, w, h, text, param1, param2, texture, member, name, short_method, button_template, text_template)
return DF:NewButton (parent, parent, name, member, w, h, func, param1, param2, texture, text, short_method, button_template, text_template)
end
@@ -1006,7 +1030,9 @@ function DF:NewButton (parent, container, name, member, w, h, func, param1, para
ButtonObject.container = container
ButtonObject.options = {OnGrab = false}
- ButtonObject.button = CreateFrame ("button", name, parent, "DetailsFrameworkButtonTemplate")
+ ButtonObject.button = CreateFrame ("button", name, parent)
+ build_button (ButtonObject.button)
+
ButtonObject.widget = ButtonObject.button
--ButtonObject.button:SetBackdrop ({bgFile = DF.folder .. "background", tileSize = 64, edgeFile = DF.folder .. "border_2", edgeSize = 10, insets = {left = 1, right = 1, top = 1, bottom = 1}})
diff --git a/Libs/DF/button.xml b/Libs/DF/button.xml
index ae375e7c..97dfbf42 100644
--- a/Libs/DF/button.xml
+++ b/Libs/DF/button.xml
@@ -1,42 +1,3 @@
-
-
diff --git a/Libs/DF/cooltip.lua b/Libs/DF/cooltip.lua
index 5cb76aef..804bd548 100644
--- a/Libs/DF/cooltip.lua
+++ b/Libs/DF/cooltip.lua
@@ -161,10 +161,118 @@ function DF:CreateCoolTip()
--> create frames
+ local build_main_frame = function (self)
+
+ self:SetSize (500, 500)
+ self:SetPoint ("CENTER", UIParent, "CENTER")
+ self:SetBackdrop ({bgFile = [[Interface\DialogFrame\UI-DialogBox-Background-Dark]], edgeFile = [[Interface\Buttons\WHITE8X8]], tile = true, edgeSize = 1, tileSize = 16, insets = {left = 0, right = 0, top = 0, bottom = 0}})
+ self:SetBackdropColor (0.09019, 0.09019, 0.18823, 1)
+ self:SetBackdropBorderColor (0, 0, 0, 1)
+
+ if (not self.framebackgroundCenter) then
+ self.framebackgroundCenter = self:CreateTexture ("$parent_FrameBackgroundCenter", "BACKGROUND")
+ self.framebackgroundCenter:SetDrawLayer ("BACKGROUND", 2)
+ self.framebackgroundCenter:SetColorTexture (0, 0, 0, .5)
+ self.framebackgroundCenter:SetPoint ("TOPLEFT", self, "TOPLEFT", 35, -3)
+ self.framebackgroundCenter:SetPoint ("TOPRIGHT", self, "TOPRIGHT", -35, -3)
+ self.framebackgroundCenter:SetPoint ("BOTTOMLEFT", self, "BOTTOMLEFT", 35, 3)
+ self.framebackgroundCenter:SetPoint ("BOTTOMRIGHT", self, "BOTTOMRIGHT", -35, 3)
+ end
+
+ if (not self.framebackgroundLeft) then
+ self.framebackgroundLeft = self:CreateTexture ("$parent_FrameBackgroundLeft", "BACKGROUND")
+ self.framebackgroundLeft:SetDrawLayer ("BACKGROUND", 3)
+ self.framebackgroundLeft:SetColorTexture (0, 0, 0, .5)
+ self.framebackgroundLeft:SetPoint ("TOPLEFT", self, "TOPLEFT", 3, -3)
+ self.framebackgroundLeft:SetPoint ("BOTTOMLEFT", self, "BOTTOMLEFT", 3, 3)
+ self.framebackgroundLeft:SetWidth (32)
+ end
+
+ if (not self.framebackgroundRight) then
+ self.framebackgroundRight = self:CreateTexture ("$parent_FrameBackgroundRight", "BACKGROUND")
+ self.framebackgroundRight:SetDrawLayer ("BACKGROUND", 3)
+ self.framebackgroundRight:SetColorTexture (0, 0, 0, .5)
+ self.framebackgroundRight:SetPoint ("TOPRIGHT", self, "TOPRIGHT", -3, -3)
+ self.framebackgroundRight:SetPoint ("BOTTOMRIGHT", self, "BOTTOMRIGHT", -3, 3)
+ self.framebackgroundRight:SetWidth (32)
+ end
+
+ if (not self.frameWallpaper) then
+ self.frameWallpaper = self:CreateTexture ("$parent_FrameWallPaper", "BACKGROUND")
+ self.frameWallpaper:SetDrawLayer ("BACKGROUND", 4)
+ self.frameWallpaper:SetPoint ("TOPLEFT", self, "TOPLEFT", 0, 0)
+ self.frameWallpaper:SetPoint ("BOTTOMRIGHT", self, "BOTTOMRIGHT", 0, 0)
+ end
+
+ if (not self.selectedTop) then
+ self.selectedTop = self:CreateTexture ("$parent_SelectedTop", "ARTWORK")
+ self.selectedTop:SetColorTexture (.5, .5, .5, .75)
+ self.selectedTop:SetHeight (3)
+ end
+
+ if (not self.selectedBottom) then
+ self.selectedBottom = self:CreateTexture ("$parent_SelectedBottom", "ARTWORK")
+ self.selectedBottom:SetColorTexture (.5, .5, .5, .75)
+ self.selectedBottom:SetHeight (3)
+ end
+
+ if (not self.selectedMiddle) then
+ self.selectedMiddle = self:CreateTexture ("$parent_Selected", "ARTWORK")
+ self.selectedMiddle:SetColorTexture (.5, .5, .5, .75)
+ self.selectedMiddle:SetPoint ("TOPLEFT", self.selectedTop, "BOTTOMLEFT")
+ self.selectedMiddle:SetPoint ("BOTTOMRIGHT", self.selectedBottom, "TOPRIGHT")
+ end
+
+ if (not self.upperImage2) then
+ self.upperImage2 = self:CreateTexture ("$parent_UpperImage2", "ARTWORK")
+ self.upperImage2:Hide()
+ self.upperImage2:SetPoint ("CENTER", self, "CENTER", 0, -3)
+ self.upperImage2:SetPoint ("BOTTOM", self, "TOP", 0, -3)
+ end
+
+ if (not self.upperImage) then
+ self.upperImage = self:CreateTexture ("$parent_UpperImage", "OVERLAY")
+ self.upperImage:Hide()
+ self.upperImage:SetPoint ("CENTER", self, "CENTER", 0, -3)
+ self.upperImage:SetPoint ("BOTTOM", self, "TOP", 0, -3)
+ end
+
+ if (not self.upperImageText) then
+ self.upperImageText = self:CreateFontString ("$parent_UpperImageText", "OVERLAY", "GameTooltipHeaderText")
+ self.upperImageText:SetJustifyH ("LEFT")
+ self.upperImageText:SetPoint ("LEFT", self.upperImage, "RIGHT", 5, 0)
+ DF:SetFontSize (self.upperImageText, 13)
+ end
+
+ if (not self.upperImageText2) then
+ self.upperImageText2 = self:CreateFontString ("$parent_UpperImageText2", "OVERLAY", "GameTooltipHeaderText")
+ self.upperImageText2:SetJustifyH ("LEFT")
+ self.upperImageText2:SetPoint ("BOTTOMRIGHT", self, "LEFT", 0, 3)
+ DF:SetFontSize (self.upperImageText2, 13)
+ end
+
+ if (not self.titleIcon) then
+ self.titleIcon = self:CreateTexture ("$parent_TitleIcon", "OVERLAY")
+ self.titleIcon:SetTexture ("Interface\\Challenges\\challenges-main")
+ self.titleIcon:SetTexCoord (0.1521484375, 0.563671875, 0.160859375, 0.234375)
+ self.titleIcon:SetPoint ("CENTER", self, "CENTER")
+ self.titleIcon:SetPoint ("BOTTOM", self, "TOP", 0, -22)
+ self.titleIcon:Hide()
+ end
+
+ if (not self.titleText) then
+ self.titleText = self:CreateFontString ("$parent_TitleText", "OVERLAY", "GameFontHighlightSmall")
+ self.titleText:SetJustifyH ("LEFT")
+ DF:SetFontSize (self.titleText, 10)
+ self.titleText:SetPoint ("CENTER", self.titleIcon, "CENTER", 0, 6)
+ end
+ end
+
--> main frame
local frame1
if (not GameCooltipFrame1) then
- frame1 = CreateFrame ("Frame", "GameCooltipFrame1", UIParent, "DFCooltipMainFrameTemplate")
+ frame1 = CreateFrame ("Frame", "GameCooltipFrame1", UIParent)
+
tinsert (UISpecialFrames, "GameCooltipFrame1")
DF:CreateFlashAnimation (frame1)
@@ -175,6 +283,9 @@ function DF:CreateCoolTip()
frame1 = GameCooltipFrame1
end
+ --> build widgets for frame
+ build_main_frame (frame1)
+
GameCooltipFrame1_FrameBackgroundCenter:SetTexture (DF.folder .. "cooltip_background")
GameCooltipFrame1_FrameBackgroundCenter:SetTexCoord (0.10546875, 0.89453125, 0, 1)
GameCooltipFrame1_FrameBackgroundLeft:SetTexture (DF.folder .. "cooltip_background")
@@ -185,7 +296,8 @@ function DF:CreateCoolTip()
--> secondary frame
local frame2
if (not GameCooltipFrame2) then
- frame2 = CreateFrame ("Frame", "GameCooltipFrame2", UIParent, "DFCooltipMainFrameTemplate")
+ frame2 = CreateFrame ("Frame", "GameCooltipFrame2", UIParent)
+
tinsert (UISpecialFrames, "GameCooltipFrame2")
DF:CreateFlashAnimation (frame2)
frame2:SetClampedToScreen (true)
@@ -196,6 +308,9 @@ function DF:CreateCoolTip()
else
frame2 = GameCooltipFrame2
end
+
+ --> build widgets for frame
+ build_main_frame (frame2)
frame2:SetPoint ("bottomleft", frame1, "bottomright", 4, 0)
@@ -380,6 +495,109 @@ function DF:CreateCoolTip()
--> Button Creation Functions
----------------------------------------------------------------------
+ local build_button = function (self)
+
+ self:SetSize (1, 20)
+
+ --> status bar
+ self.statusbar = CreateFrame ("StatusBar", "$Parent_StatusBar", self)
+ self.statusbar:SetPoint ("LEFT", self, "LEFT", 10, 0)
+ self.statusbar:SetPoint ("RIGHT", self, "RIGHT", -10, 0)
+ self.statusbar:SetPoint ("TOP", self, "TOP", 0, 0)
+ self.statusbar:SetPoint ("BOTTOM", self, "BOTTOM", 0, 0)
+ self.statusbar:SetHeight (20)
+
+ local statusbar = self.statusbar
+
+ statusbar.texture = statusbar:CreateTexture ("$parent_Texture", "BACKGROUND")
+ statusbar.texture:SetTexture ("Interface\\PaperDollInfoFrame\\UI-Character-Skills-Bar")
+ statusbar.texture:SetSize (300, 14)
+ statusbar:SetStatusBarTexture (statusbar.texture)
+ statusbar:SetMinMaxValues (0, 100)
+
+ statusbar.spark = statusbar:CreateTexture ("$parent_Spark", "BACKGROUND")
+ statusbar.spark:Hide()
+ statusbar.spark:SetTexture ("Interface\\CastingBar\\UI-CastingBar-Spark")
+ statusbar.spark:SetBlendMode ("ADD")
+ statusbar.spark:SetSize (12, 24)
+ statusbar.spark:SetPoint ("LEFT", statusbar, "RIGHT", -20, -1)
+
+ statusbar.background = statusbar:CreateTexture ("$parent_Background", "ARTWORK")
+ statusbar.background:Hide()
+ statusbar.background:SetTexture ("Interface\\FriendsFrame\\UI-FriendsFrame-HighlightBar")
+ statusbar.background:SetPoint ("LEFT", statusbar, "LEFT", -6, 0)
+ statusbar.background:SetPoint ("RIGHT", statusbar, "RIGHT", 6, 0)
+ statusbar.background:SetPoint ("TOP", statusbar, "TOP", 0, 0)
+ statusbar.background:SetPoint ("BOTTOM", statusbar, "BOTTOM", 0, 0)
+
+ self.background = statusbar.background
+
+ statusbar.leftIcon = statusbar:CreateTexture ("$parent_LeftIcon", "OVERLAY")
+ statusbar.leftIcon:SetSize (16, 16)
+ statusbar.leftIcon:SetPoint ("LEFT", statusbar, "LEFT", 0, 0)
+
+ statusbar.rightIcon = statusbar:CreateTexture ("$parent_RightIcon", "OVERLAY")
+ statusbar.rightIcon:SetSize (16, 16)
+ statusbar.rightIcon:SetPoint ("RIGHT", statusbar, "RIGHT", 0, 0)
+
+ statusbar.spark2 = statusbar:CreateTexture ("$parent_Spark2", "OVERLAY")
+ statusbar.spark2:SetSize (32, 32)
+ statusbar.spark2:SetPoint ("LEFT", statusbar, "RIGHT", -17, -1)
+ statusbar.spark2:SetBlendMode ("ADD")
+ statusbar.spark2:SetTexture ("Interface\\CastingBar\\UI-CastingBar-Spark")
+ statusbar.spark2:Hide()
+
+ statusbar.subMenuArrow = statusbar:CreateTexture ("$parent_SubMenuArrow", "OVERLAY")
+ statusbar.subMenuArrow:SetSize (12, 12)
+ statusbar.subMenuArrow:SetPoint ("RIGHT", statusbar, "RIGHT", 3, 0)
+ statusbar.subMenuArrow:SetBlendMode ("ADD")
+ statusbar.subMenuArrow:SetTexture ("Interface\\CHATFRAME\\ChatFrameExpandArrow")
+ statusbar.subMenuArrow:Hide()
+
+ statusbar.leftText = statusbar:CreateFontString ("$parent_LeftText", "OVERLAY", "GameTooltipHeaderText")
+ statusbar.leftText:SetJustifyH ("LEFT")
+ statusbar.leftText:SetPoint ("LEFT", statusbar.leftIcon, "RIGHT", 3, 0)
+ DF:SetFontSize (statusbar.leftText, 10)
+
+ statusbar.rightText = statusbar:CreateFontString ("$parent_TextRight", "OVERLAY", "GameTooltipHeaderText")
+ statusbar.rightText:SetJustifyH ("RIGHT")
+ statusbar.rightText:SetPoint ("RIGHT", statusbar.rightIcon, "LEFT", -3, 0)
+ DF:SetFontSize (statusbar.leftText, 10)
+
+ --> background status bar
+ self.statusbar2 = CreateFrame ("StatusBar", "$Parent_StatusBarBackground", self)
+ self.statusbar2:SetPoint ("LEFT", self.statusbar, "LEFT")
+ self.statusbar2:SetPoint ("RIGHT", self.statusbar, "RIGHT")
+ self.statusbar2:SetPoint ("TOP", self.statusbar, "TOP")
+ self.statusbar2:SetPoint ("BOTTOM", self.statusbar, "BOTTOM")
+
+ local statusbar2 = self.statusbar2
+
+ statusbar2.texture = statusbar2:CreateTexture ("$parent_Texture", "BACKGROUND")
+ statusbar2.texture:SetTexture ("Interface\\PaperDollInfoFrame\\UI-Character-Skills-Bar")
+ statusbar2.texture:SetSize (300, 14)
+ statusbar2:SetStatusBarTexture (statusbar2.texture)
+ statusbar2:SetMinMaxValues (0, 100)
+
+ --> on load
+ self:RegisterForClicks ("LeftButtonDown")
+ self.leftIcon = self.statusbar.leftIcon
+ self.rightIcon = self.statusbar.rightIcon
+ self.texture = self.statusbar.texture
+ self.spark = self.statusbar.spark
+ self.spark2 = self.statusbar.spark2
+ self.leftText = self.statusbar.leftText
+ self.rightText = self.statusbar.rightText
+ self.statusbar:SetFrameLevel (self:GetFrameLevel()+2)
+ self.statusbar2:SetFrameLevel (self.statusbar:GetFrameLevel()-1)
+ self.statusbar2:SetValue (0)
+
+ --> scripts
+ self:SetScript ("OnMouseDown", GameCooltipButtonMouseDown)
+ self:SetScript ("OnMouseUp", GameCooltipButtonMouseUp)
+
+ end
+
function GameCooltipButtonMouseDown (button)
local mod = CoolTip.OptionsTable.TextHeightMod or 0
button.leftText:SetPoint ("center", button.leftIcon, "center", 0, 0+mod)
@@ -393,7 +611,9 @@ function DF:CreateCoolTip()
end
function CoolTip:CreateButton (index, frame, name)
- local new_button = CreateFrame ("Button", name, frame, "DFCooltipButtonTemplate")
+ local new_button = CreateFrame ("Button", name, frame)
+ build_button (new_button)
+
frame.Lines [index] = new_button
return new_button
end
diff --git a/Libs/DF/cooltip.xml b/Libs/DF/cooltip.xml
index db62716e..91f86436 100644
--- a/Libs/DF/cooltip.xml
+++ b/Libs/DF/cooltip.xml
@@ -1,318 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- self:SetBackdropColor (0.09019, 0.09019, 0.18823, 1)
- self:SetBackdropBorderColor (1, 1, 1, 1)
- self.framebackgroundLeft:SetWidth (32)
- self.framebackgroundRight:SetWidth (32)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Libs/DF/dropdown.lua b/Libs/DF/dropdown.lua
index 6b41a614..ae9ddf5e 100644
--- a/Libs/DF/dropdown.lua
+++ b/Libs/DF/dropdown.lua
@@ -602,7 +602,6 @@ function DetailsFrameworkDropDownOnMouseDown (button)
local name = button:GetName() .. "Row" .. i
local parent = scrollChild
- --_this_row = CreateFrame ("Button", name, parent, "DetailsFrameworkDropDownOptionTemplate")
_this_row = DF:CreateDropdownButton (parent, name)
local anchor_i = i-1
_this_row:SetPoint ("topleft", parent, "topleft", 5, (-anchor_i*20)-5)
@@ -947,7 +946,6 @@ function DF:NewDropDown (parent, container, name, member, w, h, func, default, t
--> misc
DropDownObject.container = container
- --DropDownObject.dropdown = CreateFrame ("Button", name, parent, "DetailsFrameworkDropDownTemplate")
DropDownObject.dropdown = DF:CreateNewDropdownFrame (parent, name)
DropDownObject.widget = DropDownObject.dropdown
diff --git a/Libs/DF/dropdown.xml b/Libs/DF/dropdown.xml
index d5eece96..509c0d1e 100644
--- a/Libs/DF/dropdown.xml
+++ b/Libs/DF/dropdown.xml
@@ -1,252 +1,4 @@
-
-
-
-
-
diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua
index e172a8d2..1b9443b6 100644
--- a/Libs/DF/fw.lua
+++ b/Libs/DF/fw.lua
@@ -1,5 +1,5 @@
-local dversion = 85
+local dversion = 86
local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary (major, minor)
@@ -265,7 +265,7 @@ else
elseif (numero > 999) then
return format ("%.1f", (numero/1000)) .. "K"
end
- return format ("%.1f", numero)
+ return floor (numero)
end
end
@@ -926,42 +926,15 @@ end
function DF:ShowTutorialAlertFrame (maintext, desctext, clickfunc)
- local TutorialAlertFrame = _G.DetailsFrameworkTutorialAlertFrame
+ local TutorialAlertFrame = _G.DetailsFrameworkAlertFrame
if (not TutorialAlertFrame) then
-
- TutorialAlertFrame = CreateFrame ("ScrollFrame", "DetailsFrameworkTutorialAlertFrame", UIParent, "DetailsFrameworkTutorialAlertFrameTemplate")
+
+ TutorialAlertFrame = CreateFrame ("frame", "DetailsFrameworkAlertFrame", UIParent, "MicroButtonAlertTemplate")
TutorialAlertFrame.isFirst = true
TutorialAlertFrame:SetPoint ("left", UIParent, "left", -20, 100)
-
- TutorialAlertFrame:SetWidth (290)
- TutorialAlertFrame.ScrollChild:SetWidth (256)
-
- local scrollname = TutorialAlertFrame.ScrollChild:GetName()
- _G [scrollname .. "BorderTopLeft"]:SetVertexColor (1, 0.8, 0, 1)
- _G [scrollname .. "BorderTopRight"]:SetVertexColor (1, 0.8, 0, 1)
- _G [scrollname .. "BorderBotLeft"]:SetVertexColor (1, 0.8, 0, 1)
- _G [scrollname .. "BorderBotRight"]:SetVertexColor (1, 0.8, 0, 1)
- _G [scrollname .. "BorderLeft"]:SetVertexColor (1, 0.8, 0, 1)
- _G [scrollname .. "BorderRight"]:SetVertexColor (1, 0.8, 0, 1)
- _G [scrollname .. "BorderBottom"]:SetVertexColor (1, 0.8, 0, 1)
- _G [scrollname .. "BorderTop"]:SetVertexColor (1, 0.8, 0, 1)
-
- local iconbg = _G [scrollname .. "QuestIconBg"]
- iconbg:SetTexture ([[Interface\MainMenuBar\UI-MainMenuBar-EndCap-Human]])
- iconbg:SetTexCoord (0, 1, 0, 1)
- iconbg:SetSize (100, 100)
- iconbg:ClearAllPoints()
- iconbg:SetPoint ("bottomleft", TutorialAlertFrame.ScrollChild, "bottomleft")
-
- _G [scrollname .. "Exclamation"]:SetVertexColor (1, 0.8, 0, 1)
- _G [scrollname .. "QuestionMark"]:SetVertexColor (1, 0.8, 0, 1)
-
- _G [scrollname .. "TopText"]:SetText ("Details!") --string
- _G [scrollname .. "QuestName"]:SetText ("") --string
- _G [scrollname .. "BottomText"]:SetText ("") --string
-
- TutorialAlertFrame.ScrollChild.IconShine:SetTexture ([[Interface\MainMenuBar\UI-MainMenuBar-EndCap-Human]])
+ TutorialAlertFrame:SetFrameStrata ("TOOLTIP")
+ TutorialAlertFrame:Hide()
TutorialAlertFrame:SetScript ("OnMouseUp", function (self)
if (self.clickfunc and type (self.clickfunc) == "function") then
@@ -972,21 +945,13 @@ end
TutorialAlertFrame:Hide()
end
- if (type (maintext) == "string") then
- TutorialAlertFrame.ScrollChild.QuestName:SetText (maintext)
- else
- TutorialAlertFrame.ScrollChild.QuestName:SetText ("")
- end
-
- if (type (desctext) == "string") then
- TutorialAlertFrame.ScrollChild.BottomText:SetText (desctext)
- else
- TutorialAlertFrame.ScrollChild.BottomText:SetText ("")
- end
+ --
+ TutorialAlertFrame.label = type (maintext) == "string" and maintext or type (desctext) == "string" and desctext or ""
+ MicroButtonAlert_SetText (TutorialAlertFrame, alert.label)
+ --
TutorialAlertFrame.clickfunc = clickfunc
TutorialAlertFrame:Show()
- DetailsTutorialAlertFrame_SlideInFrame (TutorialAlertFrame, "AUTOQUEST")
end
local refresh_options = function (self)
diff --git a/Libs/DF/normal_bar.lua b/Libs/DF/normal_bar.lua
index be4c8ecb..95af694d 100644
--- a/Libs/DF/normal_bar.lua
+++ b/Libs/DF/normal_bar.lua
@@ -650,6 +650,66 @@ function DetailsFrameworkNormalBar_OnCreate (self)
return true
end
+local build_statusbar = function (self)
+
+ self:SetSize (300, 14)
+
+ self.background = self:CreateTexture ("$parent_background", "BACKGROUND")
+ self.background:Hide()
+ self.background:SetAllPoints()
+ self.background:SetTexture ([[Interface\PaperDollInfoFrame\UI-Character-Skills-Bar]])
+ self.background:SetVertexColor (.3, .3, .3, .3)
+
+ self.timertexture = self:CreateTexture ("$parent_timerTexture", "ARTWORK")
+ self.timertexture:Hide()
+ self.timertexture:SetSize (300, 14)
+ self.timertexture:SetTexture ([[Interface\PaperDollInfoFrame\UI-Character-Skills-Bar]])
+ self.timertexture:SetPoint ("LEFT", self, "LEFT")
+
+ self.timertextureR = self:CreateTexture ("$parent_timerTextureR", "ARTWORK")
+ self.timertextureR:Hide()
+ self.timertextureR:SetSize (300, 14)
+ self.timertextureR:SetTexture ([[Interface\PaperDollInfoFrame\UI-Character-Skills-Bar]])
+ self.timertextureR:SetPoint ("TOPRIGHT", self, 0, 0)
+ self.timertextureR:SetPoint ("BOTTOMRIGHT", self, 0, 0)
+
+ self.texture = self:CreateTexture ("$parent_statusbarTexture", "ARTWORK")
+ self.texture:SetSize (300, 14)
+ self.texture:SetTexture ([[Interface\PaperDollInfoFrame\UI-Character-Skills-Bar]])
+
+ self:SetStatusBarTexture (self.texture)
+
+ self.icontexture = self:CreateTexture ("$parent_icon", "OVERLAY")
+ self.icontexture:SetSize (14, 14)
+ self.icontexture:SetPoint ("LEFT", self, "LEFT")
+
+ self.sparkmouseover = self:CreateTexture ("$parent_sparkMouseover", "OVERLAY")
+ self.sparkmouseover:SetSize (32, 32)
+ self.sparkmouseover:SetTexture ([[Interface\CastingBar\UI-CastingBar-Spark]])
+ self.sparkmouseover:SetBlendMode ("ADD")
+ self.sparkmouseover:SetPoint ("LEFT", self, "RIGHT", -16, -1)
+ self.sparkmouseover:Hide()
+
+ self.sparktimer = self:CreateTexture ("$parent_sparkTimer", "OVERLAY")
+ self.sparktimer:SetSize (32, 32)
+ self.sparktimer:SetPoint ("LEFT", self.timertexture, "RIGHT", -16, -1)
+ self.sparktimer:SetTexture ([[Interface\CastingBar\UI-CastingBar-Spark]])
+ self.sparktimer:SetBlendMode ("ADD")
+ self.sparktimer:Hide()
+
+ self.lefttext = self:CreateFontString ("$parent_TextLeft", "OVERLAY", "GameFontHighlight")
+ self.lefttext:SetJustifyH ("LEFT")
+ self.lefttext:SetPoint ("LEFT", self.icontexture, "RIGHT", 3, 0)
+ DF:SetFontSize (self.lefttext, 10)
+
+ self.righttext = self:CreateFontString ("$parent_TextRight", "OVERLAY", "GameFontHighlight")
+ self.righttext:SetJustifyH ("LEFT")
+ DF:SetFontSize (self.righttext, 10)
+ self.righttext:SetPoint ("RIGHT", self, "RIGHT", -3, 0)
+
+ DetailsFrameworkNormalBar_OnCreate (self)
+end
+
function DF:CreateBar (parent, texture, w, h, value, member, name)
return DF:NewBar (parent, parent, name, member, w, h, value, texture)
end
@@ -695,7 +755,9 @@ function DF:NewBar (parent, container, name, member, w, h, value, texture_name)
BarObject.container = container
--> create widgets
- BarObject.statusbar = CreateFrame ("statusbar", name, parent, "DetailsFrameworkNormalBarTemplate")
+ BarObject.statusbar = CreateFrame ("statusbar", name, parent)
+ build_statusbar (BarObject.statusbar)
+
BarObject.widget = BarObject.statusbar
if (not APIBarFunctions) then
diff --git a/Libs/DF/normal_bar.xml b/Libs/DF/normal_bar.xml
index 734a9dc8..82b982ea 100644
--- a/Libs/DF/normal_bar.xml
+++ b/Libs/DF/normal_bar.xml
@@ -1,98 +1,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- self:SetStatusBarTexture (self.texture);
- DetailsFrameworkNormalBar_OnCreate (self);
-
-
-
diff --git a/Libs/DF/panel.lua b/Libs/DF/panel.lua
index 7517c506..e0618b29 100644
--- a/Libs/DF/panel.lua
+++ b/Libs/DF/panel.lua
@@ -490,7 +490,14 @@ function DF:NewPanel (parent, container, name, member, w, h, backdrop, backdropc
PanelObject.container = container
PanelObject.rightButtonClose = false
- PanelObject.frame = CreateFrame ("frame", name, parent, "DetailsFrameworkPanelTemplate")
+ PanelObject.frame = CreateFrame ("frame", name, parent)
+ PanelObject.frame:SetSize (100, 100)
+ PanelObject.frame.Gradient = {
+ ["OnEnter"] = {0.3, 0.3, 0.3, 0.5},
+ ["OnLeave"] = {0.9, 0.7, 0.7, 1}
+ }
+ PanelObject.frame:SetBackdrop ({bgFile = [[Interface\DialogFrame\UI-DialogBox-Background]], edgeFile = "Interface\DialogFrame\UI-DialogBox-Border", edgeSize = 10, tileSize = 64, tile = true})
+
PanelObject.widget = PanelObject.frame
if (not APIFrameFunctions) then
diff --git a/Libs/DF/panel.xml b/Libs/DF/panel.xml
index 40ed1b24..5f40d599 100644
--- a/Libs/DF/panel.xml
+++ b/Libs/DF/panel.xml
@@ -1,32 +1,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- self.Gradient = {
- ["OnEnter"] = {0.3, 0.3, 0.3, 0.5},
- ["OnLeave"] = {0.9, 0.7, 0.7, 1}
- }
-
-
-
-
-
diff --git a/Libs/DF/split_bar.lua b/Libs/DF/split_bar.lua
index 52f59425..aee95724 100644
--- a/Libs/DF/split_bar.lua
+++ b/Libs/DF/split_bar.lua
@@ -526,6 +526,50 @@ function DF:CreateSplitBar (parent, parent, w, h, member, name)
return DF:NewSplitBar (parent, container, name, member, w, h)
end
+local build_statusbar = function (self)
+ self:SetSize (300, 14)
+
+ self.background = self:CreateTexture ("$parent_StatusBarBackground", "BACKGROUND")
+ self.background:SetAllPoints()
+ self.background:SetTexture ([[Interface\PaperDollInfoFrame\UI-Character-Skills-Bar]])
+ self.background:SetVertexColor (.5, .5, .5, 1)
+
+ self.texture = self:CreateTexture ("$parent_StatusBarTexture", "ARTWORK")
+ self.texture:Hide()
+ self.texture:SetSize (300, 14)
+ self.texture:SetTexture ([[Interface\PaperDollInfoFrame\UI-Character-Skills-Bar]])
+
+ self.lefticon = self:CreateTexture ("$parent_IconLeft", "OVERLAY")
+ self.lefticon:SetSize (14, 14)
+ self.lefticon:SetPoint ("LEFT", self, "LEFT")
+
+ self.righticon = self:CreateTexture ("$parent_IconRight", "OVERLAY")
+ self.righticon:SetSize (14, 14)
+ self.righticon:SetPoint ("RIGHT", self, "RIGHT")
+
+ self.spark = self:CreateTexture ("$parent_Spark", "OVERLAY")
+ self.spark:SetTexture ([[Interface\CastingBar\UI-CastingBar-Spark]])
+ self.spark:SetBlendMode ("ADD")
+ self.spark:SetSize (32, 32)
+ self.spark:SetPoint ("LEFT", self, "RIGHT", -17, -1)
+
+ self.lefttext = self:CreateFontString ("$parent_TextLeft", "OVERLAY", "GameFontHighlight")
+ DF:SetFontSize (self.lefttext, 10)
+ self.lefttext:SetJustifyH ("left")
+ self.lefttext:SetPoint ("LEFT", self.lefticon, "RIGHT", 3, 0)
+
+ self.righttext = self:CreateFontString ("$parent_TextRight", "OVERLAY", "GameFontHighlight")
+ DF:SetFontSize (self.righttext, 10)
+ self.righttext:SetJustifyH ("right")
+ self.righttext:SetPoint ("RIGHT", self.righticon, "LEFT", -3, 0)
+
+ self:SetStatusBarTexture (self.texture)
+ self:SetMinMaxValues (1, 100)
+ self:SetValue (50)
+ DetailsFrameworkSplitlBar_OnCreate (self)
+end
+
+
function DF:NewSplitBar (parent, container, name, member, w, h)
if (not name) then
@@ -563,7 +607,8 @@ function DF:NewSplitBar (parent, container, name, member, w, h)
SplitBarObject.container = container
--> create widgets
- SplitBarObject.statusbar = CreateFrame ("statusbar", name, parent, "DetailsFrameworkSplitBarTemplate")
+ SplitBarObject.statusbar = CreateFrame ("statusbar", name, parent)
+ build_statusbar (SplitBarObject.statusbar)
SplitBarObject.widget = SplitBarObject.statusbar
if (not APISplitBarFunctions) then
diff --git a/Libs/DF/split_bar.xml b/Libs/DF/split_bar.xml
index e016f350..7efbec45 100644
--- a/Libs/DF/split_bar.xml
+++ b/Libs/DF/split_bar.xml
@@ -1,82 +1,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- self:SetStatusBarTexture (self.texture);
- self:SetMinMaxValues (1, 100);
- self:SetValue (50);
- DetailsFrameworkSplitlBar_OnCreate (self);
-
-
-
-
diff --git a/Libs/DF/textentry.lua b/Libs/DF/textentry.lua
index 9f1cc265..c90b3b27 100644
--- a/Libs/DF/textentry.lua
+++ b/Libs/DF/textentry.lua
@@ -583,7 +583,14 @@ function DF:NewTextEntry (parent, container, name, member, w, h, func, param1, p
TextEntryObject.container = container
TextEntryObject.have_tooltip = nil
- TextEntryObject.editbox = CreateFrame ("EditBox", name, parent, "DetailsFrameworkEditBoxTemplate2")
+ TextEntryObject.editbox = CreateFrame ("EditBox", name, parent)
+ TextEntryObject.editbox:SetSize (232, 20)
+ TextEntryObject.editbox:SetBackdrop ({bgFile = [["Interface\DialogFrame\UI-DialogBox-Background"]], tileSize = 64, tile = true, edgeFile = [[Interface\DialogFrame\UI-DialogBox-Border]], edgeSize = 10, insets = {left = 1, right = 1, top = 0, bottom = 0}})
+
+ TextEntryObject.editbox.label = TextEntryObject.editbox:CreateFontString ("$parent_Desc", "OVERLAY", "GameFontHighlightSmall")
+ TextEntryObject.editbox.label:SetJustifyH ("left")
+ TextEntryObject.editbox.label:SetPoint ("RIGHT", TextEntryObject.editbox, "LEFT", -2, 0)
+
TextEntryObject.widget = TextEntryObject.editbox
TextEntryObject.editbox:SetTextInsets (3, 0, 0, -3)
@@ -1079,7 +1086,22 @@ function DF:NewSpecialLuaEditorEntry (parent, w, h, member, name, nointent)
parent [member] = borderframe
end
- local scrollframe = CreateFrame ("ScrollFrame", name, borderframe, "DetailsFrameworkEditBoxMultiLineTemplate")
+ local scrollframe = CreateFrame ("ScrollFrame", name, borderframe, "UIPanelScrollFrameTemplate")
+ scrollframe:SetSize (232, 20)
+ scrollframe.editbox = CreateFrame ("editbox", "$parentEditBox", scrollframe)
+ scrollframe.editbox:SetMultiLine (true)
+ scrollframe.editbox:SetAutoFocus (false)
+ scrollframe.editbox:SetSize (232, 20)
+ scrollframe.editbox:SetAllPoints()
+
+ scrollframe.editbox:SetScript ("OnCursorChanged", _G.ScrollingEdit_OnCursorChanged)
+ scrollframe.editbox:SetScript ("OnEscapePressed", _G.EditBox_ClearFocus)
+ scrollframe.editbox:SetFontObject ("GameFontHighlightSmall")
+
+ scrollframe:SetScrollChild (scrollframe.editbox)
+
+ --letters="255"
+ --countInvisibleLetters="true"
borderframe.SetAsAutoComplete = TextEntryMetaFunctions.SetAsAutoComplete
diff --git a/Libs/DF/textentry.xml b/Libs/DF/textentry.xml
index ee9d76cd..d0ef735d 100644
--- a/Libs/DF/textentry.xml
+++ b/Libs/DF/textentry.xml
@@ -1,62 +1,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Libs/DF/tutorial_alert.xml b/Libs/DF/tutorial_alert.xml
index 4cbe3112..b4150039 100644
--- a/Libs/DF/tutorial_alert.xml
+++ b/Libs/DF/tutorial_alert.xml
@@ -1,247 +1,2 @@
-
-
-
-
-
-
-
-
- self:SetHorizontalScroll(-28.5);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- self:GetParent():Hide();
-
-
- self:GetParent():Hide();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- self:GetParent():Hide();
-
-
- self:GetParent():Hide();
- --if (self:GetParent():GetParent():GetParent().type=="COMPLETED") then
- --self:GetParent():GetParent().Flash:Show();
- --end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- self.IconFlash:SetVertexColor(1, 0, 0);
-
-
- UIFrameFlash(self, 0.75, 0.75, -1, nil);
-
-
- UIFrameFlashStop(self);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/boot.lua b/boot.lua
index e67d6f05..0201df64 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 = 5986
+ _detalhes.build_counter = 6003
_detalhes.userversion = "v8.0.1." .. _detalhes.build_counter
- _detalhes.realversion = 131 --core version
+ _detalhes.realversion = 132 --core version
_detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")"
_detalhes.BFACORE = 131
Details = _detalhes
diff --git a/classes/classe_instancia.lua b/classes/classe_instancia.lua
index f7c2fd6e..a09b88c6 100644
--- a/classes/classe_instancia.lua
+++ b/classes/classe_instancia.lua
@@ -152,6 +152,10 @@ end
function _detalhes:GetInstance (id)
return _detalhes.tabela_instancias [id]
end
+--> user friendly alias
+function _detalhes:GetWindow (id)
+ return _detalhes.tabela_instancias [id]
+end
function _detalhes:GetId()
return self.meu_id
@@ -281,7 +285,11 @@ end
function _detalhes:IsAtiva()
return self.ativa
end
+
--> english alias
+function _detalhes:IsShown()
+ return self.ativa
+end
function _detalhes:IsEnabled()
return self.ativa
end
@@ -333,6 +341,10 @@ end
end
end
+ --> alias
+ function _detalhes:HideWindow()
+ return self:DesativarInstancia()
+ end
function _detalhes:ShutDown()
return self:DesativarInstancia()
end
@@ -538,6 +550,9 @@ end
end
--> alias
+ function _detalhes:ShowWindow (temp)
+ return self:AtivarInstancia (temp)
+ end
function _detalhes:EnableInstance (temp)
return self:AtivarInstancia (temp)
end
diff --git a/core/windows.lua b/core/windows.lua
index f0f9ce56..ee97f5d0 100644
--- a/core/windows.lua
+++ b/core/windows.lua
@@ -1118,52 +1118,9 @@
end
end
---> tutorial bookmark
+--> tutorial bookmark (removed)
function _detalhes:TutorialBookmark (instance)
-
_detalhes:SetTutorialCVar ("ATTRIBUTE_SELECT_TUTORIAL1", true)
-
- local func = function()
- local f = CreateFrame ("frame", nil, instance.baseframe)
- f:SetAllPoints();
- f:SetFrameStrata ("FULLSCREEN")
- f:SetBackdrop ({bgFile = [[Interface\AddOns\Details\images\background]], tile = true, tileSize = 16})
- f:SetBackdropColor (0, 0, 0, 0.8)
-
- f.alert = CreateFrame ("frame", "DetailsTutorialBookmarkAlert", UIParent, "ActionBarButtonSpellActivationAlert")
- f.alert:SetPoint ("topleft", f, "topleft")
- f.alert:SetPoint ("bottomright", f, "bottomright")
- f.alert.animOut:Stop()
- f.alert.animIn:Play()
-
- f.text = f:CreateFontString (nil, "overlay", "GameFontNormal")
- f.text:SetText (Loc ["STRING_MINITUTORIAL_BOOKMARK1"])
- f.text:SetWidth (f:GetWidth()-15)
- f.text:SetPoint ("center", f)
- f.text:SetJustifyH ("center")
-
- f.bg = f:CreateTexture (nil, "border")
- f.bg:SetTexture ([[Interface\ACHIEVEMENTFRAME\UI-Achievement-Parchment-Horizontal-Desaturated]])
- f.bg:SetAllPoints()
- f.bg:SetAlpha (0.8)
-
- f.textbg = f:CreateTexture (nil, "artwork")
- f.textbg:SetTexture ([[Interface\ACHIEVEMENTFRAME\UI-Achievement-RecentHeader]])
- f.textbg:SetPoint ("center", f)
- f.textbg:SetAlpha (0.4)
- f.textbg:SetTexCoord (0, 1, 0, 24/32)
-
- f:SetScript ("OnMouseDown", function (self, button)
- if (button == "RightButton") then
- f.alert.animIn:Stop()
- f.alert.animOut:Play()
- _detalhes.switch:ShowMe (instance)
- f:Hide()
- end
- end)
- end
-
- _detalhes:GetFramework():ShowTutorialAlertFrame ("How to Use Bookmarks", "switch fast between displays", func)
end
--> translate window
diff --git a/gumps/janela_principal.lua b/gumps/janela_principal.lua
index 1b9f2a8e..93be0b0c 100644
--- a/gumps/janela_principal.lua
+++ b/gumps/janela_principal.lua
@@ -4704,6 +4704,7 @@ function _detalhes:InstanceRefreshRows (instancia)
if (textL_outline_small) then
local c = textL_outline_small_color
row.texto_esquerdo:SetShadowColor (c[1], c[2], c[3], c[4])
+ --row.texto_esquerdo:SetShadowOffset (3, -2)
else
row.texto_esquerdo:SetShadowColor (0, 0, 0, 0)
end
diff --git a/startup.lua b/startup.lua
index 255627ed..bd4669bc 100644
--- a/startup.lua
+++ b/startup.lua
@@ -1826,6 +1826,7 @@ function _G._detalhes:Start()
_detalhes:RefreshPlaterIntegration()
end)
+ --[=[
--> suppress warnings for the first few seconds
CLOSE_SCRIPTERRORWINDOW = function()
if (ScriptErrorsFrame) then
@@ -1837,6 +1838,7 @@ function _G._detalhes:Start()
ScriptErrorsFrame:Hide()
end
C_Timer.After (5, function() _G ["CLOSE_SCRIPTERRORWINDOW"] = nil end)
+ --]=]
end
_detalhes.AddOnLoadFilesTime = GetTime()