Skip to content

Commit

Permalink
Merge pull request bigbluebutton#119 from SenecaCDOT-BigBlueButton/sw…
Browse files Browse the repository at this point in the history
…itch-lock-image

added 20x20 images so images in the users window don't shift
  • Loading branch information
ritzalam committed Apr 5, 2013

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 0166939 + e68213b commit ab24e89
Showing 9 changed files with 18 additions and 6 deletions.
12 changes: 12 additions & 0 deletions bigbluebutton-client/src/org/bigbluebutton/common/Images.as
Original file line number Diff line number Diff line change
@@ -34,6 +34,12 @@ package org.bigbluebutton.common
[Embed(source="assets/images/audio.png")]
public var audio:Class;

[Embed(source="assets/images/audio_muted_20.png")]
public var audio_muted_20:Class;

[Embed(source="assets/images/audio_20.png")]
public var audio_20:Class;

[Embed(source="assets/images/webcam_new.png")]
public var webcam_new:Class;

@@ -235,6 +241,12 @@ package org.bigbluebutton.common
[Embed(source="assets/images/unlock.png")]
public var unlocked:Class;

[Embed(source="assets/images/lock_20.png")]
public var locked_20:Class;

[Embed(source="assets/images/unlock_20.png")]
public var unlocked_20:Class;

[Embed(source="assets/images/presenter.png")]
public var presenter:Class;

Binary file modified bigbluebutton-client/src/org/bigbluebutton/common/assets/images/audio.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bigbluebutton-client/src/org/bigbluebutton/common/assets/images/lock.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bigbluebutton-client/src/org/bigbluebutton/common/assets/images/unlock.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -176,14 +176,14 @@
if (!rolledOver) {
if (data.voiceMuted)
muteImg.source = images.audio_muted;
muteImg.source = images.audio_muted_20;
else
muteImg.source = images.audio;
muteImg.source = images.audio_20;
if (data.voiceLocked)
lockImg.source = images.locked;
lockImg.source = images.locked_20;
else
lockImg.source = images.unlocked;
lockImg.source = images.unlocked_20;
} else {
if (data.voiceMuted == rolledOverMute)
muteBtn.setStyle("icon", images.audio);
@@ -205,7 +205,7 @@
<mx:Button id="webcamBtn" visible="{data.hasStream}" click="viewCamera()" icon="{images.webcam_new}"
width="20" height="20" enabled="false"
toolTip="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.webcam')}" />
<mx:Image id="muteImg" visible="false" includeInLayout="true" width="16" height="16" />
<mx:Image id="muteImg" visible="false" includeInLayout="true" width="20" height="20" />
<mx:Button id="muteBtn" visible="false" includeInLayout="false" enabled="false" icon="{images.audio}"
width="20" height="20" click="toggleMuteState()"
mouseOver="muteMouseOverHandler()"
@@ -215,7 +215,7 @@
width="20" height="20" visible="false"
toolTip="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.kickUser')}"
click="kickUser()"/>
<mx:Image id="lockImg" visible="false" includeInLayout="false" width="11" height="12" />
<mx:Image id="lockImg" visible="false" includeInLayout="false" width="20" height="20" />
<mx:Button id="lockBtn" visible="false" includeInLayout="false" enabled="false"
width="20" height="20" click="toggleLockState()"
mouseOver="lockMouseOverHandler()"

0 comments on commit ab24e89

Please sign in to comment.