VirtualBox

Changeset 57591 in vbox


Ignore:
Timestamp:
Sep 1, 2015 2:23:14 PM (9 years ago)
Author:
vboxsync
Message:

FE/Qt: 7958: Reusing VBoxGlobal host-screen wrappers.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp

    r57553 r57591  
    2929# include <QScrollBar>
    3030# include <QTextEdit>
    31 # include <QDesktopWidget>
    3231
    3332/* GUI includes: */
    … …  
    649648    {
    650649        /* Getting available geometry to calculate default geometry: */
    651         const QRect desktopRect = QApplication::desktop()->availableGeometry(this);
     650        const QRect desktopRect = vboxGlobal().availableGeometry(this);
    652651        int iDefaultWidth = desktopRect.width() * 0.5;
    653652        int iDefaultHeight = desktopRect.height() * 0.75;

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp

    r56217 r57591  
    2222/* Qt includes: */
    2323# include <QApplication>
    24 # include <QDesktopWidget>
    2524# include <QStyle>
    2625# include <QHBoxLayout>
    … …  
    3231# include "QIArrowButtonPress.h"
    3332# include "UIIconPool.h"
     33# include "VBoxGlobal.h"
    3434
    3535/* Other VBox includes: */
    … …  
    8383
    8484    /* Get 40% of the screen-area to limit the resulting hint: */
    85     const QSize screenGeometryDot4 = QApplication::desktop()->screenGeometry(this).size() * .4;
     85    const QSize screenGeometryDot4 = vboxGlobal().screenGeometry(this).size() * .4;
    8686
    8787    /* Calculate minimum size-hint which is document-size limited by screen-area: */

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

    r57553 r57591  
    2323# include <QMutex>
    2424# include <QMetaEnum>
    25 # include <QDesktopWidget>
    2625# ifdef DEBUG
    2726#  include <QMainWindow>
    … …  
    22322231
    22332232    /* Get screen-geometry [of screen with point (iX, iY) if possible]: */
    2234     const QRect screenGeometry = fOk ? QApplication::desktop()->availableGeometry(QPoint(iX, iY)) :
    2235                                        QApplication::desktop()->availableGeometry();
     2233    const QRect availableGeometry = fOk ? vboxGlobal().availableGeometry(QPoint(iX, iY)) :
     2234                                          vboxGlobal().availableGeometry();
    22362235
    22372236    /* Make sure resulting geometry is within current bounds: */
    2238     geometry = geometry.intersected(screenGeometry);
     2237    geometry = geometry.intersected(availableGeometry);
    22392238
    22402239    /* Move default-geometry to screen-geometry' center: */
    22412240    if (!fOk)
    2242         geometry.moveCenter(screenGeometry.center());
     2241        geometry.moveCenter(availableGeometry.center());
    22432242
    22442243    /* Return result: */
    … …  
    34283427
    34293428    /* Get screen-geometry [of screen with point (iX, iY) if possible]: */
    3430     const QRect screenGeometry = fOk ? QApplication::desktop()->availableGeometry(QPoint(iX, iY)) :
    3431                                        QApplication::desktop()->availableGeometry();
     3429    const QRect availableGeometry = fOk ? vboxGlobal().availableGeometry(QPoint(iX, iY)) :
     3430                                          vboxGlobal().availableGeometry();
    34323431
    34333432    /* Make sure resulting geometry is within current bounds: */
    3434     geometry = geometry.intersected(screenGeometry);
     3433    geometry = geometry.intersected(availableGeometry);
    34353434
    34363435    /* Move default-geometry to pParentWidget' geometry center: */
    … …  
    35383537
    35393538    /* Get screen-geometry [of screen with point (iX, iY) if possible]: */
    3540     const QRect screenGeometry = fOk ? QApplication::desktop()->availableGeometry(QPoint(iX, iY)) :
    3541                                        QApplication::desktop()->availableGeometry();
     3539    const QRect availableGeometry = fOk ? vboxGlobal().availableGeometry(QPoint(iX, iY)) :
     3540                                          vboxGlobal().availableGeometry();
    35423541
    35433542    /* Make sure resulting geometry is within current bounds: */
    3544     geometry = geometry.intersected(screenGeometry);
     3543    geometry = geometry.intersected(availableGeometry);
    35453544
    35463545    /* Move default-geometry to current screen center: */
    35473546    if (!fOk)
    3548         geometry.moveCenter(screenGeometry.center());
     3547        geometry.moveCenter(availableGeometry.center());
    35493548
    35503549    /* Return result: */
    … …  
    36533652#ifdef Q_WS_WIN
    36543653    /* Get screen-geometry [of screen with point (iX, iY) if possible]: */
    3655     const QRect screenGeometry = QApplication::desktop()->availableGeometry(QPoint(iX, iY));
     3654    const QRect availableGeometry = vboxGlobal().availableGeometry(QPoint(iX, iY));
    36563655
    36573656    /* Make sure resulting geometry is within current bounds: */
    3658     if (!screenGeometry.contains(geometry, true))
     3657    if (!availableGeometry.contains(geometry, true))
    36593658        geometry.moveCenter(defaultGeometry.center());
    36603659#endif /* Q_WS_WIN */

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

    r57366 r57591  
    2222/* Qt includes: */
    2323# include <QDir>
    24 # include <QDesktopWidget>
    2524# include <QFileInfo>
    2625# include <QLocale>

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

    r57590 r57591  
    29852985     * open the guest windows, this is the best assumption we can do, cause it
    29862986     * is the worst case. */
    2987     QVector<int> screenSize(qMax(cMonitors, pDW->numScreens()), 0);
    2988     for (int i = 0; i < pDW->numScreens(); ++i)
     2987    const int cHostScreens = pDW->screenCount();
     2988    QVector<int> screenSize(qMax(cMonitors, cHostScreens), 0);
     2989    for (int i = 0; i < cHostScreens; ++i)
    29892990    {
    29902991        QRect r = pDW->screenGeometry(i);

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r57285 r57591  
    2121
    2222/* Qt includes: */
    23 # include <QDesktopWidget>
    2423# include <QDir>
    2524# include <QFileInfo>

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

    r56497 r57591  
    2121
    2222/* Qt includes: */
    23 # include <QDesktopWidget>
    2423# include <QMouseEvent>
    2524# include <QTimer>
    … …  
    188187        QPoint visibleRectanglePos = m_views[m_iMouseCaptureViewIndex]->mapToGlobal(m_viewports[m_iMouseCaptureViewIndex]->pos());
    189188        visibleRectangle.translate(visibleRectanglePos);
    190         visibleRectangle = visibleRectangle.intersected(QApplication::desktop()->availableGeometry(machineLogic()->machineWindows()[m_iMouseCaptureViewIndex]));
     189        visibleRectangle = visibleRectangle.intersected(vboxGlobal().availableGeometry(machineLogic()->machineWindows()[m_iMouseCaptureViewIndex]));
    191190
    192191#ifdef Q_WS_WIN
    … …  
    11211120        viewportRectangle.translate(viewportRectangleGlobalPos);
    11221121        /* Trim full-viewport-rectangle by available geometry: */
    1123         viewportRectangle = viewportRectangle.intersected(QApplication::desktop()->availableGeometry(machineLogic()->machineWindows()[m_iMouseCaptureViewIndex]));
     1122        viewportRectangle = viewportRectangle.intersected(vboxGlobal().availableGeometry(machineLogic()->machineWindows()[m_iMouseCaptureViewIndex]));
    11241123        /* Trim partial-viewport-rectangle by top-most windows: */
    11251124        QRegion viewportRegion(viewportRectangle);

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp

    r56126 r57591  
    2222/* Qt includes: */
    2323# include <QApplication>
    24 # include <QDesktopWidget>
    2524# include <QMenu>
    2625
    … …  
    7271    bool fShouldWeAutoMountGuestScreens = gEDataManager->autoMountGuestScreensEnabled(vboxGlobal().managedVMUuid());
    7372    LogRel(("GUI: UIMultiScreenLayout::update: GUI/AutomountGuestScreens is %s\n", fShouldWeAutoMountGuestScreens ? "enabled" : "disabled"));
    74     QDesktopWidget *pDW = QApplication::desktop();
    7573    foreach (int iGuestScreen, m_guestScreens)
    7674    {
    … …  
    10199                QPoint topLeftPosition(geo.topLeft());
    102100                /* Check which host-screen the position belongs to: */
    103                 iHostScreen = pDW->screenNumber(topLeftPosition);
     101                iHostScreen = vboxGlobal().screenNumber(topLeftPosition);
    104102                /* Revalidate: */
    105103                fValid =    iHostScreen >= 0 && iHostScreen < m_cHostScreens /* In the host screen bounds? */
    … …  
    257255void UIMultiScreenLayout::calculateHostMonitorCount()
    258256{
    259     m_cHostScreens = QApplication::desktop()->screenCount();
     257    m_cHostScreens = vboxGlobal().screenCount();
    260258}
    261259
    … …  
    296294        QRect screen;
    297295        if (m_pMachineLogic->visualStateType() == UIVisualStateType_Seamless)
    298             screen = QApplication::desktop()->availableGeometry(screenLayout.value(iGuestScreen, 0));
     296            screen = vboxGlobal().availableGeometry(screenLayout.value(iGuestScreen, 0));
    299297        else
    300             screen = QApplication::desktop()->screenGeometry(screenLayout.value(iGuestScreen, 0));
     298            screen = vboxGlobal().screenGeometry(screenLayout.value(iGuestScreen, 0));
    301299        KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
    302300        display.GetScreenResolution(iGuestScreen, width, height, guestBpp, xOrigin, yOrigin, monitorStatus);

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

    r57495 r57591  
    799799    LogRelFlow(("GUI: UISession::sltCheckIfHostDisplayChanged()\n"));
    800800
    801     /* Acquire desktop wrapper: */
    802     QDesktopWidget *pDesktop = QApplication::desktop();
    803 
    804801    /* Check if display count changed: */
    805     if (pDesktop->screenCount() != m_hostScreens.size())
     802    if (vboxGlobal().screenCount() != m_hostScreens.size())
    806803    {
    807804        /* Reset watchdog: */
    … …  
    813810    {
    814811        /* Check if at least one display geometry changed: */
    815         for (int iScreenIndex = 0; iScreenIndex < pDesktop->screenCount(); ++iScreenIndex)
    816         {
    817             if (pDesktop->screenGeometry(iScreenIndex) != m_hostScreens.at(iScreenIndex))
     812        for (int iScreenIndex = 0; iScreenIndex < vboxGlobal().screenCount(); ++iScreenIndex)
     813        {
     814            if (vboxGlobal().screenGeometry(iScreenIndex) != m_hostScreens.at(iScreenIndex))
    818815            {
    819816                /* Reset watchdog: */
    … …  
    19721969{
    19731970    m_hostScreens.clear();
    1974     QDesktopWidget *pDesktop = QApplication::desktop();
    1975     for (int iScreenIndex = 0; iScreenIndex < pDesktop->screenCount(); ++iScreenIndex)
    1976         m_hostScreens << pDesktop->screenGeometry(iScreenIndex);
     1971    for (int iScreenIndex = 0; iScreenIndex < vboxGlobal().screenCount(); ++iScreenIndex)
     1972        m_hostScreens << vboxGlobal().screenGeometry(iScreenIndex);
    19771973}
    19781974

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

    r57102 r57591  
    2121
    2222/* Qt includes: */
    23 # include <QDesktopWidget>
    2423# include <QTimer>
    2524
    … …  
    757756            /* Variables to compare: */
    758757            const int iWantedHostScreenIndex = hostScreenForGuestScreen((int)uScreenID);
    759             const int iCurrentHostScreenIndex = QApplication::desktop()->screenNumber(pMachineWindow);
     758            const int iCurrentHostScreenIndex = vboxGlobal().screenNumber(pMachineWindow);
    760759            const QSize frameBufferSize((int)uisession()->frameBuffer(uScreenID)->width(), (int)uisession()->frameBuffer(uScreenID)->height());
    761             const QSize screenSize = QApplication::desktop()->screenGeometry(iWantedHostScreenIndex).size();
     760            const QSize screenSize = vboxGlobal().screenGeometry(iWantedHostScreenIndex).size();
    762761
    763762            /* If that window

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

    r57495 r57591  
    2222/* Qt includes: */
    2323# include <QApplication>
    24 # include <QDesktopWidget>
    2524# include <QMainWindow>
    2625# include <QTimer>

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

    r57494 r57591  
    2121
    2222/* Qt includes: */
    23 # include <QDesktopWidget>
    2423# include <QMenu>
    2524# include <QTimer>

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

    r57495 r57591  
    2222/* Qt includes: */
    2323# include <QApplication>
    24 # include <QDesktopWidget>
    2524# include <QMainWindow>
    2625# include <QMenuBar>
    … …  
    220219QRect UIMachineViewNormal::workingArea() const
    221220{
    222     return QApplication::desktop()->availableGeometry(this);
     221    return vboxGlobal().availableGeometry(this);
    223222}
    224223

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

    r57129 r57591  
    2121
    2222/* Qt includes: */
    23 # include <QDesktopWidget>
    2423# include <QMenuBar>
    2524# include <QTimer>
    … …  
    359358        {
    360359            /* Get available geometry, for screen with (x,y) coords if possible: */
    361             QRect availableGeo = !geo.isNull() ? QApplication::desktop()->availableGeometry(QPoint(geo.x(), geo.y())) :
    362                                                  QApplication::desktop()->availableGeometry(this);
     360            QRect availableGeo = !geo.isNull() ? vboxGlobal().availableGeometry(QPoint(geo.x(), geo.y())) :
     361                                                 vboxGlobal().availableGeometry(this);
    363362
    364363            /* Normalize to the optimal size: */
    … …  
    500499    /* Adjust position if necessary: */
    501500    if (fAdjustPosition)
    502     {
    503         const QDesktopWidget *pDesktopWidget = QApplication::desktop();
    504         const QRegion availableGeo = pDesktopWidget->availableGeometry(pos());
    505         frameGeo = VBoxGlobal::normalizeGeometry(frameGeo, availableGeo);
    506     }
     501        frameGeo = VBoxGlobal::normalizeGeometry(frameGeo, vboxGlobal().availableGeometry(pos()));
    507502
    508503    /* Finally, set the frame geometry: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

    r56704 r57591  
    2121
    2222/* Qt includes: */
    23 # include <QDesktopWidget>
    2423# include <QMainWindow>
    2524# include <QTimer>
    … …  
    176175QRect UIMachineViewScale::workingArea() const
    177176{
    178     return QApplication::desktop()->availableGeometry(this);
     177    return vboxGlobal().availableGeometry(this);
    179178}
    180179

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

    r53872 r57591  
    2121
    2222/* Qt includes: */
    23 # include <QDesktopWidget>
    2423# include <QMenu>
    2524# include <QTimer>
    … …  
    101100        {
    102101            /* Get available geometry, for screen with (x,y) coords if possible: */
    103             QRect availableGeo = !geo.isNull() ? QApplication::desktop()->availableGeometry(QPoint(geo.x(), geo.y())) :
    104                                                  QApplication::desktop()->availableGeometry(this);
     102            QRect availableGeo = !geo.isNull() ? vboxGlobal().availableGeometry(QPoint(geo.x(), geo.y())) :
     103                                                 vboxGlobal().availableGeometry(this);
    105104
    106105            /* Resize to default size: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

    r57102 r57591  
    2121
    2222/* Qt includes: */
    23 # include <QDesktopWidget>
    2423# ifndef Q_WS_MAC
    2524#  include <QTimer>

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

    r57495 r57591  
    2222/* Qt includes: */
    2323# include <QApplication>
    24 # include <QDesktopWidget>
    2524# include <QMainWindow>
    2625# include <QTimer>

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

    r57494 r57591  
    2121
    2222/* Qt includes: */
    23 # include <QDesktopWidget>
    2423# include <QMenu>
    2524# include <QTimer>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

    r57348 r57591  
    1919# include <precomp.h>
    2020#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
    21 
    22 /* Qt includes: */
    23 # include <QDesktopWidget>
    2421
    2522/* GUI includes: */
    … …  
    771768    m_iMaxVRAM = sys.GetMaxGuestVRAM();
    772769    m_iMaxVRAMVisible = m_iMaxVRAM;
    773     const uint cHostScreens = QApplication::desktop()->screenCount();
     770    const uint cHostScreens = vboxGlobal().screenCount();
    774771    m_pSliderVideoMemorySize->setMinimum(m_iMinVRAM);
    775772    m_pSliderVideoMemorySize->setMaximum(m_iMaxVRAMVisible);

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp

    r57102 r57591  
    2525# include <QMdiArea>
    2626# include <QMdiSubWindow>
    27 # include <QDesktopWidget>
    2827# include <QLabel>
    2928# include <QMenu>
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