--- a/CyborgMMO7.lua	Thu May 24 16:13:28 2012 +0000
+++ b/CyborgMMO7.lua	Mon May 28 15:54:52 2012 +0000
@@ -22,7 +22,8 @@
 
 
 
-function LoadStrings(self)
+function CyborgMMO_LoadStrings(self)
+--~ 	msg("LoadStrings("..self:GetName()..") = "..StringTable[self:GetName()])
 	self:SetText(StringTable[self:GetName()]);
 end
 
@@ -33,8 +34,8 @@
 local Settings = nil;
 
 
-function CyborgMiniMapButton_Reposition(pos)
-	CyborgMiniMapFrame:SetPoint("TOPLEFT",
+function CyborgMMO_MiniMapButtonReposition(pos)
+	CyborgMMO_MiniMapFrame:SetPoint("TOPLEFT",
 		"Minimap",
 		"TOPLEFT",
 		52-(80*cos(pos)),
@@ -42,7 +43,7 @@
 end
 
 
-function CyborgMiniMapButton_OnUpdate()
+function CyborgMMO_MiniMapButtonOnUpdate()
 
 	local xpos,ypos = GetCursorPosition()
 	local xmin,ymin = Minimap:GetLeft(), Minimap:GetBottom()
@@ -57,14 +58,14 @@
 	end
 
 
-	CyborgMiniMapButton_Reposition(degrees)
+	CyborgMMO_MiniMapButtonReposition(degrees)
 end
 
-function MouseModeChange(mode)
-	local MiniMapTexture = getglobal("CyborgMiniMapButton_Icon")
-	local MiniMapGlowTexture = getglobal("CyborgMiniMapButton_IconGlow")
-	local OpenButtonTexture = getglobal("OpenButtonPage".."OpenMainForm"):GetNormalTexture();
-	local OpenButtonGlowTexture = getglobal("OpenButtonPage".."OpenMainForm"):GetHighlightTexture();
+function CyborgMMO_MouseModeChange(mode)
+	local MiniMapTexture = getglobal("CyborgMMO_MiniMapFrameButton_Icon")
+	local MiniMapGlowTexture = getglobal("CyborgMMO_MiniMapFrameButton_IconGlow")
+	local OpenButtonTexture = getglobal("CyborgMMO_OpenButtonPage".."OpenMainForm"):GetNormalTexture();
+	local OpenButtonGlowTexture = getglobal("CyborgMMO_OpenButtonPage".."OpenMainForm"):GetHighlightTexture();
 	if(1==mode) then
 		MiniMapTexture:SetVertexColor(1,0,0,1)
 		--MiniMapGlowTexture:SetVertexColor(1,0.26,0.26,.75);
@@ -83,7 +84,7 @@
 	end
 end
 
-function LoadWowCommands()
+function CyborgMMO_LoadWowCommands()
 	if (ProfileKeyBindings == nil) then
 		ProfileKeyBindings = {}
 		ProfileKeyBindings = InternationalWowCommands[GetLocale()]
@@ -91,26 +92,26 @@
 	WowCommands = ProfileKeyBindings 
 end
 
-function GetSaveData()
+function CyborgMMO_GetSaveData()
 	if(VarsLoaded) then
 		if (CyborgMMO7SaveData == nil) then
 			CyborgMMO7SaveData = {};
 			CyborgMMO7SaveData[SaveName] = {}
 		end
-		LoadWowCommands()
+		CyborgMMO_LoadWowCommands()
 		return CyborgMMO7SaveData[SaveName];
 	end
 	return nil;
 end
 
-function SetSaveData(data, index)
+function CyborgMMO_SetSaveData(data, index)
 	if(VarsLoaded) then
-		GetSaveData()[index] = data
+		CyborgMMO_GetSaveData()[index] = data
 		ProfileKeyBindings = WowCommands
 	end
 end
 
-function Event(self, event, ...)
+function CyborgMMO_Event(self, event, ...)
     if(event == "VARIABLES_LOADED") then
 		VarsLoaded = true;
     elseif(event == "PLAYER_ENTERING_WORLD") then
@@ -129,18 +130,18 @@
 	if(false == LoadBinding) then
 		if(VarsLoaded) then
 			if(EnteredWorld) then
-				local data = GetSaveData()
+				local data = CyborgMMO_GetSaveData()
 
-				RatPageModel.Instance().LoadData();
+				CyborgMMO_RatPageModel.Instance().LoadData();
 				LoadBinding = true;
 
 				ShowMacroFrame();
 				HideUIPanel(MacroFrame);
 
 
-				SetupModeCallbacks(1);
-				SetupModeCallbacks(2);
-				SetupModeCallbacks(3);
+				CyborgMMO_SetupModeCallbacks(1);
+				CyborgMMO_SetupModeCallbacks(2);
+				CyborgMMO_SetupModeCallbacks(3);
 
 
 				--Reload Slider values:
@@ -154,85 +155,82 @@
 
 				Settings = data["Settings"];
 
-				CyborgSizeSlider:SetValue(Settings["Cyborg"]);
-				SetOpenButtonSize(Settings["Cyborg"])
-				PluginSizeSlider:SetValue(Settings["Plugin"]);
-				SetMainPageSize(Settings["Plugin"]);
-
-				if(Settings["MiniMapButton"] == false) then
-					CyborgMiniMapButton:Hide();
-				end
+				CyborgMMO_OptionPageCyborgSizeSlider:SetValue(Settings["Cyborg"]);
+				CyborgMMO_SetOpenButtonSize(Settings["Cyborg"])
+				CyborgMMO_OptionPagePluginSizeSlider:SetValue(Settings["Plugin"]);
+				CyborgMMO_SetMainPageSize(Settings["Plugin"]);
+				
+				CyborgMMO_SetMiniMapButton(Settings["MiniMapButton"])
+				CyborgMMO_SetCyborgHeadButton(Settings["CyborgButton"])
 
 				local xmin,ymin = Minimap:GetLeft(), Minimap:GetBottom()
-				CyborgMiniMapButton_Reposition(math.deg(math.atan2(ymin,xmin)))
+				CyborgMMO_MiniMapButtonReposition(math.deg(math.atan2(ymin,xmin)))
 				-- Close the main window for now
-				Close();
+				CyborgMMO_Close();
 			end
 		end
 	end
 end
 
-function SetDefaultSettings()
-	OpenButtonPageOpenMainForm:ClearAllPoints();
-	MainPage:ClearAllPoints();
-	OpenButtonPageOpenMainForm:SetPoint("LEFT", UIParent, "LEFT", 0, 0);
-	MainPage:SetPoint("LEFT", UIParent, "LEFT", 0, 0);
+function CyborgMMO_SetDefaultSettings()
+	CyborgMMO_OpenButtonPageOpenMainForm:ClearAllPoints();
+	CyborgMMO_MainPage:ClearAllPoints();
+	CyborgMMO_OpenButtonPageOpenMainForm:SetPoint("LEFT", UIParent, "LEFT", 0, 0);
+	CyborgMMO_MainPage:SetPoint("LEFT", UIParent, "LEFT", 0, 0);
 
-	SetOpenButtonSize(0.75);
-	SetMainPageSize(0.75);
-	MiniMapButton:SetChecked();
-	SetMiniMapButton(true);
-	CyborgButton:SetChecked();
-	SetCyborgHeadButton(true);
+	CyborgMMO_SetOpenButtonSize(0.75);
+	CyborgMMO_SetMainPageSize(0.75);
+	CyborgMMO_SetMiniMapButton(true);
+	CyborgMMO_SetCyborgHeadButton(true);
 end
 
-function SetupModeCallbacks(modeNum)
 
+function CyborgMMO_SetupModeCallbacks(modeNum)
 	fn = function()
-		MouseModeChange(modeNum);
-		RatPageModel.Instance().SetMode(modeNum)
+		CyborgMMO_MouseModeChange(modeNum);
+		CyborgMMO_RatPageModel.Instance().SetMode(modeNum)
 	end
 
-	local buttonFrame, parentFrame, name = CallbackFactory.Instance().AddCallback(fn);
+	local buttonFrame, parentFrame, name = CyborgMMO_CallbackFactory.Instance().AddCallback(fn);
 	if(1 ~= SetOverrideBindingClick(parentFrame, true, Mode[modeNum], name, "LeftButton")) then
 		msg("Failed to Bind modeChange");
 	end
 end
 
-function Loaded()
-    MainPage:RegisterEvent("VARIABLES_LOADED");
-	MainPage:RegisterEvent("PLAYER_ENTERING_WORLD");
-    MainPage:RegisterEvent("PLAYER_ENTER_COMBAT");
+function CyborgMMO_Loaded()
+    CyborgMMO_MainPage:RegisterEvent("VARIABLES_LOADED");
+		CyborgMMO_MainPage:RegisterEvent("PLAYER_ENTERING_WORLD");
+    CyborgMMO_MainPage:RegisterEvent("PLAYER_ENTER_COMBAT");
 end
 
-function Close()
-    MainPage:Hide();
+function CyborgMMO_Close()
+    CyborgMMO_MainPage:Hide();
 	if(Settings["CyborgButton"] == true) then
-		OpenButtonPage:Show();
+		CyborgMMO_OpenButtonPage:Show();
 	end
 end
 
-function Open()
-	MainPage:Show();
-	RatQuickPage:Hide();
+function CyborgMMO_Open()
+	CyborgMMO_MainPage:Show();
+	CyborgMMO_RatQuickPage:Hide();
 	if(Settings["CyborgButton"] == true) then
-		OpenButtonPage:Show();
+		CyborgMMO_OpenButtonPage:Show();
 	end
 end
 
-function IsOpen()
-	if(MainPage:IsVisible() == 1) then
+function CyborgMMO_IsOpen()
+	if(CyborgMMO_MainPage:IsVisible() == 1) then
 		return true;
 	else
 		return false;
 	end
 end
 
-function Toggle()
-	if(IsOpen()) then
-		Close();
+function CyborgMMO_Toggle()
+	if(CyborgMMO_IsOpen()) then
+		CyborgMMO_Close();
 	else
-		Open();
+		CyborgMMO_Open();
 	end
 end
 
@@ -241,49 +239,52 @@
 	SendChatMessage(m, "CHANNEL", nil, id);
 end
 
-function SetMainPageSize(percent)
+function CyborgMMO_SetMainPageSize(percent)
 	if(VarsLoaded) then
 		if(EnteredWorld) then
-			MainPage:SetScale(percent);
+			CyborgMMO_MainPage:SetScale(percent);
 			Settings["Plugin"] = percent;
-			local data = GetSaveData()
+			local data = CyborgMMO_GetSaveData()
 			data["Settings"] = Settings
-			PluginSizeSlider:SetValue(percent);
+			CyborgMMO_OptionPagePluginSizeSlider:SetValue(percent);
 		end
 	end
 end
 
-function SetOpenButtonSize(percent)
+function CyborgMMO_SetOpenButtonSize(percent)
 	if(VarsLoaded) then
 		if(EnteredWorld) then
-			OpenButtonPage:SetScale(percent)
+			CyborgMMO_OpenButtonPage:SetScale(percent)
 			Settings["Cyborg"] = percent;
-			local data = GetSaveData()
+			local data = CyborgMMO_GetSaveData()
 			data["Settings"] = Settings
-			CyborgSizeSlider:SetValue(percent);
+			CyborgMMO_OptionPageCyborgSizeSlider:SetValue(percent);
 		end
 	end
 end
 
-function SetCyborgHeadButton(boolVal)
+function CyborgMMO_SetCyborgHeadButton(boolVal)
 	Settings["CyborgButton"] = boolVal;
+	CyborgMMO_OptionPageCyborgButton:SetChecked(boolVal);
 	if(Settings["CyborgButton"] == true) then
-		Close();
+		CyborgMMO_Close();
 	else
-		OpenButtonPage:Hide();
+		CyborgMMO_OpenButtonPage:Hide();
 	end
-	local data = GetSaveData()
+	local data = CyborgMMO_GetSaveData()
 	data["Settings"] = Settings
 end
 
-function SetMiniMapButton(boolVal)
-	Settings["MiniMapButton"] = boolVal;
+function CyborgMMO_SetMiniMapButton(boolVal)
+	Settings["MiniMapButton"] = boolVal
+	Settings["MiniMapButton"] = boolVal
+	CyborgMMO_OptionPageMiniMapButton:SetChecked(boolVal)
 	if(Settings["MiniMapButton"] == true) then
-		CyborgMiniMapButton:Show();
+		CyborgMMO_MiniMapFrameButton:Show()
 	else
-		CyborgMiniMapButton:Hide();
+		CyborgMMO_MiniMapFrameButton:Hide()
 	end
-	local data = GetSaveData()
+	local data = CyborgMMO_GetSaveData()
 	data["Settings"] = Settings
 end