From 78b825c79d531dacd19d1bb2ea1700d3260aa77c Mon Sep 17 00:00:00 2001
From: Parnic <parnic@parnic.com>
Date: Thu, 21 Oct 2010 02:20:09 +0000
Subject: [PATCH] - added AceGUI-3.0-SharedMediaWidgets support to the font
 selection box and ToT bar texture selection

---
 .pkgmeta                   |  8 +++++---
 IceHUD.lua                 |  7 ++++---
 IceHUD.toc                 |  2 +-
 embeds.xml                 | 37 +++++++++++++++++++------------------
 modules/TargetOfTarget.lua |  7 ++++---
 5 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/.pkgmeta b/.pkgmeta
index 2e2a148..f2517c6 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -25,6 +25,9 @@ externals:
     libs/AceGUI-3.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceGUI-3.0
         tag: latest
+    libs/AceGUI-3.0-SharedMediaWidgets:
+        url: svn://svn.wowace.com/wow/ace-gui-3-0-shared-media-widgets/mainline/trunk/AceGUI-3.0-SharedMediaWidgets
+        tag: latest
     libs/AceAddon-3.0:
         url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceAddon-3.0
         tag: latest
@@ -47,12 +50,11 @@ externals:
         tag: latest
     libs/LibDBIcon-1.0:
         url: svn://svn.wowace.com/wow/libdbicon-1-0/mainline/trunk/LibDBIcon-1.0
-    libs/LibDualSpec-1.0: 
+    libs/LibDualSpec-1.0:
         url: git://git.wowace.com/wow/libdualspec-1-0/mainline.git
         tag: latest
 
 optional-dependencies:
     - libdogtag-3-0
     - libdogtag-unit-3-0
