Changeset 441 in vbox for trunk/src/VBox

Timestamp:

Jan 30, 2007 6:07:31 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Disabled VRDP UI when IMachine::VRDPServer is not available (i.e. in OSE).

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h (modified) (6 diffs)
• Main/ConsoleImpl.cpp (modified) (2 diffs)
• Main/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -974 +974 @@
     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."));
+        if (pageVRDP->isEnabled())
+        {
+            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."));
+        }
+        else
+            valid = true;
     }
 
@@ -1232 +1237 @@
                 usbItem->setVisible (false);
 
+            /* disable validators if any */
+            pageUSB->setEnabled (false);
+
             /* if machine has something to say, show the message */
             vboxProblem().cannotLoadMachineSettings (machine, false /* strict */);
@@ -1244 +1252 @@
 
             lvUSBFilters->setCurrentItem (lvUSBFilters->firstChild());
-            /*
-             *  silly, silly Qt -- doesn't emit currentChanged after adding the
-             *  first item to an empty list
-             */
+            /* silly Qt -- doesn't emit currentChanged after adding the
+             * first item to an empty list */
             lvUSBFilters_currentChanged (lvUSBFilters->firstChild());
         }
@@ -1255 +1261 @@
     {
         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()));
+
+        if (vrdp.isNull())
+        {
+            /* disable the VRDP category if VRDP is
+             * not available (i.e. in VirtualBox OSE) */
+
+            QListViewItem *vrdpItem = listView->findItem ("#vrdp", listView_Link);
+            Assert (vrdpItem);
+            if (vrdpItem)
+                vrdpItem->setVisible (false);
+
+            /* disable validators if any */
+            pageVRDP->setEnabled (false);
+
+            /* if machine has something to say, show the message */
+            vboxProblem().cannotLoadMachineSettings (machine, false /* strict */);
+        }
+        else
+        {
+            grbVRDP->setChecked (vrdp.GetEnabled());
+            leVRDPPort->setText (QString::number (vrdp.GetPort()));
+            cbVRDPAuthType->setCurrentText (vboxGlobal().toString (vrdp.GetAuthType()));
+            leVRDPTimeout->setText (QString::number (vrdp.GetAuthTimeout()));
+        }
     }
 
@@ -1271 +1297 @@
     wvalDVD->revalidate();
     wvalFloppy->revalidate();
+    wvalVRDP->revalidate();
 }
 
@@ -1479 +1506 @@
     {
         CVRDPServer vrdp = cmachine.GetVRDPServer();
-        vrdp.SetEnabled (grbVRDP->isChecked());
-        vrdp.SetPort (leVRDPPort->text().toULong());
-        vrdp.SetAuthType (vboxGlobal().toVRDPAuthType (cbVRDPAuthType->currentText()));
-        vrdp.SetAuthTimeout (leVRDPTimeout->text().toULong());
+
+        if (!vrdp.isNull())
+        {
+            /* VRDP may be unavailable (i.e. in VirtualBox OSE) */
+            vrdp.SetEnabled (grbVRDP->isChecked());
+            vrdp.SetPort (leVRDPPort->text().toULong());
+            vrdp.SetAuthType (vboxGlobal().toVRDPAuthType (cbVRDPAuthType->currentText()));
+            vrdp.SetAuthTimeout (leVRDPTimeout->text().toULong());
+        }
     }
 

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -258 +258 @@
     AssertComRCReturn (rc, rc);
 
+#ifdef VBOX_VRDP
     rc = mMachine->COMGETTER(VRDPServer) (unconst (mVRDPServer).asOutParam());
     AssertComRCReturn (rc, rc);
+#endif    
 
     rc = mMachine->COMGETTER(DVDDrive) (unconst (mDVDDrive).asOutParam());
@@ -410 +412 @@
     unconst (mFloppyDrive).setNull();
     unconst (mDVDDrive).setNull();
+#ifdef VBOX_VRDP
     unconst (mVRDPServer).setNull();
+#endif
 
     unconst (mControl).setNull();

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1046 +1046 @@
 STDMETHODIMP Machine::COMGETTER(VRDPServer)(IVRDPServer **vrdpServer)
 {
+#ifdef VBOX_VRDP
     if (!vrdpServer)
         return E_POINTER;
@@ -1054 +1055 @@
     AutoReaderLock alock (this);
 
-#ifdef VBOX_VRDP
     Assert (!!mVRDPServer);
     mVRDPServer.queryInterfaceTo (vrdpServer);
+
+    return S_OK;
 #else
-    *vrdpServer = NULL;
+    return E_NOTIMPL;
 #endif
-
-    return S_OK;
 }