mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-29 22:39:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to GUI

Browse Source
This commit is contained in:
SimonFair
2022-08-04 18:11:36 +01:00
parent 697f84d2ff
commit 5d7d77ad4f
7 changed files with 71 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.vm.manager/include/VMMachines.php
+4 -2
View File
@@ -72,11 +72,13 @@ foreach ($vms as $vm) {
$graphics = '';
if ($vncport > 0) {
$wsport = $lv->domain_get_ws_port($res);
$protocol = $lv->domain_get_web_protocol($res) ;
$vnc = autov('/plugins/dynamix.vm.manager/vnc.html',true).'&autoconnect=true&host=' . $_SERVER['HTTP_HOST'] . '&port=&path=/wsproxy/' . $wsport . '/';
$spice = autov('/plugins/dynamix.vm.manager/spice.html',true).'&autoconnect=true&host=' . $_SERVER['HTTP_HOST'] . '&port='.$vncport ;
$graphics = 'VNC:'.$vncport;
$graphics = strtoupper($protocol).":".$vncport;
} elseif ($vncport == -1) {
$graphics = 'VNC:auto';
$protocol = $lv->domain_get_web_protocol($res) ;
$graphics = strtoupper($protocol).':auto';
} elseif (!empty($arrConfig['gpu'])) {
$arrValidGPUDevices = getValidGPUDevices();
foreach ($arrConfig['gpu'] as $arrGPU) {
plugins/dynamix.vm.manager/include/libvirt.php
+20 -4
View File
@@ -674,7 +674,7 @@
continue;
}
if ($gpu['id'] == 'vnc') {
if ($gpu['id'] == 'virtual') {
$strKeyMap = '';
if (!empty($gpu['keymap'])) {
$strKeyMap = "keymap='" . $gpu['keymap'] . "'";
@@ -694,11 +694,14 @@
$strModelType = 'qxl';
}
}
#$strProtocol = 'spice';
if (!empty($gpu['protocol'])) {
$strProtocol = $gpu['protocol'];
} else $strProtocol = " vnc" ;
$vnc = "<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' websocket='-1' listen='0.0.0.0' $passwdstr $strKeyMap>
<graphics type='$strProtocol' port='-1' autoport='yes' websocket='-1' listen='0.0.0.0' $passwdstr $strKeyMap>
<listen type='address' address='0.0.0.0'/>
</graphics>
<video>
@@ -706,6 +709,11 @@
</video>";
$gpudevs_used[] = $gpu['id'];
$m = print_r($vnc,true);
$m = str_replace("\n", " ", $m);
$m = str_replace('"', "'", $m);
$cmd = "/usr/bin/logger ".'"'.$m.'"';
exec($cmd);
continue;
}
@@ -785,7 +793,7 @@
}
$memballoon = "<memballoon model='none'/>";
if (empty( array_filter(array_merge($gpudevs_used, $audiodevs_used, $pcidevs_used), function($k){ return strpos($k,'#remove')===false && $k!='vnc'; }) )) {
if (empty( array_filter(array_merge($gpudevs_used, $audiodevs_used, $pcidevs_used), function($k){ return strpos($k,'#remove')===false && $k!='virtual' ; }) )) {
$memballoon = "<memballoon model='virtio'>
<alias name='balloon0'/>
</memballoon>";
@@ -1799,6 +1807,14 @@
return $var;
}
function domain_get_web_protocol($domain) {
$tmp = $this->get_xpath($domain, '//domain/devices/graphics/@type', false);
$var = $tmp[0];
unset($tmp);
return $var;
}
function domain_get_vnc_model($domain) {
$tmp = $this->get_xpath($domain, '//domain/devices/video/model/@type', false);
if (!$tmp)
plugins/dynamix.vm.manager/include/libvirt_helpers.php
+2 -1
View File
@@ -987,7 +987,8 @@
$intVNCPort = $lv->domain_get_vnc_port($res);
if (!empty($intVNCPort)) {
$arrGPUDevices[] = [
'id' => 'vnc',
'id' => 'virtual',
'protocol' => $lv->domain_get_web_protocol($res),
'model' => $lv->domain_get_vnc_model($res),
'keymap' => $lv->domain_get_vnc_keymap($res)
];
plugins/dynamix.vm.manager/scripts/codemirror/addon/hint/libvirt-schema.js
Vendored
+1 -1
View File
@@ -303,7 +303,7 @@ function getLibvirtSchema() {
root.domain.devices.graphics = {
"!attrs": {
type: ["vnc"],
type: ["vnc","spice"],
port: ["-1"],
autoport: ["yes", "no"],
websocket: ["-1"],
plugins/dynamix.vm.manager/spice.html
+1 -1
View File
@@ -58,7 +58,7 @@
var auto = urlParams.get('autoconnect') ;
var host = urlParams.get("host") ;
var port = urlParams.get("port") ;
host ="192.168.1.225" ;
document.getElementById("host").value = host ;
document.getElementById("port").value = port;
if (auto === 'true' || auto == '1') {
plugins/dynamix.vm.manager/templates/Custom.form.php
+40 -21
View File
@@ -76,7 +76,8 @@
],
'gpu' => [
[
'id' => 'vnc',
'id' => 'virtual',
'protcol' => 'vnc',
'model' => 'qxl',
'keymap' => 'en-us'
]
@@ -126,9 +127,11 @@
$dom = $lv->get_domain_by_name($_POST['domain']['name']);
$vncport = $lv->domain_get_vnc_port($dom);
$wsport = $lv->domain_get_ws_port($dom);
$protocol = $lv->domain_get_web_protocol($dom);
$reply = ['success' => true];
if ($vncport > 0) {
$reply['vncurl'] = autov('/plugins/dynamix.vm.manager/vnc.html',true).'&autoconnect=true&host='.$_SERVER['HTTP_HOST'].'&port=&path=/wsproxy/'.$wsport.'/';
//$reply['spiceurl'] = autov('/plugins/dynamix.vm.manager/spice.html',true).'&autoconnect=true&host='.$_SERVER['HTTP_HOST'].'&port='.$vncport;
}
} else {
$reply = ['error' => $lv->get_last_error()];
@@ -852,8 +855,9 @@
<select name="gpu[<?=$i?>][id]" class="gpu narrow">
<?
if ($i == 0) {
// Only the first video card can be VNC
echo mk_option($arrGPU['id'], 'vnc', _('VNC'));
// Only the first video card can be VNC or SPICE
echo mk_option($arrGPU['id'], 'virtual', _('Virtual'));
} else {
echo mk_option($arrGPU['id'], '', _('None'));
}
@@ -867,20 +871,30 @@
</tr>
<?if ($i == 0) {?>
<tr class="<?if ($arrGPU['id'] != 'vnc') echo 'was';?>advanced vncmodel">
<td>_(VNC Video Driver)_:</td>
<tr class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protcol">
<td>_(Virt Protcol)_:</td>
<td>
<select id="webprotocol" name="gpu[<?=$i?>][protocol]" class="narrow" title="_(video for VNC)_">
<?echo mk_option($arrGPU['protocol'], 'vnc', _('VNC'));?>
<?echo mk_option($arrGPU['protocol'], 'spice', _('SPICE'));?>
</select>
</td>
</tr>
<tr class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced vncmodel">
<td>_(Virt Video Driver)_:</td>
<td>
<select id="vncmodel" name="gpu[<?=$i?>][model]" class="narrow" title="_(video for VNC)_">
<?mk_dropdown_options($arrValidVNCModels, $arrGPU['model']);?>
</select>
</td>
</tr>
<tr class="vncpassword">
<td>_(VNC Password)_:</td>
<td>_(Virt Password)_:</td>
<td><input type="password" name="domain[password]" autocomplete='new-password' title="_(password for VNC)_" placeholder="_(password for VNC)_ (_(optional)_)" /></td>
</tr>
<tr class="<?if ($arrGPU['id'] != 'vnc') echo 'was';?>advanced vnckeymap">
<td>_(VNC Keyboard)_:</td>
<tr class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced vnckeymap">
<td>_(Virt Keyboard)_:</td>
<td>
<select name="gpu[<?=$i?>][keymap]" title="_(keyboard for VNC)_">
<?mk_dropdown_options($arrValidKeyMaps, $arrGPU['keymap']);?>
@@ -888,36 +902,41 @@
</td>
</tr>
<?}?>
<tr class="<?if ($arrGPU['id'] == 'vnc') echo 'was';?>advanced romfile">
<tr class="<?if ($arrGPU['id'] == 'virtual') echo 'was';?>advanced romfile">
<td>_(Graphics ROM BIOS)_:</td>
<td>
<input type="text" name="gpu[<?=$i?>][rom]" autocomplete="off" spellcheck="false" data-pickcloseonfile="true" data-pickfilter="rom,bin" data-pickmatch="^[^.].*" data-pickroot="/mnt/" value="<?=htmlspecialchars($arrGPU['rom'])?>" placeholder="_(Path to ROM BIOS file)_ (_(optional)_)" title="_(Path to ROM BIOS file)_ (_(optional)_)" />
</td>
</tr>
</table>
<?if ($i == 0) {?>
<?if ($i == 0 || $i == 1) {?>
<blockquote class="inline_help">
<p>
<b>Graphics Card</b><br>
If you wish to assign a graphics card to the VM, select it from this list, otherwise leave it set to VNC.
If you wish to assign a graphics card to the VM, select it from this list, otherwise leave it set to virtual.
</p>
<p class="<?if ($arrGPU['id'] != 'vnc') echo 'was';?>advanced vncmodel">
<b>VNC Video Driver</b><br>
<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
<b>virtual Video protocol i.e. VNC/SPICE</b><br>
If you wish to assign a protocol to use for a virtual screen connections, specify one here.
</p>
<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced vncmodel">
<b>virtual Video Driver</b><br>
If you wish to assign a different video driver to use for a VNC connection, specify one here.
</p>
<p class="vncpassword">
<b>VNC Password</b><br>
<b>virtual Password</b><br>
If you wish to require a password to connect to the VM over a VNC connection, specify one here.
</p>
<p class="<?if ($arrGPU['id'] != 'vnc') echo 'was';?>advanced vnckeymap">
<b>VNC Keyboard</b><br>
<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced vnckeymap">
<b>virtual Keyboard</b><br>
If you wish to assign a different keyboard layout to use for a VNC connection, specify one here.
</p>
<p class="<?if ($arrGPU['id'] == 'vnc') echo 'was';?>advanced romfile">
<p class="<?if ($arrGPU['id'] == 'virtual') echo 'was';?>advanced romfile">
<b>Graphics ROM BIOS</b><br>
If you wish to use a custom ROM BIOS for a Graphics card, specify one here.
</p>
@@ -1445,7 +1464,7 @@ $(function() {
if (myindex == 0) {
$vnc_sections = $('.vncmodel,.vncpassword,.vnckeymap');
if (myvalue == 'vnc') {
if (myvalue == 'virtual') {
$vnc_sections.filter('.wasadvanced').removeClass('wasadvanced').addClass('advanced');
slideDownRows($vnc_sections.not(isVMAdvancedMode() ? '.basic' : '.advanced'));
} else {
@@ -1455,7 +1474,7 @@ $(function() {
}
$romfile = $(this).closest('table').find('.romfile');
if (myvalue == 'vnc' || myvalue == '') {
if (myvalue == 'virtual' || myvalue == '') {
slideUpRows($romfile.not(isVMAdvancedMode() ? '.basic' : '.advanced'));
$romfile.filter('.advanced').removeClass('advanced').addClass('wasadvanced');
} else {
@@ -1505,7 +1524,7 @@ $(function() {
} while (gpu);
form.find('select[name="gpu[0][id]"] option').each(function(){
var gpu = $(this).val();
if (gpu != 'vnc' && !gpus.includes(gpu)) form.append('<input type="hidden" name="pci[]" value="'+gpu+'#remove">');
if (gpu != 'virtual' && !gpus.includes(gpu)) form.append('<input type="hidden" name="pci[]" value="'+gpu+'#remove">');
});
// remove unused sound cards
var sound = [], i = 0;
@@ -1532,7 +1551,7 @@ $(function() {
$.post("/plugins/dynamix.vm.manager/templates/Custom.form.php", postdata, function( data ) {
if (data.success) {
if (data.vncurl) {
var vnc_window=window.open(data.vncurl, '_blank', 'scrollbars=yes,resizable=yes');
if (data.webprotocol === "spice" ) var vnc_window=window.open(data.spiceurl, '_blank', 'scrollbars=yes,resizable=yes'); else var vnc_window=window.open(data.vncurl, '_blank', 'scrollbars=yes,resizable=yes');
try {
vnc_window.focus();
} catch (e) {
plugins/dynamix.vm.manager/templates/LibreELEC.form.php
+3 -3
View File
@@ -719,7 +719,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
</select>
</td>
</tr>
<tr class="<?if ($arrGPU['id'] == 'vnc') echo 'was';?>advanced romfile">
<tr class="<?if ($arrGPU['id'] == 'virtual') echo 'was';?>advanced romfile">
<td>_(Graphics ROM BIOS)_:</td>
<td>
<input type="text" name="gpu[<?=$i?>][rom]" autocomplete="off" spellcheck="false" data-pickcloseonfile="true" data-pickfilter="rom,bin" data-pickmatch="^[^.].*" data-pickroot="/mnt/" value="<?=htmlspecialchars($arrGPU['rom'])?>" placeholder="_(Path to ROM BIOS file)_ (_(optional)_)" title="_(Path to ROM BIOS file)_ (_(optional)_)" />
@@ -733,7 +733,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
If you wish to assign a graphics card to the VM, select it from this list.
</p>
<p class="<?if ($arrGPU['id'] == 'vnc') echo 'was';?>advanced romfile">
<p class="<?if ($arrGPU['id'] == 'virtual') echo 'was';?>advanced romfile">
<b>Graphics ROM BIOS</b><br>
If you wish to use a custom ROM BIOS for a Graphics card, specify one here.
</p>
@@ -1170,7 +1170,7 @@ $(function() {
} while (gpu);
form.find('select[name="gpu[0][id]"] option').each(function(){
var gpu = $(this).val();
if (gpu != 'vnc' && !gpus.includes(gpu)) form.append('<input type="hidden" name="pci[]" value="'+gpu+'#remove">');
if (gpu != 'virtual' && !gpus.includes(gpu)) form.append('<input type="hidden" name="pci[]" value="'+gpu+'#remove">');
});
// remove unused sound cards
var sound = [], i = 0;