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

Cleaned up images to make the client smaller

Browse Source 
Made changes to desktop sharing user interface

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2684 af16638f-c34d-0410-8cfa-b39d5352b314
This commit is contained in:
Denis Zgonjanin 2009-10-16 16:04:25 +00:00
parent 83c3927b0a
commit 4d12da959f
10 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@ package org.bigbluebutton.common
public var refresh_slides:Class;
[Embed(source="assets/images/table.png")]
public var presentation:Class;
public var table:Class;
[Embed(source="assets/images/tfn.png")]
public var blindside:Class;
@ -153,5 +153,11 @@ package org.bigbluebutton.common
[Embed(source="assets/images/control_play_blue.png")]
public var control_play:Class;
[Embed(source="assets/images/shape_move_front.png")]
public var layout:Class;
[Embed(source="assets/images/arrow_inout.png")]
public var fit_to_width:Class;
}
}

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 551 B

0
bigbluebutton-client/src/org/bigbluebutton/main/view/assets/images/shape_move_front.png → bigbluebutton-client/src/org/bigbluebutton/common/assets/images/shape_move_front.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 435 B

After

Width:  |  Height:  |  Size: 435 B

34
bigbluebutton-client/src/org/bigbluebutton/main/view/assets/Images.as
View File

@ -1,34 +0,0 @@
/**
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
*
* Copyright (c) 2008 by respective authors (see below).
*
* This program is free software; you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation; either version 2.1 of the License, or (at your option) any later
* version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
package org.bigbluebutton.main.view.assets
{
[Bindable]
public class Images
{
[Embed(source="images/table.png")]
public var logs:Class;
[Embed(source="images/arrow_out.png")]
public var full_screen:Class;
[Embed(source="images/shape_move_front.png")]
public var layout:Class;
}
}

BIN
bigbluebutton-client/src/org/bigbluebutton/main/view/assets/images/arrow_out.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 594 B

BIN
bigbluebutton-client/src/org/bigbluebutton/main/view/assets/images/table.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 566 B

4
bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainApplicationShell.mxml
View File

@ -37,6 +37,7 @@
<mx:Script>
<![CDATA[
import org.bigbluebutton.common.Images;
import org.bigbluebutton.modules.viewers.events.JoinFailedEvent;
import com.asfusion.mate.events.Dispatcher;
import org.bigbluebutton.main.events.AddHighligtherCanvasEvent;
@ -56,7 +57,6 @@
import org.bigbluebutton.main.MainApplicationFacade;
import org.bigbluebutton.main.view.MainApplicationShellMediator;
import flash.events.MouseEvent;
import org.bigbluebutton.main.view.assets.Images;
public static const NAME:String = 'MainApplicationShell';
protected var facade:MainApplicationFacade = MainApplicationFacade.getInstance();
@ -77,7 +77,7 @@
public var numberOfModules:int = 0;
[Bindable] private var fullscreen_icon:Class = images.full_screen;
[Bindable] private var logs_icon:Class = images.logs;
[Bindable] private var logs_icon:Class = images.table;
[Bindable] private var reset_layout_icon:Class = images.layout;
public function get mode():String {

4
bigbluebutton-client/src/org/bigbluebutton/main/views/components/MainView.mxml
View File

@ -10,6 +10,7 @@
<mate:Listener type="{OpenWindowEvent.OPEN_WINDOW_EVENT}" method="handleOpenWindowEvent" />
<mx:Script>
<![CDATA[
import org.bigbluebutton.common.Images;
import org.bigbluebutton.main.events.OpenWindowEvent;
import org.bigbluebutton.common.IBbbModuleWindow;
import org.bigbluebutton.main.events.LoginEvent;
@ -25,7 +26,6 @@
import org.bigbluebutton.common.Constants;
import flexlib.mdi.effects.effectsLib.MDIVistaEffects;
import flash.events.MouseEvent;
import org.bigbluebutton.main.view.assets.Images;
import org.bigbluebutton.main.MainApplicationFacade;
public static const NAME:String = 'MAinView';
@ -45,7 +45,7 @@
private var _mode:String = 'LIVE';
[Bindable] private var fullscreen_icon:Class = images.full_screen;
[Bindable] private var logs_icon:Class = images.logs;
[Bindable] private var logs_icon:Class = images.table;
[Bindable]
public var model:MainViewModel;

6
bigbluebutton-client/src/org/bigbluebutton/modules/deskShare/business/DeskShareProxy.as
View File

@ -268,7 +268,9 @@ package org.bigbluebutton.modules.deskShare.business
}
public function calculateEncodingDimensions(captureWidth:Number, captureHeight:Number):void{
if (captureWidth <= LARGER_DIMENSION && captureHeight <= LARGER_DIMENSION){
height = captureHeight;
width = captureWidth;
/*if (captureWidth <= LARGER_DIMENSION && captureHeight <= LARGER_DIMENSION){
height = captureHeight;
width = captureWidth;
return;
@ -292,7 +294,7 @@ package org.bigbluebutton.modules.deskShare.business
} else{
height = LARGER_DIMENSION;
width = Math.round(LARGER_DIMENSION/ratio);
}
}*/
}
}

