- minor ui tweaks
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3337 af16638f-c34d-0410-8cfa-b39d5352b314
This commit is contained in:
Richard Alam
parent
fbdfe311f6
commit
f73e7ff58a
@ -62,6 +62,7 @@ bbb.presentation.resetZoomBtn.toolTip = Reset Zoom
|
||||
bbb.presentation.presenterNameLbl = {0} is currently presenting.
|
||||
bbb.presentation.maximizeRestoreBtn.toolTip = Maximize this window
|
||||
bbb.presentation.maximizeRestoreBtn.toolTip2 = Restore to previous size
|
||||
bbb.presentation.clickToUpload = Click to upload presentation
|
||||
|
||||
## PresentationWindowMediator.as
|
||||
bbb.presentation.presenting = {0} is currently presenting.
|
||||
|
||||
@ -62,6 +62,7 @@ bbb.presentation.resetZoomBtn.toolTip = Zoom par défaut
|
||||
bbb.presentation.presenterNameLbl = {0} est actuellement présentateur.
|
||||
bbb.presentation.maximizeRestoreBtn.toolTip = Agrandir cette fenêtre
|
||||
bbb.presentation.maximizeRestoreBtn.toolTip2 = Restaurer à sa taille précédente
|
||||
bbb.presentation.clickToUpload = Click to upload presentation
|
||||
|
||||
## PresentationWindowMediator.as
|
||||
bbb.presentation.presenting = {0} est en ce moment présentateur.
|
||||
|
||||
@ -58,6 +58,7 @@ bbb.presentation.slideNumLbl =
|
||||
bbb.presentation.forwardBtn.toolTip = Volgende pagina
|
||||
bbb.presentation.resetZoomBtn.toolTip = Reset Zoom.
|
||||
bbb.presentation.presenterNameLbl = {0} is bezig met presenteren.
|
||||
bbb.presentation.clickToUpload = Click to upload presentation
|
||||
|
||||
## PresentationWindowMediator.as
|
||||
bbb.presentation.presenting = {0} is bezig met presenteren.
|
||||
|
||||
@ -58,6 +58,7 @@ bbb.presentation.slideNumLbl =
|
||||
bbb.presentation.forwardBtn.toolTip = 下一张
|
||||
bbb.presentation.resetZoomBtn.toolTip = 重置
|
||||
bbb.presentation.presenterNameLbl = 当前演示者为 {0}
|
||||
bbb.presentation.clickToUpload = Click to upload presentation
|
||||
|
||||
# FileUploadWindow.mxml
|
||||
bbb.fileupload.title = 上传幻灯片
|
||||
|
||||
@ -27,7 +27,7 @@ package org.bigbluebutton.modules.chat.maps
|
||||
public function openChatWindow():void {
|
||||
_chatWindow.title = ResourceUtil.getInstance().getString("bbb.chat.title");
|
||||
_chatWindow.showCloseButton = false;
|
||||
_chatWindow.xPosition = 740;
|
||||
_chatWindow.xPosition = 825;
|
||||
_chatWindow.yPosition = 0;
|
||||
|
||||
// Set the local dispatcher for this window so that it can send messages
|
||||
|
||||
@ -64,8 +64,8 @@
|
||||
|
||||
private var dispState:String;
|
||||
|
||||
[Bindable] private var _defaultWidth:int = 590;
|
||||
[Bindable] private var _defaultHeight:int = 300;
|
||||
[Bindable] private var _defaultWidth:int = 500;
|
||||
[Bindable] private var _defaultHeight:int = 450;
|
||||
|
||||
public function get defaultWidth():int{
|
||||
return _defaultWidth;
|
||||
|
||||
@ -165,8 +165,8 @@
|
||||
|
||||
private function uploadProgressUpdate(e:UploadEvent):void{
|
||||
var progress:Number = e.percentageComplete;
|
||||
progressLbl.text = progress + "%" + ResourceUtil.getInstance().getString('bbb.presentation.uploaded');
|
||||
progressBar.label = progress + "%" + ResourceUtil.getInstance().getString('bbb.presentation.uploaded');
|
||||
progressLbl.text = progress + "% " + ResourceUtil.getInstance().getString('bbb.presentation.uploaded');
|
||||
progressBar.label = progress + "% " + ResourceUtil.getInstance().getString('bbb.presentation.uploaded');
|
||||
progressBar.setProgress(progress, 100);
|
||||
progressBar.validateNow();
|
||||
progressLbl.validateNow();
|
||||
|
||||
@ -92,10 +92,11 @@
|
||||
private var _yPosition:int = 0;
|
||||
|
||||
[Bindable] private var CONTROL_BAR_HEIGHT:int = 45;
|
||||
private static const TOP_WINDOW_BORDER:int = 20;
|
||||
private static const TOP_WINDOW_BORDER:int = 30;
|
||||
private static const WIDTH_PADDING:int = 5;
|
||||
|
||||
// Init to the size of the window.
|
||||
private var currentSlideWidth:int = 450;
|
||||
private var currentSlideWidth:int = 600;
|
||||
private var currentSlideHeight:int = 450;
|
||||
|
||||
private var mouseDown:Boolean = false;
|
||||
@ -122,6 +123,17 @@
|
||||
dispatchEvent(new MDIWindowEvent(MDIWindowEvent.MAXIMIZE, this));
|
||||
isMaximized = true;
|
||||
windowControls.maximizeRestoreBtn.toolTip = ResourceUtil.getInstance().getString('bbb.presentation.maximizeRestoreBtn.toolTip2');
|
||||
|
||||
/*
|
||||
* Need to have a timer to trigger resizing slide to window after the
|
||||
* window has been maximized/restored. The MAXIMIZE/RESTORE events are
|
||||
* generated when the button is clicked so the width and height are not
|
||||
* the ones we want.
|
||||
*/
|
||||
fitToWindowTimer = new Timer(1000);
|
||||
fitToWindowTimer.addEventListener(TimerEvent.TIMER, maximizeTimerHandler);
|
||||
fitToWindowTimer.start();
|
||||
|
||||
} else{
|
||||
this.width = savedWindowWidth;
|
||||
this.height = savedWindowHeight;
|
||||
@ -130,15 +142,7 @@
|
||||
isMaximized = false;
|
||||
windowControls.maximizeRestoreBtn.toolTip = ResourceUtil.getInstance().getString('bbb.presentation.maximizeRestoreBtn.toolTip');
|
||||
}
|
||||
/*
|
||||
* Need to have a timer to trigger resizing slide to window after the
|
||||
* window has been maximized/restored. The MAXIMIZE/RESTORE events are
|
||||
* generated when the button is clicked so the width and height are not
|
||||
* the ones we want.
|
||||
*/
|
||||
fitToWindowTimer = new Timer(1000);
|
||||
fitToWindowTimer.addEventListener(TimerEvent.TIMER, maximizeTimerHandler);
|
||||
fitToWindowTimer.start();
|
||||
|
||||
}
|
||||
|
||||
private function maximizeTimerHandler(event:TimerEvent):void {
|
||||
@ -179,11 +183,8 @@
|
||||
slideHeight = ((currentSlideHeight * slideWidth)/currentSlideWidth);
|
||||
}
|
||||
|
||||
LogUtil.debug("before: fitSlideToWindowMaintainingAspectRatio " + this.width + "," + this.height);
|
||||
this.width = slideWidth;
|
||||
this.width = slideWidth + WIDTH_PADDING;
|
||||
this.height = slideHeight + CONTROL_BAR_HEIGHT + TOP_WINDOW_BORDER;
|
||||
LogUtil.debug("after: fitSlideToWindowMaintainingAspectRatio " + "," + this.width + "," + this.height);
|
||||
|
||||
sendWindowResizedEvent(slideWidth, slideHeight);
|
||||
}
|
||||
|
||||
@ -299,7 +300,7 @@
|
||||
}
|
||||
|
||||
private function onSliderZoom():void {
|
||||
dispatchResizeEvent(zoomSlider.value);
|
||||
dispatchResizeEvent((zoomSlider.value/10)*10);
|
||||
}
|
||||
|
||||
private function dispatchResizeEvent(newSize:int):void {
|
||||
@ -335,8 +336,8 @@
|
||||
thumbnailWindow.setDataProvider(slideView.slides);
|
||||
}
|
||||
|
||||
presenterNameLabel.text = "";
|
||||
presenterNameLabel.visible = false;
|
||||
presenterNameLabel.text = ResourceUtil.getInstance().getString('bbb.presentation.clickToUpload');
|
||||
presenterNameLabel.visible = true;
|
||||
thumbnailWindow.visible = true;
|
||||
thumbnailWindow.setFisheyeVisibility(true);
|
||||
}
|
||||
@ -370,7 +371,9 @@
|
||||
slideView.visible = true;
|
||||
|
||||
if (slideManager != null) slideManager.clear();
|
||||
|
||||
|
||||
presenterNameLabel.visible = false;
|
||||
presenterNameLabel.text = "";
|
||||
if (isPresenter) {
|
||||
backButton.visible = true;
|
||||
forwardButton.visible = true;
|
||||
@ -407,17 +410,13 @@
|
||||
} else {
|
||||
forwardButton.enabled = false;
|
||||
}
|
||||
|
||||
// zoomSlider.value = 100;
|
||||
// dispatchEvent(new ZoomEvent(ZoomEvent.RESTORE));
|
||||
// dispatchEvent(new MoveEvent(MoveEvent.MOVE));
|
||||
}
|
||||
|
||||
private function clearPresentation(e:UploadEvent):void{
|
||||
slideView.visible = false;
|
||||
slideView.selectedSlide = 0;
|
||||
slideNumLbl.text = "";
|
||||
presenterNameLabel.text = "";
|
||||
presenterNameLabel.text = ResourceUtil.getInstance().getString('bbb.presentation.clickToUpload');
|
||||
presenterNameLabel.visible = false;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user