Merge branch 'master' into listener-does-not-get-displayed-problem

bigbluebutton-client/branding/default/style/css/BBBDefault.css

@@ -624,3 +624,8 @@ MDIWindow {
   downSkin:      Embed('assets/images/resizeHandler.png');
   disabledSkin:  Embed('assets/images/resizeHandler.png');
 }
+
+.cameraDisplaySettingsWindowStartBtn
+{
+
+}

bigbluebutton-client/locale/en_US/bbbResources.properties

@@ -252,3 +252,6 @@ bbb.shortcutkey.chat.chatbox.gofirst = control+shift+32
 bbb.shortcutkey.chat.chatbox.gofirst.function = Go to first message
 bbb.shortcutkey.chat.chatbox.goread = control+shift+82
 bbb.shortcutkey.chat.chatbox.goread.function = Go to the most recent message you have read
+
+bbb.publishVideo.startPublishBtn.labelText = Start Sharing
+bbb.publishVideo.changeCameraBtn.labelText = Change Camera Settings

bigbluebutton-client/locale/ne_NE/bbbResources.properties

@@ -28,52 +28,52 @@ bbb.viewers.viewersGrid.statusItemRenderer = अवस्था
 bbb.viewers.viewersGrid.statusItemRenderer.raiseHand.toolTip == हात उठौनुहोस {0} 
 bbb.viewers.viewersGrid.statusItemRenderer.streamIcon.toolTip =हेर्नको लागि क्लिक गर्नुहोस
 bbb.viewers.viewersGrid.statusItemRenderer.presIcon.toolTip = प्रस्तुतकर्ता
-bbb.viewers.presentBtn.toolTip = 
-bbb.viewers.raiseHandBtn.toolTip = 
-bbb.viewers.presentBtn.label = 
-bbb.viewers.kickUserBtn.toolTip = 
-bbb.presentation.title = 
-bbb.presentation.fitToWidth.toolTip = 
-bbb.presentation.fitToPage.toolTip = 
-bbb.presentation.uploadPresBtn = 
-bbb.presentation.uploadPresBtn.toolTip = 
-bbb.presentation.backBtn.toolTip = 
-bbb.presentation.slideNumLbl.toolTip = 
-bbb.presentation.forwardBtn.toolTip = 
-bbb.presentation.resetZoomBtn.toolTip = 
-bbb.presentation.presenterNameLbl = 
-bbb.presentation.clickToUpload = 
-bbb.presentation.maxUploadFileExceededAlert = 
-bbb.presentation.uploadcomplete = 
-bbb.presentation.uploaded = 
-bbb.presentation.document.supported = 
-bbb.presentation.document.converted = 
-bbb.presentation.error.document.convert.failed = 
-bbb.presentation.error.io = 
-bbb.presentation.error.security = 
-bbb.presentation.error.convert.format = 
-bbb.presentation.error.convert.notsupported = 
-bbb.presentation.error.convert.nbpage = 
-bbb.presentation.error.convert.maxnbpagereach = 
-bbb.presentation.error.convert.swf = 
-bbb.presentation.converted = 
-bbb.presentation.ok = 
-bbb.presentation.uploadwindow.presentationfile = 
+bbb.viewers.presentBtn.toolTip = प्रयोगकर्तालाई प्रस्तुताकर्ताको  रूपमा  छान्नुहोस
+bbb.viewers.raiseHandBtn.toolTip = हातउठाउनको लागि क्लिक गर्नुहोस
+bbb.viewers.presentBtn.label = प्रस्तुताकर्ताकोरूपमा  परिबर्तन  गर्नुहोस 
+bbb.viewers.kickUserBtn.toolTip = प्रयोगकर्तालाई हटाउनुहोस
+bbb.presentation.title = प्रस्तुती 
+bbb.presentation.fitToWidth.toolTip =मनिटरको आकारमा मिलाउनुहोस 
+bbb.presentation.fitToPage.toolTip = पेजको आकारमा मिलाउनुहोस
+bbb.presentation.uploadPresBtn = सर्भरमा प्रस्तुती सामग्री पठाउनुहोस
+bbb.presentation.uploadPresBtn.toolTip = सर्भरमा प्रस्तुती सामग्री पठाउनुहोस
+bbb.presentation.backBtn.toolTip = पुरानो प्रस्तुती
+bbb.presentation.slideNumLbl.toolTip = पस्तुती छान्नुहोस
+bbb.presentation.forwardBtn.toolTip = अघिल्लो प्रस्तुती पेजमा जानुहोस
+bbb.presentation.resetZoomBtn.toolTip = zoomलाइ पहिलेको अबस्थामा लैजानुहोस
+bbb.presentation.presenterNameLbl = {0} प्रस्तुतकर्ताले प्रस्तुत  गर्दैहुनुहुन्छ
+bbb.presentation.clickToUpload = सर्भरमा प्रस्तुती पठाउनुहोस
+bbb.presentation.maxUploadFileExceededAlert = क्षमाप्रार्थी छौ अनुमति भन्दा बढी आकारको सामग्री पठाउन खोजियो 
+bbb.presentation.uploadcomplete = सर्भरमा प्रस्तुती पठाउने काम सम्पन्न भयो
+bbb.presentation.uploaded = सर्भरमा प्रस्तुती पठाउने काम सम्पन्न भयो
+bbb.presentation.document.supported = तपाइले पठाउनु भएको प्रस्तुती ठिक छ
+bbb.presentation.document.converted = परिबर्तन सफल भयो
+bbb.presentation.error.document.convert.failed = परिबर्तन गसमस्या भयो 
+bbb.presentation.error.io = IO Error कृपया Administratorलाइ सम्पर्क गर्नुहोस
+bbb.presentation.error.security = security मा समस्या भयो
+bbb.presentation.error.convert.format = प्रस्तुती सामग्री परिबर्तन गर्न समस्या भयो
+bbb.presentation.error.convert.notsupported = तपाइले सर्भरमा पठाउनुभएको सामग्रीको format बुझिएन
+bbb.presentation.error.convert.nbpage = कति पेज छ भन्ने अनुमान गर्न सकिएन
+bbb.presentation.error.convert.maxnbpagereach = क्षमाप्रार्थी छौ धेरै पेज भयो
+bbb.presentation.error.convert.swf = सर्भरमा पठाइएको सामग्री परिबर्तन गर्न समस्या भयो कृपया Administrator लाइ सम्पर्क गर्नुहोस
+bbb.presentation.converted = {0} मा {1} परिबर्तन भयो
+bbb.presentation.ok = ठिक भयो
+bbb.presentation.uploadwindow.presentationfile = प्रस्तुती सामग्री
 bbb.presentation.uploadwindow.pdf = 
 bbb.presentation.uploadwindow.word = 
 bbb.presentation.uploadwindow.excel = 
 bbb.presentation.uploadwindow.powerpoint = 
 bbb.presentation.uploadwindow.image = चित्र
