Mercurial > wow > cyborg-mmo7

diff OptionView.lua @ 13:6cb9a2936580

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Miscellanous Lua code consistency improvements: - no semicolon except between statements on same line - use of implicit cast to bool in if/while conditions, instead of various eq/neq against true, false or nil - no parenthesis around if/while conditions (C-ism) - avoid long function calls in if conditions - removed space in comma-separated expressions lists in multiple assignments - added spaces between arguments of functions calls - use tabs for indentation (in Lua files only) - don't reverse == in if conditions, like "if 42==foo then" (C-ism) - removed some extra parenthesis in complex expressions (C-ism) - added spaces around operators in most expressions for ease of reading - added comma after last element of table initializers - removed space after # operator - moved comment prefix of disabled code into tab (to keep disabled code aligned)
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Thu, 25 Apr 2013 01:29:45 +0000
parents 8428fa7cf0e4
children cccc7661a2e6
line wrap: on
line diff
--- a/OptionView.lua	Tue Apr 16 15:19:23 2013 +0000
+++ b/OptionView.lua	Thu Apr 25 01:29:45 2013 +0000
@@ -1,4 +1,4 @@
---~ Warcraft Plugin for Cyborg MMO7 
+--~ Warcraft Plugin for Cyborg MMO7
 --~ Filename: OptionView.lua
 --~ Description: The code for the Option page in the UI, not much here because we dont have many options. Probably could refactor.
 --~ Copyright (C) 2012 Mad Catz Inc.
@@ -20,11 +20,10 @@
 
 CyborgMMO_OptionView = {
 	new = function(self)
-        self.name = "Cyborg MMO7 Plugin"
-        InterfaceOptions_AddCategory(self);
+		self.name = "Cyborg MMO7 Plugin"
+		InterfaceOptions_AddCategory(self)
 		return self
-
-	end
+	end,
 }
 
 local lastButton = nil
@@ -33,23 +32,22 @@
 	lastButton = name
 	local index = CyborgMMO_GetButtonIndex(name)
 	local mode = 1
-	while(index > 13) do
+	while index > 13 do
 		mode = mode + 1
 		index = index - 13
 	end
-	local buttonStr =  CyborgMMO_StringTable[("CyborgMMO_OptionPageRebindMouseRow"..index.."Name")]
-	
+	local buttonStr = CyborgMMO_StringTable[("CyborgMMO_OptionPageRebindMouseRow"..index.."Name")]
+
 	getglobal("CyborgMMO_BindingFrameButtonName"):SetText(buttonStr.." Mode "..mode)
 	getglobal("CyborgMMO_BindingFrameKey"):SetText(CyborgMMO_StringTable["CyborgMMO_CurrentBinding"].." "..CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)])
 	CyborgMMO_BindingFrame:Show()
-	
 end
 
 function CyborgMMO_GetBindingButtonText(name)
-	if(nil == CyborgMMO_WowCommands) then
-		CyborgMMO_LoadWowCommands();
+	if not CyborgMMO_WowCommands then
+		CyborgMMO_LoadWowCommands()
 	end
-	
+
 	local binding = CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(name)]
 	getglobal(name):SetText(binding)
 end
@@ -62,157 +60,156 @@
 end
 
 function CyborgMMO_ShowProfileTooltip(self)
-	local red, green, blue, _ = self:GetVertexColor()
-	if((red == 0) and (green == 0) and (blue == 0)) then
-		GameTooltip:SetOwner(self:GetParent(), "ANCHOR_RIGHT");
-		GameTooltip:SetText(CyborgMMO_StringTable["CyborgMMO_ToolTipLine1"], nil, nil, nil, nil, 1);
-		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine2"], 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine3"], 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine4"], 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine5"], 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8);
-		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine6"], 0.8, 1.0, 0.8);
-		GameTooltip:Show();
+	local red,green,blue = self:GetVertexColor()
+	if red == 0 and green == 0 and blue == 0 then
+		GameTooltip:SetOwner(self:GetParent(), "ANCHOR_RIGHT")
+		GameTooltip:SetText(CyborgMMO_StringTable["CyborgMMO_ToolTipLine1"], nil, nil, nil, nil, 1)
+		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine2"], 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine3"], 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine4"], 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine5"], 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(nil, 0.8, 1.0, 0.8)
+		GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine6"], 0.8, 1.0, 0.8)
+		GameTooltip:Show()
 	end
 end
 
 function CyborgMMO_HideProfileTooltip(self)
-	GameTooltip:Hide();
+	GameTooltip:Hide()
 end
 
 function CyborgMMO_GetNumberFromHexLetter(str)
 	local number = 0
-	if("A" == str) then
+	if str == "A" then
 		number = 10
