Mercurial > wow > cyborg-mmo7

diff CyborgMMO7.lua @ 1:a4e2eaf9cad9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Initial Fixes for ticket 1: Added a menu to the interface options page to allow the syncing of the addon to the mouse profile. This should resolve i8n issues
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Wed, 23 May 2012 08:26:07 +0000
parents bf9220814fb5
children d186f8cd5000
line wrap: on
line diff
--- a/CyborgMMO7.lua	Tue Jan 24 17:14:21 2012 +0000
+++ b/CyborgMMO7.lua	Wed May 23 08:26:07 2012 +0000
@@ -18,396 +18,12 @@
 --~ along with this program; if not, write to the Free Software
 --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-Mode = {
-	["enUS"] = {
-		"ALT-CTRL-E",
-		"ALT-CTRL-F",
-		"ALT-CTRL-["
-	},
-	["frFR"] = {
-		"ALT-CTRL-E",
-		"ALT-CTRL-F",
-		"ALT-CTRL-^"
-	},
-	["deDE"] = {
-		"ALT-CTRL-E",
-		"ALT-CTRL-F",
-		"ALT-CTRL-ü"
-	},
-	["zhCN"] = {
-		"ALT-CTRL-E",
-		"ALT-CTRL-F",
-		"ALT-CTRL-["
-	},
-	["zhTW"] = {
-		"ALT-CTRL-E",
-		"ALT-CTRL-F",
-		"ALT-CTRL-["
-	},
-	["esES"] = {
-		"ALT-CTRL-E",
-		"ALT-CTRL-F",
-		"ALT-CTRL-'"
-	},
-	["esMX"] = {
-		"ALT-CTRL-E",
-		"ALT-CTRL-F",
-		"ALT-CTRL-'"
-	}
-}
 
