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

better icons in the video windows

Browse Source
This commit is contained in:
Felipe Cecagno 2014-03-24 17:37:47 -03:00
parent 69ea5a3175
commit b4607f8f38
12 changed files with 42 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bigbluebutton-client/branding/default/style/css/BBBDefault.css
View File

@ -687,10 +687,10 @@ https://www.iconfinder.com/icons/172512/mute_icon#size=128
*/
.muteOverlayBtn
{
upSkin: Embed('assets/images/icons8_mute20.png');
overSkin: Embed('assets/images/icons8_mute20.png');
downSkin: Embed('assets/images/icons8_mute20.png');
disabledSkin: Embed('assets/images/icons8_mute20.png');
upSkin: Embed('assets/images/audio_20_white.png');
overSkin: Embed('assets/images/audio_20_white.png');
downSkin: Embed('assets/images/audio_20_white.png');
disabledSkin: Embed('assets/images/audio_20_white.png');
}
/*
@ -698,21 +698,10 @@ https://www.iconfinder.com/icons/172499/low_volume_icon#size=128
*/
.unmuteOverlayBtn
{
upSkin: Embed('assets/images/icons8_low_volume20.png');
overSkin: Embed('assets/images/icons8_low_volume20.png');
downSkin: Embed('assets/images/icons8_low_volume20.png');
disabledSkin: Embed('assets/images/icons8_low_volume20.png');
}
/*
https://www.iconfinder.com/icons/172479/high_volume_icon#size=128
*/
.talkingOverlayBtn
{
upSkin: Embed('assets/images/icons8_high_volume20.png');
overSkin: Embed('assets/images/icons8_high_volume20.png');
downSkin: Embed('assets/images/icons8_high_volume20.png');
disabledSkin: Embed('assets/images/icons8_high_volume20.png');
upSkin: Embed('assets/images/audio_muted_20_white.png');
overSkin: Embed('assets/images/audio_muted_20_white.png');
downSkin: Embed('assets/images/audio_muted_20_white.png');
disabledSkin: Embed('assets/images/audio_muted_20_white.png');
}
.resizeHndlr

BIN
bigbluebutton-client/branding/default/style/css/assets/images/audio_20_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 602 B

BIN
bigbluebutton-client/branding/default/style/css/assets/images/audio_20_white.xcf Normal file
View File

Binary file not shown.

BIN
bigbluebutton-client/branding/default/style/css/assets/images/audio_muted_20_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 697 B

BIN
bigbluebutton-client/branding/default/style/css/assets/images/icons8_high_volume20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 444 B

BIN
bigbluebutton-client/branding/default/style/css/assets/images/icons8_low_volume20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 371 B

BIN
bigbluebutton-client/branding/default/style/css/assets/images/icons8_mute20.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 375 B

6
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
View File

@ -303,5 +303,11 @@ package org.bigbluebutton.common
[Embed(source="assets/images/grid_icon.png")]
public var grid_icon:Class;
[Embed(source="assets/images/moderator_white.png")]
public var moderator_white:Class;
[Embed(source="assets/images/presenter_white.png")]
public var presenter_white:Class;
}
}

BIN
bigbluebutton-client/src/org/bigbluebutton/common/assets/images/moderator_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 309 B

BIN
bigbluebutton-client/src/org/bigbluebutton/common/assets/images/presenter_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 377 B

3
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
View File

