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

- use fit-to-page as default for each new page

Browse Source 
- update icons and locale strings
This commit is contained in:
Richard Alam 2012-02-28 18:31:27 +00:00
parent bd368125d3
commit 0e795da75f
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/locale/en_US/bbbResources.properties
View File

@ -33,6 +33,8 @@ bbb.viewers.raiseHandBtn.toolTip = Click to raise hand.
bbb.viewers.presentBtn.label = Switch Presenter
bbb.viewers.kickUserBtn.toolTip = Kick User
bbb.presentation.title = Presentation
bbb.presentation.fitToWidth.toolTip = Fit to width
bbb.presentation.fitToPage.toolTip = Fit to page
bbb.presentation.uploadPresBtn = Upload a document for presentation.
bbb.presentation.uploadPresBtn.toolTip = Upload a document for presentation.
bbb.presentation.backBtn.toolTip = Previous slide.

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

@ -21,6 +21,12 @@ package org.bigbluebutton.common
[Bindable]
public class Images
{
[Embed(source="assets/images/fit-to-page.png")]
public var fitToPage:Class;
[Embed(source="assets/images/fit-to-width.png")]
public var fitToWidth:Class;
[Embed(source="assets/images/green-circle.png")]
public var greenCircle:Class;

19
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
View File

@ -32,7 +32,7 @@
verticalScrollPolicy="off"
horizontalScrollPolicy="off"
showControls="true" resize="maximizeHandler()"
backgroundColor="red"
backgroundColor="#efefef"
implements="org.bigbluebutton.common.IBbbModuleWindow"
creationComplete="onCreationComplete()"
width="{DEFAULT_WINDOW_WIDTH}" height="{DEFAULT_WINDOW_HEIGHT}"
@ -101,7 +101,8 @@
[Bindable] private var forwardIcon:Class = images.forward;
[Bindable] private var backwardIcon:Class = images.backward;
[Bindable] private var magnifierIcon:Class = images.magnifier;
[Bindable] public var fitToWidthIcon:Class = images.magnifier;
[Bindable] public var fitToWidthIcon:Class = images.fitToWidth;
[Bindable] public var fitToPageIcon:Class = images.fitToPage;
[Bindable] private var thumbY:Number;
public var uploadWindow:FileUploadWindow = null;
@ -185,11 +186,7 @@
currentSlideWidth = event.slideWidth;
currentSlideHeight = event.slideHeight;
fitToPage = true;
if (currentSlideHeight > currentSlideWidth) {
fitToPage = false;
}
// slideView.switchToFitToPage(fitToPage);
fitSlideToWindowMaintainingAspectRatio();
}
@ -291,6 +288,7 @@
zoomSlider.visible = show;
btnResetZoom.visible = show;
btnSlideNum.visible = show;
btnFitToPage.visible = show;
setButtonsVisibility(show);
}
@ -485,7 +483,7 @@
<mx:Fade id="thumbFadeIn" alphaFrom="1" alphaTo="0" duration="100" />
<mx:Fade id="thumbFadeOut" alphaFrom="0" alphaTo="1" duration="100" />
<views:SlideView id="slideView" width="100%" height="100%" visible="false" mouseDown="mouseDown = true" backgroundColor="blue"
<views:SlideView id="slideView" width="100%" height="100%" visible="false" mouseDown="mouseDown = true" backgroundColor="#efefef"
mouseUp="mouseDown = false" verticalScrollPolicy="off" horizontalScrollPolicy="off" />
<mx:ApplicationControlBar id="presCtrlBar" width="100%" height="{CONTROL_BAR_HEIGHT}">
<mx:Button id="uploadPres" icon="{uploadIcon}" visible="false" width="20" height="20"
@ -504,8 +502,9 @@
useHandCursor="true" snapInterval="5" allowTrackClick="true" liveDragging="true"
dataTipFormatFunction="removeDecimalFromDataTip" change="onSliderZoom()" width="100"/>
<mx:Spacer width="50%" id="spacer3"/>
<mx:Button id="btnFitToPage" icon="{magnifierIcon}" visible="true" width="20" height="20" toggle="true" selected="{!fitToPage}"
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.resetZoomBtn.toolTip')}" click="onFitToPage()"/>
<mx:Button id="btnFitToPage" icon="{fitToPage ? fitToWidthIcon : fitToPageIcon}" visible="false" width="20" height="20" toggle="true" selected="{!fitToPage}"
toolTip="{fitToPage ? ResourceUtil.getInstance().getString('bbb.presentation.fitToWidth.toolTip') : ResourceUtil.getInstance().getString('bbb.presentation.fitToPage.toolTip')}"
click="onFitToPage()"/>
<mx:Button id="btnResetZoom" icon="{magnifierIcon}" visible="false" width="20" height="20"
toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.resetZoomBtn.toolTip')}" click="onResetZoom()"/>
<mx:Spacer width="5" id="spacer4"/>