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

adjusted the ShortcutWindow sizing

Browse Source
This commit is contained in:
Chad Pilkey 2016-02-08 13:07:47 -08:00
parent d5db28ac3c
commit 9264f50ae5
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bigbluebutton-client/src/org/bigbluebutton/main/model/ShortcutOptions.as
View File

@ -88,7 +88,6 @@ package org.bigbluebutton.main.model
} }
if (deskshare){generalResource.push('bbb.shortcutkey.share.desktop');} if (deskshare){generalResource.push('bbb.shortcutkey.share.desktop');}
if (webcam){generalResource.push('bbb.shortcutkey.share.webcam');} if (webcam){generalResource.push('bbb.shortcutkey.share.webcam');}
if (polling){generalResource.push('bbb.shortcutkey.polling.buttonClick');}
generalResource.push('bbb.shortcutkey.shortcutWindow'); generalResource.push('bbb.shortcutkey.shortcutWindow');
generalResource.push('bbb.shortcutkey.logout'); generalResource.push('bbb.shortcutkey.logout');

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

@ -252,8 +252,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
public function openShortcutHelpWindow(e:Event = null):void{ public function openShortcutHelpWindow(e:Event = null):void{
if (scWindow == null) { if (scWindow == null) {
scWindow = new ShortcutHelpWindow(); scWindow = new ShortcutHelpWindow();
scWindow.width = 300;
scWindow.height = 300;
} }
if (scWindow.minimized) if (scWindow.minimized)
@ -263,7 +261,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
scWindow.restore(); scWindow.restore();
mdiCanvas.windowManager.add(scWindow); mdiCanvas.windowManager.add(scWindow);
mdiCanvas.windowManager.absPos(scWindow, mdiCanvas.width/2 - 150, mdiCanvas.height/2 - 150); mdiCanvas.windowManager.absPos(scWindow, mdiCanvas.width/2 - scWindow.width/2, mdiCanvas.height/2 - scWindow.height/2);
scWindow.focusHead(); scWindow.focusHead();
} }

4
bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml Normal file → Executable file
View File

@ -24,6 +24,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
xmlns:mx="http://www.adobe.com/2006/mxml" xmlns:mx="http://www.adobe.com/2006/mxml"
xmlns:common="org.bigbluebutton.common.*" xmlns:common="org.bigbluebutton.common.*"
showCloseButton="true" showCloseButton="true"
height="350"
width="430"
initialize="init()" initialize="init()"
creationComplete="onCreationComplete()" creationComplete="onCreationComplete()"
xmlns:mate="http://mate.asfusion.com/" xmlns:mate="http://mate.asfusion.com/"
@ -256,7 +258,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:ComboBox> </mx:ComboBox>
<mx:DataGrid id="keyList" draggableColumns="false" dataProvider="{shownKeys}" width="100%" height="100%"> <mx:DataGrid id="keyList" draggableColumns="false" dataProvider="{shownKeys}" width="100%" height="100%">
<mx:columns> <mx:columns>
<mx:DataGridColumn dataField="shortcut" headerText="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.headers.shortcut')}"/> <mx:DataGridColumn dataField="shortcut" width="150" headerText="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.headers.shortcut')}"/>
<mx:DataGridColumn dataField="func" headerText="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.headers.function')}"/> <mx:DataGridColumn dataField="func" headerText="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.headers.function')}"/>
</mx:columns> </mx:columns>
</mx:DataGrid> </mx:DataGrid>