[pve-devel] r5392 - in pve-manager/pve2: . debian www/manager

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-01-18 15:28:31 +0100 (Tue, 18 Jan 2011)
New Revision: 5392

Modified:
   pve-manager/pve2/ChangeLog
   pve-manager/pve2/debian/control.in
   pve-manager/pve2/www/manager/PVEConsole.js
Log:
	* www/manager/PVEConsole.js: test code for new TigerVNC applet
	(vncterm update)
	* debian/control.in (Depends): depend on libio-socket-ssl-perl



Modified: pve-manager/pve2/ChangeLog
===================================================================
--- pve-manager/pve2/ChangeLog	2011-01-18 14:17:08 UTC (rev 5391)
+++ pve-manager/pve2/ChangeLog	2011-01-18 14:28:31 UTC (rev 5392)
@@ -1,3 +1,12 @@
+2011-01-18  root  <root at maui.maurer-it.com>
+
+	* www/manager/PVEConsole.js: test code for new TigerVNC applet
+	(vncterm update)
+
+2011-01-17  root  <root at maui.maurer-it.com>
+
+	* debian/control.in (Depends): depend on libio-socket-ssl-perl
+
 2011-01-13  root  <root at maui.maurer-it.com>
 
 	* www/manager/StatusPanel.js: a simple log viewer.

Modified: pve-manager/pve2/debian/control.in
===================================================================
--- pve-manager/pve2/debian/control.in	2011-01-18 14:17:08 UTC (rev 5391)
+++ pve-manager/pve2/debian/control.in	2011-01-18 14:28:31 UTC (rev 5392)
@@ -3,7 +3,7 @@
 Section: admin
 Priority: optional
 Architecture: all
-Depends: perl5, libtimedate-perl, apache2-mpm-prefork, libauthen-pam-perl, libintl-perl, rsync, libapache2-request-perl, libjson-perl, libdigest-sha1-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl, wget, libnet-dns-perl, vlan, ifenslave-2.6 (>= 1.1.0-10), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, libjs-prototype (>= 1.6.0.3-1), netcat-traditional, pve-cluster, libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libhttp-request-params-perl, libpve-access-control
+Depends: perl5, libtimedate-perl, apache2-mpm-prefork, libauthen-pam-perl, libintl-perl, rsync, libapache2-request-perl, libjson-perl, libdigest-sha1-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl, wget, libnet-dns-perl, vlan, ifenslave-2.6 (>= 1.1.0-10), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, libjs-prototype (>= 1.6.0.3-1), netcat-traditional, pve-cluster, libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libhttp-request-params-perl, libpve-access-control, libio-socket-ssl-perl
 Conflicts: netcat-openbsd
 Maintainer: Proxmox Support Team <support at proxmox.com>
 Description: The Proxmox Virtual Environment

Modified: pve-manager/pve2/www/manager/PVEConsole.js
===================================================================
--- pve-manager/pve2/www/manager/PVEConsole.js	2011-01-18 14:17:08 UTC (rev 5391)
+++ pve-manager/pve2/www/manager/PVEConsole.js	2011-01-18 14:28:31 UTC (rev 5392)
@@ -26,7 +26,7 @@
 	if (!vmid)
 	    throw "no vmid specified";
 
-	var port = 5900;
+	var port = 5910;
 	var ticket = "TEST";
 	var myid = self.id + "-vncapp";
 
@@ -86,12 +86,20 @@
 	var tbar = [ 
 	    { text: 'Start'},
 	    { text: 'Stop'},
-	    { text: 'Reset'},
+	    { text: 'CAD' ,
+	      handler: function() { 
+		  var applet = Ext.getDom(myid);
+		  applet.sendCtrlAltDel();
+	      }
+	    },
             '->',
             { 
                 text: 'New Window',
                 handler: function() {
-                    var url = "?console=" + vmid;
+		    var url = "?console=" + vmid;
+		    //var port = 5910;
+		    //var ticket = "TEST";
+		    //window.location = "vnc://" + location.host + ":" + port + '/' + ticket;
                     var nw = window.open(url, '_blank', "innerWidth=745,innerheight=427");
                     nw.focus();
                }
@@ -105,9 +113,8 @@
 		border: false,
 		bodyCfg: {
 		    id: myid,
-		    //name: 'vncapp',
 		    tag: 'applet',
-		    code: 'VncViewer.class',
+		    code: 'com.tigervnc.vncviewer.VncViewer',
 		    archive: '/vncterm/VncViewer.jar',
 		    cn: [
 			{tag: 'param', name: 'id', value: myid},
@@ -117,6 +124,7 @@
 		    ]
 		}
 	    }
+
 	});
 
 	PVE.Console.superclass.initComponent.call(self);