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

Added global hotkey to open breakout rooms window.

Browse Source
This commit is contained in:
Ghazi Triki 2017-02-14 10:34:01 +01:00
parent 3710ba9a4a
commit a8c44fba91
6 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -550,7 +550,9 @@ bbb.shortcutkey.users.focusUsers = 85
bbb.shortcutkey.users.focusUsers.function = Focus to users list
bbb.shortcutkey.users.muteAllButPres = 65
bbb.shortcutkey.users.muteAllButPres.function = Mute everyone but the Presenter
bbb.shortcutkey.users.focusBreakoutRooms = 66
bbb.shortcutkey.users.breakoutRooms = 75
bbb.shortcutkey.users.breakoutRooms.function = Breakout rooms window
bbb.shortcutkey.users.focusBreakoutRooms = 84
bbb.shortcutkey.users.focusBreakoutRooms.function = Focus to breakout rooms list
bbb.shortcutkey.users.listenToBreakoutRoom = 76
bbb.shortcutkey.users.listenToBreakoutRoom.function = Listen to selected breakout room
@ -624,14 +626,14 @@ bbb.shortcutkey.specialKeys.plus = Plus
bbb.shortcutkey.specialKeys.minus = Minus
bbb.toolbar.videodock.toolTip.closeAllVideos = Close all videos
bbb.users.settings.lockAll=Lock All Users
bbb.users.settings.lockAllExcept=Lock Users Except Presenter
bbb.users.settings.lockSettings=Lock Viewers ...
bbb.users.settings.breakoutRooms=Breakout Rooms ...
bbb.users.settings.sendBreakoutRoomsInvitations=Send Breakout Rooms Invitations ...
bbb.users.settings.unlockAll=Unlock All Viewers
bbb.users.settings.roomIsLocked=Locked by default
bbb.users.settings.roomIsMuted=Muted by default
bbb.users.settings.lockAll = Lock All Users
bbb.users.settings.lockAllExcept = Lock Users Except Presenter
bbb.users.settings.lockSettings = Lock Viewers ...
bbb.users.settings.breakoutRooms = Breakout Rooms ...
bbb.users.settings.sendBreakoutRoomsInvitations = Send Breakout Rooms Invitations ...
bbb.users.settings.unlockAll = Unlock All Viewers
bbb.users.settings.roomIsLocked = Locked by default
bbb.users.settings.roomIsMuted = Muted by default
bbb.lockSettings.save = Apply
bbb.lockSettings.save.tooltip = Apply lock settings

3
bigbluebutton-client/src/BigBlueButtonMainContainer.mxml
View File

@ -166,6 +166,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
keyCombos[globalModifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.raiseHand') as String)] = ShortcutEvent.RAISE_HAND;
keyCombos[globalModifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.users.muteme') as String)] = ShortcutEvent.MUTE_ME_EVENT;
keyCombos[globalModifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.users.muteAllButPres') as String)] = ShortcutEvent.MUTE_ALL_BUT_PRES;
keyCombos[globalModifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.users.breakoutRooms') as String)] = ShortcutEvent.OPEN_BREAKOUT_ROOMS;
}
if (ShortcutOptions.presentationActive){
keyCombos[globalModifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.focus.presentation') as String)] = ShortcutEvent.FOCUS_PRESENTATION_WINDOW;
@ -201,7 +202,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
// Handle general-access hotkeys, regardless of what window the user is focused in
private function handleKeyDown(e:KeyboardEvent) :void {
if (keyCombos == null) loadKeyCombos(globalModifier);
if (keyCombos == null) loadKeyCombos(globalModifier);
var keyPress:String = KeyboardUtil.buildPressedKeys(e);

1
bigbluebutton-client/src/org/bigbluebutton/core/KeyboardUtil.as
View File

@ -17,6 +17,7 @@
*
*/
package org.bigbluebutton.core {
import flash.events.KeyboardEvent;
public final class KeyboardUtil {

1
bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as
View File

@ -79,6 +79,7 @@ package org.bigbluebutton.main.events {
//public static const FOCUS_LOOP_END:String = 'FOCUS_LOOP_END';
public static const FOCUS_SHORTCUT_BUTTON:String = 'FOCUS_SHORTCUT_BUTTON';
public static const MUTE_ALL_BUT_PRES:String = 'MUTE_ALL_BUT_PRES';
public static const OPEN_BREAKOUT_ROOMS:String = 'OPEN_BREAKOUT_ROOMS';
public static const FOCUS_LOGOUT_BUTTON:String = 'FOCUS_LOGOUT_BUTTON';
public static const CLOSE_POLL_STATS:String = 'CLOSE_POLL_STATS';

1
bigbluebutton-client/src/org/bigbluebutton/main/model/ShortcutOptions.as
View File

@ -90,6 +90,7 @@ package org.bigbluebutton.main.model
generalResource.push('bbb.shortcutkey.logout');
if (users){generalResource.push('bbb.shortcutkey.raiseHand');}
if (users){generalResource.push('bbb.shortcutkey.users.breakoutRooms');}
if (audio){generalResource.push('bbb.shortcutkey.users.muteme');}
if (audio){generalResource.push('bbb.shortcutkey.users.muteAllButPres');}
if (chat){generalResource.push('bbb.shortcutkey.chat.chatinput');}

9
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml Executable file → Normal file
View File

@ -34,6 +34,7 @@
<mate:Listener type="{ShortcutEvent.RAISE_HAND}" method="remoteRaiseHand" />
<mate:Listener type="{ShortcutEvent.FOCUS_USERS_WINDOW}" method="focusWindow" />
<mate:Listener type="{ShortcutEvent.MUTE_ALL_BUT_PRES}" method="remoteMuteAllButPres" />
<mate:Listener type="{ShortcutEvent.OPEN_BREAKOUT_ROOMS}" method="handleOpenBreakoutRooms" />
<mate:Listener type="{MeetingMutedEvent.MEETING_MUTED}" method="handleMeetingMuted" />
<mate:Listener type="{LockControlEvent.CHANGED_LOCK_SETTINGS}" method="handleChangedLockSettingsEvent" />
<mate:Listener type="{BreakoutRoomEvent.UPDATE_REMAINING_TIME_PARENT}" method="handleRemainingTimeUpdate" />
@ -641,7 +642,13 @@
muteAll();
}
}
private function handleOpenBreakoutRooms(e:ShortcutEvent):void{
if (breakoutOptions.enabled && amIModerator && !UserManager.getInstance().getConference().isBreakout) {
breakoutRooms();
}
}
private function breakoutRoomNameLabelFunction(item:Object, column:DataGridColumn) : String {
return ResourceUtil.getInstance().getString('bbb.users.roomsGrid.room') + " " + item.sequence;
}