Index: /trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h (revision 283)
+++ /trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h (revision 284)
@@ -218,4 +218,18 @@
}
+ QString toString (CEnums::VRDPAuthType t) const
+ {
+ AssertMsg (!vrdpAuthTypes [t].isNull(), ("No text for %d", t));
+ return vrdpAuthTypes [t];
+ }
+
+ CEnums::VRDPAuthType toVRDPAuthType (const QString &s) const
+ {
+ QStringVector::const_iterator it =
+ qFind (vrdpAuthTypes.begin(), vrdpAuthTypes.end(), s);
+ AssertMsg (it != vrdpAuthTypes.end(), ("No value for {%s}", s.latin1()));
+ return CEnums::VRDPAuthType (it - vrdpAuthTypes.begin());
+ }
+
/**
* Similar to toString (CEnums::HardDiskType), but returns 'Differencing'
@@ -421,4 +435,5 @@
QStringVector diskTypes;
QStringVector diskStorageTypes;
+ QStringVector vrdpAuthTypes;
QStringVector diskControllerDevices;
QStringVector audioDriverTypes;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (revision 283)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (revision 284)
@@ -326,4 +326,5 @@
, diskTypes (CEnums::HardDiskType_COUNT)
, diskStorageTypes (CEnums::HardDiskStorageType_COUNT)
+ , vrdpAuthTypes (CEnums::VRDPAuthType_COUNT)
, diskControllerDevices (3)
, audioDriverTypes (CEnums::AudioDriverType_COUNT)
@@ -1198,4 +1199,11 @@
diskStorageTypes [CEnums::ISCSIHardDisk] =
tr ("iSCSI", "DiskStorageType");
+
+ vrdpAuthTypes [CEnums::VRDPAuthNull] =
+ tr ("Null", "VRDPAuthType");
+ vrdpAuthTypes [CEnums::VRDPAuthExternal] =
+ tr ("External", "VRDPAuthType");
+ vrdpAuthTypes [CEnums::VRDPAuthGuest] =
+ tr ("Guest", "VRDPAuthType");
Assert (diskControllerDevices.count() == 3);
Index: /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui (revision 283)
+++ /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui (revision 284)
@@ -232,4 +232,24 @@
+ -
+
+ VRDP
+
+
+ 7
+
+
+ #vrdp
+
+
+ discard_cur_state_16px.png
+
+
+
+
+
+
+
+
listView
@@ -2021,4 +2041,218 @@
+
+
+
+
+ pageVRDP
+
+
+ 7
+
+
+
+ unnamed
+
+
+ 0
+
+
+
+ grbVRDP
+
+
+ &Enable VRDP Server
+
+
+ true
+
+
+ true
+
+
+
+ unnamed
+
+
+
+ layout31
+
+
+
+ unnamed
+
+
+
+ txVRDPPort
+
+
+ Server port
+
+
+ cbAudioDriver
+
+
+
+
+ txVRDPAuthMethod
+
+
+ Authentication Method
+
+
+ cbAudioDriver
+
+
+
+
+ txVRDPAuthTimeout
+
+
+ Authentication Timeout
+
+
+ cbAudioDriver
+
+
+
+
+
+
+ layout32
+
+
+
+ unnamed
+
+
+
+ leVRDPPort
+
+
+
+ 1
+ 0
+ 0
+ 0
+
+
+
+ Displays the VRDP Server port.
+
+
+
+
+ cbVRDPAuthType
+
+
+
+ 1
+ 0
+ 0
+ 0
+
+
+
+ Defines the VRDP authentication method.
+
+
+
+
+ leVRDPTimeout
+
+
+
+ 1
+ 0
+ 0
+ 0
+
+
+
+ Specifies the timeout for guest authentication, in milliseconds.
+
+
+
+
+
+
+ layout33
+
+
+
+ unnamed
+
+
+
+ spacer36_2
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 16
+ 20
+
+
+
+
+
+ spacer36_2_3
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 16
+ 20
+
+
+
+
+
+ spacer36_2_2
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 16
+ 20
+
+
+
+
+
+
+
+
+
+ spacer11_2
+
+
+ Vertical
+
+
+ Expanding
+
+
+
+ 20
+ 110
+
+
+
@@ -2359,4 +2593,8 @@
tbUSBFilterUp
tbUSBFilterDown
+ grbVRDP
+ leVRDPPort
+ cbVRDPAuthType
+ leVRDPTimeout
buttonHelp
buttonOk
@@ -2397,4 +2635,5 @@
QIWidgetValidator *wvalDVD;
QIWidgetValidator *wvalFloppy;
+ QIWidgetValidator *wvalVRDP;
QUuid uuidHDA;
QUuid uuidHDB;
Index: /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h (revision 283)
+++ /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h (revision 284)
@@ -457,4 +457,25 @@
mUSBFilterListModified = false;
+ /* VRDP Page */
+
+ QWhatsThis::add (static_cast (grbVRDP->child ("qt_groupbox_checkbox")),
+ tr ("When checked, enables the Virtual Remote Desktop "
+ "Protocol which allows remote clients to connect "
+ "to this virtual machine (when it is running) "
+ "using a VRDP client."));
+
+ ULONG maxPort = 65535;
+ leVRDPPort->setValidator (new QIntValidator (0, maxPort, this));
+ leVRDPTimeout->setValidator (new QIntValidator (0, maxPort, this));
+ wvalVRDP = new QIWidgetValidator (pageVRDP, this);
+ connect (wvalVRDP, SIGNAL (validityChanged (const QIWidgetValidator *)),
+ this, SLOT (enableOk (const QIWidgetValidator *)));
+ connect (wvalVRDP, SIGNAL (isValidRequested (QIWidgetValidator *)),
+ this, SLOT (revalidate( QIWidgetValidator *)));
+
+ connect (grbVRDP, SIGNAL (toggled (bool)), wvalFloppy, SLOT (revalidate()));
+ connect (leVRDPPort, SIGNAL (textChanged (const QString&)), wvalFloppy, SLOT (revalidate()));
+ connect (leVRDPTimeout, SIGNAL (textChanged (const QString&)), wvalFloppy, SLOT (revalidate()));
+
/*
* set initial values
@@ -557,4 +578,12 @@
wvalDVD->revalidate();
wvalFloppy->revalidate();
+
+ /* VRDP Page */
+
+ leVRDPPort->setAlignment (Qt::AlignRight);
+ cbVRDPAuthType->insertItem (vboxGlobal().toString (CEnums::VRDPAuthNull));
+ cbVRDPAuthType->insertItem (vboxGlobal().toString (CEnums::VRDPAuthExternal));
+ cbVRDPAuthType->insertItem (vboxGlobal().toString (CEnums::VRDPAuthGuest));
+ leVRDPTimeout->setAlignment (Qt::AlignRight);
}
@@ -938,4 +967,13 @@
setWarning (tr ("Incorrect host network interface is selected for Adapter %1.")
.arg (slot));
+ }
+ else if (pg == pageVRDP)
+ {
+ valid = !(grbVRDP->isChecked() &&
+ (leVRDPPort->text().isEmpty() || leVRDPTimeout->text().isEmpty()));
+ if (!valid && leVRDPPort->text().isEmpty())
+ setWarning (tr ("VRDP Port is not set."));
+ if (!valid && leVRDPTimeout->text().isEmpty())
+ setWarning (tr ("VRDP Timeout is not set."));
}
@@ -1210,4 +1248,13 @@
}
+ /* vrdp */
+ {
+ CVRDPServer vrdp = machine.GetVRDPServer();
+ grbVRDP->setChecked (vrdp.GetEnabled());
+ leVRDPPort->setText (QString::number (vrdp.GetPort()));
+ cbVRDPAuthType->setCurrentText (vboxGlobal().toString (vrdp.GetAuthType()));
+ leVRDPTimeout->setText (QString::number (vrdp.GetAuthTimeout()));
+ }
+
/* request for media shortcuts update */
cbHDA->setBelongsTo(machine.GetId());
@@ -1425,4 +1472,13 @@
}
+ /* vrdp */
+ {
+ CVRDPServer vrdp = cmachine.GetVRDPServer();
+ vrdp.SetEnabled (grbVRDP->isChecked());
+ vrdp.SetPort (leVRDPPort->text().toULong());
+ vrdp.SetAuthType (vboxGlobal().toVRDPAuthType (cbVRDPAuthType->currentText()));
+ vrdp.SetAuthTimeout (leVRDPTimeout->text().toULong());
+ }
+
return COMResult();
}