changeset 55:72adde883f46

Removed the "Defaults" button from the option page. It was no longer visible following addition of the prefix anyway. Plugged the built-in "Defaults" button of the interface options dialog to what the custom button was previously doing.
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Fri, 03 May 2013 23:24:26 +0000
parents c9706291c141
children 5ca5fe6b0871
files Localisation.lua OptionPage.xml OptionView.lua
diffstat 3 files changed, 1 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/Localisation.lua	Fri May 03 23:24:21 2013 +0000
+++ b/Localisation.lua	Fri May 03 23:24:26 2013 +0000
@@ -372,7 +372,6 @@
 		CyborgMMO_OptionPageRebindMouseRowBName="Button 3",
 		CyborgMMO_OptionPageRebindMouseRowCName="Thumb Anticlockwise",
 		CyborgMMO_OptionPageRebindMouseRowDName="Thumb Clockwise",
-		CyborgMMO_OptionPageSetDefaults="Default",
 		CyborgMMO_OptionPageTitle="Cyborg MMO7",
 		CyborgMMO_OptionPagePluginSizeSliderTitle="Interface Window Size",
 		CyborgMMO_OptionPageRebindMode1="Mode 1",
@@ -390,7 +389,6 @@
 		CyborgMMO_OptionPageCyborgButtonTitle="Bouton Cyborg",
 		CyborgMMO_OptionPageMiniMapButtonTitle="Bouton minimap",
 		CyborgMMO_OptionPageTitle="Cyborg MMO7",
-		CyborgMMO_OptionPageSetDefaults="Par défaut",
 		CyborgMMO_OptionPageCyborgSizeSliderTitle="Dimension de la tête Cyborg",
 		CyborgMMO_OptionPagePluginSizeSliderTitle="Dimension de la fenêtre d'interface",
 	},
@@ -398,7 +396,6 @@
 		CyborgMMO_OptionPageCyborgButtonTitle="Cyborg-Taste",
 		CyborgMMO_OptionPageMiniMapButtonTitle="MiniMap-Taste",
 		CyborgMMO_OptionPageTitle="Cyborg MMO7",
-		CyborgMMO_OptionPageSetDefaults="Standard",
 		CyborgMMO_OptionPageCyborgSizeSliderTitle="Größe des Cyborg-Kopfes",
 		CyborgMMO_OptionPagePluginSizeSliderTitle="Größe des Schnittstellenfensters",
 	},
@@ -406,7 +403,6 @@
 		CyborgMMO_OptionPageCyborgButtonTitle="Cyborg 按钮",
 		CyborgMMO_OptionPageMiniMapButtonTitle="“迷你地图”按钮",
 		CyborgMMO_OptionPageTitle="Cyborg MMO7",
-		CyborgMMO_OptionPageSetDefaults="默认",
 		CyborgMMO_OptionPageCyborgSizeSliderTitle="Cyborg 标题大小",
 		CyborgMMO_OptionPagePluginSizeSliderTitle="界面窗口大小",
 	},
@@ -414,7 +410,6 @@
 		CyborgMMO_OptionPageCyborgButtonTitle="Cyborg 按鈕",
 		CyborgMMO_OptionPageMiniMapButtonTitle="MiniMap 按鈕",
 		CyborgMMO_OptionPageTitle="Cyborg MMO7",
-		CyborgMMO_OptionPageSetDefaults="預設",
 		CyborgMMO_OptionPageCyborgSizeSliderTitle="Cyborg 頭大小",
 		CyborgMMO_OptionPagePluginSizeSliderTitle="介面視窗大小",
 	},
@@ -422,7 +417,6 @@
 		CyborgMMO_OptionPageCyborgButtonTitle="Botón Cyborg",
 		CyborgMMO_OptionPageMiniMapButtonTitle="Botón Minimapa",
 		CyborgMMO_OptionPageTitle="Cyborg MMO7",
-		CyborgMMO_OptionPageSetDefaults="Predeterminado",
 		CyborgMMO_OptionPageCyborgSizeSliderTitle="Tamaño de la cabeza de Cyborg",
 		CyborgMMO_OptionPagePluginSizeSliderTitle="Tamaño de la ventana de la interfaz",
 	},
@@ -430,7 +424,6 @@
 		CyborgMMO_OptionPageCyborgButtonTitle="Botón de Cyborg",
 		CyborgMMO_OptionPageMiniMapButtonTitle="Botón de Minimapa",
 		CyborgMMO_OptionPageTitle="Cyborg MMO7",
-		CyborgMMO_OptionPageSetDefaults="Modo predeterminado",
 		CyborgMMO_OptionPageCyborgSizeSliderTitle="Tamaño de la cabeza de Cyborg",
 		CyborgMMO_OptionPagePluginSizeSliderTitle="Tamaño de la ventana de interfaz",
 	},
--- a/OptionPage.xml	Fri May 03 23:24:21 2013 +0000
+++ b/OptionPage.xml	Fri May 03 23:24:26 2013 +0000
@@ -350,23 +350,6 @@
 				</Scripts>
 			</CheckButton>
 
-			<Button name="$parentSetDefaults" inherits="CyborgMMO_TemplateButton">
-				<Size><AbsDimension x="150" y="28"/></Size>
-				<Anchors>
-					<Anchor point="TOPLEFT" relativeTo="PerSpecBindings">
-						<Offset><AbsDimension x="431" y="-20"/></Offset>
-					</Anchor>
-				</Anchors>
-				<Scripts>
-					<OnLoad>
-						CyborgMMO_LoadStrings(getglobal(self:GetName()))
-					</OnLoad>
-					<OnClick>
-						CyborgMMO_SetDefaultSettings()
-					</OnClick>
-				</Scripts>
-			</Button>
-
 			<Frame name="$parentRebind" inherits="CyborgMMO_MouseRebind">
 				<Size><AbsDimension x="45" y="60"/></Size>
 				<Anchors>
--- a/OptionView.lua	Fri May 03 23:24:21 2013 +0000
+++ b/OptionView.lua	Fri May 03 23:24:26 2013 +0000
@@ -21,6 +21,7 @@
 CyborgMMO_OptionView = {
 	new = function(self)
 		self.name = "Cyborg MMO7 Plugin"
+		self.default = CyborgMMO_SetDefaultSettings
 		InterfaceOptions_AddCategory(self)
 		return self
 	end,