Skip to content

Commit af7e8c5

Browse files
capilkeycapilkey
committed
Merge remote branch 'upstream/master' into more-client-fixes
Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
2 parents 2bc57e9 + d3c3037 commit af7e8c5

File tree

10 files changed

+70
-29
lines changed

10 files changed

+70
-29
lines changed

‎bigbluebutton-client/locale/en_US/bbbResources.properties

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,28 @@ bbb.participants.title = Participants{0} {1}
5454
bbb.participants.titleBar = Participants Window title bar, double click to maximize
5555
bbb.participants.minimizeBtn.accessibilityName = Minimize the Participants Window
5656
bbb.participants.maximizeRestoreBtn.accessibilityName = Maximize the Participants Window
57+
bbb.participants.settings.buttonTooltip = Settings
58+
bbb.participants.settings.audioSettings = Audio Settings
59+
bbb.participants.settings.muteAll = Mute All
60+
bbb.participants.settings.muteAllExcept = Mute All Except Presenter
61+
bbb.participants.settings.unmuteAll = Unmute All
62+
bbb.participants.settings.lowerAllHands = Lower All Hands
63+
bbb.participants.pushToTalk.toolTip = Click to talk
64+
bbb.participants.pushToMute.toolTip = Click to mute yourself
5765
bbb.participants.participantsGrid.accessibilityName = Participants List. Use the arrow keys to navigate.
58-
bbb.participants.participantsGrid.mediaItemRenderer = Media
66+
bbb.participants.participantsGrid.nameItemRenderer = Name
67+
bbb.participants.participantsGrid.statusItemRenderer = Status
68+
bbb.participants.participantsGrid.statusItemRenderer.changePresenter = Change Presenter
5969
bbb.participants.participantsGrid.statusItemRenderer.presenter = Presenter
6070
bbb.participants.participantsGrid.statusItemRenderer.moderator = Moderator
6171
bbb.participants.participantsGrid.statusItemRenderer.handRaised = Hand Raised
6272
bbb.participants.participantsGrid.statusItemRenderer.viewer = Viewer
73+
bbb.participants.participantsGrid.mediaItemRenderer = Media
74+
bbb.participants.participantsGrid.mediaItemRenderer.talking = Talking
75+
bbb.participants.participantsGrid.mediaItemRenderer.webcam = Sharing Webcam
76+
bbb.participants.participantsGrid.mediaItemRenderer.pushToTalk = Click to talk
77+
bbb.participants.participantsGrid.mediaItemRenderer.pushToMute = Click to mute yourself
78+
bbb.participants.participantsGrid.mediaItemRenderer.kickUser = Kick user
6379
bbb.participants.participantsGrid.mediaItemRenderer.webcam = Webcam shared
6480
bbb.participants.participantsGrid.mediaItemRenderer.micOff = Microphone off
6581
bbb.participants.participantsGrid.mediaItemRenderer.micOn = Microphone on

‎bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
172172
// Listen for the ENTER key to send the message.
173173
txtMsgArea.addEventListener(KeyboardEvent.KEY_UP, handleTextAreaKeyUpEvent);
174174
175-
Accessibility.updateProperties();
175+
if(Capabilities.hasAccessibility)
176+
Accessibility.updateProperties();
176177
177178
queryForChatHistory();
178179
}
@@ -476,7 +477,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
476477
chatMessagesList.accessibilityProperties.description += " ";
477478
}
478479
}
479-
Accessibility.updateProperties();
480+
if(Capabilities.hasAccessibility)
481+
Accessibility.updateProperties();
480482
navToFirst = false;
481483
navToLatest = false;
482484
spacerNeeded = false;

