VirtualBox

Changeset 54463 in vbox


Ignore:
Timestamp:
Feb 24, 2015 5:55:48 PM (10 years ago)
Author:
vboxsync
Message:

FE/Qt: 5978: No need for mini-toolbar under Mac OS X native full-screen mode since menu-bar is accessible through Presentation Mode.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r54199 r54463  
    648648        src/settings/machine/UIMachineSettingsDisplay.cpp \
    649649        src/settings/machine/UIMachineSettingsGeneral.cpp \
    650     src/settings/machine/UIMachineSettingsInterface.cpp \
    651     src/settings/machine/UIMachineSettingsNetwork.cpp \
     650        src/settings/machine/UIMachineSettingsInterface.cpp \
     651        src/settings/machine/UIMachineSettingsNetwork.cpp \
    652652        src/settings/machine/UIMachineSettingsParallel.cpp \
    653653        src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp \
    … …  
    684684        src/widgets/VBoxOSTypeSelectorButton.cpp \
    685685        src/widgets/UINameAndSystemEditor.cpp \
    686     src/widgets/UIWarningPane.cpp \
     686        src/widgets/UIWarningPane.cpp \
    687687        src/widgets/UIFilmContainer.cpp \
    688688        src/widgets/graphics/UIGraphicsButton.cpp \

  • trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

    r54272 r54463  
    9494template<> bool canConvert<GuruMeditationHandlerType>();
    9595template<> bool canConvert<HiDPIOptimizationType>();
     96#ifndef Q_WS_MAC
    9697template<> bool canConvert<MiniToolbarAlignment>();
     98#endif /* !Q_WS_MAC */
    9799
    98100/* Declare COM canConvert specializations: */
    … …  
    178180template<> QString toInternalString(const HiDPIOptimizationType &optimizationType);
    179181template<> HiDPIOptimizationType fromInternalString<HiDPIOptimizationType>(const QString &strOptimizationType);
     182#ifndef Q_WS_MAC
    180183template<> QString toInternalString(const MiniToolbarAlignment &miniToolbarAlignment);
    181184template<> MiniToolbarAlignment fromInternalString<MiniToolbarAlignment>(const QString &strMiniToolbarAlignment);
     185#endif /* !Q_WS_MAC */
    182186
    183187/* Declare COM conversion specializations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

    r54459 r54463  
    6565template<> bool canConvert<GuruMeditationHandlerType>() { return true; }
    6666template<> bool canConvert<HiDPIOptimizationType>() { return true; }
     67#ifndef Q_WS_MAC
    6768template<> bool canConvert<MiniToolbarAlignment>() { return true; }
     69#endif /* !Q_WS_MAC */
    6870
    6971/* QString <= SizeSuffix: */
    … …  
    14531455}
    14541456
     1457#ifndef Q_WS_MAC
    14551458/* QString <= MiniToolbarAlignment: */
    14561459template<> QString toInternalString(const MiniToolbarAlignment &miniToolbarAlignment)
    … …  
    14811484    return values.at(keys.indexOf(QRegExp(strMiniToolbarAlignment, Qt::CaseInsensitive)));
    14821485}
    1483 
     1486#endif /* !Q_WS_MAC */
     1487

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

    r54459 r54463  
    127127const char* UIExtraDataDefs::GUI_HiDPI_UnscaledOutput = "GUI/HiDPI/UnscaledOutput";
    128128const char* UIExtraDataDefs::GUI_HiDPI_Optimization = "GUI/HiDPI/Optimization";
     129#ifndef Q_WS_MAC
    129130const char* UIExtraDataDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar";
    130131const char* UIExtraDataDefs::GUI_MiniToolBarAutoHide = "GUI/MiniToolBarAutoHide";
    131132const char* UIExtraDataDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment";
     133#endif /* !Q_WS_MAC */
    132134const char* UIExtraDataDefs::GUI_StatusBar_Enabled = "GUI/StatusBar/Enabled";
    133135const char* UIExtraDataDefs::GUI_RestrictedStatusBarIndicators = "GUI/RestrictedStatusBarIndicators";

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

    r54459 r54463  
    217217        /** Holds Runtime UI HiDPI optimization type. */
    218218        extern const char* GUI_HiDPI_Optimization;
     219#ifndef Q_WS_MAC
    219220        /** Holds whether mini-toolbar is enabled for full and seamless screens. */
    220221        extern const char* GUI_ShowMiniToolBar;
    … …  
    223224        /** Holds mini-toolbar alignment. */
    224225        extern const char* GUI_MiniToolBarAlignment;
     226#endif /* !Q_WS_MAC */
    225227        /** Holds Runtime UI status-bar availability status. */
    226228        extern const char* GUI_StatusBar_Enabled;
    … …  
    637639};
    638640
     641#ifndef Q_WS_MAC
    639642/** Runtime UI: Mini-toolbar alignment. */
    640643enum MiniToolbarAlignment
    … …  
    643646    MiniToolbarAlignment_Top
    644647};
     648#endif /* !Q_WS_MAC */
    645649
    646650#endif /* !___UIExtraDataDefs_h___ */

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

    r54459 r54463  
    17841784           << GUI_HiDPI_UnscaledOutput
    17851785           << GUI_HiDPI_Optimization
     1786#ifndef Q_WS_MAC
    17861787           << GUI_ShowMiniToolBar << GUI_MiniToolBarAutoHide << GUI_MiniToolBarAlignment
     1788#endif /* !Q_WS_MAC */
    17871789           << GUI_StatusBar_Enabled << GUI_RestrictedStatusBarIndicators << GUI_StatusBar_IndicatorOrder
    17881790#ifdef Q_WS_MAC
    … …  
    31693171}
    31703172
     3173#ifndef Q_WS_MAC
    31713174bool UIExtraDataManager::miniToolbarEnabled(const QString &strID)
    31723175{
    … …  
    32143217    setExtraDataString(GUI_MiniToolBarAlignment, QString(), strID);
    32153218}
     3219#endif /* Q_WS_MAC */
    32163220
    32173221bool UIExtraDataManager::statusBarEnabled(const QString &strID)

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

    r54459 r54463  
    414414        HiDPIOptimizationType hiDPIOptimizationType(const QString &strID);
    415415
     416#ifndef Q_WS_MAC
    416417        /** Returns whether mini-toolbar is enabled for full and seamless screens. */
    417418        bool miniToolbarEnabled(const QString &strID);
    … …  
    428429        /** Returns mini-toolbar @a alignment. */
    429430        void setMiniToolbarAlignment(Qt::AlignmentFlag alignment, const QString &strID);
     431#endif /* Q_WS_MAC */
    430432
    431433        /** Returns whether Runtime UI status-bar is enabled. */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h

    r53050 r54463  
    3636    UIVisualElement_VideoCapture          = RT_BIT(10),
    3737    UIVisualElement_FeaturesStuff         = RT_BIT(11),
     38#ifndef Q_WS_MAC
    3839    UIVisualElement_MiniToolBar           = RT_BIT(12),
     40#endif /* !Q_WS_MAC */
    3941    UIVisualElement_AllStuff              = 0xFFFF
    4042};

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

    r54272 r54463  
    744744                    "Ask transient machine-window #%d to hide.\n", (int)uScreenID));
    745745
    746             /* Make sure mini-toolbar hidden: */
    747             pMachineWindowFullscreen->setMiniToolbarVisible(false);
    748746            /* Make sure window hidden: */
    749747            pMachineWindow->hide();
    … …  
    757755            /* Make sure window have proper geometry and shown: */
    758756            pMachineWindow->showInNecessaryMode();
    759             /* Make sure mini-toolbar shown: */
    760             pMachineWindowFullscreen->setMiniToolbarVisible(true);
    761757        }
    762758    }
    … …  
    779775                setPresentationModeEnabled(true);
    780776
    781                 /* Make sure mini-toolbar hidden: */
    782                 pMachineWindowFullscreen->setMiniToolbarVisible(false);
    783777                /* Make sure window have proper geometry and shown: */
    784778                pMachineWindow->showInNecessaryMode();
    … …  
    794788                        "Ask machine-window #%d to hide.\n", (int)uScreenID));
    795789
    796                 /* Make sure mini-toolbar hidden: */
    797                 pMachineWindowFullscreen->setMiniToolbarVisible(false);
    798790                /* Make sure window hidden: */
    799791                pMachineWindow->hide();
    … …  
    823815                m_invalidFullscreenMachineWindows << pMachineWindow;
    824816
    825                 /* Make sure mini-toolbar hidden: */
    826                 pMachineWindowFullscreen->setMiniToolbarVisible(false);
    827817                /* Ask window to exit 'fullscreen' mode: */
    828818                emit sigNotifyAboutNativeFullscreenShouldBeExited(pMachineWindow);
    … …  
    837827                        "Ask machine-window #%d to adjust guest geometry.\n", (int)uScreenID));
    838828
    839                 /* Make sure mini-toolbar shown: */
    840                 pMachineWindowFullscreen->setMiniToolbarVisible(true);
    841829                /* Just adjust machine-view size if necessary: */
    842830                pMachineWindow->adjustMachineViewSize();
    843831                return;
    844832            }
    845 
    846             /* Make sure mini-toolbar shown: */
    847             pMachineWindowFullscreen->setMiniToolbarVisible(true);
    848833        }
    849834    }

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

    r53068 r54463  
    4949UIMachineWindowFullscreen::UIMachineWindowFullscreen(UIMachineLogic *pMachineLogic, ulong uScreenId)
    5050    : UIMachineWindow(pMachineLogic, uScreenId)
     51#ifndef Q_WS_MAC
    5152    , m_pMiniToolBar(0)
     53#endif /* !Q_WS_MAC */
    5254#ifdef Q_WS_MAC
    5355    , m_fIsInFullscreenTransition(false)
    … …  
    108110    }
    109111}
    110 
    111 void UIMachineWindowFullscreen::setMiniToolbarVisible(bool fVisible)
    112 {
    113     /* Make sure mini-toolbar exists: */
    114     if (!m_pMiniToolBar)
    115         return;
    116     /* Set mini-toolbar visibility to passed one: */
    117     m_pMiniToolBar->setVisible(fVisible);
    118 }
    119112#endif /* Q_WS_MAC */
    120113
     114#ifndef Q_WS_MAC
    121115void UIMachineWindowFullscreen::sltMachineStateChanged()
    122116{
    … …  
    127121    updateAppearanceOf(UIVisualElement_MiniToolBar);
    128122}
     123#endif /* !Q_WS_MAC */
    129124
    130125#ifdef Q_WS_MAC
    … …  
    206201    setAutoFillBackground(true);
    207202
     203#ifndef Q_WS_MAC
    208204    /* Prepare mini-toolbar: */
    209205    prepareMiniToolbar();
     206#endif /* !Q_WS_MAC */
    210207
    211208#ifdef Q_WS_MAC
    … …  
    237234}
    238235
     236#ifndef Q_WS_MAC
    239237void UIMachineWindowFullscreen::prepareMiniToolbar()
    240238{
    … …  
    249247                                              gEDataManager->autoHideMiniToolbar(vboxGlobal().managedVMUuid()));
    250248    m_pMiniToolBar->addMenus(actionPool()->menus());
    251 #ifdef RT_OS_DARWIN
    252     connect(machineLogic(), SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
    253             m_pMiniToolBar, SLOT(sltHandle3DOverlayVisibilityChange(bool)));
    254 #endif /* RT_OS_DARWIN */
    255 #ifndef RT_OS_DARWIN
    256249    connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), this, SLOT(showMinimized()));
    257 #endif /* !RT_OS_DARWIN */
    258250    connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
    259251            actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SLOT(trigger()));
    260 #ifdef RT_OS_DARWIN
    261     connect(m_pMiniToolBar, SIGNAL(sigCloseAction()),
    262             actionPool()->action(UIActionIndex_M_Application_S_Close), SLOT(trigger()));
    263 #else /* !RT_OS_DARWIN */
    264252    connect(m_pMiniToolBar, SIGNAL(sigCloseAction()),
    265253            actionPool()->action(UIActionIndexRT_M_Machine_S_Close), SLOT(trigger()));
    266 #endif /* !RT_OS_DARWIN */
    267254    connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()),
    268255            this, SLOT(sltRevokeFocus()), Qt::QueuedConnection);
    269256}
    270 
     257#endif /* !Q_WS_MAC */
     258
     259#ifndef Q_WS_MAC
    271260void UIMachineWindowFullscreen::cleanupMiniToolbar()
    272261{
    … …  
    281270    m_pMiniToolBar = 0;
    282271}
     272#endif /* !Q_WS_MAC *//
    283273
    284274void UIMachineWindowFullscreen::cleanupVisualState()
    … …  
    297287#endif /* Q_WS_MAC */
    298288
     289#ifndef Q_WS_MAC
    299290    /* Cleanup mini-toolbar: */
    300291    cleanupMiniToolbar();
     292#endif /* !Q_WS_MAC */
    301293
    302294    /* Call to base-class: */
    … …  
    364356        !pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
    365357    {
     358#ifndef Q_WS_MAC
    366359        /* If there is mini-toolbar: */
    367360        if (m_pMiniToolBar)
    368361        {
    369 #if   defined(Q_WS_WIN) || defined(Q_WS_X11)
    370362            /* Just hide mini-toolbar: */
    371363            m_pMiniToolBar->hide();
    372 #elif defined(Q_WS_MAC)
    373             /* If no native full-screen used: */
    374             if (!fSupportsNativeFullScreen)
    375             {
    376                 /* Just hide mini-toolbar: */
    377                 m_pMiniToolBar->hide();
    378             }
    379 #endif /* Q_WS_MAC */
    380364        }
     365#endif /* !Q_WS_MAC */
    381366        /* Hide window: */
    382367        hide();
    … …  
    433418    adjustMachineViewSize();
    434419
     420#ifndef Q_WS_MAC
    435421    /* If there is mini-toolbar: */
    436422    if (m_pMiniToolBar)
    437423    {
    438 #if   defined(Q_WS_WIN)
     424# if   defined(Q_WS_WIN)
    439425        /* Just show mini-toolbar: */
    440426        m_pMiniToolBar->show();
    441 #elif defined(Q_WS_MAC)
    442         /* If no native full-screen used: */
    443         if (!fSupportsNativeFullScreen)
    444         {
    445             /* Just show mini-toolbar: */
    446             m_pMiniToolBar->show();
    447         }
    448 #elif defined(Q_WS_X11)
     427# elif defined(Q_WS_X11)
    449428        /* Allow mini-toolbar to be located on full-screen area: */
    450429        m_pMiniToolBar->showFullScreen();
    … …  
    457436        /* Make sure mini-toolbar is always on top of machine-window: */
    458437        VBoxGlobal::setTransientFor(m_pMiniToolBar, this);
    459 #endif /* Q_WS_X11 */
    460     }
     438# endif /* Q_WS_X11 */
     439    }
     440#endif /* !Q_WS_MAC */
    461441
    462442    /* Make sure machine-view have focus: */
    … …  
    469449    UIMachineWindow::adjustMachineViewSize();
    470450
     451#ifndef Q_WS_MAC
    471452    /* If mini-toolbar present: */
    472453    if (m_pMiniToolBar)
    473454    {
    474455        /* Make sure this window has fullscreen logic: */
    475         UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
     456        const UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
    476457        AssertPtrReturnVoid(pFullscreenLogic);
    477458
    … …  
    490471#endif /* Q_WS_X11 */
    491472    }
    492 }
    493 
     473#endif /* !Q_WS_MAC */
     474}
     475
     476#ifndef Q_WS_MAC
    494477void UIMachineWindowFullscreen::updateAppearanceOf(int iElement)
    495478{
    … …  
    514497    }
    515498}
    516 
     499#endif /* !Q_WS_MAC */
     500

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

    r52729 r54463  
    2121#include "UIMachineWindow.h"
    2222
     23#ifndef Q_WS_MAC
    2324/* Forward declarations: */
    2425class UIRuntimeMiniToolBar;
     26#endif /* !Q_WS_MAC */
    2527
    2628/* Fullscreen machine-window implementation: */
    … …  
    5355    /** Mac OS X: Returns whether window is in 'fullscreen' transition. */
    5456    bool isInFullscreenTransition() const { return m_fIsInFullscreenTransition; }
    55     /** Mac OS X: Defines whether mini-toolbar should be @a fVisible. */
    56     void setMiniToolbarVisible(bool fVisible);
    5757#endif /* Q_WS_MAC */
    5858
    5959private slots:
    6060
     61#ifndef Q_WS_MAC
    6162    /* Session event-handlers: */
    6263    void sltMachineStateChanged();
     64#endif /* !Q_WS_MAC */
    6365
    6466#ifdef RT_OS_DARWIN
    … …  
    7678    /* Prepare helpers: */
    7779    void prepareVisualState();
     80#ifndef Q_WS_MAC
    7881    void prepareMiniToolbar();
     82#endif /* !Q_WS_MAC */
    7983
    8084    /* Cleanup helpers: */
     85#ifndef Q_WS_MAC
    8186    void cleanupMiniToolbar();
     87#endif /* !Q_WS_MAC */
    8288    void cleanupVisualState();
    8389
    … …  
    8995    virtual void adjustMachineViewSize();
    9096
    91     /* Update stuff: */
     97#ifndef Q_WS_MAC
     98    /* Update routines: */
    9299    void updateAppearanceOf(int iElement);
     100#endif /* !Q_WS_MAC */
    93101
    94     /* Widgets: */
     102#ifndef Q_WS_MAC
     103    /** Holds the mini-toolbar instance. */
    95104    UIRuntimeMiniToolBar *m_pMiniToolBar;
     105#endif /* !Q_WS_MAC */
    96106
    97107#ifdef Q_WS_MAC

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

    r53068 r54463  
    136136    connect(m_pMiniToolBar, SIGNAL(sigCloseAction()),
    137137            actionPool()->action(UIActionIndexRT_M_Machine_S_Close), SLOT(trigger()));
    138     connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()), this, SLOT(sltRevokeFocus()));
     138    connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()),
     139            this, SLOT(sltRevokeFocus()), Qt::QueuedConnection);
    139140}
    140141#endif /* !Q_WS_MAC */

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

    r52891 r54463  
    2121#include "UIMachineWindow.h"
    2222
     23#ifndef Q_WS_MAC
    2324/* Forward declarations: */
    2425class UIRuntimeMiniToolBar;
     26#endif /* !Q_WS_MAC */
    2527
    2628/* Seamless machine-window implementation: */
    … …  
    8082#endif /* VBOX_WITH_MASKED_SEAMLESS */
    8183
    82     /* Widgets: */
    8384#ifndef Q_WS_MAC
     85    /** Holds the mini-toolbar instance. */
    8486    UIRuntimeMiniToolBar *m_pMiniToolBar;
    8587#endif /* !Q_WS_MAC */

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp

    r54285 r54463  
    10881088#endif /* Q_WS_MAC */
    10891089
     1090#ifndef Q_WS_MAC
    10901091            /* Get mini-toolbar availability status: */
    10911092            const QString strMiniToolbarEnabled = localMachine.GetExtraData(UIExtraDataDefs::GUI_ShowMiniToolBar);
    … …  
    11231124                                              QApplication::translate("UIGDetails", "Disabled", "details (user interface/mini-toolbar)"));
    11241125            }
     1126#endif /* !Q_WS_MAC */
    11251127        }
    11261128        else

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

    r54199 r54463  
    6060#ifdef Q_WS_MAC
    6161    interfaceData.m_fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(m_machine.GetId());
    62 #endif /* Q_WS_MAC */
     62#else /* !Q_WS_MAC */
    6363    interfaceData.m_fShowMiniToolBar = gEDataManager->miniToolbarEnabled(m_machine.GetId());
    6464    interfaceData.m_fMiniToolBarAtTop = gEDataManager->miniToolbarAlignment(m_machine.GetId()) == Qt::AlignTop;
     65#endif /* !Q_WS_MAC */
    6566
    6667    /* Cache interface data: */
    … …  
    8283#ifdef Q_WS_MAC
    8384    m_pCheckBoxUnscaledHiDPIOutput->setChecked(interfaceData.m_fUseUnscaledHiDPIOutput);
    84 #endif /* Q_WS_MAC */
     85#else /* !Q_WS_MAC */
    8586    m_pCheckBoxShowMiniToolBar->setChecked(interfaceData.m_fShowMiniToolBar);
    8687    m_pComboToolBarAlignment->setChecked(interfaceData.m_fMiniToolBarAtTop);
     88#endif /* !Q_WS_MAC */
    8789
    8890    /* Polish page finally: */
    … …  
    104106#ifdef Q_WS_MAC
    105107    interfaceData.m_fUseUnscaledHiDPIOutput = m_pCheckBoxUnscaledHiDPIOutput->isChecked();
    106 #endif /* Q_WS_MAC */
     108#else /* !Q_WS_MAC */
    107109    interfaceData.m_fShowMiniToolBar = m_pCheckBoxShowMiniToolBar->isChecked();
    108110    interfaceData.m_fMiniToolBarAtTop = m_pComboToolBarAlignment->isChecked();
     111#endif /* !Q_WS_MAC */
    109112
    110113    /* Cache interface data: */
    … …  
    131134#ifdef Q_WS_MAC
    132135            gEDataManager->setUseUnscaledHiDPIOutput(interfaceData.m_fUseUnscaledHiDPIOutput, m_machine.GetId());
    133 #endif /* Q_WS_MAC */
     136#else /* !Q_WS_MAC */
    134137            gEDataManager->setMiniToolbarEnabled(interfaceData.m_fShowMiniToolBar, m_machine.GetId());
    135138            gEDataManager->setMiniToolbarAlignment(interfaceData.m_fMiniToolBarAtTop ? Qt::AlignTop : Qt::AlignBottom, m_machine.GetId());
     139#endif /* !Q_WS_MAC */
    136140        }
    137141    }
    … …  
    169173    m_pLabelHiDPI->setEnabled(isMachineInValidMode());
    170174    m_pCheckBoxUnscaledHiDPIOutput->setEnabled(isMachineInValidMode());
     175    m_pLabelMiniToolBar->hide();
     176    m_pCheckBoxShowMiniToolBar->hide();
     177    m_pComboToolBarAlignment->hide();
    171178#else /* !Q_WS_MAC */
    172179    m_pLabelHiDPI->hide();
    173180    m_pCheckBoxUnscaledHiDPIOutput->hide();
    174 #endif /* !Q_WS_MAC */
    175181    m_pLabelMiniToolBar->setEnabled(isMachineInValidMode());
    176182    m_pCheckBoxShowMiniToolBar->setEnabled(isMachineInValidMode());
    177183    m_pComboToolBarAlignment->setEnabled(isMachineInValidMode() && m_pCheckBoxShowMiniToolBar->isChecked());
     184#endif /* !Q_WS_MAC */
    178185    m_pStatusBarEditor->setEnabled(isMachineInValidMode());
    179186}

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h

    r54228 r54463  
    3333#ifdef Q_WS_MAC
    3434        , m_fUseUnscaledHiDPIOutput(false)
    35 #endif /* Q_WS_MAC */
     35#else /* !Q_WS_MAC */
    3636        , m_fShowMiniToolBar(false)
    3737        , m_fMiniToolBarAtTop(false)
     38#endif /* !Q_WS_MAC */
    3839    {}
    3940
    … …  
    4142    bool equal(const UIDataSettingsMachineInterface &other) const
    4243    {
    43         return (m_dScaleFactor == other.m_dScaleFactor) &&
     44        return    (m_dScaleFactor == other.m_dScaleFactor)
    4445#ifdef Q_WS_MAC
    45                (m_fUseUnscaledHiDPIOutput == other.m_fUseUnscaledHiDPIOutput) &&
    46 #endif /* Q_WS_MAC */
    47                (m_fShowMiniToolBar == other.m_fShowMiniToolBar) &&
    48                (m_fMiniToolBarAtTop == other.m_fMiniToolBarAtTop);
     46               && (m_fUseUnscaledHiDPIOutput == other.m_fUseUnscaledHiDPIOutput)
     47#else /* !Q_WS_MAC */
     48               && (m_fShowMiniToolBar == other.m_fShowMiniToolBar)
     49               && (m_fMiniToolBarAtTop == other.m_fMiniToolBarAtTop)
     50#endif /* !Q_WS_MAC */
     51        ;
    4952    }
    5053
    … …  
    5760#ifdef Q_WS_MAC
    5861    bool m_fUseUnscaledHiDPIOutput;
    59 #endif /* Q_WS_MAC */
     62#else /* !Q_WS_MAC */
    6063    bool m_fShowMiniToolBar;
    6164    bool m_fMiniToolBarAtTop;
     65#endif /* !Q_WS_MAC */
    6266};
    6367typedef UISettingsCache<UIDataSettingsMachineInterface> UICacheSettingsMachineInterface;
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