Merge pull request #396 from kynora/development

Virtual Keyboard named "Keyboard" confuse with ActionMap binding.

modules/KeyboardToy/1/ChangeUsernameDlg.gui.taml

@@ -19,7 +19,7 @@
 		Extent="250 40"
 		minExtent="8 8"
 		Visible="1"
-		AltCommand="Keyboard.pop();UserNameTxt.setText(ChangeUsernameEntry.getText());"
+		AltCommand="VirtualKeyboard.pop();UserNameTxt.setText(ChangeUsernameEntry.getText());"
 		HelpTag="0"
 		MaxLength="255"
 		HistorySize="40"
@@ -33,7 +33,7 @@
 		Profile="BlueButtonProfile"
 		Text="Cancel"
 		ButtonType="PushButton"
-		command="Keyboard.pop();"
+		command="VirtualKeyboard.pop();"
 		canSaveDynamicFields="0"
 		isContainer="0"
 		HorizSizing="relative"
@@ -52,7 +52,7 @@
 		Profile="BlueButtonProfile"
 		Text="OK"
 		ButtonType="PushButton"
-		command="Keyboard.pop();UserNameTxt.setText(ChangeUsernameEntry.getText());"
+		command="VirtualKeyboard.pop();UserNameTxt.setText(ChangeUsernameEntry.getText());"
 		canSaveDynamicFields="0"
 		isContainer="0"
 		HorizSizing="relative"

modules/KeyboardToy/1/MainGameDlg.gui.taml

@@ -33,7 +33,7 @@
 		Profile="BlueButtonProfile"
 		Text="Change username"
 		ButtonType="PushButton"
-		command="Keyboard.push(ChangeUsernameDlg, ChangeUsernameEntry);"
+		command="VirtualKeyboard.push(ChangeUsernameDlg, ChangeUsernameEntry);"
 		canSaveDynamicFields="0"
 		isContainer="0"
 		HorizSizing="relative"

modules/KeyboardToy/1/module.taml

@@ -2,7 +2,7 @@
 	ModuleId="KeyboardToy"
 	VersionId="1"
 	Description="Display virtual keyboard."
-	Dependencies="Keyboard=1"
+	Dependencies="VirtualKeyboard=1"
 	Type="toy"
 	ToyCategoryIndex="7"
 	ScriptFile="main.cs"

modules/Keyboard/1/gui/keyboardGui.taml → modules/VirtualKeyboard/1/gui/keyboardGui.taml

@@ -22,7 +22,7 @@
       canSave = "1"
       Visible = "1"
       Active = "1"
-      Image = "Keyboard:keyboardAlpha">
+      Image = "VirtualKeyboard:keyboardAlpha">
       
       <GuiImageButtonCtrl
          HorizSizing = "relative"
@@ -39,10 +39,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(Q,1,"[");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(Q,1,"[");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -58,10 +58,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(W,2,"]");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(W,2,"]");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -77,10 +77,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(E,3,"{");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(E,3,"{");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -96,10 +96,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(R,4,"}");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(R,4,"}");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -115,10 +115,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(T,5,"#");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(T,5,"#");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -134,10 +134,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(Y,6,"%");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(Y,6,"%");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -153,10 +153,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(U,7,"^");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(U,7,"^");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -172,10 +172,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(I,8, "*");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(I,8, "*");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -191,10 +191,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(O, 9, "+");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(O, 9, "+");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -210,10 +210,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(P,0,"=");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(P,0,"=");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -229,10 +229,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(A,"-", "_");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(A,"-", "_");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -248,10 +248,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(S,"\/","\\");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(S,"\/","\\");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -267,10 +267,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(D,":","|");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(D,":","|");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -286,10 +286,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(F,";","~");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(F,";","~");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -305,10 +305,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(G,"(","<");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(G,"(","<");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -324,10 +324,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(H,")",">");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(H,")",">");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -343,10 +343,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(J,"$","€");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(J,"$","€");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -362,10 +362,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(K,"","£");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(K,"","£");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -381,10 +381,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(L,"@","¥");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(L,"@","¥");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -400,10 +400,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(Z,".",".");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(Z,".",".");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -419,10 +419,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(X,",",",");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(X,",",",");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -438,10 +438,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(C,"?","?");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(C,"?","?");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -457,10 +457,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(V,"!","!");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(V,"!","!");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -476,10 +476,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(B,"","");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(B,"","");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -495,10 +495,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(N,"\"","\"");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(N,"\"","\"");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -514,10 +514,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command='Keyboard.KeyPress(M,".",".");'/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command='VirtualKeyboard.KeyPress(M,".",".");'/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -533,10 +533,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command="Keyboard.KeyPress(DELETE);"/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command="VirtualKeyboard.KeyPress(DELETE);"/>
       <GuiImageButtonCtrl
          HorizSizing = "relative"
          VertSizing = "relative"
