Cleaned up images from the presentation module

Changed icons for the desktop sharing module

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2686 af16638f-c34d-0410-8cfa-b39d5352b314

bigbluebutton-client/src/org/bigbluebutton/common/Images.as

@@ -159,5 +159,27 @@ package org.bigbluebutton.common
         
         [Embed(source="assets/images/arrow_inout.png")]
         public var fit_to_width:Class; 
+        
+        [Embed(source="assets/images/magnifier_reset.png")]
+        public var mag_reset:Class;
+        
+        ///
+        [Embed(source="assets/images/thumbnails.png")]
+        public var thumbnails:Class;
+
+        [Embed(source="assets/images/arrow_right.png")]
+        public var forward:Class;
+
+        [Embed(source="assets/images/arrow_left.png")]
+        public var backward:Class;
+        
+        [Embed(source="assets/images/magnifier.png")]
+        public var magnifier:Class;
+        
+        [Embed(source="assets/images/add.png")]
+        public var add:Class;
+        
+        [Embed(source="assets/images/bullet_go.png")]
+        public var bulletGo:Class;
 	}
 }

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

@@ -40,8 +40,8 @@
 			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;
+			[Bindable] public var fitToWidthIcon:Class = images.magnifier;
+			[Bindable] public var fitToActualSizeIcon:Class = images.mag_reset;
 			
 			private var video:Video;
 			private var ns:NetStream;

bigbluebutton-client/src/org/bigbluebutton/modules/presentation/view/components/FileUploadWindow.mxml

@@ -30,6 +30,7 @@
     	
 	<mx:Script>
 		<![CDATA[
+			import org.bigbluebutton.common.Images;
 			import org.bigbluebutton.modules.presentation.events.ConvertSuccessEvent;
 			import org.bigbluebutton.modules.presentation.events.ThumbnailsProgressEvent;
 			import org.bigbluebutton.modules.presentation.view.FileUploadWindowMediator;
@@ -40,6 +41,11 @@
             import mx.events.FlexEvent;
             	
 			public var presentationNames:Array;
+			
+			private var images:Images = new Images();
+			[Bindable] private var addIcon : Class = images.add;
+			[Bindable] private var bulletGoIcon : Class = images.bulletGo;
+			[Bindable] private var deleteIcon : Class = images.delete_icon;
 	        
 	        private var thumbnailTimer:Timer = new Timer(5000);
 	        private var genThumbText:String = "Generating thumbnails..";
@@ -108,9 +114,9 @@
 	<mx:Spacer height="100%" x="0" y="0"/>	
 	<mx:Label id="fileLbl" text="File:" x="50" y="50"/>
 	<mx:TextInput id="fileTxtInput" width="228" x="87" y="48"/>
-	<mx:Button id="selectBtn" toolTip="Browse file" click="dispatchEvent(new Event(FileUploadWindowMediator.SELECT_FILE))" icon="@Embed('../assets/add.png')" width="26" x="332" y="48"/>
+	<mx:Button id="selectBtn" toolTip="Browse file" click="dispatchEvent(new Event(FileUploadWindowMediator.SELECT_FILE))" icon="{addIcon}" width="26" x="332" y="48"/>
 	<mx:Button id="uploadBtn" label="Upload" toolTip="Upload file"  click="dispatchEvent(new Event(FileUploadWindowMediator.START_UPLOAD))"
-		enabled="false" icon="@Embed('../assets/bullet_go.png')" x="366" y="48"/>
+		enabled="false" icon="{bulletGoIcon}" x="366" y="48"/>
 
 	<mx:Label id="progBarLbl" text="Progress:" x="21" y="75" visible="false"/>
 	<mx:ProgressBar id="progressBar" mode="manual" label="" labelPlacement="center" width="360" y="75" x="87" visible="false"/>
@@ -118,9 +124,9 @@
 	<mx:Label id="presentationNamesLb" text="Uploaded Presentations:" x="50" y="90"/>
     <mx:ComboBox id="presentationNamesCombobox" width="125" x="190" y="90" dataProvider="{presentationNamesAC}"/> 
 	<mx:Button id="deleteBtn" label="" toolTip="Delete Presentation"  
-		click="deletePresentation()" enabled="true"	icon="@Embed('../assets/delete.png')" width="26" x="332" y="90"/>
+		click="deletePresentation()" enabled="true"	icon="{deleteIcon}" width="26" x="332" y="90"/>
 	<mx:Button id="showBtn" label="Show" toolTip="Show Presentation"  
-		click="showPresentation()" enabled="true" icon="@Embed('../assets/bullet_go.png')" x="366" y="90"/>
+		click="showPresentation()" enabled="true" icon="{bulletGoIcon}" x="366" y="90"/>
 	
 	<mx:ControlBar horizontalAlign="center" verticalAlign="middle" x="0" y="106">
 		<mx:Label id="progressLbl" text="" width="100%"/>

bigbluebutton-client/src/org/bigbluebutton/modules/presentation/view/components/Images.as

@@ -1,40 +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.modules.presentation.view.components
-{
-	[Bindable]
-	public class Images
-	{
-		[Embed(source="../assets/images/thumbnails.png")]
-        public var thumbnails:Class;
-        
-        [Embed(source="../assets/images/pdf_icon.png")]
-        public var pdf:Class;
-
-        [Embed(source="../assets/images/arrow_right.png")]
-        public var forward:Class;
-
-        [Embed(source="../assets/images/arrow_left.png")]
-        public var backward:Class;
-        
-        [Embed(source="../assets/images/magnifier.png")]
-        public var magnifier:Class;
-	}
-}

bigbluebutton-client/src/org/bigbluebutton/modules/presentation/view/components/PresentationWindow.mxml

@@ -35,13 +35,13 @@
 
 	<mx:Script>
 		<![CDATA[
+			import org.bigbluebutton.common.Images;
 			import flexlib.mdi.events.MDIWindowEvent;
 			import org.bigbluebutton.main.events.AddHighligtherCanvasEvent;
 			import org.bigbluebutton.modules.presentation.view.SlideViewMediator;
 		
 			import org.bigbluebutton.modules.presentation.view.PresentationWindowMediator;
 			import mx.core.Application;
-			import org.bigbluebutton.modules.presentation.view.components.Images;
 			import org.bigbluebutton.modules.presentation.PresentationFacade;
 			import mx.binding.utils.BindingUtils;