Mercurial > wow > hansgar_and_franzok_assist

changeset 20:dc1c77254f80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- added close button to users panel. - framework update.
author Tercio
date Tue, 11 Aug 2015 12:46:46 -0300
parents 215f0dd37a6c
children 7fef991992f6
files Hansgar_And_Franzok_Assist.lua Libs/DF/addon.lua Libs/DF/button.lua Libs/DF/colors.lua Libs/DF/cooltip.lua Libs/DF/dropdown.lua Libs/DF/fw.lua Libs/DF/help.lua Libs/DF/label.lua Libs/DF/normal_bar.lua Libs/DF/panel.lua Libs/DF/picture.lua Libs/DF/pictureedit.lua Libs/DF/scrollbar.lua Libs/DF/slider.lua Libs/DF/split_bar.lua Libs/DF/textentry.lua
diffstat 17 files changed, 962 insertions(+), 276 deletions(-) [+]
line wrap: on
line diff
--- a/Hansgar_And_Franzok_Assist.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Hansgar_And_Franzok_Assist.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -19,7 +19,7 @@
 --local f = CreateFrame ("frame", "Hansgar_And_Franzok_Assist", UIParent)
 local f = DF:Create1PxPanel (_, 155, 166, "Hans & Franz", "Hansgar_And_Franzok_Assist", nil, "top", true)
 f:SetFrameStrata ("DIALOG")
-f.version = "v0.15"
+f.version = "v0.15d"
 
 f.Close:SetScript ("OnClick", function (self)
 	if (f.StampersPhase) then
@@ -282,6 +282,9 @@
 		users_frame.title:SetPoint ("center", users_frame, "center")
 		users_frame.title:SetPoint ("bottom", users_frame, "top", 0, 2)
 		
+		local close = CreateFrame ("button", "Hansgar_And_Franzok_Assist_UsersPanel_CloseButton", users_frame, "UIPanelCloseButton")
+		close:SetPoint ("topright", users_frame, "topright")
+		users_frame.close_button = close
 	end
 	
 	local s = ""
--- a/Libs/DF/addon.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/addon.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -2,7 +2,7 @@
 local DF = _G ["DetailsFramework"]
 local _
 
-if (not DF) then -- or not DetailsFrameWorkLoadValid
+if (not DF or not DetailsFrameworkCanLoad) then
 	return 
 end
 
@@ -30,7 +30,6 @@
 		end
 		
 		if (broker) then
-			
 			local broker_click_function = broker.OnClick
 			if (not broker_click_function and options_table) then
 				broker_click_function = function()
@@ -50,7 +49,10 @@
 			if (databroker and broker.Minimap and global_table.Minimap) then
 				LibStub ("LibDBIcon-1.0"):Register (name, databroker, addon.db.profile.Minimap)
 			end
-			
+		end
+		
+		if (addon.OnInit) then
+			xpcall (addon.OnInit, geterrorhandler(), addon)
 		end
 		
 	end
--- a/Libs/DF/button.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/button.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,6 +1,10 @@
 
 local DF = _G ["DetailsFramework"]
 
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
+
 local _
 local _rawset = rawset --> lua local
 local _rawget = rawget --> lua local
@@ -860,11 +864,11 @@
 ------------------------------------------------------------------------------------------------------------
 --> object constructor
 
-function DF:CreateButton (parent, func, w, h, text, param1, param2, texture, member, name, short_method)
-	return DF:NewButton (parent, parent, name, member, w, h, func, param1, param2, texture, text, short_method)
+function DF:CreateButton (parent, func, w, h, text, param1, param2, texture, member, name, short_method, text_template)
+	return DF:NewButton (parent, parent, name, member, w, h, func, param1, param2, texture, text, short_method, text_template)
 end
 
-function DF:NewButton (parent, container, name, member, w, h, func, param1, param2, texture, text, short_method)
+function DF:NewButton (parent, container, name, member, w, h, func, param1, param2, texture, text, short_method, template)
 	
 	if (not name) then
 		name = "DetailsFrameworkButtonNumber" .. DF.ButtonCounter
@@ -923,7 +927,7 @@
 		for funcName, funcAddress in pairs (idx) do 
 			if (not ButtonMetaFunctions [funcName]) then
 				ButtonMetaFunctions [funcName] = function (object, ...)
-					local x = loadstring ( "return _G."..object.button:GetName()..":"..funcName.."(...)")
+					local x = loadstring ( "return _G['"..object.button:GetName().."']:"..funcName.."(...)")
 					return x (...)
 				end
 			end
@@ -973,6 +977,21 @@
 	
 	ButtonObject.short_method = short_method
 	
+	if (template) then
+		if (template.size) then
+			DF:SetFontSize (ButtonObject.button.text, template.size)
+		end
+		if (template.color) then
+			local r, g, b, a = DF:ParseColors (template.color)
+			ButtonObject.button.text:SetTextColor (r, g, b, a)
+		end
+		if (template.font) then
+			local SharedMedia = LibStub:GetLibrary ("LibSharedMedia-3.0")
+			local font = SharedMedia:Fetch ("font", template.font)
+			DF:SetFontFace (ButtonObject.button.text, font)
+		end
+	end
+	
 	--> hooks
 		ButtonObject.button:SetScript ("OnEnter", OnEnter)
 		ButtonObject.button:SetScript ("OnLeave", OnLeave)
--- a/Libs/DF/colors.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/colors.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,6 +1,10 @@
 do
 
 	local DF = _G ["DetailsFramework"]
+	
+	if (not DF or not DetailsFrameworkCanLoad) then
+		return 
+	end
 
 	DF.alias_text_colors = {
 		["aliceblue"] = {0.941176, 0.972549, 1, 1},
--- a/Libs/DF/cooltip.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/cooltip.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,7 +1,10 @@
 
 local DF = _G ["DetailsFramework"]
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
+
 local SharedMedia = LibStub:GetLibrary("LibSharedMedia-3.0")
-
 local _
 --lua locals
 local _math_floor= math.floor
@@ -19,7 +22,7 @@
 local _UIParent = UIParent
 local _CreateFrame = CreateFrame
 
-local version = 1
+local version = 2
 
 function DF:CreateCoolTip()
 
@@ -51,6 +54,8 @@
 		CoolTip.WallpaperTable = {}
 		CoolTip.WallpaperTableSub = {}
 		
+		CoolTip.PopupFrameTable = {}
+		
 		CoolTip.FunctionsTableMain = {} --> menus
 		CoolTip.FunctionsTableSub = {} --> menus
 		CoolTip.ParametersTableMain = {} --> menus
@@ -254,6 +259,7 @@
 			if (CoolTip.Type ~= 1 and CoolTip.Type ~= 2) then --> menu
 				CoolTip.active = true
 				CoolTip.mouseOver = true
+				CoolTip.had_interaction = true
 				self:SetScript ("OnUpdate", nil)
 				DF:Fade (self, 0)
 				--rever
@@ -270,6 +276,7 @@
 			if (CoolTip.Type ~= 1 and CoolTip.Type ~= 2) then
 				CoolTip.active = true
 				CoolTip.mouseOver = true
+				CoolTip.had_interaction = true
 				self:SetScript ("OnUpdate", nil)
 				DF:Fade (self, 0)
 				DF:Fade (frame1, 0)
@@ -398,6 +405,7 @@
 							if (CoolTip.Type ~= 1 and CoolTip.Type ~= 2 and not botao.isDiv) then
 								CoolTip.active = true
 								CoolTip.mouseOver = true
+								CoolTip.had_interaction = true
 
 								frame1:SetScript ("OnUpdate", nil)
 								frame2:SetScript ("OnUpdate", nil)
@@ -410,7 +418,13 @@
 									botao.leftIcon:SetBlendMode ("BLEND")
 								end
 
-								if (CoolTip.IndexesSub [botao.index] and CoolTip.IndexesSub [botao.index] > 0) then
+								if (CoolTip.PopupFrameTable [botao.index]) then
+									local on_enter, on_leave, param1, param2 = unpack (CoolTip.PopupFrameTable [botao.index])
+									if (on_enter) then
+										xpcall (on_enter, geterrorhandler(), frame1, param1, param2)
+									end
+								
+								elseif (CoolTip.IndexesSub [botao.index] and CoolTip.IndexesSub [botao.index] > 0) then
 									if (CoolTip.OptionsTable.SubMenuIsTooltip) then
 										CoolTip:ShowSub (botao.index)
 										botao.index = i
@@ -432,6 +446,7 @@
 								end
 							else
 								CoolTip.mouseOver = true
+								CoolTip.had_interaction = true
 							end
 						end)
 						
@@ -451,6 +466,13 @@
 									botao.rightIcon:SetBlendMode ("BLEND")
 								end
 								
+								if (CoolTip.PopupFrameTable [botao.index]) then
+									local on_enter, on_leave, param1, param2 = unpack (CoolTip.PopupFrameTable [botao.index])
+									if (on_leave) then
+										xpcall (on_leave, geterrorhandler(), frame1, param1, param2)
+									end
+								end
+								
 								elapsedTime = 0
 								frame1:SetScript ("OnUpdate", OnLeaveUpdateButton)
 								--CoolTip:HideSub (i)
@@ -489,6 +511,7 @@
 							if (CoolTip.Type ~= 1 and CoolTip.Type ~= 2 and not botao.isDiv) then
 								CoolTip.active = true
 								CoolTip.mouseOver = true
+								CoolTip.had_interaction = true
 								
 								botao.background:Show()
 								
@@ -505,6 +528,7 @@
 								DF:Fade (frame2, 0)
 							else
 								CoolTip.mouseOver = true
+								CoolTip.had_interaction = true
 							end
 						end)
 
