Skip to content

Commit

Permalink
- make it compile
Browse files Browse the repository at this point in the history
  • Loading branch information
@ritzalam
ritzalam committed Jul 16, 2012
1 parent 5742f27 commit a8e80c3
Show file tree
Hide file tree
Showing 20 changed files with 110 additions and 598 deletions.
4 changes: 2 additions & 2 deletions bigbluebutton-apps/.classpath.old
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="src/main/java/" kind="src" path=""/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="test/commandline"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="output" path="build/classes/main"/>
</classpath>
8 changes: 2 additions & 6 deletions bigbluebutton-client/.actionScriptProperties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<actionScriptProperties analytics="false" mainApplicationPath="BigBlueButton.mxml" projectUUID="2f78753b-2e4c-41b4-8cf4-eddb768eb4b3" version="10">
<compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="true" flex3CompatMode="true" flexSDK="Flex 4.5" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="10.3.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compiler additionalCompilerArguments="-locale=" autoRSLOrdering="false" copyDependentFiles="true" flex3CompatMode="true" flexSDK="Flex 4.5" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="10.3.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compilerSourcePath/>
<libraryPath defaultLinkType="1">
<libraryPathEntry kind="4" path="">
Expand All @@ -14,17 +14,16 @@
</libraryPathEntry>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
<libraryPathEntry applicationDomain="default" forceLoad="false" index="3" kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/spark.swc" useDefaultLinkType="true">
<crossDomainRsls>
<crossDomainRslEntry autoExtract="true" policyFileUrl="http://fpdownload.adobe.com/pub/swz/crossdomain.xml" rslUrl="http://fpdownload.adobe.com/pub/swz/flex/4.5.0.20967/spark_4.5.0.20967.swz"/>
<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="spark_4.5.0.20967.swz"/>
</crossDomainRsls>
</libraryPathEntry>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
</excludedEntries>
</libraryPathEntry>
<libraryPathEntry kind="1" linkType="1" path="libs"/>
<libraryPathEntry kind="3" linkType="2" path="${PROJECT_FRAMEWORKS}/libs/player/10.2/playerglobal.swc" useDefaultLinkType="false"/>
</libraryPath>
<sourceAttachmentPath/>
</compiler>
Expand All @@ -36,7 +35,6 @@
<application path="BigBlueButtonUnitTests.mxml"/>
<application path="DeskshareStandalone.mxml"/>
<application path="src/TestRunners.mxml"/>
<application path="BigBlueButtonTest.mxml"/>
</applications>
<modules>
<module application="src/BigBlueButton.mxml" destPath="DynamicInfoModule.swf" optimize="true" sourcePath="src/DynamicInfoModule.mxml"/>
Expand All @@ -53,8 +51,6 @@
<module application="src/BigBlueButton.mxml" destPath="SharedNotesModule.swf" optimize="true" sourcePath="src/SharedNotesModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="ClassroomAudioModule.swf" optimize="true" sourcePath="src/ClassroomAudioModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="SettingsModule.swf" optimize="true" sourcePath="src/SettingsModule.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="BigBlueButtonTest.swf" optimize="true" sourcePath="src/BigBlueButtonTest.mxml"/>
<module application="src/BigBlueButton.mxml" destPath="VideodockModule.swf" optimize="true" sourcePath="src/VideodockModule.mxml"/>
</modules>
<buildCSSFiles>
<buildCSSFileEntry destPath="bin" sourcePath="src/branding/css/logo_basic.css"/>
Expand Down
3 changes: 0 additions & 3 deletions bigbluebutton-client/locale/en_US/bbbResources.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
9 changes: 3 additions & 6 deletions bigbluebutton-client/src/org/bigbluebutton/common/Images.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -221,6 +219,5 @@ package org.bigbluebutton.common

[Embed(source="assets/images/grid_icon.png")]
public var grid_icon:Class;
>>>>>>> ajay/bbb-whiteboard-additions
}
}
206 changes: 3 additions & 203 deletions bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -517,14 +322,9 @@
<views:LoadingBar id="progressBar" x="{this.width/2 - progressBar.width/2}" y="{this.height/2 - progressBar.height/2}" width="{this.width/2}" />
<views:BrandingLogo x="{this.width - 300}" y="{this.height - 300}" />
</views:MainCanvas>

<<<<<<< HEAD
<mx:ControlBar width="100%" height="24" paddingTop="0">
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.mainshell.copyrightLabel2',[appVersion])}" id="copyrightLabel2"/>
=======

<mx:ControlBar width="100%" height="20" paddingTop="0">
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.mainshell.copyrightLabel2',[appVersion]) + '-- The Learn To Be Foundation'}" id="copyrightLabel2"/>
>>>>>>> ajay/bbb-whiteboard-additions
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.mainshell.copyrightLabel2',[appVersion]) + '-- The Learn To Be Foundation'}" id="copyrightLabel2"/>
<mx:Spacer width="20"/>
<mx:Spacer width="100%"/>
<mx:Button width="20" height="20" visible="{layoutOptions.showLogButton}" toolTip="{ResourceUtil.getInstance().getString('bbb.mainshell.logBtn.toolTip')}" id="logBtn" icon="{logs_icon}" click="openLogWindow()" />
Expand Down
Loading

0 comments on commit a8e80c3

Please sign in to comment.