Added whiteboard localization strings to en_US .properties file

bigbluebutton-client/locale/en_US/bbbResources.properties

@@ -154,4 +154,16 @@ bbb.desktopPublish.title = Desktop Sharing
 # ToolbarButton.mxml
 bbb.toolbar.phone.toolTip = Start My Microphone
 bbb.toolbar.deskshare.toolTip = Share your desktop
-bbb.toolbar.video.toolTip = Start My Camera
+bbb.toolbar.video.toolTip = Start My Camera
+
+# HighlighterToolbar.mxml
+bbb.highlighter.toolbar.pencil = Highlighter
+bbb.highlighter.toolbar.ellipse = Circle
+bbb.highlighter.toolbar.rectangle = Rectangle
+bbb.highlighter.toolbar.clear = Clear Page
+bbb.highlighter.toolbar.undo = Undo Shape
+bbb.highlighter.toolbar.color = Select Color
+bbb.highlighter.toolbar.thickness = Change Thickness
+
+# WhiteboardButton.mxml
+bbb.highlighter.button.toolTip = Whiteboard

bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainCanvas.mxml

@@ -72,7 +72,7 @@
 						win.height = leftWindowHeight;
 						break;
 					case MIDDLE:
-						x = leftWindowWidth + 10; //this.width - rightWindowWidth - centerWindowWidth + 20;
+						x = leftWindowWidth + 10;
 						y = 1;
 						win.width = centerWindowWidth;
 						win.height = centerWindowHeight;

bigbluebutton-client/src/org/bigbluebutton/modules/highlighter/views/HighlighterToolbar.mxml

@@ -44,6 +44,7 @@
 			import org.bigbluebutton.modules.highlighter.events.WhiteboardButtonEvent;
 			import org.bigbluebutton.modules.present.events.PresentationEvent;
 			import org.bigbluebutton.modules.present.views.PresentationWindow;
+			import org.bigbluebutton.util.i18n.ResourceUtil;
 			
 			private var images:Images = new Images();
 			[Bindable] private var pencil_icon:Class = images.pencil_icon;
@@ -161,16 +162,25 @@
 			
 		]]>
 	</mx:Script>
-	<mx:Button width="20" height="20" id="btnPenc" click="setShape(DrawObject.PENCIL)"  icon="{pencil_icon}" toolTip="Highlighter" toggle="true" selected="true" />
-	<mx:Button width="20" height="20" id="btnRectangle" click="setShape(DrawObject.RECTANGLE)" icon="{rectangle_icon}" toolTip="Rectangle" toggle="true" />
-	<mx:Button width="20" height="20" id="btnEllipse" click="setShape(DrawObject.ELLIPSE)" icon="{ellipse_icon}" toolTip="Circle" toggle="true" />
+	<mx:Button width="20" height="20" id="btnPenc" click="setShape(DrawObject.PENCIL)"  icon="{pencil_icon}" 
+			   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.pencil')}" toggle="true" selected="true" />
+	<mx:Button width="20" height="20" id="btnRectangle" click="setShape(DrawObject.RECTANGLE)" icon="{rectangle_icon}" 
+			   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.rectangle')}" toggle="true" />
+	<mx:Button width="20" height="20" id="btnEllipse" click="setShape(DrawObject.ELLIPSE)" icon="{ellipse_icon}" 
+			   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.ellipse')}" toggle="true" />
+	
 	<mx:Spacer height="5" />
-	<mx:Button width="20" height="20" id="btnClear" click="dispatchEvent(new HighlighterDrawEvent(HighlighterDrawEvent.CLEAR_BOARD))" icon="{delete_icon}" toolTip="Clear Page" />
-	<mx:Button width="20" height="20" id="btnUndo"  click="sendUndoCommand()" icon="{undo_icon}" toolTip="Undo Shape" />
+	<mx:Button width="20" height="20" id="btnClear" click="dispatchEvent(new HighlighterDrawEvent(HighlighterDrawEvent.CLEAR_BOARD))" icon="{delete_icon}" 
+			   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.clear')}" />
+	<mx:Button width="20" height="20" id="btnUndo"  click="sendUndoCommand()" icon="{undo_icon}" 
+			   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.undo')}" />
+	
 	<mx:Spacer height="5" />
-	<mx:ColorPicker change="changeColor(event)" id="cpik" swatchPanelStyleName="colorPickerStyle" dataProvider="{colorPickerColours}" selectedColor="0x000000" toolTip="Select Color"/>
+	<mx:ColorPicker change="changeColor(event)" id="cpik" swatchPanelStyleName="colorPickerStyle" dataProvider="{colorPickerColours}" selectedColor="0x000000" 
+					toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.color')}"/>
+	
 	<mx:Spacer height="3" />
-	<mx:VSlider height="50" id="sld" change="changeThickness(event)" toolTip="Change Thickness" minimum="1" maximum="20" 
+	<mx:VSlider height="50" id="sld" change="changeThickness(event)" toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.thickness')}" minimum="1" maximum="20" 
 				useHandCursor="true" value="1" showDataTip="false" snapInterval="1" />
 	
 </mx:VBox>

bigbluebutton-client/src/org/bigbluebutton/modules/highlighter/views/WhiteboardButton.mxml

 <?xml version="1.0" encoding="utf-8"?>
 <mx:Button xmlns:mx="http://www.adobe.com/2006/mxml" icon="{whiteboard_icon}" width="20" height="20" click="toggleWhiteboard()" visible="false"
-	implements="org.bigbluebutton.modules.present.api.IPresentationButton" xmlns:mate="http://mate.asfusion.com/" toggle="true" >
+	implements="org.bigbluebutton.modules.present.api.IPresentationButton" xmlns:mate="http://mate.asfusion.com/" toggle="true" 
+	toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.button.toolTip')}" >
+	
 	<mx:Script>
 		<![CDATA[
 			import mx.controls.Alert;
@@ -11,6 +13,7 @@
 			import org.bigbluebutton.modules.highlighter.events.HighlighterUpdate;
 			import org.bigbluebutton.modules.highlighter.events.WhiteboardButtonEvent;
 			import org.bigbluebutton.modules.present.views.PresentationWindow;
+			import org.bigbluebutton.util.i18n.ResourceUtil;
 			
 			private var images:Images = new Images();
 			[Bindable] private var whiteboard_icon:Class = images.whiteboard;