-bbb.presentation.uploadwindow.closeLabel = 
-bbb.fileupload.title = 
-bbb.fileupload.fileLbl = 
-bbb.fileupload.selectBtn.toolTip = 
-bbb.fileupload.uploadBtn = 
-bbb.fileupload.uploadBtn.toolTip = 
-bbb.fileupload.presentationNamesLbl = 
-bbb.fileupload.deleteBtn.toolTip = 
+bbb.presentation.uploadwindow.closeLabel = बन्द गर्न क्लिक गर्नुहोस
+bbb.fileupload.title = सामग्री पठाउनुहोस
+bbb.fileupload.fileLbl = सामग्री
+bbb.fileupload.selectBtn.toolTip = सर्भरमा पठाउनुहोस
+bbb.fileupload.uploadBtn = सर्भरमा पठाउनुहोस
+bbb.fileupload.uploadBtn.toolTip = सर्भरमा पठाउनुहोस
+bbb.fileupload.presentationNamesLbl = सर्भरमा पठाउनुहोस
+bbb.fileupload.deleteBtn.toolTip = मेट्नुहोस
 bbb.fileupload.showBtn = देखाउनुहोस्
-bbb.fileupload.showBtn.toolTip = 
+bbb.fileupload.showBtn.toolTip = सामग्री देखाउनुहोस
 bbb.fileupload.okCancelBtn = 
 bbb.fileupload.genThumbText = 
 bbb.fileupload.progBarLbl = 

bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml

@@ -21,18 +21,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 <mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" 
                 xmlns:view="org.bigbluebutton.main.views.*"
                 layout="absolute" 
