Quantcast

Removed references to PeriodicTable.

pschifferer [02-28-09 - 03:38]
Removed references to PeriodicTable.
Added a default icon to the main frame.
Changed the way the default tradeskill window is hidden.
Filename
CauldronMain.lua
CauldronMain.xml
CauldronMainUI.lua
CauldronTradeskill.lua
diff --git a/CauldronMain.lua b/CauldronMain.lua
index a8df139..976df4e 100644
--- a/CauldronMain.lua
+++ b/CauldronMain.lua
@@ -21,9 +21,9 @@ Cauldron.vars = {

 Cauldron.libs = {};
 -- Cauldron.libs.Abacus = LibStub("LibAbacus-3.0");
-Cauldron.libs.PT = LibStub("LibPeriodicTable-3.1");
+-- Cauldron.libs.PT = LibStub("LibPeriodicTable-3.1");

--- Cauldron:ToggleDebugLog(false);
+-- logging
 Cauldron:SetLogLevel(Cauldron.logLevels.INFO);
 --@alpha@
 -- Cauldron:SetLogLevel(Cauldron.logLevels.DEBUG);
@@ -75,7 +75,7 @@ function Cauldron:OnInitialize()
 	-- register slash command with options
 	LibStub("AceConfig-3.0"):RegisterOptionsTable("Cauldron", options, {"cauldron"});

-	-- initialize PT
+	--[[ initialize PT
 	for i=1,GetNumAddOns() do
 		local metadata = GetAddOnMetadata(i, "X-PeriodicTable-3.0-Module");
 		if metadata then
@@ -86,6 +86,7 @@ function Cauldron:OnInitialize()
 		end
 	end
 	collectgarbage();
+	--]]

 	-- let the user know the addon is loaded
 	self:Print(L["Cauldron loaded; version "],Cauldron.version);
diff --git a/CauldronMain.xml b/CauldronMain.xml
index e33d328..3c94dc8 100644
--- a/CauldronMain.xml
+++ b/CauldronMain.xml
@@ -567,6 +567,7 @@
     <Frame name="CauldronFrame" toplevel="true" frameStrata="MEDIUM"
            movable="true" resizable="false" parent="UIParent" enableMouse="true"
            hidden="true">
+        <TitleRegion setAllPoints="true" />
         <Size x="692" y="465" />
         <Anchors>
             <Anchor point="CENTER" />
@@ -575,7 +576,7 @@
         <!-- Window border and background -->
         <Layers>
 			<Layer level="BACKGROUND">
-				<Texture name="CauldronFramePortrait">
+				<Texture name="CauldronFramePortrait" file="Interface\Spellbook\Spellbook-Icon">
 					<Size x="60" y="60"/>
 					<Anchors>
 						<Anchor point="TOPLEFT">
diff --git a/CauldronMainUI.lua b/CauldronMainUI.lua
index 1f02c2f..c967d13 100644
--- a/CauldronMainUI.lua
+++ b/CauldronMainUI.lua
@@ -30,9 +30,9 @@ function Cauldron:Frame_Show()

 		-- hide the original tradeskill frame
 		TradeSkillFrame:SetAlpha(0);
---		TradeSkillFrame:ClearAllPoints();
---		TradeSkillFrame:SetPoint("TOPLEFT", 0, 900);
-		CauldronFrame:SetPoint("TOPLEFT", TradeSkillFrame, "TOPLEFT", 0, 0);
+		TradeSkillFrame:ClearAllPoints();
+		TradeSkillFrame:SetPoint("TOPLEFT", 0, 900);
+--		CauldronFrame:SetPoint("TOPLEFT", TradeSkillFrame, "TOPLEFT", 0, 0);
 	end

  	self:RegisterMessage("Cauldron_Update", "OnCauldronUpdate");
diff --git a/CauldronTradeskill.lua b/CauldronTradeskill.lua
index fa5672d..5e77137 100644
--- a/CauldronTradeskill.lua
+++ b/CauldronTradeskill.lua
@@ -156,7 +156,9 @@ function Cauldron:UpdateSkills()

 					table.insert(skillDB.recipes[name].reagents, r);

-					keywords = keywords..","..rName;
+					if rName then
+						keywords = keywords..","..rName;
+					end
 				end

 				-- fill in the keywords db entry