VirtualBox

Changeset 41689 in vbox for trunk/src/VBox/Frontends


Ignore:
Timestamp:
Jun 13, 2012 5:13:36 PM (13 years ago)
Author:
vboxsync
Message:

FE/Qt: VBoxDefs renamed to UIDefs and reworked into namespace. Corresponding files which were using VBoxDefs updated.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
67 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    r41632 r41689  
    470470        src/extensions/QITreeWidget.cpp \
    471471        src/extensions/QIWidgetValidator.cpp \
     472        src/globals/UIDefs.cpp \
    472473        src/globals/COMDefs.cpp \
    473474        src/globals/UIActionPool.cpp \
    … …  
    477478        src/globals/UIMainEventListener.cpp \
    478479        src/globals/UIMessageCenter.cpp \
    479         src/globals/VBoxDefs.cpp \
    480480        src/globals/VBoxGlobal.cpp \
    481481        src/globals/COMEnumsWrapper.cpp \

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

    r41611 r41689  
    210210public:
    211211    VBoxVHWACommandProcessEvent ()
    212         : QEvent ((QEvent::Type) VBoxDefs::VHWACommandProcessType)
     212        : QEvent ((QEvent::Type) VHWACommandProcessType)
    213213    {
    214214#ifdef DEBUG_misha
    … …  
    57745774    CMachine machine = session.GetMachine();
    57755775
    5776     QString str = machine.GetExtraData (VBoxDefs::GUI_Accelerate2D_StretchLinear);
     5776    QString str = machine.GetExtraData (GUI_Accelerate2D_StretchLinear);
    57775777    mStretchLinearEnabled = str != "off";
    57785778
    57795779    uint32_t aFourccs[VBOXVHWA_NUMFOURCC];
    57805780    int num = 0;
    5781     str = machine.GetExtraData (VBoxDefs::GUI_Accelerate2D_PixformatAYUV);
     5781    str = machine.GetExtraData (GUI_Accelerate2D_PixformatAYUV);
    57825782    if (str != "off")
    57835783        aFourccs[num++] = FOURCC_AYUV;
    5784     str = machine.GetExtraData (VBoxDefs::GUI_Accelerate2D_PixformatUYVY);
     5784    str = machine.GetExtraData (GUI_Accelerate2D_PixformatUYVY);
    57855785    if (str != "off")
    57865786        aFourccs[num++] = FOURCC_UYVY;
    5787     str = machine.GetExtraData (VBoxDefs::GUI_Accelerate2D_PixformatYUY2);
     5787    str = machine.GetExtraData (GUI_Accelerate2D_PixformatYUY2);
    57885788    if (str != "off")
    57895789        aFourccs[num++] = FOURCC_YUY2;
    5790     str = machine.GetExtraData (VBoxDefs::GUI_Accelerate2D_PixformatYV12);
     5790    str = machine.GetExtraData (GUI_Accelerate2D_PixformatYV12);
    57915791    if (str != "off")
    57925792        aFourccs[num++] = FOURCC_YV12;

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

    r41611 r41689  
    3030
    3131/* GUI includes: */
     32#include "UIDefs.h"
    3233#include "VBoxFBOverlayCommon.h"
    3334

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

    r41587 r41689  
    2828
    2929/* GUI includes: */
     30#include "UIDefs.h"
    3031#include "VBoxGlobalSettings.h"
    3132#include "UIHotKeyEditor.h"
    … …  
    127128    { "GUI/TrayIcon/Enabled",                      "trayIconEnabled",         "true|false", true },
    128129#ifdef Q_WS_MAC
    129     { VBoxDefs::GUI_PresentationModeEnabled,       "presentationModeEnabled", "true|false", true },
     130    { GUI_PresentationModeEnabled,                 "presentationModeEnabled", "true|false", true },
    130131#endif /* Q_WS_MAC */
    131132    { "GUI/HostScreenSaverDisabled",               "hostScreenSaverDisabled", "true|false", true }

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

    r41591 r41689  
    129129
    130130    /* Preload dialog attributes for this vm */
    131     QString dlgsize = mSession.GetMachine().GetExtraData (VBoxDefs::GUI_InfoDlgState);
     131    QString dlgsize = mSession.GetMachine().GetExtraData(GUI_InfoDlgState);
    132132    if (dlgsize.isEmpty())
    133133    {
    … …  
    151151    /* Save dialog attributes for this vm */
    152152    QString dlgsize ("%1,%2,%3");
    153     mSession.GetMachine().SetExtraData (VBoxDefs::GUI_InfoDlgState,
    154         dlgsize.arg (mWidth).arg (mHeight).arg (isMaximized() ? "max" : "normal"));
     153    mSession.GetMachine().SetExtraData(GUI_InfoDlgState,
     154                                       dlgsize.arg(mWidth).arg(mHeight).arg(isMaximized() ? "max" : "normal"));
    155155
    156156    if (!mSession.isNull() && !mSession.GetMachine().isNull())

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

    r34064 r41689  
    1818 */
    1919
    20 #include "QIListView.h"
    21 #include "VBoxDefs.h"
    22 
    2320#if MAC_LEOPARD_STYLE
    24 /* Qt includes */
     21/* Qt includes: */
    2522# include <QPainter>
    2623# include <QApplication>
    … …  
    2825#endif /* MAC_LEOPARD_STYLE */
    2926
    30 
    31 /* QIListView class */
     27/* GUI includes: */
     28#include "QIListView.h"
    3229
    3330QIListView::QIListView (QWidget *aParent /* = 0 */)

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

    r41175 r41689  
    1818 */
    1919
    20 /* VBox includes */
    21 #include "VBoxDefs.h"
    22 #include "VBoxGlobal.h"
    23 #include "QIArrowSplitter.h"
    24 #include "QIMessageBox.h"
    25 #include "QILabel.h"
    26 #include "QIDialogButtonBox.h"
    27 #include "UIIconPool.h"
    28 
    29 /* Qt includes */
     20/* Qt includes: */
    3021#include <QHBoxLayout>
    3122#include <QLabel>
    … …  
    3728#include <QClipboard>
    3829
     30/* GUI includes: */
     31#include "VBoxGlobal.h"
     32#include "QIArrowSplitter.h"
     33#include "QIMessageBox.h"
     34#include "QILabel.h"
     35#include "QIDialogButtonBox.h"
     36#include "UIIconPool.h"
    3937#ifdef Q_WS_MAC
    4038# include "UIMachineWindowFullscreen.h"

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

    r41587 r41689  
    1818 */
    1919
    20 /* COM includes: */
    21 #include "COMDefs.h"
    22 #include "CVirtualBoxErrorInfo.h"
    23 
    24 #if !defined (VBOX_WITH_XPCOM)
    25 
    26 
    27 #else /* !defined (VBOX_WITH_XPCOM) */
    28 
    2920/* Qt includes: */
    3021#include <QObject>
    3122#include <QSocketNotifier>
     23
     24/* COM includes: */
     25#include "COMDefs.h"
     26#include "UIDefs.h"
     27#include "CVirtualBoxErrorInfo.h"
     28
     29#if !defined (VBOX_WITH_XPCOM)
     30
     31#else /* !defined (VBOX_WITH_XPCOM) */
    3232
    3333/* Other VBox includes: */

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h

    r41587 r41689  
    108108#endif /* !defined (VBOX_WITH_XPCOM) */
    109109
    110 #include "VBoxDefs.h"
    111 
    112 
    113110/////////////////////////////////////////////////////////////////////////////
    114111

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

    r41685 r41689  
    2525/* GUI includes: */
    2626#include "COMEnumsWrapper.h"
     27#include "UIDefs.h"
    2728
    2829/* static */

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

    r41047 r41689  
    3535
    3636    ActivateActionEvent(QAction *pAction)
    37         : QEvent((QEvent::Type)VBoxDefs::ActivateActionEventType)
     37        : QEvent((QEvent::Type)ActivateActionEventType)
    3838        , m_pAction(pAction) {}
    3939    QAction* action() const { return m_pAction; }
    … …  
    383383    {
    384384        setEnabled(vboxGlobal().virtualBox().
    385                    GetExtraData(VBoxDefs::GUI_RegistrationDlgWinID).isEmpty());
     385                   GetExtraData(GUI_RegistrationDlgWinID).isEmpty());
    386386        switch (gActionPool->type())
    387387        {
    … …  
    616616    switch (pEvent->type())
    617617    {
    618         case VBoxDefs::ActivateActionEventType:
     618        case ActivateActionEventType:
    619619        {
    620620            /* Process specific event: */

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

    r41679 r41689  
    11/* $Id$ */
    2 /** @file
    3  *
    4  * VBox frontends: Qt GUI ("VirtualBox"):
    5  * VBoxDefs implementation
    6  */
     2/// @file
     3///
     4/// VBox frontends: Qt GUI ("VirtualBox"):
     5/// Global definitions and function implementations
    76
    8 /*
    9  * Copyright (C) 2006-2010 Oracle Corporation
    10  *
    11  * This file is part of VirtualBox Open Source Edition (OSE), as
    12  * available from http://www.virtualbox.org. This file is free software;
    13  * you can redistribute it and/or modify it under the terms of the GNU
    14  * General Public License (GPL) as published by the Free Software
    15  * Foundation, in version 2 as it comes in the "COPYING" file of the
    16  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
    17  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    18  */
     7// Copyright (C) 2006-2012 Oracle Corporation
     8//
     9// This file is part of VirtualBox Open Source Edition (OSE), as
     10// available from http://www.virtualbox.org. This file is free software;
     11// you can redistribute it and/or modify it under the terms of the GNU
     12// General Public License (GPL) as published by the Free Software
     13// Foundation, in version 2 as it comes in the "COPYING" file of the
     14// VirtualBox OSE distribution. VirtualBox OSE is distributed in the
     15// hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1916
    20 /* Local includes */
    21 #include <VBoxDefs.h>
     17// GUI includes:
     18#include "UIDefs.h"
    2219
    23 /* Global includes */
    24 #include <QStringList>
     20// Global definitions:
     21const char* UIDefs::GUI_RenderMode = "GUI/RenderMode";
     22const char* UIDefs::GUI_LanguageId = "GUI/LanguageID";
     23const char* UIDefs::GUI_ExtPackName = "Oracle VM VirtualBox Extension Pack";
     24const char* UIDefs::GUI_PreventBetaWarning = "GUI/PreventBetaWarning";
     25const char* UIDefs::GUI_RecentFolderHD = "GUI/RecentFolderHD";
     26const char* UIDefs::GUI_RecentFolderCD = "GUI/RecentFolderCD";
     27const char* UIDefs::GUI_RecentFolderFD = "GUI/RecentFolderFD";
     28const char* UIDefs::GUI_RecentListHD = "GUI/RecentListHD";
     29const char* UIDefs::GUI_RecentListCD = "GUI/RecentListCD";
     30const char* UIDefs::GUI_RecentListFD = "GUI/RecentListFD";
    2531
    26 /* VBoxGlobalDefs stuff: */
    27 const char* VBoxGlobalDefs::UI_ExtPackName = "Oracle VM VirtualBox Extension Pack";
     32// Selector-window definitions:
     33const char* UIDefs::GUI_Input_SelectorShortcuts = "GUI/Input/SelectorShortcuts";
     34const char* UIDefs::GUI_LastSelectorWindowPosition = "GUI/LastWindowPosition";
     35const char* UIDefs::GUI_SplitterSizes = "GUI/SplitterSizes";
     36const char* UIDefs::GUI_Toolbar = "GUI/Toolbar";
     37const char* UIDefs::GUI_Statusbar = "GUI/Statusbar";
     38const char* UIDefs::GUI_PreviewUpdate = "GUI/PreviewUpdate";
     39const char* UIDefs::GUI_DetailsPageBoxes = "GUI/DetailsPageBoxes";
     40const char* UIDefs::GUI_SelectorVMPositions = "GUI/SelectorVMPositions";
     41const char* UIDefs::GUI_LastVMSelected = "GUI/LastVMSelected";
    2842
    29 /* VBoxDefs stuff: */
    30 const char* VBoxDefs::GUI_LastWindowPosition = "GUI/LastWindowPosition";
    31 const char* VBoxDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition";
    32 const char* VBoxDefs::GUI_LastScaleWindowPosition = "GUI/LastScaleWindowPosition";
    33 const char* VBoxDefs::GUI_LastWindowState_Max = "max";
    34 const char* VBoxDefs::GUI_LastGuestSizeHint = "GUI/LastGuestSizeHint";
    35 const char* VBoxDefs::GUI_LastGuestSizeHintWasFullscreen = "GUI/LastGuestSizeHintWasFullscreen";
    36 const char* VBoxDefs::GUI_Toolbar = "GUI/Toolbar";
    37 const char* VBoxDefs::GUI_Statusbar = "GUI/Statusbar";
    38 const char* VBoxDefs::GUI_SplitterSizes = "GUI/SplitterSizes";
    39 const char* VBoxDefs::GUI_Fullscreen = "GUI/Fullscreen";
    40 const char* VBoxDefs::GUI_Seamless = "GUI/Seamless";
    41 const char* VBoxDefs::GUI_Scale = "GUI/Scale";
    42 const char* VBoxDefs::GUI_VirtualScreenToHostScreen = "GUI/VirtualScreenToHostScreen";
    43 const char* VBoxDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest";
    44 const char* VBoxDefs::GUI_FirstRun = "GUI/FirstRun";
    45 const char* VBoxDefs::GUI_HideDescriptionForWizards = "GUI/HideDescriptionForWizards";
    46 const char* VBoxDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime";
    47 const char* VBoxDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar";
    48 const char* VBoxDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment";
    49 const char* VBoxDefs::GUI_MiniToolBarAutoHide = "GUI/MiniToolBarAutoHide";
    50 const char* VBoxDefs::GUI_LastCloseAction = "GUI/LastCloseAction";
    51 const char* VBoxDefs::GUI_RestrictedCloseActions = "GUI/RestrictedCloseActions";
    52 const char* VBoxDefs::GUI_CloseActionHook = "GUI/CloseActionHook";
    53 const char* VBoxDefs::GUI_SuppressMessages = "GUI/SuppressMessages";
    54 const char* VBoxDefs::GUI_InvertMessageOption = "GUI/InvertMessageOption";
    55 const char* VBoxDefs::GUI_PermanentSharedFoldersAtRuntime = "GUI/PermanentSharedFoldersAtRuntime";
    56 const char* VBoxDefs::GUI_LanguageId = "GUI/LanguageID";
    57 const char* VBoxDefs::GUI_PreviewUpdate = "GUI/PreviewUpdate";
    58 const char* VBoxDefs::GUI_DetailsPageBoxes = "GUI/DetailsPageBoxes";
    59 const char* VBoxDefs::GUI_SelectorVMPositions = "GUI/SelectorVMPositions";
    60 const char* VBoxDefs::GUI_Input_MachineShortcuts = "GUI/Input/MachineShortcuts";
    61 const char* VBoxDefs::GUI_Input_SelectorShortcuts = "GUI/Input/SelectorShortcuts";
     43// Machine-window definitions:
     44const char* UIDefs::GUI_Input_MachineShortcuts = "GUI/Input/MachineShortcuts";
     45const char* UIDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition";
     46const char* UIDefs::GUI_LastScaleWindowPosition = "GUI/LastScaleWindowPosition";
     47const char* UIDefs::GUI_LastWindowState_Max = "max";
     48const char* UIDefs::GUI_LastGuestSizeHint = "GUI/LastGuestSizeHint";
     49const char* UIDefs::GUI_LastGuestSizeHintWasFullscreen = "GUI/LastGuestSizeHintWasFullscreen";
     50const char* UIDefs::GUI_Fullscreen = "GUI/Fullscreen";
     51const char* UIDefs::GUI_Seamless = "GUI/Seamless";
     52const char* UIDefs::GUI_Scale = "GUI/Scale";
     53const char* UIDefs::GUI_VirtualScreenToHostScreen = "GUI/VirtualScreenToHostScreen";
     54const char* UIDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest";
     55const char* UIDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime";
     56const char* UIDefs::GUI_PassCAD = "GUI/PassCAD";
     57
     58// Mini tool-bar definitions:
     59const char* UIDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar";
     60const char* UIDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment";
     61const char* UIDefs::GUI_MiniToolBarAutoHide = "GUI/MiniToolBarAutoHide";
     62
     63// Close-dialog declarations:
     64const char* UIDefs::GUI_RestrictedCloseActions = "GUI/RestrictedCloseActions";
     65const char* UIDefs::GUI_LastCloseAction = "GUI/LastCloseAction";
     66const char* UIDefs::GUI_CloseActionHook = "GUI/CloseActionHook";
     67
     68// Wizards declarations:
     69const char* UIDefs::GUI_FirstRun = "GUI/FirstRun";
     70const char* UIDefs::GUI_HideDescriptionForWizards = "GUI/HideDescriptionForWizards";
     71const char* UIDefs::GUI_Export_StorageType = "GUI/Export/StorageType";
     72const char* UIDefs::GUI_Export_Username = "GUI/Export/Username";
     73const char* UIDefs::GUI_Export_Hostname = "GUI/Export/Hostname";
     74const char* UIDefs::GUI_Export_Bucket = "GUI/Export/Bucket";
     75
     76// Message-center declarations:
     77const char* UIDefs::GUI_SuppressMessages = "GUI/SuppressMessages";
     78const char* UIDefs::GUI_InvertMessageOption = "GUI/InvertMessageOption";
     79
     80// Registration dialog declarations:
     81const char* UIDefs::GUI_RegistrationDlgWinID = "GUI/RegistrationDlgWinID";
     82const char* UIDefs::GUI_RegistrationData = "GUI/SUNOnlineData";
     83
     84// Update manager declarations:
     85const char* UIDefs::GUI_UpdateDate = "GUI/UpdateDate";
     86const char* UIDefs::GUI_UpdateCheckCount = "GUI/UpdateCheckCount";
     87
     88// Information dialog declarations:
     89const char* UIDefs::GUI_InfoDlgState = "GUI/InfoDlgState";
     90
     91#ifdef VBOX_WITH_DEBUGGER_GUI
     92const char* UIDefs::GUI_DbgEnabled = "GUI/Dbg/Enabled";
     93const char* UIDefs::GUI_DbgAutoShow = "GUI/Dbg/AutoShow";
     94#endif // VBOX_WITH_DEBUGGER_GUI
     95
    6296#ifdef Q_WS_X11
    63 const char* VBoxDefs::GUI_LicenseKey = "GUI/LicenseAgreed";
    64 #endif
    65 const char* VBoxDefs::GUI_RegistrationDlgWinID = "GUI/RegistrationDlgWinID";
    66 const char* VBoxDefs::GUI_RegistrationData = "GUI/SUNOnlineData";
    67 const char* VBoxDefs::GUI_UpdateDate = "GUI/UpdateDate";
    68 const char* VBoxDefs::GUI_UpdateCheckCount = "GUI/UpdateCheckCount";
    69 const char* VBoxDefs::GUI_LastVMSelected = "GUI/LastVMSelected";
    70 const char* VBoxDefs::GUI_InfoDlgState = "GUI/InfoDlgState";
    71 const char* VBoxDefs::GUI_RenderMode = "GUI/RenderMode";
     97const char* UIDefs::GUI_LicenseKey = "GUI/LicenseAgreed";
     98#endif // Q_WS_X11
     99
    72100#ifdef VBOX_GUI_WITH_SYSTRAY
    73 const char* VBoxDefs::GUI_TrayIconWinID = "GUI/TrayIcon/WinID";
    74 const char* VBoxDefs::GUI_TrayIconEnabled = "GUI/TrayIcon/Enabled";
    75 const char* VBoxDefs::GUI_MainWindowCount = "GUI/MainWindowCount";
    76 #endif
     101const char* UIDefs::GUI_TrayIconWinID = "GUI/TrayIcon/WinID";
     102const char* UIDefs::GUI_TrayIconEnabled = "GUI/TrayIcon/Enabled";
     103const char* UIDefs::GUI_MainWindowCount = "GUI/MainWindowCount";
     104#endif // VBOX_GUI_WITH_SYSTRAY
     105
    77106#ifdef Q_WS_MAC
    78 const char* VBoxDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
    79 const char* VBoxDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor";
    80 const char* VBoxDefs::GUI_PresentationModeEnabled = "GUI/PresentationModeEnabled";
    81 #endif /* Q_WS_MAC */
    82 const char* VBoxDefs::GUI_PassCAD = "GUI/PassCAD";
    83 const char* VBoxDefs::GUI_Export_StorageType = "GUI/Export/StorageType";
    84 const char* VBoxDefs::GUI_Export_Username = "GUI/Export/Username";
    85 const char* VBoxDefs::GUI_Export_Hostname = "GUI/Export/Hostname";
    86 const char* VBoxDefs::GUI_Export_Bucket = "GUI/Export/Bucket";
    87 const char* VBoxDefs::GUI_PreventBetaWarning = "GUI/PreventBetaWarning";
    88 const char* VBoxDefs::GUI_RecentFolderHD = "GUI/RecentFolderHD";
    89 const char* VBoxDefs::GUI_RecentFolderCD = "GUI/RecentFolderCD";
    90 const char* VBoxDefs::GUI_RecentFolderFD = "GUI/RecentFolderFD";
    91 const char* VBoxDefs::GUI_RecentListHD = "GUI/RecentListHD";
    92 const char* VBoxDefs::GUI_RecentListCD = "GUI/RecentListCD";
    93 const char* VBoxDefs::GUI_RecentListFD = "GUI/RecentListFD";
     107const char* UIDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
     108const char* UIDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor";
     109const char* UIDefs::GUI_PresentationModeEnabled = "GUI/PresentationModeEnabled";
     110#endif // Q_WS_MAC
     111
    94112#ifdef VBOX_WITH_VIDEOHWACCEL
    95 const char* VBoxDefs::GUI_Accelerate2D_StretchLinear = "GUI/Accelerate2D/StretchLinear";
    96 const char* VBoxDefs::GUI_Accelerate2D_PixformatYV12 = "GUI/Accelerate2D/PixformatYV12";
    97 const char* VBoxDefs::GUI_Accelerate2D_PixformatUYVY = "GUI/Accelerate2D/PixformatUYVY";
    98 const char* VBoxDefs::GUI_Accelerate2D_PixformatYUY2 = "GUI/Accelerate2D/PixformatYUY2";
    99 const char* VBoxDefs::GUI_Accelerate2D_PixformatAYUV = "GUI/Accelerate2D/PixformatAYUV";
    100 #endif
    101 #ifdef VBOX_WITH_DEBUGGER_GUI
    102 const char* VBoxDefs::GUI_DbgEnabled = "GUI/Dbg/Enabled";
    103 const char* VBoxDefs::GUI_DbgAutoShow = "GUI/Dbg/AutoShow";
    104 #endif
     113const char* UIDefs::GUI_Accelerate2D_StretchLinear = "GUI/Accelerate2D/StretchLinear";
     114const char* UIDefs::GUI_Accelerate2D_PixformatYV12 = "GUI/Accelerate2D/PixformatYV12";
     115const char* UIDefs::GUI_Accelerate2D_PixformatUYVY = "GUI/Accelerate2D/PixformatUYVY";
     116const char* UIDefs::GUI_Accelerate2D_PixformatYUY2 = "GUI/Accelerate2D/PixformatYUY2";
     117const char* UIDefs::GUI_Accelerate2D_PixformatAYUV = "GUI/Accelerate2D/PixformatAYUV";
     118#endif // VBOX_WITH_VIDEOHWACCEL
    105119
    106 QStringList VBoxDefs::VBoxFileExts = QStringList() << "xml" << "vbox";
    107 QStringList VBoxDefs::VBoxExtPackFileExts = QStringList() << "vbox-extpack";
    108 QStringList VBoxDefs::OVFFileExts = QStringList() << "ovf" << "ova";
     120QStringList UIDefs::VBoxFileExts = QStringList() << "xml" << "vbox";
     121QStringList UIDefs::VBoxExtPackFileExts = QStringList() << "vbox-extpack";
     122QStringList UIDefs::OVFFileExts = QStringList() << "ovf" << "ova";
    109123

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

    r41679 r41689  
    1 /** @file
    2  *
    3  * VBox frontends: Qt GUI ("VirtualBox"):
    4  * Header with common definitions and global functions
    5  */
    6 
    7 /*
    8  * Copyright (C) 2006-2011 Oracle Corporation
    9  *
    10  * This file is part of VirtualBox Open Source Edition (OSE), as
    11  * available from http://www.virtualbox.org. This file is free software;
    12  * you can redistribute it and/or modify it under the terms of the GNU
    13  * General Public License (GPL) as published by the Free Software
    14  * Foundation, in version 2 as it comes in the "COPYING" file of the
    15  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
    16  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    17  */
    18 
    19 #ifndef __VBoxDefs_h__
    20 #define __VBoxDefs_h__
    21 
    22 /* Qt includes */
     1/// @file
     2///
     3/// VBox frontends: Qt GUI ("VirtualBox"):
     4/// Global declarations and functions
     5
     6// Copyright (C) 2006-2012 Oracle Corporation
     7//
     8// This file is part of VirtualBox Open Source Edition (OSE), as
     9// available from http://www.virtualbox.org. This file is free software;
     10// you can redistribute it and/or modify it under the terms of the GNU
     11// General Public License (GPL) as published by the Free Software
     12// Foundation, in version 2 as it comes in the "COPYING" file of the
     13// VirtualBox OSE distribution. VirtualBox OSE is distributed in the
     14// hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
     15
     16#ifndef __UIDefs_h__
     17#define __UIDefs_h__
     18
     19// QT includes:
    2320#include <QEvent>
    24 #include <QUuid>
    25 #include <QMetaType>
    26 
     21#include <QStringList>
     22
     23// Other VBox defines:
    2724#define LOG_GROUP LOG_GROUP_GUI
     25
     26// Other VBox includes:
    2827#include <VBox/log.h>
    2928#include <iprt/assert.h>
    3029#include <iprt/alloc.h>
    3130
     31// Defines:
     32#define MAC_LEOPARD_STYLE defined(Q_WS_MAC) && (QT_VERSION >= 0x040300)
     33
    3234#ifdef DEBUG
    33 
    34 #define AssertWrapperOk(w)      \
     35# define AssertWrapperOk(w)      \
    3536    AssertMsg (w.isOk(), (#w " is not okay (RC=0x%08X)", w.lastRC()))
    36 #define AssertWrapperOkMsg(w, m)      \
     37# define AssertWrapperOkMsg(w, m)      \
    3738    AssertMsg (w.isOk(), (#w ": " m " (RC=0x%08X)", w.lastRC()))
    38 
    39 #else /* #ifdef DEBUG */
    40 
    41 #define AssertWrapperOk(w)          do {} while (0)
    42 #define AssertWrapperOkMsg(w, m)    do {} while (0)
    43 
    44 #endif /* #ifdef DEBUG */
     39#else // !DEBUG
     40# define AssertWrapperOk(w)          do {} while (0)
     41# define AssertWrapperOkMsg(w, m)    do {} while (0)
     42#endif // DEBUG
    4543
    4644#ifndef SIZEOF_ARRAY
    47 #define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0]))
    48 #endif
    49 
    50 /**
    51  *  Common global VBox namespace.
    52  *  Later it will replace VBoxDefs struct used as global VBox namespace.
    53  */
    54 namespace VBoxGlobalDefs
     45# define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0]))
     46#endif // SIZEOF_ARRAY
     47
     48// Global UI namespace:
     49namespace UIDefs
    5550{
    56     extern const char *UI_ExtPackName;
    57 }
    58 
    59 /** Common namespace for all enums */
    60 struct VBoxDefs
    61 {
    62     /** VM display rendering mode. */
     51    // VM display rendering mode:
    6352    enum RenderMode
    6453    {
    65         InvalidRenderMode, TimerMode, QImageMode, SDLMode, DDRAWMode, Quartz2DMode
     54          InvalidRenderMode
     55        , TimerMode
     56        , QImageMode
     57        , SDLMode
     58        , DDRAWMode
     59        , Quartz2DMode
    6660#ifdef VBOX_GUI_USE_QGLFB
    6761        , QGLMode
    68 #endif
     62#endif // VBOX_GUI_USE_QGLFB
    6963    };
    7064
    71     /** Additional Qt event types. */
    72     enum
     65    // Additional Qt event types:
     66    enum UIEventType
    7367    {
    7468          ResizeEventType = QEvent::User + 101
    … …  
    7771        , ModifierKeyChangeEventType
    7872        , MediaEnumEventType
    79 #if defined (Q_WS_WIN)
     73#ifdef Q_WS_WIN
    8074        , ShellExecuteEventType
    81 #endif
     75#endif // Q_WS_WIN
    8276        , ActivateActionEventType
    83 #if defined (Q_WS_MAC)
     77#ifdef Q_WS_MAC
    8478        , ShowWindowEventType
    85 #endif
     79#endif // Q_WS_MAC
    8680        , AddVDMUrlsEventType
    8781#ifdef VBOX_GUI_USE_QGL
    8882        , VHWACommandProcessType
    89 #endif
     83#endif // VBOX_GUI_USE_QGL
    9084    };
    9185
    92     /** Size formatting types. */
     86    // Size formatting types:
    9387    enum FormatSize
    9488    {
    … …  
    9892    };
    9993
    100     static const char* GUI_LastWindowPosition;
    101     static const char* GUI_LastNormalWindowPosition;
    102     static const char* GUI_LastScaleWindowPosition;
    103     static const char* GUI_LastWindowState_Max;
    104     static const char* GUI_SplitterSizes;
    105     static const char* GUI_Toolbar;
    106     static const char* GUI_Statusbar;
    107     static const char* GUI_LastGuestSizeHint;
    108     static const char* GUI_LastGuestSizeHintWasFullscreen;
    109     static const char* GUI_Fullscreen;
    110     static const char* GUI_Seamless;
    111     static const char* GUI_Scale;
    112     static const char* GUI_VirtualScreenToHostScreen;
    113     static const char* GUI_AutoresizeGuest;
    114     static const char* GUI_FirstRun;
    115     static const char* GUI_HideDescriptionForWizards;
    116     static const char* GUI_SaveMountedAtRuntime;
    117     static const char* GUI_ShowMiniToolBar;
    118     static const char* GUI_MiniToolBarAlignment;
    119     static const char* GUI_MiniToolBarAutoHide;
    120     static const char* GUI_LastCloseAction;
    121     static const char* GUI_RestrictedCloseActions;
    122     static const char* GUI_CloseActionHook;
    123     static const char* GUI_SuppressMessages;
    124     static const char* GUI_InvertMessageOption;
    125     static const char* GUI_PermanentSharedFoldersAtRuntime;
    126     static const char* GUI_LanguageId;
    127     static const char* GUI_PreviewUpdate;
    128     static const char* GUI_DetailsPageBoxes;
    129     static const char* GUI_SelectorVMPositions;
    130     static const char* GUI_Input_MachineShortcuts;
    131     static const char* GUI_Input_SelectorShortcuts;
     94    // Global declarations:
     95    extern const char* GUI_RenderMode;
     96    extern const char* GUI_LanguageId;
     97    extern const char* GUI_ExtPackName;
     98    extern const char* GUI_PreventBetaWarning;
     99    extern const char* GUI_RecentFolderHD;
     100    extern const char* GUI_RecentFolderCD;
     101    extern const char* GUI_RecentFolderFD;
     102    extern const char* GUI_RecentListHD;
     103    extern const char* GUI_RecentListCD;
     104    extern const char* GUI_RecentListFD;
     105
     106    // Selector-window declarations:
     107    extern const char* GUI_Input_SelectorShortcuts;
     108    extern const char* GUI_LastSelectorWindowPosition;
     109    extern const char* GUI_SplitterSizes;
     110    extern const char* GUI_Toolbar;
     111    extern const char* GUI_Statusbar;
     112    extern const char* GUI_PreviewUpdate;
     113    extern const char* GUI_DetailsPageBoxes;
     114    extern const char* GUI_SelectorVMPositions;
     115    extern const char* GUI_LastVMSelected;
     116
     117    // Machine-window declarations:
     118    extern const char* GUI_Input_MachineShortcuts;
     119    extern const char* GUI_LastNormalWindowPosition;
     120    extern const char* GUI_LastScaleWindowPosition;
     121    extern const char* GUI_LastWindowState_Max;
     122    extern const char* GUI_LastGuestSizeHint;
     123    extern const char* GUI_LastGuestSizeHintWasFullscreen;
     124    extern const char* GUI_Fullscreen;
     125    extern const char* GUI_Seamless;
     126    extern const char* GUI_Scale;
     127    extern const char* GUI_VirtualScreenToHostScreen;
     128    extern const char* GUI_AutoresizeGuest;
     129    extern const char* GUI_SaveMountedAtRuntime;
     130    extern const char* GUI_PassCAD;
     131
     132    // Mini tool-bar declarations:
     133    extern const char* GUI_ShowMiniToolBar;
     134    extern const char* GUI_MiniToolBarAlignment;
     135    extern const char* GUI_MiniToolBarAutoHide;
     136
     137    // Close-dialog declarations:
     138    extern const char* GUI_RestrictedCloseActions;
     139    extern const char* GUI_LastCloseAction;
     140    extern const char* GUI_CloseActionHook;
     141
     142    // Wizards declarations:
     143    extern const char* GUI_FirstRun;
     144    extern const char* GUI_HideDescriptionForWizards;
     145    extern const char* GUI_Export_StorageType;
     146    extern const char* GUI_Export_Username;
     147    extern const char* GUI_Export_Hostname;
     148    extern const char* GUI_Export_Bucket;
     149
     150    // Message-center declarations:
     151    extern const char* GUI_SuppressMessages;
     152    extern const char* GUI_InvertMessageOption;
     153
     154    // Registration dialog declarations:
     155    extern const char* GUI_RegistrationDlgWinID;
     156    extern const char* GUI_RegistrationData;
     157
     158    // Update manager declarations:
     159    extern const char* GUI_UpdateDate;
     160    extern const char* GUI_UpdateCheckCount;
     161
     162    // Information dialog declarations:
     163    extern const char* GUI_InfoDlgState;
     164
     165#ifdef VBOX_WITH_DEBUGGER_GUI
     166    extern const char* GUI_DbgEnabled;
     167    extern const char* GUI_DbgAutoShow;
     168#endif // VBOX_WITH_DEBUGGER_GUI
     169
    132170#ifdef Q_WS_X11
    133     static const char* GUI_LicenseKey;
    134 #endif
    135     static const char* GUI_RegistrationDlgWinID;
    136     static const char* GUI_RegistrationData;
    137     static const char* GUI_UpdateDate;
    138     static const char* GUI_UpdateCheckCount;
    139     static const char* GUI_LastVMSelected;
    140     static const char* GUI_InfoDlgState;
    141     static const char* GUI_RenderMode;
     171    extern const char* GUI_LicenseKey;
     172#endif // Q_WS_X11
     173
     174#ifdef Q_WS_MAC
     175    extern const char* GUI_RealtimeDockIconUpdateEnabled;
     176    extern const char* GUI_RealtimeDockIconUpdateMonitor;
     177    extern const char* GUI_PresentationModeEnabled;
     178#endif // Q_WS_MAC
     179
     180#ifdef VBOX_WITH_VIDEOHWACCEL
     181    extern const char* GUI_Accelerate2D_StretchLinear;
     182    extern const char* GUI_Accelerate2D_PixformatYV12;
     183    extern const char* GUI_Accelerate2D_PixformatUYVY;
     184    extern const char* GUI_Accelerate2D_PixformatYUY2;
     185    extern const char* GUI_Accelerate2D_PixformatAYUV;
     186#endif // VBOX_WITH_VIDEOHWACCEL
     187
    142188#ifdef VBOX_GUI_WITH_SYSTRAY
    143     static const char* GUI_TrayIconWinID;
    144     static const char* GUI_TrayIconEnabled;
    145     static const char* GUI_MainWindowCount;
    146 #endif
    147 #ifdef Q_WS_MAC
    148     static const char* GUI_RealtimeDockIconUpdateEnabled;
    149     static const char* GUI_RealtimeDockIconUpdateMonitor;
    150     static const char* GUI_PresentationModeEnabled;
    151 #endif /* Q_WS_MAC */
    152     static const char* GUI_PassCAD;
    153     static const char* GUI_Export_StorageType;
    154     static const char* GUI_Export_Username;
    155     static const char* GUI_Export_Hostname;
    156     static const char* GUI_Export_Bucket;
    157     static const char* GUI_PreventBetaWarning;
    158 
    159     static const char* GUI_RecentFolderHD;
    160     static const char* GUI_RecentFolderCD;
    161     static const char* GUI_RecentFolderFD;
    162     static const char* GUI_RecentListHD;
    163     static const char* GUI_RecentListCD;
    164     static const char* GUI_RecentListFD;
    165 
    166 #ifdef VBOX_WITH_VIDEOHWACCEL
    167     static const char* GUI_Accelerate2D_StretchLinear;
    168     static const char* GUI_Accelerate2D_PixformatYV12;
    169     static const char* GUI_Accelerate2D_PixformatUYVY;
    170     static const char* GUI_Accelerate2D_PixformatYUY2;
    171     static const char* GUI_Accelerate2D_PixformatAYUV;
    172 #endif
    173 
    174 #ifdef VBOX_WITH_DEBUGGER_GUI
    175     static const char* GUI_DbgEnabled;
    176     static const char* GUI_DbgAutoShow;
    177 #endif
    178 
    179     static QStringList VBoxFileExts;
    180     static QStringList VBoxExtPackFileExts;
    181     static QStringList OVFFileExts;
    182 };
    183 
    184 #define MAC_LEOPARD_STYLE defined(Q_WS_MAC) && (QT_VERSION >= 0x040300)
    185 
    186 #endif /* __VBoxDefs_h__ */
    187 
     189    extern const char* GUI_TrayIconWinID;
     190    extern const char* GUI_TrayIconEnabled;
     191    extern const char* GUI_MainWindowCount;
     192#endif // VBOX_GUI_WITH_SYSTRAY
     193
     194    extern QStringList VBoxFileExts;
     195    extern QStringList VBoxExtPackFileExts;
     196    extern QStringList OVFFileExts;
     197}
     198
     199using namespace UIDefs; // globally
     200
     201#endif // __UIDefs_h__
     202

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

    r41587 r41689  
    5454            if (strKey.startsWith("GUI/"))
    5555            {
    56                 if (strKey == VBoxDefs::GUI_RegistrationDlgWinID)
     56                if (strKey == GUI_RegistrationDlgWinID)
    5757                {
    5858                    if (m_fIsRegDlgOwner)
    … …  
    6767
    6868#ifdef VBOX_GUI_WITH_SYSTRAY
    69                 if (strKey == VBoxDefs::GUI_TrayIconWinID)
     69                if (strKey == GUI_TrayIconWinID)
    7070                {
    7171                    if (m_fIsTrayIconOwner)
    … …  
    102102           if (strKey.startsWith ("GUI/"))
    103103           {
    104                if (strKey == VBoxDefs::GUI_RegistrationDlgWinID)
     104               if (strKey == GUI_RegistrationDlgWinID)
    105105               {
    106106                   if (strValue.isEmpty())
    … …  
    118118                       emit sigCanShowRegistrationDlg(false);
    119119               }
    120                if (strKey == VBoxDefs::GUI_LanguageId)
     120               if (strKey == GUI_LanguageId)
    121121                       emit sigGUILanguageChange(strValue);
    122122#ifdef VBOX_GUI_WITH_SYSTRAY
    123                if (strKey == VBoxDefs::GUI_MainWindowCount)
     123               if (strKey == GUI_MainWindowCount)
    124124                   emit sigMainWindowCountChange(strValue.toInt());
    125                if (strKey == VBoxDefs::GUI_TrayIconWinID)
     125               if (strKey == GUI_TrayIconWinID)
    126126               {
    127127                   if (strValue.isEmpty())
    … …  
    139139                       emit sigCanShowTrayIcon(false);
    140140               }
    141                if (strKey == VBoxDefs::GUI_TrayIconEnabled)
     141               if (strKey == GUI_TrayIconEnabled)
    142142                   emit sigTrayIconChange((strValue.toLower() == "true") ? true : false);
    143143#endif /* VBOX_GUI_WITH_SYSTRAY */
    144144#ifdef Q_WS_MAC
    145                if (strKey == VBoxDefs::GUI_PresentationModeEnabled)
     145               if (strKey == GUI_PresentationModeEnabled)
    146146               {
    147147                   /* Default to true if it is an empty value */
    … …  
    164164           if (strId == vboxGlobal().managedVMUuid())
    165165           {
    166                if (   strKey == VBoxDefs::GUI_RealtimeDockIconUpdateEnabled
    167                    || strKey == VBoxDefs::GUI_RealtimeDockIconUpdateMonitor)
     166               if (   strKey == GUI_RealtimeDockIconUpdateEnabled
     167                   || strKey == GUI_RealtimeDockIconUpdateMonitor)
    168168               {
    169169                   bool f = strValue.toLower() == "false" ? false : true;

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

    r41615 r41689  
    173173    {
    174174        vbox = vboxGlobal().virtualBox();
    175         msgs = vbox.GetExtraData(VBoxDefs::GUI_SuppressMessages).split(',');
     175        msgs = vbox.GetExtraData(GUI_SuppressMessages).split(',');
    176176        if (msgs.contains(pcszAutoConfirmId))
    177177        {
    … …  
    249249        {
    250250            msgs << pcszAutoConfirmId;
    251             vbox.SetExtraData(VBoxDefs::GUI_SuppressMessages, msgs.join(","));
     251            vbox.SetExtraData(GUI_SuppressMessages, msgs.join(","));
    252252        }
    253253    }
    … …  
    10561056                                .arg(strSnapshotName),
    10571057                             tr("Create a snapshot of the current machine state"),
    1058                              !vboxGlobal().virtualBox().GetExtraDataStringList(VBoxDefs::GUI_InvertMessageOption).contains("askAboutSnapshotRestoring"),
     1058                             !vboxGlobal().virtualBox().GetExtraDataStringList(GUI_InvertMessageOption).contains("askAboutSnapshotRestoring"),
    10591059                             QString::null /* details */,
    10601060                             QIMessageBox::Ok, QIMessageBox::Cancel, 0 /* 3rd button */,
    … …  
    12851285            /* Get VM name: */
    12861286            QFileInfo fi(machine.GetSettingsFilePath());
    1287             strMachineName = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxDefs::VBoxFileExts) ? fi.completeBaseName() : fi.fileName();
     1287            strMachineName = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxFileExts) ? fi.completeBaseName() : fi.fileName();
    12881288            /* Increment inacessible VM count: */
    12891289            ++cInacessibleVMCount;
    … …  
    30203020{
    30213021    CVirtualBox vbox = vboxGlobal().virtualBox();
    3022     vbox.SetExtraData(VBoxDefs::GUI_SuppressMessages, QString::null);
     3022    vbox.SetExtraData(GUI_SuppressMessages, QString::null);
    30233023}
    30243024

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

    r41615 r41689  
    5252#include "VBoxGlobal.h"
    5353#include "VBoxUtils.h"
    54 #include "VBoxDefs.h"
    5554#include "UISelectorWindow.h"
    5655#include "UIMessageCenter.h"
    … …  
    178177    VBoxMediaEnumEvent (const UIMedium &aMedium,
    179178                        VBoxMediaList::iterator &aIterator)
    180         : QEvent ((QEvent::Type) VBoxDefs::MediaEnumEventType)
     179        : QEvent ((QEvent::Type) MediaEnumEventType)
    181180        , mMedium (aMedium), mIterator (aIterator), mLast (false)
    182181        {}
    183182    /** Constructs the last enum event */
    184183    VBoxMediaEnumEvent (VBoxMediaList::iterator &aIterator)
    185         : QEvent ((QEvent::Type) VBoxDefs::MediaEnumEventType)
     184        : QEvent ((QEvent::Type) MediaEnumEventType)
    186185        , mIterator (aIterator), mLast (true)
    187186        {}
    … …  
    221220 *  default rendering mode if the argument is NULL.
    222221 */
    223 static VBoxDefs::RenderMode vboxGetRenderMode (const char *aModeStr)
    224 {
    225     VBoxDefs::RenderMode mode = VBoxDefs::InvalidRenderMode;
     222static RenderMode vboxGetRenderMode (const char *aModeStr)
     223{
     224    RenderMode mode = InvalidRenderMode;
    226225
    227226#if defined (Q_WS_MAC) && defined (VBOX_GUI_USE_QUARTZ2D)
    228     mode = VBoxDefs::Quartz2DMode;
     227    mode = Quartz2DMode;
    229228# ifdef RT_ARCH_X86
    230229    /* Quartz2DMode doesn't refresh correctly on 32-bit Snow Leopard, use image mode. */
    … …  
    232231//    if (    RT_SUCCESS (RTSystemQueryOSInfo (RTSYSOSINFO_RELEASE, szRelease, sizeof (szRelease)))
    233232//        &&  !strncmp (szRelease, "10.", 3))
    234 //        mode = VBoxDefs::QImageMode;
     233//        mode = QImageMode;
    235234# endif
    236235#elif (defined (Q_WS_WIN32) || defined (Q_WS_PM) || defined (Q_WS_X11)) && defined (VBOX_GUI_USE_QIMAGE)
    237     mode = VBoxDefs::QImageMode;
     236    mode = QImageMode;
    238237#elif defined (Q_WS_X11) && defined (VBOX_GUI_USE_SDL)
    239     mode = VBoxDefs::SDLMode;
     238    mode = SDLMode;
    240239#elif defined (VBOX_GUI_USE_QIMAGE)
    241     mode = VBoxDefs::QImageMode;
     240    mode = QImageMode;
    242241#else
    243242# error "Cannot determine the default render mode!"
    … …  
    249248#if defined (VBOX_GUI_USE_QIMAGE)
    250249        else if (::strcmp (aModeStr, "image") == 0)
    251             mode = VBoxDefs::QImageMode;
     250            mode = QImageMode;
    252251#endif
    253252#if defined (VBOX_GUI_USE_SDL)
    254253        else if (::strcmp (aModeStr, "sdl") == 0)
    255             mode = VBoxDefs::SDLMode;
     254            mode = SDLMode;
    256255#endif
    257256#if defined (VBOX_GUI_USE_DDRAW)
    258257        else if (::strcmp (aModeStr, "ddraw") == 0)
    259             mode = VBoxDefs::DDRAWMode;
     258            mode = DDRAWMode;
    260259#endif
    261260#if defined (VBOX_GUI_USE_QUARTZ2D)
    262261        else if (::strcmp (aModeStr, "quartz2d") == 0)
    263             mode = VBoxDefs::Quartz2DMode;
     262            mode = Quartz2DMode;
    264263#endif
    265264#if defined (VBOX_GUI_USE_QGLFB)
    266265        else if (::strcmp (aModeStr, "qgl") == 0)
    267             mode = VBoxDefs::QGLMode;
     266            mode = QGLMode;
    268267#endif
    269268//#if defined (VBOX_GUI_USE_QGL)
    270269//        else if (::strcmp (aModeStr, "qgloverlay") == 0)
    271 //            mode = VBoxDefs::QGLOverlayMode;
     270//            mode = QGLOverlayMode;
    272271//#endif
    273272
    … …  
    585584{
    586585    int rc = 0;
    587     QString strTrayWinID = mVBox.GetExtraData(VBoxDefs::GUI_TrayIconWinID);
     586    QString strTrayWinID = mVBox.GetExtraData(GUI_TrayIconWinID);
    588587    if (false == strTrayWinID.isEmpty())
    589588    {
    590589        /* Check if current tray icon is alive by writing some bogus value. */
    591         mVBox.SetExtraData(VBoxDefs::GUI_TrayIconWinID, "0");
     590        mVBox.SetExtraData(GUI_TrayIconWinID, "0");
    592591        if (mVBox.isOk())
    593592        {
    594593            /* Current tray icon died - clean up. */
    595             mVBox.SetExtraData(VBoxDefs::GUI_TrayIconWinID, NULL);
     594            mVBox.SetExtraData(GUI_TrayIconWinID, NULL);
    596595            strTrayWinID.clear();
    597596        }
    … …  
    628627    {
    629628        // Use this selector for displaying the tray icon
    630         mVBox.SetExtraData(VBoxDefs::GUI_TrayIconWinID,
     629        mVBox.SetExtraData(GUI_TrayIconWinID,
    631630                           QString("%1").arg((qulonglong)vboxGlobal().mainWindow()->winId()));
    632631
    … …  
    19331932
    19341933    /* check for the agreed license version */
    1935     QStringList strList =  virtualBox().GetExtraData (VBoxDefs::GUI_LicenseKey).split(",");
     1934    QStringList strList =  virtualBox().GetExtraData (GUI_LicenseKey).split(",");
    19361935    for (int i=0; i < strList.size(); ++i)
    19371936        if (strList.at(i) == latestVersion)
    … …  
    19411940    bool result = licenseDialog.showLicenseFromFile(latestFilePath) == QDialog::Accepted;
    19421941    if (result)
    1943         virtualBox().SetExtraData (VBoxDefs::GUI_LicenseKey, (strList << latestVersion).join(","));
     1942        virtualBox().SetExtraData (GUI_LicenseKey, (strList << latestVersion).join(","));
    19441943    return result;
    19451944}
    … …  
    23862385            strTitle = tr("Please choose a virtual hard drive file");
    23872386            allType = tr("All virtual hard drive files (%1)");
    2388             strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderHD);
     2387            strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderHD);
    23892388            if (strLastFolder.isEmpty())
    2390                 strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderCD);
     2389                strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderCD);
    23912390            if (strLastFolder.isEmpty())
    2392                 strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderFD);
     2391                strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderFD);
    23932392            break;
    23942393        }
    … …  
    23982397            strTitle = tr("Please choose a virtual optical disk file");
    23992398            allType = tr("All virtual optical disk files (%1)");
    2400             strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderCD);
     2399            strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderCD);
    24012400            if (strLastFolder.isEmpty())
    2402                 strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderHD);
     2401                strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderHD);
    24032402            if (strLastFolder.isEmpty())
    2404                 strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderFD);
     2403                strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderFD);
    24052404            break;
    24062405        }
    … …  
    24102409            strTitle = tr("Please choose a virtual floppy disk file");
    24112410            allType = tr("All virtual floppy disk files (%1)");
    2412             strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderFD);
     2411            strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderFD);
    24132412            if (strLastFolder.isEmpty())
    2414                 strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderCD);
     2413                strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderCD);
    24152414            if (strLastFolder.isEmpty())
    2416                 strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderHD);
     2415                strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderHD);
    24172416            break;
    24182417        }
    … …  
    24572456
    24582457    /* Remember the path of the last chosen medium: */
    2459     QString strRecentFolderKey = mediumType == UIMediumType_HardDisk ? VBoxDefs::GUI_RecentFolderHD :
    2460                                  mediumType == UIMediumType_DVD ? VBoxDefs::GUI_RecentFolderCD :
    2461                                  mediumType == UIMediumType_Floppy ? VBoxDefs::GUI_RecentFolderFD :
     2458    QString strRecentFolderKey = mediumType == UIMediumType_HardDisk ? GUI_RecentFolderHD :
     2459                                 mediumType == UIMediumType_DVD ? GUI_RecentFolderCD :
     2460                                 mediumType == UIMediumType_Floppy ? GUI_RecentFolderFD :
    24622461                                 QString();
    24632462    vbox.SetExtraData(strRecentFolderKey, QFileInfo(strMediumLocation).absolutePath());
    24642463
    24652464    /* Update recently used list: */
    2466     QString strRecentListKey = mediumType == UIMediumType_HardDisk ? VBoxDefs::GUI_RecentListHD :
    2467                                mediumType == UIMediumType_DVD ? VBoxDefs::GUI_RecentListCD :
    2468                                mediumType == UIMediumType_Floppy ? VBoxDefs::GUI_RecentListFD :
     2465    QString strRecentListKey = mediumType == UIMediumType_HardDisk ? GUI_RecentListHD :
     2466                               mediumType == UIMediumType_DVD ? GUI_RecentListCD :
     2467                               mediumType == UIMediumType_Floppy ? GUI_RecentListFD :
    24692468                               QString();
    24702469    QStringList recentMediumList = vbox.GetExtraData(strRecentListKey).split(';');
    … …  
    25082507int VBoxGlobal::mainWindowCount ()
    25092508{
    2510     return mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt();
     2509    return mVBox.GetExtraData (GUI_MainWindowCount).toInt();
    25112510}
    25122511#endif
    … …  
    32683267/* static */
    32693268QString VBoxGlobal::formatSize (quint64 aSize, uint aDecimal /* = 2 */,
    3270                                 VBoxDefs::FormatSize aMode /* = FormatSize_Round */)
     3269                                FormatSize aMode /* = FormatSize_Round */)
    32713270{
    32723271    static QString Suffixes [7];
    … …  
    33263325            decm *= mult;
    33273326            /* not greater */
    3328             if (aMode == VBoxDefs::FormatSize_RoundDown)
     3327            if (aMode == FormatSize_RoundDown)
    33293328                decm = decm / denom;
    33303329            /* not less */
    3331             else if (aMode == VBoxDefs::FormatSize_RoundUp)
     3330            else if (aMode == FormatSize_RoundUp)
    33323331                decm = (decm + denom - 1) / denom;
    33333332            /* nearest */
    … …  
    41304129         * that attempts to set it will win, the rest will get a failure from
    41314130         * the SetExtraData() call. */
    4132         mVBox.SetExtraData (VBoxDefs::GUI_RegistrationDlgWinID,
     4131        mVBox.SetExtraData (GUI_RegistrationDlgWinID,
    41334132                            QString ("%1").arg ((qulonglong) mMainWindow->winId()));
    41344133
    … …  
    41634162    switch (e->type())
    41644163    {
    4165         case VBoxDefs::MediaEnumEventType:
     4164        case MediaEnumEventType:
    41664165        {
    41674166            VBoxMediaEnumEvent *ev = (VBoxMediaEnumEvent*) e;
    … …  
    42214220bool VBoxGlobal::isDebuggerEnabled(CMachine &aMachine)
    42224221{
    4223     return isDebuggerWorker(&mDbgEnabled, aMachine, VBoxDefs::GUI_DbgEnabled);
     4222    return isDebuggerWorker(&mDbgEnabled, aMachine, GUI_DbgEnabled);
    42244223}
    42254224
    42264225bool VBoxGlobal::isDebuggerAutoShowEnabled(CMachine &aMachine)
    42274226{
    4228     return isDebuggerWorker(&mDbgAutoShow, aMachine, VBoxDefs::GUI_DbgAutoShow);
     4227    return isDebuggerWorker(&mDbgAutoShow, aMachine, GUI_DbgAutoShow);
    42294228}
    42304229
    42314230bool VBoxGlobal::isDebuggerAutoShowCommandLineEnabled(CMachine &aMachine)
    42324231{
    4233     return isDebuggerWorker(&mDbgAutoShowCommandLine, aMachine, VBoxDefs::GUI_DbgAutoShow);
     4232    return isDebuggerWorker(&mDbgAutoShowCommandLine, aMachine, GUI_DbgAutoShow);
    42344233}
    42354234
    42364235bool VBoxGlobal::isDebuggerAutoShowStatisticsEnabled(CMachine &aMachine)
    42374236{
    4238     return isDebuggerWorker(&mDbgAutoShowStatistics, aMachine, VBoxDefs::GUI_DbgAutoShow);
     4237    return isDebuggerWorker(&mDbgAutoShowStatistics, aMachine, GUI_DbgAutoShow);
    42394238}
    42404239
    … …  
    42694268        {
    42704269            const QString& strFile = list.at(i).toLocalFile();
    4271             if (VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::VBoxFileExts))
     4270            if (VBoxGlobal::hasAllowedExtension(strFile, VBoxFileExts))
    42724271            {
    42734272                CVirtualBox vbox = vboxGlobal().virtualBox();
    … …  
    43514350    {
    43524351        /* Increase open Fe/Qt4 windows reference count. */
    4353         int c = mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt() + 1;
     4352        int c = mVBox.GetExtraData (GUI_MainWindowCount).toInt() + 1;
    43544353        AssertMsgReturnVoid ((c >= 0) || (mVBox.isOk()),
    43554354            ("Something went wrong with the window reference count!"));
    4356         mVBox.SetExtraData (VBoxDefs::GUI_MainWindowCount, QString ("%1").arg (c));
     4355        mVBox.SetExtraData (GUI_MainWindowCount, QString ("%1").arg (c));
    43574356        mIncreasedWindowCounter = mVBox.isOk();
    43584357        AssertReturnVoid (mIncreasedWindowCounter);
    … …  
    44874486
    44884487    vm_render_mode_str = RTStrDup (virtualBox()
    4489             .GetExtraData (VBoxDefs::GUI_RenderMode).toAscii().constData());
     4488            .GetExtraData (GUI_RenderMode).toAscii().constData());
    44904489
    44914490#ifdef Q_WS_X11
    … …  
    44954494#ifdef VBOX_WITH_DEBUGGER_GUI
    44964495# ifdef VBOX_WITH_DEBUGGER_GUI_MENU
    4497     initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", VBoxDefs::GUI_DbgEnabled, true);
     4496    initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", GUI_DbgEnabled, true);
    44984497# else
    4499     initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", VBoxDefs::GUI_DbgEnabled, false);
     4498    initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", GUI_DbgEnabled, false);
    45004499# endif
    4501     initDebuggerVar(&mDbgAutoShow, "VBOX_GUI_DBG_AUTO_SHOW", VBoxDefs::GUI_DbgAutoShow, false);
     4500    initDebuggerVar(&mDbgAutoShow, "VBOX_GUI_DBG_AUTO_SHOW", GUI_DbgAutoShow, false);
    45024501    mDbgAutoShowCommandLine = mDbgAutoShowStatistics = mDbgAutoShow;
    45034502    mStartPaused = false;
    … …  
    46334632    if (bForceSeamless && !vmUuid.isEmpty())
    46344633    {
    4635         mVBox.FindMachine(vmUuid).SetExtraData(VBoxDefs::GUI_Seamless, "on");
     4634        mVBox.FindMachine(vmUuid).SetExtraData(GUI_Seamless, "on");
    46364635    }
    46374636    else if (bForceFullscreen && !vmUuid.isEmpty())
    46384637    {
    4639         mVBox.FindMachine(vmUuid).SetExtraData(VBoxDefs::GUI_Fullscreen, "on");
     4638        mVBox.FindMachine(vmUuid).SetExtraData(GUI_Fullscreen, "on");
    46404639    }
    46414640
    … …  
    47244723    {
    47254724        /* Decrease open Fe/Qt4 windows reference count. */
    4726         int c = mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt() - 1;
     4725        int c = mVBox.GetExtraData (GUI_MainWindowCount).toInt() - 1;
    47274726        AssertMsg ((c >= 0) || (mVBox.isOk()),
    47284727            ("Something went wrong with the window reference count!"));
    47294728        if (c < 0)
    47304729            c = 0;   /* Clean up the mess. */
    4731         mVBox.SetExtraData (VBoxDefs::GUI_MainWindowCount,
     4730        mVBox.SetExtraData (GUI_MainWindowCount,
    47324731                            (c > 0) ? QString ("%1").arg (c) : NULL);
    47334732        AssertWrapperOk (mVBox);
    47344733        if (c == 0)
    47354734        {
    4736             mVBox.SetExtraData (VBoxDefs::GUI_TrayIconWinID, NULL);
     4735            mVBox.SetExtraData (GUI_TrayIconWinID, NULL);
    47374736            AssertWrapperOk (mVBox);
    47384737        }

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

    r41615 r41689  
    2929
    3030/* GUI includes: */
     31#include "UIDefs.h"
    3132#include "VBoxGlobalSettings.h"
    3233#include "UIMedium.h"
    … …  
    142143    QList<QUrl> &argUrlList() { return m_ArgUrlList; }
    143144
    144     VBoxDefs::RenderMode vmRenderMode() const { return vm_render_mode; }
     145    RenderMode vmRenderMode() const { return vm_render_mode; }
    145146    const char *vmRenderModeStr() const { return vm_render_mode_str; }
    146147    bool isKWinManaged() const { return mIsKWinManaged; }
    … …  
    347348
    348349    static quint64 parseSize (const QString &);
    349     static QString formatSize (quint64 aSize, uint aDecimal = 2,
    350                                VBoxDefs::FormatSize aMode = VBoxDefs::FormatSize_Round);
     350    static QString formatSize (quint64 aSize, uint aDecimal = 2, FormatSize aMode = FormatSize_Round);
    351351
    352352    static quint64 requiredVideoMemory(const QString &strGuestOSTypeId, int cMonitors = 1);
    … …  
    501501    VBoxMediaList mMediaList;
    502502
    503     VBoxDefs::RenderMode vm_render_mode;
     503    RenderMode vm_render_mode;
    504504    const char * vm_render_mode_str;
    505505    bool mIsKWinManaged;

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

    r41355 r41689  
    504504                    /* Allow to prevent this message */
    505505                    QString str = vboxGlobal().virtualBox().
    506                         GetExtraData (VBoxDefs::GUI_PreventBetaWarning);
     506                        GetExtraData(GUI_PreventBetaWarning);
    507507                    if (str != vboxVersion)
    508508                        msgCenter().showBETAWarning();

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

    r41650 r41689  
    6565
    6666    AddVDMUrlsEvent (const QList <QUrl> &aUrls)
    67         : QEvent (static_cast <QEvent::Type> (VBoxDefs::AddVDMUrlsEventType))
     67        : QEvent (static_cast <QEvent::Type> (AddVDMUrlsEventType))
    6868        , mUrls (aUrls)
    6969    {}
    … …  
    748748            break;
    749749        }
    750         case VBoxDefs::AddVDMUrlsEventType:
     750        case AddVDMUrlsEventType:
    751751        {
    752752            if (aObject == currentTreeWidget())

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

    r41650 r41689  
    2424#include "QIMainDialog.h"
    2525#include "QIWithRetranslateUI.h"
    26 #include "VBoxDefs.h"
    2726#include "VBoxMediaComboBox.h"
    2827

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp

    r41140 r41689  
    2929#include "VBoxGlobal.h"
    3030#include "UIMessageCenter.h"
    31 #include "VBoxDefs.h"
    32 
    33 /* Using declarations: */
    34 using namespace VBoxGlobalDefs;
    3531
    3632/* static */
    … …  
    6157
    6258    /* Prepare source/target: */
    63     QString strExtPackUnderscoredName(QString(UI_ExtPackName).replace(' ', '_'));
     59    QString strExtPackUnderscoredName(QString(GUI_ExtPackName).replace(' ', '_'));
    6460    QString strTemplateSourcePath("http://download.virtualbox.org/virtualbox/%1/");
    6561    QString strTemplateSourceName(QString("%1-%2.vbox-extpack").arg(strExtPackUnderscoredName));
    … …  
    8581bool UIDownloaderExtensionPack::askForDownloadingConfirmation(QNetworkReply *pReply)
    8682{
    87     return msgCenter().confirmDownloadExtensionPack(UI_ExtPackName, source().toString(), pReply->header(QNetworkRequest::ContentLengthHeader).toInt());
     83    return msgCenter().confirmDownloadExtensionPack(GUI_ExtPackName, source().toString(), pReply->header(QNetworkRequest::ContentLengthHeader).toInt());
    8884}
    8985
    … …  
    120116
    121117        /* Warn the user about extension-pack was downloaded but was NOT saved: */
    122         msgCenter().warnAboutExtentionPackCantBeSaved(UI_ExtPackName, source().toString(), QDir::toNativeSeparators(target()));
     118        msgCenter().warnAboutExtentionPackCantBeSaved(GUI_ExtPackName, source().toString(), QDir::toNativeSeparators(target()));
    123119
    124120        /* Ask the user for another location for the extension-pack file: */
    125121        QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(),
    126122                                                               msgCenter().networkManagerOrMainWindowShown(),
    127                                                                tr("Select folder to save %1 to").arg(UI_ExtPackName), true);
     123                                                               tr("Select folder to save %1 to").arg(GUI_ExtPackName), true);
    128124
    129125        /* Check if user had really set a new target: */

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

    r41614 r41689  
    3535#include "UIDownloaderExtensionPack.h"
    3636#include "UIGlobalSettingsExtension.h"
    37 #include "VBoxDefs.h"
    3837#include "QIProcess.h"
    3938
    … …  
    4847/* Forward declarations: */
    4948class UIUpdateStep;
    50 
    51 /* Using declarations: */
    52 using namespace VBoxGlobalDefs;
    5349
    5450/* Queue for processing update-steps: */
    … …  
    166162        /* Calculate the count of checks left: */
    167163        int cCount = 1;
    168         QString strCount = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateCheckCount);
     164        QString strCount = vboxGlobal().virtualBox().GetExtraData(GUI_UpdateCheckCount);
    169165        if (!strCount.isEmpty())
    170166        {
    … …  
    193189        }
    194190        url.addQueryItem("count", QString::number(cCount));
    195         url.addQueryItem("branch", VBoxUpdateData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate)).branchName());
     191        url.addQueryItem("branch", VBoxUpdateData(vboxGlobal().virtualBox().GetExtraData(GUI_UpdateDate)).branchName());
    196192        QString strUserAgent(QString("VirtualBox %1 <%2>").arg(vboxGlobal().virtualBox().GetVersion()).arg(platformInfo()));
    197193
    … …  
    231227        /* Save left count of checks: */
    232228        int cCount = 1;
    233         QString strCount = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateCheckCount);
     229        QString strCount = vboxGlobal().virtualBox().GetExtraData(GUI_UpdateCheckCount);
    234230        if (!strCount.isEmpty())
    235231        {
    … …  
    238234            if (ok) cCount = c;
    239235        }
    240         vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateCheckCount, QString("%1").arg((qulonglong)cCount + 1));
     236        vboxGlobal().virtualBox().SetExtraData(GUI_UpdateCheckCount, QString("%1").arg((qulonglong)cCount + 1));
    241237
    242238        /* Notify about step completion: */
    … …  
    376372
    377373        /* Get extension pack: */
    378         CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(UI_ExtPackName);
     374        CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
    379375        /* Return if extension pack is NOT installed: */
    380376        if (extPack.isNull())
    … …  
    410406        {
    411407            /* Inform the user that he should update the extension pack: */
    412             msgCenter().requestUserDownloadExtensionPack(UI_ExtPackName, strExtPackVersion, strVBoxVersion);
     408            msgCenter().requestUserDownloadExtensionPack(GUI_ExtPackName, strExtPackVersion, strVBoxVersion);
    413409            /* Never try to download for ENTERPRISE version: */
    414410            emit sigStepComplete();
    … …  
    417413
    418414        /* Ask the user about extension pack downloading: */
    419         if (!msgCenter().proposeDownloadExtensionPack(UI_ExtPackName, strExtPackVersion))
     415        if (!msgCenter().proposeDownloadExtensionPack(GUI_ExtPackName, strExtPackVersion))
    420416        {
    421417            emit sigStepComplete();
    … …  
    438434    {
    439435        /* Warn the user about extension pack was downloaded and saved, propose to install it: */
    440         if (msgCenter().proposeInstallExtentionPack(UI_ExtPackName, strSource, QDir::toNativeSeparators(strTarget)))
     436        if (msgCenter().proposeInstallExtentionPack(GUI_ExtPackName, strSource, QDir::toNativeSeparators(strTarget)))
    441437            UIGlobalSettingsExtension::doInstallation(strTarget, strDigest, msgCenter().mainWindowShown(), NULL);
    442438    }
    … …  
    518514
    519515    /* Load/decode curent update data: */
    520     VBoxUpdateData currentData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate));
     516    VBoxUpdateData currentData(vboxGlobal().virtualBox().GetExtraData(GUI_UpdateDate));
    521517
    522518    /* If update is really necessary: */
    … …  
    536532{
    537533    /* Load/decode curent update data: */
    538     VBoxUpdateData currentData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate));
     534    VBoxUpdateData currentData(vboxGlobal().virtualBox().GetExtraData(GUI_UpdateDate));
    539535    /* Encode/save new update data: */
    540536    VBoxUpdateData newData(currentData.periodIndex(), currentData.branchIndex());
    541     vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDate, newData.data());
     537    vboxGlobal().virtualBox().SetExtraData(GUI_UpdateDate, newData.data());
    542538
    543539#ifdef VBOX_WITH_UPDATE_REQUEST

  • trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

    r41387 r41689  
    198198# include "VBoxCocoaSpecialControls.h"
    199199#endif
    200 #include "VBoxDefs.h"
     200#include "UIDefs.h"
    201201#include "VBoxDownloaderWgt.h"
    202202#include "UIApplianceExportEditorWidget.h"
    … …  
    321321
    322322#ifdef Q_WS_MAC
    323 # if MAC_LEOPARD_STYLE /* This is defined by VBoxDefs.h and must come after it was included */
     323# if MAC_LEOPARD_STYLE /* This is defined by UIDefs.h and must come after it was included */
    324324#  include <qmacstyle_mac.h>
    325325# endif

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

    r41587 r41689  
    2525
    2626/* GUI includes: */
    27 #include "VBoxDefs.h"
     27#include "UIDefs.h"
     28
     29/* COM includes: */
    2830#include "CFramebuffer.h"
    2931
    … …  
    4446                  ulong uBitsPerPixel, ulong uBytesPerLine,
    4547                  ulong uWidth, ulong uHeight)
    46         : QEvent((QEvent::Type)VBoxDefs::ResizeEventType)
     48        : QEvent((QEvent::Type)ResizeEventType)
    4749        , m_uPixelFormat(uPixelFormat), m_pVRAM(pVRAM), m_uBitsPerPixel(uBitsPerPixel)
    4850        , m_uBytesPerLine(uBytesPerLine), m_uWidth(uWidth), m_uHeight(uHeight) {}
    … …  
    7274
    7375    UIRepaintEvent(int iX, int iY, int iW, int iH)
    74         : QEvent((QEvent::Type)VBoxDefs::RepaintEventType)
     76        : QEvent((QEvent::Type)RepaintEventType)
    7577        , m_iX(iX), m_iY(iY), m_iW(iW), m_iH(iH) {}
    7678    int x() { return m_iX; }
    … …  
    9294
    9395    UISetRegionEvent(const QRegion &region)
    94         : QEvent((QEvent::Type)VBoxDefs::SetRegionEventType)
     96        : QEvent((QEvent::Type)SetRegionEventType)
    9597        , m_region(region) {}
    9698    QRegion region() { return m_region; }

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

    r41591 r41689  
    709709    {
    710710        /* CAD settings: */
    711         QString passCAD = session().GetConsole().GetMachine().GetExtraData(VBoxDefs::GUI_PassCAD);
     711        QString passCAD = session().GetConsole().GetMachine().GetExtraData(GUI_PassCAD);
    712712        if (!passCAD.isEmpty() && passCAD != "false" && passCAD != "no")
    713713            m_fPassCAD = true;

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

    r41107 r41689  
    523523        {
    524524            /* Test 'scale' flag: */
    525             QString strScaleSettings = machine.GetExtraData(VBoxDefs::GUI_Scale);
     525            QString strScaleSettings = machine.GetExtraData(GUI_Scale);
    526526            if (strScaleSettings == "on")
    527527            {
    … …  
    535535        {
    536536            /* Test 'seamless' flag: */
    537             QString strSeamlessSettings = machine.GetExtraData(VBoxDefs::GUI_Seamless);
     537            QString strSeamlessSettings = machine.GetExtraData(GUI_Seamless);
    538538            if (strSeamlessSettings == "on")
    539539            {
    … …  
    548548        {
    549549            /* Test 'fullscreen' flag: */
    550             QString strFullscreenSettings = machine.GetExtraData(VBoxDefs::GUI_Fullscreen);
     550            QString strFullscreenSettings = machine.GetExtraData(GUI_Fullscreen);
    551551            if (strFullscreenSettings == "on")
    552552            {
    … …  
    567567    {
    568568        /* Set 'scale' flag: */
    569         machine.SetExtraData(VBoxDefs::GUI_Scale, m_pVisualState &&
     569        machine.SetExtraData(GUI_Scale, m_pVisualState &&
    570570                             m_pVisualState->visualStateType() == UIVisualStateType_Scale ? "on" : QString());
    571571
    572572        /* Set 'seamless' flag: */
    573         machine.SetExtraData(VBoxDefs::GUI_Seamless, m_pVisualState &&
     573        machine.SetExtraData(GUI_Seamless, m_pVisualState &&
    574574                             m_pVisualState->visualStateType() == UIVisualStateType_Seamless ? "on" : QString());
    575575
    576576        /* Set 'fullscreen' flag: */
    577         machine.SetExtraData(VBoxDefs::GUI_Fullscreen, m_pVisualState &&
     577        machine.SetExtraData(GUI_Fullscreen, m_pVisualState &&
    578578                             m_pVisualState->visualStateType() == UIVisualStateType_Fullscreen ? "on" : QString());
    579579    }

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

    r41615 r41689  
    708708    {
    709709        pDockSettingsMenu->addSeparator();
    710         m_DockIconPreviewMonitor = qMin(session().GetMachine().GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateMonitor).toInt(), cGuestScreens - 1);
     710        m_DockIconPreviewMonitor = qMin(session().GetMachine().GetExtraData(GUI_RealtimeDockIconUpdateMonitor).toInt(), cGuestScreens - 1);
    711711        m_pDockPreviewSelectMonitorGroup = new QActionGroup(this);
    712712        for (int i = 0; i < cGuestScreens; ++i)
    … …  
    732732    m_pDockIconPreview = new UIDockIconPreview(uisession(), vboxGlobal().vmGuestOSTypeIcon(osTypeId));
    733733
    734     QString strTest = session().GetMachine().GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled).toLower();
     734    QString strTest = session().GetMachine().GetExtraData(GUI_RealtimeDockIconUpdateEnabled).toLower();
    735735    /* Default to true if it is an empty value */
    736736    bool f = (strTest.isEmpty() || strTest == "true");
    … …  
    11861186                case UIMediumType_DVD:
    11871187                    mediums = vboxGlobal().host().GetDVDDrives();
    1188                     strRecentMediumAddress = VBoxDefs::GUI_RecentListCD;
     1188                    strRecentMediumAddress = GUI_RecentListCD;
    11891189                    break;
    11901190                case UIMediumType_Floppy:
    11911191                    mediums = vboxGlobal().host().GetFloppyDrives();
    1192                     strRecentMediumAddress = VBoxDefs::GUI_RecentListFD;
     1192                    strRecentMediumAddress = GUI_RecentListFD;
    11931193                    break;
    11941194                default:
    … …  
    16981698            fEnabled = false;
    16991699
    1700         machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, fEnabled ? "true" : "false");
     1700        machine.SetExtraData(GUI_RealtimeDockIconUpdateEnabled, fEnabled ? "true" : "false");
    17011701        updateDockOverlay();
    17021702    }
    … …  
    17091709    {
    17101710        int monitor = pAction->data().toInt();
    1711         machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateMonitor, QString::number(monitor));
     1711        machine.SetExtraData(GUI_RealtimeDockIconUpdateMonitor, QString::number(monitor));
    17121712        updateDockOverlay();
    17131713    }
    … …  
    17231723            m_pDockPreviewSelectMonitorGroup->setEnabled(fEnabled);
    17241724            CMachine machine = session().GetMachine();
    1725             m_DockIconPreviewMonitor = qMin(machine.GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateMonitor).toInt(), (int)machine.GetMonitorCount() - 1);
     1725            m_DockIconPreviewMonitor = qMin(machine.GetExtraData(GUI_RealtimeDockIconUpdateMonitor).toInt(), (int)machine.GetMonitorCount() - 1);
    17261726        }
    17271727        /* Resize the dock icon in the case the preview monitor has changed. */

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

    r39932 r41689  
    6666    m_Shortcuts[PopupMenuShortcut]             = UIKeySequence("PopupMenu",             "Home");
    6767    /* Overwrite the key sequences with the one in extra data. */
    68     loadExtraData(VBoxDefs::GUI_Input_MachineShortcuts, EndShortcutType);
     68    loadExtraData(GUI_Input_MachineShortcuts, EndShortcutType);
    6969}
    7070

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

    r41600 r41689  
    179179    /* And track whether we have had a "normal" resize since the last
    180180     * fullscreen resize hint was sent: */
    181     QString strKey = makeExtraDataKeyPerMonitor
    182                          (VBoxDefs::GUI_LastGuestSizeHintWasFullscreen);
     181    QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHintWasFullscreen);
    183182    machine.SetExtraData(strKey, isFullscreenOrSeamless() ? "true" : "");
    184183}
    … …  
    193192        case KMachineState_TeleportingPausedVM:
    194193        {
    195             if (   vboxGlobal().vmRenderMode() != VBoxDefs::TimerMode
     194            if (   vboxGlobal().vmRenderMode() != TimerMode
    196195                && m_pFrameBuffer
    197196                &&
    … …  
    222221                || m_previousState == KMachineState_Restoring)
    223222            {
    224                 if (vboxGlobal().vmRenderMode() != VBoxDefs::TimerMode && m_pFrameBuffer)
     223                if (vboxGlobal().vmRenderMode() != TimerMode && m_pFrameBuffer)
    225224                {
    226225                    /* Reset the pixmap to free memory: */
    … …  
    271270    switch (vboxGlobal().vmRenderMode())
    272271    {
    273         case VBoxDefs::QGLMode:
     272        case QGLMode:
    274273            pViewport = new VBoxGLWidget(session().GetConsole(), this, NULL);
    275274            break;
    … …  
    289288    {
    290289#ifdef VBOX_GUI_USE_QIMAGE
    291         case VBoxDefs::QImageMode:
     290        case QImageMode:
    292291        {
    293292            UIFrameBuffer* pFrameBuffer = uisession()->frameBuffer(screenId());
    … …  
    316315#endif /* VBOX_GUI_USE_QIMAGE */
    317316#ifdef VBOX_GUI_USE_QGLFB
    318         case VBoxDefs::QGLMode:
     317        case QGLMode:
    319318            m_pFrameBuffer = new UIFrameBufferQGL(this);
    320319            break;
    321 //        case VBoxDefs::QGLOverlayMode:
     320//        case QGLOverlayMode:
    322321//            m_pFrameBuffer = new UIQGLOverlayFrameBuffer(this);
    323322//            break;
    324323#endif /* VBOX_GUI_USE_QGLFB */
    325324#ifdef VBOX_GUI_USE_SDL
    326         case VBoxDefs::SDLMode:
     325        case SDLMode:
    327326        {
    328327            /* Indicate that we are doing all drawing stuff ourself: */
    … …  
    362361#if 0 // TODO: Enable DDraw frame buffer!
    363362#ifdef VBOX_GUI_USE_DDRAW
    364         case VBoxDefs::DDRAWMode:
     363        case DDRAWMode:
    365364            m_pFrameBuffer = new UIDDRAWFrameBuffer(this);
    366365            if (!m_pFrameBuffer || m_pFrameBuffer->address() == NULL)
    … …  
    368367                if (m_pFrameBuffer)
    369368                    delete m_pFrameBuffer;
    370                 m_mode = VBoxDefs::QImageMode;
     369                m_mode = QImageMode;
    371370                m_pFrameBuffer = new UIFrameBufferQImage(this);
    372371            }
    … …  
    375374#endif
    376375#ifdef VBOX_GUI_USE_QUARTZ2D
    377         case VBoxDefs::Quartz2DMode:
     376        case Quartz2DMode:
    378377        {
    379378            /* Indicate that we are doing all drawing stuff ourself: */
    … …  
    527526    {
    528527        /* Process pending frame-buffer resize events: */
    529         QApplication::sendPostedEvents(this, VBoxDefs::ResizeEventType);
     528        QApplication::sendPostedEvents(this, ResizeEventType);
    530529        if (   0
    531530#ifdef VBOX_GUI_USE_QIMAGE
    532             || vboxGlobal().vmRenderMode() == VBoxDefs::QImageMode
     531            || vboxGlobal().vmRenderMode() == QImageMode
    533532#endif
    534533#ifdef VBOX_GUI_USE_SDL
    535             || vboxGlobal().vmRenderMode() == VBoxDefs::SDLMode
     534            || vboxGlobal().vmRenderMode() == SDLMode
    536535#endif
    537536#ifdef VBOX_GUI_USE_QUARTZ2D
    538             || vboxGlobal().vmRenderMode() == VBoxDefs::Quartz2DMode
     537            || vboxGlobal().vmRenderMode() == Quartz2DMode
    539538#endif
    540539#ifdef VBOX_WITH_VIDEOHWACCEL
    … …  
    674673
    675674    /* Load machine view hint: */
    676     QString strKey = makeExtraDataKeyPerMonitor
    677                          (VBoxDefs::GUI_LastGuestSizeHint);
     675    QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHint);
    678676    QString strValue = machine.GetExtraData(strKey);
    679677
    … …  
    706704
    707705    /* Save machine view hint: */
    708     QString strKey = makeExtraDataKeyPerMonitor
    709                          (VBoxDefs::GUI_LastGuestSizeHint);
     706    QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHint);
    710707    QString strValue = QString("%1,%2").arg(sizeHint.width()).arg(sizeHint.height());
    711708    machine.SetExtraData(strKey, strValue);
    … …  
    838835    {
    839836# ifdef VBOX_GUI_USE_QUARTZ2D
    840         if (vboxGlobal().vmRenderMode() == VBoxDefs::Quartz2DMode)
     837        if (vboxGlobal().vmRenderMode() == Quartz2DMode)
    841838        {
    842839            /* If the render mode is Quartz2D we could use the CGImageRef
    … …  
    951948}
    952949
    953 VBoxDefs::RenderMode UIMachineView::getRenderMode() const
     950RenderMode UIMachineView::getRenderMode() const
    954951{
    955952    if (visualStateType() != UIVisualStateType_Scale)
    … …  
    964961    {
    965962#ifdef VBOX_GUI_USE_QUARTZ2D
    966         case VBoxDefs::Quartz2DMode:
    967             return VBoxDefs::Quartz2DMode;
     963        case Quartz2DMode:
     964            return Quartz2DMode;
    968965#endif /* VBOX_GUI_USE_QUARTZ2D */
    969966        default:
    970967#ifdef VBOX_GUI_USE_QIMAGE
    971         case VBoxDefs::QImageMode:
    972             return VBoxDefs::QImageMode;
     968        case QImageMode:
     969            return QImageMode;
    973970#endif /* VBOX_GUI_USE_QIMAGE */
    974971        break;
    … …  
    982979    switch (pEvent->type())
    983980    {
    984         case VBoxDefs::RepaintEventType:
     981        case RepaintEventType:
    985982        {
    986983            UIRepaintEvent *pPaintEvent = static_cast<UIRepaintEvent*>(pEvent);
    … …  
    992989#ifdef Q_WS_MAC
    993990        /* Event posted OnShowWindow: */
    994         case VBoxDefs::ShowWindowEventType:
     991        case ShowWindowEventType:
    995992        {
    996993            /* Dunno what Qt3 thinks a window that has minimized to the dock should be - it is not hidden,
    … …  
    10061003
    10071004#ifdef VBOX_WITH_VIDEOHWACCEL
    1008         case VBoxDefs::VHWACommandProcessType:
     1005        case VHWACommandProcessType:
    10091006        {
    10101007            m_pFrameBuffer->doProcessVHWACommand(pEvent);
    … …  
    11031100
    11041101#ifdef VBOX_GUI_USE_QUARTZ2D
    1105     if (vboxGlobal().vmRenderMode() == VBoxDefs::Quartz2DMode && m_pFrameBuffer)
     1102    if (vboxGlobal().vmRenderMode() == Quartz2DMode && m_pFrameBuffer)
    11061103    {
    11071104        m_pFrameBuffer->paintEvent(pPaintEvent);

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

    r41587 r41689  
    2525
    2626/* GUI includes: */
     27#include "UIDefs.h"
    2728#include "UIMachineDefs.h"
    2829#ifdef Q_WS_MAC
    … …  
    183184    /** Returns the current rendering mode.
    184185     * @note contains special case logic for scale mode. */
    185     VBoxDefs::RenderMode getRenderMode() const;
     186    RenderMode getRenderMode() const;
    186187
    187188    /* Cross-platforms event processors: */

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

    r41608 r41689  
    284284
    285285            /* Check if there is a close hock script defined. */
    286             const QString& strScript = m.GetExtraData(VBoxDefs::GUI_CloseActionHook);
     286            const QString& strScript = m.GetExtraData(GUI_CloseActionHook);
    287287            if (!strScript.isEmpty())
    288288            {
    … …  
    298298
    299299            /* Check which close actions are disallowed: */
    300             QStringList restictedActionsList = m.GetExtraData(VBoxDefs::GUI_RestrictedCloseActions).split(',');
     300            QStringList restictedActionsList = m.GetExtraData(GUI_RestrictedCloseActions).split(',');
    301301            bool fIsStateSavingAllowed = !restictedActionsList.contains("SaveState", Qt::CaseInsensitive);
    302302            bool fIsACPIShutdownAllowed = !restictedActionsList.contains("Shutdown", Qt::CaseInsensitive);
    … …  
    333333
    334334            /* Read the last user's choice for the given VM: */
    335             QStringList lastAction = m.GetExtraData(VBoxDefs::GUI_LastCloseAction).split(',');
     335            QStringList lastAction = m.GetExtraData(GUI_LastCloseAction).split(',');
    336336
    337337            /* Check which button should be initially chosen: */
    … …  
    473473                    {
    474474                        /* Read the last user's choice for the given VM: */
    475                         QStringList prevAction = m.GetExtraData(VBoxDefs::GUI_LastCloseAction).split(',');
     475                        QStringList prevAction = m.GetExtraData(GUI_LastCloseAction).split(',');
    476476                        /* Memorize the last user's choice for the given VM: */
    477477                        QString lastAction = strPowerOff;
    … …  
    487487                        if (dlg.mCbDiscardCurState->isChecked())
    488488                            (lastAction += ",") += strDiscardCurState;
    489                         m.SetExtraData(VBoxDefs::GUI_LastCloseAction, lastAction);
     489                        m.SetExtraData(GUI_LastCloseAction, lastAction);
    490490                    }
    491491                }

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

    r41591 r41689  
    771771    {
    772772#if 0 // TODO: Move that to fullscreen event-handler:
    773         if (vboxGlobal().vmRenderMode() != VBoxDefs::SDLMode)
     773        if (vboxGlobal().vmRenderMode() != SDLMode)
    774774        {
    775775            /* try to automatically scroll the guest canvas if the
    … …  
    798798            int iVw = m_views[uScreenId]->visibleWidth(), iVh = m_views[uScreenId]->visibleHeight();
    799799
    800             if (vboxGlobal().vmRenderMode() != VBoxDefs::SDLMode)
     800            if (vboxGlobal().vmRenderMode() != SDLMode)
    801801            {
    802802                /* Try to automatically scroll the guest canvas if the

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

    r41587 r41689  
    2525
    2626/* GUI includes: */
     27#include "UIDefs.h"
    2728#include "UIMultiScreenLayout.h"
    2829#include "UIActionPoolRuntime.h"
    … …  
    99100    {
    100101        /* If the user ever selected a combination in the view menu, we have the following entry: */
    101         QString strTest = machine.GetExtraData(QString("%1%2").arg(VBoxDefs::GUI_VirtualScreenToHostScreen).arg(i));
     102        QString strTest = machine.GetExtraData(QString("%1%2").arg(GUI_VirtualScreenToHostScreen).arg(i));
    102103        bool fOk;
    103104        int cScreen = strTest.toInt(&fOk);
    … …  
    113114             * to the target screens and they will magically open there in
    114115             * seamless/fullscreen also. */
    115             QString strTest1 = machine.GetExtraData(VBoxDefs::GUI_LastWindowPosition + (i > 0 ? QString::number(i): ""));
     116            QString strTest1 = machine.GetExtraData(GUI_LastNormalWindowPosition + (i > 0 ? QString::number(i): ""));
    116117            QRegExp posParser("(-?\\d+),(-?\\d+),(-?\\d+),(-?\\d+)");
    117118            if (posParser.exactMatch(strTest1))
    … …  
    257258    {
    258259        int iHostScreen = m_pScreenMap->value(i);
    259         machine.SetExtraData(QString("%1%2").arg(VBoxDefs::GUI_VirtualScreenToHostScreen).arg(i), QString::number(iHostScreen));
     260        machine.SetExtraData(QString("%1%2").arg(GUI_VirtualScreenToHostScreen).arg(i), QString::number(iHostScreen));
    260261        QList<QAction*> screenActions = viewActions.at(i)->menu()->actions();
    261262        for (int w = 0; w < screenActions.size(); ++w)

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

    r41615 r41689  
    720720
    721721        /* Is there should be First RUN Wizard? */
    722         strSettings = machine.GetExtraData(VBoxDefs::GUI_FirstRun);
     722        strSettings = machine.GetExtraData(GUI_FirstRun);
    723723        if (strSettings == "yes")
    724724            m_fIsFirstTimeStarted = true;
    725725
    726726        /* Ignore mediums mounted at runtime? */
    727         strSettings = machine.GetExtraData(VBoxDefs::GUI_SaveMountedAtRuntime);
     727        strSettings = machine.GetExtraData(GUI_SaveMountedAtRuntime);
    728728        if (strSettings == "no")
    729729            m_fIsIgnoreRuntimeMediumsChanging = true;
    730730
    731731        /* Should guest autoresize? */
    732         strSettings = machine.GetExtraData(VBoxDefs::GUI_AutoresizeGuest);
     732        strSettings = machine.GetExtraData(GUI_AutoresizeGuest);
    733733        QAction *pGuestAutoresizeSwitch = gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize);
    734734        pGuestAutoresizeSwitch->setChecked(strSettings != "off");
    … …  
    752752    {
    753753        /* Disable First RUN Wizard for the since now: */
    754         machine.SetExtraData(VBoxDefs::GUI_FirstRun, QString());
     754        machine.SetExtraData(GUI_FirstRun, QString());
    755755
    756756        /* Remember if guest should autoresize: */
    757         machine.SetExtraData(VBoxDefs::GUI_AutoresizeGuest,
     757        machine.SetExtraData(GUI_AutoresizeGuest,
    758758                             gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->isChecked() ?
    759759                             QString() : "off");

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

    r41598 r41689  
    2323#include <QObject>
    2424#include <QCursor>
     25#include <QEvent>
    2526
    2627/* GUI includes: */

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

    r41587 r41689  
    209209        && m_pScreenLayout->isHostTaskbarCovert())
    210210    {
    211         QString testStr = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_PresentationModeEnabled).toLower();
     211        QString testStr = vboxGlobal().virtualBox().GetExtraData(GUI_PresentationModeEnabled).toLower();
    212212        /* Default to false if it is an empty value */
    213213        if (testStr.isEmpty() || testStr == "false")

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

    r41107 r41689  
    9797    switch (pEvent->type())
    9898    {
    99         case VBoxDefs::ResizeEventType:
     99        case ResizeEventType:
    100100        {
    101101            return guestResizeEvent(pEvent, true);
    … …  
    201201     * We need to do that because we cannot correctly draw in a scrolled window in SDL mode.
    202202     * In all other modes, or when auto-resize is in force, this function does nothing. */
    203     if (vboxGlobal().vmRenderMode() == VBoxDefs::SDLMode)
     203    if (vboxGlobal().vmRenderMode() == SDLMode)
    204204    {
    205205        if (!uisession()->isGuestSupportsGraphics() || !m_bIsGuestAutoresizeEnabled)

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

    r41587 r41689  
    2727
    2828/* GUI includes: */
     29#include "UIDefs.h"
    2930#include "VBoxMiniToolBar.h"
    3031#include "UISession.h"
    … …  
    111112
    112113    /* Make sure mini-toolbar is necessary: */
    113     bool fIsActive = m.GetExtraData(VBoxDefs::GUI_ShowMiniToolBar) != "no";
     114    bool fIsActive = m.GetExtraData(GUI_ShowMiniToolBar) != "no";
    114115    if (!fIsActive)
    115116        return;
    116117
    117118    /* Get the mini-toolbar alignment: */
    118     bool fIsAtTop = m.GetExtraData(VBoxDefs::GUI_MiniToolBarAlignment) == "top";
     119    bool fIsAtTop = m.GetExtraData(GUI_MiniToolBarAlignment) == "top";
    119120    /* Get the mini-toolbar auto-hide feature availability: */
    120     bool fIsAutoHide = m.GetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide) != "off";
     121    bool fIsAutoHide = m.GetExtraData(GUI_MiniToolBarAutoHide) != "off";
    121122    m_pMiniToolBar = new VBoxMiniToolBar(centralWidget(),
    122123                                         fIsAtTop ? VBoxMiniToolBar::AlignTop : VBoxMiniToolBar::AlignBottom,
    … …  
    142143
    143144    /* Save mini-toolbar settings: */
    144     machine().SetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide, m_pMiniToolBar->isAutoHide() ? QString() : "off");
     145    machine().SetExtraData(GUI_MiniToolBarAutoHide, m_pMiniToolBar->isAutoHide() ? QString() : "off");
    145146    /* Delete mini-toolbar: */
    146147    delete m_pMiniToolBar;

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

    r41107 r41689  
    9797    switch (pEvent->type())
    9898    {
    99         case VBoxDefs::ResizeEventType:
     99        case ResizeEventType:
    100100        {
    101101            return guestResizeEvent(pEvent, false);
    … …  
    198198        /* We send a guest size hint if needed to reverse a transition
    199199         * to fullscreen or seamless. */
    200         QString strKey = makeExtraDataKeyPerMonitor
    201                              (VBoxDefs::GUI_LastGuestSizeHintWasFullscreen);
     200        QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHintWasFullscreen);
    202201        QString strHintSent = machine.GetExtraData(strKey);
    203202        if (!strHintSent.isEmpty())
    … …  
    270269            availableGeo = dwt->availableGeometry(pTopLevelWidget->pos());
    271270
    272         frameGeo = VBoxGlobal::normalizeGeometry(frameGeo, availableGeo, vboxGlobal().vmRenderMode() != VBoxDefs::SDLMode /* can resize? */);
     271        frameGeo = VBoxGlobal::normalizeGeometry(frameGeo, availableGeo, vboxGlobal().vmRenderMode() != SDLMode /* can resize? */);
    273272    }
    274273
    … …  
    314313     * We need to do that because we cannot correctly draw in a scrolled window in SDL mode.
    315314     * In all other modes, or when auto-resize is in force, this function does nothing. */
    316     if (vboxGlobal().vmRenderMode() == VBoxDefs::SDLMode)
     315    if (vboxGlobal().vmRenderMode() == SDLMode)
    317316    {
    318317        if (!uisession()->isGuestSupportsGraphics() || !m_bIsGuestAutoresizeEnabled)

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

    r41591 r41689  
    338338    {
    339339        /* Load window position settings: */
    340         QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastNormalWindowPosition) :
    341                                      QString("%1%2").arg(VBoxDefs::GUI_LastNormalWindowPosition).arg(m_uScreenId);
     340        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastNormalWindowPosition) :
     341                                     QString("%1%2").arg(GUI_LastNormalWindowPosition).arg(m_uScreenId);
    342342        QStringList strPositionSettings = m.GetExtraDataStringList(strPositionAddress);
    343343        bool ok = !strPositionSettings.isEmpty(), max = false;
    … …  
    356356        else ok = false;
    357357        if (ok && strPositionSettings.size() > 4)
    358             max = strPositionSettings[4] == VBoxDefs::GUI_LastWindowState_Max;
     358            max = strPositionSettings[4] == GUI_LastWindowState_Max;
    359359        QRect ar = ok ? QApplication::desktop()->availableGeometry(QPoint(x, y)) :
    360360                        QApplication::desktop()->availableGeometry(this);
    … …  
    439439                                    .arg(m_normalGeometry.width()).arg(m_normalGeometry.height());
    440440        if (isMaximizedChecked())
    441             strWindowPosition += QString(",%1").arg(VBoxDefs::GUI_LastWindowState_Max);
    442         QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastNormalWindowPosition) :
    443                                      QString("%1%2").arg(VBoxDefs::GUI_LastNormalWindowPosition).arg(m_uScreenId);
     441            strWindowPosition += QString(",%1").arg(GUI_LastWindowState_Max);
     442        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastNormalWindowPosition) :
     443                                     QString("%1%2").arg(GUI_LastNormalWindowPosition).arg(m_uScreenId);
    444444        m.SetExtraData(strPositionAddress, strWindowPosition);
    445445    }

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

    r41591 r41689  
    161161    switch (pEvent->type())
    162162    {
    163         case VBoxDefs::ResizeEventType:
     163        case ResizeEventType:
    164164        {
    165165            /* Some situations require framebuffer resize events to be ignored at all,
    … …  
    192192        }
    193193
    194         case VBoxDefs::RepaintEventType:
     194        case RepaintEventType:
    195195        {
    196196            UIRepaintEvent *pPaintEvent = static_cast<UIRepaintEvent*>(pEvent);

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

    r41587 r41689  
    2929
    3030/* GUI includes: */
     31#include "UIDefs.h"
    3132#include "UISession.h"
    3233#include "UIMachineLogic.h"
    … …  
    110111    /* Load extra-data settings: */
    111112    {
    112         QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastScaleWindowPosition) :
    113                                      QString("%1%2").arg(VBoxDefs::GUI_LastScaleWindowPosition).arg(m_uScreenId);
     113        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastScaleWindowPosition) :
     114                                     QString("%1%2").arg(GUI_LastScaleWindowPosition).arg(m_uScreenId);
    114115        QStringList strPositionSettings = m.GetExtraDataStringList(strPositionAddress);
    115116
    … …  
    130131        else ok = false;
    131132        if (ok && strPositionSettings.size() > 4)
    132             max = strPositionSettings[4] == VBoxDefs::GUI_LastWindowState_Max;
     133            max = strPositionSettings[4] == GUI_LastWindowState_Max;
    133134
    134135        QRect ar = ok ? QApplication::desktop()->availableGeometry(QPoint(x, y)) :
    … …  
    169170                                    .arg(m_normalGeometry.width()).arg(m_normalGeometry.height());
    170171        if (isMaximizedChecked())
    171             strWindowPosition += QString(",%1").arg(VBoxDefs::GUI_LastWindowState_Max);
    172         QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastScaleWindowPosition) :
    173                                      QString("%1%2").arg(VBoxDefs::GUI_LastScaleWindowPosition).arg(m_uScreenId);
     172            strWindowPosition += QString(",%1").arg(GUI_LastWindowState_Max);
     173        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastScaleWindowPosition) :
     174                                     QString("%1%2").arg(GUI_LastScaleWindowPosition).arg(m_uScreenId);
    174175        m.SetExtraData(strPositionAddress, strWindowPosition);
    175176    }

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

    r41591 r41689  
    101101    switch (pEvent->type())
    102102    {
    103         case VBoxDefs::SetRegionEventType:
     103        case SetRegionEventType:
    104104        {
    105105            /* Get region-update event: */
    … …  
    115115        }
    116116
    117         case VBoxDefs::ResizeEventType:
     117        case ResizeEventType:
    118118        {
    119119            return guestResizeEvent(pEvent, true);

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

    r41587 r41689  
    143143
    144144    /* Make sure mini-toolbar is necessary: */
    145     bool fIsActive = m.GetExtraData(VBoxDefs::GUI_ShowMiniToolBar) != "no";
     145    bool fIsActive = m.GetExtraData(GUI_ShowMiniToolBar) != "no";
    146146    if (!fIsActive)
    147147        return;
    148148
    149149    /* Get the mini-toolbar alignment: */
    150     bool fIsAtTop = m.GetExtraData(VBoxDefs::GUI_MiniToolBarAlignment) == "top";
     150    bool fIsAtTop = m.GetExtraData(GUI_MiniToolBarAlignment) == "top";
    151151    /* Get the mini-toolbar auto-hide feature availability: */
    152     bool fIsAutoHide = m.GetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide) != "off";
     152    bool fIsAutoHide = m.GetExtraData(GUI_MiniToolBarAutoHide) != "off";
    153153    m_pMiniToolBar = new VBoxMiniToolBar(centralWidget(),
    154154                                         fIsAtTop ? VBoxMiniToolBar::AlignTop : VBoxMiniToolBar::AlignBottom,
    … …  
    192192
    193193    /* Save mini-toolbar settings: */
    194     machine().SetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide, m_pMiniToolBar->isAutoHide() ? QString() : "off");
     194    machine().SetExtraData(GUI_MiniToolBarAutoHide, m_pMiniToolBar->isAutoHide() ? QString() : "off");
    195195    /* Delete mini-toolbar: */
    196196    delete m_pMiniToolBar;
    … …  
    348348#elif defined (Q_WS_MAC)
    349349# if defined (VBOX_GUI_USE_QUARTZ2D)
    350     if (vboxGlobal().vmRenderMode() == VBoxDefs::Quartz2DMode)
     350    if (vboxGlobal().vmRenderMode() == Quartz2DMode)
    351351    {
    352352        /* If we are using the Quartz2D backend we have to trigger

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp

    r39932 r41689  
    5757    m_Shortcuts[AboutShortcut]               = UIKeySequence("About");
    5858    /* Get a list of overwritten keys */
    59     loadExtraData(VBoxDefs::GUI_Input_SelectorShortcuts, EndShortcutType);
     59    loadExtraData(GUI_Input_SelectorShortcuts, EndShortcutType);
    6060}
    6161

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

    r41616 r41689  
    146146    /* Load toolbar/statusbar availability settings: */
    147147    CVirtualBox vbox = vboxGlobal().virtualBox();
    148     QString strToolbar = vbox.GetExtraData(VBoxDefs::GUI_Toolbar);
    149     QString strStatusbar = vbox.GetExtraData(VBoxDefs::GUI_Statusbar);
     148    QString strToolbar = vbox.GetExtraData(GUI_Toolbar);
     149    QString strStatusbar = vbox.GetExtraData(GUI_Statusbar);
    150150    bool fToolbar = strToolbar.isEmpty() || strToolbar == "true";
    151151    bool fStatusbar = strStatusbar.isEmpty() || strStatusbar == "true";
    … …  
    176176            m_pBar->show();
    177177#endif /* !Q_WS_MAC */
    178             vbox.SetExtraData(VBoxDefs::GUI_Toolbar, "true");
     178            vbox.SetExtraData(GUI_Toolbar, "true");
    179179        }
    180180        else
    … …  
    185185            m_pBar->hide();
    186186#endif /* !Q_WS_MAC */
    187             vbox.SetExtraData(VBoxDefs::GUI_Toolbar, "false");
     187            vbox.SetExtraData(GUI_Toolbar, "false");
    188188        }
    189189    }
    … …  
    193193        {
    194194            statusBar()->show();
    195             vbox.SetExtraData(VBoxDefs::GUI_Statusbar, "true");
     195            vbox.SetExtraData(GUI_Statusbar, "true");
    196196        }
    197197        else
    198198        {
    199199            statusBar()->hide();
    200             vbox.SetExtraData(VBoxDefs::GUI_Statusbar, "false");
     200            vbox.SetExtraData(GUI_Statusbar, "false");
    201201        }
    202202    }
    … …  
    291291        QString strTitle = tr("Select a virtual machine file");
    292292        QStringList extensions;
    293         for (int i = 0; i < VBoxDefs::VBoxFileExts.size(); ++i)
    294             extensions << QString("*.%1").arg(VBoxDefs::VBoxFileExts[i]);
     293        for (int i = 0; i < VBoxFileExts.size(); ++i)
     294            extensions << QString("*.%1").arg(VBoxFileExts[i]);
    295295        QString strFilter = tr("Virtual machine files (%1)").arg(extensions.join(" "));
    296296        /* Create open file dialog: */
    … …  
    792792        m_pVMModel->addItem(*m);
    793793    /* Apply the saved sort order. */
    794     m_pVMModel->sortByIdList(vbox.GetExtraDataStringList(VBoxDefs::GUI_SelectorVMPositions));
     794    m_pVMModel->sortByIdList(vbox.GetExtraDataStringList(GUI_SelectorVMPositions));
    795795    /* Update details page. */
    796796    sltCurrentVMItemChanged();
    … …  
    962962        if (!strFile.isEmpty() && QFile::exists(strFile))
    963963        {
    964             if (VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::VBoxFileExts))
     964            if (VBoxGlobal::hasAllowedExtension(strFile, VBoxFileExts))
    965965            {
    966966                /* VBox config files. */
    … …  
    977977                    sltShowAddMachineDialog(strFile);
    978978            }
    979             else if (VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::OVFFileExts))
     979            else if (VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts))
    980980            {
    981981                /* OVF/OVA. Only one file at the time. */
    … …  
    983983                break;
    984984            }
    985             else if (VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::VBoxExtPackFileExts))
     985            else if (VBoxGlobal::hasAllowedExtension(strFile, VBoxExtPackFileExts))
    986986            {
    987987                UIGlobalSettingsExtension::doInstallation(strFile, QString(), this, NULL);
    … …  
    12631263            /* We have to invert the isVisible check one time, cause this event
    12641264             * is sent *before* the real toggle is done. Really intuitive Trolls. */
    1265             vbox.SetExtraData(VBoxDefs::GUI_Toolbar, !::darwinIsToolbarVisible(mVMToolBar) ? "true" : "false");
     1265            vbox.SetExtraData(GUI_Toolbar, !::darwinIsToolbarVisible(mVMToolBar) ? "true" : "false");
    12661266            break;
    12671267        }
    … …  
    16841684    /* Restore window position: */
    16851685    {
    1686         QString strWinPos = vbox.GetExtraData(VBoxDefs::GUI_LastWindowPosition);
     1686        QString strWinPos = vbox.GetExtraData(GUI_LastSelectorWindowPosition);
    16871687
    16881688        bool ok = false, max = false;
    … …  
    16961696            h = strWinPos.section(',', 3, 3).toInt(&ok);
    16971697        if (ok)
    1698             max = strWinPos.section(',', 4, 4) == VBoxDefs::GUI_LastWindowState_Max;
     1698            max = strWinPos.section(',', 4, 4) == GUI_LastWindowState_Max;
    16991699
    17001700        QRect ar = ok ? QApplication::desktop()->availableGeometry(QPoint(x, y)) :
    … …  
    17271727    /* Restore selected VM(s): */
    17281728    {
    1729         QString strPrevVMId = vbox.GetExtraData(VBoxDefs::GUI_LastVMSelected);
     1729        QString strPrevVMId = vbox.GetExtraData(GUI_LastVMSelected);
    17301730
    17311731        m_pVMListView->selectItemById(strPrevVMId);
    … …  
    17341734    /* Restore splitter handle position: */
    17351735    {
    1736         QList<int> sizes = vbox.GetExtraDataIntList(VBoxDefs::GUI_SplitterSizes);
     1736        QList<int> sizes = vbox.GetExtraDataIntList(GUI_SplitterSizes);
    17371737
    17381738        if (sizes.size() == 2)
    … …  
    17421742    /* Restore toolbar and statusbar visibility: */
    17431743    {
    1744         QString strToolbar = vbox.GetExtraData(VBoxDefs::GUI_Toolbar);
    1745         QString strStatusbar = vbox.GetExtraData(VBoxDefs::GUI_Statusbar);
     1744        QString strToolbar = vbox.GetExtraData(GUI_Toolbar);
     1745        QString strStatusbar = vbox.GetExtraData(GUI_Statusbar);
    17461746
    17471747#ifdef Q_WS_MAC
    … …  
    17751775        if (isMaximized())
    17761776#endif /* !Q_WS_MAC */
    1777             strWinPos += QString(",%1").arg(VBoxDefs::GUI_LastWindowState_Max);
    1778 
    1779         vbox.SetExtraData(VBoxDefs::GUI_LastWindowPosition, strWinPos);
     1777            strWinPos += QString(",%1").arg(GUI_LastWindowState_Max);
     1778
     1779        vbox.SetExtraData(GUI_LastSelectorWindowPosition, strWinPos);
    17801780    }
    17811781
    … …  
    17841784        UIVMItem *pItem = m_pVMListView->currentItem();
    17851785        QString strCurrentVMId = pItem ? QString(pItem->id()) : QString();
    1786         vbox.SetExtraData(VBoxDefs::GUI_LastVMSelected, strCurrentVMId);
    1787         vbox.SetExtraDataStringList(VBoxDefs::GUI_SelectorVMPositions, m_pVMModel->idList());
     1786        vbox.SetExtraData(GUI_LastVMSelected, strCurrentVMId);
     1787        vbox.SetExtraDataStringList(GUI_SelectorVMPositions, m_pVMModel->idList());
    17881788    }
    17891789
    17901790    /* Save splitter handle position: */
    17911791    {
    1792         vbox.SetExtraDataIntList(VBoxDefs::GUI_SplitterSizes, m_pSplitter->sizes());
     1792        vbox.SetExtraDataIntList(GUI_SplitterSizes, m_pSplitter->sizes());
    17931793    }
    17941794}

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

    r41608 r41689  
    16541654
    16551655    /* Load section configuration from extra data: */
    1656     QStringList values = vboxGlobal().virtualBox().GetExtraDataStringList(VBoxDefs::GUI_DetailsPageBoxes,
     1656    QStringList values = vboxGlobal().virtualBox().GetExtraDataStringList(GUI_DetailsPageBoxes,
    16571657                                                                          /* Default keys: */
    16581658                                                                          QStringList()
    … …  
    17161716    }
    17171717    /* Save section configuration to extra data: */
    1718     vboxGlobal().virtualBox().SetExtraDataStringList(VBoxDefs::GUI_DetailsPageBoxes, m_sectionSettings.values());
     1718    vboxGlobal().virtualBox().SetExtraDataStringList(GUI_DetailsPageBoxes, m_sectionSettings.values());
    17191719}
    17201720

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp

    r41608 r41689  
    264264         * UIMessageCenter::confirm_machineDeletion() */
    265265        QFileInfo fi(m_strSettingsFile);
    266         QString name = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxDefs::VBoxFileExts) ?
     266        QString name = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxFileExts) ?
    267267                       fi.completeBaseName() : fi.fileName();
    268268        needsResort = name != m_strName;

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp

    r40202 r41689  
    517517        QList<QUrl> list = pEvent->mimeData()->urls();
    518518        QString file = list.at(0).toLocalFile();
    519         if (VBoxGlobal::hasAllowedExtension(file, VBoxDefs::VBoxFileExts))
     519        if (VBoxGlobal::hasAllowedExtension(file, VBoxFileExts))
    520520        {
    521521            Qt::DropAction action = Qt::IgnoreAction;
    … …  
    529529                pEvent->accept();
    530530            }
    531         }else if (   VBoxGlobal::hasAllowedExtension(file, VBoxDefs::OVFFileExts)
     531        }else if (   VBoxGlobal::hasAllowedExtension(file, OVFFileExts)
    532532                  && pEvent->possibleActions().testFlag(Qt::CopyAction))
    533533        {
    534534            pEvent->setDropAction(Qt::CopyAction);
    535535            pEvent->accept();
    536         }else if (   VBoxGlobal::hasAllowedExtension(file, VBoxDefs::VBoxExtPackFileExts)
     536        }else if (   VBoxGlobal::hasAllowedExtension(file, VBoxExtPackFileExts)
    537537                  && pEvent->possibleActions().testFlag(Qt::CopyAction))
    538538        {

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp

    r41591 r41689  
    8282
    8383    /* Load preview update interval: */
    84     QString strInterval = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_PreviewUpdate);
     84    QString strInterval = vboxGlobal().virtualBox().GetExtraData(GUI_PreviewUpdate);
    8585    /* Parse loaded value: */
    8686    UpdateInterval interval = m_intervals.key(strInterval, UpdateInterval_1000ms);
    … …  
    375375    }
    376376    if (fSave && m_intervals.contains(interval))
    377         vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_PreviewUpdate, m_intervals[interval]);
     377        vboxGlobal().virtualBox().SetExtraData(GUI_PreviewUpdate, m_intervals[interval]);
    378378}
    379379

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.cpp

    r38977 r41689  
    8787    if (mActive)
    8888    {
    89         vboxGlobal().virtualBox().SetExtraData (VBoxDefs::GUI_TrayIconWinID,
    90                                                 QString::null);
     89        vboxGlobal().virtualBox().SetExtraData(GUI_TrayIconWinID, QString::null);
    9190        hide();
    9291    }

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

    r41587 r41689  
    845845         * the boot order or disk configuration were changed: */
    846846        if (m_fResetFirstRunFlag)
    847             m_machine.SetExtraData(VBoxDefs::GUI_FirstRun, QString::null);
     847            m_machine.SetExtraData(GUI_FirstRun, QString::null);
    848848
    849849        /* Save settings finally: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

    r41587 r41689  
    334334    QString strTitle = tr("Select an extension package file");
    335335    QStringList extensions;
    336     for (int i = 0; i < VBoxDefs::VBoxExtPackFileExts.size(); ++i)
    337         extensions << QString("*.%1").arg(VBoxDefs::VBoxExtPackFileExts[i]);
     336    for (int i = 0; i < VBoxExtPackFileExts.size(); ++i)
     337        extensions << QString("*.%1").arg(VBoxExtPackFileExts[i]);
    338338    QString strFilter = tr("Extension package files (%1)").arg(extensions.join(" "));
    339339

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp

    r34166 r41689  
    4949
    5050    /* Fill internal variables with corresponding values: */
    51     VBoxUpdateData updateData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate));
     51    VBoxUpdateData updateData(vboxGlobal().virtualBox().GetExtraData(GUI_UpdateDate));
    5252    m_cache.m_fCheckEnabled = !updateData.isNoNeedToCheck();
    5353    m_cache.m_periodIndex = updateData.periodIndex();
    … …  
    103103    /* Gather corresponding values from internal variables: */
    104104    VBoxUpdateData newData(m_cache.m_periodIndex, m_cache.m_branchIndex);
    105     vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDate, newData.data());
     105    vboxGlobal().virtualBox().SetExtraData(GUI_UpdateDate, newData.data());
    106106
    107107    /* Upload properties & settings to data: */

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

    r41608 r41689  
    350350                            "the minimum amount required to switch the virtual machine to "
    351351                            "fullscreen or seamless mode.")
    352                             .arg(vboxGlobal().formatSize(uNeedBytes, 0, VBoxDefs::FormatSize_RoundUp));
     352                            .arg(vboxGlobal().formatSize(uNeedBytes, 0, FormatSize_RoundUp));
    353353            return true;
    354354        }
    … …  
    362362                strWarning = tr("you have assigned less than <b>%1</b> of video memory which is "
    363363                                "the minimum amount required for HD Video to be played efficiently.")
    364                                 .arg(vboxGlobal().formatSize(uNeedBytes, 0, VBoxDefs::FormatSize_RoundUp));
     364                                .arg(vboxGlobal().formatSize(uNeedBytes, 0, FormatSize_RoundUp));
    365365                return true;
    366366            }
    … …  
    379379                strWarning = tr("you have 3D Acceleration enabled for a operation system which uses the WDDM video driver. "
    380380                                "For maximal performance set the guest VRAM to at least <b>%1</b>.")
    381                                 .arg(vboxGlobal().formatSize(uNeedBytes, 0, VBoxDefs::FormatSize_RoundUp));
     381                                .arg(vboxGlobal().formatSize(uNeedBytes, 0, FormatSize_RoundUp));
    382382                return true;
    383383            }

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

    r41608 r41689  
    9090    generalData.m_strName = m_machine.GetName();
    9191    generalData.m_strGuestOsTypeId = m_machine.GetOSTypeId();
    92     QString strSaveMountedAtRuntime = m_machine.GetExtraData(VBoxDefs::GUI_SaveMountedAtRuntime);
     92    QString strSaveMountedAtRuntime = m_machine.GetExtraData(GUI_SaveMountedAtRuntime);
    9393    generalData.m_fSaveMountedAtRuntime = strSaveMountedAtRuntime != "no";
    94     QString strShowMiniToolBar = m_machine.GetExtraData(VBoxDefs::GUI_ShowMiniToolBar);
     94    QString strShowMiniToolBar = m_machine.GetExtraData(GUI_ShowMiniToolBar);
    9595    generalData.m_fShowMiniToolBar = strShowMiniToolBar != "no";
    96     QString strMiniToolBarAlignment = m_machine.GetExtraData(VBoxDefs::GUI_MiniToolBarAlignment);
     96    QString strMiniToolBarAlignment = m_machine.GetExtraData(GUI_MiniToolBarAlignment);
    9797    generalData.m_fMiniToolBarAtTop = strMiniToolBarAlignment == "top";
    9898    generalData.m_strSnapshotsFolder = m_machine.GetSnapshotFolder();
    … …  
    174174            /* Advanced tab: */
    175175            m_machine.SetClipboardMode(generalData.m_clipboardMode);
    176             m_machine.SetExtraData(VBoxDefs::GUI_SaveMountedAtRuntime, generalData.m_fSaveMountedAtRuntime ? "yes" : "no");
    177             m_machine.SetExtraData(VBoxDefs::GUI_ShowMiniToolBar, generalData.m_fShowMiniToolBar ? "yes" : "no");
    178             m_machine.SetExtraData(VBoxDefs::GUI_MiniToolBarAlignment, generalData.m_fMiniToolBarAtTop ? "top" : "bottom");
     176            m_machine.SetExtraData(GUI_SaveMountedAtRuntime, generalData.m_fSaveMountedAtRuntime ? "yes" : "no");
     177            m_machine.SetExtraData(GUI_ShowMiniToolBar, generalData.m_fShowMiniToolBar ? "yes" : "no");
     178            m_machine.SetExtraData(GUI_MiniToolBarAlignment, generalData.m_fMiniToolBarAtTop ? "top" : "bottom");
    179179            /* Description tab: */
    180180            m_machine.SetDescription(generalData.m_strDescription);

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

    r41615 r41689  
    31713171    {
    31723172        case UIMediumType_HardDisk:
    3173             strRecentMediumAddress = VBoxDefs::GUI_RecentListHD;
     3173            strRecentMediumAddress = GUI_RecentListHD;
    31743174            break;
    31753175        case UIMediumType_DVD:
    3176             strRecentMediumAddress = VBoxDefs::GUI_RecentListCD;
     3176            strRecentMediumAddress = GUI_RecentListCD;
    31773177            break;
    31783178        case UIMediumType_Floppy:
    3179             strRecentMediumAddress = VBoxDefs::GUI_RecentListFD;
     3179            strRecentMediumAddress = GUI_RecentListFD;
    31803180            break;
    31813181        default:

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

    r41608 r41689  
    3131#include "UIMachineSettingsUSB.h"
    3232#include "UIMachineSettingsUSBFilterDetails.h"
    33 #include "VBoxDefs.h"
    3433#include "COMEnumsWrapper.h"
    3534
    … …  
    4342#include "CExtPackManager.h"
    4443#include "CExtPack.h"
    45 
    46 /* Using declarations: */
    47 using namespace VBoxGlobalDefs;
    4844
    4945/**
    … …  
    420416            usbData.m_fUSBEnabled = mGbUSB->isChecked();
    421417            /* USB 2.0 (EHCI): */
    422             CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(UI_ExtPackName);
     418            CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
    423419            usbData.m_fEHCIEnabled = extPack.isNull() || !extPack.GetUsable() ? false : mCbUSB2->isChecked();
    424420
    … …  
    579575    NOREF(strWarningText);
    580576#ifdef VBOX_WITH_EXTPACK
    581     CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(UI_ExtPackName);
     577    CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
    582578    if (mGbUSB->isChecked() && mCbUSB2->isChecked() && (extPack.isNull() || !extPack.GetUsable()))
    583579    {
    … …  
    587583                            "After this you will be able to re-enable USB 2.0. "
    588584                            "It will be disabled in the meantime unless you cancel the current settings changes.")
    589                             .arg(UI_ExtPackName);
    590         msgCenter().remindAboutUnsupportedUSB2(UI_ExtPackName, this);
     585                            .arg(GUI_ExtPackName);
     586        msgCenter().remindAboutUnsupportedUSB2(GUI_ExtPackName, this);
    591587        return true;
    592588    }

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

    r35862 r41689  
    2020/* Local includes */
    2121#include "UIHotKeyEditor.h"
    22 #include "VBoxDefs.h"
    2322#include "VBoxGlobal.h"
    2423

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp

    r41415 r41689  
    6262        QString strWizardName = nameForType(m_type);
    6363        /* Load mode settings: */
    64         QStringList wizards = vboxGlobal().virtualBox().GetExtraDataStringList(VBoxDefs::GUI_HideDescriptionForWizards);
     64        QStringList wizards = vboxGlobal().virtualBox().GetExtraDataStringList(GUI_HideDescriptionForWizards);
    6565
    6666        /* Switch mode: */
    … …  
    8989
    9090        /* Save mode settings: */
    91         vboxGlobal().virtualBox().SetExtraDataStringList(VBoxDefs::GUI_HideDescriptionForWizards, wizards);
     91        vboxGlobal().virtualBox().SetExtraDataStringList(GUI_HideDescriptionForWizards, wizards);
    9292
    9393        /* Prepare: */
    … …  
    551551        return UIWizardMode_Basic;
    552552    /* Get mode from extra-data: */
    553     QStringList wizards = vboxGlobal().virtualBox().GetExtraDataStringList(VBoxDefs::GUI_HideDescriptionForWizards);
     553    QStringList wizards = vboxGlobal().virtualBox().GetExtraDataStringList(GUI_HideDescriptionForWizards);
    554554    if (wizards.contains(nameForType(type)))
    555555        return UIWizardMode_Expert;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

    r41587 r41689  
    124124        /* Save attributes to GUI extra data: */
    125125        StorageType storageType = field("storageType").value<StorageType>();
    126         vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_Export_StorageType, QString::number(storageType));
    127         vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_Export_Username, m_pLeUsername->text());
    128         vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_Export_Hostname, m_pLeHostname->text());
    129         vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_Export_Bucket, m_pLeBucket->text());
     126        vboxGlobal().virtualBox().SetExtraData(GUI_Export_StorageType, QString::number(storageType));
     127        vboxGlobal().virtualBox().SetExtraData(GUI_Export_Username, m_pLeUsername->text());
     128        vboxGlobal().virtualBox().SetExtraData(GUI_Export_Hostname, m_pLeHostname->text());
     129        vboxGlobal().virtualBox().SetExtraData(GUI_Export_Bucket, m_pLeBucket->text());
    130130#endif
    131131        return true;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp

    r41610 r41689  
    5959            QString settingsFile = machine.GetSettingsFilePath();
    6060            QFileInfo fi(settingsFile);
    61             strName = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxDefs::VBoxFileExts) ? fi.completeBaseName() : fi.fileName();
     61            strName = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxFileExts) ? fi.completeBaseName() : fi.fileName();
    6262            pixIcon = QPixmap(":/os_other.png").scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
    6363        }

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp

    r41372 r41689  
    3838    /* Load storage-type from GUI extra data: */
    3939    bool ok;
    40     StorageType storageType = StorageType(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_Export_StorageType).toInt(&ok));
     40    StorageType storageType = StorageType(vboxGlobal().virtualBox().GetExtraData(GUI_Export_StorageType).toInt(&ok));
    4141    if (ok)
    4242        setStorageType(storageType);

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp

    r41372 r41689  
    4242    /* Select default settings: */
    4343#if 0
    44     m_pUsernameEditor->setText(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_Export_Username));
    45     m_pHostnameEditor->setText(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_Export_Hostname));
    46     m_pBucketEditor->setText(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_Export_Bucket));
     44    m_pUsernameEditor->setText(vboxGlobal().virtualBox().GetExtraData(GUI_Export_Username));
     45    m_pHostnameEditor->setText(vboxGlobal().virtualBox().GetExtraData(GUI_Export_Hostname));
     46    m_pBucketEditor->setText(vboxGlobal().virtualBox().GetExtraData(GUI_Export_Bucket));
    4747#else
    4848    /* Do nothing for now... */
    … …  
    307307    {
    308308        const QString &strFile = m_pFileSelector->path().toLower();
    309         fResult = VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::OVFFileExts);
     309        fResult = VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts);
    310310        if (fResult)
    311311        {

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp

    r41402 r41689  
    232232    {
    233233        const QString &strFile = m_pFileSelector->path().toLower();
    234         fResult = VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::OVFFileExts);
     234        fResult = VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts);
    235235        if (fResult)
    236236        {

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

    r41372 r41689  
    7777{
    7878    /* Make sure appliance file has allowed extension and exists: */
    79     return VBoxGlobal::hasAllowedExtension(m_pFileSelector->path().toLower(), VBoxDefs::OVFFileExts) &&
     79    return VBoxGlobal::hasAllowedExtension(m_pFileSelector->path().toLower(), OVFFileExts) &&
    8080           QFileInfo(m_pFileSelector->path()).exists();
    8181}

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp

    r41402 r41689  
    9292{
    9393    /* Make sure appliance file has allowed extension and exists and appliance widget is valid: */
    94     return VBoxGlobal::hasAllowedExtension(m_pFileSelector->path().toLower(), VBoxDefs::OVFFileExts) &&
     94    return VBoxGlobal::hasAllowedExtension(m_pFileSelector->path().toLower(), OVFFileExts) &&
    9595           QFileInfo(m_pFileSelector->path()).exists() &&
    9696           m_pApplianceWidget->isValid();

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

    r41615 r41689  
    2424#include "UIWizardNewVMPageBasic3.h"
    2525#include "UIWizardNewVMPageExpert.h"
    26 #include "VBoxDefs.h"
    2726#include "VBoxGlobal.h"
    2827#include "UIMessageCenter.h"
    … …  
    3332#include "CExtPackManager.h"
    3433#include "CStorageController.h"
    35 
    36 /* Using declarations: */
    37 using namespace VBoxGlobalDefs;
    3834
    3935UIWizardNewVM::UIWizardNewVM(QWidget *pParent)
    … …  
    7672         * Selecting an existing virtual hard drive will cancel the FirstRun wizard. */
    7773        if (field("virtualDiskId").toString().isNull() || !field("virtualDisk").value<CMedium>().isNull())
    78             m_machine.SetExtraData(VBoxDefs::GUI_FirstRun, "yes");
     74            m_machine.SetExtraData(GUI_FirstRun, "yes");
    7975    }
    8076
    … …  
    104100         * introduced by the new distribution model. */
    105101        CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager();
    106         if (manager.IsExtPackUsable(UI_ExtPackName))
     102        if (manager.IsExtPackUsable(GUI_ExtPackName))
    107103            usbController.SetEnabledEhci(true);
    108104    }

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp

    r41615 r41689  
    2727#include "UIWizardNewVMPageBasic3.h"
    2828#include "UIWizardNewVM.h"
    29 #include "VBoxDefs.h"
    3029#include "UIMessageCenter.h"
    3130#include "UIIconPool.h"
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