‎bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ParticipantsProxy.as

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,14 @@ package org.bigbluebutton.modules.participants.business
9494
{
9595
//find the presenter and lock them
9696
var pres:BBBUser = UserManager.getInstance().getConference().getPresenter();
97-
_listenersService.lockMuteUser(int(pres.voiceUserid), true);
97+
if (pres)
98+
_listenersService.lockMuteUser(int(pres.voiceUserid), true);
9899

99100
_listenersService.muteAllUsers(true);
100101

101102
//unlock the presenter
102-
_listenersService.lockMuteUser(int(pres.voiceUserid), false);
103+
if (pres)
104+
_listenersService.lockMuteUser(int(pres.voiceUserid), false);
103105
}
104106

105107
public function kickUser(event:KickUserEvent):void {

‎bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,16 @@
106106
</mx:Script>
107107
<mx:Image id="showLock" visible="{data.voiceLocked}" source="{images.lock_close}" width="20" height="20" />
108108
<mx:Image id="talkingIcon" visible="{data.talking}" source="{images.sound_new}" width="20" height="20"
109-
toolTip="{ResourceUtil.getInstance().getString('bbb.listenerItem.talkImg.toolTip')}" />
109+
toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.talking')}" />
110110
<mx:Button id="webcamBtn" visible="{data.hasStream}" click="viewCamera()" icon="{images.webcam_new}"
111111
width="20" height="20" enabled="false"
112-
toolTip="{ResourceUtil.getInstance().getString('bbb.viewers.viewersGrid.statusItemRenderer.streamIcon.toolTip')}" />
112+
toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.webcam')}" />
113113
<mx:Button id="muteBtn" visible="{data.voiceJoined}" enabled="false"
114114
width="20" height="20" click="toggleMuteState()"
115115
icon="{data.voiceMuted ? images.audio_muted : images.audio}"
116-
toolTip="{data.voiceMuted ? ResourceUtil.getInstance().getString('bbb.listeners.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.listeners.pushToMute.toolTip')}" />
116+
toolTip="{data.voiceMuted ? ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.pushToTalk') : ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.pushToMute')}" />
117117
<mx:Button id="kickUserBtn" icon="{images.eject_user_new}"
118118
width="20" height="20" visible="{rolledOver}"
119-
toolTip="{ResourceUtil.getInstance().getString('bbb.viewers.kickUserBtn.toolTip')}"
119+
toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.kickUser')}"
120120
click="kickUser()"/>
121121
</mx:HBox>

‎bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
<mx:Label id="nameLabel" textAlign="left" text="{data.name} {data.me ? '(you)' : ''}"
3131
fontWeight="{data.me ? 'bold' : 'normal'}"
3232
color="{data.me ? 0x003399 : 0x000000}"
33-
toolTip="Name"/>
33+
toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.nameItemRenderer')}"/>
3434
</mx:HBox>

‎bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
implements="org.bigbluebutton.common.IBbbModuleWindow"
2626
xmlns:mate="http://mate.asfusion.com/"
2727
creationComplete="onCreationComplete()"
28+
title="{ResourceUtil.getInstance().getString('bbb.participants.title')}"
2829
showCloseButton="false">
2930

3031
<mate:Listener type="{LocaleChangeEvent.LOCALE_CHANGED}" method="localeChanged" />
@@ -171,17 +172,16 @@
171172
172173
private function openSettings():void {
173174
// everyone can see the audio settings
174-
var myMenuData:Array = [{label: "Audio Settings", icon: images.audio}];
175+
var myMenuData:Array = [{label: ResourceUtil.getInstance().getString('bbb.participants.settings.audioSettings'), icon: images.audio}];
175176
176177
if (amIModerator) {
177-
myMenuData[1] = {type: "separator"};
178-
myMenuData[2] = {label: "Lower All Hands", icon: images.hand_new};
178+
myMenuData[1] = {type: "separator"};
179+
myMenuData[2] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.lowerAllHands'), icon: images.hand_new};
179180
if (!roomMuted) {
180-
myMenuData[3] = {label: "Mute All", icon: images.audio_muted};
181-
myMenuData[4] = {label: "Mute All Except Presenter", icon: images.audio_muted};
181+
myMenuData[3] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.muteAll'), icon: images.audio_muted};
182+
myMenuData[4] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.muteAllExcept'), icon: images.audio_muted};
182183
} else
183-
myMenuData[3] = {label: "Unmute All", icon: images.audio};
184-
184+
myMenuData[3] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.unmuteAll'), icon: images.audio};
185185
}
186186
187187
// make sure the previous menu is closed before opening a new one
@@ -388,9 +388,9 @@
388388
tabIndex="{partOptions.baseTabIndex+5}"
389389
accessibilityName="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.accessibilityName')}" >
390390
<mx:columns>
391-
<mx:DataGridColumn dataField="userStatus" headerText="{ResourceUtil.getInstance().getString('bbb.viewers.viewersGrid.statusItemRenderer')}" editable="false" width="45"
391+
<mx:DataGridColumn dataField="userStatus" headerText="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer')}" editable="false" width="45"
392392
itemRenderer="org.bigbluebutton.modules.participants.views.StatusItemRenderer" sortable="false" />
393-
<mx:DataGridColumn dataField="name" headerText="{ResourceUtil.getInstance().getString('bbb.viewers.viewersGrid.nameItemRenderer')}" editable="false" width="100" sortable="false"
393+
<mx:DataGridColumn dataField="name" headerText="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.nameItemRenderer')}" editable="false" width="100" sortable="false"
394394
itemRenderer="org.bigbluebutton.modules.participants.views.NameItemRenderer"/>
395395
<mx:DataGridColumn dataField="media" headerText="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer')}" sortable="false"
396396
itemRenderer="org.bigbluebutton.modules.participants.views.MediaItemRenderer"/>
@@ -399,15 +399,15 @@
399399

400400
<mx:ControlBar width="100%">
401401
<mx:Button id="settingsBtn" icon="{images.users_settings}" width="30" height="30"
402-
toolTip="Settings" click="openSettings()" visible="true" tabIndex="{partOptions.baseTabIndex+10}"/>
402+
toolTip="{ResourceUtil.getInstance().getString('bbb.participants.settings.buttonTooltip')}" click="openSettings()" visible="true" tabIndex="{partOptions.baseTabIndex+10}"/>
403403
<mx:Button id="raiseHandBtn" toggle="true" icon="{images.hand_new}"
404404
width="30" height="30" toolTip="Raise Hand" click="raiseHand()"
405405
visible="false" includeInLayout="{raiseHandBtn.visible}" tabIndex="{partOptions.baseTabIndex+15}" />
406406
<mx:Spacer width="100%"/>
407407
<mx:Button id="muteMeBtn" click="toggleMuteMeState()" height="30" width="30"
408408
icon="{UserManager.getInstance().getConference().voiceMuted ? images.audio_muted : images.audio}"
409409
visible="{UserManager.getInstance().getConference().voiceJoined}"
410-
toolTip="{UserManager.getInstance().getConference().voiceMuted ? ResourceUtil.getInstance().getString('bbb.listeners.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.listeners.pushToMute.toolTip')}"
410+
toolTip="{UserManager.getInstance().getConference().voiceMuted ? ResourceUtil.getInstance().getString('bbb.participants.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.participants.pushToMute.toolTip')}"
411411
tabIndex="{partOptions.baseTabIndex+20}"/>
412412

413413
</mx:ControlBar>

‎bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
roleBtn.enabled = false;
9494
} else if (rolledOver) {
9595
roleBtn.setStyle("icon", images.presenter_new);
96-
roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.viewers.presentBtn.label');
96+
roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer.changePresenter');
9797
roleBtn.enabled = true;
9898
} else if (data.role == Role.MODERATOR) {
9999
roleBtn.setStyle("icon", images.moderator);

‎bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,32 @@ package org.bigbluebutton.modules.present.managers
5050
}
5151

5252
public function handleStartModuleEvent(e:PresentModuleEvent):void{
53-
if (presentWindow != null) return;
53+
LogUtil.debug("markos: begin handleStartModuleEvent");
54+
if (presentWindow != null){
55+
LogUtil.debug("markos: presentwindow is NOT null");
56+
return;
57+
}
58+
LogUtil.debug("markos: before presentwindow");
5459
presentWindow = new PresentationWindow();
60+
LogUtil.debug("markos: presentwindow is created");
5561
presentWindow.visible = (e.data.showPresentWindow == "true");
62+
LogUtil.debug("markos: presentwindow is visible");
5663
presentWindow.showControls = (e.data.showWindowControls == "true");
64+
LogUtil.debug("markos: presentwindow shows controls");
5765
openWindow(presentWindow);
66+
LogUtil.debug("markos: finish handleStartModuleEvent");
5867
}
5968

6069
public function handleStopModuleEvent():void{
6170
presentWindow.close();
6271
}
6372

64-
private function openWindow(window:IBbbModuleWindow):void{
73+
private function openWindow(window:IBbbModuleWindow):void{
74+
LogUtil.debug("markos: begin openwindow");
6575
var event:OpenWindowEvent = new OpenWindowEvent(OpenWindowEvent.OPEN_WINDOW_EVENT);
6676
event.window = window;
67-
globalDispatcher.dispatchEvent(event);
77+
globalDispatcher.dispatchEvent(event);
78+
LogUtil.debug("markos: finish openwindow");
6879
}
6980

7081
public function handleOpenUploadWindow(e:UploadEvent):void{

‎bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,22 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
149149
private var localDispatcher:Dispatcher = new Dispatcher();
150150
151151
private function init():void{
152+
LogUtil.debug("markos: begin init");
152153
presentOptions = new PresentOptions();
153154
baseIndex = presentOptions.baseTabIndex;
155+
LogUtil.debug("markos: end init");
154156
}
155157
156158
private function onCreationComplete():void{
159+
LogUtil.debug("markos: begin oncreationcomplete");
157160
thumbY = this.height - 160;
158-
bindKeyboardEvents();
161+
162+
bindKeyboardEvents();
163+
LogUtil.debug("markos: passed bindKeyboardEvents");
159164
this.addEventListener(MDIWindowEvent.RESIZE_END, onResizeEndEvent);
160165
slideView.addEventListener(ListEvent.ITEM_ROLL_OVER, onItemRollOver);
161166
resourcesChanged();
167+
LogUtil.debug("markos: passed resourcesChanged");
162168
163169
titleBarOverlay.tabIndex = baseIndex;
164170
@@ -168,6 +174,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
168174
169175
slideView.slideLoader.tabIndex = baseIndex+4;
170176
hotkeyCapture();
177+
LogUtil.debug("markos: finish oncreationcomplete");
171178
}
172179
173180
private function hotkeyCapture():void{
@@ -584,7 +591,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
584591
closeBtn.accessibilityName = ResourceUtil.getInstance().getString("bbb.presentation.closeBtn.accessibilityName");
585592
}
586593
587-
Accessibility.updateProperties();
594+
if(Capabilities.hasAccessibility)
595+
Accessibility.updateProperties();
588596
}
589597
590598
private function localeChanged(e:LocaleChangeEvent):void{

‎bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
308308
*/
309309
private function handleSlideLoadedEvent(e:SlideEvent):void{
310310
slideLoader.source = e.slide;
311-
slideLoader.accessibilityProperties.description = e.slideText;
312-
Accessibility.updateProperties()
311+
if(Capabilities.hasAccessibility){
312+
slideLoader.accessibilityProperties.description = e.slideText;
313+
Accessibility.updateProperties()
314+
}
313315
}
314316
315317
/**

0 commit comments

Comments
 (0)