0
@@ -7,8 +7,8 @@ if not ControlFreak then return end
0
 --      Locals      --
0
 ----------------------
0
 
0
-local ww = LibStub("WidgetWarlock-Alpha1")
0
 local tekcheck = LibStub("tekKonfig-Checkbox")
0
+local tekslider = LibStub("tekKonfig-Slider")
0
 local GAP = 8
0
 
0
 
0
@@ -37,9 +37,9 @@ frame:SetScript("OnShow", function(frame)
0
   showtip:SetChecked(ControlFreak.db.char.showtooltip)
0
 
0
 
0
-	local threshslider, threshslidertext, threashsliderlow = ww:SummonSlider(frame, "Break Threshold: "..ControlFreak.db.char.breakthreshold.." sec", 0, 10, "LEFT", frame, "TOP", GAP, 0)
0
-	threshslider:SetPoint("TOP", lockpos, "TOP", 0, -15)
0
-	ww:EnslaveTooltip(threshslider, "Time (in seconds) before spell breaks to unfade frame.")
0
+	local threshslider, threshslidertext, threshcontainer = tekslider.new(frame, "Break Threshold: "..ControlFreak.db.char.breakthreshold.." sec", 0, 10, "LEFT", frame, "TOP", GAP, 0)
0
+	threshcontainer:SetPoint("TOP", lockpos, "TOP", 0, 0)
0
+	threshslider.tiptext = "Time (in seconds) before spell breaks to unfade frame."
0
   threshslider:SetValue(ControlFreak.db.char.breakthreshold)
0
   threshslider:SetValueStep(1)
0
   threshslider:SetScript("OnValueChanged", function()
0
@@ -49,9 +49,9 @@ frame:SetScript("OnShow", function(frame)
0
 
0
 
0
   local alpha = math.floor(ControlFreak.db.char.alpha*100 + .5)
0
-	local alphaslider, alphaslidertext, alphasliderlow = ww:SummonSlider(frame, "Alpha: "..alpha.."%", "0%", "100%", "TOP", threashsliderlow, "BOTTOM", 0, -GAP-10)
0
-	alphaslider:SetPoint("LEFT", threshslider, "LEFT")
0
-	ww:EnslaveTooltip(alphaslider, "Alpha level to fade frame to when focus is controlled, dead, or not set.")
0
+	local alphaslider, alphaslidertext = tekslider.new(frame, "Alpha: "..alpha.."%", "0%", "100%", "TOP", threshcontainer, "BOTTOM", 0, -GAP)
0
+--~ 	alphaslider:SetPoint("LEFT", threshslider, "LEFT")
0
+	alphaslider.tiptext = "Alpha level to fade frame to when focus is controlled, dead, or not set."
0
   alphaslider:SetValue(ControlFreak.db.char.alpha)
0
   alphaslider:SetValueStep(0.05)
0
   alphaslider:SetScript("OnValueChanged", function()
0
@@ -62,9 +62,8 @@ frame:SetScript("OnShow", function(frame)
0
   end)
0
 
0
 
0
-	local function OnShow(frame) ww.FadeIn(frame, 0.5) end
0
-	frame:SetScript("OnShow", OnShow)
0
-	OnShow(frame)
0
+	frame:SetScript("OnShow", LibStub("tekKonfig-FadeIn").FadeIn)
0
+	LibStub("tekKonfig-FadeIn").FadeIn(frame)
0
 end)
0
 
0
 InterfaceOptions_AddCategory(frame)

0
@@ -21,7 +21,7 @@ frame.parent = "Control Freak"
0
 frame:Hide()
0
 frame:SetScript("OnShow", function(frame)
0
   local ControlFreak = ControlFreak
0
-	local title, subtitle = LibStub("tekKonfig-Heading").new(frame, "Macro Profile", "These controls let you select a different macro, or create your own.  To reset a default profile you've changed, just delete it!")
0
+	local title, subtitle = LibStub("tekKonfig-Heading").new(frame, "Control Freak - Macro Profile", "These controls let you select a different macro, or create your own.  To reset a default profile you've changed, just delete it!")
0
 
0
 
0
   local currentlabel = ww:SummonFontString(frame, "OVERLAY", "GameFontNormal", "Current profile:", "TOPLEFT", subtitle, "BOTTOMLEFT", -2, -GAP)
0
@@ -53,6 +53,7 @@ frame:SetScript("OnShow", function(frame)
0
   local rows = {}
0
   local offset, selectedprofile, proflies = 0
0
   local function UpdateRows()
0
+		table.sort(profiles)
0
     for i,row in ipairs(rows) do
0
       local profile = profiles[i + offset]
0
       if profile then
0
@@ -108,6 +109,7 @@ frame:SetScript("OnShow", function(frame)
0
     local profile = selectedprofile
0
     ControlFreak.db:SetProfile(profile)
0
     current:SetText(profile)
0
+		selectedprofile = nil
0
     ToggleButtons()
0
     UpdateRows()
0
   end)
0
@@ -141,8 +143,9 @@ frame:SetScript("OnShow", function(frame)
0
   ww:EnslaveTooltip(deletebutton, "Delete the selected profile.  Default profiles will reset to their original settings when deleted.")
0
   ww:EnslaveTooltip(createbutton, "Duplicate the current profile into a new profile.")
0
 
0
+	local fade = LibStub("tekKonfig-FadeIn").FadeIn
0
   local function OnShow(frame)
0
-		ww.FadeIn(frame, 0.5)
0
+		fade(frame)
0
     profiles = ControlFreak.db:GetProfiles()
0
     UpdateRows()
0
   end

0
@@ -28,7 +28,7 @@ frame.name = "Macro"
0
 frame:Hide()
0
 frame:SetScript("OnShow", function(frame)
0
   local ControlFreak = ControlFreak
0
-	local title, subtitle = LibStub("tekKonfig-Heading").new(frame, "Macro", "These controls let you customize the macro, creature types it applies to, and the debuffs to watch.")
0
+	local title, subtitle = LibStub("tekKonfig-Heading").new(frame, "Control Freak - Macro", "These controls let you customize the macro, creature types it applies to, and the debuffs to watch.")
0
 
0
 
0
   local checkgrouplabel = ww:SummonFontString(frame, "OVERLAY", "GameFontHighlightSmall", "Creature Types", "TOPLEFT", subtitle, "BOTTOMLEFT", -2 + EDGEGAP, -GAP)
0
@@ -63,7 +63,6 @@ frame:SetScript("OnShow", function(frame)
0
 
0
 
0
   local macrolabel = ww:SummonFontString(frame, "OVERLAY", "GameFontNormalSmall", "Macro", "TOPLEFT", debufflabel, "BOTTOMLEFT", 0, -GAP)
0
---~ 	macrolabel:SetPoint("TOP", debuff, "BOTTOM", 0, -5)
0
   local editbox = CreateFrame("EditBox", nil, frame)
0
   editbox:SetPoint("TOP", macrolabel, "BOTTOM", 0, -5)
0
   editbox:SetPoint("LEFT", EDGEGAP/3, 0)

0
@@ -21,6 +21,9 @@ OptionHouse.lua
0
 
0
 tekKonfigHeading.lua
0
 tekKonfigCheckbox.lua
0
+tekKonfigSlider.lua
0
+tekKonfigFadeIn.lua
0
+
0
 WidgetWarlock\WidgetWarlock.xml
0
 
0
 Locale.lua