Changeset 4131 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 13, 2007 2:04:12 PM (17 years ago)

Author:

vboxsync

Message:

Main/Frontends: Added missing IConsoleCallback notifications (onDVDDriveChange, onFloppyDriveChange, onNetworkAdapterChange, onSerialPortChange, onParallelPortChange, onVRDPServerChange, onUSBControllerChange, onSharedFolderChange) to track third party configuration requests in frontends.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxSDL/VBoxSDL.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxConsoleView.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -435 +435 @@
     }
 
-    STDMETHOD(OnStateChange)(MachineState_T machineState)
-    {
-        LogFlow(("OnStateChange: machineState = %d (%s)\n", machineState, GetStateName(machineState)));
-        SDL_Event event = {0};
-
-        if (     machineState == MachineState_Aborted
-            ||  (machineState == MachineState_Saved      && !m_fIgnorePowerOffEvents)
-            ||  (machineState == MachineState_PoweredOff && !m_fIgnorePowerOffEvents))
-        {
-            /*
-             * We have to inform the SDL thread that the application has be terminated
-             */
-            event.type      = SDL_USEREVENT;
-            event.user.type = SDL_USER_EVENT_TERMINATE;
-            event.user.code = machineState == MachineState_Aborted
-                                           ? VBOXSDL_TERM_ABEND
-                                           : VBOXSDL_TERM_NORMAL;
-        }
-        else
-        {
-            /*
-             * Inform the SDL thread to refresh the titlebar
-             */
-            event.type      = SDL_USEREVENT;
-            event.user.type = SDL_USER_EVENT_UPDATE_TITLEBAR;
-        }
-
-        PushSDLEventForSure(&event);
-        return S_OK;
-    }
-
-    STDMETHOD(OnAdditionsStateChange)()
-    {
-        return S_OK;
-    }
-
     STDMETHOD(OnKeyboardLedsChange)(BOOL fNumLock, BOOL fCapsLock, BOOL fScrollLock)
     {
@@ -484 +448 @@
     }
 
-    STDMETHOD(OnUSBDeviceStateChange)(IUSBDevice *device, BOOL attached,
-                                      IVirtualBoxErrorInfo *message)
+    STDMETHOD(OnStateChange)(MachineState_T machineState)
+    {
+        LogFlow(("OnStateChange: machineState = %d (%s)\n", machineState, GetStateName(machineState)));
+        SDL_Event event = {0};
+
+        if (     machineState == MachineState_Aborted
+            ||  (machineState == MachineState_Saved      && !m_fIgnorePowerOffEvents)
+            ||  (machineState == MachineState_PoweredOff && !m_fIgnorePowerOffEvents))
+        {
+            /*
+             * We have to inform the SDL thread that the application has be terminated
+             */
+            event.type      = SDL_USEREVENT;
+            event.user.type = SDL_USER_EVENT_TERMINATE;
+            event.user.code = machineState == MachineState_Aborted
+                                           ? VBOXSDL_TERM_ABEND
+                                           : VBOXSDL_TERM_NORMAL;
+        }
+        else
+        {
+            /*
+             * Inform the SDL thread to refresh the titlebar
+             */
+            event.type      = SDL_USEREVENT;
+            event.user.type = SDL_USER_EVENT_UPDATE_TITLEBAR;
+        }
+
+        PushSDLEventForSure(&event);
+        return S_OK;
+    }
+
+    STDMETHOD(OnAdditionsStateChange)()
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnDVDDriveChange)()
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnFloppyDriveChange)()
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnNetworkAdapterChange) (INetworkAdapter *aNetworkAdapter)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnSerialPortChange) (ISerialPort *aSerialPort)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnParallelPortChange) (IParallelPort *aParallelPort)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnVRDPServerChange)()
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnUSBControllerChange)()
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnUSBDeviceStateChange) (IUSBDevice *aDevice, BOOL aAttached,
+                                      IVirtualBoxErrorInfo *aError)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnSharedFolderChange) (Scope_T aScope)
     {
         return S_OK;

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

@@ -372 +372 @@
     }
 
+    STDMETHOD(OnKeyboardLedsChange)(BOOL fNumLock, BOOL fCapsLock, BOOL fScrollLock)
+    {
+        QApplication::postEvent (mView,
+                                 new ModifierKeyChangeEvent (fNumLock, fCapsLock,
+                                                             fScrollLock));
+        return S_OK;
+    }
+
     STDMETHOD(OnStateChange)(MachineState_T machineState)
     {
@@ -396 +404 @@
     }
 
-    STDMETHOD(OnKeyboardLedsChange)(BOOL fNumLock, BOOL fCapsLock, BOOL fScrollLock)
-    {
-        QApplication::postEvent (mView,
-                                 new ModifierKeyChangeEvent (fNumLock, fCapsLock,
-                                                             fScrollLock));
+    STDMETHOD(OnDVDDriveChange)()
+    {
+        LogTrace();
         return S_OK;
     }
 
-    STDMETHOD(OnUSBDeviceStateChange)(IUSBDevice *device, BOOL attached,
-                                      IVirtualBoxErrorInfo *error)
+    STDMETHOD(OnFloppyDriveChange)()
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnNetworkAdapterChange) (INetworkAdapter *aNetworkAdapter)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnSerialPortChange) (ISerialPort *aSerialPort)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnParallelPortChange) (IParallelPort *aParallelPort)
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnVRDPServerChange)()
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnUSBControllerChange)()
+    {
+        return S_OK;
+    }
+
+    STDMETHOD(OnUSBDeviceStateChange)(IUSBDevice *aDevice, BOOL aAttached,
+                                      IVirtualBoxErrorInfo *aError)
     {
         QApplication::postEvent (mView,
                                  new USBDeviceStateChangeEvent (
-                                     CUSBDevice (device),
-                                     bool (attached),
-                                     CVirtualBoxErrorInfo (error)));
+                                     CUSBDevice (aDevice),
+                                     bool (aAttached),
+                                     CVirtualBoxErrorInfo (aError)));
+        return S_OK;
+    }
+
+    STDMETHOD(OnSharedFolderChange) (Scope_T aScope)
+    {
         return S_OK;
     }