@@ -1956,6 +1980,8 @@
 			frame2:SetBackdropBorderColor (unpack (default_backdropborder_color))
 
 			--[
+			_table_wipe (CoolTip.PopupFrameTable)
+			
 			_table_wipe (CoolTip.LeftTextTable)
 			_table_wipe (CoolTip.LeftTextTableSub)
 			_table_wipe (CoolTip.RightTextTable)
@@ -2530,6 +2556,17 @@
 		end
 	
 ----------------------------------------------------------------------
+	--> popup frame
+		function CoolTip:AddPopUpFrame (func_on_show, func_on_hide, param1, param2)
+			
+			-- act like a sub menu
+			if (CoolTip.Indexes > 0) then
+				CoolTip.PopupFrameTable [CoolTip.Indexes] = {func_on_show or false, func_on_hide or false, param1, param2}
+			end
+			
+		end
+
+----------------------------------------------------------------------
 	--> adds a line.
 	--> only works with cooltip type 1 and 2 (tooltip and tooltip with bars)
 	--> parameters: left text, right text [, L color R, L color G, L color B, L color A [, R color R, R color G, R color B, R color A [, wrap]]] 
@@ -2780,11 +2817,14 @@
 	
 		--> serach key: ~start
 		function CoolTip:Show (frame, menuType, color)
+			CoolTip.had_interaction = false
 			return CoolTip:ShowCooltip (frame, menuType, color)
 		end
 		
 		function CoolTip:ShowCooltip (frame, menuType, color)
 
+			CoolTip.had_interaction = false
+		
 			if (frame) then
 				--> details framework
 				if (frame.dframework) then
--- a/Libs/DF/dropdown.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/dropdown.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,7 +1,10 @@
 
 local DF = _G ["DetailsFramework"]
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
+
 local _
-
 local _rawset = rawset --> lua local
 local _rawget = rawget --> lua local
 local _setmetatable = setmetatable --> lua local
@@ -822,7 +825,15 @@
 	self.MyObject:Close()
 end
 
-
+function DF:BuildDropDownFontList (on_click, icon, icon_texcoord, icon_size)
+	local t = {}
+	local SharedMedia = LibStub:GetLibrary ("LibSharedMedia-3.0")
+	for name, fontPath in pairs (SharedMedia:HashTable ("font")) do 
+		t[#t+1] = {value = name, label = name, onclick = on_click, icon = icon, iconsize = icon_size, texcoord = icon_texcoord, font = fontPath, descfont = "abcdefg ABCDEFG"}
+	end
+	table.sort (t, function (t1, t2) return t1.label < t2.label end)
+	return t
+end
 
 ------------------------------------------------------------------------------------------------------------
 --> object constructor
@@ -888,7 +899,7 @@
 		for funcName, funcAddress in pairs (idx) do 
 			if (not DropDownMetaFunctions [funcName]) then
 				DropDownMetaFunctions [funcName] = function (object, ...)
-					local x = loadstring ( "return _G."..object.dropdown:GetName()..":"..funcName.."(...)")
+					local x = loadstring ( "return _G['"..object.dropdown:GetName().."']:"..funcName.."(...)")
 					return x (...)
 				end
 			end
--- a/Libs/DF/fw.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/fw.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,13 +1,13 @@
 
-local major, minor = "DetailsFramework-1.0", 3
+local major, minor = "DetailsFramework-1.0", 5
 local DF, oldminor = LibStub:NewLibrary (major, minor)
 
 if (not DF) then
-	DetailsFrameWorkLoadValid = false
+	DetailsFrameworkCanLoad = false
 	return 
 end
 
-DetailsFrameWorkLoadValid = true
+DetailsFrameworkCanLoad = true
 
 local _type = type
 local _unpack = unpack
@@ -38,6 +38,9 @@
 
 DF.embeds = DF.embeds or {}
 local embed_functions = {
+	"RemoveRealName",
+	"table",
+	"BuildDropDownFontList",
 	"SetFontSize",
 	"SetFontFace",
 	"SetFontColor",
@@ -55,6 +58,7 @@
 	"ShowTutorialAlertFrame",
 	"GetNpcIdFromGuid",
 	"ShowFeedbackPanel",
+	"SetAsOptionsPanel",
 	
 	"CreateDropDown",
 	"CreateButton",
@@ -75,10 +79,77 @@
 	"CreateTextEntry",
 	"Create1PxPanel",
 	"CreateFeedbackButton",
-	
+	"CreateOptionsFrame",
+	"ShowPromptPanel",
 	"www_icons",
 }
 
+DF.table = {}
+
+function DF.table.reverse (t)
+	local new = {}
+	local index = 1
+	for i = #t, 1, -1 do
+		new [index] = t[i]
+		index = index + 1
+	end
+	return new
+end
+
+--> copy from table2 to table1 overwriting values
+function DF.table.copy (t1, t2)
+	for key, value in pairs (t2) do 
+		if (type (value) == "table") then
+			t1 [key] = t1 [key] or {}
+			DF.table.copy (t1 [key], t2 [key])
+		else
+			t1 [key] = value
+		end
+	end
+	return t1
+end
+
+--> copy values that does exist on table2 but not on table1
+function DF.table.deploy (t1, t2)
+	for key, value in pairs (t2) do 
+		if (type (value) == "table") then
+			t1 [key] = t1 [key] or {}
+			DF.table.deploy (t1 [key], t2 [key])
+		elseif (not t1 [key]) then
+			t1 [key] = value
+		end
+	end
+end
+
+function DF.table.dump (t, s, deep)
+	s = s or ""
+	deep = deep or 0
+	local space = ""
+	for i = 1, deep do
+		space = space .. "   "
+	end
+	for key, value in pairs (t) do
+		local tpe = _type (value)
+		if (type (key) ~= "string") then
+			key = "unknown?"
+		end		
+		if (tpe == "table") then
+			s = s .. space .. "[" .. key .. "] = |cFFa9ffa9table {|r\n"
+			s = s .. DF.table.dump (value, nil, deep+1)
+			s = s .. space .. "|cFFa9ffa9}|r\n"
+		elseif (tpe == "string") then
+			s = s .. space .. "[" .. key .. "] = '|cFFfff1c1" .. value .. "|r'\n"
+		elseif (tpe == "number") then
+			s = s .. space .. "[" .. key .. "] = |cFFffc1f4" .. value .. "|r\n"
+		elseif (tpe == "function") then
+			s = s .. space .. "[" .. key .. "] = function()\n"
+		elseif (tpe == "boolean") then
+			s = s .. space .. "[" .. key .. "] = |cFF99d0ff" .. (value and "true" or "false") .. "|r\n"
+		end
+	end
+	return s
+end
+
 DF.www_icons = {
 	texture = "feedback_sites",
 	wowi = {0, 0.7890625, 0, 37/128},
@@ -94,6 +165,10 @@
 	return target
 end
 
+function DF:RemoveRealName (name)
+	return name:gsub (("%-.*"), "")
+end
+
 function DF:SetFontSize (fontString, ...)
 	local fonte, _, flags = fontString:GetFont()
 	fontString:SetFont (fonte, max (...), flags)
@@ -492,7 +567,7 @@
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --> menus
 	
-	function DF:BuildMenu (parent, menu, x_offset, y_offset, height)
+	function DF:BuildMenu (parent, menu, x_offset, y_offset, height, use_two_points)
 		
 		local cur_x = x_offset
 		local cur_y = y_offset
@@ -503,10 +578,22 @@
 		
 		for index, widget_table in ipairs (menu) do 
 		
-			if (widget_table.type == "select" or widget_table.type == "dropdown") then
-				local dropdown = self:NewDropDown (parent, nil, "$parentWidget" .. index, nil, 140, 18, widget_table.values, widget_table.get())
+			if (widget_table.type == "blank" or widget_table.type == "space") then
+				-- do nothing
+		
+			elseif (widget_table.type == "label" or widget_table.type == "text") then
+				local label = DF:CreateLabel (parent, widget_table.get() or widget_table.text, widget_table.text_template or widget_table.size, widget_table.color, widget_table.font, nil, "$parentWidget" .. index, "overlay")
+				label._get = widget_table.get
+				label.widget_type = "label"
+				label:SetPoint (cur_x, cur_y)
+				tinsert (parent.widget_list, label)
+			
+			elseif (widget_table.type == "select" or widget_table.type == "dropdown") then
+				local dropdown = DF:NewDropDown (parent, nil, "$parentWidget" .. index, nil, 140, 18, widget_table.values, widget_table.get())
 				dropdown.tooltip = widget_table.desc
-				local label = self:NewLabel (parent, nil, "$parentLabel" .. index, nil, widget_table.name, "GameFontNormal", 12)
+				dropdown._get = widget_table.get
+				dropdown.widget_type = "select"
+				local label = DF:NewLabel (parent, nil, "$parentLabel" .. index, nil, widget_table.name .. (use_two_points and ": " or ""), "GameFontNormal", widget_table.text_template or 12)
 				dropdown:SetPoint ("left", label, "right", 2)
 				label:SetPoint (cur_x, cur_y)
 				
@@ -515,12 +602,16 @@
 					max_x = size
 				end
 				
+				tinsert (parent.widget_list, dropdown)
+				
 			elseif (widget_table.type == "toggle" or widget_table.type == "switch") then
-				local switch = self:NewSwitch (parent, nil, "$parentWidget" .. index, nil, 60, 20, nil, nil, widget_table.get())
+				local switch = DF:NewSwitch (parent, nil, "$parentWidget" .. index, nil, 60, 20, nil, nil, widget_table.get())
 				switch.tooltip = widget_table.desc
+				switch._get = widget_table.get
+				switch.widget_type = "toggle"
 				switch.OnSwitch = widget_table.set
 				
-				local label = self:NewLabel (parent, nil, "$parentLabel" .. index, nil, widget_table.name, "GameFontNormal", 12)
+				local label = DF:NewLabel (parent, nil, "$parentLabel" .. index, nil, widget_table.name .. (use_two_points and ": " or ""), "GameFontNormal", widget_table.text_template or 12)
 				switch:SetPoint ("left", label, "right", 2)
 				label:SetPoint (cur_x, cur_y)
 				
@@ -529,13 +620,17 @@
 					max_x = size
 				end
 				
+				tinsert (parent.widget_list, switch)
+				
 			elseif (widget_table.type == "range" or widget_table.type == "slider") then
 				local is_decimanls = widget_table.usedecimals
-				local slider = self:NewSlider (parent, nil, "$parentWidget" .. index, nil, 140, 20, widget_table.min, widget_table.max, widget_table.step, widget_table.get(),  is_decimanls)
+				local slider = DF:NewSlider (parent, nil, "$parentWidget" .. index, nil, 140, 20, widget_table.min, widget_table.max, widget_table.step, widget_table.get(),  is_decimanls)
 				slider.tooltip = widget_table.desc
+				slider._get = widget_table.get
+				slider.widget_type = "range"
 				slider:SetHook ("OnValueChange", widget_table.set)
 				
-				local label = self:NewLabel (parent, nil, "$parentLabel" .. index, nil, widget_table.name, "GameFontNormal", 12)
+				local label = DF:NewLabel (parent, nil, "$parentLabel" .. index, nil, widget_table.name .. (use_two_points and ": " or ""), "GameFontNormal", widget_table.text_template or 12)
 				slider:SetPoint ("left", label, "right", 2)
 				label:SetPoint (cur_x, cur_y)
 				
@@ -544,9 +639,13 @@
 					max_x = size
 				end
 				
+				tinsert (parent.widget_list, slider)
+				
 			elseif (widget_table.type == "color" or widget_table.type == "color") then
-				local colorpick = self:NewColorPickButton (parent, "$parentWidget" .. index, nil, widget_table.set)
+				local colorpick = DF:NewColorPickButton (parent, "$parentWidget" .. index, nil, widget_table.set)
 				colorpick.tooltip = widget_table.desc
+				colorpick._get = widget_table.get
+				colorpick.widget_type = "color"
 
 				local default_value, g, b, a = widget_table.get()
 				if (type (default_value) == "table") then
@@ -555,7 +654,7 @@
 					colorpick:SetColor (default_value, g, b, a)
 				end
 				
-				local label = self:NewLabel (parent, nil, "$parentLabel" .. index, nil, widget_table.name, "GameFontNormal", 12)
+				local label = DF:NewLabel (parent, nil, "$parentLabel" .. index, nil, widget_table.name .. (use_two_points and ": " or ""), "GameFontNormal", widget_table.text_template or 12)
 				colorpick:SetPoint ("left", label, "right", 2)
 				label:SetPoint (cur_x, cur_y)
 				
@@ -564,18 +663,23 @@
 					max_x = size
 				end
 				
+				tinsert (parent.widget_list, colorpick)
+				
 			elseif (widget_table.type == "execute" or widget_table.type == "button") then
 			
-				local button = self:NewButton (parent, nil, "$parentWidget", nil, 120, 18, widget_table.func, widget_table.param1, widget_table.param2, nil, widget_table.name)
+				local button = DF:NewButton (parent, nil, "$parentWidget", nil, 120, 18, widget_table.func, widget_table.param1, widget_table.param2, nil, widget_table.name)
 				button:InstallCustomTexture()
 				button:SetPoint (cur_x, cur_y)
 				button.tooltip = widget_table.desc
+				button.widget_type = "execute"
 				
 				local size = button:GetWidth() + 4
 				if (size > max_x) then
 					max_x = size
 				end
 				
+				tinsert (parent.widget_list, button)
+				
 			end
 		
 			if (widget_table.spacement) then
@@ -663,6 +767,34 @@
 		DetailsTutorialAlertFrame_SlideInFrame (TutorialAlertFrame, "AUTOQUEST")
 	end
 	
+	local refresh_options = function (self)
+		for _, widget in ipairs (self.widget_list) do
+			if (widget._get) then
+				if (widget.widget_type == "label") then
+					if (widget._get()) then
+						widget:SetText (widget._get())
+					end
+				elseif (widget.widget_type == "select") then
+					widget:Select (widget._get())
+				elseif (widget.widget_type == "toggle" or widget.widget_type == "range") then
+					widget:SetValue (widget._get())
+				elseif (widget.widget_type == "color") then
+					local default_value, g, b, a = widget._get()
+					if (type (default_value) == "table") then
+						widget:SetColor (unpack (default_value))
+					else
+						widget:SetColor (default_value, g, b, a)
+					end
+				end
+			end
+		end
+	end
+	
+	function DF:SetAsOptionsPanel (frame)
+		frame.RefreshOptions = refresh_options
+		frame.widget_list = {}
+	end
+	
 	function DF:CreateOptionsFrame (name, title, template)
 	
 		template = template or 1
@@ -671,6 +803,8 @@
 			local options_frame = CreateFrame ("frame", name, UIParent, "ButtonFrameTemplate")
 			tinsert (UISpecialFrames, name)
 			options_frame:SetSize (500, 200)
+			options_frame.RefreshOptions = refresh_options
+			options_frame.widget_list = {}
 			
 			options_frame:SetScript ("OnMouseDown", function(self, button)
 				if (button == "RightButton") then
@@ -709,6 +843,8 @@
 			local options_frame = CreateFrame ("frame", name, UIParent)
 			tinsert (UISpecialFrames, name)
 			options_frame:SetSize (500, 200)
+			options_frame.RefreshOptions = refresh_options
+			options_frame.widget_list = {}
 
 			options_frame:SetScript ("OnMouseDown", function(self, button)
 				if (button == "RightButton") then
--- a/Libs/DF/help.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/help.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,8 +1,11 @@
 
 
 local DF = _G ["DetailsFramework"]
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
+
 local _
-
 local _rawset = rawset --> lua local
 local _rawget = rawget --> lua local
 
--- a/Libs/DF/label.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/label.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,9 +1,10 @@
-
-
 
 local DF = _G ["DetailsFramework"]
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
+
 local _
-
 local _rawset = rawset --> lua local
 local _rawget = rawget --> lua local
 local _setmetatable = setmetatable --> lua local
@@ -270,7 +271,7 @@
 		for funcName, funcAddress in pairs (idx) do 
 			if (not LabelMetaFunctions [funcName]) then
 				LabelMetaFunctions [funcName] = function (object, ...)
-					local x = loadstring ( "return _G."..object.label:GetName()..":"..funcName.."(...)")
+					local x = loadstring ( "return _G['"..object.label:GetName().."']:"..funcName.."(...)")
 					return x (...)
 				end
 			end
@@ -279,15 +280,33 @@
 	
 	LabelObject.label:SetText (text)
 	
-	if (size) then
-		DF:SetFontSize (LabelObject.label, size)
-	end
-	
 	if (color) then
 		local r, g, b, a = DF:ParseColors (color)
 		LabelObject.label:SetTextColor (r, g, b, a)
+	end	
+	
+	if (size and type (size) == "number") then
+		DF:SetFontSize (LabelObject.label, size)
+		
+	elseif (size and type (size) == "table") then
+		local template = size
+		
+		if (template.size) then
+			DF:SetFontSize (LabelObject.label, template.size)
+		end
+		if (template.color) then
+			local r, g, b, a = DF:ParseColors (template.color)
+			LabelObject.label:SetTextColor (r, g, b, a)
+		end
+		if (template.font) then
+			local SharedMedia = LibStub:GetLibrary ("LibSharedMedia-3.0")
+			local font = SharedMedia:Fetch ("font", template.font)
+			DF:SetFontFace (LabelObject.label, font)
+		end
 	end
 	
+
+	
 	LabelObject.label:SetJustifyH ("LEFT")
 	
 	setmetatable (LabelObject, LabelMetaFunctions)
--- a/Libs/DF/normal_bar.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/normal_bar.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,9 +1,10 @@
-
-
 
 local DF = _G ["DetailsFramework"]
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
+
 local _
-
 local _rawset = rawset --> lua locals
 local _rawget = rawget --> lua locals
 local _setmetatable = setmetatable --> lua locals
@@ -619,7 +620,7 @@
 			for funcName, funcAddress in pairs (idx) do 
 				if (not BarMetaFunctions [funcName]) then
 					BarMetaFunctions [funcName] = function (object, ...)
-						local x = loadstring ( "return _G."..object.statusbar:GetName()..":"..funcName.."(...)")
+						local x = loadstring ( "return _G['"..object.statusbar:GetName().."']:"..funcName.."(...)")
 						return x (...)
 					end
 				end
--- a/Libs/DF/panel.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/panel.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,11 +1,10 @@
 
 local DF = _G ["DetailsFramework"]
-local _
-
-if (not DF) then -- or not DetailsFrameWorkLoadValid
+if (not DF or not DetailsFrameworkCanLoad) then
 	return 
 end
 
+local _
 --> lua locals
 local _rawset = rawset --> lua local
 local _rawget = rawget --> lua local
@@ -503,7 +502,7 @@
 		for funcName, funcAddress in pairs (idx) do 
 			if (not PanelMetaFunctions [funcName]) then
 				PanelMetaFunctions [funcName] = function (object, ...)
-					local x = loadstring ( "return _G."..object.frame:GetName()..":"..funcName.."(...)")
+					local x = loadstring ( "return _G['"..object.frame:GetName().."']:"..funcName.."(...)")
 					return x (...)
 				end
 			end
@@ -551,10 +550,305 @@
 	self.MyObject._icon:SetBlendMode ("BLEND")
 end
 
-function DF:CreateFillPanel (parent, rows, name, member, w, h, total_lines, fill_row, autowidth, options)
-	return DF:NewFillPanel (parent, rows, name, member, w, h, total_lines, fill_row, autowidth, options)
+local add_row = function (self, t, need_update)
+	local index = #self.rows+1
+	
+	local thisrow = DF:NewPanel (self, self, "$parentHeader_" .. self._name .. index, nil, 1, 20)
+	thisrow.backdrop = {bgFile = [[Interface\DialogFrame\UI-DialogBox-Gold-Background]]}
+	thisrow.color = "silver"
+	thisrow.type = t.type
+	thisrow.func = t.func
+	thisrow.name = t.name
+	thisrow.notext = t.notext
+	thisrow.icon = t.icon
+	thisrow.iconalign = t.iconalign
+	
+	thisrow.hidden = t.hidden or false
+	
+	local text = DF:NewLabel (thisrow, nil, self._name .. "$parentLabel" .. index, "text")
+	text:SetPoint ("left", thisrow, "left", 2, 0)
+	text:SetText (t.name)
+
+	tinsert (self._raw_rows, t)
+	tinsert (self.rows, thisrow)
+	
+	if (need_update) then
+		self:AlignRows()
+	end
 end
 
+local align_rows = function (self)
+
+	local rows_shown = 0
+	for index, row in ipairs (self.rows) do
+		if (not row.hidden) then
+			rows_shown = rows_shown + 1
+		end
+	end
+
+	local cur_width = 0
+	local row_width = self._width / rows_shown
+	local sindex = 1
+	
+	wipe (self._anchors)
+	
+	for index, row in ipairs (self.rows) do
+		if (not row.hidden) then
+			if (self._autowidth) then
+				if (self._raw_rows [index].width) then
+					row.width = self._raw_rows [index].width
+				else
+					row.width = row_width
+				end
+				row:SetPoint ("topleft", self, "topleft", cur_width, 0)
+				tinsert (self._anchors, cur_width)
+				cur_width = cur_width + row_width + 1
+			else
+				row:SetPoint ("topleft", self, "topleft", cur_width, 0)
+				row.width = self._raw_rows [index].width
+				tinsert (self._anchors, cur_width)
+				cur_width = cur_width + self._raw_rows [index].width + 1
+			end
+			row:Show()
+
+			local type = row.type
+
+			if (type == "text") then
+				for i = 1, #self.scrollframe.lines do
+					local line = self.scrollframe.lines [i]
+					local text = tremove (line.text_available)
+					if (not text) then
+						self:CreateRowText (line)
+						text = tremove (line.text_available)
+					end
+					tinsert (line.text_inuse, text)
+					text:SetPoint ("left", line, "left", self._anchors [#self._anchors], 0)
+					text:SetWidth (row.width)
+				end
+			elseif (type == "entry") then
+				for i = 1, #self.scrollframe.lines do
+					local line = self.scrollframe.lines [i]
+					local entry = tremove (line.entry_available)
+					if (not entry) then
+						self:CreateRowEntry (line)
+						entry = tremove (line.entry_available)
+					end
+					tinsert (line.entry_inuse, entry)
+					entry:SetPoint ("left", line, "left", self._anchors [#self._anchors], 0)
+					if (sindex == rows_shown) then
+						entry:SetWidth (row.width - 25)
+					else
+						entry:SetWidth (row.width)
+					end
+					entry.func = row.func
+				end
+			elseif (type == "button") then
+				for i = 1, #self.scrollframe.lines do
+					local line = self.scrollframe.lines [i]
+					local button = tremove (line.button_available)
+					if (not button) then
+						self:CreateRowButton (line)
+						button = tremove (line.button_available)
+					end
+					tinsert (line.button_inuse, button)
+					button:SetPoint ("left", line, "left", self._anchors [#self._anchors], 0)
+					if (sindex == rows_shown) then
+						button:SetWidth (row.width - 25)
+					else
+						button:SetWidth (row.width)
+					end
+					
+					if (row.icon) then
+						button._icon.texture = row.icon
+						button._icon:ClearAllPoints()
+						if (row.iconalign) then
+							if (row.iconalign == "center") then
+								button._icon:SetPoint ("center", button, "center")
+							elseif (row.iconalign == "right") then
+								button._icon:SetPoint ("right", button, "right")
+							end
+						else
+							button._icon:SetPoint ("left", button, "left")
+						end
+					end
+					
+					if (row.name and not row.notext) then
+						button._text:SetPoint ("left", button._icon, "right", 2, 0)
+						button._text.text = row.name
+					end					
+					
+				end
+			elseif (type == "icon") then
+				for i = 1, #self.scrollframe.lines do
+					local line = self.scrollframe.lines [i]
+					local icon = tremove (line.icon_available)
+					if (not icon) then
+						self:CreateRowIcon (line)
+						icon = tremove (line.icon_available)
+					end
+					tinsert (line.icon_inuse, icon)
+					icon:SetPoint ("left", line, "left", self._anchors [#self._anchors] + ( ((row.width or 22) - 22) / 2), 0)
+					icon.func = row.func
+				end
+			end
+			
+			sindex = sindex + 1
+		else
+			row:Hide()
+		end
+	end
+	
+	if (#self.rows > 0) then
+		if (self._autowidth) then
+			self.rows [#self.rows]:SetWidth (row_width - rows_shown + 1)
+		else
+			self.rows [#self.rows]:SetWidth (self._raw_rows [rows_shown].width - rows_shown + 1)
+		end
+	end
+	
+	self.showing_amt = rows_shown
+end
+
+local update_rows = function (self, updated_rows)
+	for i = 1, #updated_rows do
+		local t = updated_rows [i]
+		local raw = self._raw_rows [i]
+		
+		if (not raw) then
+			self:AddRow (t)
+		else
+			raw.name = t.name
+			raw.hidden = t.hidden or false
+			
+			local widget = self.rows [i]
+			widget.name = t.name
+			widget.hidden = t.hidden or false
+			
+			widget.text:SetText (t.name)
+		end
+	end
+	
+	for i = #updated_rows+1, #self._raw_rows do
+		local raw = self._raw_rows [i]
+		local widget = self.rows [i]
+		raw.hidden = true
+		widget.hidden = true
+	end
+	
+	for index, row in ipairs (self.scrollframe.lines) do
+		for i = #row.text_inuse, 1, -1 do
+			tinsert (row.text_available, tremove (row.text_inuse, i))
+		end
+		for i = 1, #row.text_available do
+			row.text_available[i]:Hide()
+		end
+		
+		for i = #row.entry_inuse, 1, -1 do
+			tinsert (row.entry_available, tremove (row.entry_inuse, i))
+		end
+		for i = 1, #row.entry_available do
+			row.entry_available[i]:Hide()
+		end
+		
+		for i = #row.button_inuse, 1, -1 do
+			tinsert (row.button_available, tremove (row.button_inuse, i))
+		end
+		for i = 1, #row.button_available do
+			row.button_available[i]:Hide()
+		end
+		
+		for i = #row.icon_inuse, 1, -1 do
+			tinsert (row.icon_available, tremove (row.icon_inuse, i))
+		end
+		for i = 1, #row.icon_available do
+			row.icon_available[i]:Hide()
+		end
+	end
+	
+	self:AlignRows()
+
+end
+
+local create_panel_text = function (self, row)
+	row.text_total = row.text_total + 1
+	local text = DF:NewLabel (row, nil, self._name .. "$parentLabel" .. row.text_total, "text" .. row.text_total)
+	tinsert (row.text_available, text)
+end
+
+local create_panel_entry = function (self, row)
+	row.entry_total = row.entry_total + 1
+	local editbox = DF:NewTextEntry (row, nil, "$parentEntry" .. row.entry_total, "entry", 120, 20)
+	editbox.align = "left"
+	
+	editbox:SetHook ("OnEnterPressed", function()
+		editbox.widget.focuslost = true
+		editbox:ClearFocus()
+		editbox.func (editbox.index, editbox.text)
+		return true
+	end) 
+	
+	editbox:SetBackdrop ({bgFile = [[Interface\DialogFrame\UI-DialogBox-Background]], edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", edgeSize = 1})
+	editbox:SetBackdropColor (1, 1, 1, 0.1)
+	editbox:SetBackdropBorderColor (1, 1, 1, 0.1)
+	editbox.editbox.current_bordercolor = {1, 1, 1, 0.1}
+	
+	tinsert (row.entry_available, editbox)
+end
+
+local create_panel_button = function (self, row)
+	row.button_total = row.button_total + 1
+	local button = DF:NewButton (row, nil, "$parentButton" .. row.button_total, "button" .. row.button_total, 120, 20)
+	button:InstallCustomTexture()
+
+	--> create icon and the text
+	local icon = DF:NewImage (button, nil, 20, 20)
+	local text = DF:NewLabel (button)
+	
+	button._icon = icon
+	button._text = text
+
+	button:SetHook ("OnEnter", button_on_enter)
+	button:SetHook ("OnLeave", button_on_leave)
+	
+	tinsert (row.button_available, button)
+end
+
+local icon_onclick = function (texture, iconbutton)
+	iconbutton._icon.texture = texture
+	iconbutton.func (iconbutton.index, texture)
+end
+
+local create_panel_icon = function (self, row)
+	row.icon_total = row.icon_total + 1
+	local iconbutton = DF:NewButton (row, nil, "$parentIconButton" .. row.icon_total, "iconbutton", 22, 20)
+	iconbutton:InstallCustomTexture()
+	
+	iconbutton:SetHook ("OnEnter", button_on_enter)
+	iconbutton:SetHook ("OnLeave", button_on_leave)
+	
+	iconbutton:SetHook ("OnMouseUp", function()
+		DF:IconPick (icon_onclick, true, iconbutton)
+		return true
+	end)
+	
+	local icon = DF:NewImage (iconbutton, nil, 20, 20, "artwork", nil, "_icon", "$parentIcon" .. row.icon_total)
+	iconbutton._icon = icon
+
+	icon:SetPoint ("center", iconbutton, "center", 0, 0)
+
+	tinsert (row.icon_available, iconbutton)
+end
+
+local set_fill_function = function (self, func)
+	self._fillfunc = func
+end
+local set_total_function = function (self, func)
+	self._totalfunc = func
+end
+local drop_header_function = function (self)
+	wipe (self.rows)
+end
+ -- ~fillpanel
 function DF:NewFillPanel (parent, rows, name, member, w, h, total_lines, fill_row, autowidth, options)
 	
 	local panel = DF:NewPanel (parent, parent, name, member, w, h)
@@ -562,134 +856,124 @@
 	
 	options = options or {rowheight = 20}
 	panel.rows = {}
-
+	
+	panel.AddRow = add_row
+	panel.AlignRows = align_rows
+	panel.UpdateRows = update_rows
+	panel.CreateRowText = create_panel_text
+	panel.CreateRowEntry = create_panel_entry
+	panel.CreateRowButton = create_panel_button
+	panel.CreateRowIcon = create_panel_icon
+	panel.SetFillFunction = set_fill_function
+	panel.SetTotalFunction = set_total_function
+	panel.DropHeader = drop_header_function
+	
+	panel._name = name
+	panel._width = w
+	panel._height = h
+	panel._raw_rows = {}
+	panel._anchors = {}
+	panel._fillfunc = fill_row
+	panel._totalfunc = total_lines
+	panel._autowidth = autowidth
+	
 	for index, t in ipairs (rows) do 
-		local thisrow = DF:NewPanel (panel, panel, "$parentHeader_" .. name .. index, nil, 1, 20)
-		thisrow.backdrop = {bgFile = [[Interface\DialogFrame\UI-DialogBox-Gold-Background]]}
-		thisrow.color = "silver"
-		thisrow.type = t.type
-		thisrow.func = t.func
-		thisrow.name = t.name
-		thisrow.notext = t.notext
-		thisrow.icon = t.icon
-		thisrow.iconalign = t.iconalign
-		
-		local text = DF:NewLabel (thisrow, nil, name .. "$parentLabel", "text")
-		text:SetPoint ("left", thisrow, "left", 2, 0)
-		text:SetText (t.name)
-
-		tinsert (panel.rows, thisrow)
-	end
-
-	local cur_width = 0
-	local row_width = w / #rows
-	
-	local anchors = {}
-	
-	for index, row in ipairs (panel.rows) do
-		if (autowidth) then
-			row:SetWidth (row_width)
-			row:SetPoint ("topleft", panel, "topleft", cur_width, 0)
-			tinsert (anchors, cur_width)
-			cur_width = cur_width + row_width + 1
-		else
-			row:SetPoint ("topleft", panel, "topleft", cur_width, 0)
-			row.width = rows [index].width
-			tinsert (anchors, cur_width)
-			cur_width = cur_width + rows [index].width + 1
-		end
-	end
-	
-	if (autowidth) then
-		panel.rows [#panel.rows]:SetWidth (row_width - #rows + 1)
-	else
-		panel.rows [#panel.rows]:SetWidth (rows [#rows].width - #rows + 1)
+		panel.AddRow (panel, t)
 	end
 	
 	local refresh_fillbox = function (self)
+	
 		local offset = FauxScrollFrame_GetOffset (self)
-		local filled_lines = total_lines()
-		
+		local filled_lines = panel._totalfunc (panel)		
+	
 		for index = 1, #self.lines do
-		
+	
 			local row = self.lines [index]
 			if (index <= filled_lines) then
-			
+
 				local real_index = index + offset
-			
-				local results = fill_row (real_index)
+				local results = panel._fillfunc (real_index, panel)
 				
 				if (results [1]) then
-				
 					row:Show()
+
+					local text, entry, button, icon = 1, 1, 1, 1
 					
-					for i = 1, #row.row_widgets do
-					
-						row.row_widgets [i].index = real_index
-						
-						if (panel.rows [i].type == "icon") then
+					for index, t in ipairs (panel.rows) do
+						if (not t.hidden) then
+							if (t.type == "text") then
+								local fontstring = row.text_inuse [text]
+								text = text + 1
+								fontstring:SetText (results [index])
+								fontstring.index = real_index
+								fontstring:Show()
 
-							local result = results [i]:gsub (".-%\\", "")
-							row.row_widgets [i]._icon.texture = results [i]
-						
-						elseif (panel.rows [i].type == "button") then
-						
-							if (type (results [i]) == "table") then
+							elseif (t.type == "entry") then
+								local entrywidget = row.entry_inuse [entry]
+								entry = entry + 1
+								entrywidget:SetText (results [index])
+								entrywidget.index = real_index
+								entrywidget:Show()
+								
+							elseif (t.type == "button") then
+								local buttonwidget = row.button_inuse [button]
+								button = button + 1
+								buttonwidget.index = real_index
 							
-								if (results [i].text) then
-									row.row_widgets [i]:SetText (results [i].text)
+								local func = function()
+									t.func (real_index, index)
+									panel:Refresh()
+								end
+								buttonwidget:SetClickFunction (func)
+							
+								if (type (results [index]) == "table") then
+									if (results [index].text) then
+										buttonwidget:SetText (results [index].text)
+									end
+									
+									if (results [index].icon) then
+										buttonwidget._icon:SetTexture (results [index].icon)
+									end
+									
+									if (results [index].func) then
+										buttonwidget:SetClickFunction (results [index].func, real_index, results [index].value)
+									end
+								else
+									buttonwidget:SetText (results [index])
 								end
 								
-								if (results [i].icon) then
-									row.row_widgets [i]._icon:SetTexture (results [i].icon)
-								end
+								buttonwidget:Show()
 								
-								if (results [i].func) then
-									row.row_widgets [i]:SetClickFunction (results [i].func, real_index, results [i].value)
-								end
-
-							else
-								row.row_widgets [i]:SetText (results [i])
+							elseif (t.type == "icon") then
+								local iconwidget = row.icon_inuse [icon]
+								icon = icon + 1
+								
+								iconwidget.line = index
+								iconwidget.index = real_index
+								
+								local result = results [index]:gsub (".-%\\", "")
+								iconwidget._icon.texture = results [index]
+								
+								iconwidget:Show()
 							end
-							
-						else
-							--> text
-							row.row_widgets [i]:SetText (results [i])
-							if (panel.rows [i].type == "entry") then
-								row.row_widgets [i]:SetCursorPosition (0)
-							end
-							
 						end
 					end
-					
+
 				else
 					row:Hide()
-					for i = 1, #row.row_widgets do
-						row.row_widgets [i]:SetText ("")
-						if (panel.rows [i].type == "icon") then
-							row.row_widgets [i]._icon.texture = ""
-						end
-					end
 				end
 			else
 				row:Hide()
-				for i = 1, #row.row_widgets do
-					row.row_widgets [i]:SetText ("")
-					if (panel.rows [i].type == "icon") then
-						row.row_widgets [i]._icon.texture = ""
-					end
-				end
 			end
 		end
 	end
 	
 	function panel:Refresh()
-		local filled_lines = total_lines()
+		local filled_lines = panel._totalfunc (panel)
 		local scroll_total_lines = #panel.scrollframe.lines
 		local line_height = options.rowheight
-		
+		refresh_fillbox (panel.scrollframe)
 		FauxScrollFrame_Update (panel.scrollframe, filled_lines, scroll_total_lines, line_height)
-		refresh_fillbox (panel.scrollframe)
 	end
 	
 	local scrollframe = CreateFrame ("scrollframe", name .. "Scroll", panel.widget, "FauxScrollFrameTemplate")
@@ -706,130 +990,42 @@
 	local size = options.rowheight
 	local amount = math.floor (((h-21) / size))
 	
-	
 	for i = 1, amount do
-	
-		local row = DF:NewPanel (panel, nil, "$parentRow_" .. i, nil, 1, size)
-		row.backdrop = {bgFile = [[Interface\DialogFrame\UI-DialogBox-Background]]}
+		local row = CreateFrame ("frame", panel:GetName() .. "Row_" .. i, panel.widget)
+		row:SetSize (1, size)
 		row.color = {1, 1, 1, .2}
+		
+		row:SetBackdrop ({bgFile = [[Interface\Tooltips\UI-Tooltip-Background]]})
+		
+		if (i%2 == 0) then
+			row:SetBackdropColor (.5, .5, .5, 0.2)
+		else
+			row:SetBackdropColor (1, 1, 1, 0.00)
+		end
+		
 		row:SetPoint ("topleft", scrollframe, "topleft", 0, (i-1) * size * -1)
 		row:SetPoint ("topright", scrollframe, "topright", 0, (i-1) * size * -1)
 		tinsert (scrollframe.lines, row)
 		
-		row.row_widgets = {}
+		row.text_available = {}
+		row.text_inuse = {}
+		row.text_total = 0
 		
-		for o = 1, #rows do
+		row.entry_available = {}
+		row.entry_inuse = {}
+		row.entry_total = 0
 		
-			local _type = panel.rows [o].type
-
-			if (_type == "text") then
-			
-				--> create text
-				local text = DF:NewLabel (row, nil, name .. "$parentLabel" .. o, "text" .. o)
-				text:SetPoint ("left", row, "left", anchors [o], 0)
-				
-				--> insert in the table
-				tinsert (row.row_widgets, text)
-			
-			elseif (_type == "entry") then
-			
-				--> create editbox
-				local editbox = DF:NewTextEntry (row, nil, "$parentEntry" .. o, "entry", panel.rows [o].width, 20, panel.rows [o].func, i, o)
-				editbox.align = "left"
-				editbox:SetHook ("OnEnterPressed", function()
-					editbox.widget.focuslost = true
-					editbox:ClearFocus()
-					editbox.func (editbox.index, editbox.text)
-					return true
-				end) 
-				editbox:SetPoint ("left", row, "left", anchors [o], 0)
-				editbox:SetBackdrop ({bgFile = [[Interface\DialogFrame\UI-DialogBox-Background]], edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", edgeSize = 1})
-				editbox:SetBackdropColor (1, 1, 1, 0.1)
-				editbox:SetBackdropBorderColor (1, 1, 1, 0.1)
-				editbox.editbox.current_bordercolor = {1, 1, 1, 0.1}
-				
-				--> insert in the table
-				tinsert (row.row_widgets, editbox)
-			
-			elseif (_type == "button") then
-			
-				--> create button
-				local button = DF:NewButton (row, nil, "$parentButton" .. o, "button", panel.rows [o].width, 20)
-				
-				local func = function()
-					panel.rows [o].func (button.index, o)
-					panel:Refresh()
-				end
-				button:SetClickFunction (func)
-				
-				button:SetPoint ("left", row, "left", anchors [o], 0)
-				
-				--> create icon and the text
-				local icon = DF:NewImage (button, nil, 20, 20)
-				local text = DF:NewLabel (button)
-				
-				button._icon = icon
-				button._text = text
-
-				button:SetHook ("OnEnter", button_on_enter)
-				button:SetHook ("OnLeave", button_on_leave)
-
-				if (panel.rows [o].icon) then
-					icon.texture = panel.rows [o].icon
-					if (panel.rows [o].iconalign) then
-						if (panel.rows [o].iconalign == "center") then
-							icon:SetPoint ("center", button, "center")
-						elseif (panel.rows [o].iconalign == "right") then
-							icon:SetPoint ("right", button, "right")
-						end
-					else
-						icon:SetPoint ("left", button, "left")
-					end
-				end
-				
-				if (panel.rows [o].name and not panel.rows [o].notext) then
-					text:SetPoint ("left", icon, "right", 2, 0)
-					text.text = panel.rows [o].name
-				end
-
-				--> inser in the table
-				tinsert (row.row_widgets, button)
-			
-			elseif (_type == "icon") then
-			
-				--> create button and icon
-				local iconbutton = DF:NewButton (row, nil, "$parentIconButton" .. o, "iconbutton", 22, 20)
-				iconbutton:InstallCustomTexture()
-				
-				iconbutton:SetHook ("OnEnter", button_on_enter)
-				iconbutton:SetHook ("OnLeave", button_on_leave)
-				
-				--iconbutton:InstallCustomTexture()
-				local icon = DF:NewImage (iconbutton, nil, 20, 20, "artwork", nil, "_icon", "$parentIcon" .. o)
-				iconbutton._icon = icon
-				
-				iconbutton:SetPoint ("left", row, "left", anchors [o] + ( (panel.rows [o].width - 22) / 2), 0)
-				icon:SetPoint ("center", iconbutton, "center", 0, 0)
-				
-				--> set functions
-				local function iconcallback (texture)
-					iconbutton._icon.texture = texture
-					panel.rows [o].func (iconbutton.index, texture)
-				end
-				
-				iconbutton:SetClickFunction (function()
-					DF:IconPick (iconcallback, true)
-					return true
-				end)
-				
-				--> insert in the table
-				tinsert (row.row_widgets, iconbutton)
-				
-			end
-
-		end
+		row.button_available = {}
+		row.button_inuse = {}
+		row.button_total = 0
+		
+		row.icon_available = {}
+		row.icon_inuse = {}
+		row.icon_total = 0
 	end
 	
+	panel.AlignRows (panel)
+	
 	return panel
 end
 
@@ -871,7 +1067,7 @@
 end
 
 ------------icon pick
-function DF:IconPick (callback, close_when_select)
+function DF:IconPick (callback, close_when_select, param1, param2)
 
 	if (not DF.IconPickFrame) then 
 	
@@ -980,7 +1176,7 @@
 		DF.IconPickFrame.buttons = {}
 		
 		local OnClickFunction = function (self) 
-			DF.IconPickFrame.callback (self.icon:GetTexture())
+			DF.IconPickFrame.callback (self.icon:GetTexture(), DF.IconPickFrame.param1, DF.IconPickFrame.param2)
 			if (DF.IconPickFrame.click_close) then
 				close_button:Click()
 			end
@@ -1202,6 +1398,8 @@
 		
 	end
 	
+	DF.IconPickFrame.param1, DF.IconPickFrame.param2 = param1, param2
+	
 	DF.IconPickFrame:Show()
 	DF.IconPickFrameScroll.update (DF.IconPickFrameScroll)
 	DF.IconPickFrame.callback = callback or DF.IconPickFrame.emptyFunction
@@ -1324,6 +1522,21 @@
 	self.Title:SetText (text or "")
 end
 
+local Panel1PxSetLocked= function (self, lock_state)
+	if (type (lock_state) ~= "boolean") then
+		return
+	end
+	if (lock_state) then
+		-- lock it
+		self.IsLocked = false
+		Panel1PxOnClickLock (self.Lock)
+	else
+		-- unlockit
+		self.IsLocked = true
+		Panel1PxOnClickLock (self.Lock)
+	end
+end
+
 local Panel1PxReadConfig = function (self)
 	local db = self.db
 	if (db) then
@@ -1368,6 +1581,10 @@
 	end
 end
 
+local Panel1PxSavePosition= function (self)
+	DF:SavePositionOnScreen (self)
+end
+
 local Panel1PxHasPosition = function (self)
 	local db = self.db
 	if (db) then
@@ -1446,14 +1663,68 @@
 	f.Lock = lock
 	f.Close = close
 	f.HasPosition = Panel1PxHasPosition
+	f.SavePosition = Panel1PxSavePosition
 	
 	f.IsLocked = not f.IsLocked
+	f.SetLocked = Panel1PxSetLocked
 	Panel1PxOnToggleLock (f)
 	
 	return f
 end
 
 ------------------------------------------------------------------------------------------------------------------------------------------------
+-- ~prompt
+function DF:ShowPromptPanel (message, func_true, func_false)
+	
+	if (not DF.prompt_panel) then
+		local f = CreateFrame ("frame", "DetailsFrameworkPrompt", UIParent) 
+		f:SetSize (400, 100)
+		f:SetFrameStrata ("DIALOG")
+		f:SetPoint ("center", UIParent, "center", 0, -300)
+		f:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true})
+		f:SetBackdropColor (0, 0, 0, 0.8)
+		f:SetBackdropBorderColor (0, 0, 0, 1)
+		
+		local button_true = DF:CreateButton (f, nil, 60, 20, "")
+		button_true:SetPoint ("bottomleft", f, "bottomleft", 5, 5)
+		f.button_true = button_true
+
+		local button_false = DF:CreateButton (f, nil, 60, 20, "")
+		button_false:SetPoint ("bottomright", f, "bottomright", -5, 5)
+		f.button_false = button_false
+		
+		button_true:SetClickFunction (function()
+			local my_func = button_true.true_function
+			if (my_func) then
+				local okey, errormessage = pcall (my_func, true)
+				if (not okey) then
+					print ("error:", errormessage)
+				end
+			end
+		end)
+		
+		button_false:SetClickFunction (function()
+			local my_func = button_false.false_function
+			if (my_func) then
+				local okey, errormessage = pcall (my_func, true)
+				if (not okey) then
+					print ("error:", errormessage)
+				end
+			end
+		end)
+		
+		f:Hide()
+		DF.promtp_panel = f
+	end
+	
+	assert (type (func_true) == "function" and type (func_false) == "function", "ShowPromptPanel expects two functions.")
+	
+	DF.promtp_panel.button_true.true_function = func_true
+	DF.promtp_panel.button_false.false_function = func_false
+	
+	DF.promtp_panel:Show()
+end
+------------------------------------------------------------------------------------------------------------------------------------------------
 --> options button -- ~options
 function DF:CreateOptionsButton (parent, callback, name)
 	
@@ -2488,4 +2759,172 @@
 	chart_panel_onresize (f)
 	
 	return f
+end
+
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- ~gframe
+local gframe_on_enter_line = function (self)
+	self:SetBackdropColor (0, 0, 0, 0)
+
+	local parent = self:GetParent()
+	local ball = self.ball
+	ball:SetBlendMode ("ADD")
+	
+	local on_enter = parent._onenter_line
+	if (on_enter) then
+		return on_enter (self, parent)
+	end
+end
+
+local gframe_on_leave_line = function (self)
+	self:SetBackdropColor (0, 0, 0, .6)
+	
+	local parent = self:GetParent()
+	local ball = self.ball
+	ball:SetBlendMode ("BLEND")
+	
+	local on_leave = parent._onleave_line
+	if (on_leave) then
+		return on_leave (self, parent)
+	end
+end
+
+local gframe_create_line = function (self)
+	local index = #self._lines+1
+	
+	local f = CreateFrame ("frame", nil, self)
+	self._lines [index] = f
+	f.id = index
+	f:SetScript ("OnEnter", gframe_on_enter_line)
+	f:SetScript ("OnLeave", gframe_on_leave_line)
+	
+	f:SetWidth (self._linewidth)
+	
+	if (index == 1) then
+		f:SetPoint ("topleft", self, "topleft")
+		f:SetPoint ("bottomleft", self, "bottomleft")
+	else
+		local previous_line = self._lines [index-1]
+		f:SetPoint ("topleft", previous_line, "topright")
+		f:SetPoint ("bottomleft", previous_line, "bottomright")
+	end
+	
+	local t = f:CreateTexture (nil, "background")
+	t:SetWidth (1)
+	t:SetPoint ("topright", f, "topright")
+	t:SetPoint ("bottomright", f, "bottomright")
+	t:SetTexture (1, 1, 1, .1)
+	f.grid = t
+	
+	local b = f:CreateTexture (nil, "overlay")
+	b:SetTexture ([[Interface\COMMON\Indicator-Yellow]])
+	b:SetSize (16, 16)
+	f.ball = b
+	local anchor = CreateFrame ("frame", nil, f)
+	anchor:SetAllPoints (b)
+	b.tooltip_anchor = anchor
+	
+	local spellicon = f:CreateTexture (nil, "artwork")
+	spellicon:SetPoint ("bottom", b, "bottom", 0, 10)
+	spellicon:SetSize (16, 16)
+	f.spellicon = spellicon
+	
+	local timeline = f:CreateFontString (nil, "overlay", "GameFontNormal")
+	timeline:SetPoint ("bottomright", f, "bottomright", -2, 0)
+	_detalhes:SetFontSize (timeline, 8)
+	f.timeline = timeline
+	
+	return f
+end
+
+local gframe_getline = function (self, index)
+	local line = self._lines [index]
+	if (not line) then
+		line = gframe_create_line (self)
+	end
+	return line
+end
+
+local gframe_reset = function (self)
+	for i, line in ipairs (self._lines) do
+		line:Hide()
+	end
+	if (self.GraphLib_Lines_Used) then
+		for i = #self.GraphLib_Lines_Used, 1, -1 do
+			local line = tremove (self.GraphLib_Lines_Used)
+			tinsert (self.GraphLib_Lines, line)
+			line:Hide()
+		end
+	end
+end
+
+local gframe_update = function (self, lines)
+	
+	local g = LibStub:GetLibrary ("LibGraph-2.0")
+	local h = self:GetHeight()/100
+	local amtlines = #lines
+	local linewidth = self._linewidth
+	
+	local max_value = 0
+	for i = 1, amtlines do
+		if (lines [i].value > max_value) then
+			max_value = lines [i].value
+		end
+	end
+	
+	local o = 1
+	local lastvalue = self:GetHeight()/2
+	
+	for i = 1, min (amtlines, self._maxlines) do
+		
+		local data = lines [i]
+
+		local pvalue = data.value / max_value * 100
+		if (pvalue > 98) then
+			pvalue = 98
+		end
+		pvalue = pvalue * h
+	
+		g:DrawLine (self, (o-1)*linewidth, lastvalue, o*linewidth, pvalue, linewidth, {1, 1, 1, 1}, "overlay")
+		lastvalue = pvalue
+
+		local line = self:GetLine (i)
+		line:Show()
+		line.ball:Show()
+		
+		line.ball:SetPoint ("bottomleft", self, "bottomleft", (o*linewidth)-8, pvalue-8)
+		line.spellicon:SetTexture (nil)
+		line.timeline:SetText (data.text)
+		line.timeline:Show()
+		
+		line.data = data
+		
+		o = o + 1
+	end
+	
+end
+
+function DF:CreateGFrame (parent, w, h, linewidth, onenter, onleave, member, name)
+	local f = CreateFrame ("frame", name, parent)
+	f:SetSize (w or 450, h or 150)
+	f.CustomLine = [[Interface\AddOns\Details\Libs\LibGraph-2.0\line]]
+	
+	if (member) then
+		parent [member] = f
+	end
+	
+	f.CreateLine = gframe_create_line
+	f.GetLine = gframe_getline
+	f.Reset = gframe_reset
+	f.UpdateLines = gframe_update
+	
+	f._lines = {}
+	
+	f._onenter_line = onenter
+	f._onleave_line = onleave
+	
+	f._linewidth = linewidth or 50
+	f._maxlines = floor (f:GetWidth() / f._linewidth)
+	
+	return f
 end
\ No newline at end of file
--- a/Libs/DF/picture.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/picture.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,9 +1,10 @@
-
-
 
 local DF = _G ["DetailsFramework"]
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
+
 local _
-
 local _rawset = rawset --> lua local
 local _rawget = rawget --> lua local
 local _setmetatable = setmetatable --> lua local
@@ -245,7 +246,7 @@
 		for funcName, funcAddress in pairs (idx) do 
 			if (not ImageMetaFunctions [funcName]) then
 				ImageMetaFunctions [funcName] = function (object, ...)
-					local x = loadstring ( "return _G."..object.image:GetName()..":"..funcName.."(...)")
+					local x = loadstring ( "return _G['"..object.image:GetName().."']:"..funcName.."(...)")
 					return x (...)
 				end
 			end
--- a/Libs/DF/pictureedit.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/pictureedit.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,7 +1,9 @@
-
-
 
 local DF = _G ["DetailsFramework"]
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
+
 local _
 
 	local window = DF:NewPanel (UIParent, nil, "DetailsFrameworkImageEdit", nil, 100, 100, false)
--- a/Libs/DF/scrollbar.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/scrollbar.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,5 +1,8 @@
 
 local DF = _G ["DetailsFramework"]
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
 
 function DF:CreateScrollBar (master, slave, x, y)
 	return DF:NewScrollBar (master, slave, x, y)
--- a/Libs/DF/slider.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/slider.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,9 +1,10 @@
-
-
 
 local DF = _G ["DetailsFramework"]
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
+
 local _
-
 local _rawset = rawset --> lua local
 local _rawget = rawget --> lua local
 local _setmetatable = setmetatable --> lua local
@@ -966,7 +967,7 @@
 		for funcName, funcAddress in pairs (idx) do 
 			if (not SliderMetaFunctions [funcName]) then
 				SliderMetaFunctions [funcName] = function (object, ...)
-					local x = loadstring ( "return _G."..object.slider:GetName()..":"..funcName.."(...)")
+					local x = loadstring ( "return _G['"..object.slider:GetName().."']:"..funcName.."(...)")
 					return x (...)
 				end
 			end
--- a/Libs/DF/split_bar.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/split_bar.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,9 +1,10 @@
-
-
 
 local DF = _G ["DetailsFramework"]
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
+
 local _
-
 local _rawset = rawset --> lua local
 local _rawget = rawget --> lua local
 local _setmetatable = setmetatable --> lua local
@@ -605,7 +606,7 @@
 			for funcName, funcAddress in pairs (idx) do 
 				if (not SplitBarMetaFunctions [funcName]) then
 					SplitBarMetaFunctions [funcName] = function (object, ...)
-						local x = loadstring ( "return _G."..object.statusbar:GetName()..":"..funcName.."(...)")
+						local x = loadstring ( "return _G['"..object.statusbar:GetName().."']:"..funcName.."(...)")
 						return x (...)
 					end
 				end
--- a/Libs/DF/textentry.lua	Sat Jul 18 17:32:30 2015 -0300
+++ b/Libs/DF/textentry.lua	Tue Aug 11 12:46:46 2015 -0300
@@ -1,9 +1,10 @@
-
-
 
 local DF = _G ["DetailsFramework"]
+if (not DF or not DetailsFrameworkCanLoad) then
+	return 
+end
+
 local _
-
 local _rawset = rawset --> lua local
 local _rawget = rawget --> lua local
 local _setmetatable = setmetatable --> lua local
@@ -538,7 +539,7 @@
 		for funcName, funcAddress in pairs (idx) do 
 			if (not TextEntryMetaFunctions [funcName]) then
 				TextEntryMetaFunctions [funcName] = function (object, ...)
-					local x = loadstring ( "return _G."..object.editbox:GetName()..":"..funcName.."(...)")
+					local x = loadstring ( "return _G['"..object.editbox:GetName().."']:"..funcName.."(...)")
 					return x (...)
 				end
 			end