diff OptionPage.xml @ 4:d186f8cd5000

Renamed functions to avoid conflicts
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Mon, 28 May 2012 15:54:52 +0000
parents 461854a2849c
children 6cb9a2936580
line wrap: on
line diff
--- a/OptionPage.xml	Thu May 24 16:13:28 2012 +0000
+++ b/OptionPage.xml	Mon May 28 15:54:52 2012 +0000
@@ -56,11 +56,11 @@
 	</OnLoad>
 	<OnEvent>
 		if(event == "VARIABLES_LOADED") then
-			GetBindingButtonText(self:GetName());
+			CyborgMMO_GetBindingButtonText(self:GetName());
 		end
 	</OnEvent>
 	<OnClick>
-		BindButton(self:GetName())
+		CyborgMMO_BindButton(self:GetName())
 	</OnClick>
 	</Scripts>
 </Button>
@@ -136,16 +136,16 @@
 		</Frames>
 		<Scripts>
 			<OnLoad>
-				LoadStrings(getglobal(self:GetName().."Name"));
+				CyborgMMO_LoadStrings(getglobal(self:GetName().."Name"));
 			</OnLoad>
 		</Scripts>
 	</Frame>
 
 <!--Custom keybinds -->
-	<Frame name="MouseRebind"  virtual="true">
+	<Frame name="CyborgMMO_MouseRebind"  virtual="true">
 		<Layers>
 			<Layer level="ARTWORK">
-				<FontString name="MouseRebindTitle" inherits="GameFontNormalLarge" text="MMO Keybinds:-">
+				<FontString name="$parentTitle" inherits="GameFontNormalLarge" text="CyborgMMO_MouseRebindTitle">
 					<Anchors>
 						<Anchor point="TOPLEFT">
 							<Offset>
@@ -154,7 +154,7 @@
 						</Anchor>
 					</Anchors>
 				</FontString>
-				<FontString name="Mode1" inherits="GameFontNormal" text="Mode 1">
+				<FontString name="$parentMode1" inherits="GameFontNormal" text="Mode Num">
 					<Anchors>
 						<Anchor point="TOPLEFT">
 							<Offset>
@@ -163,7 +163,7 @@
 						</Anchor>
 					</Anchors>
 				</FontString>
-				<FontString name="Mode2" inherits="GameFontNormal" text="Mode 2">
+				<FontString name="$parentMode2" inherits="GameFontNormal" text="Mode Num">
 					<Anchors>
 						<Anchor point="TOPLEFT">
 							<Offset>
@@ -172,7 +172,7 @@
 						</Anchor>
 					</Anchors>
 				</FontString>
-				<FontString name="Mode3" inherits="GameFontNormal" text="Mode 3">
+				<FontString name="$parentMode3" inherits="GameFontNormal" text="Mode Num">
 					<Anchors>
 						<Anchor point="TOPLEFT">
 							<Offset>
@@ -184,7 +184,7 @@
 			</Layer>
 		</Layers>
 		<Frames>
-			<Frame name="MouseRow1" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow1" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="$parent">
 						<Offset>
@@ -193,108 +193,108 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow2" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow2" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow1">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow1">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow3" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow3" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow2">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow2">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow4" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow4" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow3">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow3">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow5" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow5" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow4">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow4">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow6" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow6" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow5">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow5">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow7" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow7" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow6">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow6">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow8" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow8" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow7">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow7">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow9" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRow9" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow8">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow8">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowA" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRowA" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRow9">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRow9">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowB" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRowB" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRowA">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRowA">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowC" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRowC" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRowB">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRowB">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowD" inherits="CyborgMMO_TemplateButtonRow">
+			<Frame name="$parentMouseRowD" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MouseRowC">
+					<Anchor point="TOPLEFT" relativeTo="$parentMouseRowC">
 						<Offset>
 							<AbsDimension x="0" y="-30" />
 						</Offset>
@@ -302,11 +302,9 @@
 				</Anchors>
 			</Frame>
 		</Frames>
-		<OnLoad>
-		</OnLoad>
 	</Frame>
 
-	<Frame name="OptionPage">
+	<Frame name="CyborgMMO_OptionPage">
 		<Layers>
 			<Layer level="ARTWORK">
 				<FontString name="$parentTitle" inherits="GameFontNormalLarge">
@@ -322,7 +320,7 @@
 		</Layers>
 
 		<Frames>
-			<CheckButton name="MiniMapButton" inherits="UICheckButtonTemplate" checked="true">
+			<CheckButton name="$parentMiniMapButton" inherits="UICheckButtonTemplate" checked="true">
 				<Size>
 					<AbsDimension x="32" y="32"/>
 				</Size>
@@ -348,25 +346,25 @@
 				</Layers>
 				<Scripts>
 					<OnLoad>
-						LoadStrings(getglobal(self:GetName().."Title"));
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
 					</OnLoad>
 					<OnClick>
 						if(self:GetChecked() == 1) then
-							SetMiniMapButton(true)
+							CyborgMMO_SetMiniMapButton(true)
 						else
-							SetMiniMapButton(false)
+							CyborgMMO_SetMiniMapButton(false)
 						end
 					</OnClick>
 				</Scripts>
 			</CheckButton>
 
 
