diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 86824dedd514a92affa962a58325ac19c0d8ecef..49b12c06c9182920b02db801181b848aaa17715c 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -54,12 +54,28 @@ bbb.participants.title = Participants{0} {1}
bbb.participants.titleBar = Participants Window title bar, double click to maximize
bbb.participants.minimizeBtn.accessibilityName = Minimize the Participants Window
bbb.participants.maximizeRestoreBtn.accessibilityName = Maximize the Participants Window
+bbb.participants.settings.buttonTooltip = Settings
+bbb.participants.settings.audioSettings = Audio Settings
+bbb.participants.settings.muteAll = Mute All
+bbb.participants.settings.muteAllExcept = Mute All Except Presenter
+bbb.participants.settings.unmuteAll = Unmute All
+bbb.participants.settings.lowerAllHands = Lower All Hands
+bbb.participants.pushToTalk.toolTip = Click to talk
+bbb.participants.pushToMute.toolTip = Click to mute yourself
bbb.participants.participantsGrid.accessibilityName = Participants List. Use the arrow keys to navigate.
-bbb.participants.participantsGrid.mediaItemRenderer = Media
+bbb.participants.participantsGrid.nameItemRenderer = Name
+bbb.participants.participantsGrid.statusItemRenderer = Status
+bbb.participants.participantsGrid.statusItemRenderer.changePresenter = Change Presenter
bbb.participants.participantsGrid.statusItemRenderer.presenter = Presenter
bbb.participants.participantsGrid.statusItemRenderer.moderator = Moderator
bbb.participants.participantsGrid.statusItemRenderer.handRaised = Hand Raised
bbb.participants.participantsGrid.statusItemRenderer.viewer = Viewer
+bbb.participants.participantsGrid.mediaItemRenderer = Media
+bbb.participants.participantsGrid.mediaItemRenderer.talking = Talking
+bbb.participants.participantsGrid.mediaItemRenderer.webcam = Sharing Webcam
+bbb.participants.participantsGrid.mediaItemRenderer.pushToTalk = Click to talk
+bbb.participants.participantsGrid.mediaItemRenderer.pushToMute = Click to mute yourself
+bbb.participants.participantsGrid.mediaItemRenderer.kickUser = Kick user
bbb.participants.participantsGrid.mediaItemRenderer.webcam = Webcam shared
bbb.participants.participantsGrid.mediaItemRenderer.micOff = Microphone off
bbb.participants.participantsGrid.mediaItemRenderer.micOn = Microphone on
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
index a5fff94c5632e90f9b518017cb5b5fdf5ee9734f..40c359840cb2199312f0a02b0d04334a16830cfd 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
@@ -172,7 +172,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
// Listen for the ENTER key to send the message.
txtMsgArea.addEventListener(KeyboardEvent.KEY_UP, handleTextAreaKeyUpEvent);
- Accessibility.updateProperties();
+ if(Capabilities.hasAccessibility)
+ Accessibility.updateProperties();
queryForChatHistory();
}
@@ -476,7 +477,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
chatMessagesList.accessibilityProperties.description += " ";
}
}
- Accessibility.updateProperties();
+ if(Capabilities.hasAccessibility)
+ Accessibility.updateProperties();
navToFirst = false;
navToLatest = false;
spacerNeeded = false;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ParticipantsProxy.as b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ParticipantsProxy.as
index 907fea5174570a6578c50bfd04c097b59979ef84..d456bdc95bf408a8015202b59883a7e85879b44b 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ParticipantsProxy.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ParticipantsProxy.as
@@ -94,12 +94,14 @@ package org.bigbluebutton.modules.participants.business
{
//find the presenter and lock them
var pres:BBBUser = UserManager.getInstance().getConference().getPresenter();
- _listenersService.lockMuteUser(int(pres.voiceUserid), true);
+ if (pres)
+ _listenersService.lockMuteUser(int(pres.voiceUserid), true);
_listenersService.muteAllUsers(true);
//unlock the presenter
- _listenersService.lockMuteUser(int(pres.voiceUserid), false);
+ if (pres)
+ _listenersService.lockMuteUser(int(pres.voiceUserid), false);
}
public function kickUser(event:KickUserEvent):void {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml
index a1c741e13d80ffe0743cb5f97a40805e8602d1f0..5793ef130efc69976b87968e7760df8f98ba45b1 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml
@@ -106,16 +106,16 @@
</mx:Script>
<mx:Image id="showLock" visible="{data.voiceLocked}" source="{images.lock_close}" width="20" height="20" />
<mx:Image id="talkingIcon" visible="{data.talking}" source="{images.sound_new}" width="20" height="20"
- toolTip="{ResourceUtil.getInstance().getString('bbb.listenerItem.talkImg.toolTip')}" />
+ toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.talking')}" />
<mx:Button id="webcamBtn" visible="{data.hasStream}" click="viewCamera()" icon="{images.webcam_new}"
width="20" height="20" enabled="false"
- toolTip="{ResourceUtil.getInstance().getString('bbb.viewers.viewersGrid.statusItemRenderer.streamIcon.toolTip')}" />
+ toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.webcam')}" />
<mx:Button id="muteBtn" visible="{data.voiceJoined}" enabled="false"
width="20" height="20" click="toggleMuteState()"
icon="{data.voiceMuted ? images.audio_muted : images.audio}"
- toolTip="{data.voiceMuted ? ResourceUtil.getInstance().getString('bbb.listeners.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.listeners.pushToMute.toolTip')}" />
+ toolTip="{data.voiceMuted ? ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.pushToTalk') : ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.pushToMute')}" />
<mx:Button id="kickUserBtn" icon="{images.eject_user_new}"
width="20" height="20" visible="{rolledOver}"
- toolTip="{ResourceUtil.getInstance().getString('bbb.viewers.kickUserBtn.toolTip')}"
+ toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.kickUser')}"
click="kickUser()"/>
</mx:HBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml
index 0582bc6114bef989a95033db79fd2ce275a8e558..7ad7ff0df9ba809aa78d06173f4d67b98423689b 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml
@@ -30,5 +30,5 @@
<mx:Label id="nameLabel" textAlign="left" text="{data.name} {data.me ? '(you)' : ''}"
fontWeight="{data.me ? 'bold' : 'normal'}"
color="{data.me ? 0x003399 : 0x000000}"
- toolTip="Name"/>
+ toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.nameItemRenderer')}"/>
</mx:HBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
index 96eae80e842f5c45aa566bfacb1355fc1a2dc1d5..44186c19ef2980bf41ee9cc544fd8dfc735f1287 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
@@ -25,6 +25,7 @@
implements="org.bigbluebutton.common.IBbbModuleWindow"
xmlns:mate="http://mate.asfusion.com/"
creationComplete="onCreationComplete()"
+ title="{ResourceUtil.getInstance().getString('bbb.participants.title')}"
showCloseButton="false">
<mate:Listener type="{LocaleChangeEvent.LOCALE_CHANGED}" method="localeChanged" />
@@ -171,17 +172,16 @@
private function openSettings():void {
// everyone can see the audio settings
- var myMenuData:Array = [{label: "Audio Settings", icon: images.audio}];
+ var myMenuData:Array = [{label: ResourceUtil.getInstance().getString('bbb.participants.settings.audioSettings'), icon: images.audio}];
if (amIModerator) {
- myMenuData[1] = {type: "separator"};
- myMenuData[2] = {label: "Lower All Hands", icon: images.hand_new};
+ myMenuData[1] = {type: "separator"};
+ myMenuData[2] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.lowerAllHands'), icon: images.hand_new};
if (!roomMuted) {
- myMenuData[3] = {label: "Mute All", icon: images.audio_muted};
- myMenuData[4] = {label: "Mute All Except Presenter", icon: images.audio_muted};
+ myMenuData[3] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.muteAll'), icon: images.audio_muted};
+ myMenuData[4] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.muteAllExcept'), icon: images.audio_muted};
} else
- myMenuData[3] = {label: "Unmute All", icon: images.audio};
-
+ myMenuData[3] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.unmuteAll'), icon: images.audio};
}
// make sure the previous menu is closed before opening a new one
@@ -388,9 +388,9 @@
tabIndex="{partOptions.baseTabIndex+5}"
accessibilityName="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.accessibilityName')}" >
<mx:columns>
- <mx:DataGridColumn dataField="userStatus" headerText="{ResourceUtil.getInstance().getString('bbb.viewers.viewersGrid.statusItemRenderer')}" editable="false" width="45"
+ <mx:DataGridColumn dataField="userStatus" headerText="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer')}" editable="false" width="45"
itemRenderer="org.bigbluebutton.modules.participants.views.StatusItemRenderer" sortable="false" />
- <mx:DataGridColumn dataField="name" headerText="{ResourceUtil.getInstance().getString('bbb.viewers.viewersGrid.nameItemRenderer')}" editable="false" width="100" sortable="false"
+ <mx:DataGridColumn dataField="name" headerText="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.nameItemRenderer')}" editable="false" width="100" sortable="false"
itemRenderer="org.bigbluebutton.modules.participants.views.NameItemRenderer"/>
<mx:DataGridColumn dataField="media" headerText="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer')}" sortable="false"
itemRenderer="org.bigbluebutton.modules.participants.views.MediaItemRenderer"/>
@@ -399,7 +399,7 @@
<mx:ControlBar width="100%">
<mx:Button id="settingsBtn" icon="{images.users_settings}" width="30" height="30"
- toolTip="Settings" click="openSettings()" visible="true" tabIndex="{partOptions.baseTabIndex+10}"/>
+ toolTip="{ResourceUtil.getInstance().getString('bbb.participants.settings.buttonTooltip')}" click="openSettings()" visible="true" tabIndex="{partOptions.baseTabIndex+10}"/>
<mx:Button id="raiseHandBtn" toggle="true" icon="{images.hand_new}"
width="30" height="30" toolTip="Raise Hand" click="raiseHand()"
visible="false" includeInLayout="{raiseHandBtn.visible}" tabIndex="{partOptions.baseTabIndex+15}" />
@@ -407,7 +407,7 @@
<mx:Button id="muteMeBtn" click="toggleMuteMeState()" height="30" width="30"
icon="{UserManager.getInstance().getConference().voiceMuted ? images.audio_muted : images.audio}"
visible="{UserManager.getInstance().getConference().voiceJoined}"
- toolTip="{UserManager.getInstance().getConference().voiceMuted ? ResourceUtil.getInstance().getString('bbb.listeners.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.listeners.pushToMute.toolTip')}"
+ toolTip="{UserManager.getInstance().getConference().voiceMuted ? ResourceUtil.getInstance().getString('bbb.participants.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.participants.pushToMute.toolTip')}"
tabIndex="{partOptions.baseTabIndex+20}"/>
</mx:ControlBar>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml
index 31392bb86eaef2c31ee0992eda8e0e0235af5522..09d513a199b2d82484033c3baf3f1fbde9edef6d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml
@@ -93,7 +93,7 @@
roleBtn.enabled = false;
} else if (rolledOver) {
roleBtn.setStyle("icon", images.presenter_new);
- roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.viewers.presentBtn.label');
+ roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer.changePresenter');
roleBtn.enabled = true;
} else if (data.role == Role.MODERATOR) {
roleBtn.setStyle("icon", images.moderator);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
index 382af49871b2fcd151047bcb4525dc98c4c0f703..996777b7d9772bdb3e06ebae8de0de2348d13fe8 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
@@ -50,21 +50,32 @@ package org.bigbluebutton.modules.present.managers
}
public function handleStartModuleEvent(e:PresentModuleEvent):void{
- if (presentWindow != null) return;
+ LogUtil.debug("markos: begin handleStartModuleEvent");
+ if (presentWindow != null){
+ LogUtil.debug("markos: presentwindow is NOT null");
+ return;
+ }
+ LogUtil.debug("markos: before presentwindow");
presentWindow = new PresentationWindow();
+ LogUtil.debug("markos: presentwindow is created");
presentWindow.visible = (e.data.showPresentWindow == "true");
+ LogUtil.debug("markos: presentwindow is visible");
presentWindow.showControls = (e.data.showWindowControls == "true");
+ LogUtil.debug("markos: presentwindow shows controls");
openWindow(presentWindow);
+ LogUtil.debug("markos: finish handleStartModuleEvent");
}
public function handleStopModuleEvent():void{
presentWindow.close();
}
- private function openWindow(window:IBbbModuleWindow):void{
+ private function openWindow(window:IBbbModuleWindow):void{
+ LogUtil.debug("markos: begin openwindow");
var event:OpenWindowEvent = new OpenWindowEvent(OpenWindowEvent.OPEN_WINDOW_EVENT);
event.window = window;
- globalDispatcher.dispatchEvent(event);
+ globalDispatcher.dispatchEvent(event);
+ LogUtil.debug("markos: finish openwindow");
}
public function handleOpenUploadWindow(e:UploadEvent):void{
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
index 65f56176a84cb2f32c417cf7b13c3ce44e6ede1f..79d9659949918d7220fde8ec7495facc506736f9 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
@@ -149,16 +149,22 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var localDispatcher:Dispatcher = new Dispatcher();
private function init():void{
+ LogUtil.debug("markos: begin init");
presentOptions = new PresentOptions();
baseIndex = presentOptions.baseTabIndex;
+ LogUtil.debug("markos: end init");
}
private function onCreationComplete():void{
+ LogUtil.debug("markos: begin oncreationcomplete");
thumbY = this.height - 160;
- bindKeyboardEvents();
+
+ bindKeyboardEvents();
+ LogUtil.debug("markos: passed bindKeyboardEvents");
this.addEventListener(MDIWindowEvent.RESIZE_END, onResizeEndEvent);
slideView.addEventListener(ListEvent.ITEM_ROLL_OVER, onItemRollOver);
resourcesChanged();
+ LogUtil.debug("markos: passed resourcesChanged");
titleBarOverlay.tabIndex = baseIndex;
@@ -168,6 +174,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
slideView.slideLoader.tabIndex = baseIndex+4;
hotkeyCapture();
+ LogUtil.debug("markos: finish oncreationcomplete");
}
private function hotkeyCapture():void{
@@ -584,7 +591,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
closeBtn.accessibilityName = ResourceUtil.getInstance().getString("bbb.presentation.closeBtn.accessibilityName");
}
- Accessibility.updateProperties();
+ if(Capabilities.hasAccessibility)
+ Accessibility.updateProperties();
}
private function localeChanged(e:LocaleChangeEvent):void{
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
index 8ed55b13e324a032a1508e50ea9afb9af1515017..f8d44d53d80c51bb5e3ba6c5cf5813533f496b55 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
@@ -308,8 +308,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*/
private function handleSlideLoadedEvent(e:SlideEvent):void{
slideLoader.source = e.slide;
- slideLoader.accessibilityProperties.description = e.slideText;
- Accessibility.updateProperties()
+ if(Capabilities.hasAccessibility){
+ slideLoader.accessibilityProperties.description = e.slideText;
+ Accessibility.updateProperties()
+ }
}
/**