-    - librangecheck-2-0
-    - libhealcomm-4-0
\ No newline at end of file
+    - librangecheck-2-0
\ No newline at end of file
diff --git a/IceHUD.lua b/IceHUD.lua
index ed1369e..4a7c16f 100644
--- a/IceHUD.lua
+++ b/IceHUD.lua
@@ -373,16 +373,17 @@ Expand "|cffffdc42Module Settings|r", expand PlayerInfo (or TargetInfo for targe
 
 		textSettings = {
 			type = 'select',
+			dialogControl = "LSM30_Font",
 			name = L["Font"],
 			desc = L["IceHUD Font"],
 			order = 19,
 			get = function(info)
-				return IceHUD:GetSelectValue(info, IceHUD.IceCore:GetFontFamily())
+				return IceHUD.IceCore:GetFontFamily()
 			end,
 			set = function(info, value)
-				IceHUD.IceCore:SetFontFamily(info.option.values[value])
+				IceHUD.IceCore:SetFontFamily(value)
 			end,
-			values = SML:List('font'),
+			values = AceGUIWidgetLSMlists.font,
 			order = 94.75,
 		},
 
diff --git a/IceHUD.toc b/IceHUD.toc
index 7827b1a..f132b45 100644
--- a/IceHUD.toc
+++ b/IceHUD.toc
@@ -5,7 +5,7 @@
 ## Notes: Another HUD addon
 ## Version: @project-version@ (Revision: @project-revision@)
 ## SavedVariables: IceCoreDB
-## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibDualSpec-1.0, LibDBIcon-1.0
+## OptionalDeps: Ace3, LibSharedMedia-3.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibRangeCheck-2.0, LibDualSpec-1.0, LibDBIcon-1.0, AceGUI-3.0-SharedMediaWidgets
 ## X-Category: HUDs
 ## X-Website: http://www.wowace.com/projects/ice-hud/
 
diff --git a/embeds.xml b/embeds.xml
index 56d4c03..e967e67 100644
--- a/embeds.xml
+++ b/embeds.xml
@@ -1,20 +1,21 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
-<Script file="libs\LibStub\LibStub.lua"/>
-<Script file="libs\CallbackHandler-1.0\CallbackHandler-1.0.lua"/>
-<Include file="libs\AceDB-3.0\AceDB-3.0.xml"/>
-<Include file="libs\AceDBOptions-3.0\AceDBOptions-3.0.xml"/>
-<Include file="libs\AceGUI-3.0\AceGUI-3.0.xml"/>
-<Include file="libs\AceConfig-3.0\AceConfig-3.0.xml"/>
-<Include file="libs\AceEvent-3.0\AceEvent-3.0.xml"/>
-<Include file="libs\AceTimer-3.0\AceTimer-3.0.xml"/>
-<Include file="libs\AceConsole-3.0\AceConsole-3.0.xml"/>
-<Include file="libs\AceAddon-3.0\AceAddon-3.0.xml"/>
-<Include file="libs\AceLocale-3.0\AceLocale-3.0.xml"/>
-<Include file="libs\LibDogTag-3.0\lib.xml"/>
-<Include file="libs\LibDogTag-Unit-3.0\lib.xml"/>
-<Script file="libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
-<Include file="libs\LibSharedMedia-3.0\lib.xml"/>
-<Script file="LibDataBroker-1.1.lua"/>
-<Script file="libs\LibDBIcon-1.0\LibDBIcon-1.0.lua"/>
-<Script file="libs\LibDualSpec-1.0\LibDualSpec-1.0.lua"/>
+	<Script file="libs\LibStub\LibStub.lua"/>
+	<Script file="libs\CallbackHandler-1.0\CallbackHandler-1.0.lua"/>
+	<Include file="libs\AceDB-3.0\AceDB-3.0.xml"/>
+	<Include file="libs\AceDBOptions-3.0\AceDBOptions-3.0.xml"/>
+	<Include file="libs\AceGUI-3.0\AceGUI-3.0.xml"/>
+	<Include file="libs\AceGUI-3.0-SharedMediaWidgets\widget.xml"/>
+	<Include file="libs\AceConfig-3.0\AceConfig-3.0.xml"/>
+	<Include file="libs\AceEvent-3.0\AceEvent-3.0.xml"/>
+	<Include file="libs\AceTimer-3.0\AceTimer-3.0.xml"/>
+	<Include file="libs\AceConsole-3.0\AceConsole-3.0.xml"/>
+	<Include file="libs\AceAddon-3.0\AceAddon-3.0.xml"/>
+	<Include file="libs\AceLocale-3.0\AceLocale-3.0.xml"/>
+	<Include file="libs\LibDogTag-3.0\lib.xml"/>
+	<Include file="libs\LibDogTag-Unit-3.0\lib.xml"/>
+	<Script file="libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
+	<Include file="libs\LibSharedMedia-3.0\lib.xml"/>
+	<Script file="LibDataBroker-1.1.lua"/>
+	<Script file="libs\LibDBIcon-1.0\LibDBIcon-1.0.lua"/>
+	<Script file="libs\LibDualSpec-1.0\LibDualSpec-1.0.lua"/>
 </Ui>
diff --git a/modules/TargetOfTarget.lua b/modules/TargetOfTarget.lua
index 8094912..3ebd3a7 100644
--- a/modules/TargetOfTarget.lua
+++ b/modules/TargetOfTarget.lua
@@ -126,19 +126,20 @@ function TargetOfTarget.prototype:GetOptions()
 
 	opts["texture"] = {
 		type = 'select',
+		dialogControl = "LSM30_Statusbar",
 		name = L["Texture"],
 		desc = L["ToT frame texture"],
 		get = function(info)
-			return IceHUD:GetSelectValue(info, self.moduleSettings.texture)
+			return self.moduleSettings.texture
 		end,
 		set = function(info, v)
-			self.moduleSettings.texture = info.option.values[v]
+			self.moduleSettings.texture = v
 			self:Redraw()
 		end,
 		disabled = function()
 			return not self.moduleSettings.enabled
 		end,
-		values = SML:List(SML.MediaType.STATUSBAR),
+		values = AceGUIWidgetLSMlists.statusbar,
 		order = 35
 	}