diff --git a/bigbluebutton-apps/.classpath.old b/bigbluebutton-apps/.classpath.old index 065fe37b812e..d8de8d6afb2e 100644 --- a/bigbluebutton-apps/.classpath.old +++ b/bigbluebutton-apps/.classpath.old @@ -1,7 +1,7 @@ + - - + diff --git a/bigbluebutton-client/.actionScriptProperties b/bigbluebutton-client/.actionScriptProperties index 1ba615aba023..cbdc570b923a 100755 --- a/bigbluebutton-client/.actionScriptProperties +++ b/bigbluebutton-client/.actionScriptProperties @@ -1,6 +1,6 @@ - + @@ -14,17 +14,16 @@ - + - @@ -36,7 +35,6 @@ - @@ -53,8 +51,6 @@ - - diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index 8fbf9fcf1953..a49c3aa6b9a8 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -132,7 +132,6 @@ bbb.desktopView.actualSize = Display actual size bbb.toolbar.phone.toolTip = Share My Microphone bbb.toolbar.deskshare.toolTip = Share My Desktop bbb.toolbar.video.toolTip = Share My Camera -<<<<<<< HEAD bbb.layout.addButton.toolTip = Add the custom layout to the list bbb.layout.combo.toolTip = Change the current layout bbb.layout.loadButton.toolTip = Load layouts from a file @@ -146,9 +145,7 @@ bbb.layout.save.complete = Layouts were successfully saved bbb.layout.load.complete = Layouts were successfully loaded bbb.layout.load.failed = Failed to load the layouts bbb.highlighter.toolbar.pencil = Highlighter -======= bbb.highlighter.toolbar.pencil = Pencil ->>>>>>> ajay/bbb-whiteboard-additions bbb.highlighter.toolbar.ellipse = Circle bbb.highlighter.toolbar.rectangle = Rectangle bbb.highlighter.toolbar.clear = Clear Page diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/Images.as b/bigbluebutton-client/src/org/bigbluebutton/common/Images.as index 229493f7ed90..145c1fa2980c 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/common/Images.as +++ b/bigbluebutton-client/src/org/bigbluebutton/common/Images.as @@ -182,21 +182,19 @@ package org.bigbluebutton.common [Embed(source="assets/images/shape_handles.png")] public var shape_handles:Class; -<<<<<<< HEAD [Embed(source="assets/images/disk.png")] public var disk:Class; [Embed(source="assets/images/folder.png")] public var folder:Class; -======= - + // PLACE CUSTOM IMAGES BELOW [Embed(source="assets/images/line.png")] public var line_icon:Class; - [Embed(source="assets/images/text_icon.png")] - public var text_icon:Class; +// [Embed(source="assets/images/text_icon.png")] +// public var text_icon:Class; [Embed(source="assets/images/fill_icon.png")] public var fill_icon:Class; @@ -221,6 +219,5 @@ package org.bigbluebutton.common [Embed(source="assets/images/grid_icon.png")] public var grid_icon:Class; ->>>>>>> ajay/bbb-whiteboard-additions } } \ No newline at end of file diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml index 14a2a413c126..499c23b2bf5c 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml @@ -77,201 +77,7 @@ import org.bigbluebutton.main.events.RecordStatusEvent; import org.bigbluebutton.main.events.SuccessfulLoginEvent; import org.bigbluebutton.main.model.LayoutOptions; - import org.bigbluebutton.main.model.users.events.ConnectionFailedEvent; -<<<<<<< HEAD - import org.bigbluebutton.util.i18n.ResourceUtil; - import org.bigbluebutton.util.logging.Logger; - - private var globalDispatcher:Dispatcher; - private var dispState:String; //full-screen? - private var images:Images = new Images(); - private var stoppedModules:ArrayCollection; - private var logs:Logger = new Logger(); - private var logWindow:LogWindow; - private var logoutWindow:LoggedOutWindow; - private var connectionLostWindow:ConnectionLostWindow; - - // LIVE or PLAYBACK - private var _mode:String = 'LIVE'; - [Bindable] public var appVersion:String = ' '; - private var localeVersion:String = 'old'; - [Bindable] public var numberOfModules:int = 0; - - [Bindable] private var fullscreen_icon:Class = images.full_screen; - [Bindable] private var logs_icon:Class = images.table; - [Bindable] private var reset_layout_icon:Class = images.layout; - - private var receivedConfigLocaleVer:Boolean = false; - private var receivedResourceLocaleVer:Boolean = false; - - public function get mode():String { - return _mode; - } - - [Bindable] private var layoutOptions:LayoutOptions; - - [Bindable] private var showToolbarOpt:Boolean = true; - - public function initOptions(e:Event):void { - LogUtil.debug("**** Init layout options ***"); - layoutOptions = new LayoutOptions(); - layoutOptions.parseOptions(); - showToolbarOpt = layoutOptions.showToolbar; - LogUtil.debug("*** show toolbar = " + layoutOptions.showToolbar); - toolbar.displayToolbar(); - } - - protected function initializeShell():void { - globalDispatcher = new Dispatcher(); - } - - protected function initFullScreen():void { - /* Set up full screen handler. */ - stage.addEventListener(FullScreenEvent.FULL_SCREEN, fullScreenHandler); - dispState = stage.displayState; - } - - private var sendStartModulesEvent:Boolean = true; - - private function handleApplicationVersionEvent(event:AppVersionEvent):void { - if (event.configLocaleVersion == true) { - receivedConfigLocaleVer = true; - appVersion = event.appVersion; - localeVersion = event.localeVersion; - LogUtil.debug("Received locale version from config.xml"); - } else { - receivedResourceLocaleVer = true; - LogUtil.debug("Received locale version from locale file."); - } - - if (receivedConfigLocaleVer && receivedResourceLocaleVer) { - LogUtil.debug("Comparing locale versions."); - if (!event.suppressLocaleWarning) checkLocaleVersion(localeVersion); - if (sendStartModulesEvent) { - sendStartModulesEvent = false; - sendStartAllModulesEvent(); - } - } - } - - public function sendStartAllModulesEvent():void{ - LogUtil.debug("Sending start all modules event"); - var dispatcher:Dispatcher = new Dispatcher(); - dispatcher.dispatchEvent(new ModuleLoadEvent(ModuleLoadEvent.START_ALL_MODULES)); - } - - private function fullScreenHandler(evt:FullScreenEvent):void { - dispState = stage.displayState + " (fullScreen=" + evt.fullScreen.toString() + ")"; - if (evt.fullScreen) { - LogUtil.debug("Switching to full screen"); - /* Do something specific here if we switched to full screen mode. */ - - } else { - LogUtil.debug("Switching to normal screen"); - /* Do something specific here if we switched to normal mode. */ - } - } - - private function openLogWindow():void { - if (logWindow == null){ - logWindow = new LogWindow(); - logWindow.logs = logs; - } - mdiCanvas.windowManager.add(logWindow); - mdiCanvas.windowManager.absPos(logWindow, 50, 50); - logWindow.width = mdiCanvas.width - 100; - logWindow.height = mdiCanvas.height - 100; - } - - private function toggleFullScreen():void{ - LogUtil.debug("Toggling fullscreen"); - try { - switch (stage.displayState) { - case StageDisplayState.FULL_SCREEN: - LogUtil.debug("full screen mode"); - // If already in full screen mode, switch to normal mode. - stage.displayState = StageDisplayState.NORMAL; - break; - default: - LogUtil.debug("Normal screen mode"); - // If not in full screen mode, switch to full screen mode. - stage.displayState = StageDisplayState.FULL_SCREEN; - break; - } - } catch (err:SecurityError) { - // ignore - } - } - - private function handleOpenWindowEvent(event:OpenWindowEvent):void { - - var window:IBbbModuleWindow = event.window; - mdiCanvas.addWindow(window); - } - - private function handleCloseWindowEvent(event:CloseWindowEvent):void { - var window:IBbbModuleWindow = event.window; - mdiCanvas.removeWindow(window); - } - - private function resetLayout():void{ - mdiCanvas.resetWindowLayout(); - } - - private function addComponentToCanvas(e:AddUIComponentToMainCanvas):void{ - mdiCanvas.addChild(e.component); - } - - public function checkLocaleVersion(localeVersion:String):void { - Alert.okLabel ="OK"; - var version:String = "old-locales"; - version = ResourceUtil.getInstance().getString('bbb.mainshell.locale.version'); - LogUtil.debug("Locale from config=" + localeVersion + ", from locale file=" + version); - - if ((version == "old-locales") || (version == "") || (version == null)) { - wrongLocaleVersion(); - } else { - if (version != localeVersion) wrongLocaleVersion(); - } - } - - private function showMicSettings(event:BBBEvent):void { - var micSettings:MicSettings = MicSettings(PopUpManager.createPopUp(mdiCanvas, MicSettings, true)); - var point1:Point = new Point(); - // Calculate position of TitleWindow in Application's coordinates. - point1.x = width/2; - point1.y = height/2; - micSettings.x = point1.x - (micSettings.width/2); - micSettings.y = point1.y - (micSettings.height/2); - } - - private function wrongLocaleVersion():void { - var localeWindow:OldLocaleWarnWindow = OldLocaleWarnWindow(PopUpManager.createPopUp(mdiCanvas, OldLocaleWarnWindow, false)); - - var point1:Point = new Point(); - // Calculate position of TitleWindow in Application's coordinates. - point1.x = width/2; - point1.y = height/2; - localeWindow.x = point1.x - (localeWindow.width/2); - localeWindow.y = point1.y - (localeWindow.height/2); - } - - private function handleLogout(e:ConnectionFailedEvent):void { - if (layoutOptions.showLogoutWindow) { - if (logoutWindow != null) return; - logoutWindow = LoggedOutWindow(PopUpManager.createPopUp( mdiCanvas, LoggedOutWindow, false)); - - var point1:Point = new Point(); - // Calculate position of TitleWindow in Application's coordinates. - point1.x = width/2; - point1.y = height/2; - logoutWindow.x = point1.x - (logoutWindow.width/2); - logoutWindow.y = point1.y - (logoutWindow.height/2); - - if (e is ConnectionFailedEvent) logoutWindow.setReason((e as ConnectionFailedEvent).type); - else logoutWindow.setReason("You have logged out of the conference"); - -======= + import org.bigbluebutton.main.model.users.events.ConnectionFailedEvent; import org.bigbluebutton.util.i18n.ResourceUtil; import org.bigbluebutton.util.logging.Logger; @@ -464,7 +270,6 @@ if (e is ConnectionFailedEvent) logoutWindow.setReason((e as ConnectionFailedEvent).type); else logoutWindow.setReason("You have logged out of the conference"); ->>>>>>> ajay/bbb-whiteboard-additions mdiCanvas.removeAllWindows(); } else { mdiCanvas.removeAllWindows(); @@ -517,14 +322,9 @@ - -<<<<<<< HEAD - - -======= + - ->>>>>>> ajay/bbb-whiteboard-additions + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as index b67eb7384059..38078e7b3ae6 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as @@ -2,8 +2,7 @@ package org.bigbluebutton.modules.whiteboard { import flash.display.DisplayObject; import flash.display.Shape; - import flash.display.Sprite; -<<<<<<< HEAD + import flash.display.Sprite; import flash.events.KeyboardEvent; import flash.events.MouseEvent; import flash.events.TextEvent; @@ -15,8 +14,7 @@ package org.bigbluebutton.modules.whiteboard import mx.controls.TextInput; import mx.core.Application; import mx.core.UIComponent; - import mx.managers.CursorManager; -======= + import mx.managers.CursorManager; import flash.events.FocusEvent; import flash.events.KeyboardEvent; import flash.events.TextEvent; @@ -24,9 +22,7 @@ package org.bigbluebutton.modules.whiteboard import flash.text.TextFieldAutoSize; import flash.ui.Keyboard; - import mx.collections.ArrayCollection; - ->>>>>>> ajay/bbb-whiteboard-additions + import mx.collections.ArrayCollection; import org.bigbluebutton.common.IBbbCanvas; import org.bigbluebutton.common.LogUtil; import org.bigbluebutton.main.events.MadePresenterEvent; @@ -35,14 +31,13 @@ package org.bigbluebutton.modules.whiteboard import org.bigbluebutton.modules.whiteboard.business.shapes.GraphicFactory; import org.bigbluebutton.modules.whiteboard.business.shapes.GraphicObject; import org.bigbluebutton.modules.whiteboard.business.shapes.ShapeFactory; -<<<<<<< HEAD + import org.bigbluebutton.modules.whiteboard.business.shapes.TextBox; -======= + import org.bigbluebutton.modules.whiteboard.business.shapes.TextFactory; import org.bigbluebutton.modules.whiteboard.business.shapes.TextObject; import org.bigbluebutton.modules.whiteboard.business.shapes.WhiteboardConstants; - import org.bigbluebutton.modules.whiteboard.events.GraphicObjectFocusEvent; ->>>>>>> ajay/bbb-whiteboard-additions + import org.bigbluebutton.modules.whiteboard.events.GraphicObjectFocusEvent; import org.bigbluebutton.modules.whiteboard.events.PageEvent; import org.bigbluebutton.modules.whiteboard.events.ToggleGridEvent; import org.bigbluebutton.modules.whiteboard.events.WhiteboardDrawEvent; @@ -71,12 +66,12 @@ package org.bigbluebutton.modules.whiteboard private var drawColor:uint = 0x000000; private var fillColor:uint = 0x000000; private var thickness:uint = 1; -<<<<<<< HEAD + private var _fontStyle:String = "_sans"; private var _fontSize:Number = 18; private var _textText:String = "Hello BBB!"; -======= + private var fillOn:Boolean = false; private var transparencyOn:Boolean = false; @@ -101,12 +96,12 @@ package org.bigbluebutton.modules.whiteboard when erasing, for aesthetics */ private var sendEraserFrequency:uint = 20; ->>>>>>> ajay/bbb-whiteboard-additions + private var drawStatus:String = DrawObject.DRAW_START; private var textStatus:String = TextObject.TEXT_CREATED; private var width:Number; private var height:Number; -<<<<<<< HEAD + public function changeFontStyle(font:String):void { _fontStyle = font; @@ -116,17 +111,6 @@ package org.bigbluebutton.modules.whiteboard _fontSize = size; } - public function doMouseUp():void { - if (isDrawing) { - /** - * Check if we are drawing because when resizing the window, it generates - * a mouseUp event at the end of resize. We don't want to dispatch another - * shape to the viewers. - */ - isDrawing = false; - sendShapeToServer(DrawObject.DRAW_END); -======= - // isGrid represents the state of the current page (grid vs not grid) private var isGrid:Boolean = true; // drawGrid is the sprite added to the page when isGrid is true @@ -162,8 +146,7 @@ package org.bigbluebutton.modules.whiteboard sendShapeToServer(DrawObject.DRAW_END); } - } ->>>>>>> ajay/bbb-whiteboard-additions + } } } @@ -189,11 +172,9 @@ package org.bigbluebutton.modules.whiteboard break; } -<<<<<<< HEAD + // LogUtil.error("SEGMENT LENGTH = [" + segment.length + "] STATUS = [" + dobj.status + "]"); -======= - //LogUtil.error("SEGMENT LENGTH = [" + segment.length + "] STATUS = [" + dobj.status + "]"); ->>>>>>> ajay/bbb-whiteboard-additions + if (this.toolType == DrawObject.PENCIL || this.toolType == DrawObject.ERASER) { @@ -207,7 +188,7 @@ package org.bigbluebutton.modules.whiteboard wbCanvas.sendGraphicToServer(dobj, WhiteboardDrawEvent.SEND_SHAPE); } -<<<<<<< HEAD +/* public function doMouseDown(mouseX:Number, mouseY:Number):void { isDrawing = true; drawStatus = DrawObject.DRAW_START; @@ -220,7 +201,8 @@ package org.bigbluebutton.modules.whiteboard wbCanvas.unregisterForMouseEvents(); addTextFieldExample(); } -======= + } + */ private function sendTextToServer(status:String, tobj:TextObject):void { switch (status) { case TextObject.TEXT_CREATED: @@ -236,8 +218,7 @@ package org.bigbluebutton.modules.whiteboard break; } - wbCanvas.sendGraphicToServer(tobj, WhiteboardDrawEvent.SEND_TEXT); ->>>>>>> ajay/bbb-whiteboard-additions + wbCanvas.sendGraphicToServer(tobj, WhiteboardDrawEvent.SEND_TEXT); } private var tfe:TextFieldExample; @@ -251,17 +232,13 @@ package org.bigbluebutton.modules.whiteboard wbCanvas.addRawChild(tfe); } - -<<<<<<< HEAD - public function doMouseMove(mouseX:Number, mouseY:Number):void { - if (isDrawing){ -======= + public function doMouseDown(mouseX:Number, mouseY:Number):void{ if(graphicType == WhiteboardConstants.TYPE_SHAPE) { isDrawing = true; drawStatus = DrawObject.DRAW_START; segment = new Array(); ->>>>>>> ajay/bbb-whiteboard-additions + segment.push(mouseX); segment.push(mouseY); } else if(graphicType == WhiteboardConstants.TYPE_SELECTION) { @@ -310,11 +287,7 @@ package org.bigbluebutton.modules.whiteboard } } -<<<<<<< HEAD - public function drawSegment(event:WhiteboardUpdate):void { - var o:DrawObject = event.data; - draw(o); -======= + public function drawGraphic(event:WhiteboardUpdate):void{ var o:GraphicObject = event.data; var recvdShapes:Boolean = event.recvdShapes; @@ -326,8 +299,7 @@ package org.bigbluebutton.modules.whiteboard } else if(o.getGraphicType() == WhiteboardConstants.TYPE_TEXT) { var tobj:TextObject = o as TextObject; drawText(tobj, recvdShapes); - } ->>>>>>> ajay/bbb-whiteboard-additions + } } // Draws a DrawObject when/if it is received from the server @@ -379,13 +351,12 @@ package org.bigbluebutton.modules.whiteboard } } - private function addNewShape(o:DrawObject):void { -<<<<<<< HEAD + private function addNewShape(o:DrawObject):void { LogUtil.debug("Adding new shape"); if (o.getType() == DrawObject.TEXT) return; -======= + //LogUtil.debug("Adding new shape "); ->>>>>>> ajay/bbb-whiteboard-additions + var dobj:DrawObject = shapeFactory.makeShape(o); wbCanvas.addGraphic(dobj); graphicList.push(dobj); @@ -821,9 +792,8 @@ package org.bigbluebutton.modules.whiteboard return topMostObj; } -<<<<<<< HEAD - - private var _textShape:UIComponent; + + private var _textShape:UIComponent; // private var _currentText:TextInput; // private var _currentText:TextField = new TextField(); private var _currentText:TextBox; // = new TextBox(); @@ -942,9 +912,7 @@ package org.bigbluebutton.modules.whiteboard // set focus wbCanvas.stage.focus = _currentText; } -======= - ->>>>>>> ajay/bbb-whiteboard-additions + } } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as index 70466a1248b3..ca451b76139b 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as @@ -132,7 +132,7 @@ package org.bigbluebutton.modules.whiteboard.business private function handleUndoCommand(message:Object):void { LogUtil.debug("Handle Whiteboard Undo Command "); - dispatcher.dispatchEvent(new WhiteboardUpdate(WhiteboardUpdate.SHAPE_UNDONE)); +// dispatcher.dispatchEvent(new WhiteboardUpdate(WhiteboardUpdate.SHAPE_UNDONE)); } private function handleEnableWhiteboardCommand(message:Object):void { @@ -209,7 +209,7 @@ package org.bigbluebutton.modules.whiteboard.business public function getPageHistory(e:PageEvent):void { var nc:NetConnection = connection; -<<<<<<< HEAD + nc.call("whiteboard.setActivePage", new Responder( function(result:Object):void { // On successful result @@ -220,21 +220,6 @@ package org.bigbluebutton.modules.whiteboard.business // } else{ // LogUtil.debug("Whiteboard: Shapes up to date, no need to update"); // } -======= - nc.call( - "whiteboard.setActivePage",// Remote function name - new Responder( - // On successful result - function(result:Object):void { - if ((result as int) != e.graphicObjs.length) { - LogUtil.debug("Whiteboard: Need to retrieve shapes. Have " + e.graphicObjs.length + " on client, " - + (result as int) + " on server"); - LogUtil.debug("Whiteboard: Retrieving shapes on page" + e.pageNum); - getHistory(); - } else{ - LogUtil.debug("Whiteboard: Shapes up to date, no need to update"); - } ->>>>>>> ajay/bbb-whiteboard-additions }, function(status:Object):void { // status - On error occurred @@ -254,17 +239,16 @@ package org.bigbluebutton.modules.whiteboard.business * */ public function sendShape(e:WhiteboardDrawEvent):void{ -<<<<<<< HEAD - var shape:DrawObject = e.message; +// var shape:DrawObject = e.message; LogUtil.debug("*** Sending shape"); var annotation:Object = new Object(); - annotation["type"] = shape.getType(); - annotation["points"] = shape.getShapeArray(); - annotation["color"] = shape.getColor(); - annotation["thickness"] = shape.getThickness(); - annotation["id"] = shape.id; - annotation["status"] = shape.status; +// annotation["type"] = shape.getType(); +// annotation["points"] = shape.getShapeArray(); +// annotation["color"] = shape.getColor(); +// annotation["thickness"] = shape.getThickness(); +// annotation["id"] = shape.id; +// annotation["status"] = shape.status; var nc:NetConnection = connection; nc.call("whiteboard.sendAnnotation", new Responder( @@ -280,29 +264,6 @@ package org.bigbluebutton.modules.whiteboard.business ),//new Responder annotation ); -======= - var shape:DrawObject = e.message as DrawObject; - //LogUtil.debug("*** Sending shape"); - var nc:NetConnection = connection; - nc.call( - "whiteboard.sendShape",// Remote function name - new Responder( - // On successful result - function(result:Object):void { - //LogUtil.debug("Whiteboard::sendShape() "); - }, - // status - On error occurred - function(status:Object):void { - LogUtil.error("Error occurred:"); - for (var x:Object in status) { - LogUtil.error(x + " : " + status[x]); - } - } - ),//new Responder - shape.getShapeArray(), shape.getType(), shape.getColor(), shape.getThickness(), - shape.getFill(), shape.getFillColor(), shape.getTransparency(), shape.getGraphicID(), shape.status - ); //_netConnection.call ->>>>>>> ajay/bbb-whiteboard-additions } /** @@ -422,9 +383,6 @@ package org.bigbluebutton.modules.whiteboard.business //drawSO.send("undo"); } -<<<<<<< HEAD - -======= /** * Triggers the undo shape event on all clients * @@ -468,8 +426,7 @@ package org.bigbluebutton.modules.whiteboard.business LogUtil.debug("TOGGLE CALLBACK RECEIVED"); dispatcher.dispatchEvent(new ToggleGridEvent(ToggleGridEvent.GRID_TOGGLED)); } ->>>>>>> ajay/bbb-whiteboard-additions - + public function modifyEnabled(e:WhiteboardPresenterEvent):void{ var nc:NetConnection = connection; nc.call( @@ -500,20 +457,12 @@ package org.bigbluebutton.modules.whiteboard.business private function getHistory():void{ var nc:NetConnection = connection; nc.call( -<<<<<<< HEAD "whiteboard.requestAnnotationHistory",// Remote function name -======= - "whiteboard.getHistory",// Remote function name ->>>>>>> ajay/bbb-whiteboard-additions new Responder( // On successful result function(result:Object):void { LogUtil.debug("Whiteboard::getHistory() : retrieving whiteboard history"); -<<<<<<< HEAD // receivedShapesHistory(result); -======= - receivedGraphicsHistory(result); ->>>>>>> ajay/bbb-whiteboard-additions }, // status - On error occurred function(status:Object):void { diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as index 2163bbc15f20..2a6fab4d5551 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as @@ -17,13 +17,9 @@ * */ package org.bigbluebutton.modules.whiteboard.business.shapes -<<<<<<< HEAD -{ -======= { import flash.display.DisplayObject; - import flash.display.Shape; ->>>>>>> ajay/bbb-whiteboard-additions + import flash.display.Shape; import flash.display.Sprite; /** @@ -42,14 +38,10 @@ package org.bigbluebutton.modules.whiteboard.business.shapes public static const ERASER:String = "eraser"; public static const RECTANGLE:String = "rectangle"; public static const ELLIPSE:String = "ellipse"; -<<<<<<< HEAD - public static const TEXT:String = "text"; - -======= + public static const TEXT:String = "text"; public static const TRIANGLE:String = "triangle"; public static const LINE:String = "line"; ->>>>>>> ajay/bbb-whiteboard-additions protected var type:String; protected var shape:Array; protected var color:uint; @@ -66,10 +58,7 @@ package org.bigbluebutton.modules.whiteboard.business.shapes public static const DRAW_START:String = "DRAW_START"; public var status:String = DRAW_START; -<<<<<<< HEAD protected var _shape:Sprite = new Sprite(); -======= ->>>>>>> ajay/bbb-whiteboard-additions protected var _segment:Array; /** @@ -94,10 +83,10 @@ package org.bigbluebutton.modules.whiteboard.business.shapes this.optimize(); } -<<<<<<< HEAD - public function getShape():Sprite { - return _shape; -======= + +// public function getShape():Sprite { + // } + public function getGraphicType():String { return WhiteboardConstants.TYPE_SHAPE; } @@ -116,7 +105,6 @@ package org.bigbluebutton.modules.whiteboard.business.shapes public function normalize(val:Number, side:Number):Number { return (val*100.0)/side; ->>>>>>> ajay/bbb-whiteboard-additions } /** diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObjectFactory.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObjectFactory.as index cbda54f54196..68d2f250d4a9 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObjectFactory.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObjectFactory.as @@ -55,15 +55,6 @@ package org.bigbluebutton.modules.whiteboard.business.shapes } else if (type == DrawObject.RECTANGLE){ d = makeRectangle(shape, color, thickness, fill, fillColor, trans); } else if (type == DrawObject.ELLIPSE){ -<<<<<<< HEAD - d = makeEllipse(shape, color, thickness); - } else if (type == DrawObject.TEXT){ - d = makeText(shape, color, thickness); - d.getShapeArray().push(d.getShape().width); - d.getShapeArray().push(d.getShape().height); - } - -======= d = makeEllipse(shape, color, thickness, fill, fillColor, trans); } else if (type == DrawObject.TRIANGLE){ d = makeTriangle(shape, color, thickness, fill, fillColor, trans); @@ -73,8 +64,12 @@ package org.bigbluebutton.modules.whiteboard.business.shapes d = makeHighlighter(shape, color, thickness, trans); } else if (type == DrawObject.ERASER){ d = makeEraser(shape, color, thickness, trans); - } ->>>>>>> ajay/bbb-whiteboard-additions + } else if (type == DrawObject.TEXT){ + // d = makeText(shape, color, thickness); + // d.getShapeArray().push(d.getShape().width); + // d.getShapeArray().push(d.getShape().height); + } + return d; } @@ -89,14 +84,8 @@ package org.bigbluebutton.modules.whiteboard.business.shapes * @return the Pencil DrawObject created from the parameters * */ -<<<<<<< HEAD - public function makePencil(shape:Array, color:uint, thickness:uint):DrawObject{ - return new Pencil(shape, color, thickness); - -======= public function makePencil(shape:Array, color:uint, thickness:uint, trans:Boolean):DrawObject{ return new Pencil(shape, color, thickness, trans); ->>>>>>> ajay/bbb-whiteboard-additions } /** @@ -199,8 +188,8 @@ package org.bigbluebutton.modules.whiteboard.business.shapes return new Triangle(shape, color, thickness, fill, fillColor, trans); } - public function makeText(shape:Array, color:uint, thickness:uint):DrawObject{ - return new Text(shape, color, thickness); - } + // public function makeText(shape:Array, color:uint, thickness:uint):DrawObject{ + // return new Text(shape, color, thickness); + // } } } \ No newline at end of file diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Ellipse.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Ellipse.as index 155a5d96f943..3233f1aa5845 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Ellipse.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Ellipse.as @@ -62,16 +62,11 @@ package org.bigbluebutton.modules.whiteboard.business.shapes this.shape.push(y2); } -<<<<<<< HEAD - override public function makeShape(parentWidth:Number, parentHeight:Number):void { - var newShape:Sprite = new Sprite(); - newShape.graphics.lineStyle(getThickness(), getColor()); -======= override public function makeGraphic(parentWidth:Number, parentHeight:Number):void { if(!fill) this.graphics.lineStyle(getThickness(), getColor(), getTransparencyLevel()); else this.graphics.lineStyle(getThickness(), getColor()); ->>>>>>> ajay/bbb-whiteboard-additions + var arrayEnd:Number = getShapeArray().length; var startX:Number = denormalize(getShapeArray()[0], parentWidth); var startY:Number = denormalize(getShapeArray()[1], parentHeight); diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Pencil.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Pencil.as index 19ca27ef40f2..0d37a135921a 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Pencil.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Pencil.as @@ -39,14 +39,8 @@ package org.bigbluebutton.modules.whiteboard.business.shapes super(DrawObject.PENCIL, segment, color, thickness, false, 0x000000, false); } -<<<<<<< HEAD - override public function makeShape(parentWidth:Number, parentHeight:Number):void { - var newShape:Sprite = new Sprite(); - newShape.graphics.lineStyle(getThickness(), getColor()); -======= override public function makeGraphic(parentWidth:Number, parentHeight:Number):void { this.graphics.lineStyle(getThickness(), getColor()); ->>>>>>> ajay/bbb-whiteboard-additions var graphicsCommands:Vector. = new Vector.(); graphicsCommands.push(1); diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Rectangle.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Rectangle.as index d3fa2e1225fa..950dd49e3eab 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Rectangle.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Rectangle.as @@ -58,16 +58,11 @@ package org.bigbluebutton.modules.whiteboard.business.shapes this.shape.push(y2); } -<<<<<<< HEAD - override public function makeShape(parentWidth:Number, parentHeight:Number):void { - var newShape:Sprite = new Sprite(); - newShape.graphics.lineStyle(getThickness(), getColor()); -======= override public function makeGraphic(parentWidth:Number, parentHeight:Number):void { if(!fill) this.graphics.lineStyle(getThickness(), getColor(), getTransparencyLevel()); else this.graphics.lineStyle(getThickness(), getColor()); ->>>>>>> ajay/bbb-whiteboard-additions + var arrayEnd:Number = getShapeArray().length; var startX:Number = denormalize(getShapeArray()[0], parentWidth); var startY:Number = denormalize(getShapeArray()[1], parentHeight); diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/ShapeFactory.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/ShapeFactory.as index 6c8e2d780f78..61d93c11157a 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/ShapeFactory.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/ShapeFactory.as @@ -49,19 +49,7 @@ package org.bigbluebutton.modules.whiteboard.business.shapes * @param shape * @return * - */ -<<<<<<< HEAD - public function makeShape(shape:DrawObject):DrawObject{ - if (shape.getType() == DrawObject.PENCIL){ - return makePencil(shape as Pencil); - } else if (shape.getType() == DrawObject.RECTANGLE){ - return makeRectangle(shape as Rectangle); - } else if (shape.getType() == DrawObject.ELLIPSE){ - return makeEllipse(shape as Ellipse); - } else if (shape.getType() == DrawObject.TEXT){ - return makeText(shape as Text); - } -======= + */ public function makeShape(graphic:DrawObject):DrawObject{ if (graphic.getType() == DrawObject.PENCIL){ return makePencil(graphic as Pencil); @@ -78,7 +66,7 @@ package org.bigbluebutton.modules.whiteboard.business.shapes } else if (graphic.getType() == DrawObject.ERASER){ return makeEraser(graphic as Eraser); } ->>>>>>> ajay/bbb-whiteboard-additions + return null; } @@ -87,14 +75,9 @@ package org.bigbluebutton.modules.whiteboard.business.shapes var normSegment:Array = new Array(); for (var i:int = 0; i < segment.length; i += 2) { normSegment[i] = normalize(segment[i] , _parentWidth); - normSegment[i+1] = normalize(segment[i+1], _parentHeight); -<<<<<<< HEAD - } - return makeShape(drawFactory.makeDrawObject(type, normSegment, color, thickness)); -======= + normSegment[i+1] = normalize(segment[i+1], _parentHeight); } - return makeShape(drawFactory.makeDrawObject(type, normSegment, color, thickness, fill, fillColor, transparency)); ->>>>>>> ajay/bbb-whiteboard-additions + return makeShape(drawFactory.makeDrawObject(type, normSegment, color, thickness, fill, fillColor, transparency)); } /** @@ -191,13 +174,11 @@ package org.bigbluebutton.modules.whiteboard.business.shapes e.makeGraphic(_parentWidth, _parentHeight); return e; } -<<<<<<< HEAD private function makeText(e:Text):DrawObject{ e.makeShape(_parentWidth, _parentHeight); return e; } -======= ->>>>>>> ajay/bbb-whiteboard-additions + } } \ No newline at end of file diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Text.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Text.as index 9e21bfcaa405..1505d27f5490 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Text.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Text.as @@ -18,9 +18,9 @@ package org.bigbluebutton.modules.whiteboard.business.shapes public var fontSize:Number = 18; public var textcolor:Object = 0xFF0000; - public function Text(segment:Array, color:uint, thickness:uint) + public function Text(segment:Array, color:uint, thickness:uint, fill:Boolean, fillColor:uint, trans:Boolean) { - super(DrawObject.TEXT, segment, color, thickness); + super(DrawObject.TEXT, segment, color, thickness, fill, fillColor, trans); } /** @@ -42,7 +42,8 @@ package org.bigbluebutton.modules.whiteboard.business.shapes private var scale:uint = 1; // private var fontSize:uint = 18; - override public function makeShape(parentWidth:Number, parentHeight:Number):void { + // override + public function makeShape(parentWidth:Number, parentHeight:Number):void { var newShape:Sprite = new Sprite(); newShape.x = denormalize(getShapeArray()[0], parentWidth); newShape.y = denormalize(getShapeArray()[1], parentHeight); diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/PageManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/PageManager.as index 09937ab37a51..6b83cf3f000a 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/PageManager.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/PageManager.as @@ -43,15 +43,11 @@ package org.bigbluebutton.modules.whiteboard.managers pages = new ArrayCollection(); dispatcher = new Dispatcher(); } - -<<<<<<< HEAD + public function addShapeToPage(e:WhiteboardUpdate):void { (pages.getItemAt(pageNum) as ArrayCollection).addItem(e.data); } - - public function undoShapeFromPage():void { - var page:ArrayCollection = pages.getItemAt(pageNum) as ArrayCollection; -======= + public function addGraphicToPage(e:WhiteboardUpdate):void { var gobjToAdd:GraphicObject = e.data as GraphicObject; var currPage:Page = pages.getItemAt(pageNum) as Page; @@ -72,22 +68,15 @@ package org.bigbluebutton.modules.whiteboard.managers } public function undoGraphicFromPage():void { - var page:Page = pages.getItemAt(pageNum) as Page; ->>>>>>> ajay/bbb-whiteboard-additions + var page:Page = pages.getItemAt(pageNum) as Page; if (page.length > 0) page.removeItemAt(page.length - 1); } - public function clearPage():void { -<<<<<<< HEAD + public function clearPage():void { var page:ArrayCollection = pages.getItemAt(pageNum) as ArrayCollection; page.removeAll(); } -======= - var page:Page = pages.getItemAt(pageNum) as Page; - page.removeAll(); - } - public function toggleGrid():void { var page:Page = pages.getItemAt(pageNum) as Page; page.toggleGrid(); @@ -97,8 +86,7 @@ package org.bigbluebutton.modules.whiteboard.managers var page:Page = pages.getItemAt(pageNum) as Page; return page.isGridToggled(); } - ->>>>>>> ajay/bbb-whiteboard-additions + public function loadPage(e:PageEvent):void { if (pages.length ==0 ) return; if ((pages.getItemAt(e.pageNum) as Page).length == 0) return; diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/WhiteboardManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/WhiteboardManager.as index f3392ab6e145..3f8f6e455dd1 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/WhiteboardManager.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/WhiteboardManager.as @@ -81,15 +81,11 @@ package org.bigbluebutton.modules.whiteboard.managers private function addHighlighterToolbar(e:TimerEvent):void{ // if (UserManager.getInstance().getConference().amIPresenter()) { - whiteboardButton.setVisible(true); -<<<<<<< HEAD + whiteboardButton.setVisible(true); // } PresentationAPI.getInstance().addButtonToToolbar(whiteboardButton); -======= - } - PresentationAPI.getInstance().addButtonToToolbar(whiteboardButton); - //highlighterCanvas.addRawChild(textToolbar); ->>>>>>> ajay/bbb-whiteboard-additions + + } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as index 1ed31f0e9083..0810b9b10b6d 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as @@ -29,7 +29,7 @@ package org.bigbluebutton.modules.whiteboard.models public function undo():void { _currentPresentation.undo(); - _dispatcher.dispatchEvent(new WhiteboardDrawEvent(WhiteboardDrawEvent.UNDO_SHAPE)); + // _dispatcher.dispatchEvent(new WhiteboardDrawEvent(WhiteboardDrawEvent.UNDO_SHAPE)); } public function clear():void { diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml index f23bc4a302cf..d895ec1c9976 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml @@ -20,22 +20,13 @@ $Id: $ --> - - - - >>>>>> ajay/bbb-whiteboard-additions + >>>>>> ajay/bbb-whiteboard-additions + private function doMouseDown():void{ model.doMouseDown(this.mouseX, this.mouseY); } private function doMouseMove(event:Event):void { model.doMouseMove(this.mouseX, this.mouseY); } - -<<<<<<< HEAD + public function sendShapeToServer(dobj:DrawObject):void { var event:WhiteboardDrawEvent = new WhiteboardDrawEvent(WhiteboardDrawEvent.SEND_SHAPE); event.message = dobj; @@ -118,15 +103,14 @@ } public function setShape(s:String):void { - model.setShape(s); + // model.setShape(s); } public function changeColor(e:Event):void { model.changeColor(e.target.selectedColor); } - public function changeThickness(e:Event):void { -======= + public function sendGraphicToServer(gobj:GraphicObject, type:String):void{ var event:WhiteboardDrawEvent = new WhiteboardDrawEvent(type); @@ -143,16 +127,11 @@ toolType = s; } - public function changeColor(e:Event):void{ - model.changeColor(e.target.selectedColor); - } - public function changeFillColor(e:Event):void{ model.changeFillColor(e.target.selectedColor); } - public function changeThickness(e:Event):void{ ->>>>>>> ajay/bbb-whiteboard-additions + public function changeThickness(e:Event):void{ model.changeThickness(e.target.value); } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml index 80dc29875348..14cd637de21c 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml @@ -23,7 +23,7 @@ - + .colorPickerStyle { backgroundColor:#E5E6E7; @@ -56,24 +56,7 @@ - >>>>>> ajay/bbb-whiteboard-additions + import org.bigbluebutton.util.i18n.ResourceUtil; private var images:Images = new Images(); [Bindable] private var hand_icon:Class = images.hand_icon; @@ -107,23 +89,18 @@ [Bindable] private var rectangle_icon:Class = images.square_icon; [Bindable] private var ellipse_icon:Class = images.circle_icon; [Bindable] private var thick_icon:Class = images.whiteboard_thick; - [Bindable] private var thin_icon:Class = images.whiteboard_thin; -<<<<<<< HEAD + [Bindable] private var thin_icon:Class = images.whiteboard_thin; [Bindable] private var scribble_icon:Class = images.scribble_icon; - [Bindable] private var text_icon:Class = images.text_icon; - -======= + [Bindable] private var text_icon:Class = images.text_icon; [Bindable] private var triangle_icon:Class = images.triangle_icon; [Bindable] private var line_icon:Class = images.line_icon; [Bindable] private var fill_icon:Class = images.fill_icon; [Bindable] private var transparency_icon:Class = images.transparency_icon; - [Bindable] private var text_icon:Class = images.text_icon; [Bindable] private var eraser_icon:Class = images.eraser_icon; [Bindable] private var highlighter_icon:Class = images.highlighter_icon; [Bindable] private var select_icon:Class = images.select_icon; [Bindable] private var grid_icon:Class = images.grid_icon; - ->>>>>>> ajay/bbb-whiteboard-additions + public var canvas:WhiteboardCanvas; private var presentationWindow:PresentationWindow; @@ -137,8 +114,7 @@ * Sets the type of shape we're drawing (pencil, rectangle, etc...) * @param s The type * - */ -<<<<<<< HEAD + */ protected function setShape(s:String):void{ canvas.setShape(s); @@ -168,7 +144,8 @@ btnText.selected = true; break; } -======= + } + protected function setTool(gType:String, toolType:String):void{ if(gType == WhiteboardConstants.TYPE_SHAPE) { canvas.setGraphicType(gType); @@ -294,8 +271,7 @@ } canvas.setGraphicType(gType); canvas.setTool(toolType); - } ->>>>>>> ajay/bbb-whiteboard-additions + } } private function setShapeToPencil(e:WhiteboardButtonEvent):void{ @@ -393,85 +369,9 @@ private function closeToolbar(e:StopWhiteboardModuleEvent):void{ parent.removeChild(this); } -<<<<<<< HEAD - - [Bindable] - public var cards:ArrayCollection = new ArrayCollection( - [ {label:"10", data:1}, - {label:"12", data:2}, - {label:"14", data:3} ]); - - private function closeHandler(event:Event):void { -// myLabel.text = "You selected: " + ComboBox(event.target).selectedItem.label; -// myData.text = "Data: " + ComboBox(event.target).selectedItem.data; - } ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >>>>>> ajay/bbb-whiteboard-additions + @@ -535,5 +434,5 @@ ---> + diff --git a/bigbluebutton-web/application.properties b/bigbluebutton-web/application.properties index fbc630f76ef7..9b59e148c7cf 100755 --- a/bigbluebutton-web/application.properties +++ b/bigbluebutton-web/application.properties @@ -1,7 +1,7 @@ #utf-8 -#Sat Jun 23 11:11:43 EDT 2012 +#Fri Jun 10 11:32:20 EDT 2011 app.version=0.70dev app.servlet.version=2.4 app.grails.version=1.1.1 -plugins.jsecurity=0.4.1 app.name=bigbluebutton +plugins.jsecurity=0.4.1