Merge branch 'status-icons' of github.com:pedrobmarin/bigbluebutton into mconf

This commit is contained in:
Felipe Cecagno 2016-11-19 23:07:43 -02:00
commit e13aba9184
22 changed files with 24 additions and 18 deletions

View File

@ -212,6 +212,7 @@ bbb.users.emojiStatus.speakSlower = Could you please speak slower?
bbb.users.emojiStatus.beRightBack = I'll be right back
bbb.users.emojiStatus.happy = :)
bbb.users.emojiStatus.sad = :(
bbb.users.emojiStatus.applause = Applause
bbb.presentation.title = Presentation
bbb.presentation.titleWithPres = Presentation: {0}
bbb.presentation.quickLink.label = Presentation Window

View File

@ -213,6 +213,7 @@ bbb.users.emojiStatus.laughter = :)
bbb.users.emojiStatus.happy = Estado feliz
bbb.users.emojiStatus.smile = Estado sonriente
bbb.users.emojiStatus.sad = :(
bbb.users.emojiStatus.applause = Aplausos
bbb.users.emojiStatus.confused = Estado confundido
bbb.users.emojiStatus.neutral = Estado neutral
bbb.users.emojiStatus.away = Estado fuera de línea

View File

@ -207,6 +207,7 @@ bbb.users.emojiStatus.laughter = :)
bbb.users.emojiStatus.happy = Alegre
bbb.users.emojiStatus.smile = Sorriso
bbb.users.emojiStatus.sad = :(
bbb.users.emojiStatus.applause = Aplauso
bbb.users.emojiStatus.confused = Confuso
bbb.users.emojiStatus.neutral = Neutro
bbb.users.emojiStatus.away = Ausente

View File

@ -52,10 +52,10 @@ package org.bigbluebutton.common
[Embed(source="assets/images/sound_new.png")]
public var sound_new:Class;
[Embed(source="assets/images/moderator.png")]
[Embed(source="assets/images/moderator_20db.png")]
public var moderator:Class;
[Embed(source="assets/images/presenter_new.png")]
[Embed(source="assets/images/presenter_new_20db.png")]
public var presenter_new:Class;
[Embed(source="assets/images/webcam_kickuser.png")]
@ -148,7 +148,7 @@ package org.bigbluebutton.common
[Embed(source="assets/images/mic_unmuted.png")]
public var sound_none:Class;
[Embed(source="assets/images/sound.png")]
[Embed(source="assets/images/ic_hearing_grey_20dp.png")]
public var sound:Class;
[Embed(source="assets/images/cancel.png")]
@ -337,40 +337,43 @@ package org.bigbluebutton.common
[Embed(source="assets/images/user_delete.png")]
public var user_delete:Class;
[Embed(source="assets/images/status/ic_mood_black_18dp.png")]
[Embed(source="assets/images/status/ic_mood_grey_20dp.png")]
public var mood:Class;
[Embed(source="assets/images/status/ic_clear_black_18dp.png")]
[Embed(source="assets/images/status/ic_clear_grey_20dp.png")]
public var mood_clear:Class;
[Embed(source="assets/images/status/icon-3-high-five.png")]
[Embed(source="assets/images/status/icon-3-grey-high-five.png")]
public var mood_raiseHand:Class;
[Embed(source="assets/images/status/icon-6-thumb-up.png")]
[Embed(source="assets/images/status/icon-6-grey-thumb-up.png")]
public var mood_agree:Class;
[Embed(source="assets/images/status/icon-7-thumb-down.png")]
[Embed(source="assets/images/status/icon-7-grey-thumb-down.png")]
public var mood_disagree:Class;
[Embed(source="assets/images/status/ic_fast_forward_black_18dp.png")]
[Embed(source="assets/images/status/ic_fast_forward_grey_20dp.png")]
public var mood_speakFaster:Class;
[Embed(source="assets/images/status/ic_fast_rewind_black_18dp.png")]
[Embed(source="assets/images/status/ic_fast_rewind_grey_20dp.png")]
public var mood_speakSlower:Class;
[Embed(source="assets/images/status/ic_volume_up_black_18dp.png")]
[Embed(source="assets/images/status/ic_volume_up_grey_20dp.png")]
public var mood_speakLouder:Class;
[Embed(source="assets/images/status/ic_volume_down_black_18dp.png")]
[Embed(source="assets/images/status/ic_volume_down_grey_20dp.png")]
public var mood_speakSofter:Class;
[Embed(source="assets/images/status/ic_access_time_black_18dp.png")]
[Embed(source="assets/images/status/ic_access_time_grey_20dp.png")]
public var mood_beRightBack:Class;
[Embed(source="assets/images/status/icon-6-smiling-face.png")]
[Embed(source="assets/images/status/icon-6-grey-smiling-face.png")]
public var mood_happy:Class;
[Embed(source="assets/images/status/icon-7-sad-face.png")]
[Embed(source="assets/images/status/icon-7-grey-sad-face.png")]
public var mood_sad:Class;
[Embed(source="assets/images/status/applause-20.png")]
public var mood_applause:Class;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 451 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 341 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 473 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 271 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 439 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 498 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 517 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 496 B

View File

@ -35,7 +35,7 @@ package org.bigbluebutton.modules.users.views {
import org.bigbluebutton.util.i18n.ResourceUtil;
public class MoodMenu extends VBox {
private const MOODS:Array = ["raiseHand", "agree", "disagree", "speakFaster", "speakSlower",
private const MOODS:Array = ["raiseHand", "agree", "disagree", "applause", "speakFaster", "speakSlower",
"speakLouder", "speakSofter", "beRightBack", "happy", "sad", "clear"];
private var dispatcher:Dispatcher;

View File

@ -195,10 +195,10 @@
}
]]>
</mx:Script>
<mx:Image id="emojiImg" visible="true" width="18" height="18" includeInLayout="{emojiImg.visible}" />
<mx:Image id="emojiImg" visible="true" width="20" height="20" includeInLayout="{emojiImg.visible}" />
<mx:Button id="emojiBtn" visible="false" enabled="false" width="20" height="20" click="emojiBtnClicked()" includeInLayout="{emojiBtn.visible}" />
<mx:Image id="roleImg" visible="true" width="16" height="16" includeInLayout="{roleImg.visible}" />
<mx:Image id="roleImg" visible="true" width="20" height="20" includeInLayout="{roleImg.visible}" />
<mx:Button id="roleBtn" visible="false" enabled="false" width="20" height="20" click="roleBtnClicked()" includeInLayout="{roleBtn.visible}" />
<!-- Helper objects because direct bindings to data break when the itemRenderer is recycled -->