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

Timestamp:

Aug 14, 2007 8:21:59 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23624

Message:

2224: DVD attachments missed by the GUI:

GUI support for onDVDDriveChange() & onFloppyDriveChange() notifications implemented.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (1 diff)
• include/VBoxConsoleWnd.h (modified) (1 diff)
• include/VBoxDefs.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (4 diffs)
• src/VBoxConsoleWnd.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -97 +97 @@
     void machineStateChanged (CEnums::MachineState state);
     void additionsStateChanged (const QString &, bool, bool);
+    void dvdfdChanged (VBoxDefs::DiskType aType);
 
 protected:

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -172 +172 @@
     void updateAdditionsState (const QString&, bool, bool);
 
+    void updateDVDFDState (VBoxDefs::DiskType aType);
+
     void tryClose();
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxDefs.h

@@ -129 +129 @@
         MachineStateChangeEventType,
         AdditionsStateChangeEventType,
+        DVDFDChangeEventType,
         MachineDataChangeEventType,
         MachineRegisteredEventType,

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

@@ -243 +243 @@
 };
 
+/** DVD/FD change event */
+class DVDFDChangeEvent : public QEvent
+{
+public:
+    DVDFDChangeEvent (VBoxDefs::DiskType aType)
+        : QEvent ((QEvent::Type) VBoxDefs::DVDFDChangeEventType)
+        , mType (aType) {}
+    VBoxDefs::DiskType diskType() const { return mType; }
+private:
+    VBoxDefs::DiskType mType;
+};
+
 /** Menu activation event */
 class ActivateMenuEvent : public QEvent
@@ -406 +418 @@
     STDMETHOD(OnDVDDriveChange)()
     {
-        LogTrace();
+        LogFlowFunc (("DVD Drive changed\n"));
+        QApplication::postEvent (mView, new DVDFDChangeEvent (VBoxDefs::CD));
         return S_OK;
     }
@@ -412 +425 @@
     STDMETHOD(OnFloppyDriveChange)()
     {
+        LogFlowFunc (("Floppy Drive changed\n"));
+        QApplication::postEvent (mView, new DVDFDChangeEvent (VBoxDefs::FD));
         return S_OK;
     }
@@ -1083 +1098 @@
                                             ge->additionActive(),
                                             ge->supportsSeamless());
+                return true;
+            }
+
+            case VBoxDefs::DVDFDChangeEventType:
+            {
+                DVDFDChangeEvent *ev = (DVDFDChangeEvent *) e;
+                LogFlowFunc (("DVDFDChangeEvent\n"));
+
+                emit dvdfdChanged (ev->diskType());
                 return true;
             }

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

@@ -856 +856 @@
     connect (console, SIGNAL (additionsStateChanged (const QString&, bool, bool)),
              this, SLOT (updateAdditionsState (const QString &, bool, bool)));
+    connect (console, SIGNAL (dvdfdChanged (VBoxDefs::DiskType)),
+             this, SLOT (updateDVDFDState (VBoxDefs::DiskType)));
 
 #ifdef Q_WS_MAC
@@ -2225 +2227 @@
                     vboxProblem().cannotSaveMachineSettings (m);
             }
-            updateAppearanceOf (FloppyStuff);
         }
     }
@@ -2245 +2246 @@
                 vboxProblem().cannotSaveMachineSettings (m);
         }
-        updateAppearanceOf (FloppyStuff);
     }
 }
@@ -2271 +2271 @@
                     vboxProblem().cannotSaveMachineSettings (m);
             }
-            updateAppearanceOf (DVDStuff);
         }
     }
@@ -2293 +2292 @@
                 vboxProblem().cannotSaveMachineSettings (m);
         }
-        updateAppearanceOf (DVDStuff);
     }
 }
@@ -2396 +2394 @@
     /// @todo (r=dmik) use VBoxProblemReporter::cannotMountMedia...
     AssertWrapperOk (drv);
-    if (drv.isOk())
-        updateAppearanceOf (DVDStuff);
 }
 
@@ -2607 +2603 @@
                 vboxProblem().cannotSaveMachineSettings (m);
         }
-        updateAppearanceOf (FloppyStuff);
     }
 }
@@ -2635 +2630 @@
                 vboxProblem().cannotSaveMachineSettings (m);
         }
-        updateAppearanceOf (DVDStuff);
     }
 }
@@ -2896 +2890 @@
 }
 
+void VBoxConsoleWnd::updateDVDFDState (VBoxDefs::DiskType aType)
+{
+    Assert (aType == VBoxDefs::CD || aType == VBoxDefs::FD);
+    updateAppearanceOf (aType == VBoxDefs::CD ? DVDStuff :
+                        aType == VBoxDefs::FD ? FloppyStuff : AllStuff);
+}
+
 /**
  *  Helper to safely close the main console window.