diff --git a/bigbluebutton-client/build.xml b/bigbluebutton-client/build.xml
index 861a23cd32bcd9fabc28729361ffcef14421a808..e8f5444f22a22b77a04d8f0df0ac27a336d87b91 100755
--- a/bigbluebutton-client/build.xml
+++ b/bigbluebutton-client/build.xml
@@ -35,7 +35,7 @@
<property name="VIDEO_DOCK" value="VideodockModule" />
<property name="POLLING" value="PollingModule" />
<property name="LAYOUT" value="LayoutModule" />
- <property name="PARTICIPANTS" value="ParticipantsModule" />
+ <property name="USERS" value="UsersModule" />
<xmlproperty file="${SRC_DIR}/conf/locales.xml" collapseAttributes="true"/>
@@ -246,13 +246,13 @@
<build-module src="${SRC_DIR}" target="${LAYOUT}" />
</target>
- <target name="build-participants" description="Compile Participants Module">
- <build-module src="${SRC_DIR}" target="${PARTICIPANTS}" />
+ <target name="build-users" description="Compile Users Module">
+ <build-module src="${SRC_DIR}" target="${USERS}" />
</target>
<!-- just a grouping of modules to compile -->
<target name="build-main-chat-viewers-listeners-present"
- depends="build-bbb-main, build-chat, build-viewers, build-listeners, build-present, build-layout, build-broadcast, build-participants"
+ depends="build-bbb-main, build-chat, build-viewers, build-listeners, build-present, build-layout, build-broadcast, build-users"
description="Compile main, chat, viewers, listeners, present modules">
</target>
diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 49b12c06c9182920b02db801181b848aaa17715c..2114c67cc7b3010611fa4cc02b444b03f73c38fa 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -50,36 +50,36 @@ bbb.viewers.minimizeBtn.accessibilityName = Minimize the Viewers Window
bbb.viewers.maximizeRestoreBtn.accessibilityName = Maximize the Viewers Window
bbb.viewers.closeBtn.accessibilityName = Close the Viewers Window
bbb.viewers.kickUserBtn.toolTip = Kick User
-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.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
-bbb.participants.participantsGrid.mediaItemRenderer.noAudio = Not in audio conference
+bbb.users.title = Users{0} {1}
+bbb.users.titleBar = Users Window title bar, double click to maximize
+bbb.users.minimizeBtn.accessibilityName = Minimize the Users Window
+bbb.users.maximizeRestoreBtn.accessibilityName = Maximize the Users Window
+bbb.users.settings.buttonTooltip = Settings
+bbb.users.settings.audioSettings = Audio Settings
+bbb.users.settings.muteAll = Mute All
+bbb.users.settings.muteAllExcept = Mute All Except Presenter
+bbb.users.settings.unmuteAll = Unmute All
+bbb.users.settings.lowerAllHands = Lower All Hands
+bbb.users.pushToTalk.toolTip = Click to talk
+bbb.users.pushToMute.toolTip = Click to mute yourself
+bbb.users.usersGrid.accessibilityName = Users List. Use the arrow keys to navigate.
+bbb.users.usersGrid.nameItemRenderer = Name
+bbb.users.usersGrid.statusItemRenderer = Status
+bbb.users.usersGrid.statusItemRenderer.changePresenter = Change Presenter
+bbb.users.usersGrid.statusItemRenderer.presenter = Presenter
+bbb.users.usersGrid.statusItemRenderer.moderator = Moderator
+bbb.users.usersGrid.statusItemRenderer.handRaised = Hand Raised
+bbb.users.usersGrid.statusItemRenderer.viewer = Viewer
+bbb.users.usersGrid.mediaItemRenderer = Media
+bbb.users.usersGrid.mediaItemRenderer.talking = Talking
+bbb.users.usersGrid.mediaItemRenderer.webcam = Sharing Webcam
+bbb.users.usersGrid.mediaItemRenderer.pushToTalk = Click to talk
+bbb.users.usersGrid.mediaItemRenderer.pushToMute = Click to mute yourself
+bbb.users.usersGrid.mediaItemRenderer.kickUser = Kick user
+bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam shared
+bbb.users.usersGrid.mediaItemRenderer.micOff = Microphone off
+bbb.users.usersGrid.mediaItemRenderer.micOn = Microphone on
+bbb.users.usersGrid.mediaItemRenderer.noAudio = Not in audio conference
bbb.presentation.title = Presentation
bbb.presentation.fitToWidth.toolTip = Presentation Window Fit to width
bbb.presentation.fitToPage.toolTip = Presentation Window Fit to page
@@ -152,7 +152,7 @@ bbb.chat.maximizeRestoreBtn.accessibilityName = Maximize the Chat Window
bbb.chat.closeBtn.accessibilityName = Close the Chat Window
bbb.listeners.title = Listeners{0} {1}
# Strange sentence structure is due to the screen reader adding the word "list" to the end automatically.
-bbb.listeners.userList = Audio Participants List. Use the arrow keys to navigate the
+bbb.listeners.userList = Audio users List. Use the arrow keys to navigate the
bbb.listeners.pushToTalk.toolTip = Click to talk
bbb.listeners.pushToMute.toolTip = Click to mute yourself
bbb.listeners.talk = Unmute
@@ -324,7 +324,7 @@ bbb.shortcuthelp.closeBtn.accessibilityName = Close the Shortcut Window
bbb.shortcuthelp.dropdown.general = Global shortcuts
bbb.shortcuthelp.dropdown.presentation = Presentation shortcuts
bbb.shortcuthelp.dropdown.chat = Chat shortcuts
-bbb.shortcuthelp.dropdown.participants = Participants shortcuts
+bbb.shortcuthelp.dropdown.users = Users shortcuts
bbb.shortcutkey.general.minimize = 189
bbb.shortcutkey.general.minimize.function = Minimize current window
@@ -333,8 +333,8 @@ bbb.shortcutkey.general.maximize.function = Maximize current window
bbb.shortcutkey.flash.exit = 81
bbb.shortcutkey.flash.exit.function = Focus out of the Flash window
-bbb.shortcutkey.participants.muteme = 77
-bbb.shortcutkey.participants.muteme.function = Mute and Unmute your microphone
+bbb.shortcutkey.users.muteme = 77
+bbb.shortcutkey.users.muteme.function = Mute and Unmute your microphone
bbb.shortcutkey.chat.chatinput = 73
bbb.shortcutkey.chat.chatinput.function = Focus the chat input field
bbb.shortcutkey.present.focusslide = 67
@@ -342,8 +342,8 @@ bbb.shortcutkey.present.focusslide.function = Focus the presentation slide
bbb.shortcutkey.whiteboard.undo = 90
bbb.shortcutkey.whiteboard.undo.function = Undo last whiteboard mark
-bbb.shortcutkey.focus.participants = 49
-bbb.shortcutkey.focus.participants.function = Move focus to the Participants window
+bbb.shortcutkey.focus.users = 49
+bbb.shortcutkey.focus.users.function = Move focus to the Users window
bbb.shortcutkey.focus.video = 50
bbb.shortcutkey.focus.video.function = Move focus to the Video dock
bbb.shortcutkey.focus.presentation = 51
@@ -378,16 +378,16 @@ bbb.shortcutkey.present.fitWidth.function = Fit slides to width
bbb.shortcutkey.present.fitPage = 80
bbb.shortcutkey.present.fitPage.function = Fit slides to page
-bbb.shortcutkey.participants.makePresenter = 80
-bbb.shortcutkey.participants.makePresenter.function = Make selected person presenter
-bbb.shortcutkey.participants.kick = 75
-bbb.shortcutkey.participants.kick.function = Kick selected person from the meeting
-bbb.shortcutkey.participants.mute = 83
-bbb.shortcutkey.participants.mute.function = Mute or Unmute selected person
-bbb.shortcutkey.participants.muteall = 65
-bbb.shortcutkey.participants.muteall.function = Mute or Unmute all participants
-bbb.shortcutkey.participants.focusUsers = 70
-bbb.shortcutkey.participants.focusUsers.function = Focus to participants list
+bbb.shortcutkey.users.makePresenter = 80
+bbb.shortcutkey.users.makePresenter.function = Make selected person presenter
+bbb.shortcutkey.users.kick = 75
+bbb.shortcutkey.users.kick.function = Kick selected person from the meeting
+bbb.shortcutkey.users.mute = 83
+bbb.shortcutkey.users.mute.function = Mute or Unmute selected person
+bbb.shortcutkey.users.muteall = 65
+bbb.shortcutkey.users.muteall.function = Mute or Unmute all users
+bbb.shortcutkey.users.focusUsers = 70
+bbb.shortcutkey.users.focusUsers.function = Focus to users list
bbb.shortcutkey.chat.focusTabs = 89
bbb.shortcutkey.chat.focusTabs.function = Focus to chat tabs
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index a05fcb5c382d5e4e9bc4c6f2e25d3db420d66a31..21bec108543fc79b011e9ec8a9beefe987d72f05 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -16,7 +16,7 @@
<module name="ChatModule" url="http://HOST/client/ChatModule.swf?v=VERSION"
uri="rtmp://HOST/bigbluebutton"
- dependsOn="ParticipantsModule"
+ dependsOn="UsersModule"
translationOn="false"
translationEnabled="false"
privateEnabled="true"
@@ -39,7 +39,7 @@
/>
-->
- <module name="ParticipantsModule" url="http://HOST/client/ParticipantsModule.swf?v=VERSION"
+ <module name="UsersModule" url="http://HOST/client/UsersModule.swf?v=VERSION"
uri="rtmp://HOST/bigbluebutton"
/>
@@ -58,12 +58,12 @@
skipCheck="false"
showButton="true"
enabledEchoCancel="true"
- dependsOn="ParticipantsModule"
+ dependsOn="UsersModule"
/>
<module name="VideoconfModule" url="http://HOST/client/VideoconfModule.swf?v=VERSION"
uri="rtmp://HOST/video"
- dependson = "ParticipantsModule"
+ dependson = "UsersModule"
videoQuality = "100"
presenterShareOnly = "false"
controlsForPresenter = "false"
@@ -107,13 +107,13 @@
host="http://HOST"
showPresentWindow="true"
showWindowControls="true"
- dependsOn="ParticipantsModule"
+ dependsOn="UsersModule"
baseTabIndex="501"
/>
<module name="VideodockModule" url="http://HOST/client/VideodockModule.swf?v=VERSION"
uri="rtmp://HOST/bigbluebutton"
- dependsOn="VideoconfModule, ParticipantsModule"
+ dependsOn="VideoconfModule, UsersModule"
autoDock="true"
showControls="true"
maximizeWindow="false"
@@ -143,7 +143,7 @@
position="top-left"
showStreams="true"
autoPlay="false"
- dependsOn="ParticipantsModule"
+ dependsOn="UsersModule"
/>
-->
diff --git a/bigbluebutton-client/resources/prod/layout.xml b/bigbluebutton-client/resources/prod/layout.xml
index 6c98f04eb4e4707d50b5d9265faa0b46e8ea1fb2..8fcaf87c1beee215fb863c899d9d2e42e57157a0 100755
--- a/bigbluebutton-client/resources/prod/layout.xml
+++ b/bigbluebutton-client/resources/prod/layout.xml
@@ -6,7 +6,7 @@
<window name="VideoDock" width="1" height="1" x="0" y="0" order="0"/>
<window name="ChatWindow" width="0.303125" height="0.9955703211517165" x="0.3229166666666667" y="0.9656699889258029" order="4" hidden="true" />
<window name="PresentationWindow" minimized="true" order="1" hidden="true" />
- <window name="ParticipantsWindow" minimized="true" hidden="true" order="2"/>
+ <window name="UsersWindow" minimized="true" hidden="true" order="2"/>
<window name="ViewersWindow" hidden="true" draggable="false" resizable="false" />
<window name="ListenersWindow" hidden="true" draggable="false" resizable="false"/>
</layout>
@@ -16,14 +16,14 @@
<window name="PresentationWindow" width="0.5137481910274964" height="0.9946808510638298" x="0.18017366136034732" y="0" />
<window name="VideoDock" width="0.1772793053545586" height="0.30851063829787234" x="0" y="0.6875" />
<window name="ChatWindow" width="0.3031837916063676" height="0.9960106382978723" x="0.6968162083936325" y="0" />
- <window name="ParticipantsWindow" width="0.1772793053545586" height="0.6795212765957446" x="0" y="0" />
+ <window name="UsersWindow" width="0.1772793053545586" height="0.6795212765957446" x="0" y="0" />
<window name="ViewersWindow" width="0.1772793053545586" height="0.33643617021276595" x="0" y="0" />
<window name="ListenersWindow" width="0.1772793053545586" height="0.33643617021276595" x="0" y="0.34308510638297873" />
</layout>
<layout name="Users">
<window name="NotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
<window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
- <window name="ParticipantsWindow" width="0.1772793053545586" height="0.6795212765957446" x="0" y="0" />
+ <window name="UsersWindow" width="0.1772793053545586" height="0.6795212765957446" x="0" y="0" />
<window name="PresentationWindow" width="0.5137481910274964" height="0.9946808510638298" x="0.18017366136034732" y="0" />
<window name="VideoDock" width="0.1772793053545586" height="0.30851063829787234" x="0" y="0.6875" />
<window name="ChatWindow" width="0.3031837916063676" height="0.9960106382978723" x="0.6968162083936325" y="0" />
@@ -33,13 +33,13 @@
<window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
<window name="VideoDock" width="0.6570188133140377" height="0.9960106382978723" x="0" y="0" />
<window name="ChatWindow" width="0.3393632416787265" height="0.5305851063829787" x="0.658465991316932" y="0" />
- <window name="ParticipantsWindow" hidden="true" />
+ <window name="UsersWindow" hidden="true" />
<window name="PresentationWindow" width="0.34008683068017365" height="0.4601063829787234" x="0.658465991316932" y="0.535904255319149" />
</layout>
<layout name="Webinar">
<window name="NotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
<window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
- <window name="ParticipantsWindow" minimized="true" />
+ <window name="UsersWindow" minimized="true" />
<window name="VideoDock" width="0.2923611111111111" height="0.4640957446808511" x="0.7048611111111112" y="0.535904255319149" />
<window name="PresentationWindow" width="0.7027777777777777" height="0.9986702127659575" x="0" y="0" />
<window name="ChatWindow" width="0.2923611111111111" height="0.5305851063829787" x="0.7048611111111112" y="0" />
@@ -48,14 +48,14 @@
<window name="NotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
<window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
<window name="ChatWindow" width="0.4597222222222222" height="0.9958677685950413" x="0.2263888888888889" y="0" />
- <window name="ParticipantsWindow" width="0.22152777777777777" height="0.9944903581267218" x="0" y="0" />
+ <window name="UsersWindow" width="0.22152777777777777" height="0.9944903581267218" x="0" y="0" />
<window name="PresentationWindow" width="0.3104166666666667" height="0.5537190082644629" x="0.6895833333333333" y="0" />
<window name="VideoDock" width="0.30972222222222223" height="0.4256198347107438" x="0.6902777777777778" y="0.568870523415978" />
</layout>
<layout name="Lecture">
<window name="NotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
<window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
- <window name="ParticipantsWindow" hidden="true" />
+ <window name="UsersWindow" hidden="true" />
<window name="VideoDock" width="0.2923611111111111" height="0.4640957446808511" x="0.7048611111111112" y="0.535904255319149" />
<window name="PresentationWindow" width="0.7027777777777777" height="0.9986702127659575" x="0" y="0" />
<window name="ChatWindow" width="0.2923611111111111" height="0.5305851063829787" x="0.7048611111111112" y="0" />
@@ -64,7 +64,7 @@
<window name="NotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
<window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
<window name="ChatWindow" hidden="true" />
- <window name="ParticipantsWindow" hidden="true" />
+ <window name="UsersWindow" hidden="true" />
<window name="PresentationWindow" maximized="true" />
<window name="VideoDock" hidden="true" />
</layout>
@@ -72,7 +72,7 @@
<window name="NotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
<window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
<window name="ChatWindow" width="0.4597222222222222" height="0.9958677685950413" x="0.2263888888888889" y="0" />
- <window name="ParticipantsWindow" width="0.22152777777777777" height="0.9944903581267218" x="0" y="0" />
+ <window name="UsersWindow" width="0.22152777777777777" height="0.9944903581267218" x="0" y="0" />
<window name="PresentationWindow" width="0.3104166666666667" height="0.5537190082644629" x="0.6895833333333333" y="0" />
<window name="VideoDock" width="0.30972222222222223" height="0.4256198347107438" x="0.6902777777777778" y="0.568870523415978" />
</layout>
@@ -80,14 +80,14 @@
<window name="NotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
<window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
<window name="ChatWindow" hidden="true" draggable="false" resizable="false"/>
- <window name="ParticipantsWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="UsersWindow" hidden="true" draggable="false" resizable="false"/>
<window name="PresentationWindow" width="0.8" height="1" x="0" y="0" draggable="false" resizable="false"/>
<window name="VideoDock" hidden="true" draggable="false" resizable="false"/>
</layout>
<layout name="S2SVideoChat">
<window name="NotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
<window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
- <window name="ParticipantsWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="UsersWindow" hidden="true" draggable="false" resizable="false"/>
<window name="VideoDock" width="1" height="1" x="0" y="0" draggable="false" resizable="false"/>
<window name="ChatWindow" hidden="true" draggable="false" resizable="false"/>
<window name="PresentationWindow" hidden="true" draggable="false" resizable="false"/>
@@ -95,7 +95,7 @@
<layout name="Notes">
<window name="NotesWindow" hidden="false" width="0.7" height="0.4" x="0" y="0.6" draggable="false" resizable="false"/>
<window name="BroadcastWindow" hidden="false" width="0.7" height="0.6" x="0" y="0" draggable="false" resizable="false"/>
- <window name="ParticipantsWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="UsersWindow" hidden="true" draggable="false" resizable="false"/>
<window name="VideoDock" hidden="true" draggable="false" resizable="false"/>
<window name="ChatWindow" width="0.3" height="1" x="0.7" y="0" draggable="false" resizable="false"/>
<window name="PresentationWindow" hidden="true" draggable="false" resizable="false"/>
@@ -103,7 +103,7 @@
<layout name="Broadcast">
<window name="NotesWindow" hidden="false" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
<window name="BroadcastWindow" hidden="false" width="0.7" height="0.9" x="0" y="0" draggable="false" resizable="false"/>
- <window name="ParticipantsWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="UsersWindow" hidden="true" draggable="false" resizable="false"/>
<window name="VideoDock" hidden="true" draggable="false" resizable="false"/>
<window name="ChatWindow" width="0.3" height="1" x="0.7" y="0" draggable="false" resizable="false"/>
<window name="PresentationWindow" hidden="true" draggable="false" resizable="false"/>
diff --git a/bigbluebutton-client/src/BigBlueButton.mxml b/bigbluebutton-client/src/BigBlueButton.mxml
index fd13f11805ab6aab8bc1942385a13c04a5f5b400..9b0d490d16353c46c74a553b2fe5ab0b48b34407 100755
--- a/bigbluebutton-client/src/BigBlueButton.mxml
+++ b/bigbluebutton-client/src/BigBlueButton.mxml
@@ -113,11 +113,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
keyCombos = new Object(); // always start with a fresh array
keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.flash.exit') as String)] = ShortcutEvent.FOCUS_AWAY_EVENT;
- keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.participants.muteme') as String)] = ShortcutEvent.MUTE_ME_EVENT;
+ keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.users.muteme') as String)] = ShortcutEvent.MUTE_ME_EVENT;
keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.chat.chatinput') as String)] = ShortcutEvent.FOCUS_CHAT_INPUT;
// General hotKeys (usable from anywhere in the application)
- keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.focus.participants') as String)] = ShortcutEvent.FOCUS_PARTICIPANTS_WINDOW;
+ keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.focus.users') as String)] = ShortcutEvent.FOCUS_USERS_WINDOW;
keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.focus.video') as String)] = ShortcutEvent.FOCUS_VIDEO_WINDOW;
keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.focus.presentation') as String)] = ShortcutEvent.FOCUS_PRESENTATION_WINDOW;
keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.focus.chat') as String)] = ShortcutEvent.FOCUS_CHAT_WINDOW;
diff --git a/bigbluebutton-client/src/ParticipantsModule.mxml b/bigbluebutton-client/src/UsersModule.mxml
similarity index 74%
rename from bigbluebutton-client/src/ParticipantsModule.mxml
rename to bigbluebutton-client/src/UsersModule.mxml
index 182f4d624ce02e5ec70b9bd3c641fb825cd34fa5..d8eb1cd75faf46141f5ce2951cf3e79069b626ab 100755
--- a/bigbluebutton-client/src/ParticipantsModule.mxml
+++ b/bigbluebutton-client/src/UsersModule.mxml
@@ -22,24 +22,24 @@
<mx:Module xmlns:mx="http://www.adobe.com/2006/mxml"
implements="org.bigbluebutton.common.IBigBlueButtonModule"
- creationComplete="onCreationComplete()" xmlns:maps="org.bigbluebutton.modules.participants.maps.*" >
+ creationComplete="onCreationComplete()" xmlns:maps="org.bigbluebutton.modules.users.maps.*" >
- <maps:ParticipantsEventMap id="participantsEventMap" />
+ <maps:UsersEventMap id="UsersEventMap" />
<mx:Script>
<![CDATA[
import com.asfusion.mate.events.Dispatcher;
import org.bigbluebutton.common.LogUtil;
- import org.bigbluebutton.modules.participants.events.StartParticipantsModuleEvent;
- import org.bigbluebutton.modules.participants.events.StopParticipantsModuleEvent;
+ import org.bigbluebutton.modules.users.events.StartUsersModuleEvent;
+ import org.bigbluebutton.modules.users.events.StopUsersModuleEvent;
- private var _moduleName:String = "Participants Module";
+ private var _moduleName:String = "Users Module";
private var _attributes:Object;
private var dispatcher:Dispatcher;
private function onCreationComplete():void {
- LogUtil.debug("ParticipantsModule Initialized");
+ LogUtil.debug("UsersModule Initialized");
}
public function get moduleName():String {
@@ -62,15 +62,15 @@
_attributes = attributes;
dispatcher = new Dispatcher();
- var startEvent:StartParticipantsModuleEvent = new StartParticipantsModuleEvent(StartParticipantsModuleEvent.START_PARTICIPANTS_MODULE);
+ var startEvent:StartUsersModuleEvent = new StartUsersModuleEvent(StartUsersModuleEvent.START_USERS_MODULE);
startEvent.module = this;
dispatcher.dispatchEvent(startEvent);
}
public function stop():void {
- LogUtil.debug("ParticipantsModule is stopping");
+ LogUtil.debug("UsersModule is stopping");
- var endEvent:StopParticipantsModuleEvent = new StopParticipantsModuleEvent(StopParticipantsModuleEvent.STOP_PARTICIPANTS_MODULE);
+ var endEvent:StopUsersModuleEvent = new StopUsersModuleEvent(StopUsersModuleEvent.STOP_USERS_MODULE);
dispatcher.dispatchEvent(endEvent);
}
diff --git a/bigbluebutton-client/src/conf/layout.xml b/bigbluebutton-client/src/conf/layout.xml
index 4362f2274c72f0a7a652330f91ae4b0ee66b019a..b26c57c8065d711ec4c7bbd28bc39d9fd9fe124e 100755
--- a/bigbluebutton-client/src/conf/layout.xml
+++ b/bigbluebutton-client/src/conf/layout.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<layouts>
<layout name="Default" default="true">
- <window name="ParticipantsWindow" width="0.1772793053545586" height="0.6795212765957446" x="0" y="0" />
+ <window name="UsersWindow" width="0.1772793053545586" height="0.6795212765957446" x="0" y="0" />
<window name="PresentationWindow" width="0.5137481910274964" height="0.9946808510638298" x="0.18017366136034732" y="0" />
<window name="VideoDock" width="0.1772793053545586" height="0.30851063829787234" x="0" y="0.6875" />
<window name="ChatWindow" width="0.3031837916063676" height="0.9960106382978723" x="0.6968162083936325" y="0" />
@@ -9,36 +9,36 @@
<layout name="Meeting">
<window name="VideoDock" width="0.6570188133140377" height="0.9960106382978723" x="0" y="0" />
<window name="ChatWindow" width="0.3393632416787265" height="0.5305851063829787" x="0.658465991316932" y="0" />
- <window name="ParticipantsWindow" hidden="true" />
+ <window name="UsersWindow" hidden="true" />
<window name="PresentationWindow" width="0.34008683068017365" height="0.4601063829787234" x="0.658465991316932" y="0.535904255319149" />
</layout>
<layout name="Webinar">
- <window name="ParticipantsWindow" minimized="true" />
+ <window name="UsersWindow" minimized="true" />
<window name="VideoDock" width="0.2923611111111111" height="0.4640957446808511" x="0.7048611111111112" y="0.535904255319149" />
<window name="PresentationWindow" width="0.7027777777777777" height="0.9986702127659575" x="0" y="0" />
<window name="ChatWindow" width="0.2923611111111111" height="0.5305851063829787" x="0.7048611111111112" y="0" />
</layout>
<layout name="Lecture assistant">
<window name="ChatWindow" width="0.4597222222222222" height="0.9958677685950413" x="0.2263888888888889" y="0" />
- <window name="ParticipantsWindow" width="0.2222222222222222" height="0.9944903581267218" x="0" y="0" />
+ <window name="UsersWindow" width="0.2222222222222222" height="0.9944903581267218" x="0" y="0" />
<window name="PresentationWindow" width="0.3104166666666667" height="0.5537190082644629" x="0.6895833333333333" y="0" />
<window name="VideoDock" width="0.30972222222222223" height="0.4256198347107438" x="0.6902777777777778" y="0.568870523415978" />
</layout>
<layout name="Lecture">
- <window name="ParticipantsWindow" hidden="true" />
+ <window name="UsersWindow" hidden="true" />
<window name="VideoDock" width="0.2923611111111111" height="0.4640957446808511" x="0.7048611111111112" y="0.535904255319149" />
<window name="PresentationWindow" width="0.7027777777777777" height="0.9986702127659575" x="0" y="0" />
<window name="ChatWindow" width="0.2923611111111111" height="0.5305851063829787" x="0.7048611111111112" y="0" />
</layout>
<layout name="Lecture" role="presenter">
<window name="ChatWindow" hidden="true" />
- <window name="ParticipantsWindow" hidden="true" />
+ <window name="UsersWindow" hidden="true" />
<window name="PresentationWindow" maximized="true" />
<window name="VideoDock" hidden="true" />
</layout>
<layout name="Lecture" role="moderator">
<window name="ChatWindow" width="0.4597222222222222" height="0.9958677685950413" x="0.2263888888888889" y="0" />
- <window name="ParticipantsWindow" width="0.2222222222222222" height="0.9944903581267218" x="0" y="0" />
+ <window name="UsersWindow" width="0.2222222222222222" height="0.9944903581267218" x="0" y="0" />
<window name="PresentationWindow" width="0.3104166666666667" height="0.5537190082644629" x="0.6895833333333333" y="0" />
<window name="VideoDock" width="0.30972222222222223" height="0.4256198347107438" x="0.6902777777777778" y="0.568870523415978" />
</layout>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as b/bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as
index af20f76872ee775499060c64292bfa7a6b9a0590..1ca33d13e4461d235994b608d359851a2e826d11 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as
@@ -42,7 +42,7 @@ package org.bigbluebutton.main.events {
public static const GOREAD_MESSAGE:String = 'GOREAD_MESSAGE';
public static const OPEN_SHORTCUT_WIN:String = 'OPEN_SHORTCUT_WIN';
- public static const FOCUS_PARTICIPANTS_WINDOW:String = 'FOCUS_PARTICIPANTS_WINDOW';
+ public static const FOCUS_USERS_WINDOW:String = 'FOCUS_USERS_WINDOW';
public static const FOCUS_VIDEO_WINDOW:String = 'FOCUS_VIDEO_WINDOW';
public static const FOCUS_PRESENTATION_WINDOW:String = 'FOCUS_PRESENTATION_WINDOW';
public static const FOCUS_CHAT_WINDOW:String = 'FOCUS_CHAT_WINDOW';
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
index a45e5a47d779661d725876c7344261203193610e..cae1695b61e08e277c968d70d9a66528ddb63b04 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
@@ -111,7 +111,7 @@ package org.bigbluebutton.main.model.users
[Bindable] public var customdata:Object = {};
/*
- * This variable is for accessibility for the Participants Window. It can't be manually set
+ * This variable is for accessibility for the Users Window. It can't be manually set
* and only changes when one of the relevant status variables changes. Use the verifyUserStatus
* method to update the value.
* Chad
@@ -124,17 +124,17 @@ package org.bigbluebutton.main.model.users
private function set userStatus(s:String):void {}
private function verifyUserStatus():void {
if (presenter)
- _userStatus = ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer.presenter');
+ _userStatus = ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer.presenter');
else if (role == Role.MODERATOR)
- _userStatus = ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer.moderator');
+ _userStatus = ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer.moderator');
else if (raiseHand)
- _userStatus = ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer.handRaised');
+ _userStatus = ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer.handRaised');
else
- _userStatus = ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer.viewer');
+ _userStatus = ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer.viewer');
}
/*
- * This variable is for accessibility for the Participants Window. It can't be manually set
+ * This variable is for accessibility for the Users Window. It can't be manually set
* and only changes when one of the relevant media variables changes. Use the verifyMedia
* method to update the value.
* Chad
@@ -146,10 +146,10 @@ package org.bigbluebutton.main.model.users
}
private function set media(m:String):void {}
private function verifyMedia():void {
- _media = (hasStream ? ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.webcam') + " " : "") +
- (!voiceJoined ? ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.noAudio') :
- (voiceMuted ? ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.micOff') :
- ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.micOn')));
+ _media = (hasStream ? ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.webcam') + " " : "") +
+ (!voiceJoined ? ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.noAudio') :
+ (voiceMuted ? ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.micOff') :
+ ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.micOn')));
}
private var _status:StatusCollection = new StatusCollection();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
index 74738d67f7b81c1d1dcbb9f198c0062d5bb7da50..64a5aff4626e30bc13f7e1c0816f602961a77874 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
@@ -44,13 +44,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var genKeys:ArrayList;
private var presKeys:ArrayList;
private var chatKeys:ArrayList;
- private var partKeys:ArrayList;
+ private var userKeys:ArrayList;
private var genResource:Array = ['bbb.shortcutkey.general.minimize', 'bbb.shortcutkey.general.maximize',
- 'bbb.shortcutkey.flash.exit', 'bbb.shortcutkey.focus.participants', 'bbb.shortcutkey.focus.video',
+ 'bbb.shortcutkey.flash.exit', 'bbb.shortcutkey.focus.users', 'bbb.shortcutkey.focus.video',
'bbb.shortcutkey.focus.presentation', 'bbb.shortcutkey.focus.chat', 'bbb.shortcutkey.share.desktop',
'bbb.shortcutkey.share.microphone', 'bbb.shortcutkey.share.webcam', 'bbb.shortcutkey.shortcutWindow',
- 'bbb.shortcutkey.logout', 'bbb.shortcutkey.raiseHand', 'bbb.shortcutkey.participants.muteme'];
+ 'bbb.shortcutkey.logout', 'bbb.shortcutkey.raiseHand', 'bbb.shortcutkey.users.muteme'];
private var presResource:Array = ['bbb.shortcutkey.focus.presentation', 'bbb.shortcutkey.present.focusslide', 'bbb.shortcutkey.whiteboard.undo',
'bbb.shortcutkey.present.upload', 'bbb.shortcutkey.present.previous', 'bbb.shortcutkey.present.select',
@@ -62,8 +62,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
'bbb.shortcutkey.chat.chatbox.gofirst', 'bbb.shortcutkey.chat.chatbox.goback', 'bbb.shortcutkey.chat.chatbox.repeat',
'bbb.shortcutkey.chat.chatbox.advance', 'bbb.shortcutkey.chat.chatbox.golatest', 'bbb.shortcutkey.chat.chatbox.goread'];
- private var partResource:Array = ['bbb.shortcutkey.focus.participants', 'bbb.shortcutkey.participants.focusUsers', 'bbb.shortcutkey.participants.makePresenter', 'bbb.shortcutkey.participants.mute',
- 'bbb.shortcutkey.participants.kick', 'bbb.shortcutkey.participants.muteall'];
+ private var userResource:Array = ['bbb.shortcutkey.focus.users', 'bbb.shortcutkey.users.focusUsers', 'bbb.shortcutkey.users.makePresenter', 'bbb.shortcutkey.users.mute',
+ 'bbb.shortcutkey.users.kick', 'bbb.shortcutkey.users.muteall'];
[Bindable]
private var shownKeys:ArrayCollection;
@@ -89,7 +89,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
genKeys = loadKeys(genResource);
presKeys = loadKeys(presResource);
chatKeys = loadKeys(chatResource);
- partKeys = loadKeys(partResource);
+ userKeys = loadKeys(userResource);
changeArray();
}
@@ -106,8 +106,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
case 2: //Chat
shownKeys.addAll(chatKeys);
break;
- case 3: //Participants
- shownKeys.addAll(partKeys);
+ case 3: //Users
+ shownKeys.addAll(userKeys);
break;
}
}
@@ -190,7 +190,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:String>{ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.general")}</mx:String>
<mx:String>{ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.presentation")}</mx:String>
<mx:String>{ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.chat")}</mx:String>
- <mx:String>{ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.participants")}</mx:String>
+ <mx:String>{ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.users")}</mx:String>
</mx:ArrayCollection>
</mx:ComboBox>
<mx:DataGrid id="keyList" draggableColumns="false" dataProvider="{shownKeys}" width="100%" height="100%" tabIndex="{baseIndex + 15}" >
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ListenersSOService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/business/ListenersSOService.as
similarity index 97%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ListenersSOService.as
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/business/ListenersSOService.as
index 8be57b7bfe9d5f0a959a42325fd5f94b1457964c..fbdb3c2ed12dc5efd09093bcbba5b9980a7cc989 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ListenersSOService.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/business/ListenersSOService.as
@@ -16,7 +16,7 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.modules.participants.business
+package org.bigbluebutton.modules.users.business
{
import com.asfusion.mate.events.Dispatcher;
import flash.events.AsyncErrorEvent;
@@ -32,7 +32,7 @@ package org.bigbluebutton.modules.participants.business
import org.bigbluebutton.main.events.BBBEvent;
import org.bigbluebutton.main.model.users.BBBUser;
import org.bigbluebutton.main.model.users.Conference;
- import org.bigbluebutton.modules.participants.events.ParticipantsEvent;
+ import org.bigbluebutton.modules.users.events.UsersEvent;
public class ListenersSOService {
private static const LOGNAME:String = "[ListenersSOService]";
@@ -46,13 +46,13 @@ package org.bigbluebutton.modules.participants.business
private var nc_responder : Responder;
private var _soErrors:Array;
private var pingCount:int = 0;
- private var _module:ParticipantsModule;
+ private var _module:UsersModule;
private var dispatcher:Dispatcher;
private var moderator:Boolean;
private static var globalDispatcher:Dispatcher = new Dispatcher();
- public function ListenersSOService(module:ParticipantsModule) {
+ public function ListenersSOService(module:UsersModule) {
_conference = UserManager.getInstance().getConference();
_module = module;
dispatcher = new Dispatcher();
@@ -322,7 +322,7 @@ package org.bigbluebutton.modules.participants.business
}
public function muteStateCallback(mute:Boolean):void {
- var e:ParticipantsEvent = new ParticipantsEvent(ParticipantsEvent.ROOM_MUTE_STATE);
+ var e:UsersEvent = new UsersEvent(UsersEvent.ROOM_MUTE_STATE);
e.mute_state = mute;
dispatcher.dispatchEvent(e);
}
@@ -382,7 +382,7 @@ package org.bigbluebutton.modules.participants.business
new Responder(
// participants - On successful result
function(result:Object):void {
- var e:ParticipantsEvent = new ParticipantsEvent(ParticipantsEvent.ROOM_MUTE_STATE);
+ var e:UsersEvent = new UsersEvent(UsersEvent.ROOM_MUTE_STATE);
e.mute_state = result as Boolean;
dispatcher.dispatchEvent(e);
},
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/NetConnectionDelegate.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/business/NetConnectionDelegate.as
similarity index 99%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/NetConnectionDelegate.as
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/business/NetConnectionDelegate.as
index 61a08ec4b148d66a0ebef5319ba4c9479cf47b1c..99815bda039d7581ed11635062c8d3cb97b3b8dc 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/NetConnectionDelegate.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/business/NetConnectionDelegate.as
@@ -16,7 +16,7 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.modules.participants.business
+package org.bigbluebutton.modules.users.business
{
import flash.events.*;
import flash.net.NetConnection;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ParticipantsProxy.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/business/UsersProxy.as
similarity index 81%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ParticipantsProxy.as
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/business/UsersProxy.as
index ad2a38bafffe2220a6f7460257f8620fd63da652..001abed7a882aa5d4f954020d238a5134e01ec33 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/business/ParticipantsProxy.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/business/UsersProxy.as
@@ -16,7 +16,7 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.modules.participants.business
+package org.bigbluebutton.modules.users.business
{
import com.asfusion.mate.events.Dispatcher;
@@ -27,30 +27,30 @@ package org.bigbluebutton.modules.participants.business
import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.main.model.users.BBBUser;
import org.bigbluebutton.main.model.users.events.KickUserEvent;
- import org.bigbluebutton.modules.participants.events.ParticipantsEvent;
- import org.bigbluebutton.modules.participants.events.StartParticipantsModuleEvent;
- import org.bigbluebutton.modules.participants.events.StopParticipantsModuleEvent;
+ import org.bigbluebutton.modules.users.events.UsersEvent;
+ import org.bigbluebutton.modules.users.events.StartUsersModuleEvent;
+ import org.bigbluebutton.modules.users.events.StopUsersModuleEvent;
import org.bigbluebutton.core.events.VoiceConfEvent;
- public class ParticipantsProxy
+ public class UsersProxy
{
private var _listenersService:ListenersSOService;
- private var _participants:ArrayCollection = null;
+ private var _users:ArrayCollection = null;
// Is teh disconnection due to user issuing the disconnect or is it the server
// disconnecting due to t fault?
private var manualDisconnect:Boolean = false;
- private var _module:ParticipantsModule;
+ private var _module:UsersModule;
private var dispatcher:Dispatcher;
- public function ParticipantsProxy(){
+ public function UsersProxy(){
dispatcher = new Dispatcher();
}
- public function connect(event:StartParticipantsModuleEvent):void {
- _participants = UserManager.getInstance().getConference().users
+ public function connect(event:StartUsersModuleEvent):void {
+ _users = UserManager.getInstance().getConference().users
_module = event.module;
_listenersService = new ListenersSOService(_module);
_listenersService.addConnectionStatusListener(connectionStatusListener);
@@ -68,9 +68,9 @@ package org.bigbluebutton.modules.participants.business
if (connected) {
// sendNotification(ListenersModuleConstants.CONNECTED);
} else {
- _participants = null;
+ _users = null;
var dispatcher:Dispatcher = new Dispatcher();
- var e:StopParticipantsModuleEvent = new StopParticipantsModuleEvent(StopParticipantsModuleEvent.DISCONNECTED);
+ var e:StopUsersModuleEvent = new StopUsersModuleEvent(StopUsersModuleEvent.DISCONNECTED);
e.manual_disconnect = manualDisconnect;
dispatcher.dispatchEvent(e);
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/StartParticipantsModuleEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/events/StartUsersModuleEvent.as
similarity index 73%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/StartParticipantsModuleEvent.as
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/events/StartUsersModuleEvent.as
index 2f0a7db79c29d40c4399c83ea88085526e5bf5e7..c4764daa43a3153de123487812385c8f07e68b21 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/StartParticipantsModuleEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/events/StartUsersModuleEvent.as
@@ -16,17 +16,17 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.modules.participants.events
+package org.bigbluebutton.modules.users.events
{
import flash.events.Event;
- public class StartParticipantsModuleEvent extends Event
+ public class StartUsersModuleEvent extends Event
{
- public static const START_PARTICIPANTS_MODULE:String = "Start_Participants_Module";
+ public static const START_USERS_MODULE:String = "Start_Users_Module";
- public var module:ParticipantsModule;
+ public var module:UsersModule;
- public function StartParticipantsModuleEvent(type:String)
+ public function StartUsersModuleEvent(type:String)
{
super(type, true, false);
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/StopParticipantsModuleEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/events/StopUsersModuleEvent.as
similarity index 77%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/StopParticipantsModuleEvent.as
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/events/StopUsersModuleEvent.as
index 483480121d212d61df19b6cdd9a29e1b3c5eef11..503dbc2dfce0548ea62da9705d3ab0b4bfe2b8dc 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/StopParticipantsModuleEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/events/StopUsersModuleEvent.as
@@ -16,18 +16,18 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.modules.participants.events
+package org.bigbluebutton.modules.users.events
{
import flash.events.Event;
- public class StopParticipantsModuleEvent extends Event
+ public class StopUsersModuleEvent extends Event
{
- public static const STOP_PARTICIPANTS_MODULE:String = "Stop_Participants_Module";
+ public static const STOP_USERS_MODULE:String = "Stop_Users_Module";
public static const DISCONNECTED:String = "Module Disconnected";
public var manual_disconnect:Boolean;
- public function StopParticipantsModuleEvent(type:String)
+ public function StopUsersModuleEvent(type:String)
{
super(type, true, false);
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/ParticipantsEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/events/UsersEvent.as
similarity index 78%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/ParticipantsEvent.as
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/events/UsersEvent.as
index 46bfd663f364e31f830d94cc9ef312e70d86377e..c5ccb6c219fbb51baa894f8d03db68dffa21babf 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/ParticipantsEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/events/UsersEvent.as
@@ -16,17 +16,17 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.modules.participants.events
+package org.bigbluebutton.modules.users.events
{
import flash.events.Event;
- public class ParticipantsEvent extends Event
+ public class UsersEvent extends Event
{
- public static const ROOM_MUTE_STATE:String = "PARTICIPANTS_ROOM_MUTE_STATE";
+ public static const ROOM_MUTE_STATE:String = "USERS_ROOM_MUTE_STATE";
public var mute_state:Boolean;
- public function ParticipantsEvent(type:String)
+ public function UsersEvent(type:String)
{
super(type, true, false);
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/ParticipantRollEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/events/UsersRollEvent.as
similarity index 73%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/ParticipantRollEvent.as
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/events/UsersRollEvent.as
index 6641fab96ef7d8b096d8f3237a74b05ed1e14f1d..420886f0b9b133b361b8c1a3a3024a9cecd7713c 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/ParticipantRollEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/events/UsersRollEvent.as
@@ -16,18 +16,18 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.modules.participants.events
+package org.bigbluebutton.modules.users.events
{
import flash.events.Event;
- public class ParticipantRollEvent extends Event
+ public class UsersRollEvent extends Event
{
- public static const PARTICIPANT_ROLL_OVER:String = "ParticipantRollOver";
- public static const PARTICIPANT_ROLL_OUT:String = "ParticipantRollOut";
+ public static const USER_ROLL_OVER:String = "UserRollOver";
+ public static const USER_ROLL_OUT:String = "UserRollOut";
public var userID:String;
- public function ParticipantRollEvent(type:String, u:String)
+ public function UsersRollEvent(type:String, u:String)
{
super(type, true, false);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/ViewCameraEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/events/ViewCameraEvent.as
similarity index 95%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/ViewCameraEvent.as
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/events/ViewCameraEvent.as
index 92e01528927aa25409dbbf3c1578bbd7da18d03b..a1be60df854bc581fc356d89ed1b3c836360075f 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/events/ViewCameraEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/events/ViewCameraEvent.as
@@ -16,7 +16,7 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.modules.participants.events
+package org.bigbluebutton.modules.users.events
{
import flash.events.Event;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/managers/ParticipantsManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/managers/UsersManager.as
similarity index 64%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/managers/ParticipantsManager.as
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/managers/UsersManager.as
index 7b3b9a03f9b81fe8043b8103e485cd8a1200af8d..11be9f8bb54fb68ec1e8899e56e42873d9d69f77 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/managers/ParticipantsManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/managers/UsersManager.as
@@ -16,40 +16,40 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.modules.participants.managers
+package org.bigbluebutton.modules.users.managers
{
import com.asfusion.mate.events.Dispatcher;
import org.bigbluebutton.common.events.CloseWindowEvent;
import org.bigbluebutton.common.events.OpenWindowEvent;
import org.bigbluebutton.core.BBB;
- import org.bigbluebutton.modules.participants.events.StartParticipantsModuleEvent;
- import org.bigbluebutton.modules.participants.model.ParticipantsOptions;
- import org.bigbluebutton.modules.participants.views.ParticipantsWindow;
+ import org.bigbluebutton.modules.users.events.StartUsersModuleEvent;
+ import org.bigbluebutton.modules.users.model.UsersOptions;
+ import org.bigbluebutton.modules.users.views.UsersWindow;
- public class ParticipantsManager
+ public class UsersManager
{
private var dispatcher:Dispatcher;
- private var participantsWindow:ParticipantsWindow;
+ private var usersWindow:UsersWindow;
- public function ParticipantsManager(){
+ public function UsersManager(){
dispatcher = new Dispatcher();
}
- public function moduleStarted(event:StartParticipantsModuleEvent):void{
- if (participantsWindow == null){
- participantsWindow = new ParticipantsWindow();
- participantsWindow.partOptions = new ParticipantsOptions();
+ public function moduleStarted(event:StartUsersModuleEvent):void{
+ if (usersWindow == null){
+ usersWindow = new UsersWindow();
+ usersWindow.partOptions = new UsersOptions();
var e:OpenWindowEvent = new OpenWindowEvent(OpenWindowEvent.OPEN_WINDOW_EVENT);
- e.window = participantsWindow;
+ e.window = usersWindow;
dispatcher.dispatchEvent(e);
}
}
public function moduleEnded():void{
var event:CloseWindowEvent = new CloseWindowEvent(CloseWindowEvent.CLOSE_WINDOW_EVENT);
- event.window = participantsWindow;
+ event.window = usersWindow;
dispatcher.dispatchEvent(event);
}
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/maps/ParticipantsEventMap.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersEventMap.mxml
similarity index 52%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/maps/ParticipantsEventMap.mxml
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersEventMap.mxml
index 4039025b071644ebeb31f641989066b018c3145b..ccdc4f683ee899ce44f41e791834f926a08e64cc 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/maps/ParticipantsEventMap.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersEventMap.mxml
@@ -25,53 +25,53 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<![CDATA[
import mx.events.FlexEvent;
import org.bigbluebutton.main.model.users.events.KickUserEvent;
- import org.bigbluebutton.modules.participants.business.ParticipantsProxy;
+ import org.bigbluebutton.modules.users.business.UsersProxy;
import org.bigbluebutton.core.events.VoiceConfEvent;
- import org.bigbluebutton.modules.participants.events.StartParticipantsModuleEvent;
- import org.bigbluebutton.modules.participants.events.StopParticipantsModuleEvent;
- import org.bigbluebutton.modules.participants.managers.ParticipantsManager;
+ import org.bigbluebutton.modules.users.events.StartUsersModuleEvent;
+ import org.bigbluebutton.modules.users.events.StopUsersModuleEvent;
+ import org.bigbluebutton.modules.users.managers.UsersManager;
]]>
</mx:Script>
<EventHandlers type="{FlexEvent.PREINITIALIZE}" >
- <ObjectBuilder cache="global" generator="{ParticipantsProxy}" />
- <ObjectBuilder cache="global" generator="{ParticipantsManager}" />
+ <ObjectBuilder cache="global" generator="{UsersProxy}" />
+ <ObjectBuilder cache="global" generator="{UsersManager}" />
</EventHandlers>
- <EventHandlers type="{StartParticipantsModuleEvent.START_PARTICIPANTS_MODULE}" >
- <MethodInvoker generator="{ParticipantsManager}" method="moduleStarted" arguments="{event}" />
- <MethodInvoker generator="{ParticipantsProxy}" method="connect" arguments="{event}" />
+ <EventHandlers type="{StartUsersModuleEvent.START_USERS_MODULE}" >
+ <MethodInvoker generator="{UsersManager}" method="moduleStarted" arguments="{event}" />
+ <MethodInvoker generator="{UsersProxy}" method="connect" arguments="{event}" />
</EventHandlers>
- <EventHandlers type="{StopParticipantsModuleEvent.STOP_PARTICIPANTS_MODULE}" >
- <MethodInvoker generator="{ParticipantsProxy}" method="disconnect" />
- <MethodInvoker generator="{ParticipantsManager}" method="moduleEnded" />
+ <EventHandlers type="{StopUsersModuleEvent.STOP_USERS_MODULE}" >
+ <MethodInvoker generator="{UsersProxy}" method="disconnect" />
+ <MethodInvoker generator="{UsersManager}" method="moduleEnded" />
</EventHandlers>
<EventHandlers type="{KickUserEvent.KICK_USER}" >
- <MethodInvoker generator="{ParticipantsProxy}" method="kickUser" arguments="{event}" />
+ <MethodInvoker generator="{UsersProxy}" method="kickUser" arguments="{event}" />
</EventHandlers>
<EventHandlers type="{VoiceConfEvent.EJECT_USER}" >
- <MethodInvoker generator="{ParticipantsProxy}" method="ejectUser" arguments="{event}" />
+ <MethodInvoker generator="{UsersProxy}" method="ejectUser" arguments="{event}" />
</EventHandlers>
<EventHandlers type="{VoiceConfEvent.MUTE_USER}" >
- <MethodInvoker generator="{ParticipantsProxy}" method="muteUnmuteUser" arguments="{event}" />
+ <MethodInvoker generator="{UsersProxy}" method="muteUnmuteUser" arguments="{event}" />
</EventHandlers>
<EventHandlers type="{VoiceConfEvent.MUTE_ALL}" >
- <MethodInvoker generator="{ParticipantsProxy}" method="muteAllUsers" arguments="{event}" />
+ <MethodInvoker generator="{UsersProxy}" method="muteAllUsers" arguments="{event}" />
</EventHandlers>
<EventHandlers type="{VoiceConfEvent.UNMUTE_ALL}" >
- <MethodInvoker generator="{ParticipantsProxy}" method="unmuteAllUsers" arguments="{event}" />
+ <MethodInvoker generator="{UsersProxy}" method="unmuteAllUsers" arguments="{event}" />
</EventHandlers>
<EventHandlers type="{VoiceConfEvent.MUTE_ALMOST_ALL}" >
- <MethodInvoker generator="{ParticipantsProxy}" method="muteAlmostAllUsers" arguments="{event}" />
+ <MethodInvoker generator="{UsersProxy}" method="muteAlmostAllUsers" arguments="{event}" />
</EventHandlers>
</EventMap>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/model/ParticipantsOptions.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as
similarity index 85%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/model/ParticipantsOptions.as
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as
index 8c1d2750a15dcdef700d18c2b2be034c3300071c..a9a43d441c11d42e513c6026ba355fd13e45af85 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/model/ParticipantsOptions.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/model/UsersOptions.as
@@ -16,11 +16,11 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.modules.participants.model
+package org.bigbluebutton.modules.users.model
{
import org.bigbluebutton.core.BBB;
- public class ParticipantsOptions
+ public class UsersOptions
{
[Bindable]
public var windowVisible:Boolean = true;
@@ -31,9 +31,9 @@ package org.bigbluebutton.modules.participants.model
[Bindable]
public var baseTabIndex:int = 201;
- public function ParticipantsOptions()
+ public function UsersOptions()
{
- var vxml:XML = BBB.getConfigForModule("ParticipantsModule");
+ var vxml:XML = BBB.getConfigForModule("UsersModule");
if (vxml != null) {
windowVisible = (vxml.@windowVisible.toString().toUpperCase() == "TRUE") ? true : false;
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
similarity index 81%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
index 6b47badf62668a6f976898306e93539eb9981c37..ba812eb8a7e97287b5e929a841875b949f9dece4 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/MediaItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
@@ -26,8 +26,8 @@
creationComplete="onCreationComplete()" >
<mate:Listener type="{StoppedViewingWebcamEvent.STOPPED_VIEWING_WEBCAM}" method="onViewVideoCloseEvent"/>
- <mate:Listener type="{ParticipantRollEvent.PARTICIPANT_ROLL_OVER}" method="onRollOver" />
- <mate:Listener type="{ParticipantRollEvent.PARTICIPANT_ROLL_OUT}" method="onRollOut" />
+ <mate:Listener type="{UsersRollEvent.USER_ROLL_OVER}" method="onRollOver" />
+ <mate:Listener type="{UsersRollEvent.USER_ROLL_OUT}" method="onRollOut" />
<mx:Script>
<![CDATA[
@@ -46,9 +46,9 @@
import org.bigbluebutton.main.model.users.Conference;
import org.bigbluebutton.main.model.users.events.KickUserEvent;
import org.bigbluebutton.main.model.users.events.LowerHandEvent;
- import org.bigbluebutton.modules.participants.events.ParticipantRollEvent;
+ import org.bigbluebutton.modules.users.events.UsersRollEvent;
import org.bigbluebutton.core.events.VoiceConfEvent;
- import org.bigbluebutton.modules.participants.events.ViewCameraEvent;
+ import org.bigbluebutton.modules.users.events.ViewCameraEvent;
import org.bigbluebutton.util.i18n.ResourceUtil;
[Bindable]
@@ -69,13 +69,13 @@
rolledOver = false;
}
- private function onRollOver(e:ParticipantRollEvent):void{
+ private function onRollOver(e:UsersRollEvent):void{
if (moderator && (e.userID == data.userID && !data.me && !data.phoneUser)) {
rolledOver = true;
}
}
- private function onRollOut(e:ParticipantRollEvent):void{
+ private function onRollOut(e:UsersRollEvent):void{
if (moderator && (e.userID == data.userID && !data.me)) {
rolledOver = false;
}
@@ -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.participants.participantsGrid.mediaItemRenderer.talking')}" />
+ toolTip="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.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.participants.participantsGrid.mediaItemRenderer.webcam')}" />
+ toolTip="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.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.participants.participantsGrid.mediaItemRenderer.pushToTalk') : ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.pushToMute')}" />
+ toolTip="{data.voiceMuted ? ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.pushToTalk') : ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.pushToMute')}" />
<mx:Button id="kickUserBtn" icon="{images.eject_user_new}"
width="20" height="20" visible="{rolledOver}"
- toolTip="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.mediaItemRenderer.kickUser')}"
+ toolTip="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.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/users/views/NameItemRenderer.mxml
similarity index 92%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/views/NameItemRenderer.mxml
index 7ad7ff0df9ba809aa78d06173f4d67b98423689b..fb261784454ce754215f1122c6af6cc093b3613f 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/NameItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/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="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.nameItemRenderer')}"/>
+ toolTip="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.nameItemRenderer')}"/>
</mx:HBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
similarity index 89%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
index 09d513a199b2d82484033c3baf3f1fbde9edef6d..3712062190ac9316e6afb3d7fdb1fe311e6444fc 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/StatusItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
@@ -26,8 +26,8 @@
verticalScrollPolicy="off" horizontalScrollPolicy="off"
horizontalAlign="center">
- <mate:Listener type="{ParticipantRollEvent.PARTICIPANT_ROLL_OVER}" method="onRollOver" />
- <mate:Listener type="{ParticipantRollEvent.PARTICIPANT_ROLL_OUT}" method="onRollOut" />
+ <mate:Listener type="{UsersRollEvent.USER_ROLL_OVER}" method="onRollOver" />
+ <mate:Listener type="{UsersRollEvent.USER_ROLL_OUT}" method="onRollOut" />
<mate:Listener type="{LocaleChangeEvent.LOCALE_CHANGED}" method="localeChanged" />
<mx:Script>
@@ -41,7 +41,7 @@
import org.bigbluebutton.common.Role;
import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.main.model.users.events.RoleChangeEvent;
- import org.bigbluebutton.modules.participants.events.ParticipantRollEvent;
+ import org.bigbluebutton.modules.users.events.UsersRollEvent;
import org.bigbluebutton.util.i18n.ResourceUtil;
private var images:Images = new Images();
@@ -89,19 +89,19 @@
if (data != null) {
if (data.presenter) {
roleBtn.setStyle("icon", images.presenter_new);
- roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer.presenter');
+ roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer.presenter');
roleBtn.enabled = false;
} else if (rolledOver) {
roleBtn.setStyle("icon", images.presenter_new);
- roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer.changePresenter');
+ roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer.changePresenter');
roleBtn.enabled = true;
} else if (data.role == Role.MODERATOR) {
roleBtn.setStyle("icon", images.moderator);
- roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer.moderator');
+ roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer.moderator');
roleBtn.enabled = false;
} else if (data.raiseHand) {
roleBtn.setStyle("icon", images.hand_new);
- roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.statusItemRenderer.handRaised');
+ roleBtn.toolTip = ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer.handRaised');
roleBtn.enabled = false;
} else {
roleBtn.setStyle("icon", null);
@@ -111,14 +111,14 @@
}
}
- private function onRollOver(e:ParticipantRollEvent):void{
+ private function onRollOver(e:UsersRollEvent):void{
if (moderator && (e.userID == data.userID) && !data.phoneUser) {
rolledOver = true;
updateButton();
}
}
- private function onRollOut(e:ParticipantRollEvent):void{
+ private function onRollOut(e:UsersRollEvent):void{
if (moderator) {
rolledOver = false;
updateButton();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
similarity index 70%
rename from bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
rename to bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
index ed7daf7373fd4d9c06f498879f9621192a04082d..997e62b1f53f785c8a9c7592a4b3e011ed4cfda7 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
@@ -25,14 +25,14 @@
implements="org.bigbluebutton.common.IBbbModuleWindow"
xmlns:mate="http://mate.asfusion.com/"
creationComplete="onCreationComplete()"
- title="{ResourceUtil.getInstance().getString('bbb.participants.title')}"
+ title="{ResourceUtil.getInstance().getString('bbb.users.title')}"
showCloseButton="false">
<mate:Listener type="{LocaleChangeEvent.LOCALE_CHANGED}" method="localeChanged" />
<mate:Listener type="{ShortcutEvent.RAISE_HAND}" method="remoteRaiseHand" />
- <mate:Listener type="{ShortcutEvent.FOCUS_PARTICIPANTS_WINDOW}" method="focusWindow" />
+ <mate:Listener type="{ShortcutEvent.FOCUS_USERS_WINDOW}" method="focusWindow" />
<mate:Listener type="{ShortcutEvent.MUTE_ME_EVENT}" method="toggleMuteMeState" />
- <mate:Listener type="{ParticipantsEvent.ROOM_MUTE_STATE}" method="setRoomMute" />
+ <mate:Listener type="{UsersEvent.ROOM_MUTE_STATE}" method="setRoomMute" />
<mx:Script>
<![CDATA[
import com.asfusion.mate.events.Dispatcher;
@@ -60,10 +60,10 @@
import org.bigbluebutton.main.model.users.events.RaiseHandEvent;
import org.bigbluebutton.main.model.users.events.RoleChangeEvent;
import org.bigbluebutton.main.views.MainCanvas;
- import org.bigbluebutton.modules.participants.events.ParticipantRollEvent;
+ import org.bigbluebutton.modules.users.events.UsersRollEvent;
import org.bigbluebutton.core.events.VoiceConfEvent;
- import org.bigbluebutton.modules.participants.events.ParticipantsEvent;
- import org.bigbluebutton.modules.participants.model.ParticipantsOptions;
+ import org.bigbluebutton.modules.users.events.UsersEvent;
+ import org.bigbluebutton.modules.users.model.UsersOptions;
import org.bigbluebutton.util.i18n.ResourceUtil;
private var dispatcher:Dispatcher;
@@ -75,31 +75,31 @@
private var myMenu:Menu;
[Bindable]
- public var partOptions:ParticipantsOptions;
+ public var partOptions:UsersOptions;
[Bindable]
private var images:Images = new Images();
[Bindable]
- private var participants:ArrayCollection = new ArrayCollection();
+ private var users:ArrayCollection = new ArrayCollection();
private var handRaised:Boolean = false;
private var amIModerator:Boolean = false;
- private const FOCUS_PARTICIPANTS_LIST:String = "Focus Participants List";
+ private const FOCUS_USERS_LIST:String = "Focus Users List";
private const MAKE_PRESENTER:String = "Make Presenter";
- private const KICK_PARTICIPANT:String = "Kick Participant";
- private const MUTE_PARTICIPANT:String = "Mute Participant";
- private const MUTE_ALL_PARTICIPANT:String = "Mute All Participant";
+ private const KICK_USER:String = "Kick User";
+ private const MUTE_USER:String = "Mute User";
+ private const MUTE_ALL_USER:String = "Mute All User";
private function onCreationComplete():void {
dispatcher = new Dispatcher();
- participants = UserManager.getInstance().getConference().users;
+ users = UserManager.getInstance().getConference().users;
amIModerator = UserManager.getInstance().getConference().amIModerator();
BindingUtils.bindSetter(changeButtons, UserManager.getInstance().getConference(), "amIPresenter");
- BindingUtils.bindSetter(updateNumberofParticipants, participants, "length");
+ BindingUtils.bindSetter(updateNumberofUsers, users, "length");
this.addEventListener(KeyboardEvent.KEY_DOWN, handleKeyDown);
ResourceUtil.getInstance().addEventListener(Event.CHANGE, localeChanged); // Listen for locale changing
@@ -122,15 +122,15 @@
}
- private function updateNumberofParticipants(numParticipants:int):void {
- if (numParticipants > 8)
- this.title = ResourceUtil.getInstance().getString('bbb.participants.title', [":", numParticipants]);
+ private function updateNumberofUsers(numUsers:int):void {
+ if (numUsers > 8)
+ this.title = ResourceUtil.getInstance().getString('bbb.users.title', [":", numUsers]);
else
- this.title = ResourceUtil.getInstance().getString('bbb.participants.title', ["", ""]);
+ this.title = ResourceUtil.getInstance().getString('bbb.users.title', ["", ""]);
}
private function localeChanged(e:LocaleChangeEvent):void {
- updateNumberofParticipants(participants.length);
+ updateNumberofUsers(users.length);
resourcesChanged();
}
@@ -141,14 +141,14 @@
private function onItemRollOver(event:ListEvent):void{
var item:IListItemRenderer = event.itemRenderer;
var user:BBBUser = item.data as BBBUser;
- var rollEvent:ParticipantRollEvent = new ParticipantRollEvent(ParticipantRollEvent.PARTICIPANT_ROLL_OVER, user.userID);
+ var rollEvent:UsersRollEvent = new UsersRollEvent(UsersRollEvent.USER_ROLL_OVER, user.userID);
dispatcher.dispatchEvent(rollEvent);
}
private function onItemRollOut(event:ListEvent):void{
var item:IListItemRenderer = event.itemRenderer;
var user:BBBUser = item.data as BBBUser;
- var rollEvent:ParticipantRollEvent = new ParticipantRollEvent(ParticipantRollEvent.PARTICIPANT_ROLL_OUT, user.userID);
+ var rollEvent:UsersRollEvent = new UsersRollEvent(UsersRollEvent.USER_ROLL_OUT, user.userID);
dispatcher.dispatchEvent(rollEvent);
}
@@ -172,16 +172,16 @@
private function openSettings():void {
// everyone can see the audio settings
- var myMenuData:Array = [{label: ResourceUtil.getInstance().getString('bbb.participants.settings.audioSettings'), icon: images.audio}];
+ var myMenuData:Array = [{label: ResourceUtil.getInstance().getString('bbb.users.settings.audioSettings'), icon: images.audio}];
if (amIModerator) {
myMenuData[1] = {type: "separator"};
- myMenuData[2] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.lowerAllHands'), icon: images.hand_new};
+ myMenuData[2] = {label: ResourceUtil.getInstance().getString('bbb.users.settings.lowerAllHands'), icon: images.hand_new};
if (!roomMuted) {
- 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};
+ myMenuData[3] = {label: ResourceUtil.getInstance().getString('bbb.users.settings.muteAll'), icon: images.audio_muted};
+ myMenuData[4] = {label: ResourceUtil.getInstance().getString('bbb.users.settings.muteAllExcept'), icon: images.audio_muted};
} else
- myMenuData[3] = {label: ResourceUtil.getInstance().getString('bbb.participants.settings.unmuteAll'), icon: images.audio};
+ myMenuData[3] = {label: ResourceUtil.getInstance().getString('bbb.users.settings.unmuteAll'), icon: images.audio};
}
// make sure the previous menu is closed before opening a new one
@@ -218,7 +218,7 @@
Security.showSettings(SecurityPanel.MICROPHONE);
}
- private function setRoomMute(e:ParticipantsEvent):void {
+ private function setRoomMute(e:UsersEvent):void {
roomMuted = e.mute_state;
}
@@ -247,39 +247,39 @@
}
private function lowerHands():void {
- for (var i:int = 0; i < participants.length; i++) {
- var p:BBBUser = participants.getItemAt(i) as BBBUser;
+ for (var i:int = 0; i < users.length; i++) {
+ var p:BBBUser = users.getItemAt(i) as BBBUser;
if (p.raiseHand) dispatchEvent(new LowerHandEvent(p.userID));
}
}
override protected function resourcesChanged():void{
super.resourcesChanged();
- if (participants.length > 8)
- this.title = ResourceUtil.getInstance().getString('bbb.participants.title', [":", participants.length]);
+ if (users.length > 8)
+ this.title = ResourceUtil.getInstance().getString('bbb.users.title', [":", users.length]);
else
- this.title = ResourceUtil.getInstance().getString('bbb.participants.title', ["", ""]);
+ this.title = ResourceUtil.getInstance().getString('bbb.users.title', ["", ""]);
if (titleBarOverlay != null) {
- titleBarOverlay.accessibilityName = ResourceUtil.getInstance().getString('bbb.participants.titleBar');
+ titleBarOverlay.accessibilityName = ResourceUtil.getInstance().getString('bbb.users.titleBar');
}
if (windowControls != null) {
minimizeBtn.toolTip = ResourceUtil.getInstance().getString("bbb.window.minimizeBtn.toolTip");
- minimizeBtn.accessibilityName = ResourceUtil.getInstance().getString("bbb.participants.minimizeBtn.accessibilityName");
+ minimizeBtn.accessibilityName = ResourceUtil.getInstance().getString("bbb.users.minimizeBtn.accessibilityName");
maximizeRestoreBtn.toolTip = ResourceUtil.getInstance().getString("bbb.window.maximizeRestoreBtn.toolTip");
- maximizeRestoreBtn.accessibilityName = ResourceUtil.getInstance().getString("bbb.participants.maximizeRestoreBtn.accessibilityName");
+ maximizeRestoreBtn.accessibilityName = ResourceUtil.getInstance().getString("bbb.users.maximizeRestoreBtn.accessibilityName");
}
}
private function loadKeyCombos(modifier:String):void {
- keyCombos = new Object(); // always start with a fresh array bbb.shortcutkey.participants.muteall
- keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.participants.focusUsers') as String)] = FOCUS_PARTICIPANTS_LIST;
- keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.participants.makePresenter') as String)] = MAKE_PRESENTER;
- keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.participants.kick') as String)] = KICK_PARTICIPANT;
- keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.participants.mute') as String)] = MUTE_PARTICIPANT;
- keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.participants.muteall') as String)] = MUTE_ALL_PARTICIPANT;
+ keyCombos = new Object(); // always start with a fresh array bbb.shortcutkey.users.muteall
+ keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.users.focusUsers') as String)] = FOCUS_USERS_LIST;
+ keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.users.makePresenter') as String)] = MAKE_PRESENTER;
+ keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.users.kick') as String)] = KICK_USER;
+ keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.users.mute') as String)] = MUTE_USER;
+ keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.users.muteall') as String)] = MUTE_ALL_USER;
keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.general.maximize') as String)] = ShortcutEvent.MAXIMIZE_USERS;
keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.general.minimize') as String)] = ShortcutEvent.MINIMIZE_USERS;
}
@@ -291,19 +291,19 @@
(e.altKey ? "alt+" : "") + e.keyCode;
if (keyCombos[keyPress]) {
switch(keyCombos[keyPress]) {
- case FOCUS_PARTICIPANTS_LIST:
+ case FOCUS_USERS_LIST:
remoteFocusUsers();
break;
case MAKE_PRESENTER:
remoteMakePresenter();
break;
- case KICK_PARTICIPANT:
+ case KICK_USER:
remoteKickUser();
break;
- case MUTE_PARTICIPANT:
+ case MUTE_USER:
remoteMuteUser();
break;
- case MUTE_ALL_PARTICIPANT:
+ case MUTE_ALL_USER:
muteAll();
break;
case ShortcutEvent.MAXIMIZE_USERS:
@@ -339,8 +339,8 @@
}
public function remoteMakePresenter():void{
- if (amIModerator && participantsGrid.selectedIndex != -1) {
- var selData:Object = participantsGrid.selectedItem;
+ if (amIModerator && usersGrid.selectedIndex != -1) {
+ var selData:Object = usersGrid.selectedItem;
if (!selData.presenter && !selData.phoneUser) {
var e:RoleChangeEvent = new RoleChangeEvent(RoleChangeEvent.ASSIGN_PRESENTER);
@@ -352,8 +352,8 @@
}
public function remoteKickUser():void{
- if (amIModerator && participantsGrid.selectedIndex != -1) {
- var selData:Object = participantsGrid.selectedItem;
+ if (amIModerator && usersGrid.selectedIndex != -1) {
+ var selData:Object = usersGrid.selectedItem;
if (!selData.me)
dispatchEvent(new KickUserEvent(selData.userID));
@@ -361,8 +361,8 @@
}
public function remoteMuteUser():void{
- if (amIModerator && participantsGrid.selectedIndex != -1) {
- var selData:Object = participantsGrid.selectedItem;
+ if (amIModerator && usersGrid.selectedIndex != -1) {
+ var selData:Object = usersGrid.selectedItem;
if (selData.voiceJoined) {
var e:VoiceConfEvent = new VoiceConfEvent(VoiceConfEvent.MUTE_USER);
@@ -374,32 +374,32 @@
}
public function remoteFocusUsers():void{
- focusManager.setFocus(participantsGrid);
- participantsGrid.drawFocus(true);
+ focusManager.setFocus(usersGrid);
+ usersGrid.drawFocus(true);
}
]]>
</mx:Script>
- <mx:DataGrid id="participantsGrid" dataProvider="{participants}" editable="false" sortableColumns="true"
+ <mx:DataGrid id="usersGrid" dataProvider="{users}" editable="false" sortableColumns="true"
dragEnabled="false" width="100%" height="100%"
itemRollOver="onItemRollOver(event)"
itemRollOut="onItemRollOut(event)"
tabIndex="{partOptions.baseTabIndex+5}"
- accessibilityName="{ResourceUtil.getInstance().getString('bbb.participants.participantsGrid.accessibilityName')}" >
+ accessibilityName="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.accessibilityName')}" >
<mx:columns>
- <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.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"/>
+ <mx:DataGridColumn dataField="userStatus" headerText="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer')}" editable="false" width="45"
+ itemRenderer="org.bigbluebutton.modules.users.views.StatusItemRenderer" sortable="false" />
+ <mx:DataGridColumn dataField="name" headerText="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.nameItemRenderer')}" editable="false" width="100" sortable="false"
+ itemRenderer="org.bigbluebutton.modules.users.views.NameItemRenderer"/>
+ <mx:DataGridColumn dataField="media" headerText="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer')}" sortable="false"
+ itemRenderer="org.bigbluebutton.modules.users.views.MediaItemRenderer"/>
</mx:columns>
</mx:DataGrid>
<mx:ControlBar width="100%">
<mx:Button id="settingsBtn" icon="{images.users_settings}" width="30" height="30"
- toolTip="{ResourceUtil.getInstance().getString('bbb.participants.settings.buttonTooltip')}" click="openSettings()" visible="true" tabIndex="{partOptions.baseTabIndex+10}"/>
+ toolTip="{ResourceUtil.getInstance().getString('bbb.users.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.participants.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.participants.pushToMute.toolTip')}"
+ toolTip="{UserManager.getInstance().getConference().voiceMuted ? ResourceUtil.getInstance().getString('bbb.users.pushToTalk.toolTip') : ResourceUtil.getInstance().getString('bbb.users.pushToMute.toolTip')}"
tabIndex="{partOptions.baseTabIndex+20}"/>
</mx:ControlBar>