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

cleanup

Browse Source
This commit is contained in:
Felipe Cecagno 2014-12-03 16:53:45 -02:00
parent 97359c8a90
commit 7d922d0a23
1 changed files with 54 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
View File

@ -35,18 +35,15 @@
<mate:Listener type="{ShortcutEvent.MUTE_ALL_BUT_PRES}" method="remoteMuteAllButPres" /> <mate:Listener type="{ShortcutEvent.MUTE_ALL_BUT_PRES}" method="remoteMuteAllButPres" />
<mate:Listener type="{MeetingMutedEvent.MEETING_MUTED}" method="handleMeetingMuted" /> <mate:Listener type="{MeetingMutedEvent.MEETING_MUTED}" method="handleMeetingMuted" />
<mate:Listener type="{LockControlEvent.CHANGED_LOCK_SETTINGS}" method="handleChangedLockSettingsEvent" /> <mate:Listener type="{LockControlEvent.CHANGED_LOCK_SETTINGS}" method="handleChangedLockSettingsEvent" />
<mate:Listener type="{ChangeStatusBtnEvent.CHANGE_BTN_STATUS}" method="ChangeStatusBtn"/> <mate:Listener type="{ChangeStatusBtnEvent.CHANGE_BTN_STATUS}" method="onStatusChanged"/>
<mx:Script> <mx:Script>
<![CDATA[ <![CDATA[
import com.asfusion.mate.events.Dispatcher; import com.asfusion.mate.events.Dispatcher;
import flash.system.Security;
import flash.system.SecurityPanel;
import mx.binding.utils.BindingUtils; import mx.binding.utils.BindingUtils;
import mx.collections.ArrayCollection; import mx.collections.ArrayCollection;
import mx.controls.Menu; import mx.controls.Menu;
import mx.controls.listClasses.IListItemRenderer; import mx.controls.listClasses.IListItemRenderer;
import mx.events.DataGridEvent;
import mx.core.IFlexDisplayObject; import mx.core.IFlexDisplayObject;
import mx.events.ListEvent; import mx.events.ListEvent;
import mx.events.MenuEvent; import mx.events.MenuEvent;
@ -63,7 +60,6 @@
import org.bigbluebutton.core.vo.LockSettingsVO; import org.bigbluebutton.core.vo.LockSettingsVO;
import org.bigbluebutton.main.events.ShortcutEvent; import org.bigbluebutton.main.events.ShortcutEvent;
import org.bigbluebutton.main.model.users.BBBUser; import org.bigbluebutton.main.model.users.BBBUser;
import org.bigbluebutton.main.model.users.Conference;
import org.bigbluebutton.main.model.users.events.ChangeStatusEvent; import org.bigbluebutton.main.model.users.events.ChangeStatusEvent;
import org.bigbluebutton.main.model.users.events.ChangeStatusBtnEvent; import org.bigbluebutton.main.model.users.events.ChangeStatusBtnEvent;
import org.bigbluebutton.main.model.users.events.KickUserEvent; import org.bigbluebutton.main.model.users.events.KickUserEvent;
@ -73,12 +69,9 @@
import org.bigbluebutton.modules.users.events.MeetingMutedEvent; import org.bigbluebutton.modules.users.events.MeetingMutedEvent;
import org.bigbluebutton.modules.users.events.UsersEvent; import org.bigbluebutton.modules.users.events.UsersEvent;
import org.bigbluebutton.modules.users.events.UsersRollEvent; import org.bigbluebutton.modules.users.events.UsersRollEvent;
import org.bigbluebutton.core.events.VoiceConfEvent;
import org.bigbluebutton.modules.users.events.UsersEvent;
import org.bigbluebutton.modules.users.model.UsersOptions; import org.bigbluebutton.modules.users.model.UsersOptions;
import org.bigbluebutton.util.i18n.ResourceUtil; import org.bigbluebutton.util.i18n.ResourceUtil;
import org.bigbluebutton.common.LogUtil;
private var dispatcher:Dispatcher; private var dispatcher:Dispatcher;
private var keyCombos:Object; private var keyCombos:Object;
@ -111,7 +104,6 @@
private var muteMeRolled:Boolean = false; private var muteMeRolled:Boolean = false;
private var myMenuStaticHeight:Number = 209;
private var moodMenuHeight:Number = -1; private var moodMenuHeight:Number = -1;
private function onCreationComplete():void { private function onCreationComplete():void {
@ -146,7 +138,6 @@
stage.addEventListener(MouseEvent.MOUSE_OVER, handleStageMouseOver); stage.addEventListener(MouseEvent.MOUSE_OVER, handleStageMouseOver);
usersGrid.addEventListener(MouseEvent.MOUSE_OVER, handleUsersGridMouseOver); usersGrid.addEventListener(MouseEvent.MOUSE_OVER, handleUsersGridMouseOver);
} }
public function getPrefferedPosition():String{ public function getPrefferedPosition():String{
@ -227,13 +218,13 @@
private function clearAllStatus():void { private function clearAllStatus():void {
for (var i:int = 0; i < users.length; i++) { for (var i:int = 0; i < users.length; i++) {
var p:BBBUser = users.getItemAt(i) as BBBUser; var p:BBBUser = users.getItemAt(i) as BBBUser;
if (p.hasMood) dispatchEvent( new ChangeStatusEvent(p.userID, ChangeStatusEvent.CLEAR_STATUS) ); if (p.hasMood) {
dispatchEvent( new ChangeStatusEvent(p.userID, ChangeStatusEvent.CLEAR_STATUS) );
}
} }
// raiseHandBtn.setStyle("icon",images.hand_new);
} }
private function openMoodMenu():void { private function openMoodMenu():void {
// everyone can see the audio settings
var myMenuData:Array = []; var myMenuData:Array = [];
if(partOptions.enableRaiseHand) { if(partOptions.enableRaiseHand) {
myMenuData.push( {label: ResourceUtil.getInstance().getString('bbb.users.status.clearStatus'), icon: images.delete_icon, callback: function():void { changeStatus(ChangeStatusEvent.CLEAR_STATUS); }} ); myMenuData.push( {label: ResourceUtil.getInstance().getString('bbb.users.status.clearStatus'), icon: images.delete_icon, callback: function():void { changeStatus(ChangeStatusEvent.CLEAR_STATUS); }} );
@ -308,30 +299,19 @@
myMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.lockSettings'), icon: images.lock_open, handler: lockSettings}); myMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.lockSettings'), icon: images.lock_open, handler: lockSettings});
// make sure the previous meantnu is closed before opening a new one // make sure the previous menu is closed before opening a new one
// This could be improved to include a flag that tells if the menu is open, // This could be improved to include a flag that tells if the menu is open,
// but it would require an extra listener for the MenuCloseEvent. // but it would require an extra listener for the MenuCloseEvent.
if (myMenu) myMenu.hide(); if (myMenu) myMenu.hide();
myMenu = Menu.createMenu(null, myMenuData, true); myMenu = Menu.createMenu(null, myMenuData, true);
var myMenuPos:Point = new Point(); myMenu.variableRowHeight = true;
myMenuPos.x = this.x + settingsBtn.x + 1; myMenu.show(this.x + settingsBtn.x + settingsBtn.width + 2, this.y + this.height);
myMenuPos.y = this.y + this.height + settingsBtn.height; myMenu.addEventListener(MenuEvent.ITEM_CLICK, menuClickHandler);
myMenu.setFocus();
if (myMenuPos.y + myMenuStaticHeight + 2 > stage.stageHeight) {
myMenuPos.y = this.y + this.height - (5*myMenu.rowHeight) + 7;
}
myMenu.show(myMenuPos.x, myMenuPos.y);
myMenu.addEventListener(MenuEvent.ITEM_CLICK, menuClickHandler);
myMenu.setFocus();
} }
private function menuClickHandler(e:MenuEvent):void { private function menuClickHandler(e:MenuEvent):void {
e.item.callback(); e.item.callback();
} }
@ -346,6 +326,7 @@
var e:ChangeStatusEvent = new ChangeStatusEvent(UserManager.getInstance().getConference().getMyUserId(), status); var e:ChangeStatusEvent = new ChangeStatusEvent(UserManager.getInstance().getConference().getMyUserId(), status);
dispatchEvent(e); dispatchEvent(e);
} }
private function lockSettings():void { private function lockSettings():void {
LogUtil.traceObject("Action: lockSettings"); LogUtil.traceObject("Action: lockSettings");
@ -448,6 +429,7 @@
keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.users.kick') as String)] = KICK_USER; 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.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.users.muteall') as String)] = MUTE_ALL_USER;
//TODO Include shortcuts to lock control
keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.general.maximize') as String)] = ShortcutEvent.MAXIMIZE_USERS; 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; keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.general.minimize') as String)] = ShortcutEvent.MINIMIZE_USERS;
} }
@ -545,59 +527,56 @@
focusManager.setFocus(usersGrid); focusManager.setFocus(usersGrid);
usersGrid.drawFocus(true); usersGrid.drawFocus(true);
} }
private function remoteMuteAllButPres():void{ private function remoteMuteAllButPres():void{
muteAlmostAll(); muteAlmostAll();
} }
public function ChangeStatusBtn(e:ChangeStatusBtnEvent):void{ public function onStatusChanged(e:ChangeStatusBtnEvent):void{
var icon:String = e.getStatusName(); var icon:String = e.getStatusName();
if(e.userId == UserManager.getInstance().getConference().getMyUserId()){ if (e.userId == UserManager.getInstance().getConference().getMyUserId()) {
switch(icon){ switch(icon) {
case "CLEAR_STATUS":
case "CLEAR_STATUS": raiseHandBtn.setStyle("icon",images.hand_new);
raiseHandBtn.setStyle("icon",images.hand_new); break;
break; case "RAISE_HAND":
case "RAISE_HAND": raiseHandBtn.setStyle("icon",images.hand_new);
raiseHandBtn.setStyle("icon",images.hand_new); break;
break; case "AGREE":
case "AGREE": raiseHandBtn.setStyle("icon",images.agree);
raiseHandBtn.setStyle("icon",images.agree); break;
break; case "DISAGREE":
case "DISAGREE": raiseHandBtn.setStyle("icon",images.disagree);
raiseHandBtn.setStyle("icon",images.disagree); break;
break; case "SPEAK_LOUDER":
case "SPEAK_LOUDER": raiseHandBtn.setStyle("icon",images.speak_louder);
raiseHandBtn.setStyle("icon",images.speak_louder); break;
break; case "SPEAK_LOWER":
case "SPEAK_LOWER": raiseHandBtn.setStyle("icon",images.speak_lower);
raiseHandBtn.setStyle("icon",images.speak_lower); break;
break; case "SPEAK_FASTER":
case "SPEAK_FASTER": raiseHandBtn.setStyle("icon",images.speak_faster);
raiseHandBtn.setStyle("icon",images.speak_faster); break;
break; case "SPEAK_SLOWER":
case "SPEAK_SLOWER": raiseHandBtn.setStyle("icon",images.speak_slower);
raiseHandBtn.setStyle("icon",images.speak_slower); break;
break; case "BE_RIGHT_BACK":
case "BE_RIGHT_BACK": raiseHandBtn.setStyle("icon",images.be_right_back);
raiseHandBtn.setStyle("icon",images.be_right_back); break;
break; case "LAUGHTER":
case "LAUGHTER": raiseHandBtn.setStyle("icon",images.laughter);
raiseHandBtn.setStyle("icon",images.laughter); break;
break; case "SAD":
case "SAD": raiseHandBtn.setStyle("icon",images.sad);
raiseHandBtn.setStyle("icon",images.sad); break;
break; default:
default: raiseHandBtn.setStyle("icon",images.hand_new);
raiseHandBtn.setStyle("icon",images.hand_new); break;
}
}
} }
}
}
]]> ]]>
</mx:Script> </mx:Script>