@ -228,7 +228,8 @@ package org.bigbluebutton.modules.videoconf.maps
}
private function openAvatarWindowFor(userID:String):void {
if (! UsersUtil.hasUser(userID)) return;
closeWindow(userID);
var userAvatar:UserGraphicHolder = new UserGraphicHolder();

80
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
View File

@ -57,17 +57,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var _dispatcher:Dispatcher = new Dispatcher();
private var _images:Images = new Images();
[Bindable] public var glowColor:String = "";
[Bindable] public var glowBlurSize:Number = 0;
[Bindable]
private var _videoOptions:VideoConfOptions = new VideoConfOptions();
private const TITLE_BACKGROUND_TALKING:uint = 0x20c600;
private const TITLE_BACKGROUND_NOT_TALKING:uint = 0x42444c;
protected function onCreationComplete():void {
// loadAvatar("https://avatars3.githubusercontent.com/u/5931345?s=140");
this.glowColor = _videoOptions.glowColor;
this.glowBlurSize = _videoOptions.glowBlurSize;
}
public function loadAvatar(user:BBBUser, options:VideoConfOptions):void {
@ -174,37 +167,25 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function updateButtons():void {
if (user != null) {
if (_rolledOverMuteBtn) {
if (user.voiceMuted) {
muteBtn.styleName = "unmuteOverlayBtn";
} else {
muteBtn.styleName = "muteOverlayBtn";
}
if (_rolledOverMuteBtn == user.voiceMuted) {
muteBtn.styleName = "muteOverlayBtn";
} else {
if (user.voiceMuted) {
muteBtn.styleName = "muteOverlayBtn";
} else {
if (user.talking) {
muteBtn.styleName = "talkingOverlayBtn";
} else {
muteBtn.styleName = "unmuteOverlayBtn";
}
}
muteBtn.styleName = "unmuteOverlayBtn";
}
if (_rolledOverCanvas || _rolledOverMuteBtn) {
muteBtn.visible = user.voiceJoined;
muteBtnWrapper.visible = user.voiceJoined;
} else {
muteBtn.visible = user.voiceJoined && (user.talking || user.voiceMuted);
muteBtnWrapper.visible = user.voiceJoined && user.voiceMuted;
}
var userIconVisibility:Boolean;
if (user.presenter) {
userIcon.source = _images.presenter_new;
userIcon.source = _images.presenter_white;
userIconVisibility = true;
} else {
if (user.role == BBBUser.MODERATOR) {
userIcon.source = _images.moderator;
userIcon.source = _images.moderator_white;
userIconVisibility = true;
} else {
userIconVisibility = false;
@ -217,15 +198,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function handleUserTalkingEvent(event:CoreEvent):void {
if (user && event.message.userID == user.userID) {
updateButtons();
/*
if (event.message.talking) {
notTalkingEffect.end();
talkingEffect.play([muteBtn]);
titleBox.setStyle("backgroundColor", TITLE_BACKGROUND_TALKING);
} else {
talkingEffect.end();
notTalkingEffect.play([muteBtn]);
titleBox.setStyle("backgroundColor", TITLE_BACKGROUND_NOT_TALKING);
}
*/
}
}
@ -238,19 +215,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
]]>
</mx:Script>
<mx:Fade id="myCustomEffect" />
<mx:Glow id="talkingEffect" duration="500" alphaFrom="1.0" alphaTo="0.3"
blurXFrom="0.0" blurXTo="{glowBlurSize}" blurYFrom="0.0" blurYTo="{glowBlurSize}" color="{glowColor}"/>
<mx:Glow id="notTalkingEffect" duration="500" alphaFrom="0.3" alphaTo="1.0"
blurXFrom="{glowBlurSize}" blurXTo="0.0" blurYFrom="{glowBlurSize}" blurYTo="0.0" color="{glowColor}"/>
<mx:Canvas id="canvas" width="100%" height="100%">
<views:UserAvatar id="avatar" width="100%" height="100%" visible="false" includeInLayout="false" />
<views:UserVideo id="video" width="100%" height="100%" visible="false" includeInLayout="false" />
<mx:VBox id="overlay" width="100%" height="100%" >
<mx:HBox
backgroundColor="#42444c"
id="titleBox"
backgroundColor="{TITLE_BACKGROUND_NOT_TALKING}"
backgroundAlpha="0.6"
width="100%"
verticalAlign="middle"
@ -270,24 +241,25 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Button styleName="closeBtnFocus" buttonMode="true" click="shutdown()" />
</mx:Box>
</mx:HBox>
<mx:HBox
<mx:Box
width="100%"
paddingTop="15"
paddingRight="15"
horizontalAlign="right"
horizontalScrollPolicy="off"
verticalScrollPolicy="off" >
<mx:Button
id="muteBtn"
styleName="talkingOverlayBtn"
buttonMode="true"
width="20"
height="20"
click="onMuteBtnClick()"
mouseOver="onMuteBtnMouseOver()"
mouseOut="onMuteBtnMouseOut()"
visible="false" />
</mx:HBox>
<mx:Box
id="muteBtnWrapper"
visible="false" >
<mx:Button
id="muteBtn"
styleName="talkingOverlayBtn"
buttonMode="true"
click="onMuteBtnClick()"
mouseOver="onMuteBtnMouseOver()"
mouseOut="onMuteBtnMouseOut()" />
</mx:Box>
</mx:Box>
</mx:VBox>
</mx:Canvas>
</mx:VBox>