-	elseif("B" == str) then
+	elseif str == "B" then
 		number = 11
-	elseif("C" == str) then
+	elseif str == "C" then
 		number = 12
-	elseif("D" == str) then
+	elseif str == "D" then
 		number = 13
-	elseif("E" == str) then
+	elseif str == "E" then
 		number = 14
-	elseif("F" == str) then
+	elseif str == "F" then
 		number = 15
-	else 
-	 number = tonumber(str)
+	else
+		number = tonumber(str)
 	end
 	return number
 end
 
 function CyborgMMO_SetNewKeybind(keyOrButton)
 	local previous = CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)]
-	CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)] = keyOrButton;
-	CyborgMMO_GetBindingButtonText(lastButton);
+	CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)] = keyOrButton
+	CyborgMMO_GetBindingButtonText(lastButton)
 	CyborgMMO_BindingFrame:Hide()
 	CyborgMMO_RatPageModel.Instance().LoadData()
 end
 
 function CyborgMMO_BindingFrameOnKeyDown(self, keyOrButton)
-   if keyOrButton=="ESCAPE" then
-      CyborgMMO_BindingFrame:Hide()
-      return
-   end
-   
-   if ( GetBindingFromClick(keyOrButton) == "SCREENSHOT" ) then
-      RunBinding("SCREENSHOT");
-      return;
-   end
-   
-   local keyPressed = keyOrButton;
-   
-   if ( keyPressed == "UNKNOWN" ) then
-      return;
-   end
-   
-   -- Convert the mouse button names
-   if ( keyPressed == "LeftButton" ) then
-      keyPressed = "BUTTON1";
-   elseif ( keyPressed == "RightButton" ) then
-      keyPressed = "BUTTON2";
-   elseif ( keyPressed == "MiddleButton" ) then
-      keyPressed = "BUTTON3";
-   elseif ( keyPressed == "Button4" ) then
-      keyPressed = "BUTTON4"
-   elseif ( keyOrButton == "Button5" ) then
-      keyPressed = "BUTTON5"
-   elseif ( keyPressed == "Button6" ) then
-      keyPressed = "BUTTON6"
-   elseif ( keyOrButton == "Button7" ) then
-      keyPressed = "BUTTON7"
-   elseif ( keyPressed == "Button8" ) then
-      keyPressed = "BUTTON8"
-   elseif ( keyOrButton == "Button9" ) then
-      keyPressed = "BUTTON9"
-   elseif ( keyPressed == "Button10" ) then
-      keyPressed = "BUTTON10"
-   elseif ( keyOrButton == "Button11" ) then
-      keyPressed = "BUTTON11"
-   elseif ( keyPressed == "Button12" ) then
-      keyPressed = "BUTTON12"
-   elseif ( keyOrButton == "Button13" ) then
-      keyPressed = "BUTTON13"
-   elseif ( keyPressed == "Button14" ) then
-      keyPressed = "BUTTON14"
-   elseif ( keyOrButton == "Button15" ) then
-      keyPressed = "BUTTON15"
-   elseif ( keyPressed == "Button16" ) then
-      keyPressed = "BUTTON16"
-   elseif ( keyOrButton == "Button17" ) then
-      keyPressed = "BUTTON17"
-   elseif ( keyPressed == "Button18" ) then
-      keyPressed = "BUTTON18"
-   elseif ( keyOrButton == "Button19" ) then
-      keyPressed = "BUTTON19"
-   elseif ( keyPressed == "Button20" ) then
-      keyPressed = "BUTTON20"
-   elseif ( keyOrButton == "Button21" ) then
-      keyPressed = "BUTTON21"
-   elseif ( keyPressed == "Button22" ) then
-      keyPressed = "BUTTON22"
-   elseif ( keyOrButton == "Button23" ) then
-      keyPressed = "BUTTON23"
-   elseif ( keyPressed == "Button24" ) then
-      keyPressed = "BUTTON24"
-   elseif ( keyOrButton == "Button25" ) then
-      keyPressed = "BUTTON25"
-   elseif ( keyPressed == "Button26" ) then
-      keyPressed = "BUTTON26"
-   elseif ( keyOrButton == "Button27" ) then
-      keyPressed = "BUTTON27"
-   elseif ( keyPressed == "Button28" ) then
-      keyPressed = "BUTTON28"
-   elseif ( keyOrButton == "Button29" ) then
-      keyPressed = "BUTTON29"
-   elseif ( keyPressed == "Button30" ) then
-      keyPressed = "BUTTON30"
-   elseif ( keyOrButton == "Button31" ) then
-      keyPressed = "BUTTON31"
-   end
-   
-   if ( keyPressed == "LSHIFT" or
-	keyPressed == "RSHIFT" or
-	keyPressed == "LCTRL" or
-	keyPressed == "RCTRL" or
-	keyPressed == "LALT" or
-	keyPressed == "RALT" ) then
-      return;
-   end
-   if ( IsShiftKeyDown() ) then
-      keyPressed = "SHIFT-"..keyPressed
-   end
-   if ( IsControlKeyDown() ) then
-      keyPressed = "CTRL-"..keyPressed
-   end
-   if ( IsAltKeyDown() ) then
-      keyPressed = "ALT-"..keyPressed
-   end
-   if ( keyPressed == "BUTTON1" or keyPressed == "BUTTON2" ) then
-      return;
-   end
-	 
-	 CyborgMMO_SetNewKeybind(keyPressed)
-	 
+	if keyOrButton == "ESCAPE" then
+		CyborgMMO_BindingFrame:Hide()
+		return
+	end
+
+	if GetBindingFromClick(keyOrButton) == "SCREENSHOT" then
+		RunBinding("SCREENSHOT")
+		return
+	end
+
+	local keyPressed = keyOrButton
+
+	if keyPressed == "UNKNOWN" then
+		return
+	end
+
+	-- Convert the mouse button names
+	if keyPressed == "LeftButton" then
+		keyPressed = "BUTTON1"
+	elseif keyPressed == "RightButton" then
+		keyPressed = "BUTTON2"
+	elseif keyPressed == "MiddleButton" then
+		keyPressed = "BUTTON3"
+	elseif keyPressed == "Button4" then
+		keyPressed = "BUTTON4"
+	elseif keyOrButton == "Button5" then
+		keyPressed = "BUTTON5"
+	elseif keyPressed == "Button6" then
+		keyPressed = "BUTTON6"
+	elseif keyOrButton == "Button7" then
+		keyPressed = "BUTTON7"
+	elseif keyPressed == "Button8" then
+		keyPressed = "BUTTON8"
+	elseif keyOrButton == "Button9" then
+		keyPressed = "BUTTON9"
+	elseif keyPressed == "Button10" then
+		keyPressed = "BUTTON10"
+	elseif keyOrButton == "Button11" then
+		keyPressed = "BUTTON11"
+	elseif keyPressed == "Button12" then
+		keyPressed = "BUTTON12"
+	elseif keyOrButton == "Button13" then
+		keyPressed = "BUTTON13"
+	elseif keyPressed == "Button14" then
+		keyPressed = "BUTTON14"
+	elseif keyOrButton == "Button15" then
+		keyPressed = "BUTTON15"
+	elseif keyPressed == "Button16" then
+		keyPressed = "BUTTON16"
+	elseif keyOrButton == "Button17" then
+		keyPressed = "BUTTON17"
+	elseif keyPressed == "Button18" then
+		keyPressed = "BUTTON18"
+	elseif keyOrButton == "Button19" then
+		keyPressed = "BUTTON19"
+	elseif keyPressed == "Button20" then
+		keyPressed = "BUTTON20"
+	elseif keyOrButton == "Button21" then
+		keyPressed = "BUTTON21"
+	elseif keyPressed == "Button22" then
+		keyPressed = "BUTTON22"
+	elseif keyOrButton == "Button23" then
+		keyPressed = "BUTTON23"
+	elseif keyPressed == "Button24" then
+		keyPressed = "BUTTON24"
+	elseif keyOrButton == "Button25" then
+		keyPressed = "BUTTON25"
+	elseif keyPressed == "Button26" then
+		keyPressed = "BUTTON26"
+	elseif keyOrButton == "Button27" then
+		keyPressed = "BUTTON27"
+	elseif keyPressed == "Button28" then
+		keyPressed = "BUTTON28"
+	elseif keyOrButton == "Button29" then
+		keyPressed = "BUTTON29"
+	elseif keyPressed == "Button30" then
+		keyPressed = "BUTTON30"
+	elseif keyOrButton == "Button31" then
+		keyPressed = "BUTTON31"
+	end
+
+	if keyPressed == "LSHIFT" or
+	   keyPressed == "RSHIFT" or
+	   keyPressed == "LCTRL" or
+	   keyPressed == "RCTRL" or
+	   keyPressed == "LALT" or
+	   keyPressed == "RALT" then
+		return
+	end
+	if IsShiftKeyDown() then
+		keyPressed = "SHIFT-"..keyPressed
+	end
+	if IsControlKeyDown() then
+		keyPressed = "CTRL-"..keyPressed
+	end
+	if IsAltKeyDown() then
+		keyPressed = "ALT-"..keyPressed
+	end
+	if keyPressed == "BUTTON1" or keyPressed == "BUTTON2" then
+		return
+	end
+
+	CyborgMMO_SetNewKeybind(keyPressed)
 end