Mercurial > wow > cyborg-mmo7

changeset 56:5ca5fe6b0871

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved the key rebinding to a separate option page.
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Fri, 03 May 2013 23:24:32 +0000
parents 72adde883f46
children 1236b2b22dde
files OptionPage.xml
diffstat 1 files changed, 34 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/OptionPage.xml	Fri May 03 23:24:26 2013 +0000
+++ b/OptionPage.xml	Fri May 03 23:24:32 2013 +0000
@@ -124,7 +124,7 @@
 			<Layer level="ARTWORK">
 				<FontString name="$parentTitle" inherits="GameFontNormalLarge" text="CyborgMMO_MouseRebindTitle">
 					<Anchors>
-						<Anchor point="TOPLEFT"><Offset><AbsDimension x="-15" y="0"/></Offset></Anchor>
+						<Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
 					</Anchors>
 				</FontString>
 				<FontString name="$parentMode1" inherits="GameFontNormal" text="Mode Num">
@@ -257,7 +257,7 @@
 				<Size><AbsDimension x="32" y="32"/></Size>
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="$parentTitle">
-						<Offset><AbsDimension x="15" y="-25"/></Offset>
+						<Offset><AbsDimension x="0" y="-30"/></Offset>
 					</Anchor>
 				</Anchors>
 				<Layers>
@@ -350,30 +350,13 @@
 				</Scripts>
 			</CheckButton>
 
-			<Frame name="$parentRebind" inherits="CyborgMMO_MouseRebind">
-				<Size><AbsDimension x="45" y="60"/></Size>
-				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="$parentTitle">
-						<Offset><AbsDimension x="25" y="-120"/></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="$parentCyborgSize">
 				<Size>
 					<AbsDimension x="180" y="32"/>
 				</Size>
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="$parentTitle">
-						<Offset><AbsDimension x="195" y="-40"/></Offset>
+						<Offset><AbsDimension x="250" y="-40"/></Offset>
 					</Anchor>
 				</Anchors>
 				<Frames>
@@ -394,7 +377,7 @@
 							<Layer>
 								<FontString name="$parentTitle" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateSliderTitle">
 									<Anchors>
-										<Anchor point="BOTTOM" relativePoint="TOP"/>
+										<Anchor point="BOTTOMLEFT" relativePoint="TOPLEFT"/>
 									</Anchors>
 								</FontString>
 								<FontString name="$parentLow" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateNormalString" text="50%">
@@ -427,7 +410,7 @@
 				<Size><AbsDimension x="180" y="32"/></Size>
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="$parentCyborgSize">
-						<Offset><AbsDimension x="200" y="0"/></Offset>
+						<Offset><AbsDimension x="0" y="-50"/></Offset>
 					</Anchor>
 				</Anchors>
 				<Frames>
@@ -448,7 +431,7 @@
 							<Layer>
 								<FontString name="$parentTitle" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateSliderTitle">
 									<Anchors>
-										<Anchor point="BOTTOM" relativePoint="TOP"/>
+										<Anchor point="BOTTOMLEFT" relativePoint="TOPLEFT"/>
 									</Anchors>
 								</FontString>
 								<FontString name="$parentLow" font="Fonts\FRIZQT__.TTF" inherits="CyborgMMO_TemplateNormalString" text="50%">
@@ -488,6 +471,34 @@
 		</Scripts>
 	</Frame>
 
+	<Frame name="CyborgMMO_OptionSubPageRebind">
+		<Frames>
+			<Frame name="CyborgMMO_OptionPageRebind" inherits="CyborgMMO_MouseRebind">
+				<Size><AbsDimension x="40" y="60"/></Size>
+				<Anchors>
+					<Anchor point="TOPLEFT">
+						<Offset><AbsDimension x="15" y="-15"/></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>
+		</Frames>
+		<Scripts>
+			<OnLoad>
+				self.name = "Rebind keys"
+				self.parent = CyborgMMO_OptionPage
+				InterfaceOptions_AddCategory(self)
+			</OnLoad>
+		</Scripts>
+	</Frame>
+
 	<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>
 		<Anchors>