diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 977e7520c9a930e5cfd505f6c979bbf29da79aaa..8eb0d3f841af9335b05129f122bc30c141f37861 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -16,18 +16,11 @@ bbb.oldlocalewindow.reminder2=Please clear your browser's cache and try again.
bbb.oldlocalewindow.windowTitle=Warning: Old Language Translations
# MicSettings.mxml
-bbb.micSettings.audioSetup=Audio Setup
-bbb.micSettings.needHeadset=You need to use a headset with BigBlueButton.
-bbb.micSettings.listen=1. Listen
-bbb.micSettings.clickToPlaySound=Click to play sound.
-bbb.micSettings.playSound=Click to hear sound
-bbb.micSettings.hearFromHeadset=You should hear audio in your headset (not your computer speakers).
-bbb.micSettings.speak=2. Speak
-bbb.micSettings.speakIntoMic=Speak into the microphone.
-bbb.micSettings.micActivity=Microphone Activity
+bbb.micSettings.playSound=Play Test Sound
+bbb.micSettings.hearFromHeadset=You should hear audio in your headset, not your computer speakers.
+bbb.micSettings.speakIntoMic=You should see the bar move as you speak into your headset.
bbb.micSettings.changeMic=Change Microphone
-bbb.micSettings.ready=3. Ready
-bbb.micSettings.join=Join
+bbb.micSettings.join=Join Audio
bbb.micSettings.cancel=Cancel
# MainToolbar.mxml
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
index c03d1319f222662923dc47da39f3ceb000a6738d..dd2fa49d68272b153fd9be2d2a043373b75ed561 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
@@ -6,6 +6,7 @@
import mx.events.ItemClickEvent;
import mx.managers.PopUpManager;
+ import org.bigbluebutton.common.Images;
import org.bigbluebutton.common.LogUtil;
import org.bigbluebutton.main.events.BBBEvent;
import org.bigbluebutton.util.i18n.ResourceUtil;
@@ -16,14 +17,16 @@
private var timer:Timer;
private var mic:Microphone;
private var playingAudio:Boolean = false;
-
+ private var images:Images = new Images();
+ [Bindable] private var cancelIcon:Class = images.delete_icon;
+
private function initDefaultMic():void {
mic = Microphone.getMicrophone(-1);
mic.setLoopBack(true);
if (mic != null) {
mic.addEventListener(StatusEvent.STATUS, micStatusEventHandler);
} else {
- LogUtil.warn("**** MIC IS USED ***");
+ LogUtil.warn("Microphone is used by another application.");
}
timer = new Timer(100);
timer.addEventListener(TimerEvent.TIMER, updateMicLevel);
@@ -33,10 +36,10 @@
private function micStatusEventHandler(event:StatusEvent):void {
switch(event.code) {
case "Microphone.Muted":
- LogUtil.warn("***ACCESS TO MIC DENIED***");
+ LogUtil.warn("Access to microphone has been denied.");
break;
case "Microphone.Unmuted":
- LogUtil.warn("***ACCESS TO MIC ALLOWED***");
+ LogUtil.warn("Access to the microphone has been allowed.");
break;
default:
LogUtil.debug("unknown micStatusHandler event: " + event);
@@ -67,7 +70,6 @@
}
private function completeHandler(event:Event):void {
- trace("completeHandler: " + event);
channel = soundFactory.play();
playButton.label = "Stop";
playingAudio = true;
@@ -111,6 +113,7 @@
mic = null;
if (playingAudio) channel.stop();
}
+
private var DEFAULT_HELP_URL:String = "http://www.bigbluebutton.org/content/videos";
private function onHelpButtonClicked():void {
navigateToURL(new URLRequest(DEFAULT_HELP_URL));
@@ -120,46 +123,51 @@
<mx:VBox width="100%" height="100%">
<mx:HBox width="100%">
<mx:Spacer width="50%"/>
- <mx:Label fontSize="20" text="{ResourceUtil.getInstance().getString('bbb.micSettings.audioSetup')}"/>
<mx:Spacer width="50%"/>
- <mx:LinkButton fontSize="18" label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}" click="onHelpButtonClicked()"/>
+ <mx:Button id="cancelBtn" icon="{cancelIcon}" width="20" height="20" toolTip="{ResourceUtil.getInstance().getString('bbb.micSettings.cancel')}" click="onCancelClicked()"/>
+ </mx:HBox>
+ <mx:HBox width="100%" height="20">
+ <mx:Spacer width="50%"/>
+ <mx:Spacer width="50%"/>
</mx:HBox>
- <mx:VBox width="100%">
- <mx:Label fontSize="14" color="red" text="{ResourceUtil.getInstance().getString('bbb.micSettings.needHeadset')}"/>
- <mx:Label fontSize="12" color="red" text="{ResourceUtil.getInstance().getString('bbb.micSettings.hearFromHeadset')}"/>
- </mx:VBox>
<mx:HBox width="100%" height="50%">
- <mx:VBox width="20%" height="100%">
- <mx:Label fontSize="18" text="{ResourceUtil.getInstance().getString('bbb.micSettings.listen')}"/>
- </mx:VBox>
- <mx:Spacer width="10%"/>
<mx:VBox width="70%" height="100%">
+ <mx:Text text="{ResourceUtil.getInstance().getString('bbb.micSettings.hearFromHeadset')}"/>
+ </mx:VBox>
+ <mx:VBox width="50%" height="100%">
<mx:Button id="playButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.playSound')}"
click="playButtonClickHandler()" toggle="true"/>
+ <mx:Spacer width="100%"/>
</mx:VBox>
</mx:HBox>
+ <mx:HBox width="100%" height="20">
+ <mx:Spacer width="50%"/>
+ <mx:Spacer width="50%"/>
+ </mx:HBox>
<mx:HBox width="100%" height="50%">
- <mx:VBox width="20%" height="100%">
- <mx:Label fontSize="18" text="{ResourceUtil.getInstance().getString('bbb.micSettings.speak')}"/>
+ <mx:VBox width="70%" height="100%">
+ <mx:Text text="{ResourceUtil.getInstance().getString('bbb.micSettings.speakIntoMic')}"/>
</mx:VBox>
<mx:Spacer width="10%"/>
- <mx:VBox width="70%" height="100%">
+ <mx:VBox width="20%" height="100%">
<mx:Spacer width="10%"/>
- <mx:Label text="{ResourceUtil.getInstance().getString('bbb.micSettings.speakIntoMic')}"/>
- <mx:ProgressBar id="micLevel1" minimum="0" maximum="100" label="{ResourceUtil.getInstance().getString('bbb.micSettings.micActivity')}"
- labelPlacement="top"
+ <mx:Label id="mic1Label" text="Microphone Name" />
+ <mx:ProgressBar id="micLevel1" minimum="0" maximum="100"
+ labelPlacement="right" label=""
direction="right" mode="manual" visible="true" width="120"/>
<mx:Button id="settingBtn" label="{ResourceUtil.getInstance().getString('bbb.micSettings.changeMic')}" click="showMicSettingsPanel()"/>
- <mx:Label id="mic1Label" text="Microphone Name" />
+
</mx:VBox>
</mx:HBox>
- <mx:Label fontSize="18" text="{ResourceUtil.getInstance().getString('bbb.micSettings.ready')}"/>
+ <mx:HBox width="100%" height="20">
+ <mx:Spacer width="50%"/>
+ <mx:Spacer width="50%"/>
+ </mx:HBox>
<mx:HBox width="100%">
- <mx:Spacer width="40%"/>
+ <mx:Spacer width="80%"/>
<mx:Button id="okBtn" label="{ResourceUtil.getInstance().getString('bbb.micSettings.join')}" click="onJoinClicked()"/>
- <mx:Spacer width="20%"/>
- <mx:Button id="cancelBtn" label="{ResourceUtil.getInstance().getString('bbb.micSettings.cancel')}" click="onCancelClicked()"/>
- <mx:Spacer width="40%"/>
+ <mx:Spacer width="10%"/>
+ <mx:LinkButton fontSize="14" label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}" click="onHelpButtonClicked()"/>
</mx:HBox>
<mx:HBox width="100%">
<mx:Spacer width="50%"/>