VirtualBox

Changeset 36589 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Apr 6, 2011 3:24:00 PM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
71029
Message:

FE/Qt: Moving UISettingsDialogType enum from VBoxDefs to separate UISettingsDefs namespace.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
14 edited
2 copied

Legend:

Unmodified
Added
Removed

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

    r36357 r36589  
    458458        src/extensions/QIWidgetValidator.cpp \
    459459        src/extensions/QIWizard.cpp \
     460        src/settings/UISettingsDefs.cpp \
    460461        src/settings/UISettingsDialog.cpp \
    461462        src/settings/UISettingsDialogSpecific.cpp \

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

    r36519 r36589  
    9999    };
    100100
    101     /** Settings dialog types: */
    102     enum SettingsDialogType
    103     {
    104         SettingsDialogType_Wrong,
    105         SettingsDialogType_Offline,
    106         SettingsDialogType_Saved,
    107         SettingsDialogType_Runtime
    108     };
    109 
    110101    static const char* GUI_LastWindowPosition;
    111102    static const char* GUI_LastNormalWindowPosition;

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

    r36357 r36589  
    964964    /* Prepare VM settings dialog: */
    965965    UISettingsDialog *pDlg = new UISettingsDialogMachine(defaultMachineWindow()->machineWindow(),
    966                                                          VBoxDefs::SettingsDialogType_Runtime,
     966                                                         SettingsDialogType_Online,
    967967                                                         sharedMachine, session().GetConsole(),
    968968                                                         strCategory, QString());

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

    r36519 r36589  
    595595    CSystemProperties props = vboxGlobal().virtualBox().GetSystemProperties();
    596596
    597     UISettingsDialog *dlg = new UISettingsDialogGlobal(this, VBoxDefs::SettingsDialogType_Offline);
     597    UISettingsDialog *dlg = new UISettingsDialogGlobal(this, SettingsDialogType_Offline);
    598598    dlg->getFrom();
    599599
    … …  
    723723    AssertMsgReturnVoid(pItem, ("Item must be always selected here"));
    724724
    725     VBoxDefs::SettingsDialogType dialogType = pItem->machineState() == KMachineState_Saved ? VBoxDefs::SettingsDialogType_Saved :
    726                                               pItem->sessionState() == KSessionState_Unlocked ? VBoxDefs::SettingsDialogType_Offline :
    727                                               VBoxDefs::SettingsDialogType_Runtime;
    728 
    729     CSession session = vboxGlobal().openSession(pItem->id(), dialogType != VBoxDefs::SettingsDialogType_Offline /* connect to existing? */);
    730     AssertMsgReturn(!session.isNull(), ("Session must not be null"), (void)0);
     725    SettingsDialogType dialogType = machineStateToSettingsDialogType(pItem->machineState());
     726
     727    CSession session = vboxGlobal().openSession(pItem->id(), dialogType != SettingsDialogType_Offline /* connect to existing? */);
     728    AssertMsgReturnVoid(!session.isNull(), ("Session must not be null"));
    731729    CMachine machine = session.GetMachine();
    732     AssertMsgReturn(!machine.isNull(), ("Machine must not be null"), (void)0);
    733     CConsole console = dialogType == VBoxDefs::SettingsDialogType_Offline ? CConsole() : session.GetConsole();
     730    AssertMsgReturnVoid(!machine.isNull(), ("Machine must not be null"));
     731    CConsole console = dialogType == SettingsDialogType_Offline ? CConsole() : session.GetConsole();
    734732
    735733    /* Don't show the inaccessible warning if the user open the vm settings: */

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

    r36567 r36589  
    33 *
    44 * VBox frontends: Qt GUI ("VirtualBox"):
    5  * VBoxDefs implementation
     5 * UISettingsDefs implementation
    66 */
    77
    88/*
    9  * Copyright (C) 2006-2010 Oracle Corporation
     9 * Copyright (C) 2011 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1818 */
    1919
    20 /* Local includes */
    21 #include <VBoxDefs.h>
     20/* VBox includes: */
     21#include "UISettingsDefs.h"
    2222
    23 /* Global includes */
    24 #include <QStringList>
     23/* Using declarations: */
     24using namespace UISettingsDefs;
    2525
    26 const char* VBoxDefs::GUI_LastWindowPosition = "GUI/LastWindowPosition";
    27 const char* VBoxDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition";
    28 const char* VBoxDefs::GUI_LastScaleWindowPosition = "GUI/LastScaleWindowPosition";
    29 const char* VBoxDefs::GUI_LastWindowState_Max = "max";
    30 const char* VBoxDefs::GUI_LastGuestSizeHint = "GUI/LastGuestSizeHint";
    31 const char* VBoxDefs::GUI_Toolbar = "GUI/Toolbar";
    32 const char* VBoxDefs::GUI_Statusbar = "GUI/Statusbar";
    33 const char* VBoxDefs::GUI_SplitterSizes = "GUI/SplitterSizes";
    34 const char* VBoxDefs::GUI_Fullscreen = "GUI/Fullscreen";
    35 const char* VBoxDefs::GUI_Seamless = "GUI/Seamless";
    36 const char* VBoxDefs::GUI_Scale = "GUI/Scale";
    37 const char* VBoxDefs::GUI_VirtualScreenToHostScreen = "GUI/VirtualScreenToHostScreen";
    38 const char* VBoxDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest";
    39 const char* VBoxDefs::GUI_FirstRun = "GUI/FirstRun";
    40 const char* VBoxDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime";
    41 const char* VBoxDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar";
    42 const char* VBoxDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment";
    43 const char* VBoxDefs::GUI_MiniToolBarAutoHide = "GUI/MiniToolBarAutoHide";
    44 const char* VBoxDefs::GUI_LastCloseAction = "GUI/LastCloseAction";
    45 const char* VBoxDefs::GUI_RestrictedCloseActions = "GUI/RestrictedCloseActions";
    46 const char* VBoxDefs::GUI_SuppressMessages = "GUI/SuppressMessages";
    47 const char* VBoxDefs::GUI_PermanentSharedFoldersAtRuntime = "GUI/PermanentSharedFoldersAtRuntime";
    48 const char* VBoxDefs::GUI_LanguageId = "GUI/LanguageID";
    49 const char* VBoxDefs::GUI_PreviewUpdate = "GUI/PreviewUpdate";
    50 const char* VBoxDefs::GUI_DetailsPageBoxes = "GUI/DetailsPageBoxes";
    51 const char* VBoxDefs::GUI_SelectorVMPositions = "GUI/SelectorVMPositions";
    52 const char* VBoxDefs::GUI_Input_MachineShortcuts = "GUI/Input/MachineShortcuts";
    53 const char* VBoxDefs::GUI_Input_SelectorShortcuts = "GUI/Input/SelectorShortcuts";
    54 #ifdef Q_WS_X11
    55 const char* VBoxDefs::GUI_LicenseKey = "GUI/LicenseAgreed";
    56 #endif
    57 const char* VBoxDefs::GUI_RegistrationDlgWinID = "GUI/RegistrationDlgWinID";
    58 const char* VBoxDefs::GUI_RegistrationData = "GUI/SUNOnlineData";
    59 const char* VBoxDefs::GUI_UpdateDlgWinID = "GUI/UpdateDlgWinID";
    60 const char* VBoxDefs::GUI_UpdateDate = "GUI/UpdateDate";
    61 const char* VBoxDefs::GUI_UpdateCheckCount = "GUI/UpdateCheckCount";
    62 const char* VBoxDefs::GUI_LastVMSelected = "GUI/LastVMSelected";
    63 const char* VBoxDefs::GUI_InfoDlgState = "GUI/InfoDlgState";
    64 const char* VBoxDefs::GUI_RenderMode = "GUI/RenderMode";
    65 #ifdef VBOX_GUI_WITH_SYSTRAY
    66 const char* VBoxDefs::GUI_TrayIconWinID = "GUI/TrayIcon/WinID";
    67 const char* VBoxDefs::GUI_TrayIconEnabled = "GUI/TrayIcon/Enabled";
    68 const char* VBoxDefs::GUI_MainWindowCount = "GUI/MainWindowCount";
    69 #endif
    70 #ifdef Q_WS_MAC
    71 const char* VBoxDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
    72 const char* VBoxDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor";
    73 const char* VBoxDefs::GUI_PresentationModeEnabled = "GUI/PresentationModeEnabled";
    74 #endif /* Q_WS_MAC */
    75 const char* VBoxDefs::GUI_PassCAD = "GUI/PassCAD";
    76 const char* VBoxDefs::GUI_Export_StorageType = "GUI/Export/StorageType";
    77 const char* VBoxDefs::GUI_Export_Username = "GUI/Export/Username";
    78 const char* VBoxDefs::GUI_Export_Hostname = "GUI/Export/Hostname";
    79 const char* VBoxDefs::GUI_Export_Bucket = "GUI/Export/Bucket";
    80 const char* VBoxDefs::GUI_PreventBetaWarning = "GUI/PreventBetaWarning";
    81 const char* VBoxDefs::GUI_RecentFolderHD = "GUI/RecentFolderHD";
    82 const char* VBoxDefs::GUI_RecentFolderCD = "GUI/RecentFolderCD";
    83 const char* VBoxDefs::GUI_RecentFolderFD = "GUI/RecentFolderFD";
    84 const char* VBoxDefs::GUI_RecentListHD = "GUI/RecentListHD";
    85 const char* VBoxDefs::GUI_RecentListCD = "GUI/RecentListCD";
    86 const char* VBoxDefs::GUI_RecentListFD = "GUI/RecentListFD";
    87 #ifdef VBOX_WITH_VIDEOHWACCEL
    88 const char* VBoxDefs::GUI_Accelerate2D_StretchLinear = "GUI/Accelerate2D/StretchLinear";
    89 const char* VBoxDefs::GUI_Accelerate2D_PixformatYV12 = "GUI/Accelerate2D/PixformatYV12";
    90 const char* VBoxDefs::GUI_Accelerate2D_PixformatUYVY = "GUI/Accelerate2D/PixformatUYVY";
    91 const char* VBoxDefs::GUI_Accelerate2D_PixformatYUY2 = "GUI/Accelerate2D/PixformatYUY2";
    92 const char* VBoxDefs::GUI_Accelerate2D_PixformatAYUV = "GUI/Accelerate2D/PixformatAYUV";
    93 #endif
    94 #ifdef VBOX_WITH_DEBUGGER_GUI
    95 const char* VBoxDefs::GUI_DbgEnabled = "GUI/Dbg/Enabled";
    96 const char* VBoxDefs::GUI_DbgAutoShow = "GUI/Dbg/AutoShow";
    97 #endif
     26/* Machine state => Settings dialog type converter: */
     27SettingsDialogType UISettingsDefs::machineStateToSettingsDialogType(KMachineState machineState)
     28{
     29    SettingsDialogType result = SettingsDialogType_Wrong;
     30    switch (machineState)
     31    {
     32        case KMachineState_PoweredOff:
     33        case KMachineState_Teleported:
     34        case KMachineState_Aborted:
     35            result = SettingsDialogType_Offline;
     36            break;
     37        case KMachineState_Saved:
     38            result = SettingsDialogType_Saved;
     39            break;
     40        case KMachineState_Running:
     41        case KMachineState_Paused:
     42            result = SettingsDialogType_Online;
     43            break;
     44        default:
     45            break;
     46    }
     47    return result;
     48}
    9849
    99 QStringList VBoxDefs::VBoxFileExts = QStringList() << "xml" << "vbox";
    100 QStringList VBoxDefs::VBoxExtPackFileExts = QStringList() << "vbox-extpack";
    101 QStringList VBoxDefs::OVFFileExts = QStringList() << "ovf" << "ova";
    102 

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.h

    r36567 r36589  
    22 *
    33 * VBox frontends: Qt GUI ("VirtualBox"):
    4  * Header with common definitions and global functions
     4 * Header with definitions and functions related to settings dialog
    55 */
    66
    77/*
    8  * Copyright (C) 2006-2011 Oracle Corporation
     8 * Copyright (C) 2011 Oracle Corporation
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1717 */
    1818
    19 #ifndef __VBoxDefs_h__
    20 #define __VBoxDefs_h__
     19#ifndef __UISettingsDefs_h__
     20#define __UISettingsDefs_h__
    2121
    22 /* Qt includes */
    23 #include <QEvent>
    24 #include <QUuid>
    25 #include <QMetaType>
     22/* VBox includes: */
     23#include "COMDefs.h"
    2624
    27 #define LOG_GROUP LOG_GROUP_GUI
    28 #include <VBox/log.h>
    29 #include <iprt/assert.h>
    30 #include <iprt/alloc.h>
    31 
    32 #ifdef DEBUG
    33 
    34 #define AssertWrapperOk(w)      \
    35     AssertMsg (w.isOk(), (#w " is not okay (RC=0x%08X)", w.lastRC()))
    36 #define AssertWrapperOkMsg(w, m)      \
    37     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 */
    45 
    46 #ifndef SIZEOF_ARRAY
    47 #define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0]))
    48 #endif
    49 
    50 /** Common namespace for all enums */
    51 struct VBoxDefs
     25/* Settings dialog namespace: */
     26namespace UISettingsDefs
    5227{
    53     /** Medium type. */
    54     enum MediumType
    55     {
    56         MediumType_Invalid,
    57         MediumType_HardDisk,
    58         MediumType_DVD,
    59         MediumType_Floppy,
    60         MediumType_All
    61     };
    62 
    63     /** VM display rendering mode. */
    64     enum RenderMode
    65     {
    66         InvalidRenderMode, TimerMode, QImageMode, SDLMode, DDRAWMode, Quartz2DMode
    67 #ifdef VBOX_GUI_USE_QGLFB
    68         , QGLMode
    69 #endif
    70     };
    71 
    72     /** Additional Qt event types. */
    73     enum
    74     {
    75           ResizeEventType = QEvent::User + 101
    76         , RepaintEventType
    77         , SetRegionEventType
    78         , ModifierKeyChangeEventType
    79         , MediaEnumEventType
    80 #if defined (Q_WS_WIN)
    81         , ShellExecuteEventType
    82 #endif
    83         , ActivateActionEventType
    84 #if defined (Q_WS_MAC)
    85         , ShowWindowEventType
    86 #endif
    87         , AddVDMUrlsEventType
    88 #ifdef VBOX_GUI_USE_QGL
    89         , VHWACommandProcessType
    90 #endif
    91     };
    92 
    93     /** Size formatting types. */
    94     enum FormatSize
    95     {
    96         FormatSize_Round,
    97         FormatSize_RoundDown,
    98         FormatSize_RoundUp
    99     };
    100 
    101     /** Settings dialog types: */
     28    /* Settings dialog types: */
    10229    enum SettingsDialogType
    10330    {
    … …  
    10532        SettingsDialogType_Offline,
    10633        SettingsDialogType_Saved,
    107         SettingsDialogType_Runtime
     34        SettingsDialogType_Online
    10835    };
    10936
    110     static const char* GUI_LastWindowPosition;
    111     static const char* GUI_LastNormalWindowPosition;
    112     static const char* GUI_LastScaleWindowPosition;
    113     static const char* GUI_LastWindowState_Max;
    114     static const char* GUI_SplitterSizes;
    115     static const char* GUI_Toolbar;
    116     static const char* GUI_Statusbar;
    117     static const char* GUI_LastGuestSizeHint;
    118     static const char* GUI_Fullscreen;
    119     static const char* GUI_Seamless;
    120     static const char* GUI_Scale;
    121     static const char* GUI_VirtualScreenToHostScreen;
    122     static const char* GUI_AutoresizeGuest;
    123     static const char* GUI_FirstRun;
    124     static const char* GUI_SaveMountedAtRuntime;
    125     static const char* GUI_ShowMiniToolBar;
    126     static const char* GUI_MiniToolBarAlignment;
    127     static const char* GUI_MiniToolBarAutoHide;
    128     static const char* GUI_LastCloseAction;
    129     static const char* GUI_RestrictedCloseActions;
    130     static const char* GUI_SuppressMessages;
    131     static const char* GUI_PermanentSharedFoldersAtRuntime;
    132     static const char* GUI_LanguageId;
    133     static const char* GUI_PreviewUpdate;
    134     static const char* GUI_DetailsPageBoxes;
    135     static const char* GUI_SelectorVMPositions;
    136     static const char* GUI_Input_MachineShortcuts;
    137     static const char* GUI_Input_SelectorShortcuts;
    138 #ifdef Q_WS_X11
    139     static const char* GUI_LicenseKey;
    140 #endif
    141     static const char* GUI_RegistrationDlgWinID;
    142     static const char* GUI_RegistrationData;
    143     static const char* GUI_UpdateDlgWinID;
    144     static const char* GUI_UpdateDate;
    145     static const char* GUI_UpdateCheckCount;
    146     static const char* GUI_LastVMSelected;
    147     static const char* GUI_InfoDlgState;
    148     static const char* GUI_RenderMode;
    149 #ifdef VBOX_GUI_WITH_SYSTRAY
    150     static const char* GUI_TrayIconWinID;
    151     static const char* GUI_TrayIconEnabled;
    152     static const char* GUI_MainWindowCount;
    153 #endif
    154 #ifdef Q_WS_MAC
    155     static const char* GUI_RealtimeDockIconUpdateEnabled;
    156     static const char* GUI_RealtimeDockIconUpdateMonitor;
    157     static const char* GUI_PresentationModeEnabled;
    158 #endif /* Q_WS_MAC */
    159     static const char* GUI_PassCAD;
    160     static const char* GUI_Export_StorageType;
    161     static const char* GUI_Export_Username;
    162     static const char* GUI_Export_Hostname;
    163     static const char* GUI_Export_Bucket;
    164     static const char* GUI_PreventBetaWarning;
     37    /* Machine state => Settings dialog type converter: */
     38    SettingsDialogType machineStateToSettingsDialogType(KMachineState machineState);
     39}
    16540
    166     static const char* GUI_RecentFolderHD;
    167     static const char* GUI_RecentFolderCD;
    168     static const char* GUI_RecentFolderFD;
    169     static const char* GUI_RecentListHD;
    170     static const char* GUI_RecentListCD;
    171     static const char* GUI_RecentListFD;
     41#endif /* __UISettingsDefs_h__ */
    17242
    173 #ifdef VBOX_WITH_VIDEOHWACCEL
    174     static const char* GUI_Accelerate2D_StretchLinear;
    175     static const char* GUI_Accelerate2D_PixformatYV12;
    176     static const char* GUI_Accelerate2D_PixformatUYVY;
    177     static const char* GUI_Accelerate2D_PixformatYUY2;
    178     static const char* GUI_Accelerate2D_PixformatAYUV;
    179 #endif
    180 
    181 #ifdef VBOX_WITH_DEBUGGER_GUI
    182     static const char* GUI_DbgEnabled;
    183     static const char* GUI_DbgAutoShow;
    184 #endif
    185 
    186     static QStringList VBoxFileExts;
    187     static QStringList VBoxExtPackFileExts;
    188     static QStringList OVFFileExts;
    189 };
    190 
    191 Q_DECLARE_METATYPE(VBoxDefs::MediumType);
    192 
    193 #define MAC_LEOPARD_STYLE defined(Q_WS_MAC) && (QT_VERSION >= 0x040300)
    194 
    195 #endif /* __VBoxDefs_h__ */
    196 

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

    r36357 r36589  
    4242
    4343/* Settings Dialog Constructor: */
    44 UISettingsDialog::UISettingsDialog(QWidget *pParent, VBoxDefs::SettingsDialogType dialogType)
     44UISettingsDialog::UISettingsDialog(QWidget *pParent, SettingsDialogType settingsDialogType)
    4545    /* Parent class: */
    4646    : QIWithRetranslateUI<QIMainDialog>(pParent)
    … …  
    4949    , m_pStack(0)
    5050    /* Common variables: */
    51     , m_dialogType(dialogType)
     51    , m_dialogType(settingsDialogType)
    5252    , m_fPolished(false)
    5353    /* Loading stuff: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

    r36357 r36589  
    2020#define __UISettingsDialog_h__
    2121
    22 /* Local includes */
     22/* VBox includes: */
    2323#include "QIMainDialog.h"
    2424#include "QIWithRetranslateUI.h"
    2525#include "UISettingsDialog.gen.h"
    26 #include "VBoxDefs.h"
     26#include "UISettingsDefs.h"
    2727
    28 /* Forward declarations */
     28/* Forward declarations: */
    2929class QIWidgetValidator;
    3030class QStackedWidget;
    … …  
    3333class VBoxSettingsSelector;
    3434class UISettingsPage;
     35
     36/* Using declarations: */
     37using namespace UISettingsDefs;
    3538
    3639/* Base dialog class for both Global & VM settings which encapsulates most of their similar functionalities */
    … …  
    4245
    4346    /* Settings Dialog Constructor/Destructor: */
    44     UISettingsDialog(QWidget *pParent, VBoxDefs::SettingsDialogType dialogType);
     47    UISettingsDialog(QWidget *pParent, SettingsDialogType settingsDialogType);
    4548   ~UISettingsDialog();
    4649
    … …  
    6669
    6770    /* Dialog type: */
    68     VBoxDefs::SettingsDialogType dialogType() { return m_dialogType; }
     71    SettingsDialogType dialogType() { return m_dialogType; }
    6972    /* Dialog title: */
    7073    virtual QString title() const = 0;
    … …  
    110113
    111114    /* Global Flags: */
    112     VBoxDefs::SettingsDialogType m_dialogType;
     115    SettingsDialogType m_dialogType;
    113116    bool m_fPolished;
    114117

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

    r36357 r36589  
    2727/* Local includes */
    2828#include "UISettingsDialogSpecific.h"
     29#include "UISettingsDefs.h"
    2930#include "VBoxGlobal.h"
    3031#include "VBoxProblemReporter.h"
    … …  
    288289UISettingsSerializer* UISettingsSerializer::m_pInstance = 0;
    289290
    290 UISettingsDialogGlobal::UISettingsDialogGlobal(QWidget *pParent, VBoxDefs::SettingsDialogType type)
    291     : UISettingsDialog(pParent, type)
     291UISettingsDialogGlobal::UISettingsDialogGlobal(QWidget *pParent, SettingsDialogType settingsDialogType)
     292    : UISettingsDialog(pParent, settingsDialogType)
    292293{
    293294    /* Window icon: */
    … …  
    507508}
    508509
    509 UISettingsDialogMachine::UISettingsDialogMachine(QWidget *pParent, VBoxDefs::SettingsDialogType type,
     510UISettingsDialogMachine::UISettingsDialogMachine(QWidget *pParent, SettingsDialogType settingsDialogType,
    510511                                                 const CMachine &machine, const CConsole &console,
    511512                                                 const QString &strCategory, const QString &strControl)
    512     : UISettingsDialog(pParent, type)
     513    : UISettingsDialog(pParent, settingsDialogType)
    513514    , m_machine(machine)
    514515    , m_console(console)

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

    r36357 r36589  
    4343    };
    4444
    45     UISettingsDialogGlobal(QWidget *pParent, VBoxDefs::SettingsDialogType type);
     45    UISettingsDialogGlobal(QWidget *pParent, SettingsDialogType settingsDialogType);
    4646
    4747protected:
    … …  
    8282    };
    8383
    84     UISettingsDialogMachine(QWidget *pParent, VBoxDefs::SettingsDialogType type,
     84    UISettingsDialogMachine(QWidget *pParent, SettingsDialogType settingsDialogType,
    8585                            const CMachine &machine, const CConsole &console,
    8686                            const QString &strCategory, const QString &strControl);
    … …  
    110110    CMachine m_machine;
    111111    CConsole m_console;
     112
    112113    bool m_fAllowResetFirstRunFlag;
    113114    bool m_fResetFirstRunFlag;

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

    r36357 r36589  
    2424UISettingsPage::UISettingsPage(UISettingsPageType pageType)
    2525    : m_pageType(pageType)
    26     , m_dialogType(VBoxDefs::SettingsDialogType_Wrong)
     26    , m_dialogType(SettingsDialogType_Wrong)
    2727    , m_cId(-1)
    2828    , m_fPolished(false)

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h

    r36519 r36589  
    2727#include "QIWithRetranslateUI.h"
    2828#include "COMDefs.h"
    29 #include "VBoxDefs.h"
     29#include "UISettingsDefs.h"
    3030#include "VBoxGlobalSettings.h"
    3131
    … …  
    3333class QIWidgetValidator;
    3434class QShowEvent;
     35
     36/* Using declarations: */
     37using namespace UISettingsDefs;
    3538
    3639/* Settings page types: */
    … …  
    9699
    97100    /* Settings dialog type stuff: */
    98     VBoxDefs::SettingsDialogType dialogType() const { return m_dialogType; }
    99     virtual void setDialogType(VBoxDefs::SettingsDialogType dialogType) { m_dialogType = dialogType; }
    100     bool isMachineOffline() const { return dialogType() == VBoxDefs::SettingsDialogType_Offline; }
    101     bool isMachineSaved() const { return dialogType() == VBoxDefs::SettingsDialogType_Saved; }
    102     bool isMachineOnline() const { return dialogType() == VBoxDefs::SettingsDialogType_Runtime; }
     101    SettingsDialogType dialogType() const { return m_dialogType; }
     102    virtual void setDialogType(SettingsDialogType settingsDialogType) { m_dialogType = settingsDialogType; }
     103    bool isMachineOffline() const { return dialogType() == SettingsDialogType_Offline; }
     104    bool isMachineSaved() const { return dialogType() == SettingsDialogType_Saved; }
     105    bool isMachineOnline() const { return dialogType() == SettingsDialogType_Online; }
    103106    bool isMachineInValidMode() const { return isMachineOffline() || isMachineSaved() || isMachineOnline(); }
    104107
    … …  
    130133    /* Private variables: */
    131134    UISettingsPageType m_pageType;
    132     VBoxDefs::SettingsDialogType m_dialogType;
     135    SettingsDialogType m_dialogType;
    133136    int m_cId;
    134137    bool m_fPolished;

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

    r36519 r36589  
    701701}
    702702
    703 void UIMachineSettingsSF::setDialogType(VBoxDefs::SettingsDialogType settingsDialogType)
     703void UIMachineSettingsSF::setDialogType(SettingsDialogType settingsDialogType)
    704704{
    705705    UISettingsPageMachine::setDialogType(settingsDialogType);

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

    r36357 r36589  
    104104    SFoldersNameList usedList (bool aIncludeSelected);
    105105
    106     void setDialogType(VBoxDefs::SettingsDialogType settingsDialogType);
     106    void setDialogType(SettingsDialogType settingsDialogType);
    107107
    108108    UISharedFolderType m_type;

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

    r36519 r36589  
    766766    , mToolTipType (DefaultToolTip)
    767767    , m_chipsetType(KChipsetType_PIIX3)
    768     , m_dialogType(VBoxDefs::SettingsDialogType_Wrong)
     768    , m_dialogType(SettingsDialogType_Wrong)
    769769{
    770770}
    … …  
    936936        case R_IsMoreIDEControllersPossible:
    937937        {
    938             return (m_dialogType == VBoxDefs::SettingsDialogType_Offline) &&
     938            return (m_dialogType == SettingsDialogType_Offline) &&
    939939                   (static_cast<RootItem*>(mRootItem)->childCount(KStorageBus_IDE) <
    940940                    vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus(chipsetType(), KStorageBus_IDE));
    … …  
    942942        case R_IsMoreSATAControllersPossible:
    943943        {
    944             return (m_dialogType == VBoxDefs::SettingsDialogType_Offline) &&
     944            return (m_dialogType == SettingsDialogType_Offline) &&
    945945                   (static_cast<RootItem*>(mRootItem)->childCount(KStorageBus_SATA) <
    946946                    vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus(chipsetType(), KStorageBus_SATA));
    … …  
    948948        case R_IsMoreSCSIControllersPossible:
    949949        {
    950             return (m_dialogType == VBoxDefs::SettingsDialogType_Offline) &&
     950            return (m_dialogType == SettingsDialogType_Offline) &&
    951951                   (static_cast<RootItem*>(mRootItem)->childCount(KStorageBus_SCSI) <
    952952                    vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus(chipsetType(), KStorageBus_SCSI));
    … …  
    954954        case R_IsMoreFloppyControllersPossible:
    955955        {
    956             return (m_dialogType == VBoxDefs::SettingsDialogType_Offline) &&
     956            return (m_dialogType == SettingsDialogType_Offline) &&
    957957                   (static_cast<RootItem*>(mRootItem)->childCount(KStorageBus_Floppy) <
    958958                    vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus(chipsetType(), KStorageBus_Floppy));
    … …  
    960960        case R_IsMoreSASControllersPossible:
    961961        {
    962             return (m_dialogType == VBoxDefs::SettingsDialogType_Offline) &&
     962            return (m_dialogType == SettingsDialogType_Offline) &&
    963963                   (static_cast<RootItem*>(mRootItem)->childCount(KStorageBus_SAS) <
    964964                    vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus(chipsetType(), KStorageBus_SAS));
    … …  
    972972                    ControllerItem *ctr = static_cast <ControllerItem*> (item);
    973973                    CSystemProperties sp = vboxGlobal().virtualBox().GetSystemProperties();
    974                     return (m_dialogType == VBoxDefs::SettingsDialogType_Offline) &&
     974                    return (m_dialogType == SettingsDialogType_Offline) &&
    975975                           ((uint)rowCount(aIndex) < sp.GetMaxPortCountForStorageBus(ctr->ctrBusType()) *
    976976                                                     sp.GetMaxDevicesPerPortForStorageBus(ctr->ctrBusType()));
    … …  
    14201420}
    14211421
    1422 void StorageModel::setDialogType(VBoxDefs::SettingsDialogType dialogType)
     1422void StorageModel::setDialogType(SettingsDialogType dialogType)
    14231423{
    14241424    m_dialogType = dialogType;
    … …  
    19011901    {
    19021902        /* Here come the properties which could be changed only in offline state: */
    1903         case VBoxDefs::SettingsDialogType_Offline:
     1903        case SettingsDialogType_Offline:
    19041904        {
    19051905            /* Remove currently present controllers & attachments */
    … …  
    19761976        }
    19771977        /* Here come the properties which could be changed at runtime too: */
    1978         case VBoxDefs::SettingsDialogType_Runtime:
     1978        case SettingsDialogType_Online:
    19791979        {
    19801980            /* Iterate all the controllers and update changed CD/DVD and floppy attachments: */
    … …  
    30663066}
    30673067
    3068 void UIMachineSettingsStorage::setDialogType(VBoxDefs::SettingsDialogType settingsDialogType)
     3068void UIMachineSettingsStorage::setDialogType(SettingsDialogType settingsDialogType)
    30693069{
    30703070    UISettingsPageMachine::setDialogType(settingsDialogType);

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

    r36357 r36589  
    503503    void setChipsetType(KChipsetType type);
    504504
    505     void setDialogType(VBoxDefs::SettingsDialogType dialogType);
     505    void setDialogType(SettingsDialogType dialogType);
    506506
    507507    QMap<KStorageBus, int> currentControllerTypes() const;
    … …  
    523523
    524524    KChipsetType m_chipsetType;
    525     VBoxDefs::SettingsDialogType m_dialogType;
     525    SettingsDialogType m_dialogType;
    526526};
    527527Q_DECLARE_METATYPE (StorageModel::ToolTipType);
    … …  
    673673    void addRecentMediumActions(QMenu *pOpenMediumMenu, VBoxDefs::MediumType recentMediumType);
    674674
    675     void setDialogType(VBoxDefs::SettingsDialogType settingsDialogType);
     675    void setDialogType(SettingsDialogType settingsDialogType);
    676676    void polishPage();
    677677
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