BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- change layout of mic settings

Browse Source
This commit is contained in:
Richard Alam 2011-09-12 15:09:04 +00:00
parent f66ecd7b34
commit 03e3894936
2 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-client/locale/en_US/bbbResources.properties
View File

@ -20,7 +20,7 @@ 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=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.
@ -28,6 +28,7 @@ bbb.micSettings.micActivity=Microphone Activity
bbb.micSettings.changeMic=Change Microphone
bbb.micSettings.ready=3. Ready
bbb.micSettings.join=Join
bbb.micSettings.cancel=Cancel
# MainToolbar.mxml
bbb.mainToolbar.helpBtn = Help

63
bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
View File

@ -61,7 +61,7 @@
soundFactory.load(request);
} else {
channel.stop();
playButton.label = "Play";
playButton.label = ResourceUtil.getInstance().getString('bbb.micSettings.playSound');
playingAudio = false;
}
}
@ -98,7 +98,20 @@
event.payload['useMicrophone'] = true;
dispatchEvent(event);
PopUpManager.removePopUp(this);
}
}
private function onCancelClicked():void {
timer.stop();
mic.setLoopBack(false);
mic = null;
if (playingAudio) channel.stop();
PopUpManager.removePopUp(this);
}
private var DEFAULT_HELP_URL:String = "http://www.bigbluebutton.org/content/videos";
private function onHelpButtonClicked():void {
navigateToURL(new URLRequest(DEFAULT_HELP_URL));
}
]]>
</mx:Script>
<mx:VBox width="100%" height="100%">
@ -106,44 +119,44 @@
<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:HBox>
<mx:HBox width="100%">
<mx:Spacer width="50%"/>
<mx:Label fontSize="16" color="red" text="{ResourceUtil.getInstance().getString('bbb.micSettings.needHeadset')}"/>
<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="45%" height="100%">
<mx:Label fontSize="18" text="{ResourceUtil.getInstance().getString('bbb.micSettings.listen')}"/>
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.micSettings.clickToPlaySound')}"/>
<mx:Text text="{ResourceUtil.getInstance().getString('bbb.micSettings.hearFromHeadset')}"/>
<mx:Text text="Click here for help."/>
<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="45%" height="100%">
<mx:Button id="playButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.playSound')}" click="playButtonClickHandler()" toggle="true"/>
<mx:VBox width="70%" height="100%">
<mx:Button id="playButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.playSound')}"
click="playButtonClickHandler()" toggle="true"/>
</mx:VBox>
</mx:HBox>
<mx:HBox width="100%" height="50%">
<mx:VBox width="45%" height="100%">
<mx:Label fontSize="18" text="{ResourceUtil.getInstance().getString('bbb.micSettings.speak')}"/>
<mx:Label text="{ResourceUtil.getInstance().getString('bbb.micSettings.speakIntoMic')}"/>
<mx:Text text="{ResourceUtil.getInstance().getString('bbb.micSettings.hearFromHeadset')}"/>
<mx:Text text="Click here for help."/>
<mx:VBox width="20%" height="100%">
<mx:Label fontSize="18" text="{ResourceUtil.getInstance().getString('bbb.micSettings.speak')}"/>
</mx:VBox>
<mx:Spacer width="10%"/>
<mx:VBox width="45%" height="100%">
<mx:ProgressBar id="micLevel1" minimum="0" maximum="100" label="{ResourceUtil.getInstance().getString('bbb.micSettings.micActivity')}" labelPlacement="left"
direction="right" mode="manual" visible="true" width="120"/>
<mx:Label id="mic1Label" text="Microphone Name" />
<mx:VBox width="70%" 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"
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%">
<mx:Spacer width="50%"/>
<mx:Spacer width="40%"/>
<mx:Button id="okBtn" label="{ResourceUtil.getInstance().getString('bbb.micSettings.join')}" click="closeWindow()"/>
<mx:Spacer width="50%"/>
<mx:Spacer width="20%"/>
<mx:Button id="cancelBtn" label="{ResourceUtil.getInstance().getString('bbb.micSettings.cancel')}" click="onCancelClicked()"/>
<mx:Spacer width="40%"/>
</mx:HBox>
<mx:HBox width="100%">
<mx:Spacer width="50%"/>