# HG changeset patch
# User madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
# Date 1337876008 0
# Node ID 461854a2849c36f8d2500ac2d60e33b850e33f66
# Parent  08c83fa555a539bf013f55dd41e5536af2e3aecf
Update to the layout

diff -r 08c83fa555a5 -r 461854a2849c Localisation.lua
--- a/Localisation.lua	Wed May 23 10:58:25 2012 +0000
+++ b/Localisation.lua	Thu May 24 16:13:28 2012 +0000
@@ -350,32 +350,35 @@
 
 InternationalStringTable = {
 	["enUS"] = {
+		BindingFrameExitButton="Close",
+		BindingFrameHeaderText="Please press the appropriate button",
+		CurrentBinding="Current Binding",
 		CyborgButtonTitle="Cyborg Button",
+		CyborgSizeSliderTitle="Cyborg Head Size",
 		MiniMapButtonTitle="MiniMap Button",
-		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="Default",
-		CyborgSizeSliderTitle="Cyborg Head Size",
-		PluginSizeSliderTitle="Interface Window Size",
-		MouseRowCName="Thumb Anticlockwise",
-		MouseRowDName="Thumb Clockwise",
+		MouseRow10Name="Back Button",
+		MouseRow11Name="Button 3",
+		MouseRow12Name="Thumb Anticlockwise",
+		MouseRow13Name="Thumb Clockwise",
 		MouseRow1Name="Scroll Button",
 		MouseRow2Name="Forwards Button",
 		MouseRow3Name="Button 2",
 		MouseRow4Name="Hat Top",
+		MouseRow5Name="Precision Aim",
+		MouseRow6Name="Hat Bottom",
 		MouseRow7Name="Hat Left",
-		MouseRow5Name="Precision Aim",
 		MouseRow8Name="Hat Right",
-		MouseRow6Name="Hat Bottom",
 		MouseRow9Name="Button 1",
+		MouseRowAName="Back Button",
 		MouseRowBName="Button 3",
-		MouseRowAName="Back Button",
-		MouseRow12Name="Thumb Anticlockwise",
-		MouseRow13Name="Thumb Clockwise",
-		MouseRow11Name="Button 3",
-		MouseRow10Name="Back Button",
-		BindingFrameHeaderText="Please press the appropriate button",
-		BindingFrameExitButton="Close",
-		CurrentBinding="Current Binding",
+		MouseRowCName="Thumb Anticlockwise",
+		MouseRowDName="Thumb Clockwise",
+		OptionPageSetDefaults="Default",
+		OptionPageTitle="Cyborg MMO7",
+		PluginSizeSliderTitle="Interface Window Size",
+		Mode1="Mode 1",
+		Mode2="Mode 2",
+		Mode3="Mode 3"
 	},
 	["frFR"] = {
 		CyborgButtonTitle="Bouton Cyborg",
diff -r 08c83fa555a5 -r 461854a2849c OptionPage.xml
--- a/OptionPage.xml	Wed May 23 10:58:25 2012 +0000
+++ b/OptionPage.xml	Thu May 24 16:13:28 2012 +0000
@@ -20,7 +20,7 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. 
 	-->
-	<FontString name="normalStringTemplate" font="Fonts\FRIZQT__.TTF" text="NoText" virtual="true">
+	<FontString name="CyborgMMO_TemplateNormalString" font="Fonts\FRIZQT__.TTF" text="NoText" virtual="true">
 		<FontHeight>
 			<AbsValue val="10" />
 		</FontHeight>
@@ -33,40 +33,39 @@
 		</Shadow>
 	</FontString>
 
-<Button name="standard" virtual="true">
-				<NormalTexture file="Interface\Buttons\UI-Panel-Button-Up">
-					<TexCoords left="0" right="0.625" top="0" bottom="0.6875" />
-				</NormalTexture>
-				<PushedTexture file="Interface\Buttons\UI-Panel-Button-Down">
-					<TexCoords left="0" right="0.625" top="0" bottom="0.6875" />
-				</PushedTexture>
-				<DisabledTexture file="Interface\Buttons\UI-Panel-Button-Disabled">
-					<TexCoords left="0" right="0.625" top="0" bottom="0.6875" />
-				</DisabledTexture>
-				<HighlightTexture file="Interface\Buttons\UI-Panel-Button-Highlight" alphaMode="ADD">
-					<TexCoords left="0" right="0.625" top="0" bottom="0.6875" />
-				</HighlightTexture>
+<Button name="CyborgMMO_TemplateButton" virtual="true">
+	<NormalTexture file="Interface\Buttons\UI-Panel-Button-Up">
+		<TexCoords left="0" right="0.625" top="0" bottom="0.6875" />
+	</NormalTexture>
+	<PushedTexture file="Interface\Buttons\UI-Panel-Button-Down">
+		<TexCoords left="0" right="0.625" top="0" bottom="0.6875" />
+	</PushedTexture>
+	<DisabledTexture file="Interface\Buttons\UI-Panel-Button-Disabled">
+		<TexCoords left="0" right="0.625" top="0" bottom="0.6875" />
+	</DisabledTexture>
+	<HighlightTexture file="Interface\Buttons\UI-Panel-Button-Highlight" alphaMode="ADD">
+		<TexCoords left="0" right="0.625" top="0" bottom="0.6875" />
+	</HighlightTexture>
 
-				<NormalFont style="GameFontNormal" />
-				<HighlightFont style="GameFontHighlight" />
-				<DisabledFont style="GameFontDisable" />
-				<Scripts>
-				<OnLoad>
-					self:RegisterEvent("VARIABLES_LOADED")
-				</OnLoad>
-				<OnEvent>
-					if(event == "VARIABLES_LOADED") then
-						GetBindingButtonText(self:GetName());
-					end
+	<NormalFont style="GameFontNormal" />
+	<HighlightFont style="GameFontHighlight" />
+	<DisabledFont style="GameFontDisable" />
+	<Scripts>
+	<OnLoad>
+		self:RegisterEvent("VARIABLES_LOADED")
+	</OnLoad>
+	<OnEvent>
+		if(event == "VARIABLES_LOADED") then
+			GetBindingButtonText(self:GetName());
+		end
+	</OnEvent>
+	<OnClick>
+		BindButton(self:GetName())
+	</OnClick>
+	</Scripts>
+</Button>
 
-				</OnEvent>
-				<OnClick>
-					BindButton(self:GetName())
-				</OnClick>
-				</Scripts>
-			</Button>
-
-	<FontString name="SliderTitle" font="Fonts\FRIZQT__.TTF" text="NoText" virtual="true">
+	<FontString name="CyborgMMO_TemplateSliderTitle" font="Fonts\FRIZQT__.TTF" text="NoText" virtual="true">
 		<FontHeight>
 			<AbsValue val="14" />
 		</FontHeight>
@@ -79,18 +78,18 @@
 		</Shadow>
 	</FontString>
 	
-	<Frame name="ButtonRow" virtual="true">
+	<Frame name="CyborgMMO_TemplateButtonRow" virtual="true">
 		<Size>
 			<AbsDimension x="160" y="28" />
 		</Size>
 		
 		<Layers>
 			<Layer level="ARTWORK">
-				<FontString name="$parentName" inherits="GameFontNormalLarge">
+				<FontString name="$parentName" inherits="GameFontNormal">
 					<Anchors>
 						<Anchor point="TOPLEFT" relativeTo="$parent">
 							<Offset>
-								<AbsDimension x="0" y="0" />
+								<AbsDimension x="0" y="-10" />
 							</Offset>
 						</Anchor>
 					</Anchors>
@@ -98,38 +97,38 @@
 			</Layer>
 		</Layers>
 		<Frames>
-		<Button name="$parentMode1" inherits="standard">
+		<Button name="$parentMode1" inherits="CyborgMMO_TemplateButton">
 			<Size>
-				<AbsDimension x="140" y="28" />
+				<AbsDimension x="145" y="28" />
 			</Size>
 			<Anchors>
 				<Anchor point="TOPLEFT" relativeTo="$parent">
 				<Offset>
-					<AbsDimension x="150" y="5"/>
+					<AbsDimension x="135" y="0"/>
 				</Offset>
 				</Anchor>
 			</Anchors>
 		</Button>
-		<Button name="$parentMode2" inherits="standard">
+		<Button name="$parentMode2" inherits="CyborgMMO_TemplateButton">
 			<Size>
-				<AbsDimension x="140" y="28" />
+				<AbsDimension x="145" y="28" />
 			</Size>
 			<Anchors>
 				<Anchor point="TOPLEFT" relativeTo="$parent">
 				<Offset>
-					<AbsDimension x="290" y="5"/>
+					<AbsDimension x="280" y="0"/>
 				</Offset>
 				</Anchor>
 			</Anchors>
 		</Button>
-		<Button name="$parentMode3" inherits="standard">
+		<Button name="$parentMode3" inherits="CyborgMMO_TemplateButton">
 			<Size>
-				<AbsDimension x="140" y="28" />
+				<AbsDimension x="145" y="28" />
 			</Size>
 			<Anchors>
 				<Anchor point="TOPLEFT" relativeTo="$parent">
 				<Offset>
-					<AbsDimension x="430" y="5"/>
+					<AbsDimension x="425" y="0"/>
 				</Offset>
 				</Anchor>
 			</Anchors>
@@ -150,16 +149,42 @@
 					<Anchors>
 						<Anchor point="TOPLEFT">
 							<Offset>
-								<AbsDimension x="-15" y="-15" />
+								<AbsDimension x="-15" y="0" />
 							</Offset>
 						</Anchor>
 					</Anchors>
 				</FontString>
-				
+				<FontString name="Mode1" inherits="GameFontNormal" text="Mode 1">
+					<Anchors>
+						<Anchor point="TOPLEFT">
+							<Offset>
+								<AbsDimension x="147" y="-28" />
+							</Offset>
+						</Anchor>
+					</Anchors>
+				</FontString>
+				<FontString name="Mode2" inherits="GameFontNormal" text="Mode 2">
+					<Anchors>
+						<Anchor point="TOPLEFT">
+							<Offset>
+								<AbsDimension x="282" y="-28" />
+							</Offset>
+						</Anchor>
+					</Anchors>
+				</FontString>
+				<FontString name="Mode3" inherits="GameFontNormal" text="Mode 3">
+					<Anchors>
+						<Anchor point="TOPLEFT">
+							<Offset>
+								<AbsDimension x="427" y="-28" />
+							</Offset>
+						</Anchor>
+					</Anchors>
+				</FontString>
 			</Layer>
 		</Layers>
 		<Frames>
-			<Frame name="MouseRow1" inherits="ButtonRow">
+			<Frame name="MouseRow1" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="$parent">
 						<Offset>
@@ -168,7 +193,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow2" inherits="ButtonRow">
+			<Frame name="MouseRow2" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRow1">
 						<Offset>
@@ -177,7 +202,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow3" inherits="ButtonRow">
+			<Frame name="MouseRow3" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRow2">
 						<Offset>
@@ -186,7 +211,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow4" inherits="ButtonRow">
+			<Frame name="MouseRow4" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRow3">
 						<Offset>
@@ -195,7 +220,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow5" inherits="ButtonRow">
+			<Frame name="MouseRow5" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRow4">
 						<Offset>
@@ -204,7 +229,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow6" inherits="ButtonRow">
+			<Frame name="MouseRow6" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRow5">
 						<Offset>
@@ -213,7 +238,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow7" inherits="ButtonRow">
+			<Frame name="MouseRow7" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRow6">
 						<Offset>
@@ -222,7 +247,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow8" inherits="ButtonRow">
+			<Frame name="MouseRow8" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRow7">
 						<Offset>
@@ -231,7 +256,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRow9" inherits="ButtonRow">
+			<Frame name="MouseRow9" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRow8">
 						<Offset>
@@ -240,7 +265,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowA" inherits="ButtonRow">
+			<Frame name="MouseRowA" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRow9">
 						<Offset>
@@ -249,7 +274,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowB" inherits="ButtonRow">
+			<Frame name="MouseRowB" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRowA">
 						<Offset>
@@ -258,7 +283,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowC" inherits="ButtonRow">
+			<Frame name="MouseRowC" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRowB">
 						<Offset>
@@ -267,7 +292,7 @@
 					</Anchor>
 				</Anchors>
 			</Frame>
-			<Frame name="MouseRowD" inherits="ButtonRow">
+			<Frame name="MouseRowD" inherits="CyborgMMO_TemplateButtonRow">
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MouseRowC">
 						<Offset>
@@ -310,7 +335,7 @@
 				</Anchors>
 				<Layers>
 					<Layer>
-						<FontString name="$parentTitle" font="Fonts\FRIZQT__.TTF" inherits="SliderTitle">
+						<FontString name="$parentTitle" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateSliderTitle">
 							<Anchors>
 								<Anchor point="LEFT" relativePoint="$parentMiniMapButton">
 									<Offset>
@@ -349,7 +374,7 @@
 				</Anchors>
 				<Layers>
 					<Layer>
-						<FontString name="$parentTitle" font="Fonts\FRIZQT__.TTF" inherits="SliderTitle">
+						<FontString name="$parentTitle" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateSliderTitle">
 							<Anchors>
 								<Anchor point="LEFT" relativePoint="$parentCyborgButton">
 									<Offset>
@@ -374,14 +399,14 @@
 				</Scripts>
 			</CheckButton>
 
-			<Button name="$parentSetDefaults" inherits="standard">
+			<Button name="$parentSetDefaults" inherits="CyborgMMO_TemplateButton">
 				<Size>
-					<AbsDimension x="156" y="28" />
+					<AbsDimension x="150" y="28" />
 				</Size>
 				<Anchors>
 				  <Anchor point="TOPLEFT" relativeTo="CyborgButton">
 					<Offset>
-						<AbsDimension x="0" y="-40"/>
+						<AbsDimension x="431" y="-20"/>
 					</Offset>
 				  </Anchor>
 				</Anchors>
@@ -410,12 +435,12 @@
 			
 			<Frame name="CyborgSize">
 				<Size>
-					<AbsDimension x="198" y="10" />
+					<AbsDimension x="180" y="32" />
 				</Size>
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="$parentTitle">
 						<Offset>
-							<AbsDimension x="255" y="-20"/>
+							<AbsDimension x="195" y="-40"/>
 						</Offset>
 					</Anchor>
 				</Anchors>
@@ -441,17 +466,17 @@
 						</Backdrop>
 						<Layers>
 							<Layer>
-								<FontString name="$parentTitle" font="Fonts\FRIZQT__.TTF" inherits="SliderTitle">
+								<FontString name="$parentTitle" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateSliderTitle">
 									<Anchors>
 										<Anchor point="BOTTOM" relativePoint="TOP" />
 									</Anchors>
 								</FontString>
-								<FontString name="$parentLow" font="Fonts\FRIZQT__.TTF" inherits="normalStringTemplate" text="50%">
+								<FontString name="$parentLow" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateNormalString" text="50%">
 									<Anchors>
 										<Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" />
 									</Anchors>
 								</FontString>
-								<FontString name="$parentHigh" font="Fonts\FRIZQT__.TTF" inherits="normalStringTemplate" text="100%">
+								<FontString name="$parentHigh" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateNormalString" text="100%">
 									<Anchors>
 										<Anchor point="TOPRIGHT" relativePoint="BOTTOMRIGHT" />
 									</Anchors>
@@ -474,12 +499,12 @@
 			</Frame>
 			<Frame name="PluginSize">
 				<Size>
-					<AbsDimension x="198" y="60" />
+					<AbsDimension x="180" y="32" />
 				</Size>
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="CyborgSize">
 						<Offset>
-							<AbsDimension x="0" y="-40"/>
+							<AbsDimension x="200" y="0"/>
 						</Offset>
 					</Anchor>
 				</Anchors>
@@ -505,17 +530,17 @@
 						</Backdrop>
 						<Layers>
 							<Layer>
-								<FontString name="$parentTitle" font="Fonts\FRIZQT__.TTF" inherits="SliderTitle">
+								<FontString name="$parentTitle" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateSliderTitle">
 									<Anchors>
 										<Anchor point="BOTTOM" relativePoint="TOP" />
 									</Anchors>
 								</FontString>
-								<FontString name="$parentLow" font="Fonts\FRIZQT__.TTF" inherits="normalStringTemplate" text="50%">
+								<FontString name="$parentLow" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateNormalString" text="50%">
 									<Anchors>
 										<Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" />
 									</Anchors>
 								</FontString>
-								<FontString name="$parentHigh" font="Fonts\FRIZQT__.TTF" inherits="normalStringTemplate" text="100%">
+								<FontString name="$parentHigh" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateNormalString" text="100%">
 									<Anchors>
 										<Anchor point="TOPRIGHT" relativePoint="BOTTOMRIGHT" />
 									</Anchors>