VirtualBox

Changeset 7678 in vbox


Ignore:
Timestamp:
Apr 1, 2008 12:33:40 PM (17 years ago)
Author:
vboxsync
Message:

FE/Qt4: Ported the Console Window to Qt4.

Location:
trunk/src/VBox/Frontends/VirtualBox4
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h

    r7599 r7678  
    156156    void prepareNetworkMenu();
    157157
    158     void setDynamicMenuItemStatusTip (int aId);
    159 
    160     void captureFloppy (int aId);
    161     void captureDVD (int aId);
    162     void activateNetworkMenu (int aId);
    163     void switchUSB (int aId);
     158    void setDynamicMenuItemStatusTip (QAction *aAction);
     159
     160    void captureFloppy (QAction *aAction);
     161    void captureDVD (QAction *aAction);
     162    void activateNetworkMenu (QAction *aAction);
     163    void switchUSB (QAction *aAction);
    164164
    165165    void statusTipChanged (const QString &);
    … …  
    243243
    244244    // Devices popup menus
    245     QMenu *devicesMenu;
    246     QMenu *devicesMountFloppyMenu;
    247     QMenu *devicesMountDVDMenu;
    248     QMenu *devicesSFMenu;
    249     QMenu *devicesNetworkMenu;
    250     VBoxUSBMenu *devicesUSBMenu;
    251     VBoxSwitchMenu *devicesVRDPMenu;
    252 
    253     int devicesUSBMenuSeparatorId;
    254     int devicesVRDPMenuSeparatorId;
    255     int devicesSFMenuSeparatorId;
    256 
    257245    bool waitForStatusBarChange;
    258246    bool statusBarChangedInside;
    259247
    260     QSpacerItem *mShiftingSpacerLeft;
    261     QSpacerItem *mShiftingSpacerTop;
    262     QSpacerItem *mShiftingSpacerRight;
    263     QSpacerItem *mShiftingSpacerBottom;
    264     QSize mMaskShift;
    265 
     248    QAction *mDevicesUSBMenuSeparator;
     249    QAction *mDevicesVRDPMenuSeparator;
     250    QAction *mDevicesSFMenuSeparator;
     251
     252    QMenu *mVMMenu;
     253    QMenu *mDevicesMenu;
     254    QMenu *mDevicesMountFloppyMenu;
     255    QMenu *mDevicesMountDVDMenu;
     256    /* see showIndicatorContextMenu for a description of mDevicesSFMenu */
     257    /* QMenu *mDevicesSFMenu; */
     258    QMenu *mDevicesNetworkMenu;
     259    VBoxUSBMenu *mDevicesUSBMenu;
     260    /* VBoxSwitchMenu *mDevicesVRDPMenu; */
    266261#ifdef VBOX_WITH_DEBUGGER_GUI
    267262    // Debugger popup menu
    268     Q3PopupMenu *dbgMenu;
    269 #endif
     263    QMenu *mDbgMenu;
     264#endif
     265    QMenu *mHelpMenu;
    270266
    271267    // Menu identifiers
    … …  
    283279    };
    284280
     281    QSpacerItem *mShiftingSpacerLeft;
     282    QSpacerItem *mShiftingSpacerTop;
     283    QSpacerItem *mShiftingSpacerRight;
     284    QSpacerItem *mShiftingSpacerBottom;
     285    QSize mMaskShift;
     286
    285287    CSession csession;
    286288
    … …  
    300302    bool no_auto_close : 1;
    301303
    302     QMap <int, CHostDVDDrive> hostDVDMap;
    303     QMap <int, CHostFloppyDrive> hostFloppyMap;
     304    QMap <QAction *, CHostDVDDrive> hostDVDMap;
     305    QMap <QAction *, CHostFloppyDrive> hostFloppyMap;
    304306
    305307    QPoint normal_pos;

  • trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

    r7643 r7678  
    3131#include <qthread.h>
    3232#include <q3popupmenu.h>
     33#include <QMenu>
    3334#include <qtooltip.h>
    3435
    … …  
    717718 *  This class provides the list of USB devices attached to the host.
    718719 */
    719 class VBoxUSBMenu : public Q3PopupMenu
     720class VBoxUSBMenu : public QMenu
    720721{
    721722    Q_OBJECT
    … …  
    723724public:
    724725
    725     enum { USBDevicesMenuNoDevicesId = 1 };
    726 
    727726    VBoxUSBMenu (QWidget *);
    728727
    729     const CUSBDevice& getUSB (int);
     728    const CUSBDevice& getUSB (QAction *aAction);
    730729
    731730    void setConsole (const CConsole &);
    … …  
    735734    void processAboutToShow();
    736735
    737     void processHighlighted (int);
    738 
    739736private:
    740 
    741     QMap <int, CUSBDevice> mUSBDevicesMap;
     737    bool event(QEvent *aEvent);
     738
     739    QMap <QAction *, CUSBDevice> mUSBDevicesMap;
    742740    CConsole mConsole;
    743741};
    744 
    745742
    746743/**

  • trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

    r7669 r7678  
    118118    , mIsSeamless (false)
    119119    , mIsSeamlessSupported (false)
    120 #warning port me
    121 //    , normal_wflags (getWFlags())
    122120    , was_max (false)
    123121    , console_style (0)
    … …  
    283281    /* Machine submenu */
    284282
    285     QMenu *vmMenu = new QMenu (this);
     283    mVMMenu = menuBar()->addMenu (QString::null);
     284    mMainMenu->addMenu (mVMMenu);
    286285
    287286    /* dynamic & status line popup menus */
    288     vmAutoresizeMenu = new VBoxSwitchMenu (vmMenu, vmAutoresizeGuestAction);
    289     vmDisMouseIntegrMenu = new VBoxSwitchMenu (vmMenu, vmDisableMouseIntegrAction,
     287    vmAutoresizeMenu = new VBoxSwitchMenu (mVMMenu, vmAutoresizeGuestAction);
     288    vmDisMouseIntegrMenu = new VBoxSwitchMenu (mVMMenu, vmDisableMouseIntegrAction,
    290289                                               true /* inverted toggle state */);
    291290
    292     vmMenu->addAction (vmFullscreenAction);
    293     vmMenu->addAction (vmSeamlessAction);
    294     vmMenu->addAction (vmAdjustWindowAction);
    295     vmMenu->addAction (vmAutoresizeGuestAction);
    296     vmMenu->addSeparator();
    297     vmMenu->addAction (vmDisableMouseIntegrAction);
    298     vmMenu->addSeparator();
    299     vmMenu->addAction (vmTypeCADAction);
     291    mVMMenu->addAction (vmFullscreenAction);
     292    mVMMenu->addAction (vmSeamlessAction);
     293    mVMMenu->addAction (vmAdjustWindowAction);
     294    mVMMenu->addAction (vmAutoresizeGuestAction);
     295    mVMMenu->addSeparator();
     296    mVMMenu->addAction (vmDisableMouseIntegrAction);
     297    mVMMenu->addSeparator();
     298    mVMMenu->addAction (vmTypeCADAction);
    300299#if defined(Q_WS_X11)
    301     vmMenu->addAction (vmTypeCABSAction);
    302 #endif
    303     vmMenu->addSeparator();
    304     vmMenu->addAction (vmTakeSnapshotAction);
    305     vmMenu->addSeparator();
    306     vmMenu->addAction (vmShowInformationDlgAction);
    307     vmMenu->addSeparator();
    308     vmMenu->addAction (vmResetAction);
    309     vmMenu->addAction (vmPauseAction);
    310     vmMenu->addAction (vmACPIShutdownAction);
    311     vmMenu->addSeparator();
    312     vmMenu->addAction (vmCloseAction);
    313 
    314     menuBar()->insertItem (QString::null, vmMenu, vmMenuId);
    315     mMainMenu->insertItem (QString::null, vmMenu, vmMenuId);
     300    mVMMenu->addAction (vmTypeCABSAction);
     301#endif
     302    mVMMenu->addSeparator();
     303    mVMMenu->addAction (vmTakeSnapshotAction);
     304    mVMMenu->addSeparator();
     305    mVMMenu->addAction (vmShowInformationDlgAction);
     306    mVMMenu->addSeparator();
     307    mVMMenu->addAction (vmResetAction);
     308    mVMMenu->addAction (vmPauseAction);
     309    mVMMenu->addAction (vmACPIShutdownAction);
     310    mVMMenu->addSeparator();
     311    mVMMenu->addAction (vmCloseAction);
    316312
    317313    /* Devices submenu */
    318314
    319     devicesMenu = new QMenu (this);
     315    mDevicesMenu = menuBar()->addMenu (QString::null);
     316    mMainMenu->addMenu (mDevicesMenu);
    320317
    321318    /* dynamic & statusline popup menus */
    322     devicesMountFloppyMenu = new QMenu (devicesMenu);
    323     devicesMountDVDMenu = new QMenu (devicesMenu);
    324     devicesSFMenu = new QMenu (devicesMenu);
    325     devicesNetworkMenu = new QMenu (devicesMenu);
    326     devicesUSBMenu = new VBoxUSBMenu (devicesMenu);
    327     devicesVRDPMenu = new VBoxSwitchMenu (devicesMenu, devicesSwitchVrdpAction);
    328 
    329     devicesMenu->insertItem (VBoxGlobal::iconSet (":/cd_16px.png", ":/cd_disabled_16px.png"),
    330         QString::null, devicesMountDVDMenu, devicesMountDVDMenuId);
    331     devicesMenu->addAction (devicesUnmountDVDAction);
    332     devicesMenu->addSeparator();
    333 
    334     devicesMenu->insertItem (VBoxGlobal::iconSet (":/fd_16px.png", ":/fd_disabled_16px.png"),
    335         QString::null, devicesMountFloppyMenu, devicesMountFloppyMenuId);
    336     devicesMenu->addAction (devicesUnmountFloppyAction);
    337     devicesMenu->addSeparator();
    338 
    339     devicesMenu->insertItem (VBoxGlobal::iconSet (":/nw_16px.png", ":/nw_disabled_16px.png"),
    340         QString::null, devicesNetworkMenu, devicesNetworkMenuId);
    341     devicesMenu->addSeparator();
    342 
    343     devicesMenu->insertItem (VBoxGlobal::iconSet (":/usb_16px.png", ":/usb_disabled_16px.png"),
    344         QString::null, devicesUSBMenu, devicesUSBMenuId);
    345     devicesUSBMenuSeparatorId = devicesMenu->insertSeparator();
    346 
    347     devicesMenu->addAction (devicesSFDialogAction);
    348     devicesSFMenuSeparatorId = devicesMenu->insertSeparator();
    349     devicesMenu->addAction (devicesSFDialogAction);
    350 
    351     devicesMenu->addAction (devicesSwitchVrdpAction);
    352     devicesVRDPMenuSeparatorId = devicesMenu->insertSeparator();
    353 
    354     devicesMenu->addAction (devicesInstallGuestToolsAction);
    355 
    356     menuBar()->insertItem (QString::null, devicesMenu, devicesMenuId);
    357     mMainMenu->insertItem (QString::null, devicesMenu, devicesMenuId);
     319
     320    mDevicesMountDVDMenu = mDevicesMenu->addMenu (VBoxGlobal::iconSet (":/cd_16px.png", ":/cd_disabled_16px.png"), QString::null);
     321    mDevicesMenu->addAction (devicesUnmountDVDAction);
     322    mDevicesMenu->addSeparator();
     323
     324    mDevicesMountFloppyMenu = mDevicesMenu->addMenu (VBoxGlobal::iconSet (":/fd_16px.png", ":/fd_disabled_16px.png"), QString::null);
     325    mDevicesMenu->addAction (devicesUnmountFloppyAction);
     326    mDevicesMenu->addSeparator();
     327
     328    mDevicesNetworkMenu = mDevicesMenu->addMenu (VBoxGlobal::iconSet (":/nw_16px.png", ":/nw_disabled_16px.png"), QString::null);
     329    mDevicesMenu->addSeparator();
     330
     331    mDevicesUSBMenu = new VBoxUSBMenu (mDevicesMenu);
     332    mDevicesMenu->addMenu (mDevicesUSBMenu);
     333    mDevicesUSBMenu->setIcon (VBoxGlobal::iconSet (":/usb_16px.png", ":/usb_disabled_16px.png"));
     334    mDevicesUSBMenuSeparator = mDevicesMenu->addSeparator();
     335
     336    /* see showIndicatorContextMenu for a description of mDevicesSFMenu */
     337    /* mDevicesSFMenu = mDevicesMenu->addMenu (QString::null); */
     338    mDevicesMenu->addAction (devicesSFDialogAction);
     339    mDevicesSFMenuSeparator = mDevicesMenu->addSeparator();
     340
     341    /* Currently not needed cause there is no state icon in the statusbar */
     342    /* mDevicesVRDPMenu = new VBoxSwitchMenu (mDevicesMenu, devicesSwitchVrdpAction); */
     343    mDevicesMenu->addAction (devicesSwitchVrdpAction);
     344    mDevicesVRDPMenuSeparator = mDevicesMenu->addSeparator();
     345
     346    mDevicesMenu->addAction (devicesInstallGuestToolsAction);
    358347
    359348    /* reset the "context menu" flag */
    360     devicesMenu->setItemParameter (devicesMountFloppyMenuId, 0);
    361     devicesMenu->setItemParameter (devicesMountDVDMenuId, 0);
    362     devicesMenu->setItemParameter (devicesUSBMenuId, 0);
     349    mDevicesMountFloppyMenu->menuAction()->setData (false);
     350    mDevicesMountDVDMenu->menuAction()->setData (false);
     351    mDevicesUSBMenu->menuAction()->setData (false);
    363352
    364353#ifdef VBOX_WITH_DEBUGGER_GUI
    … …  
    378367    /* Help submenu */
    379368
    380     QMenu *helpMenu = new QMenu (this);
    381 
    382     helpMenu->addAction (helpContentsAction);
    383     helpMenu->addAction (helpWebAction);
    384     helpMenu->addSeparator();
     369    mHelpMenu = menuBar()->addMenu (QString::null);
     370    mMainMenu->addMenu (mHelpMenu);
     371
     372    mHelpMenu->addAction (helpContentsAction);
     373    mHelpMenu->addAction (helpWebAction);
     374    mHelpMenu->addSeparator();
    385375#ifdef VBOX_WITH_REGISTRATION
    386     helpMenu->addAction (helpRegisterAction);
     376    mHelpMenu->addAction (helpRegisterAction);
    387377    helpRegisterAction->setEnabled (vboxGlobal().virtualBox().
    388378        GetExtraData (VBoxDefs::GUI_RegistrationDlgWinID).isEmpty());
    389379#endif
    390     helpMenu->addAction (helpAboutAction);
    391     helpMenu->addSeparator();
    392     helpMenu->addAction (helpResetMessagesAction);
    393 
    394     menuBar()->insertItem( QString::null, helpMenu, helpMenuId );
    395     mMainMenu->insertItem (QString::null, helpMenu, helpMenuId);
     380    mHelpMenu->addAction (helpAboutAction);
     381    mHelpMenu->addSeparator();
     382    mHelpMenu->addAction (helpResetMessagesAction);
    396383
    397384    ///// Status bar ////////////////////////////////////////////////////////
    … …  
    522509
    523510
    524     connect (devicesMountFloppyMenu, SIGNAL(aboutToShow()), this, SLOT(prepareFloppyMenu()));
    525     connect (devicesMountDVDMenu, SIGNAL(aboutToShow()), this, SLOT(prepareDVDMenu()));
    526     connect (devicesNetworkMenu, SIGNAL(aboutToShow()), this, SLOT(prepareNetworkMenu()));
     511    connect (mDevicesMountFloppyMenu, SIGNAL(aboutToShow()), this, SLOT(prepareFloppyMenu()));
     512    connect (mDevicesMountDVDMenu, SIGNAL(aboutToShow()), this, SLOT(prepareDVDMenu()));
     513    connect (mDevicesNetworkMenu, SIGNAL(aboutToShow()), this, SLOT(prepareNetworkMenu()));
    527514
    528515    connect (statusBar(), SIGNAL(messageChanged (const QString &)), this, SLOT(statusTipChanged (const QString &)));
    529516
    530     connect (devicesMountFloppyMenu, SIGNAL(activated(int)), this, SLOT(captureFloppy(int)));
    531     connect (devicesMountDVDMenu, SIGNAL(activated(int)), this, SLOT(captureDVD(int)));
    532     connect (devicesUSBMenu, SIGNAL(activated(int)), this, SLOT(switchUSB(int)));
    533     connect (devicesNetworkMenu, SIGNAL(activated(int)), this, SLOT(activateNetworkMenu(int)));
    534 
    535     connect (devicesMountFloppyMenu, SIGNAL (highlighted (int)),
    536              this, SLOT (setDynamicMenuItemStatusTip (int)));
    537     connect (devicesMountDVDMenu, SIGNAL (highlighted (int)),
    538              this, SLOT (setDynamicMenuItemStatusTip (int)));
    539     connect (devicesNetworkMenu, SIGNAL (highlighted (int)),
    540              this, SLOT (setDynamicMenuItemStatusTip (int)));
     517    connect (mDevicesMountFloppyMenu, SIGNAL(triggered(QAction *)), this, SLOT(captureFloppy(QAction *)));
     518    connect (mDevicesMountDVDMenu, SIGNAL(triggered(QAction *)), this, SLOT(captureDVD(QAction *)));
     519    connect (mDevicesUSBMenu, SIGNAL(triggered(QAction *)), this, SLOT(switchUSB(QAction *)));
     520    connect (mDevicesNetworkMenu, SIGNAL(triggered(QAction *)), this, SLOT(activateNetworkMenu(QAction *)));
     521
     522    connect (mDevicesMountFloppyMenu, SIGNAL (hovered (QAction *)),
     523             this, SLOT (setDynamicMenuItemStatusTip (QAction *)));
     524    connect (mDevicesMountDVDMenu, SIGNAL (hovered (QAction *)),
     525             this, SLOT (setDynamicMenuItemStatusTip (QAction *)));
     526    connect (mDevicesNetworkMenu, SIGNAL (hovered (QAction *)),
     527             this, SLOT (setDynamicMenuItemStatusTip (QAction *)));
    541528
    542529    /* Cleanup the status bar tip when a menu with dynamic items is
    … …  
    544531     * for normal menus (because Qt will not do it on pressing ESC if the menu
    545532     * is constructed of dynamic items only) */
    546     connect (devicesMountFloppyMenu, SIGNAL (aboutToHide()),
     533    connect (mDevicesMountFloppyMenu, SIGNAL (aboutToHide()),
    547534             this, SLOT (clearStatusBar()));
    548     connect (devicesMountDVDMenu, SIGNAL (aboutToHide()),
     535    connect (mDevicesMountDVDMenu, SIGNAL (aboutToHide()),
    549536             this, SLOT (clearStatusBar()));
    550     connect (devicesNetworkMenu, SIGNAL (aboutToHide()),
     537    connect (mDevicesNetworkMenu, SIGNAL (aboutToHide()),
    551538             this, SLOT (clearStatusBar()));
    552539
    … …  
    764751    {
    765752        /* hide usb_menu & usb_separator & usb_status_led */
    766         devicesMenu->setItemVisible (devicesUSBMenuId, false);
    767         devicesMenu->setItemVisible (devicesUSBMenuSeparatorId, false);
     753        mDevicesUSBMenu->setVisible (false);
     754        mDevicesUSBMenuSeparator->setVisible (false);
    768755        usb_light->setHidden (true);
    769756    }
    … …  
    771758    {
    772759        bool isUSBEnabled = usbctl.GetEnabled();
    773         devicesUSBMenu->setEnabled (isUSBEnabled);
    774         devicesUSBMenu->setConsole (cconsole);
     760        mDevicesUSBMenu->setEnabled (isUSBEnabled);
     761        mDevicesUSBMenu->setConsole (cconsole);
    775762        usb_light->setState (isUSBEnabled ? KDeviceActivity_Idle
    776763                                          : KDeviceActivity_Null);
    … …  
    783770        /* hide vrdp_menu_action & vrdp_separator & vrdp_status_icon */
    784771        devicesSwitchVrdpAction->setVisible (false);
    785         devicesMenu->setItemVisible (devicesVRDPMenuSeparatorId, false);
     772        mDevicesVRDPMenuSeparator->setVisible (false);
    786773#if 0
    787774        vrdp_state->setHidden (true);
    … …  
    795782        /* hide shared folders menu action & sf_separator & sf_status_icon */
    796783        devicesSFDialogAction->setVisible (false);
    797         devicesMenu->setItemVisible (devicesSFMenuSeparatorId, false);
     784        mDevicesSFMenuSeparator->setVisible (false);
    798785        sf_light->setHidden (true);
    799786    }
    … …  
    11341121    mMainMenu->popup (pos);
    11351122    mMainMenu->activateWindow();
    1136     mMainMenu->setActiveItem (0);
     1123    mMainMenu->setActiveAction (mMainMenu->actions().first());
    11371124}
    11381125
    … …  
    15381525        tr ("Unmount the currently mounted CD/DVD-ROM media"));
    15391526
    1540     devicesVRDPMenu->setToolTip (tr ("Remote Desktop (RDP) Server",
    1541                                      "enable/disable..."));
     1527    /* mDevicesVRDPMenu->setToolTip (tr ("Remote Desktop (RDP) Server",
     1528                                     "enable/disable...")); */
    15421529    devicesSwitchVrdpAction->setText (tr ("Remote Dis&play"));
    15431530    devicesSwitchVrdpAction->setStatusTip (
    … …  
    15831570    /* Devices menu submenus */
    15841571
    1585     devicesMenu->changeItem (devicesMountFloppyMenuId, tr ("Mount &Floppy"));
    1586     devicesMenu->changeItem (devicesMountDVDMenuId, tr ("Mount &CD/DVD-ROM"));
    1587     devicesMenu->changeItem (devicesNetworkMenuId, tr ("&Network Adapters"));
    1588     devicesMenu->changeItem (devicesUSBMenuId, tr ("&USB Devices"));
     1572    mDevicesMountFloppyMenu->setTitle (tr ("Mount &Floppy"));
     1573    mDevicesMountDVDMenu->setTitle (tr ("Mount &CD/DVD-ROM"));
     1574    mDevicesNetworkMenu->setTitle (tr ("&Network Adapters"));
     1575    mDevicesUSBMenu->setTitle (tr ("&USB Devices"));
    15891576
    15901577    /* main menu & seamless popup menu */
    15911578
    1592     menuBar()->changeItem (vmMenuId, tr ("&Machine"));
    1593 #warning port me: check this if the menu popups in the vm. (H+HOME?)
    1594 //    mMainMenu->changeItem (vmMenuId,
    1595 //        VBoxGlobal::iconSet (":/machine_16px.png"), tr ("&Machine"));
    1596     menuBar()->changeItem (devicesMenuId, tr ("&Devices"));
    1597 //    mMainMenu->changeItem (devicesMenuId,
    1598 //        VBoxGlobal::iconSet (":/settings_16px.png"), tr ("&Devices"));
     1579    mVMMenu->setTitle (tr ("&Machine"));
     1580//    mVMMenu->setIcon (VBoxGlobal::iconSet (":/machine_16px.png"));
     1581
     1582    mDevicesMenu->setTitle (tr ("&Devices"));
     1583//    mDevicesMenu->setIcon (VBoxGlobal::iconSet (":/settings_16px.png"));
     1584
    15991585#ifdef VBOX_WITH_DEBUGGER_GUI
    16001586    if (vboxGlobal().isDebuggerEnabled())
    … …  
    16041590    }
    16051591#endif
    1606     menuBar()->changeItem (helpMenuId, tr ("&Help"));
    1607 //    mMainMenu->changeItem (helpMenuId,
    1608 //        VBoxGlobal::iconSet (":/help_16px.png"), tr ("&Help"));
     1592    mHelpMenu->setTitle (tr ("&Help"));
     1593//    mHelpMenu->setIcon (VBoxGlobal::iconSet (":/help_16px.png"));
    16091594
    16101595    /* status bar widgets */
    … …  
    16651650    if (element & FloppyStuff)
    16661651    {
    1667         devicesMountFloppyMenu->setEnabled (isRunningOrPaused);
     1652        mDevicesMountFloppyMenu->setEnabled (isRunningOrPaused);
    16681653        CFloppyDrive floppy = cmachine.GetFloppyDrive();
    16691654        KDriveState state = floppy.GetState();
    … …  
    17091694    if (element & DVDStuff)
    17101695    {
    1711         devicesMountDVDMenu->setEnabled (isRunningOrPaused);
     1696        mDevicesMountDVDMenu->setEnabled (isRunningOrPaused);
    17121697        CDVDDrive dvd = cmachine.GetDVDDrive();
    17131698        KDriveState state = dvd.GetState();
    … …  
    17871772                                       : KDeviceActivity_Null);
    17881773
    1789         devicesNetworkMenu->setEnabled (isRunningOrPaused && count > 0);
     1774        mDevicesNetworkMenu->setEnabled (isRunningOrPaused && count > 0);
    17901775
    17911776        /* update tooltip */
    … …  
    18291814            if (isUSBEnabled)
    18301815            {
    1831                 devicesUSBMenu->setEnabled (isRunningOrPaused);
     1816                mDevicesUSBMenu->setEnabled (isRunningOrPaused);
    18321817
    18331818                CUSBDeviceEnumerator en = cconsole.GetUSBDevices().Enumerate();
    … …  
    18441829            else
    18451830            {
    1846                 devicesUSBMenu->setEnabled (false);
     1831                mDevicesUSBMenu->setEnabled (false);
    18471832
    18481833                info = tr ("<br><nobr><b>USB Controller is disabled</b></nobr>",
    … …  
    19821967        ULONG64 usedBits = screen.width() /* display width */
    19831968                         * screen.height() /* display height */
    1984 #warning port me: check this
    19851969                         * depth(); /* bit per pixel */
    1986 //                         * QColor::numBitPlanes(); /* bit per pixel */
    19871970        if (aOn && (availBits < usedBits))
    19881971        {
    19891972            vboxProblem().cannotEnterSeamlessMode (screen.width(),
    1990 #warning port me: check this
    19911973                screen.height(), depth());
    1992 //                screen.height(), QColor::numBitPlanes());
    19931974            return false;
    19941975        }
    … …  
    22122193        clearMask();
    22132194        centralWidget()->setPalette (mErasePalette);
    2214         centralWidget()->setBackgroundMode (Qt::PaletteBackground);
    22152195        centralWidget()->setAutoFillBackground (false);
    22162196        console->setFrameStyle (console_style);
    … …  
    24612441        CProgress progress =
    24622442            cconsole.TakeSnapshot (dlg.mLeName->text().trimmed(),
    2463                                    dlg.mTeDescription->text());
     2443                                   dlg.mTeDescription->toPlainText());
    24642444
    24652445        if (cconsole.isOk())
    … …  
    27692749    if (!console) return;
    27702750
    2771     devicesMountFloppyMenu->clear();
     2751    mDevicesMountFloppyMenu->clear();
    27722752
    27732753    CHostFloppyDrive selected = csession.GetMachine().GetFloppyDrive().GetHostDrive();
    … …  
    27852765            drvName :
    27862766            QString ("%1 (%2)").arg (description, drvName);
    2787         int id = devicesMountFloppyMenu->insertItem (
    2788             tr ("Host Drive ") + fullName);
    2789         hostFloppyMap [id] = hostFloppy;
     2767        QAction *action = mDevicesMountFloppyMenu->addAction (tr ("Host Drive ") + fullName);
     2768        action->setStatusTip (tr ("Mount the selected physical drive of the host PC",
     2769                                  "Floppy tip"));
     2770        hostFloppyMap [action] = hostFloppy;
    27902771        if (machine_state != KMachineState_Running && machine_state != KMachineState_Paused)
    2791             devicesMountFloppyMenu->setItemEnabled (id, false);
     2772            action->setEnabled (false);
    27922773        else if (!selected.isNull())
    27932774            if (!selected.GetName().compare (hostFloppy.GetName()))
    2794                 devicesMountFloppyMenu->setItemEnabled (id, false);
    2795     }
    2796 
    2797     if (devicesMountFloppyMenu->count() > 0)
    2798         devicesMountFloppyMenu->addSeparator();
    2799     devicesMountFloppyMenu->addAction (devicesMountFloppyImageAction);
     2775                action->setEnabled (false);
     2776    }
     2777
     2778    if (mDevicesMountFloppyMenu->actions().count() > 0)
     2779        mDevicesMountFloppyMenu->addSeparator();
     2780    mDevicesMountFloppyMenu->addAction (devicesMountFloppyImageAction);
    28002781
    28012782    /* if shown as a context menu */
    2802     if (devicesMenu->itemParameter (devicesMountFloppyMenuId))
    2803     {
    2804         devicesMountFloppyMenu->addSeparator();
    2805         devicesMountFloppyMenu->addAction (devicesUnmountFloppyAction);
     2783    if(mDevicesMountFloppyMenu->menuAction()->data().toBool())
     2784    {
     2785        mDevicesMountFloppyMenu->addSeparator();
     2786        mDevicesMountFloppyMenu->addAction (devicesUnmountFloppyAction);
    28062787    }
    28072788}
    … …  
    28152796    if (!console) return;
    28162797
    2817     devicesMountDVDMenu->clear();
     2798    mDevicesMountDVDMenu->clear();
    28182799
    28192800    CHostDVDDrive selected = csession.GetMachine().GetDVDDrive().GetHostDrive();
    … …  
    28312812            drvName :
    28322813            QString ("%1 (%2)").arg (description, drvName);
    2833         int id = devicesMountDVDMenu->insertItem (
     2814        QAction *action = mDevicesMountDVDMenu->addAction (
    28342815            tr ("Host Drive ") + fullName);
    2835         hostDVDMap [id] = hostDVD;
     2816        action->setStatusTip (tr ("Mount the selected physical drive of the host PC",
     2817                                  "CD/DVD tip"));
     2818        hostDVDMap [action] = hostDVD;
    28362819        if (machine_state != KMachineState_Running && machine_state != KMachineState_Paused)
    2837             devicesMountDVDMenu->setItemEnabled (id, false);
     2820            action->setEnabled (false);
    28382821        else if (!selected.isNull())
    28392822            if (!selected.GetName().compare (hostDVD.GetName()))
    2840                 devicesMountDVDMenu->setItemEnabled (id, false);
    2841     }
    2842 
    2843     if (devicesMountDVDMenu->count() > 0)
    2844         devicesMountDVDMenu->addSeparator();
    2845     devicesMountDVDMenu->addAction (devicesMountDVDImageAction);
     2823                action->setEnabled (false);
     2824    }
     2825
     2826    if (mDevicesMountDVDMenu->actions().count() > 0)
     2827        mDevicesMountDVDMenu->addSeparator();
     2828    mDevicesMountDVDMenu->addAction (devicesMountDVDImageAction);
    28462829
    28472830    /* if shown as a context menu */
    2848 
    2849     if (devicesMenu->itemParameter (devicesMountDVDMenuId))
    2850     {
    2851         devicesMountDVDMenu->addSeparator();
    2852         devicesMountDVDMenu->addAction (devicesUnmountDVDAction);
     2831    if(mDevicesMountDVDMenu->menuAction()->data().toBool())
     2832    {
     2833        mDevicesMountDVDMenu->addSeparator();
     2834        mDevicesMountDVDMenu->addAction (devicesUnmountDVDAction);
    28532835    }
    28542836}
    … …  
    28592841void VBoxConsoleWnd::prepareNetworkMenu()
    28602842{
    2861     devicesNetworkMenu->clear();
     2843    mDevicesNetworkMenu->clear();
    28622844    ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount();
    28632845    for (ulong slot = 0; slot < count; ++ slot)
    28642846    {
    28652847        CNetworkAdapter adapter = csession.GetMachine().GetNetworkAdapter (slot);
    2866         int id = devicesNetworkMenu->insertItem (tr ("Adapter %1", "network").arg (slot));
    2867         devicesNetworkMenu->setItemEnabled (id, adapter.GetEnabled());
    2868         devicesNetworkMenu->setItemChecked (id, adapter.GetEnabled() && adapter.GetCableConnected());
    2869     }
    2870 }
    2871 
    2872 void VBoxConsoleWnd::setDynamicMenuItemStatusTip (int aId)
     2848        QAction *action = mDevicesNetworkMenu->addAction (tr ("Adapter %1", "network").arg (slot));
     2849        action->setEnabled (adapter.GetEnabled());
     2850        action->setCheckable (true);
     2851        action->setChecked (adapter.GetEnabled() && adapter.GetCableConnected());
     2852        action->setData (static_cast<qulonglong> (slot));
     2853    }
     2854}
     2855
     2856void VBoxConsoleWnd::setDynamicMenuItemStatusTip (QAction *aAction)
    28732857{
    28742858    QString tip;
    28752859
    2876     if (sender() == devicesMountFloppyMenu)
    2877     {
    2878         if (hostFloppyMap.find (aId) != hostFloppyMap.end())
    2879             tip = tr ("Mount the selected physical drive of the host PC",
    2880                       "Floppy tip");
    2881     }
    2882     else if (sender() == devicesMountDVDMenu)
    2883     {
    2884         if (hostDVDMap.find (aId) != hostDVDMap.end())
    2885             tip = tr ("Mount the selected physical drive of the host PC",
    2886                       "CD/DVD tip");
    2887     }
    2888     else if (sender() == devicesNetworkMenu)
    2889     {
    2890         tip = devicesNetworkMenu->isItemChecked (aId) ?
     2860    if (sender() == mDevicesNetworkMenu)
     2861    {
     2862        tip = aAction->isChecked() ?
    28912863            tr ("Disconnect the cable from the selected virtual network adapter") :
    28922864            tr ("Connect the cable to the selected virtual network adapter");
    … …  
    29142886
    29152887/**
    2916  *  Captures a floppy device corresponding to a given menu id.
     2888 *  Captures a floppy device corresponding to a given menu action.
    29172889 */
    2918 void VBoxConsoleWnd::captureFloppy (int aId)
     2890void VBoxConsoleWnd::captureFloppy (QAction *aAction)
    29192891{
    29202892    if (!console) return;
    29212893
    2922     CHostFloppyDrive d = hostFloppyMap [aId];
     2894    CHostFloppyDrive d = hostFloppyMap [aAction];
    29232895    /* if null then some other item but host drive is selected */
    29242896    if (d.isNull()) return;
    … …  
    29412913
    29422914/**
    2943  *  Captures a CD/DVD-ROM device corresponding to a given menu id.
     2915 *  Captures a CD/DVD-ROM device corresponding to a given menu action.
    29442916 */
    2945 void VBoxConsoleWnd::captureDVD (int aId)
     2917void VBoxConsoleWnd::captureDVD (QAction *aAction)
    29462918{
    29472919    if (!console) return;
    29482920
    2949     CHostDVDDrive d = hostDVDMap [aId];
     2921    CHostDVDDrive d = hostDVDMap [aAction];
    29502922    /* if null then some other item but host drive is selected */
    29512923    if (d.isNull()) return;
    … …  
    29702942 *  Switch the cable connected/disconnected for the selected network adapter
    29712943 */
    2972 void VBoxConsoleWnd::activateNetworkMenu (int aId)
    2973 {
    2974     ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount();
    2975     for (ulong slot = 0; slot < count; ++ slot)
    2976     {
    2977         if (aId == devicesNetworkMenu->idAt (slot))
    2978         {
    2979             CNetworkAdapter adapter = csession.GetMachine().GetNetworkAdapter (slot);
    2980             bool connected = adapter.GetCableConnected();
    2981             if (adapter.GetEnabled())
    2982                 adapter.SetCableConnected (!connected);
    2983             break;
    2984         }
    2985     }
     2944void VBoxConsoleWnd::activateNetworkMenu (QAction *aAction)
     2945{
     2946    ulong slot = aAction->data().toULongLong();
     2947    CNetworkAdapter adapter = csession.GetMachine().GetNetworkAdapter (slot);
     2948    bool connected = adapter.GetCableConnected();
     2949    if (adapter.GetEnabled())
     2950        adapter.SetCableConnected (!connected);
    29862951}
    29872952
    … …  
    29892954 *  Attach/Detach selected USB Device.
    29902955 */
    2991 void VBoxConsoleWnd::switchUSB (int aId)
     2956void VBoxConsoleWnd::switchUSB (QAction *aAction)
    29922957{
    29932958    if (!console) return;
    … …  
    29962961    AssertWrapperOk (csession);
    29972962
    2998     CUSBDevice usb = devicesUSBMenu->getUSB (aId);
     2963    CUSBDevice usb = mDevicesUSBMenu->getUSB (aAction);
    29992964    /* if null then some other item but a USB device is selected */
    30002965    if (usb.isNull())
    30012966        return;
    30022967
    3003     if (devicesUSBMenu->isItemChecked (aId))
     2968    if (!aAction->isChecked())
    30042969    {
    30052970        cconsole.DetachUSBDevice (usb.GetId());
    … …  
    30302995    {
    30312996        /* set "this is a context menu" flag */
    3032         devicesMenu->setItemParameter (devicesMountDVDMenuId, 1);
    3033         devicesMountDVDMenu->exec (e->globalPos());
    3034         devicesMenu->setItemParameter (devicesMountDVDMenuId, 0);
     2997        mDevicesMountDVDMenu->menuAction()->setData (true);
     2998        mDevicesMountDVDMenu->exec (e->globalPos());
     2999        mDevicesMountDVDMenu->menuAction()->setData (false);
    30353000    }
    30363001    else
    … …  
    30383003    {
    30393004        /* set "this is a context menu" flag */
    3040         devicesMenu->setItemParameter (devicesMountFloppyMenuId, 1);
    3041         devicesMountFloppyMenu->exec (e->globalPos());
    3042         devicesMenu->setItemParameter (devicesMountFloppyMenuId, 0);
     3005        mDevicesMountFloppyMenu->menuAction()->setData (true);
     3006        mDevicesMountFloppyMenu->exec (e->globalPos());
     3007        mDevicesMountFloppyMenu->menuAction()->setData (false);
    30433008    }
    30443009    else
    30453010    if (ind == usb_light)
    30463011    {
    3047         if (devicesUSBMenu->isEnabled())
     3012        if (mDevicesUSBMenu->isEnabled())
    30483013        {
    30493014            /* set "this is a context menu" flag */
    3050             devicesMenu->setItemParameter (devicesUSBMenuId, 1);
    3051             devicesUSBMenu->exec (e->globalPos());
    3052             devicesMenu->setItemParameter (devicesUSBMenuId, 0);
     3015            mDevicesUSBMenu->menuAction()->setData (true);
     3016            mDevicesUSBMenu->exec (e->globalPos());
     3017            mDevicesUSBMenu->menuAction()->setData (false);
    30533018        }
    30543019    }
    30553020    else
    3056     if (ind == vrdp_state)
    3057     {
    3058         devicesVRDPMenu->exec (e->globalPos());
    3059     }
    3060     else
     3021    /* if (ind == vrdp_state)
     3022    {
     3023        mDevicesVRDPMenu->exec (e->globalPos());
     3024    }
     3025    else */
    30613026    if (ind == autoresize_state)
    30623027    {
    … …  
    30753040         * menu itself is kept just in case if we need more than one item in
    30763041         * the future. */
    3077 #if 0
    3078         devicesSFMenu->exec (e->globalPos());
    3079 #else
     3042        /* mDevicesSFMenu->exec (e->globalPos()); */
    30803043        if (devicesSFDialogAction->isEnabled())
    30813044            devicesSFDialogAction->trigger();
    3082 #endif
    30833045    }
    30843046    else
    30853047    if (ind == net_light)
    30863048    {
    3087         if (devicesNetworkMenu->isEnabled())
     3049        if (mDevicesNetworkMenu->isEnabled())
    30883050        {
    30893051            /* set "this is a context menu" flag */
    3090             devicesMenu->setItemParameter (devicesNetworkMenuId, 1);
    3091             devicesNetworkMenu->exec (e->globalPos());
    3092             devicesMenu->setItemParameter (devicesNetworkMenuId, 0);
     3052            mDevicesNetworkMenu->menuAction()->setData (true);
     3053            mDevicesNetworkMenu->exec (e->globalPos());
     3054            mDevicesNetworkMenu->menuAction()->setData (false);
    30933055        }
    30943056    }
    … …  
    32613223        /* If seamless mode should be enabled then check if it is enabled
    32623224         * currently and re-enable it if open-view procedure is finished */
    3263         if (vmSeamlessAction->isOn() && mIsOpenViewFinished && aSeamlessSupported)
     3225        if (vmSeamlessAction->isChecked() && mIsOpenViewFinished && aSeamlessSupported)
    32643226            toggleFullscreenMode (true, true);
    32653227    }
    … …  
    33323294void VBoxConsoleWnd::tryClose()
    33333295{
    3334 #warning port me
     3296#warning "port me"
     3297    /* @todo: I'm not sure if it is the right way to force an shutdown if modal
     3298     * child widgets are open. Anyway, currently I didn't know how to achieve
     3299     * this. So for now we simply call close. */
     3300     
     3301     close();
     3302
    33353303//    LogFlowFunc (("eventLoopLevel=%d\n", qApp->eventLoop()->loopLevel()));
    33363304//
    … …  
    33543322//    }
    33553323//    else
    3356 //        close();
     3324//     close();
    33573325}
    33583326

  • trunk/src/VBox/Frontends/VirtualBox4/src/VBoxFBQuartz2D.cpp

    r7412 r7678  
    172172    QRect Q2DViewRect = mapYOrigin (QRect (p.x(), p.y(), mView->width(), mView->height()), pMain->height());
    173173    /* We have to pay special attention to the scrollbars */
    174     if (mView->horizontalScrollBar()->isVisible())
    175         Q2DViewRect.setY (Q2DViewRect.y() + (mView->horizontalScrollBar()->frameSize().height() + 2));
    176     if (mView->verticalScrollBar()->isVisible())
    177         Q2DViewRect.setWidth (Q2DViewRect.width() - (mView->verticalScrollBar()->frameSize().width() + 2));
     174//    if (mView->horizontalScrollBar()->isVisible())
     175//        Q2DViewRect.setY (Q2DViewRect.y() + (mView->horizontalScrollBar()->frameSize().height() + 2));
     176//    if (mView->verticalScrollBar()->isVisible())
     177//        Q2DViewRect.setWidth (Q2DViewRect.width() - (mView->verticalScrollBar()->frameSize().width() + 2));
    178178
    179179    /* Create the context to draw on */

  • trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

    r7663 r7678  
    26652665    QIcon iconSet;
    26662666
    2667     iconSet.setPixmap (QPixmap (aNormal),
    2668                        QIcon::Automatic, QIcon::Normal);
     2667    iconSet.addFile (aNormal, QSize(),
     2668                     QIcon::Normal);
    26692669    if (aDisabled != NULL)
    2670         iconSet.setPixmap (QPixmap (aDisabled),
    2671                            QIcon::Automatic, QIcon::Disabled);
     2670        iconSet.addFile (aDisabled, QSize(),
     2671                         QIcon::Disabled);
    26722672    if (aActive != NULL)
    2673         iconSet.setPixmap (QPixmap (aActive),
    2674                            QIcon::Automatic, QIcon::Active);
     2673        iconSet.addFile (aActive, QSize(),
     2674                         QIcon::Active);
    26752675    return iconSet;
    26762676}
    … …  
    42014201 *  This class provides the list of USB devices attached to the host.
    42024202 */
    4203 VBoxUSBMenu::VBoxUSBMenu (QWidget *aParent) : Q3PopupMenu (aParent)
     4203VBoxUSBMenu::VBoxUSBMenu (QWidget *aParent) : QMenu (aParent)
    42044204{
    42054205    connect (this, SIGNAL (aboutToShow()),
    42064206             this, SLOT   (processAboutToShow()));
    4207     connect (this, SIGNAL (highlighted (int)),
    4208              this, SLOT   (processHighlighted (int)));
    4209 }
    4210 
    4211 const CUSBDevice& VBoxUSBMenu::getUSB (int aIndex)
    4212 {
    4213     return mUSBDevicesMap [aIndex];
     4207//    connect (this, SIGNAL (hovered (QAction *)),
     4208//             this, SLOT   (processHighlighted (QAction *)));
     4209}
     4210
     4211const CUSBDevice& VBoxUSBMenu::getUSB (QAction *aAction)
     4212{
     4213    return mUSBDevicesMap [aAction];
    42144214}
    42154215
    … …  
    42294229    if (isUSBEmpty)
    42304230    {
    4231         insertItem (
    4232             tr ("<no available devices>", "USB devices"),
    4233             USBDevicesMenuNoDevicesId);
    4234         setItemEnabled (USBDevicesMenuNoDevicesId, false);
     4231        QAction *action = addAction (tr ("<no available devices>", "USB devices"));
     4232        action->setEnabled (false);
     4233        action->setToolTip (tr ("No supported devices connected to the host PC",
     4234                                "USB device tooltip"));
    42354235    }
    42364236    else
    … …  
    42414241            CHostUSBDevice iterator = en.GetNext();
    42424242            CUSBDevice usb = CUnknown (iterator);
    4243             int id = insertItem (vboxGlobal().details (usb));
    4244             mUSBDevicesMap [id] = usb;
     4243            QAction *action = addAction (vboxGlobal().details (usb));
     4244            action->setCheckable (true);
     4245            mUSBDevicesMap [action] = usb;
    42454246            /* check if created item was alread attached to this session */
    42464247            if (!mConsole.isNull())
    … …  
    42484249                CUSBDevice attachedUSB =
    42494250                    mConsole.GetUSBDevices().FindById (usb.GetId());
    4250                 setItemChecked (id, !attachedUSB.isNull());
    4251                 setItemEnabled (id, iterator.GetState() !=
    4252                                 KUSBDeviceState_Unavailable);
     4251                action->setChecked (!attachedUSB.isNull());
     4252                action->setEnabled (iterator.GetState() !=
     4253                                    KUSBDeviceState_Unavailable);
    42534254            }
    42544255        }
    … …  
    42564257}
    42574258
    4258 void VBoxUSBMenu::processHighlighted (int aIndex)
    4259 {
    4260     /* the <no available devices> item is highlighted */
    4261     if (aIndex == USBDevicesMenuNoDevicesId)
    4262     {
    4263         QToolTip::add (this,
    4264             tr ("No supported devices connected to the host PC",
    4265                 "USB device tooltip"));
    4266         return;
    4267     }
    4268 
    4269     CUSBDevice usb = mUSBDevicesMap [aIndex];
    4270     /* if null then some other item but a USB device is highlighted */
    4271     if (usb.isNull())
    4272     {
    4273         QToolTip::remove (this);
    4274         return;
    4275     }
    4276 
    4277     QToolTip::remove (this);
    4278     QToolTip::add (this, vboxGlobal().toolTip (usb));
    4279 }
    4280 
     4259bool VBoxUSBMenu::event(QEvent *aEvent)
     4260{
     4261    /* We provide dynamic tooltips for the usb devices */
     4262    if (aEvent->type() == QEvent::ToolTip)
     4263    {
     4264        QHelpEvent *helpEvent = static_cast<QHelpEvent *> (aEvent);
     4265        QAction *action = actionAt (helpEvent->pos());
     4266        if (action)
     4267        {
     4268            CUSBDevice usb = mUSBDevicesMap [action];
     4269            if (!usb.isNull())
     4270            {
     4271                QToolTip::showText (helpEvent->globalPos(), vboxGlobal().toolTip (usb));
     4272                return true;
     4273            }
     4274        }
     4275    }
     4276    return QMenu::event (aEvent);
     4277}
    42814278
    42824279/**

  • trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxGlobalSettingsDlg.ui

    r7235 r7678  
    13371337    <slot>tbAddUSBFilter_clicked()</slot>
    13381338    <slot>tbAddUSBFilterFrom_clicked()</slot>
    1339     <slot>menuAddUSBFilterFrom_activated( int )</slot>
     1339    <slot>menuAddUSBFilterFrom_activated( QAction * )</slot>
    13401340    <slot>tbRemoveUSBFilter_clicked()</slot>
    13411341    <slot>tbUSBFilterUp_clicked()</slot>

  • trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxGlobalSettingsDlg.ui.h

    r7250 r7678  
    971971}
    972972
    973 void VBoxGlobalSettingsDlg::menuAddUSBFilterFrom_activated (int aIndex)
    974 {
    975     CUSBDevice usb = usbDevicesMenu->getUSB (aIndex);
     973void VBoxGlobalSettingsDlg::menuAddUSBFilterFrom_activated (QAction *aAction)
     974{
     975    CUSBDevice usb = usbDevicesMenu->getUSB (aAction);
    976976
    977977    // if null then some other item but a USB device is selected

  • trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsDlg.ui

    r7235 r7678  
    32953295    <slot>tbAddUSBFilter_clicked()</slot>
    32963296    <slot>tbAddUSBFilterFrom_clicked()</slot>
    3297     <slot>menuAddUSBFilterFrom_activated( int )</slot>
     3297    <slot>menuAddUSBFilterFrom_activated( QAction * )</slot>
    32983298    <slot>tbRemoveUSBFilter_clicked()</slot>
    32993299    <slot>tbUSBFilterUp_clicked()</slot>

  • trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsDlg.ui.h

    r7560 r7678  
    776776                                                      ":/usb_movedown_disabled_16px.png"));
    777777    usbDevicesMenu = new VBoxUSBMenu (this);
    778     connect (usbDevicesMenu, SIGNAL(activated(int)), this, SLOT(menuAddUSBFilterFrom_activated(int)));
     778    connect (usbDevicesMenu, SIGNAL(triggered(QAction *)), this, SLOT(menuAddUSBFilterFrom_activated(QAction *)));
    779779    mUSBFilterListModified = false;
    780780
    … …  
    26862686}
    26872687
    2688 void VBoxVMSettingsDlg::menuAddUSBFilterFrom_activated (int aIndex)
    2689 {
    2690     CUSBDevice usb = usbDevicesMenu->getUSB (aIndex);
     2688void VBoxVMSettingsDlg::menuAddUSBFilterFrom_activated (QAction *aAction)
     2689{
     2690    CUSBDevice usb = usbDevicesMenu->getUSB (aAction);
    26912691    /* if null then some other item but a USB device is selected */
    26922692    if (usb.isNull())
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette