Changeset 2463 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 3, 2007 1:53:29 PM (18 years ago)

Author:

vboxsync

Message:

Main & All Frontends: Prototyped a bunch of Main API changes (IVirtualBoxErrorInfo extension for cascading errors; IMachine/IConsoleCallback extension to properly activate the console window; IVirtualBoxCallback::onExtraDataCanChange() support for error messages; minor IHost::createUSBDeviceFilter/removeUSBDeviceFilter corrections).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/VBoxConsoleView.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (2 diffs)
• src/VBoxGlobalSettings.cpp (modified) (2 diffs)
• ui/VBoxGlobalSettingsDlg.ui.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -367 +367 @@
                                          QString::fromUcs2 (message)));
         return S_OK;
+    }
+
+    STDMETHOD(OnCanShowWindow)(BOOL *canShow)
+    {
+        if (!canShow)
+            return E_POINTER;
+        /* @todo return TRUE... */
+        *canShow = FALSE;
+        return S_OK;
+    }
+
+    STDMETHOD(OnShowWindow)()
+    {
+        /* @todo implement */
+        return E_NOTIMPL;
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -174 +174 @@
     STDMETHOD(OnExtraDataCanChange)(IN_GUIDPARAM id,
                                     IN_BSTRPARAM key, IN_BSTRPARAM value,
-                                    BOOL *allowChange)
-    {
-        if (!allowChange)
+                                    BSTR *error, BOOL *allowChange)
+    {
+        if (!error || !allowChange)
             return E_INVALIDARG;
 
         if (COMBase::toQUuid (id).isNull())
         {
-            // it's a global extra data key someone wants to change
+            /* it's a global extra data key someone wants to change */
             QString sKey = QString::fromUcs2 (key);
             QString sVal = QString::fromUcs2 (value);
             if (sKey.startsWith ("GUI/"))
             {
-                // try to set the global setting to check its syntax
+                /* try to set the global setting to check its syntax */
                 VBoxGlobalSettings gs (false /* non-null */);
                 if (gs.setPublicProperty (sKey, sVal))
                 {
-                    /// @todo (dmik)
-                    //  report the error message to the server using
-                    //  IVurtualBoxError
-                    *allowChange = !!gs; // allow only when no error
+                    /* this is a known GUI property key */
+                    if (!gs)
+                    {
+                        /* disallow the change when there is an error*/
+                        *error = SysAllocString ((const OLECHAR *)
+                                                 gs.lastError().ucs2());
+                        *allowChange = FALSE;
+                    }
+                    else
+                        *allowChange = TRUE;
                     return S_OK;
                 }
@@ -199 +205 @@
         }
 
-        // not interested in this key -- never disagree
+        /* not interested in this key -- never disagree */
         *allowChange = TRUE;
         return S_OK;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp

@@ -197 +197 @@
 
 /**
- *  Sets a value of the property with the given public name.
- *  Returns false if such property is not found, and true otherwise.
+ *  Sets a value of a property with the given public name.
+ *  Returns false if the specified property is not found, and true otherwise.
  *
  *  This method (as opposed to #setProperty (const char *name, const QVariant& value))
@@ -204 +204 @@
  *
  *  If an error occures while setting the value of the property, #operator !()
- *  will return false after this method returns, and #lastError() will contain
+ *  will return false after this method returns true, and #lastError() will contain
  *  the error message.
  *

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

@@ -656 +656 @@
      */
     CHost host = vboxGlobal().virtualBox().GetHost();
-    CHostUSBDeviceFilter removedFilter;
     if (mUSBFilterListModified)
-        for (ulong count = host.GetUSBDeviceFilters().GetCount(); count; -- count)
-            host.RemoveUSBDeviceFilter (0, removedFilter);
+        for (ulong cnt = host.GetUSBDeviceFilters().GetCount(); cnt; -- cnt)
+            host.RemoveUSBDeviceFilter (0);
 
     /* then add all new filters */
@@ -877 +876 @@
     }
 
-    /* creating new usb filter */
-    CHostUSBDeviceFilter hostFilter;
-    vboxGlobal().virtualBox().GetHost().CreateUSBDeviceFilter (
-        usbFilterName.arg (maxFilterIndex + 1), hostFilter);
+    /* create a new usb filter */
+    CHost host = vboxGlobal().virtualBox().GetHost();
+    CHostUSBDeviceFilter hostFilter = host
+        .CreateUSBDeviceFilter (usbFilterName.arg (maxFilterIndex + 1));
     hostFilter.SetAction (CEnums::USBDeviceFilterHold);
 
@@ -904 +903 @@
 
     CHost host = vboxGlobal().virtualBox().GetHost();
-    CHostUSBDeviceFilter hostFilter;
-    host.CreateUSBDeviceFilter (vboxGlobal().details (usb), hostFilter);
+    CHostUSBDeviceFilter hostFilter = host
+        .CreateUSBDeviceFilter (vboxGlobal().details (usb));
     hostFilter.SetAction (CEnums::USBDeviceFilterHold);