41
bigbluebutton-client/src/org/bigbluebutton/modules/deskShare/view/components/DesktopViewWindow.mxml
View File

@ -31,6 +31,7 @@
<mx:Script>
<![CDATA[
import org.bigbluebutton.common.Images;
import flexlib.mdi.events.MDIWindowEvent;
import mx.events.ResizeEvent;
import mx.controls.Alert;
@ -38,6 +39,10 @@
import mx.core.UIComponent;
import mx.events.SliderEvent;
private var images:Images = new Images();
[Bindable] public var fitToWidthIcon:Class = images.fit_to_width;
[Bindable] public var fitToActualSizeIcon:Class = images.full_screen;
private var video:Video;
private var ns:NetStream;
private var videoHolder:UIComponent;
@ -78,7 +83,10 @@
this.addChild(videoHolder);
videoHolder.percentWidth = 100;
videoHolder.percentHeight = 100;
videoHolder.addEventListener(ResizeEvent.RESIZE, onResize);
//videoHolder.addEventListener(ResizeEvent.RESIZE, onResize);
this.width = 600;
fitToWidth();
}
public function startVideo(connection:NetConnection, stream:String, width:Number, height:Number):void{
@ -98,9 +106,6 @@
video.height = height;
video.attachNetStream(ns);
ns.play(stream);
this.width = video.width + 6;
this.height = video.height + 73;
this.stream = stream;
}
@ -168,11 +173,32 @@
this.close();
}
private function onZoomChange(e:SliderEvent):void{
/*private function onZoomChange(e:SliderEvent):void{
video.width = zoomSlider.value/100 * videoWidth;
video.height = zoomSlider.value/100 * videoHeight;
videoHolder.width = zoomSlider.value/100 * videoWidth;
videoHolder.height = zoomSlider.value/100 * videoHeight;
}*/
/**
* resizes the desktop sharing video to fit to the width of this window
*/
private function fitToWidth():void{
var aspectRatio:Number = video.width/video.height;
video.width = this.width - 22;
videoHolder.width = this.width - 22;
video.height = video.width / aspectRatio;
videoHolder.height = video.width / aspectRatio;
}
/**
* resizes the desktop sharing video to actual video resolution
*/
private function fitToActualSize():void{
video.width = videoWidth;
videoHolder.width = videoWidth;
video.height = videoHeight;
videoHolder.height = videoHeight;
}
]]>
</mx:Script>
@ -180,7 +206,8 @@
<mate:Listener type="{StopViewingEvent.STOP_VIEWING}" method="closeWindow" />
<mx:ControlBar id="bottomBar">
<mx:HSlider id="zoomSlider" value="100" minimum="50" maximum="250" change="onZoomChange(event)" labels="{['50%','250%']}" labelOffset="0" />
<mx:Label id="lblStatus" />
<!--<mx:HSlider id="zoomSlider" value="100" minimum="50" maximum="250" change="onZoomChange(event)" labels="{['50%','250%']}" labelOffset="0" />-->
<mx:Button id="btnFitToWidth" click="fitToWidth()" icon="{fitToWidthIcon}" toolTip="Fit To Width" />
<mx:Button id="btnActualSize" click="fitToActualSize()" icon="{fitToActualSizeIcon}" toolTip="100% zoom" />
</mx:ControlBar>
</MDIWindow>