-WowCommands = {
-	["enUS"] = {
-		"ALT-CTRL-NUMPAD1",
-		"ALT-CTRL-NUMPAD2",
-		"ALT-CTRL-NUMPAD3",
-		"ALT-CTRL-NUMPAD4",
-		"ALT-CTRL-NUMPAD5",
-		"ALT-CTRL-NUMPAD6",
-		"ALT-CTRL-NUMPAD7",
-		"ALT-CTRL-NUMPAD8",
-		"ALT-CTRL-NUMPAD9",
-		"ALT-CTRL-NUMPAD0",
-		"ALT-CTRL-1",
-		"ALT-CTRL-2",
-		"ALT-CTRL-3",
-		"ALT-CTRL-4",
-		"ALT-CTRL-5",
-		"ALT-CTRL-6",
-		"ALT-CTRL-7",
-		"ALT-CTRL-8",
-		"ALT-CTRL-9",
-		"ALT-CTRL-0",
-		"ALT-CTRL-F1",
-		"ALT-CTRL-F2",
-		"ALT-CTRL-F3",
-		"ALT-CTRL-F4",
-		"ALT-CTRL-F5",
-		"ALT-CTRL-F6",
-		"ALT-CTRL-F7",
-		"ALT-CTRL-F8",
-		"ALT-CTRL-F9",
-		"ALT-CTRL-F10",
-		"ALT-CTRL-F11",
-		"ALT-CTRL-F12",
-		"ALT-CTRL--",
-		"ALT-CTRL-H",
-		"ALT-CTRL-A",
-		"ALT-CTRL-B",
-		"ALT-CTRL-C",
-		"ALT-CTRL-D",
-		"ALT-CTRL-END"
-	},
-	["frFR"] = {
-		"ALT-CTRL-NUMPAD1",
-		"ALT-CTRL-NUMPAD2",
-		"ALT-CTRL-NUMPAD3",
-		"ALT-CTRL-NUMPAD4",
-		"ALT-CTRL-NUMPAD5",
-		"ALT-CTRL-NUMPAD6",
-		"ALT-CTRL-NUMPAD7",
-		"ALT-CTRL-NUMPAD8",
-		"ALT-CTRL-NUMPAD9",
-		"ALT-CTRL-NUMPAD0",
-		"ALT-CTRL-1",
-		"ALT-CTRL-2",
-		"ALT-CTRL-3",
-		"ALT-CTRL-4",
-		"ALT-CTRL-5",
-		"ALT-CTRL-6",
-		"ALT-CTRL-7",
-		"ALT-CTRL-8",
-		"ALT-CTRL-9",
-		"ALT-CTRL-0",
-		"ALT-CTRL-F1",
-		"ALT-CTRL-F2",
-		"ALT-CTRL-F3",
-		"ALT-CTRL-F4",
-		"ALT-CTRL-F5",
-		"ALT-CTRL-F6",
-		"ALT-CTRL-F7",
-		"ALT-CTRL-F8",
-		"ALT-CTRL-F9",
-		"ALT-CTRL-F10",
-		"ALT-CTRL-F11",
-		"ALT-CTRL-F12",
-		"ALT-CTRL-)",
-		"ALT-CTRL-H",
-		"ALT-CTRL-Q",
-		"ALT-CTRL-B",
-		"ALT-CTRL-C",
-		"ALT-CTRL-D",
-		"ALT-CTRL-END"
-	},
-	["deDE"] = {
-		"ALT-CTRL-NUMPAD1",
-		"ALT-CTRL-NUMPAD2",
-		"ALT-CTRL-NUMPAD3",
-		"ALT-CTRL-NUMPAD4",
-		"ALT-CTRL-NUMPAD5",
-		"ALT-CTRL-NUMPAD6",
-		"ALT-CTRL-NUMPAD7",
-		"ALT-CTRL-NUMPAD8",
-		"ALT-CTRL-NUMPAD9",
-		"ALT-CTRL-NUMPAD0",
-		"ALT-CTRL-1",
-		"ALT-CTRL-2",
-		"ALT-CTRL-3",
-		"ALT-CTRL-4",
-		"ALT-CTRL-5",
-		"ALT-CTRL-6",
-		"ALT-CTRL-7",
-		"ALT-CTRL-8",
-		"ALT-CTRL-9",
-		"ALT-CTRL-0",
-		"ALT-CTRL-F1",
-		"ALT-CTRL-F2",
-		"ALT-CTRL-F3",
-		"ALT-CTRL-F4",
-		"ALT-CTRL-F5",
-		"ALT-CTRL-F6",
-		"ALT-CTRL-F7",
-		"ALT-CTRL-F8",
-		"ALT-CTRL-F9",
-		"ALT-CTRL-F10",
-		"ALT-CTRL-F11",
-		"ALT-CTRL-F12",
-		"ALT-CTRL-ß",
-		"ALT-CTRL-H",
-		"ALT-CTRL-A",
-		"ALT-CTRL-B",
-		"ALT-CTRL-C",
-		"ALT-CTRL-D",
-		"ALT-CTRL-END"
-	},
-	["zhCN"] = {
-		"ALT-CTRL-NUMPAD1",
-		"ALT-CTRL-NUMPAD2",
-		"ALT-CTRL-NUMPAD3",
-		"ALT-CTRL-NUMPAD4",
-		"ALT-CTRL-NUMPAD5",
-		"ALT-CTRL-NUMPAD6",
-		"ALT-CTRL-NUMPAD7",
-		"ALT-CTRL-NUMPAD8",
-		"ALT-CTRL-NUMPAD9",
-		"ALT-CTRL-NUMPAD0",
-		"ALT-CTRL-1",
-		"ALT-CTRL-2",
-		"ALT-CTRL-3",
-		"ALT-CTRL-4",
-		"ALT-CTRL-5",
-		"ALT-CTRL-6",
-		"ALT-CTRL-7",
-		"ALT-CTRL-8",
-		"ALT-CTRL-9",
-		"ALT-CTRL-0",
-		"ALT-CTRL-F1",
-		"ALT-CTRL-F2",
-		"ALT-CTRL-F3",
-		"ALT-CTRL-F4",
-		"ALT-CTRL-F5",
-		"ALT-CTRL-F6",
-		"ALT-CTRL-F7",
-		"ALT-CTRL-F8",
-		"ALT-CTRL-F9",
-		"ALT-CTRL-F10",
-		"ALT-CTRL-F11",
-		"ALT-CTRL-F12",
-		"ALT-CTRL--",
-		"ALT-CTRL-H",
-		"ALT-CTRL-A",
-		"ALT-CTRL-B",
-		"ALT-CTRL-C",
-		"ALT-CTRL-D",
-		"ALT-CTRL-END"
-	},
-	["zhTW"] = {
-		"ALT-CTRL-NUMPAD1",
-		"ALT-CTRL-NUMPAD2",
-		"ALT-CTRL-NUMPAD3",
-		"ALT-CTRL-NUMPAD4",
-		"ALT-CTRL-NUMPAD5",
-		"ALT-CTRL-NUMPAD6",
-		"ALT-CTRL-NUMPAD7",
-		"ALT-CTRL-NUMPAD8",
-		"ALT-CTRL-NUMPAD9",
-		"ALT-CTRL-NUMPAD0",
-		"ALT-CTRL-1",
-		"ALT-CTRL-2",
-		"ALT-CTRL-3",
-		"ALT-CTRL-4",
-		"ALT-CTRL-5",
-		"ALT-CTRL-6",
-		"ALT-CTRL-7",
-		"ALT-CTRL-8",
-		"ALT-CTRL-9",
-		"ALT-CTRL-0",
-		"ALT-CTRL-F1",
-		"ALT-CTRL-F2",
-		"ALT-CTRL-F3",
-		"ALT-CTRL-F4",
-		"ALT-CTRL-F5",
-		"ALT-CTRL-F6",
-		"ALT-CTRL-F7",
-		"ALT-CTRL-F8",
-		"ALT-CTRL-F9",
-		"ALT-CTRL-F10",
-		"ALT-CTRL-F11",
-		"ALT-CTRL-F12",
-		"ALT-CTRL--",
-		"ALT-CTRL-H",
-		"ALT-CTRL-A",
-		"ALT-CTRL-B",
-		"ALT-CTRL-C",
-		"ALT-CTRL-D",
-		"ALT-CTRL-END"
-	},
-	["esES"] = {
-		"ALT-CTRL-NUMPAD1",
-		"ALT-CTRL-NUMPAD2",
-		"ALT-CTRL-NUMPAD3",
-		"ALT-CTRL-NUMPAD4",
-		"ALT-CTRL-NUMPAD5",
-		"ALT-CTRL-NUMPAD6",
-		"ALT-CTRL-NUMPAD7",
-		"ALT-CTRL-NUMPAD8",
-		"ALT-CTRL-NUMPAD9",
-		"ALT-CTRL-NUMPAD0",
-		"ALT-CTRL-1",
-		"ALT-CTRL-2",
-		"ALT-CTRL-3",
-		"ALT-CTRL-4",
-		"ALT-CTRL-5",
-		"ALT-CTRL-6",
-		"ALT-CTRL-7",
-		"ALT-CTRL-8",
-		"ALT-CTRL-9",
-		"ALT-CTRL-0",
-		"ALT-CTRL-F1",
-		"ALT-CTRL-F2",
-		"ALT-CTRL-F3",
-		"ALT-CTRL-F4",
-		"ALT-CTRL-F5",
-		"ALT-CTRL-F6",
-		"ALT-CTRL-F7",
-		"ALT-CTRL-F8",
-		"ALT-CTRL-F9",
-		"ALT-CTRL-F10",
-		"ALT-CTRL-F11",
-		"ALT-CTRL-F12",
-		"ALT-CTRL-'",
-		"ALT-CTRL-H",
-		"ALT-CTRL-A",
-		"ALT-CTRL-B",
-		"ALT-CTRL-C",
-		"ALT-CTRL-D",
-		"ALT-CTRL-END"
-	},
-	["esMX"] = {
-		"ALT-CTRL-NUMPAD1",
-		"ALT-CTRL-NUMPAD2",
-		"ALT-CTRL-NUMPAD3",
-		"ALT-CTRL-NUMPAD4",
-		"ALT-CTRL-NUMPAD5",
-		"ALT-CTRL-NUMPAD6",
-		"ALT-CTRL-NUMPAD7",
-		"ALT-CTRL-NUMPAD8",
-		"ALT-CTRL-NUMPAD9",
-		"ALT-CTRL-NUMPAD0",
-		"ALT-CTRL-1",
-		"ALT-CTRL-2",
-		"ALT-CTRL-3",
-		"ALT-CTRL-4",
-		"ALT-CTRL-5",
-		"ALT-CTRL-6",
-		"ALT-CTRL-7",
-		"ALT-CTRL-8",
-		"ALT-CTRL-9",
-		"ALT-CTRL-0",
-		"ALT-CTRL-F1",
-		"ALT-CTRL-F2",
-		"ALT-CTRL-F3",
-		"ALT-CTRL-F4",
-		"ALT-CTRL-F5",
-		"ALT-CTRL-F6",
-		"ALT-CTRL-F7",
-		"ALT-CTRL-F8",
-		"ALT-CTRL-F9",
-		"ALT-CTRL-F10",
-		"ALT-CTRL-F11",
-		"ALT-CTRL-F12",
-		"ALT-CTRL-'",
-		"ALT-CTRL-H",
-		"ALT-CTRL-A",
-		"ALT-CTRL-B",
-		"ALT-CTRL-C",
-		"ALT-CTRL-D",
-		"ALT-CTRL-END"
-	}
-}
 
 
-StringTable = {
-	["enUS"] = {
-		CyborgButtonTitle="Cyborg Button",
-		MiniMapButtonTitle="MiniMap Button",
-		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="Default",
-		CyborgSizeSliderTitle="Cyborg Head Size",
-		PluginSizeSliderTitle="Interface Window Size"
-	},
-	["frFR"] = {
-		CyborgButtonTitle="Bouton Cyborg",
-		MiniMapButtonTitle="Bouton minimap",
-		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="Par défaut",
-		CyborgSizeSliderTitle="Dimension de la tête Cyborg",
-		PluginSizeSliderTitle="Dimension de la fenêtre d'interface"
-	},
-	["deDE"] = {
-		CyborgButtonTitle="Cyborg-Taste",
-		MiniMapButtonTitle="MiniMap-Taste",
-		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="Standard",
-		CyborgSizeSliderTitle="Größe des Cyborg-Kopfes",
-		PluginSizeSliderTitle="Größe des Schnittstellenfensters"
-	},
-	["zhCN"] = {
-		CyborgButtonTitle="Cyborg 按钮",
-		MiniMapButtonTitle="“迷你地图”按钮",
-		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="默认",
-		CyborgSizeSliderTitle="Cyborg 标题大小",
-		PluginSizeSliderTitle="界面窗口大小"
-	},
-	["zhTW"] = {
-		CyborgButtonTitle="Cyborg 按鈕",
-		MiniMapButtonTitle="MiniMap 按鈕",
-		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="預設",
-		CyborgSizeSliderTitle="Cyborg 頭大小",
-		PluginSizeSliderTitle="介面視窗大小"
-	},
-	["esES"] = {
-		CyborgButtonTitle="Botón Cyborg",
-		MiniMapButtonTitle="Botón Minimapa",
-		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="Predeterminado",
-		CyborgSizeSliderTitle="Tamaño de la cabeza de Cyborg",
-		PluginSizeSliderTitle="Tamaño de la ventana de la interfaz"
-	},
-	["esMX"] = {
-		CyborgButtonTitle="Botón de Cyborg",
-		MiniMapButtonTitle="Botón de Minimapa",
-		OptionPageTitle="Cyborg MMO7",
-		OptionPageSetDefaults="Modo predeterminado",
-		CyborgSizeSliderTitle="Tamaño de la cabeza de Cyborg",
-		PluginSizeSliderTitle="Tamaño de la ventana de interfaz"
-	}
-}
 
 function LoadStrings(self)
