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

Timestamp:

Feb 7, 2007 5:46:35 PM (18 years ago)

Author:

vboxsync

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

18420

Message:

FE/Qt: Added VRDP UI to the VM Console window.

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxConsoleWnd.h (modified) (8 diffs)
• VBoxGlobal.h (modified) (1 diff)

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

@@ -44 +44 @@
 class QIStateIndicator;
 
+class VBoxUSBMenu;
 class VBoxUSBLedTip;
 
@@ -94 +95 @@
         Caption                     = 0x40,
         USBStuff                    = 0x80,
+        VRDPStuff                   = 0x100,
         AllStuff                    = 0xFF,
     };
@@ -122 +124 @@
     void devicesMountDVDImage();
     void devicesUnmountDVD();
+    void devicesSwitchVrdp();
     void devicesInstallGuestAdditions();
 
     void prepareFloppyMenu();
     void prepareDVDMenu();
-    void prepareUSBMenu();
+    void prepareVRDPMenu();
 
     void captureFloppy (int id);
     void captureDVD (int id);
     void switchUSB (int id);
-    void makeUSBToolTip (int id);
 
     void showIndicatorContextMenu (QIStateIndicator *ind, QContextMenuEvent *e);
@@ -171 +173 @@
     QAction *devicesMountDVDImageAction;
     QAction *devicesUnmountDVDAction;
+    QAction *devicesSwitchVrdpAction;
     QAction *devicesInstallGuestToolsAction;
 
@@ -188 +191 @@
     QPopupMenu *devicesMountFloppyMenu;
     QPopupMenu *devicesMountDVDMenu;
-    QPopupMenu *devicesUSBMenu;
+    VBoxUSBMenu *devicesUSBMenu;
+    QPopupMenu *devicesVRDPMenu;
+
+    int devicesUSBMenuSeparatorId;
+    int devicesVRDPMenuSeparatorId;
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -202 +209 @@
         devicesMountDVDMenuId,
         devicesUSBMenuId,
-        devicesUSBMenuNoDevicesId,
 #ifdef VBOX_WITH_DEBUGGER_GUI
         dbgMenuId,
@@ -216 +222 @@
     QIStateIndicator *mouse_state, *hostkey_state;
     QIStateIndicator *autoresize_state;
+    QIStateIndicator *vrdp_state;
     QHBox *hostkey_hbox;
     QLabel *hostkey_name;
@@ -229 +236 @@
     QMap <int, CHostDVDDrive> hostDVDMap;
     QMap <int, CHostFloppyDrive> hostFloppyMap;
-    QMap <int, CUSBDevice> hostUSBMap;
 
     QPoint normal_pos;

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

@@ -507 +507 @@
     enum { USBDevicesMenuNoDevicesId = 1 };
 
-    VBoxUSBMenu (QWidget *aParent) : QPopupMenu (aParent)
-    {
-        connect (this, SIGNAL (aboutToShow()),
-                 this, SLOT   (processAboutToShow()));
-        connect (this, SIGNAL (highlighted (int)),
-                 this, SLOT   (processHighlighted (int)));
-    }
-
-    const CUSBDevice& getUSB (int aIndex)
-    {
-        return usbDevicesMap [aIndex];
-    }
+    VBoxUSBMenu (QWidget *);
+
+    const CUSBDevice& getUSB (int);
+
+    void setConsole (const CConsole &);
 
 private slots:
 
-    void processAboutToShow()
-    {
-        clear(), usbDevicesMap.clear();
-        CHost host = vboxGlobal().virtualBox().GetHost();
-
-        bool isUSBEmpty = host.GetUSBDevices().GetCount() == 0;
-        if (isUSBEmpty)
-        {
-            insertItem (
-                tr ("<no available devices>", "USB devices"),
-                USBDevicesMenuNoDevicesId);
-            setItemEnabled (USBDevicesMenuNoDevicesId, false);
-        }
-        else
-        {
-            CHostUSBDeviceEnumerator en = host.GetUSBDevices().Enumerate();
-            while (en.HasMore())
-            {
-                CHostUSBDevice iterator = en.GetNext();
-                CUSBDevice usb = CUnknown (iterator);
-                int id = insertItem (vboxGlobal().details (usb));
-                usbDevicesMap [id] = usb;
-            }
-        }
-    }
-
-    void processHighlighted (int aIndex)
-    {
-        /* the <no available devices> item is highlighted */
-        if (aIndex == USBDevicesMenuNoDevicesId)
-        {
-            QToolTip::add (this,
-                tr ("No supported devices connected to the host PC",
-                    "USB device tooltip"));
-            return;
-        }
-
-        CUSBDevice usb = usbDevicesMap [aIndex];
-        /* if null then some other item but a USB device is highlighted */
-        if (usb.isNull())
-        {
-            QToolTip::remove (this);
-            return;
-        }
-
-        QToolTip::remove (this);
-        QToolTip::add (this, vboxGlobal().toolTip (usb));
-    }
+    void processAboutToShow();
+
+    void processHighlighted (int);
 
 private:
 
-    QMap <int, CUSBDevice> usbDevicesMap;
+    QMap <int, CUSBDevice> mUSBDevicesMap;
+    CConsole mConsole;
 };