@@ -552,10 +552,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:spaceBarD"
-         NormalImage = "Keyboard:spaceBar"
-         HoverImage = "Keyboard:spaceBar"
-         command="Keyboard.KeyPress(SPACE);"/>
+         DownImage = "VirtualKeyboard:spaceBarD"
+         NormalImage = "VirtualKeyboard:spaceBar"
+         HoverImage = "VirtualKeyboard:spaceBar"
+         command="VirtualKeyboard.KeyPress(SPACE);"/>
          
       <GuiImageButtonCtrl
          name = "toUpperBtn"
@@ -573,10 +573,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         command = "Keyboard.toUpper();"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"/>
+         command = "VirtualKeyboard.toUpper();"
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"/>
          
       <GuiImageButtonCtrl
          name = "toUpperLockBtn"
@@ -594,10 +594,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         command = "Keyboard.toUpperLock();"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"/>
+         command = "VirtualKeyboard.toUpperLock();"
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"/>
          
       <GuiImageButtonCtrl
          name = "toLower_UpperLockBtn"
@@ -615,10 +615,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         command = "Keyboard.toLower();"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbD"
-         HoverImage = "Keyboard:kbbD"/>
+         command = "VirtualKeyboard.toLower();"
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbD"
+         HoverImage = "VirtualKeyboard:kbbD"/>
       <GuiImageButtonCtrl
          name = "toLowerBtn"
          HorizSizing = "relative"
@@ -635,10 +635,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         command = "Keyboard.toLower();"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"/>
+         command = "VirtualKeyboard.toLower();"
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"/>
          
       <GuiImageButtonCtrl
          name = "toNumberBtn"
@@ -656,10 +656,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command = "Keyboard.toNumber();"/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command = "VirtualKeyboard.toNumber();"/>
          
       <GuiImageButtonCtrl
          name = "toLower_NumberBtn"
@@ -677,10 +677,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command = "Keyboard.tolower();"/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command = "VirtualKeyboard.tolower();"/>
          
       <GuiImageButtonCtrl
          name = "toSymbolBtn"
@@ -698,10 +698,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command = "Keyboard.toSymbol();"/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command = "VirtualKeyboard.toSymbol();"/>
       <GuiImageButtonCtrl
          name = "toNumber_SymbolBtn"
          HorizSizing = "relative"
@@ -718,10 +718,10 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         DownImage = "Keyboard:kbbD"
-         NormalImage = "Keyboard:kbbN"
-         HoverImage = "Keyboard:kbbN"
-         command = "Keyboard.toNumber();"/>
+         DownImage = "VirtualKeyboard:kbbD"
+         NormalImage = "VirtualKeyboard:kbbN"
+         HoverImage = "VirtualKeyboard:kbbN"
+         command = "VirtualKeyboard.toNumber();"/>
          
       <GuiImageButtonCtrl
          name = "keyCloseBtn"
@@ -739,11 +739,11 @@
          groupNum = "-1"
          buttonType = "PushButton"
          useMouseEvents = "1"
-         NormalImage = "Keyboard:closeBtn"
-         DownImage = "Keyboard:closeBtn"
-         HoverImage = "Keyboard:closeBtn"
-         InactiveImage = "Keyboard:closeBtn"
-         command="Keyboard.KeyPress(CLOSE);"/>
+         NormalImage = "VirtualKeyboard:closeBtn"
+         DownImage = "VirtualKeyboard:closeBtn"
+         HoverImage = "VirtualKeyboard:closeBtn"
+         InactiveImage = "VirtualKeyboard:closeBtn"
+         command="VirtualKeyboard.KeyPress(CLOSE);"/>
    </GuiSpriteCtrl>
    
 </GuiControl>

modules/Keyboard/1/main.cs → modules/VirtualKeyboard/1/main.cs

@@ -1,22 +1,22 @@
-function Keyboard::create(%this)
+function VirtualKeyboard::create(%this)
 {
    %this.resetState();
    
 }
 
-function Keyboard::destroy(%this)
+function VirtualKeyboard::destroy(%this)
 {
    
 }
 
-function Keyboard::resetState(%this)
+function VirtualKeyboard::resetState(%this)
 {
    %this.state = "toLower";
    %this.dock = "bottom";
    %this.targetGui ="";
    %this.textBox = "";
 }
-function Keyboard::push(%this, %targetGui, %textBox, %showClose)
+function VirtualKeyboard::push(%this, %targetGui, %textBox, %showClose)
 {
    Sandbox.add( TamlRead("./gui/keyboardGui.taml") );
    %textBox.setText("");
@@ -38,7 +38,7 @@ function Keyboard::push(%this, %targetGui, %textBox, %showClose)
    
 }
 