-	self:SetText(StringTable[GetLocale()][self:GetName()]);
+	self:SetText(StringTable[self:GetName()]);
 end
 
 local VarsLoaded = false;
@@ -417,7 +33,6 @@
 local Settings = nil;
 
 
-
 function CyborgMiniMapButton_Reposition(pos)
 	CyborgMiniMapFrame:SetPoint("TOPLEFT",
 		"Minimap",
@@ -468,12 +83,21 @@
 	end
 end
 
+function LoadWowCommands()
+	if (ProfileKeyBindings == nil) then
+		ProfileKeyBindings = {}
+		ProfileKeyBindings = InternationalWowCommands[GetLocale()]
+	end
+	WowCommands = ProfileKeyBindings 
+end
+
 function GetSaveData()
 	if(VarsLoaded) then
 		if (CyborgMMO7SaveData == nil) then
 			CyborgMMO7SaveData = {};
 			CyborgMMO7SaveData[SaveName] = {}
 		end
+		LoadWowCommands()
 		return CyborgMMO7SaveData[SaveName];
 	end
 	return nil;
@@ -482,6 +106,7 @@
 function SetSaveData(data, index)
 	if(VarsLoaded) then
 		GetSaveData()[index] = data
+		ProfileKeyBindings = WowCommands
 	end
 end
 
@@ -496,7 +121,7 @@
 	elseif(event == nil) then
 		msg("Event is nil");
 	else
-		msg("Event is not nil");
+		msg("Event is " + event);
     end
 
 
@@ -569,7 +194,7 @@
 	end
 
 	local buttonFrame, parentFrame, name = CallbackFactory.Instance().AddCallback(fn);
-	if(1 ~= SetOverrideBindingClick(parentFrame, true, Mode[GetLocale()][modeNum], name, "LeftButton")) then
+	if(1 ~= SetOverrideBindingClick(parentFrame, true, Mode[modeNum], name, "LeftButton")) then
 		msg("Failed to Bind modeChange");
 	end
 end