-			<CheckButton name="CyborgButton" inherits="UICheckButtonTemplate" checked="true">
+			<CheckButton name="$parentCyborgButton" inherits="UICheckButtonTemplate" checked="true">
 				<Size>
 					<AbsDimension x="32" y="32"/>
 				</Size>
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="MiniMapButton">
+					<Anchor point="TOPLEFT" relativeTo="$parentMiniMapButton">
 						<Offset>
 							<AbsDimension x="0" y="-30"/>
 						</Offset>
@@ -387,13 +385,13 @@
 				</Layers>
 				<Scripts>
 					<OnLoad>
-						LoadStrings(getglobal(self:GetName().."Title"));
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
 					</OnLoad>
 					<OnClick>
 						if(self:GetChecked() == 1) then
-							SetCyborgHeadButton(true)
+							CyborgMMO_SetCyborgHeadButton(true)
 						else
-							SetCyborgHeadButton(false)
+							CyborgMMO_SetCyborgHeadButton(false)
 						end
 					</OnClick>
 				</Scripts>
@@ -412,15 +410,15 @@
 				</Anchors>
 				<Scripts>
 					<OnLoad>
-						LoadStrings(getglobal(self:GetName()));
+						CyborgMMO_LoadStrings(getglobal(self:GetName()));
 					</OnLoad>
 					<OnClick>
-						SetDefaultSettings();
+						CyborgMMO_SetDefaultSettings();
 					</OnClick>
 				</Scripts>
 			</Button>
 			
-			<Frame name="Rebind" inherits="MouseRebind">
+			<Frame name="$parentRebind" inherits="CyborgMMO_MouseRebind">
 				<Size>
 					<AbsDimension x="45" y="60" />
 				</Size>
@@ -431,9 +429,17 @@
 						</Offset>
 					</Anchor>
 				</Anchors>
+				<Scripts>
+					<OnLoad>
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Mode1"))
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Mode2"))
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Mode3"))
+					</OnLoad>
+				</Scripts>
 			</Frame>
 			
-			<Frame name="CyborgSize">
+			<Frame name="$parentCyborgSize">
 				<Size>
 					<AbsDimension x="180" y="32" />
 				</Size>
@@ -490,19 +496,19 @@
 						</ThumbTexture>
 						<Scripts>
 							<OnLoad>
-								LoadStrings(getglobal(self:GetName().."Title"))
+								CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
 							</OnLoad>
-							<OnValueChanged>SetOpenButtonSize(self:GetValue())</OnValueChanged>
+							<OnValueChanged>CyborgMMO_SetOpenButtonSize(self:GetValue())</OnValueChanged>
 						</Scripts>
 					</Slider>
 				</Frames>
 			</Frame>
-			<Frame name="PluginSize">
+			<Frame name="$parentPluginSize">
 				<Size>
 					<AbsDimension x="180" y="32" />
 				</Size>
 				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="CyborgSize">
+					<Anchor point="TOPLEFT" relativeTo="$parentCyborgSize">
 						<Offset>
 							<AbsDimension x="200" y="0"/>
 						</Offset>
@@ -554,10 +560,10 @@
 						</ThumbTexture>
 						<Scripts>
 							<OnLoad>
-								LoadStrings(getglobal(self:GetName().."Title"));
+								CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
 							</OnLoad>
 							<OnValueChanged>
-								SetMainPageSize(self:GetValue())
+								CyborgMMO_SetMainPageSize(self:GetValue())
 							</OnValueChanged>
 						</Scripts>
 					  </Slider>
@@ -567,14 +573,14 @@
 
 		<Scripts>
 			<OnLoad>
-				LoadStrings(getglobal(self:GetName().."Title"));
+				CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
 				msg("Loaded Option Page");
-				self = OptionView.new(self);
+				self = CyborgMMO_OptionView.new(self);
 			</OnLoad>
 		</Scripts>
 	</Frame>
 	
-	<Button name="BindingFrame" toplevel="true" parent="UIParent" frameStrata="DIALOG" movable="true" enableMouse="true" hidden="true" enableKeyboard="true">
+	<Button name="CyborgMMO_BindingFrame" toplevel="true" parent="UIParent" frameStrata="DIALOG" movable="true" enableMouse="true" hidden="true" enableKeyboard="true">
     <Size>
       <AbsDimension x="400" y="200"/>
     </Size>
@@ -664,10 +670,6 @@
           </Anchor>
         </Anchors>
         <Scripts>
-				<OnLoad>
-					LoadStrings(getglobal("BindingFrameHeaderText"))
-					LoadStrings(getglobal("BindingFrameExitButton"))
-				</OnLoad>
           <OnClick>
             HideUIPanel(self:GetParent());
           </OnClick>
@@ -677,19 +679,21 @@
 
     <Scripts>
       <OnLoad>
+			CyborgMMO_LoadStrings(getglobal(self:GetName().."HeaderText"))
+			CyborgMMO_LoadStrings(getglobal(self:GetName().."ExitButton"))
         self:RegisterForClicks("AnyUp");
       </OnLoad>
       <OnClick>
-        BindingFrame_OnKeyDown(self, button);
+        CyborgMMO_BindingFrameOnKeyDown(self, button);
       </OnClick>
       <OnKeyDown>
-        BindingFrame_OnKeyDown(self, key);
+        CyborgMMO_BindingFrameOnKeyDown(self, key);
       </OnKeyDown>
       <OnMouseWheel>
         if (delta > 0) then
-          BindingFrame_OnKeyDown(self, "MOUSEWHEELUP");
+          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELUP");
         else
-          BindingFrame_OnKeyDown(self, "MOUSEWHEELDOWN");
+          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELDOWN");
         end
       </OnMouseWheel>
     </Scripts>