-function Keyboard::Pop(%this)
+function VirtualKeyboard::Pop(%this)
 {
    KeyboardSet.delete();
    KeyboardGui.delete();
@@ -46,7 +46,7 @@ function Keyboard::Pop(%this)
    %this.resetState();
 }
 
-function Keyboard::toLower(%this)
+function VirtualKeyboard::toLower(%this)
 {
    %this.state = "toLower";
    toLower_NumberBtn.visible = false;
@@ -58,11 +58,11 @@ function Keyboard::toLower(%this)
    
    toUpperBtn.visible = true;
    toNumberBtn.visible = true;
-   keyboardSet.Image = "Keyboard:keyboardAlphaLower";
+   keyboardSet.Image = "VirtualKeyboard:keyboardAlphaLower";
    
 }
 
-function Keyboard::toUpper(%this)
+function VirtualKeyboard::toUpper(%this)
 {
    %this.state = "toUpper";
    toUpperBtn.visible = false;
@@ -74,10 +74,10 @@ function Keyboard::toUpper(%this)
 
    toUpperLockBtn.visible =true;
    toNumberBtn.visible = true;
-   keyboardSet.Image = "Keyboard:keyboardAlpha";
+   keyboardSet.Image = "VirtualKeyboard:keyboardAlpha";
 }
 
-function Keyboard::toUpperLock(%this)
+function VirtualKeyboard::toUpperLock(%this)
 {
    %this.state = "toUpperLock";
    toUpperBtn.visible = false;
@@ -89,10 +89,10 @@ function Keyboard::toUpperLock(%this)
    
    toLower_UpperLockBtn.visible = true;
    toNumberBtn.visible = true;
-   keyboardSet.Image = "Keyboard:keyboardAlpha";
+   keyboardSet.Image = "VirtualKeyboard:keyboardAlpha";
 }
 
-function Keyboard::toNumber(%this)
+function VirtualKeyboard::toNumber(%this)
 {
    %this.state = "toNumber";
    toNumberBtn.visible = false;
@@ -104,10 +104,10 @@ function Keyboard::toNumber(%this)
    
    toSymbolBtn.visible = true;
    toLower_NumberBtn.visible = true;
-   keyboardSet.Image = "Keyboard:keyboardNumber";
+   keyboardSet.Image = "VirtualKeyboard:keyboardNumber";
 }
 
-function Keyboard::toSymbol(%this)
+function VirtualKeyboard::toSymbol(%this)
 {
    %this.state = "toSymbol";
    toSymbolBtn.visible = false;
@@ -120,11 +120,11 @@ function Keyboard::toSymbol(%this)
    toNumber_symbolBtn.visible = true;
    toLower_NumberBtn.visible = true;
    
-   keyboardSet.Image = "Keyboard:keyboardSymbol";
+   keyboardSet.Image = "VirtualKeyboard:keyboardSymbol";
 }
 
 
-function Keyboard::KeyPress(%this, %letter, %number, %symbol)
+function VirtualKeyboard::KeyPress(%this, %letter, %number, %symbol)
 {
    if (%letter $= "close")
       %this.schedule(50, "Pop");
@@ -137,7 +137,7 @@ function Keyboard::KeyPress(%this, %letter, %number, %symbol)
 }
 
 
-function Keyboard::InsertChar(%this, %letter, %number, %symbol)
+function VirtualKeyboard::InsertChar(%this, %letter, %number, %symbol)
 {
    if (strlen(%this.textBox.getText()) >= %this.textBox.MaxLength)
       return;
@@ -175,7 +175,7 @@ function Keyboard::InsertChar(%this, %letter, %number, %symbol)
    }
 }
 
-function Keyboard::DeleteCommand(%this)
+function VirtualKeyboard::DeleteCommand(%this)
 {
    %len = strlen(%this.textBox.getText());
    if (%len > 0)
@@ -220,6 +220,6 @@ if(!isObject(GuiKeyboardProfile)) new GuiControlProfile (GuiKeyboardProfile)
     cursorColor = "0 0 0 255";
 
     // sounds
-    soundButtonDown = "Keyboard:keypress";
+    soundButtonDown = "VirtualKeyboard:keypress";
     //soundButtonOver = "Sandbox:mouseOver";
 };

modules/Keyboard/1/module.taml → modules/VirtualKeyboard/1/module.taml

@@ -1,5 +1,5 @@
 <ModuleDefinition
-	ModuleId="Keyboard"
+	ModuleId="VirtualKeyboard"
 	VersionId="1"
 	ScriptFile="main.cs"
 	CreateFunction="create"