diff options
| -rw-r--r-- | endpoints/lib/vboxconnector.php | 8 | ||||
| -rw-r--r-- | panes/settingsGeneral.html | 30 |
2 files changed, 14 insertions, 24 deletions
diff --git a/endpoints/lib/vboxconnector.php b/endpoints/lib/vboxconnector.php index 8c0f712..01f8384 100644 --- a/endpoints/lib/vboxconnector.php +++ b/endpoints/lib/vboxconnector.php @@ -1593,7 +1593,7 @@ class vboxconnector { // Network properties $eprops = $n->getProperties(null); $eprops = array_combine($eprops[1],$eprops[0]); - $iprops = array_map(create_function('$a','$b=explode("=",$a); return array($b[0]=>$b[1]);'),preg_split('/[\r|\n]+/',$args['networkAdapters'][$i]['properties'])); + $iprops = array_map(function($a){$b=explode("=",$a); return array($b[0]=>$b[1]);},preg_split('/[\r|\n]+/',$args['networkAdapters'][$i]['properties'])); $inprops = array(); foreach($iprops as $a) { foreach($a as $k=>$v) @@ -2113,7 +2113,7 @@ class vboxconnector { // Network properties $eprops = $n->getProperties(null); $eprops = array_combine($eprops[1],$eprops[0]); - $iprops = array_map(create_function('$a','$b=explode("=",$a); return array($b[0]=>$b[1]);'),preg_split('/[\r|\n]+/',$args['networkAdapters'][$i]['properties'])); + $iprops = array_map(function($a){$b=explode("=",$a); return array($b[0]=>$b[1]);},preg_split('/[\r|\n]+/',$args['networkAdapters'][$i]['properties'])); $inprops = array(); foreach($iprops as $a) { foreach($a as $k=>$v) @@ -3944,7 +3944,7 @@ class vboxconnector { else $nd = null; $props = $n->getProperties(null); - $props = implode("\n",array_map(create_function('$a,$b','return "$a=$b";'),$props[1],$props[0])); + $props = implode("\n",array_map(function($a,$b){return "$a=$b";},$props[1],$props[0])); $adapters[] = array( 'adapterType' => (string)$n->adapterType, @@ -4500,7 +4500,7 @@ class vboxconnector { } // sort by port then device - usort($return,create_function('$a,$b', 'if($a["port"] == $b["port"]) { if($a["device"] < $b["device"]) { return -1; } if($a["device"] > $b["device"]) { return 1; } return 0; } if($a["port"] < $b["port"]) { return -1; } return 1;')); + usort($return,function($a,$b){if($a["port"] == $b["port"]) { if($a["device"] < $b["device"]) { return -1; } if($a["device"] > $b["device"]) { return 1; } return 0; } if($a["port"] < $b["port"]) { return -1; } return 1;}); return $return; } diff --git a/panes/settingsGeneral.html b/panes/settingsGeneral.html index 60c6dfa..610d029 100644 --- a/panes/settingsGeneral.html +++ b/panes/settingsGeneral.html @@ -11,7 +11,7 @@ <li><a href="#vboxSettingsTabGeneralAdvanced"><span class='translate'>Advanced</span></a></li>
<li><a href="#vboxSettingsTabGeneralDescription"><span class='translate'>Description</span></a></li>
<li><a href="#vboxSettingsTabGeneralEncryption"><span class='translate'>Encryption</span></a></li>
- <li id='vboxSettingsTabGeneralInputTab'><a href="#vboxSettingsTabGeneralInput"><span class='translate'>Input</span></a></li>
+ <li id='vboxSettingsTabGeneralInputTab'><a href="#vboxSettingsTabGeneralInput"><span class='translateinputtab'>Input</span></a></li>
</ul>
<!-- Basic Tab -->
@@ -126,7 +126,7 @@ <div id='vboxSettingsTabGeneralInput' title='Input'>
<table class='vboxVertical'>
<tr>
- <th><span class='translate'>Keyboard:</span></th>
+ <th><span class='translateinput'>Keyboard</span><span> :</span></th>
<td><select name='vboxSettingsTabGeneralInputKeyboard'>
<option value='PS2Keyboard'>PS/2 Keyboard</option>
<option value='USBKeyboard'>USB Keyboard</option>
@@ -134,7 +134,7 @@ </td>
</tr>
<tr>
- <th><span class='translate'>Mouse:</span></th>
+ <th><span class='translateinput'>Mouse</span><span> :</span></th>
<td><select name='vboxSettingsTabGeneralInputMouse'>
<option value='PS2Mouse'>PS/2 Mouse</option>
<option value='USBMouse'>USB Mouse</option>
@@ -147,6 +147,8 @@ <script type='text/javascript'>
/* Translations */
+$('#vboxSettingsTabGeneralInput').find(".translateinput").html(function(i,h){return trans(h,'UIActionPool');});
+$('#vboxSettingsTabGeneralInputTab').find(".translateinputtab").html(function(i,h){return trans(h,'UISettingsDialogGlobal');});
$('#vboxSettingsTabGeneralBasic').find(".translateos").html(function(i,h){return trans(h,'UINameAndSystemEditor');});
if($('#vboxPane').data('vboxConfig').vboxAutostartConfig) {
@@ -162,6 +164,7 @@ if($('#vboxPane').data('vboxConfig').vboxAutostartConfig) { }
$('#vboxSettingsTabGeneralEncryption').find('option').html(function(i,h){ return trans(h, 'UIMachineSettingsGeneral', 'cipher type')});
+$('#vboxSettingsTabGeneralInput').find('option').html(function(i,h){ return trans(h, 'VBoxGlobal')});
/* Browse for snapshot folder */
function vboxSnapshotBrowseFolder(btn) {
@@ -179,15 +182,6 @@ if(!$('#vboxPane').data('vboxConfig').startStopConfig) { }
-/*
- * Remove input if advancedconfig is not set
- * else set default values
- */
-if(!$('#vboxPane').data('vboxConfig').enableAdvancedConfig) {
- $('#vboxSettingsTabGeneralInputTab').remove();
- $('#vboxSettingsTabGeneralInput').remove();
-}
-
/* Custom icons */
if($('#vboxPane').data('vboxConfig').enableCustomIcons) {
@@ -276,10 +270,8 @@ $('#vboxSettingsDialog').on('dataLoaded', function(){ document.forms['frmVboxSettings'].vboxSettingsGeneralDescription.innerHTML = $('#vboxSettingsDialog').data('vboxMachineData').description;
/* Advanced config options */
- if($('#vboxPane').data('vboxConfig').enableAdvancedConfig) {
- $(document.forms['frmVboxSettings'].vboxSettingsTabGeneralInputKeyboard).val($('#vboxSettingsDialog').data('vboxMachineData').keyboardHIDType);
- $(document.forms['frmVboxSettings'].vboxSettingsTabGeneralInputMouse).val($('#vboxSettingsDialog').data('vboxMachineData').pointingHIDType);
- }
+ $(document.forms['frmVboxSettings'].vboxSettingsTabGeneralInputKeyboard).val($('#vboxSettingsDialog').data('vboxMachineData').keyboardHIDType);
+ $(document.forms['frmVboxSettings'].vboxSettingsTabGeneralInputMouse).val($('#vboxSettingsDialog').data('vboxMachineData').pointingHIDType);
/* OS Type */
@@ -397,10 +389,8 @@ $('#vboxSettingsDialog').on('dataLoaded', function(){ $('#vboxSettingsDialog').data('vboxMachineData').snapshotFolder = document.forms['frmVboxSettings'].vboxSettingsGeneralSnapshotFolder.value;
$('#vboxSettingsDialog').data('vboxMachineData').description = $(document.forms['frmVboxSettings'].vboxSettingsGeneralDescription).val();
- if($('#vboxPane').data('vboxConfig').enableAdvancedConfig) {
- $('#vboxSettingsDialog').data('vboxMachineData').keyboardHIDType = $(document.forms['frmVboxSettings'].vboxSettingsTabGeneralInputKeyboard).val();
- $('#vboxSettingsDialog').data('vboxMachineData').pointingHIDType = $(document.forms['frmVboxSettings'].vboxSettingsTabGeneralInputMouse).val();
- }
+ $('#vboxSettingsDialog').data('vboxMachineData').keyboardHIDType = $(document.forms['frmVboxSettings'].vboxSettingsTabGeneralInputKeyboard).val();
+ $('#vboxSettingsDialog').data('vboxMachineData').pointingHIDType = $(document.forms['frmVboxSettings'].vboxSettingsTabGeneralInputMouse).val();
if($('#vboxPane').data('vboxConfig').enableCustomIcons)
$('#vboxSettingsDialog').data('vboxMachineData').customIcon = $(document.forms['frmVboxSettings'].vboxSettingsGeneralIcon).val();
|