-                width="600" height="400" creationComplete="onCreationComplete()" 
+                width="630" height="450" creationComplete="onCreationComplete()" styleName="cameraDisplaySettingsWindowStyle" 
                 showCloseButton="true" close="onCancelClicked()" keyDown="handleKeyDown(event)">
   <mx:Script>
     <![CDATA[
-      import com.asfusion.mate.events.Dispatcher;
-      
-      import flash.ui.Keyboard;
-      
+      import com.asfusion.mate.events.Dispatcher;     
+      import flash.ui.Keyboard;      
       import mx.events.CloseEvent;
       import mx.events.ItemClickEvent;
-      import mx.managers.PopUpManager;
-      
+      import mx.managers.PopUpManager;     
       import org.bigbluebutton.common.Images;
       import org.bigbluebutton.common.LogUtil;
       import org.bigbluebutton.core.UsersUtil;
@@ -63,16 +60,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       
       static private var _cameraAccessDenied:Boolean = false;
       
-      [Bindable]
-      private var camIcon:Class = images.webcam;
-      
       private var _video:Video;
       private var aspectRatio:Number = 1;
       
       private function onCreationComplete():void {          
         changeDefaultCamForMac();
         
-        if (UsersUtil.amIPresenter()) {
+        if (UsersUtil.amIPresenter() && resolutions.length > 1) {
           showResControls(true);
         }
         
@@ -87,7 +81,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         for (var i:int = 0; i < Camera.names.length; i++){
           if (Camera.names[i] == "USB Video Class Video") {
             /** Set as default for Macs */
-            cmbCameraSelector.selectedIndex = i;
+            _camera = Camera.getCamera("USB Video Class Video");
           }
         }
       }
@@ -96,12 +90,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         if (show) {
           this.visible = true;
           btnStartPublish.visible = true;
-          cmbCameraSelector.visible = true;
         } else{					
           this.width = 0;
           this.height = 0;
           btnStartPublish.visible = false;
-          cmbCameraSelector.visible = false;
           this.visible = false;
         }
       }
@@ -195,6 +187,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       }
       
       private function startPublishing():void {
+        updateCamera();
+        
         // Save the index of the camera. Need it to send the message.
         var camIndex:int = _camera.index;
         
@@ -279,13 +273,22 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     ]]>
   </mx:Script>
   
-  <mx:VBox id="webcamDisplay" width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5">
-    <view:VideoHolder id="_videoHolder" width="100%" height="90%"/>
-    <mx:HBox width="100%"> 
-      <mx:Button id="btnStartPublish" toolTip="{ResourceUtil.getInstance().getString('bbb.publishVideo.startPublishBtn.toolTip')}" icon="{camIcon}" click="startPublishing()" enabled="true"/>
-      <mx:ComboBox id="cmbCameraSelector" dataProvider="{Camera.names}" width="150" visible="false" change="updateCamera()"/>
-      <mx:Button id="changeCamera" label="Change Camera" toolTip="{ResourceUtil.getInstance().getString('bbb.publishVideo.startPublishBtn.toolTip')}" click="showCameraSettings()"/>
-      <mx:ComboBox id="cmbResolution" dataProvider="{resolutions}" width="20%" visible="false" change="updateCamera()"/>
+  <mx:VBox id="webcamDisplay" width="100%" height="100%" paddingTop="10" styleName="cameraDisplaySettingsWindowBackground">
+    <view:VideoHolder id="_videoHolder" width="100%" height="75%" />
+    <mx:HBox width="100%" height="20%"> 
+      <mx:Spacer width="5"/>
+	    <mx:Button id="changeCamera" styleName="cameraDisplaySettingsWindowChangeCamBtn" 
+                 label="{ResourceUtil.getInstance().getString('bbb.publishVideo.changeCameraBtn.labelText')}" 
+                 toolTip="{ResourceUtil.getInstance().getString('bbb.publishVideo.startPublishBtn.toolTip')}" 
+                 click="showCameraSettings()"/>
+      <mx:Spacer width="70%"/>
+      <mx:ComboBox id="cmbResolution" styleName="cameraDisplaySettingsWindowChangeResolutionCombo" 
+                   dataProvider="{resolutions}" visible="false" change="updateCamera()"/>
+      <mx:Spacer width="5"/>
+	    <mx:Button id="btnStartPublish" toolTip="{ResourceUtil.getInstance().getString('bbb.publishVideo.startPublishBtn.toolTip')}" 
+                 click="startPublishing()" enabled="true" styleName="cameraDisplaySettingsWindowStartBtn" 
+                 label="{ResourceUtil.getInstance().getString('bbb.publishVideo.startPublishBtn.labelText')}" />
+      <mx:Spacer width="5"/>
     </mx:HBox>
     
   </mx:VBox>