Commit Graph

4287 Commits

Author SHA1 Message Date
Richard Alam
7c8aa4a671 - move things around 2012-07-18 17:41:42 +00:00
Richard Alam
5de4cb976c - handle change presentation 2012-07-18 00:30:44 +00:00
Richard Alam
309e7f32c3 - send and receive whiteboard messages 2012-07-17 22:48:51 +00:00
Richard Alam
17121a337a handle messages from server 2012-07-17 20:17:42 +00:00
Richard Alam
93fe4dc478 - move things around 2012-07-17 16:57:01 +00:00
Richard Alam
26077b8499 - make dependency injection work 2012-07-17 14:48:33 +00:00
Richard Alam
94140b6cef - WhiteboardModel.as is not being inited by the map. Investigating why. 2012-07-16 22:24:28 +00:00
Richard Alam
47b882c917 - slowly making it work 2012-07-16 20:16:28 +00:00
Richard Alam
2d202a0c4a - cleanup 2012-07-16 19:52:26 +00:00
Richard Alam
a8e80c3a9c - make it compile 2012-07-16 19:03:12 +00:00
Richard Alam
5742f2764a Merge remote branch 'ajay/bbb-whiteboard-additions' into merge-whiteboard-features
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddShapeWhiteboardRecordEvent.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/WhiteboardEventRecorder.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/IWhiteboardRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Page.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/ShapeGraphic.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text_icon.png
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObjectFactory.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Ellipse.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Pencil.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Rectangle.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/ShapeFactory.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/PageManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/WhiteboardManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/maps/WhiteboardCanvasEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
2012-07-16 18:08:21 +00:00
Ajay Gopinath
27b2e5ad10 Finalized licenses and deleted random backup files and cleaned up repo. 2012-07-15 14:49:42 -04:00
Ajay Gopinath
89c8e75a2f Fixed TextToolbar's 'text size' menu not closing when focus is changed. 2012-07-15 13:54:41 -04:00
Ajay Gopinath
73ad0281c7 Fixed problem of TextToolbar disappearing when text loses focus. 2012-07-15 13:15:54 -04:00
Ajay Gopinath
70f003b249 Fixed problem of glitchy text when changing pages. 2012-07-15 05:13:09 -04:00
Ajay Gopinath
16a4c2ded3 Fixed issue of zooming without TextToolbar. Fixed flicker with TextToolbar when changing values. 2012-07-15 03:37:46 -04:00
Ajay Gopinath
9544daa34d Backing up before reverting to attempt to fix really dumb problem. 2012-07-14 23:55:01 -04:00
Ajay Gopinath
ddf0cf8df4 Commented most of the new code. Need to fix grid not appearing, shapes being received oddly, and zooming with text toolbar. 2012-07-14 01:46:41 -04:00
Richard Alam
b2973cb3b1 - start refactoring the client 2012-07-14 02:01:14 +00:00
Richard Alam
0b78831ffa - add method to delete annotation 2012-07-13 21:53:00 +00:00
Richard Alam
5c3e6888f4 - cleanup 2012-07-13 21:34:10 +00:00
Richard Alam
1fab7a430c - send and handle change page 2012-07-13 21:00:02 +00:00
Richard Alam
c89a8a2513 - not used 2012-07-13 20:31:26 +00:00
Richard Alam
b3b74a191b - remove unneeded modules from build 2012-07-13 20:31:02 +00:00
Richard Alam
45faed3019 - broadcast messages to other clients without using shared object 2012-07-13 20:30:32 +00:00
Richard Alam
5b55b6930b - listen for messages from server 2012-07-13 17:26:46 +00:00
Richard Alam
293d0bb9a7 - modify whiteboard server app to be able to store text 2012-07-12 22:02:25 +00:00
Richard Alam
20a0fff6c7 - edit text field 2012-07-12 15:14:29 +00:00
Richard Alam
5bc47d3344 - can't seem to type/edit the text 2012-07-11 01:38:41 +00:00
Ajay Gopinath
c1f5ff0ae5 Finished graph/grid toggle tool. Two bugs remaining: 1)text and grid are not showing up when new clients join 2) sync text/grid when changing pages within a document. TOBE fixed. 2012-07-10 21:36:21 -04:00
Ajay Gopinath
540ed95984 Fixed shapes not being received bug. Fixed text toolbar not moving with window/whiteboard. Added 'text size' feature to text tool options. 2012-07-10 14:51:53 -04:00
Richard Alam
575ffb45b8 - start modifying server side 2012-07-10 12:23:43 +00:00
Richard Alam
5bac26a123 - add textbox 2012-07-10 12:23:17 +00:00
Richard Alam
7aa983e069 - add font style, size, color 2012-07-10 10:39:55 +00:00
Ajay Gopinath
715cb602c3 Finished text tool 'options'. 2012-07-09 16:43:03 -04:00
Ajay Gopinath
c38b719823 FINALLY! FINISHED TEXT TOOL. 2012-07-08 21:12:37 -04:00
Ajay Gopinath
8715327475 Modified record event to include fill color. Need to finish text tool and presentation GUI. 2012-07-08 14:30:46 -04:00
Ajay Gopinath
0ef622f959 Added triangle tool and made fill color selectable rather than making it the same as the line color of the DrawObject. 2012-07-06 22:36:41 -04:00
Richard Alam
59fde6e7ea - add icons to toolbar 2012-07-06 20:54:43 +00:00
Ajay Gopinath
a9fabf0028 Fixed duplication of GraphicObjects glitch when zooming and changing view modes. Added sprite transformation libraries but need to integrate with program. 2012-07-06 15:40:35 -04:00
Richard Alam
e6a7a2b8b1 - add scribble and text icon 2012-07-06 17:42:17 +00:00
Richard Alam
79f313b880 Merge remote branch 'origin/add-pointer-record' into add-more-whiteboard-features 2012-07-06 17:35:23 +00:00
Markos Calderon
3d86d5d2a0 forgot to add service file 2012-07-06 10:02:45 -07:00
Richard Alam
459d486309 Merge remote branch 'origin/add-pointer-record' into add-more-whiteboard-features 2012-07-06 16:00:06 +00:00
Richard Alam
ec9a72b3bb Merge branch 'master' into add-more-whiteboard-features 2012-07-06 15:21:31 +00:00
Richard Alam
1d4ee2862c Merge branch 'layout-module' 2012-07-06 15:03:49 +00:00
Ajay Gopinath
92343a02e5 Major change. Finished recognition of individual GraphicObjects using Selection Tool. Able to pick out top most GraphicObject when layers are present. Fixed personal license statements. New system exclusively for LTB, may be difficult to merge back with BBB, but will suffice for now. Text still buggy. 2012-07-05 19:09:53 -04:00
Markos Calderon
e378ee146c added changes for record presentation pointer 2012-07-05 14:59:13 -07:00
Ajay Gopinath
b2e86495c6 Added selection tool and basic recognition of individual objects. Need to fix text tool and allow modification of individual objects. 2012-07-05 16:03:17 -04:00
Felipe Cecagno
cd111f4d09 fixing the issue reported by a community member on this post: https://groups.google.com/forum/#!msg/bigbluebutton-dev/WgqfuXgPolE/YBAqw7kc0PoJ 2012-07-05 14:14:12 -03:00