Changeset 281 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Jan 24, 2007 4:42:35 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixes and enhancements to the USB device menus (tooltips, error reporting etc.).

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxConsoleWnd.h (modified) (1 diff)
• VBoxGlobal.h (modified) (6 diffs)
• VBoxProblemReporter.h (modified) (1 diff)

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

@@ -202 +202 @@
         devicesMountDVDMenuId,
         devicesUSBMenuId,
+        devicesUSBMenuNoDevicesId,
 #ifdef VBOX_WITH_DEBUGGER_GUI
         dbgMenuId,

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

@@ -278 +278 @@
     }
 
+    QString toString (CEnums::USBDeviceState aState) const
+    {
+        AssertMsg (!USBDeviceStates [aState].isNull(), ("No text for %d", aState));
+        return USBDeviceStates [aState];
+    }
+
     QPixmap snapshotIcon (bool online) const
     {
@@ -283 +289 @@
     }
 
-    // details generators
+    /* details generators */
 
     QString details (const CHardDisk &aHD, bool aPredict = false) const;
 
+    QString details (const CUSBDevice &aDevice) const;
+    QString toolTip (const CUSBDevice &aDevice) const;
+
     QString prepareFileNameForHTML (const QString &fn) const;
 
     QString detailsReport (const CMachine &m, bool isNewVM, bool withLinks) const;
 
-    // VirtualBox helpers
+    /* VirtualBox helpers */
 
     CSession openSession (const QUuid &id);
@@ -304 +313 @@
     VBoxMediaList currentMediaList() const { return media_list; }
 
-    // various helpers
+    /* various helpers */
 
     void languageChange();
 
-    void cleanup(); // made public for internal purposes
-
-    // public static stuff
+    /* made public for internal purposes */
+    void cleanup();
+
+    /* public static stuff */
 
     static QIconSet iconSet (const char *aNormal,
@@ -345 +355 @@
     void mediaEnumerated (const VBoxMediaList &list);
 
-    // signals emitted when the VirtualBox callback is called by the server
-    // (not that currently these signals are emitted only when the application
-    //  is the in the VM selector mode)
+    /* signals emitted when the VirtualBox callback is called by the server
+     * (not that currently these signals are emitted only when the application
+     * is the in the VM selector mode) */
 
     void machineStateChanged (const VBoxMachineStateChangeEvent &e);
@@ -414 +424 @@
     QStringVector audioDriverTypes;
     QStringVector networkAttachmentTypes;
+    QStringVector USBDeviceStates;
 
     mutable bool detailReportTemplatesReady;
@@ -423 +434 @@
 inline VBoxGlobal &vboxGlobal() { return VBoxGlobal::instance(); }
 
-#endif // __VBoxGlobal_h__
-
+#endif /* __VBoxGlobal_h__ */
+

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

@@ -180 +180 @@
 #endif
 
+    void cannotAttachUSBDevice (const CConsole &console, const QString &device);
+    void cannotDetachUSBDevice (const CConsole &console, const QString &device);
+
     bool confirmReleaseImage (QWidget*, QString);