Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 41689) @@ -470,4 +470,5 @@ src/extensions/QITreeWidget.cpp \ src/extensions/QIWidgetValidator.cpp \ + src/globals/UIDefs.cpp \ src/globals/COMDefs.cpp \ src/globals/UIActionPool.cpp \ @@ -477,5 +478,4 @@ src/globals/UIMainEventListener.cpp \ src/globals/UIMessageCenter.cpp \ - src/globals/VBoxDefs.cpp \ src/globals/VBoxGlobal.cpp \ src/globals/COMEnumsWrapper.cpp \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp (revision 41689) @@ -210,5 +210,5 @@ public: VBoxVHWACommandProcessEvent () - : QEvent ((QEvent::Type) VBoxDefs::VHWACommandProcessType) + : QEvent ((QEvent::Type) VHWACommandProcessType) { #ifdef DEBUG_misha @@ -5774,19 +5774,19 @@ CMachine machine = session.GetMachine(); - QString str = machine.GetExtraData (VBoxDefs::GUI_Accelerate2D_StretchLinear); + QString str = machine.GetExtraData (GUI_Accelerate2D_StretchLinear); mStretchLinearEnabled = str != "off"; uint32_t aFourccs[VBOXVHWA_NUMFOURCC]; int num = 0; - str = machine.GetExtraData (VBoxDefs::GUI_Accelerate2D_PixformatAYUV); + str = machine.GetExtraData (GUI_Accelerate2D_PixformatAYUV); if (str != "off") aFourccs[num++] = FOURCC_AYUV; - str = machine.GetExtraData (VBoxDefs::GUI_Accelerate2D_PixformatUYVY); + str = machine.GetExtraData (GUI_Accelerate2D_PixformatUYVY); if (str != "off") aFourccs[num++] = FOURCC_UYVY; - str = machine.GetExtraData (VBoxDefs::GUI_Accelerate2D_PixformatYUY2); + str = machine.GetExtraData (GUI_Accelerate2D_PixformatYUY2); if (str != "off") aFourccs[num++] = FOURCC_YUY2; - str = machine.GetExtraData (VBoxDefs::GUI_Accelerate2D_PixformatYV12); + str = machine.GetExtraData (GUI_Accelerate2D_PixformatYV12); if (str != "off") aFourccs[num++] = FOURCC_YV12; Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h (revision 41689) @@ -30,4 +30,5 @@ /* GUI includes: */ +#include "UIDefs.h" #include "VBoxFBOverlayCommon.h" Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp (revision 41689) @@ -28,4 +28,5 @@ /* GUI includes: */ +#include "UIDefs.h" #include "VBoxGlobalSettings.h" #include "UIHotKeyEditor.h" @@ -127,5 +128,5 @@ { "GUI/TrayIcon/Enabled", "trayIconEnabled", "true|false", true }, #ifdef Q_WS_MAC - { VBoxDefs::GUI_PresentationModeEnabled, "presentationModeEnabled", "true|false", true }, + { GUI_PresentationModeEnabled, "presentationModeEnabled", "true|false", true }, #endif /* Q_WS_MAC */ { "GUI/HostScreenSaverDisabled", "hostScreenSaverDisabled", "true|false", true } Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp (revision 41689) @@ -129,5 +129,5 @@ /* Preload dialog attributes for this vm */ - QString dlgsize = mSession.GetMachine().GetExtraData (VBoxDefs::GUI_InfoDlgState); + QString dlgsize = mSession.GetMachine().GetExtraData(GUI_InfoDlgState); if (dlgsize.isEmpty()) { @@ -151,6 +151,6 @@ /* Save dialog attributes for this vm */ QString dlgsize ("%1,%2,%3"); - mSession.GetMachine().SetExtraData (VBoxDefs::GUI_InfoDlgState, - dlgsize.arg (mWidth).arg (mHeight).arg (isMaximized() ? "max" : "normal")); + mSession.GetMachine().SetExtraData(GUI_InfoDlgState, + dlgsize.arg(mWidth).arg(mHeight).arg(isMaximized() ? "max" : "normal")); if (!mSession.isNull() && !mSession.GetMachine().isNull()) Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp (revision 41689) @@ -18,9 +18,6 @@ */ -#include "QIListView.h" -#include "VBoxDefs.h" - #if MAC_LEOPARD_STYLE -/* Qt includes */ +/* Qt includes: */ # include # include @@ -28,6 +25,6 @@ #endif /* MAC_LEOPARD_STYLE */ - -/* QIListView class */ +/* GUI includes: */ +#include "QIListView.h" QIListView::QIListView (QWidget *aParent /* = 0 */) Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp (revision 41689) @@ -18,14 +18,5 @@ */ -/* VBox includes */ -#include "VBoxDefs.h" -#include "VBoxGlobal.h" -#include "QIArrowSplitter.h" -#include "QIMessageBox.h" -#include "QILabel.h" -#include "QIDialogButtonBox.h" -#include "UIIconPool.h" - -/* Qt includes */ +/* Qt includes: */ #include #include @@ -37,4 +28,11 @@ #include +/* GUI includes: */ +#include "VBoxGlobal.h" +#include "QIArrowSplitter.h" +#include "QIMessageBox.h" +#include "QILabel.h" +#include "QIDialogButtonBox.h" +#include "UIIconPool.h" #ifdef Q_WS_MAC # include "UIMachineWindowFullscreen.h" Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp (revision 41689) @@ -18,16 +18,16 @@ */ -/* COM includes: */ -#include "COMDefs.h" -#include "CVirtualBoxErrorInfo.h" - -#if !defined (VBOX_WITH_XPCOM) - - -#else /* !defined (VBOX_WITH_XPCOM) */ - /* Qt includes: */ #include #include + +/* COM includes: */ +#include "COMDefs.h" +#include "UIDefs.h" +#include "CVirtualBoxErrorInfo.h" + +#if !defined (VBOX_WITH_XPCOM) + +#else /* !defined (VBOX_WITH_XPCOM) */ /* Other VBox includes: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h (revision 41689) @@ -108,7 +108,4 @@ #endif /* !defined (VBOX_WITH_XPCOM) */ -#include "VBoxDefs.h" - - ///////////////////////////////////////////////////////////////////////////// Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/COMEnumsWrapper.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/COMEnumsWrapper.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/COMEnumsWrapper.cpp (revision 41689) @@ -25,4 +25,5 @@ /* GUI includes: */ #include "COMEnumsWrapper.h" +#include "UIDefs.h" /* static */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 41689) @@ -35,5 +35,5 @@ ActivateActionEvent(QAction *pAction) - : QEvent((QEvent::Type)VBoxDefs::ActivateActionEventType) + : QEvent((QEvent::Type)ActivateActionEventType) , m_pAction(pAction) {} QAction* action() const { return m_pAction; } @@ -383,5 +383,5 @@ { setEnabled(vboxGlobal().virtualBox(). - GetExtraData(VBoxDefs::GUI_RegistrationDlgWinID).isEmpty()); + GetExtraData(GUI_RegistrationDlgWinID).isEmpty()); switch (gActionPool->type()) { @@ -616,5 +616,5 @@ switch (pEvent->type()) { - case VBoxDefs::ActivateActionEventType: + case ActivateActionEventType: { /* Process specific event: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp (revision 41689) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp (revision 41689) @@ -0,0 +1,123 @@ +/* $Id$ */ +/// @file +/// +/// VBox frontends: Qt GUI ("VirtualBox"): +/// Global definitions and function implementations + +// Copyright (C) 2006-2012 Oracle Corporation +// +// This file is part of VirtualBox Open Source Edition (OSE), as +// available from http://www.virtualbox.org. This file is free software; +// you can redistribute it and/or modify it under the terms of the GNU +// General Public License (GPL) as published by the Free Software +// Foundation, in version 2 as it comes in the "COPYING" file of the +// VirtualBox OSE distribution. VirtualBox OSE is distributed in the +// hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + +// GUI includes: +#include "UIDefs.h" + +// Global definitions: +const char* UIDefs::GUI_RenderMode = "GUI/RenderMode"; +const char* UIDefs::GUI_LanguageId = "GUI/LanguageID"; +const char* UIDefs::GUI_ExtPackName = "Oracle VM VirtualBox Extension Pack"; +const char* UIDefs::GUI_PreventBetaWarning = "GUI/PreventBetaWarning"; +const char* UIDefs::GUI_RecentFolderHD = "GUI/RecentFolderHD"; +const char* UIDefs::GUI_RecentFolderCD = "GUI/RecentFolderCD"; +const char* UIDefs::GUI_RecentFolderFD = "GUI/RecentFolderFD"; +const char* UIDefs::GUI_RecentListHD = "GUI/RecentListHD"; +const char* UIDefs::GUI_RecentListCD = "GUI/RecentListCD"; +const char* UIDefs::GUI_RecentListFD = "GUI/RecentListFD"; + +// Selector-window definitions: +const char* UIDefs::GUI_Input_SelectorShortcuts = "GUI/Input/SelectorShortcuts"; +const char* UIDefs::GUI_LastSelectorWindowPosition = "GUI/LastWindowPosition"; +const char* UIDefs::GUI_SplitterSizes = "GUI/SplitterSizes"; +const char* UIDefs::GUI_Toolbar = "GUI/Toolbar"; +const char* UIDefs::GUI_Statusbar = "GUI/Statusbar"; +const char* UIDefs::GUI_PreviewUpdate = "GUI/PreviewUpdate"; +const char* UIDefs::GUI_DetailsPageBoxes = "GUI/DetailsPageBoxes"; +const char* UIDefs::GUI_SelectorVMPositions = "GUI/SelectorVMPositions"; +const char* UIDefs::GUI_LastVMSelected = "GUI/LastVMSelected"; + +// Machine-window definitions: +const char* UIDefs::GUI_Input_MachineShortcuts = "GUI/Input/MachineShortcuts"; +const char* UIDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition"; +const char* UIDefs::GUI_LastScaleWindowPosition = "GUI/LastScaleWindowPosition"; +const char* UIDefs::GUI_LastWindowState_Max = "max"; +const char* UIDefs::GUI_LastGuestSizeHint = "GUI/LastGuestSizeHint"; +const char* UIDefs::GUI_LastGuestSizeHintWasFullscreen = "GUI/LastGuestSizeHintWasFullscreen"; +const char* UIDefs::GUI_Fullscreen = "GUI/Fullscreen"; +const char* UIDefs::GUI_Seamless = "GUI/Seamless"; +const char* UIDefs::GUI_Scale = "GUI/Scale"; +const char* UIDefs::GUI_VirtualScreenToHostScreen = "GUI/VirtualScreenToHostScreen"; +const char* UIDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest"; +const char* UIDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime"; +const char* UIDefs::GUI_PassCAD = "GUI/PassCAD"; + +// Mini tool-bar definitions: +const char* UIDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar"; +const char* UIDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment"; +const char* UIDefs::GUI_MiniToolBarAutoHide = "GUI/MiniToolBarAutoHide"; + +// Close-dialog declarations: +const char* UIDefs::GUI_RestrictedCloseActions = "GUI/RestrictedCloseActions"; +const char* UIDefs::GUI_LastCloseAction = "GUI/LastCloseAction"; +const char* UIDefs::GUI_CloseActionHook = "GUI/CloseActionHook"; + +// Wizards declarations: +const char* UIDefs::GUI_FirstRun = "GUI/FirstRun"; +const char* UIDefs::GUI_HideDescriptionForWizards = "GUI/HideDescriptionForWizards"; +const char* UIDefs::GUI_Export_StorageType = "GUI/Export/StorageType"; +const char* UIDefs::GUI_Export_Username = "GUI/Export/Username"; +const char* UIDefs::GUI_Export_Hostname = "GUI/Export/Hostname"; +const char* UIDefs::GUI_Export_Bucket = "GUI/Export/Bucket"; + +// Message-center declarations: +const char* UIDefs::GUI_SuppressMessages = "GUI/SuppressMessages"; +const char* UIDefs::GUI_InvertMessageOption = "GUI/InvertMessageOption"; + +// Registration dialog declarations: +const char* UIDefs::GUI_RegistrationDlgWinID = "GUI/RegistrationDlgWinID"; +const char* UIDefs::GUI_RegistrationData = "GUI/SUNOnlineData"; + +// Update manager declarations: +const char* UIDefs::GUI_UpdateDate = "GUI/UpdateDate"; +const char* UIDefs::GUI_UpdateCheckCount = "GUI/UpdateCheckCount"; + +// Information dialog declarations: +const char* UIDefs::GUI_InfoDlgState = "GUI/InfoDlgState"; + +#ifdef VBOX_WITH_DEBUGGER_GUI +const char* UIDefs::GUI_DbgEnabled = "GUI/Dbg/Enabled"; +const char* UIDefs::GUI_DbgAutoShow = "GUI/Dbg/AutoShow"; +#endif // VBOX_WITH_DEBUGGER_GUI + +#ifdef Q_WS_X11 +const char* UIDefs::GUI_LicenseKey = "GUI/LicenseAgreed"; +#endif // Q_WS_X11 + +#ifdef VBOX_GUI_WITH_SYSTRAY +const char* UIDefs::GUI_TrayIconWinID = "GUI/TrayIcon/WinID"; +const char* UIDefs::GUI_TrayIconEnabled = "GUI/TrayIcon/Enabled"; +const char* UIDefs::GUI_MainWindowCount = "GUI/MainWindowCount"; +#endif // VBOX_GUI_WITH_SYSTRAY + +#ifdef Q_WS_MAC +const char* UIDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled"; +const char* UIDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor"; +const char* UIDefs::GUI_PresentationModeEnabled = "GUI/PresentationModeEnabled"; +#endif // Q_WS_MAC + +#ifdef VBOX_WITH_VIDEOHWACCEL +const char* UIDefs::GUI_Accelerate2D_StretchLinear = "GUI/Accelerate2D/StretchLinear"; +const char* UIDefs::GUI_Accelerate2D_PixformatYV12 = "GUI/Accelerate2D/PixformatYV12"; +const char* UIDefs::GUI_Accelerate2D_PixformatUYVY = "GUI/Accelerate2D/PixformatUYVY"; +const char* UIDefs::GUI_Accelerate2D_PixformatYUY2 = "GUI/Accelerate2D/PixformatYUY2"; +const char* UIDefs::GUI_Accelerate2D_PixformatAYUV = "GUI/Accelerate2D/PixformatAYUV"; +#endif // VBOX_WITH_VIDEOHWACCEL + +QStringList UIDefs::VBoxFileExts = QStringList() << "xml" << "vbox"; +QStringList UIDefs::VBoxExtPackFileExts = QStringList() << "vbox-extpack"; +QStringList UIDefs::OVFFileExts = QStringList() << "ovf" << "ova"; + Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h (revision 41689) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h (revision 41689) @@ -0,0 +1,202 @@ +/// @file +/// +/// VBox frontends: Qt GUI ("VirtualBox"): +/// Global declarations and functions + +// Copyright (C) 2006-2012 Oracle Corporation +// +// This file is part of VirtualBox Open Source Edition (OSE), as +// available from http://www.virtualbox.org. This file is free software; +// you can redistribute it and/or modify it under the terms of the GNU +// General Public License (GPL) as published by the Free Software +// Foundation, in version 2 as it comes in the "COPYING" file of the +// VirtualBox OSE distribution. VirtualBox OSE is distributed in the +// hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + +#ifndef __UIDefs_h__ +#define __UIDefs_h__ + +// QT includes: +#include +#include + +// Other VBox defines: +#define LOG_GROUP LOG_GROUP_GUI + +// Other VBox includes: +#include +#include +#include + +// Defines: +#define MAC_LEOPARD_STYLE defined(Q_WS_MAC) && (QT_VERSION >= 0x040300) + +#ifdef DEBUG +# define AssertWrapperOk(w) \ + AssertMsg (w.isOk(), (#w " is not okay (RC=0x%08X)", w.lastRC())) +# define AssertWrapperOkMsg(w, m) \ + AssertMsg (w.isOk(), (#w ": " m " (RC=0x%08X)", w.lastRC())) +#else // !DEBUG +# define AssertWrapperOk(w) do {} while (0) +# define AssertWrapperOkMsg(w, m) do {} while (0) +#endif // DEBUG + +#ifndef SIZEOF_ARRAY +# define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0])) +#endif // SIZEOF_ARRAY + +// Global UI namespace: +namespace UIDefs +{ + // VM display rendering mode: + enum RenderMode + { + InvalidRenderMode + , TimerMode + , QImageMode + , SDLMode + , DDRAWMode + , Quartz2DMode +#ifdef VBOX_GUI_USE_QGLFB + , QGLMode +#endif // VBOX_GUI_USE_QGLFB + }; + + // Additional Qt event types: + enum UIEventType + { + ResizeEventType = QEvent::User + 101 + , RepaintEventType + , SetRegionEventType + , ModifierKeyChangeEventType + , MediaEnumEventType +#ifdef Q_WS_WIN + , ShellExecuteEventType +#endif // Q_WS_WIN + , ActivateActionEventType +#ifdef Q_WS_MAC + , ShowWindowEventType +#endif // Q_WS_MAC + , AddVDMUrlsEventType +#ifdef VBOX_GUI_USE_QGL + , VHWACommandProcessType +#endif // VBOX_GUI_USE_QGL + }; + + // Size formatting types: + enum FormatSize + { + FormatSize_Round, + FormatSize_RoundDown, + FormatSize_RoundUp + }; + + // Global declarations: + extern const char* GUI_RenderMode; + extern const char* GUI_LanguageId; + extern const char* GUI_ExtPackName; + extern const char* GUI_PreventBetaWarning; + extern const char* GUI_RecentFolderHD; + extern const char* GUI_RecentFolderCD; + extern const char* GUI_RecentFolderFD; + extern const char* GUI_RecentListHD; + extern const char* GUI_RecentListCD; + extern const char* GUI_RecentListFD; + + // Selector-window declarations: + extern const char* GUI_Input_SelectorShortcuts; + extern const char* GUI_LastSelectorWindowPosition; + extern const char* GUI_SplitterSizes; + extern const char* GUI_Toolbar; + extern const char* GUI_Statusbar; + extern const char* GUI_PreviewUpdate; + extern const char* GUI_DetailsPageBoxes; + extern const char* GUI_SelectorVMPositions; + extern const char* GUI_LastVMSelected; + + // Machine-window declarations: + extern const char* GUI_Input_MachineShortcuts; + extern const char* GUI_LastNormalWindowPosition; + extern const char* GUI_LastScaleWindowPosition; + extern const char* GUI_LastWindowState_Max; + extern const char* GUI_LastGuestSizeHint; + extern const char* GUI_LastGuestSizeHintWasFullscreen; + extern const char* GUI_Fullscreen; + extern const char* GUI_Seamless; + extern const char* GUI_Scale; + extern const char* GUI_VirtualScreenToHostScreen; + extern const char* GUI_AutoresizeGuest; + extern const char* GUI_SaveMountedAtRuntime; + extern const char* GUI_PassCAD; + + // Mini tool-bar declarations: + extern const char* GUI_ShowMiniToolBar; + extern const char* GUI_MiniToolBarAlignment; + extern const char* GUI_MiniToolBarAutoHide; + + // Close-dialog declarations: + extern const char* GUI_RestrictedCloseActions; + extern const char* GUI_LastCloseAction; + extern const char* GUI_CloseActionHook; + + // Wizards declarations: + extern const char* GUI_FirstRun; + extern const char* GUI_HideDescriptionForWizards; + extern const char* GUI_Export_StorageType; + extern const char* GUI_Export_Username; + extern const char* GUI_Export_Hostname; + extern const char* GUI_Export_Bucket; + + // Message-center declarations: + extern const char* GUI_SuppressMessages; + extern const char* GUI_InvertMessageOption; + + // Registration dialog declarations: + extern const char* GUI_RegistrationDlgWinID; + extern const char* GUI_RegistrationData; + + // Update manager declarations: + extern const char* GUI_UpdateDate; + extern const char* GUI_UpdateCheckCount; + + // Information dialog declarations: + extern const char* GUI_InfoDlgState; + +#ifdef VBOX_WITH_DEBUGGER_GUI + extern const char* GUI_DbgEnabled; + extern const char* GUI_DbgAutoShow; +#endif // VBOX_WITH_DEBUGGER_GUI + +#ifdef Q_WS_X11 + extern const char* GUI_LicenseKey; +#endif // Q_WS_X11 + +#ifdef Q_WS_MAC + extern const char* GUI_RealtimeDockIconUpdateEnabled; + extern const char* GUI_RealtimeDockIconUpdateMonitor; + extern const char* GUI_PresentationModeEnabled; +#endif // Q_WS_MAC + +#ifdef VBOX_WITH_VIDEOHWACCEL + extern const char* GUI_Accelerate2D_StretchLinear; + extern const char* GUI_Accelerate2D_PixformatYV12; + extern const char* GUI_Accelerate2D_PixformatUYVY; + extern const char* GUI_Accelerate2D_PixformatYUY2; + extern const char* GUI_Accelerate2D_PixformatAYUV; +#endif // VBOX_WITH_VIDEOHWACCEL + +#ifdef VBOX_GUI_WITH_SYSTRAY + extern const char* GUI_TrayIconWinID; + extern const char* GUI_TrayIconEnabled; + extern const char* GUI_MainWindowCount; +#endif // VBOX_GUI_WITH_SYSTRAY + + extern QStringList VBoxFileExts; + extern QStringList VBoxExtPackFileExts; + extern QStringList OVFFileExts; +} + +using namespace UIDefs; // globally + +#endif // __UIDefs_h__ + Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp (revision 41689) @@ -54,5 +54,5 @@ if (strKey.startsWith("GUI/")) { - if (strKey == VBoxDefs::GUI_RegistrationDlgWinID) + if (strKey == GUI_RegistrationDlgWinID) { if (m_fIsRegDlgOwner) @@ -67,5 +67,5 @@ #ifdef VBOX_GUI_WITH_SYSTRAY - if (strKey == VBoxDefs::GUI_TrayIconWinID) + if (strKey == GUI_TrayIconWinID) { if (m_fIsTrayIconOwner) @@ -102,5 +102,5 @@ if (strKey.startsWith ("GUI/")) { - if (strKey == VBoxDefs::GUI_RegistrationDlgWinID) + if (strKey == GUI_RegistrationDlgWinID) { if (strValue.isEmpty()) @@ -118,10 +118,10 @@ emit sigCanShowRegistrationDlg(false); } - if (strKey == VBoxDefs::GUI_LanguageId) + if (strKey == GUI_LanguageId) emit sigGUILanguageChange(strValue); #ifdef VBOX_GUI_WITH_SYSTRAY - if (strKey == VBoxDefs::GUI_MainWindowCount) + if (strKey == GUI_MainWindowCount) emit sigMainWindowCountChange(strValue.toInt()); - if (strKey == VBoxDefs::GUI_TrayIconWinID) + if (strKey == GUI_TrayIconWinID) { if (strValue.isEmpty()) @@ -139,9 +139,9 @@ emit sigCanShowTrayIcon(false); } - if (strKey == VBoxDefs::GUI_TrayIconEnabled) + if (strKey == GUI_TrayIconEnabled) emit sigTrayIconChange((strValue.toLower() == "true") ? true : false); #endif /* VBOX_GUI_WITH_SYSTRAY */ #ifdef Q_WS_MAC - if (strKey == VBoxDefs::GUI_PresentationModeEnabled) + if (strKey == GUI_PresentationModeEnabled) { /* Default to true if it is an empty value */ @@ -164,6 +164,6 @@ if (strId == vboxGlobal().managedVMUuid()) { - if ( strKey == VBoxDefs::GUI_RealtimeDockIconUpdateEnabled - || strKey == VBoxDefs::GUI_RealtimeDockIconUpdateMonitor) + if ( strKey == GUI_RealtimeDockIconUpdateEnabled + || strKey == GUI_RealtimeDockIconUpdateMonitor) { bool f = strValue.toLower() == "false" ? false : true; Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 41689) @@ -173,5 +173,5 @@ { vbox = vboxGlobal().virtualBox(); - msgs = vbox.GetExtraData(VBoxDefs::GUI_SuppressMessages).split(','); + msgs = vbox.GetExtraData(GUI_SuppressMessages).split(','); if (msgs.contains(pcszAutoConfirmId)) { @@ -249,5 +249,5 @@ { msgs << pcszAutoConfirmId; - vbox.SetExtraData(VBoxDefs::GUI_SuppressMessages, msgs.join(",")); + vbox.SetExtraData(GUI_SuppressMessages, msgs.join(",")); } } @@ -1056,5 +1056,5 @@ .arg(strSnapshotName), tr("Create a snapshot of the current machine state"), - !vboxGlobal().virtualBox().GetExtraDataStringList(VBoxDefs::GUI_InvertMessageOption).contains("askAboutSnapshotRestoring"), + !vboxGlobal().virtualBox().GetExtraDataStringList(GUI_InvertMessageOption).contains("askAboutSnapshotRestoring"), QString::null /* details */, QIMessageBox::Ok, QIMessageBox::Cancel, 0 /* 3rd button */, @@ -1285,5 +1285,5 @@ /* Get VM name: */ QFileInfo fi(machine.GetSettingsFilePath()); - strMachineName = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxDefs::VBoxFileExts) ? fi.completeBaseName() : fi.fileName(); + strMachineName = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxFileExts) ? fi.completeBaseName() : fi.fileName(); /* Increment inacessible VM count: */ ++cInacessibleVMCount; @@ -3020,5 +3020,5 @@ { CVirtualBox vbox = vboxGlobal().virtualBox(); - vbox.SetExtraData(VBoxDefs::GUI_SuppressMessages, QString::null); + vbox.SetExtraData(GUI_SuppressMessages, QString::null); } Index: unk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp (revision 41688) +++ (revision ) @@ -1,109 +1,0 @@ -/* $Id$ */ -/** @file - * - * VBox frontends: Qt GUI ("VirtualBox"): - * VBoxDefs implementation - */ - -/* - * Copyright (C) 2006-2010 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -/* Local includes */ -#include - -/* Global includes */ -#include - -/* VBoxGlobalDefs stuff: */ -const char* VBoxGlobalDefs::UI_ExtPackName = "Oracle VM VirtualBox Extension Pack"; - -/* VBoxDefs stuff: */ -const char* VBoxDefs::GUI_LastWindowPosition = "GUI/LastWindowPosition"; -const char* VBoxDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition"; -const char* VBoxDefs::GUI_LastScaleWindowPosition = "GUI/LastScaleWindowPosition"; -const char* VBoxDefs::GUI_LastWindowState_Max = "max"; -const char* VBoxDefs::GUI_LastGuestSizeHint = "GUI/LastGuestSizeHint"; -const char* VBoxDefs::GUI_LastGuestSizeHintWasFullscreen = "GUI/LastGuestSizeHintWasFullscreen"; -const char* VBoxDefs::GUI_Toolbar = "GUI/Toolbar"; -const char* VBoxDefs::GUI_Statusbar = "GUI/Statusbar"; -const char* VBoxDefs::GUI_SplitterSizes = "GUI/SplitterSizes"; -const char* VBoxDefs::GUI_Fullscreen = "GUI/Fullscreen"; -const char* VBoxDefs::GUI_Seamless = "GUI/Seamless"; -const char* VBoxDefs::GUI_Scale = "GUI/Scale"; -const char* VBoxDefs::GUI_VirtualScreenToHostScreen = "GUI/VirtualScreenToHostScreen"; -const char* VBoxDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest"; -const char* VBoxDefs::GUI_FirstRun = "GUI/FirstRun"; -const char* VBoxDefs::GUI_HideDescriptionForWizards = "GUI/HideDescriptionForWizards"; -const char* VBoxDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime"; -const char* VBoxDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar"; -const char* VBoxDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment"; -const char* VBoxDefs::GUI_MiniToolBarAutoHide = "GUI/MiniToolBarAutoHide"; -const char* VBoxDefs::GUI_LastCloseAction = "GUI/LastCloseAction"; -const char* VBoxDefs::GUI_RestrictedCloseActions = "GUI/RestrictedCloseActions"; -const char* VBoxDefs::GUI_CloseActionHook = "GUI/CloseActionHook"; -const char* VBoxDefs::GUI_SuppressMessages = "GUI/SuppressMessages"; -const char* VBoxDefs::GUI_InvertMessageOption = "GUI/InvertMessageOption"; -const char* VBoxDefs::GUI_PermanentSharedFoldersAtRuntime = "GUI/PermanentSharedFoldersAtRuntime"; -const char* VBoxDefs::GUI_LanguageId = "GUI/LanguageID"; -const char* VBoxDefs::GUI_PreviewUpdate = "GUI/PreviewUpdate"; -const char* VBoxDefs::GUI_DetailsPageBoxes = "GUI/DetailsPageBoxes"; -const char* VBoxDefs::GUI_SelectorVMPositions = "GUI/SelectorVMPositions"; -const char* VBoxDefs::GUI_Input_MachineShortcuts = "GUI/Input/MachineShortcuts"; -const char* VBoxDefs::GUI_Input_SelectorShortcuts = "GUI/Input/SelectorShortcuts"; -#ifdef Q_WS_X11 -const char* VBoxDefs::GUI_LicenseKey = "GUI/LicenseAgreed"; -#endif -const char* VBoxDefs::GUI_RegistrationDlgWinID = "GUI/RegistrationDlgWinID"; -const char* VBoxDefs::GUI_RegistrationData = "GUI/SUNOnlineData"; -const char* VBoxDefs::GUI_UpdateDate = "GUI/UpdateDate"; -const char* VBoxDefs::GUI_UpdateCheckCount = "GUI/UpdateCheckCount"; -const char* VBoxDefs::GUI_LastVMSelected = "GUI/LastVMSelected"; -const char* VBoxDefs::GUI_InfoDlgState = "GUI/InfoDlgState"; -const char* VBoxDefs::GUI_RenderMode = "GUI/RenderMode"; -#ifdef VBOX_GUI_WITH_SYSTRAY -const char* VBoxDefs::GUI_TrayIconWinID = "GUI/TrayIcon/WinID"; -const char* VBoxDefs::GUI_TrayIconEnabled = "GUI/TrayIcon/Enabled"; -const char* VBoxDefs::GUI_MainWindowCount = "GUI/MainWindowCount"; -#endif -#ifdef Q_WS_MAC -const char* VBoxDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled"; -const char* VBoxDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor"; -const char* VBoxDefs::GUI_PresentationModeEnabled = "GUI/PresentationModeEnabled"; -#endif /* Q_WS_MAC */ -const char* VBoxDefs::GUI_PassCAD = "GUI/PassCAD"; -const char* VBoxDefs::GUI_Export_StorageType = "GUI/Export/StorageType"; -const char* VBoxDefs::GUI_Export_Username = "GUI/Export/Username"; -const char* VBoxDefs::GUI_Export_Hostname = "GUI/Export/Hostname"; -const char* VBoxDefs::GUI_Export_Bucket = "GUI/Export/Bucket"; -const char* VBoxDefs::GUI_PreventBetaWarning = "GUI/PreventBetaWarning"; -const char* VBoxDefs::GUI_RecentFolderHD = "GUI/RecentFolderHD"; -const char* VBoxDefs::GUI_RecentFolderCD = "GUI/RecentFolderCD"; -const char* VBoxDefs::GUI_RecentFolderFD = "GUI/RecentFolderFD"; -const char* VBoxDefs::GUI_RecentListHD = "GUI/RecentListHD"; -const char* VBoxDefs::GUI_RecentListCD = "GUI/RecentListCD"; -const char* VBoxDefs::GUI_RecentListFD = "GUI/RecentListFD"; -#ifdef VBOX_WITH_VIDEOHWACCEL -const char* VBoxDefs::GUI_Accelerate2D_StretchLinear = "GUI/Accelerate2D/StretchLinear"; -const char* VBoxDefs::GUI_Accelerate2D_PixformatYV12 = "GUI/Accelerate2D/PixformatYV12"; -const char* VBoxDefs::GUI_Accelerate2D_PixformatUYVY = "GUI/Accelerate2D/PixformatUYVY"; -const char* VBoxDefs::GUI_Accelerate2D_PixformatYUY2 = "GUI/Accelerate2D/PixformatYUY2"; -const char* VBoxDefs::GUI_Accelerate2D_PixformatAYUV = "GUI/Accelerate2D/PixformatAYUV"; -#endif -#ifdef VBOX_WITH_DEBUGGER_GUI -const char* VBoxDefs::GUI_DbgEnabled = "GUI/Dbg/Enabled"; -const char* VBoxDefs::GUI_DbgAutoShow = "GUI/Dbg/AutoShow"; -#endif - -QStringList VBoxDefs::VBoxFileExts = QStringList() << "xml" << "vbox"; -QStringList VBoxDefs::VBoxExtPackFileExts = QStringList() << "vbox-extpack"; -QStringList VBoxDefs::OVFFileExts = QStringList() << "ovf" << "ova"; - Index: unk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h (revision 41688) +++ (revision ) @@ -1,187 +1,0 @@ -/** @file - * - * VBox frontends: Qt GUI ("VirtualBox"): - * Header with common definitions and global functions - */ - -/* - * Copyright (C) 2006-2011 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -#ifndef __VBoxDefs_h__ -#define __VBoxDefs_h__ - -/* Qt includes */ -#include -#include -#include - -#define LOG_GROUP LOG_GROUP_GUI -#include -#include -#include - -#ifdef DEBUG - -#define AssertWrapperOk(w) \ - AssertMsg (w.isOk(), (#w " is not okay (RC=0x%08X)", w.lastRC())) -#define AssertWrapperOkMsg(w, m) \ - AssertMsg (w.isOk(), (#w ": " m " (RC=0x%08X)", w.lastRC())) - -#else /* #ifdef DEBUG */ - -#define AssertWrapperOk(w) do {} while (0) -#define AssertWrapperOkMsg(w, m) do {} while (0) - -#endif /* #ifdef DEBUG */ - -#ifndef SIZEOF_ARRAY -#define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0])) -#endif - -/** - * Common global VBox namespace. - * Later it will replace VBoxDefs struct used as global VBox namespace. - */ -namespace VBoxGlobalDefs -{ - extern const char *UI_ExtPackName; -} - -/** Common namespace for all enums */ -struct VBoxDefs -{ - /** VM display rendering mode. */ - enum RenderMode - { - InvalidRenderMode, TimerMode, QImageMode, SDLMode, DDRAWMode, Quartz2DMode -#ifdef VBOX_GUI_USE_QGLFB - , QGLMode -#endif - }; - - /** Additional Qt event types. */ - enum - { - ResizeEventType = QEvent::User + 101 - , RepaintEventType - , SetRegionEventType - , ModifierKeyChangeEventType - , MediaEnumEventType -#if defined (Q_WS_WIN) - , ShellExecuteEventType -#endif - , ActivateActionEventType -#if defined (Q_WS_MAC) - , ShowWindowEventType -#endif - , AddVDMUrlsEventType -#ifdef VBOX_GUI_USE_QGL - , VHWACommandProcessType -#endif - }; - - /** Size formatting types. */ - enum FormatSize - { - FormatSize_Round, - FormatSize_RoundDown, - FormatSize_RoundUp - }; - - static const char* GUI_LastWindowPosition; - static const char* GUI_LastNormalWindowPosition; - static const char* GUI_LastScaleWindowPosition; - static const char* GUI_LastWindowState_Max; - static const char* GUI_SplitterSizes; - static const char* GUI_Toolbar; - static const char* GUI_Statusbar; - static const char* GUI_LastGuestSizeHint; - static const char* GUI_LastGuestSizeHintWasFullscreen; - static const char* GUI_Fullscreen; - static const char* GUI_Seamless; - static const char* GUI_Scale; - static const char* GUI_VirtualScreenToHostScreen; - static const char* GUI_AutoresizeGuest; - static const char* GUI_FirstRun; - static const char* GUI_HideDescriptionForWizards; - static const char* GUI_SaveMountedAtRuntime; - static const char* GUI_ShowMiniToolBar; - static const char* GUI_MiniToolBarAlignment; - static const char* GUI_MiniToolBarAutoHide; - static const char* GUI_LastCloseAction; - static const char* GUI_RestrictedCloseActions; - static const char* GUI_CloseActionHook; - static const char* GUI_SuppressMessages; - static const char* GUI_InvertMessageOption; - static const char* GUI_PermanentSharedFoldersAtRuntime; - static const char* GUI_LanguageId; - static const char* GUI_PreviewUpdate; - static const char* GUI_DetailsPageBoxes; - static const char* GUI_SelectorVMPositions; - static const char* GUI_Input_MachineShortcuts; - static const char* GUI_Input_SelectorShortcuts; -#ifdef Q_WS_X11 - static const char* GUI_LicenseKey; -#endif - static const char* GUI_RegistrationDlgWinID; - static const char* GUI_RegistrationData; - static const char* GUI_UpdateDate; - static const char* GUI_UpdateCheckCount; - static const char* GUI_LastVMSelected; - static const char* GUI_InfoDlgState; - static const char* GUI_RenderMode; -#ifdef VBOX_GUI_WITH_SYSTRAY - static const char* GUI_TrayIconWinID; - static const char* GUI_TrayIconEnabled; - static const char* GUI_MainWindowCount; -#endif -#ifdef Q_WS_MAC - static const char* GUI_RealtimeDockIconUpdateEnabled; - static const char* GUI_RealtimeDockIconUpdateMonitor; - static const char* GUI_PresentationModeEnabled; -#endif /* Q_WS_MAC */ - static const char* GUI_PassCAD; - static const char* GUI_Export_StorageType; - static const char* GUI_Export_Username; - static const char* GUI_Export_Hostname; - static const char* GUI_Export_Bucket; - static const char* GUI_PreventBetaWarning; - - static const char* GUI_RecentFolderHD; - static const char* GUI_RecentFolderCD; - static const char* GUI_RecentFolderFD; - static const char* GUI_RecentListHD; - static const char* GUI_RecentListCD; - static const char* GUI_RecentListFD; - -#ifdef VBOX_WITH_VIDEOHWACCEL - static const char* GUI_Accelerate2D_StretchLinear; - static const char* GUI_Accelerate2D_PixformatYV12; - static const char* GUI_Accelerate2D_PixformatUYVY; - static const char* GUI_Accelerate2D_PixformatYUY2; - static const char* GUI_Accelerate2D_PixformatAYUV; -#endif - -#ifdef VBOX_WITH_DEBUGGER_GUI - static const char* GUI_DbgEnabled; - static const char* GUI_DbgAutoShow; -#endif - - static QStringList VBoxFileExts; - static QStringList VBoxExtPackFileExts; - static QStringList OVFFileExts; -}; - -#define MAC_LEOPARD_STYLE defined(Q_WS_MAC) && (QT_VERSION >= 0x040300) - -#endif /* __VBoxDefs_h__ */ - Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (revision 41689) @@ -52,5 +52,4 @@ #include "VBoxGlobal.h" #include "VBoxUtils.h" -#include "VBoxDefs.h" #include "UISelectorWindow.h" #include "UIMessageCenter.h" @@ -178,10 +177,10 @@ VBoxMediaEnumEvent (const UIMedium &aMedium, VBoxMediaList::iterator &aIterator) - : QEvent ((QEvent::Type) VBoxDefs::MediaEnumEventType) + : QEvent ((QEvent::Type) MediaEnumEventType) , mMedium (aMedium), mIterator (aIterator), mLast (false) {} /** Constructs the last enum event */ VBoxMediaEnumEvent (VBoxMediaList::iterator &aIterator) - : QEvent ((QEvent::Type) VBoxDefs::MediaEnumEventType) + : QEvent ((QEvent::Type) MediaEnumEventType) , mIterator (aIterator), mLast (true) {} @@ -221,10 +220,10 @@ * default rendering mode if the argument is NULL. */ -static VBoxDefs::RenderMode vboxGetRenderMode (const char *aModeStr) -{ - VBoxDefs::RenderMode mode = VBoxDefs::InvalidRenderMode; +static RenderMode vboxGetRenderMode (const char *aModeStr) +{ + RenderMode mode = InvalidRenderMode; #if defined (Q_WS_MAC) && defined (VBOX_GUI_USE_QUARTZ2D) - mode = VBoxDefs::Quartz2DMode; + mode = Quartz2DMode; # ifdef RT_ARCH_X86 /* Quartz2DMode doesn't refresh correctly on 32-bit Snow Leopard, use image mode. */ @@ -232,12 +231,12 @@ // if ( RT_SUCCESS (RTSystemQueryOSInfo (RTSYSOSINFO_RELEASE, szRelease, sizeof (szRelease))) // && !strncmp (szRelease, "10.", 3)) -// mode = VBoxDefs::QImageMode; +// mode = QImageMode; # endif #elif (defined (Q_WS_WIN32) || defined (Q_WS_PM) || defined (Q_WS_X11)) && defined (VBOX_GUI_USE_QIMAGE) - mode = VBoxDefs::QImageMode; + mode = QImageMode; #elif defined (Q_WS_X11) && defined (VBOX_GUI_USE_SDL) - mode = VBoxDefs::SDLMode; + mode = SDLMode; #elif defined (VBOX_GUI_USE_QIMAGE) - mode = VBoxDefs::QImageMode; + mode = QImageMode; #else # error "Cannot determine the default render mode!" @@ -249,25 +248,25 @@ #if defined (VBOX_GUI_USE_QIMAGE) else if (::strcmp (aModeStr, "image") == 0) - mode = VBoxDefs::QImageMode; + mode = QImageMode; #endif #if defined (VBOX_GUI_USE_SDL) else if (::strcmp (aModeStr, "sdl") == 0) - mode = VBoxDefs::SDLMode; + mode = SDLMode; #endif #if defined (VBOX_GUI_USE_DDRAW) else if (::strcmp (aModeStr, "ddraw") == 0) - mode = VBoxDefs::DDRAWMode; + mode = DDRAWMode; #endif #if defined (VBOX_GUI_USE_QUARTZ2D) else if (::strcmp (aModeStr, "quartz2d") == 0) - mode = VBoxDefs::Quartz2DMode; + mode = Quartz2DMode; #endif #if defined (VBOX_GUI_USE_QGLFB) else if (::strcmp (aModeStr, "qgl") == 0) - mode = VBoxDefs::QGLMode; + mode = QGLMode; #endif //#if defined (VBOX_GUI_USE_QGL) // else if (::strcmp (aModeStr, "qgloverlay") == 0) -// mode = VBoxDefs::QGLOverlayMode; +// mode = QGLOverlayMode; //#endif @@ -585,13 +584,13 @@ { int rc = 0; - QString strTrayWinID = mVBox.GetExtraData(VBoxDefs::GUI_TrayIconWinID); + QString strTrayWinID = mVBox.GetExtraData(GUI_TrayIconWinID); if (false == strTrayWinID.isEmpty()) { /* Check if current tray icon is alive by writing some bogus value. */ - mVBox.SetExtraData(VBoxDefs::GUI_TrayIconWinID, "0"); + mVBox.SetExtraData(GUI_TrayIconWinID, "0"); if (mVBox.isOk()) { /* Current tray icon died - clean up. */ - mVBox.SetExtraData(VBoxDefs::GUI_TrayIconWinID, NULL); + mVBox.SetExtraData(GUI_TrayIconWinID, NULL); strTrayWinID.clear(); } @@ -628,5 +627,5 @@ { // Use this selector for displaying the tray icon - mVBox.SetExtraData(VBoxDefs::GUI_TrayIconWinID, + mVBox.SetExtraData(GUI_TrayIconWinID, QString("%1").arg((qulonglong)vboxGlobal().mainWindow()->winId())); @@ -1933,5 +1932,5 @@ /* check for the agreed license version */ - QStringList strList = virtualBox().GetExtraData (VBoxDefs::GUI_LicenseKey).split(","); + QStringList strList = virtualBox().GetExtraData (GUI_LicenseKey).split(","); for (int i=0; i < strList.size(); ++i) if (strList.at(i) == latestVersion) @@ -1941,5 +1940,5 @@ bool result = licenseDialog.showLicenseFromFile(latestFilePath) == QDialog::Accepted; if (result) - virtualBox().SetExtraData (VBoxDefs::GUI_LicenseKey, (strList << latestVersion).join(",")); + virtualBox().SetExtraData (GUI_LicenseKey, (strList << latestVersion).join(",")); return result; } @@ -2386,9 +2385,9 @@ strTitle = tr("Please choose a virtual hard drive file"); allType = tr("All virtual hard drive files (%1)"); - strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderHD); + strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderHD); if (strLastFolder.isEmpty()) - strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderCD); + strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderCD); if (strLastFolder.isEmpty()) - strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderFD); + strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderFD); break; } @@ -2398,9 +2397,9 @@ strTitle = tr("Please choose a virtual optical disk file"); allType = tr("All virtual optical disk files (%1)"); - strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderCD); + strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderCD); if (strLastFolder.isEmpty()) - strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderHD); + strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderHD); if (strLastFolder.isEmpty()) - strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderFD); + strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderFD); break; } @@ -2410,9 +2409,9 @@ strTitle = tr("Please choose a virtual floppy disk file"); allType = tr("All virtual floppy disk files (%1)"); - strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderFD); + strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderFD); if (strLastFolder.isEmpty()) - strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderCD); + strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderCD); if (strLastFolder.isEmpty()) - strLastFolder = virtualBox().GetExtraData(VBoxDefs::GUI_RecentFolderHD); + strLastFolder = virtualBox().GetExtraData(GUI_RecentFolderHD); break; } @@ -2457,14 +2456,14 @@ /* Remember the path of the last chosen medium: */ - QString strRecentFolderKey = mediumType == UIMediumType_HardDisk ? VBoxDefs::GUI_RecentFolderHD : - mediumType == UIMediumType_DVD ? VBoxDefs::GUI_RecentFolderCD : - mediumType == UIMediumType_Floppy ? VBoxDefs::GUI_RecentFolderFD : + QString strRecentFolderKey = mediumType == UIMediumType_HardDisk ? GUI_RecentFolderHD : + mediumType == UIMediumType_DVD ? GUI_RecentFolderCD : + mediumType == UIMediumType_Floppy ? GUI_RecentFolderFD : QString(); vbox.SetExtraData(strRecentFolderKey, QFileInfo(strMediumLocation).absolutePath()); /* Update recently used list: */ - QString strRecentListKey = mediumType == UIMediumType_HardDisk ? VBoxDefs::GUI_RecentListHD : - mediumType == UIMediumType_DVD ? VBoxDefs::GUI_RecentListCD : - mediumType == UIMediumType_Floppy ? VBoxDefs::GUI_RecentListFD : + QString strRecentListKey = mediumType == UIMediumType_HardDisk ? GUI_RecentListHD : + mediumType == UIMediumType_DVD ? GUI_RecentListCD : + mediumType == UIMediumType_Floppy ? GUI_RecentListFD : QString(); QStringList recentMediumList = vbox.GetExtraData(strRecentListKey).split(';'); @@ -2508,5 +2507,5 @@ int VBoxGlobal::mainWindowCount () { - return mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt(); + return mVBox.GetExtraData (GUI_MainWindowCount).toInt(); } #endif @@ -3268,5 +3267,5 @@ /* static */ QString VBoxGlobal::formatSize (quint64 aSize, uint aDecimal /* = 2 */, - VBoxDefs::FormatSize aMode /* = FormatSize_Round */) + FormatSize aMode /* = FormatSize_Round */) { static QString Suffixes [7]; @@ -3326,8 +3325,8 @@ decm *= mult; /* not greater */ - if (aMode == VBoxDefs::FormatSize_RoundDown) + if (aMode == FormatSize_RoundDown) decm = decm / denom; /* not less */ - else if (aMode == VBoxDefs::FormatSize_RoundUp) + else if (aMode == FormatSize_RoundUp) decm = (decm + denom - 1) / denom; /* nearest */ @@ -4130,5 +4129,5 @@ * that attempts to set it will win, the rest will get a failure from * the SetExtraData() call. */ - mVBox.SetExtraData (VBoxDefs::GUI_RegistrationDlgWinID, + mVBox.SetExtraData (GUI_RegistrationDlgWinID, QString ("%1").arg ((qulonglong) mMainWindow->winId())); @@ -4163,5 +4162,5 @@ switch (e->type()) { - case VBoxDefs::MediaEnumEventType: + case MediaEnumEventType: { VBoxMediaEnumEvent *ev = (VBoxMediaEnumEvent*) e; @@ -4221,20 +4220,20 @@ bool VBoxGlobal::isDebuggerEnabled(CMachine &aMachine) { - return isDebuggerWorker(&mDbgEnabled, aMachine, VBoxDefs::GUI_DbgEnabled); + return isDebuggerWorker(&mDbgEnabled, aMachine, GUI_DbgEnabled); } bool VBoxGlobal::isDebuggerAutoShowEnabled(CMachine &aMachine) { - return isDebuggerWorker(&mDbgAutoShow, aMachine, VBoxDefs::GUI_DbgAutoShow); + return isDebuggerWorker(&mDbgAutoShow, aMachine, GUI_DbgAutoShow); } bool VBoxGlobal::isDebuggerAutoShowCommandLineEnabled(CMachine &aMachine) { - return isDebuggerWorker(&mDbgAutoShowCommandLine, aMachine, VBoxDefs::GUI_DbgAutoShow); + return isDebuggerWorker(&mDbgAutoShowCommandLine, aMachine, GUI_DbgAutoShow); } bool VBoxGlobal::isDebuggerAutoShowStatisticsEnabled(CMachine &aMachine) { - return isDebuggerWorker(&mDbgAutoShowStatistics, aMachine, VBoxDefs::GUI_DbgAutoShow); + return isDebuggerWorker(&mDbgAutoShowStatistics, aMachine, GUI_DbgAutoShow); } @@ -4269,5 +4268,5 @@ { const QString& strFile = list.at(i).toLocalFile(); - if (VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::VBoxFileExts)) + if (VBoxGlobal::hasAllowedExtension(strFile, VBoxFileExts)) { CVirtualBox vbox = vboxGlobal().virtualBox(); @@ -4351,8 +4350,8 @@ { /* Increase open Fe/Qt4 windows reference count. */ - int c = mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt() + 1; + int c = mVBox.GetExtraData (GUI_MainWindowCount).toInt() + 1; AssertMsgReturnVoid ((c >= 0) || (mVBox.isOk()), ("Something went wrong with the window reference count!")); - mVBox.SetExtraData (VBoxDefs::GUI_MainWindowCount, QString ("%1").arg (c)); + mVBox.SetExtraData (GUI_MainWindowCount, QString ("%1").arg (c)); mIncreasedWindowCounter = mVBox.isOk(); AssertReturnVoid (mIncreasedWindowCounter); @@ -4487,5 +4486,5 @@ vm_render_mode_str = RTStrDup (virtualBox() - .GetExtraData (VBoxDefs::GUI_RenderMode).toAscii().constData()); + .GetExtraData (GUI_RenderMode).toAscii().constData()); #ifdef Q_WS_X11 @@ -4495,9 +4494,9 @@ #ifdef VBOX_WITH_DEBUGGER_GUI # ifdef VBOX_WITH_DEBUGGER_GUI_MENU - initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", VBoxDefs::GUI_DbgEnabled, true); + initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", GUI_DbgEnabled, true); # else - initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", VBoxDefs::GUI_DbgEnabled, false); + initDebuggerVar(&mDbgEnabled, "VBOX_GUI_DBG_ENABLED", GUI_DbgEnabled, false); # endif - initDebuggerVar(&mDbgAutoShow, "VBOX_GUI_DBG_AUTO_SHOW", VBoxDefs::GUI_DbgAutoShow, false); + initDebuggerVar(&mDbgAutoShow, "VBOX_GUI_DBG_AUTO_SHOW", GUI_DbgAutoShow, false); mDbgAutoShowCommandLine = mDbgAutoShowStatistics = mDbgAutoShow; mStartPaused = false; @@ -4633,9 +4632,9 @@ if (bForceSeamless && !vmUuid.isEmpty()) { - mVBox.FindMachine(vmUuid).SetExtraData(VBoxDefs::GUI_Seamless, "on"); + mVBox.FindMachine(vmUuid).SetExtraData(GUI_Seamless, "on"); } else if (bForceFullscreen && !vmUuid.isEmpty()) { - mVBox.FindMachine(vmUuid).SetExtraData(VBoxDefs::GUI_Fullscreen, "on"); + mVBox.FindMachine(vmUuid).SetExtraData(GUI_Fullscreen, "on"); } @@ -4724,15 +4723,15 @@ { /* Decrease open Fe/Qt4 windows reference count. */ - int c = mVBox.GetExtraData (VBoxDefs::GUI_MainWindowCount).toInt() - 1; + int c = mVBox.GetExtraData (GUI_MainWindowCount).toInt() - 1; AssertMsg ((c >= 0) || (mVBox.isOk()), ("Something went wrong with the window reference count!")); if (c < 0) c = 0; /* Clean up the mess. */ - mVBox.SetExtraData (VBoxDefs::GUI_MainWindowCount, + mVBox.SetExtraData (GUI_MainWindowCount, (c > 0) ? QString ("%1").arg (c) : NULL); AssertWrapperOk (mVBox); if (c == 0) { - mVBox.SetExtraData (VBoxDefs::GUI_TrayIconWinID, NULL); + mVBox.SetExtraData (GUI_TrayIconWinID, NULL); AssertWrapperOk (mVBox); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h (revision 41689) @@ -29,4 +29,5 @@ /* GUI includes: */ +#include "UIDefs.h" #include "VBoxGlobalSettings.h" #include "UIMedium.h" @@ -142,5 +143,5 @@ QList &argUrlList() { return m_ArgUrlList; } - VBoxDefs::RenderMode vmRenderMode() const { return vm_render_mode; } + RenderMode vmRenderMode() const { return vm_render_mode; } const char *vmRenderModeStr() const { return vm_render_mode_str; } bool isKWinManaged() const { return mIsKWinManaged; } @@ -347,6 +348,5 @@ static quint64 parseSize (const QString &); - static QString formatSize (quint64 aSize, uint aDecimal = 2, - VBoxDefs::FormatSize aMode = VBoxDefs::FormatSize_Round); + static QString formatSize (quint64 aSize, uint aDecimal = 2, FormatSize aMode = FormatSize_Round); static quint64 requiredVideoMemory(const QString &strGuestOSTypeId, int cMonitors = 1); @@ -501,5 +501,5 @@ VBoxMediaList mMediaList; - VBoxDefs::RenderMode vm_render_mode; + RenderMode vm_render_mode; const char * vm_render_mode_str; bool mIsKWinManaged; Index: /trunk/src/VBox/Frontends/VirtualBox/src/main.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/main.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/main.cpp (revision 41689) @@ -504,5 +504,5 @@ /* Allow to prevent this message */ QString str = vboxGlobal().virtualBox(). - GetExtraData (VBoxDefs::GUI_PreventBetaWarning); + GetExtraData(GUI_PreventBetaWarning); if (str != vboxVersion) msgCenter().showBETAWarning(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 41689) @@ -65,5 +65,5 @@ AddVDMUrlsEvent (const QList &aUrls) - : QEvent (static_cast (VBoxDefs::AddVDMUrlsEventType)) + : QEvent (static_cast (AddVDMUrlsEventType)) , mUrls (aUrls) {} @@ -748,5 +748,5 @@ break; } - case VBoxDefs::AddVDMUrlsEventType: + case AddVDMUrlsEventType: { if (aObject == currentTreeWidget()) Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h (revision 41689) @@ -24,5 +24,4 @@ #include "QIMainDialog.h" #include "QIWithRetranslateUI.h" -#include "VBoxDefs.h" #include "VBoxMediaComboBox.h" Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp (revision 41689) @@ -29,8 +29,4 @@ #include "VBoxGlobal.h" #include "UIMessageCenter.h" -#include "VBoxDefs.h" - -/* Using declarations: */ -using namespace VBoxGlobalDefs; /* static */ @@ -61,5 +57,5 @@ /* Prepare source/target: */ - QString strExtPackUnderscoredName(QString(UI_ExtPackName).replace(' ', '_')); + QString strExtPackUnderscoredName(QString(GUI_ExtPackName).replace(' ', '_')); QString strTemplateSourcePath("http://download.virtualbox.org/virtualbox/%1/"); QString strTemplateSourceName(QString("%1-%2.vbox-extpack").arg(strExtPackUnderscoredName)); @@ -85,5 +81,5 @@ bool UIDownloaderExtensionPack::askForDownloadingConfirmation(QNetworkReply *pReply) { - return msgCenter().confirmDownloadExtensionPack(UI_ExtPackName, source().toString(), pReply->header(QNetworkRequest::ContentLengthHeader).toInt()); + return msgCenter().confirmDownloadExtensionPack(GUI_ExtPackName, source().toString(), pReply->header(QNetworkRequest::ContentLengthHeader).toInt()); } @@ -120,10 +116,10 @@ /* Warn the user about extension-pack was downloaded but was NOT saved: */ - msgCenter().warnAboutExtentionPackCantBeSaved(UI_ExtPackName, source().toString(), QDir::toNativeSeparators(target())); + msgCenter().warnAboutExtentionPackCantBeSaved(GUI_ExtPackName, source().toString(), QDir::toNativeSeparators(target())); /* Ask the user for another location for the extension-pack file: */ QString strTarget = QIFileDialog::getExistingDirectory(QFileInfo(target()).absolutePath(), msgCenter().networkManagerOrMainWindowShown(), - tr("Select folder to save %1 to").arg(UI_ExtPackName), true); + tr("Select folder to save %1 to").arg(GUI_ExtPackName), true); /* Check if user had really set a new target: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp (revision 41689) @@ -35,5 +35,4 @@ #include "UIDownloaderExtensionPack.h" #include "UIGlobalSettingsExtension.h" -#include "VBoxDefs.h" #include "QIProcess.h" @@ -48,7 +47,4 @@ /* Forward declarations: */ class UIUpdateStep; - -/* Using declarations: */ -using namespace VBoxGlobalDefs; /* Queue for processing update-steps: */ @@ -166,5 +162,5 @@ /* Calculate the count of checks left: */ int cCount = 1; - QString strCount = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateCheckCount); + QString strCount = vboxGlobal().virtualBox().GetExtraData(GUI_UpdateCheckCount); if (!strCount.isEmpty()) { @@ -193,5 +189,5 @@ } url.addQueryItem("count", QString::number(cCount)); - url.addQueryItem("branch", VBoxUpdateData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate)).branchName()); + url.addQueryItem("branch", VBoxUpdateData(vboxGlobal().virtualBox().GetExtraData(GUI_UpdateDate)).branchName()); QString strUserAgent(QString("VirtualBox %1 <%2>").arg(vboxGlobal().virtualBox().GetVersion()).arg(platformInfo())); @@ -231,5 +227,5 @@ /* Save left count of checks: */ int cCount = 1; - QString strCount = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateCheckCount); + QString strCount = vboxGlobal().virtualBox().GetExtraData(GUI_UpdateCheckCount); if (!strCount.isEmpty()) { @@ -238,5 +234,5 @@ if (ok) cCount = c; } - vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateCheckCount, QString("%1").arg((qulonglong)cCount + 1)); + vboxGlobal().virtualBox().SetExtraData(GUI_UpdateCheckCount, QString("%1").arg((qulonglong)cCount + 1)); /* Notify about step completion: */ @@ -376,5 +372,5 @@ /* Get extension pack: */ - CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(UI_ExtPackName); + CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName); /* Return if extension pack is NOT installed: */ if (extPack.isNull()) @@ -410,5 +406,5 @@ { /* Inform the user that he should update the extension pack: */ - msgCenter().requestUserDownloadExtensionPack(UI_ExtPackName, strExtPackVersion, strVBoxVersion); + msgCenter().requestUserDownloadExtensionPack(GUI_ExtPackName, strExtPackVersion, strVBoxVersion); /* Never try to download for ENTERPRISE version: */ emit sigStepComplete(); @@ -417,5 +413,5 @@ /* Ask the user about extension pack downloading: */ - if (!msgCenter().proposeDownloadExtensionPack(UI_ExtPackName, strExtPackVersion)) + if (!msgCenter().proposeDownloadExtensionPack(GUI_ExtPackName, strExtPackVersion)) { emit sigStepComplete(); @@ -438,5 +434,5 @@ { /* Warn the user about extension pack was downloaded and saved, propose to install it: */ - if (msgCenter().proposeInstallExtentionPack(UI_ExtPackName, strSource, QDir::toNativeSeparators(strTarget))) + if (msgCenter().proposeInstallExtentionPack(GUI_ExtPackName, strSource, QDir::toNativeSeparators(strTarget))) UIGlobalSettingsExtension::doInstallation(strTarget, strDigest, msgCenter().mainWindowShown(), NULL); } @@ -518,5 +514,5 @@ /* Load/decode curent update data: */ - VBoxUpdateData currentData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate)); + VBoxUpdateData currentData(vboxGlobal().virtualBox().GetExtraData(GUI_UpdateDate)); /* If update is really necessary: */ @@ -536,8 +532,8 @@ { /* Load/decode curent update data: */ - VBoxUpdateData currentData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate)); + VBoxUpdateData currentData(vboxGlobal().virtualBox().GetExtraData(GUI_UpdateDate)); /* Encode/save new update data: */ VBoxUpdateData newData(currentData.periodIndex(), currentData.branchIndex()); - vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDate, newData.data()); + vboxGlobal().virtualBox().SetExtraData(GUI_UpdateDate, newData.data()); #ifdef VBOX_WITH_UPDATE_REQUEST Index: /trunk/src/VBox/Frontends/VirtualBox/src/precomp.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/precomp.h (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/precomp.h (revision 41689) @@ -198,5 +198,5 @@ # include "VBoxCocoaSpecialControls.h" #endif -#include "VBoxDefs.h" +#include "UIDefs.h" #include "VBoxDownloaderWgt.h" #include "UIApplianceExportEditorWidget.h" @@ -321,5 +321,5 @@ #ifdef Q_WS_MAC -# if MAC_LEOPARD_STYLE /* This is defined by VBoxDefs.h and must come after it was included */ +# if MAC_LEOPARD_STYLE /* This is defined by UIDefs.h and must come after it was included */ # include # endif Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h (revision 41689) @@ -25,5 +25,7 @@ /* GUI includes: */ -#include "VBoxDefs.h" +#include "UIDefs.h" + +/* COM includes: */ #include "CFramebuffer.h" @@ -44,5 +46,5 @@ ulong uBitsPerPixel, ulong uBytesPerLine, ulong uWidth, ulong uHeight) - : QEvent((QEvent::Type)VBoxDefs::ResizeEventType) + : QEvent((QEvent::Type)ResizeEventType) , m_uPixelFormat(uPixelFormat), m_pVRAM(pVRAM), m_uBitsPerPixel(uBitsPerPixel) , m_uBytesPerLine(uBytesPerLine), m_uWidth(uWidth), m_uHeight(uHeight) {} @@ -72,5 +74,5 @@ UIRepaintEvent(int iX, int iY, int iW, int iH) - : QEvent((QEvent::Type)VBoxDefs::RepaintEventType) + : QEvent((QEvent::Type)RepaintEventType) , m_iX(iX), m_iY(iY), m_iW(iW), m_iH(iH) {} int x() { return m_iX; } @@ -92,5 +94,5 @@ UISetRegionEvent(const QRegion ®ion) - : QEvent((QEvent::Type)VBoxDefs::SetRegionEventType) + : QEvent((QEvent::Type)SetRegionEventType) , m_region(region) {} QRegion region() { return m_region; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (revision 41689) @@ -709,5 +709,5 @@ { /* CAD settings: */ - QString passCAD = session().GetConsole().GetMachine().GetExtraData(VBoxDefs::GUI_PassCAD); + QString passCAD = session().GetConsole().GetMachine().GetExtraData(GUI_PassCAD); if (!passCAD.isEmpty() && passCAD != "false" && passCAD != "no") m_fPassCAD = true; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp (revision 41689) @@ -523,5 +523,5 @@ { /* Test 'scale' flag: */ - QString strScaleSettings = machine.GetExtraData(VBoxDefs::GUI_Scale); + QString strScaleSettings = machine.GetExtraData(GUI_Scale); if (strScaleSettings == "on") { @@ -535,5 +535,5 @@ { /* Test 'seamless' flag: */ - QString strSeamlessSettings = machine.GetExtraData(VBoxDefs::GUI_Seamless); + QString strSeamlessSettings = machine.GetExtraData(GUI_Seamless); if (strSeamlessSettings == "on") { @@ -548,5 +548,5 @@ { /* Test 'fullscreen' flag: */ - QString strFullscreenSettings = machine.GetExtraData(VBoxDefs::GUI_Fullscreen); + QString strFullscreenSettings = machine.GetExtraData(GUI_Fullscreen); if (strFullscreenSettings == "on") { @@ -567,13 +567,13 @@ { /* Set 'scale' flag: */ - machine.SetExtraData(VBoxDefs::GUI_Scale, m_pVisualState && + machine.SetExtraData(GUI_Scale, m_pVisualState && m_pVisualState->visualStateType() == UIVisualStateType_Scale ? "on" : QString()); /* Set 'seamless' flag: */ - machine.SetExtraData(VBoxDefs::GUI_Seamless, m_pVisualState && + machine.SetExtraData(GUI_Seamless, m_pVisualState && m_pVisualState->visualStateType() == UIVisualStateType_Seamless ? "on" : QString()); /* Set 'fullscreen' flag: */ - machine.SetExtraData(VBoxDefs::GUI_Fullscreen, m_pVisualState && + machine.SetExtraData(GUI_Fullscreen, m_pVisualState && m_pVisualState->visualStateType() == UIVisualStateType_Fullscreen ? "on" : QString()); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 41689) @@ -708,5 +708,5 @@ { pDockSettingsMenu->addSeparator(); - m_DockIconPreviewMonitor = qMin(session().GetMachine().GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateMonitor).toInt(), cGuestScreens - 1); + m_DockIconPreviewMonitor = qMin(session().GetMachine().GetExtraData(GUI_RealtimeDockIconUpdateMonitor).toInt(), cGuestScreens - 1); m_pDockPreviewSelectMonitorGroup = new QActionGroup(this); for (int i = 0; i < cGuestScreens; ++i) @@ -732,5 +732,5 @@ m_pDockIconPreview = new UIDockIconPreview(uisession(), vboxGlobal().vmGuestOSTypeIcon(osTypeId)); - QString strTest = session().GetMachine().GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled).toLower(); + QString strTest = session().GetMachine().GetExtraData(GUI_RealtimeDockIconUpdateEnabled).toLower(); /* Default to true if it is an empty value */ bool f = (strTest.isEmpty() || strTest == "true"); @@ -1186,9 +1186,9 @@ case UIMediumType_DVD: mediums = vboxGlobal().host().GetDVDDrives(); - strRecentMediumAddress = VBoxDefs::GUI_RecentListCD; + strRecentMediumAddress = GUI_RecentListCD; break; case UIMediumType_Floppy: mediums = vboxGlobal().host().GetFloppyDrives(); - strRecentMediumAddress = VBoxDefs::GUI_RecentListFD; + strRecentMediumAddress = GUI_RecentListFD; break; default: @@ -1698,5 +1698,5 @@ fEnabled = false; - machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, fEnabled ? "true" : "false"); + machine.SetExtraData(GUI_RealtimeDockIconUpdateEnabled, fEnabled ? "true" : "false"); updateDockOverlay(); } @@ -1709,5 +1709,5 @@ { int monitor = pAction->data().toInt(); - machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateMonitor, QString::number(monitor)); + machine.SetExtraData(GUI_RealtimeDockIconUpdateMonitor, QString::number(monitor)); updateDockOverlay(); } @@ -1723,5 +1723,5 @@ m_pDockPreviewSelectMonitorGroup->setEnabled(fEnabled); CMachine machine = session().GetMachine(); - m_DockIconPreviewMonitor = qMin(machine.GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateMonitor).toInt(), (int)machine.GetMonitorCount() - 1); + m_DockIconPreviewMonitor = qMin(machine.GetExtraData(GUI_RealtimeDockIconUpdateMonitor).toInt(), (int)machine.GetMonitorCount() - 1); } /* Resize the dock icon in the case the preview monitor has changed. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp (revision 41689) @@ -66,5 +66,5 @@ m_Shortcuts[PopupMenuShortcut] = UIKeySequence("PopupMenu", "Home"); /* Overwrite the key sequences with the one in extra data. */ - loadExtraData(VBoxDefs::GUI_Input_MachineShortcuts, EndShortcutType); + loadExtraData(GUI_Input_MachineShortcuts, EndShortcutType); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (revision 41689) @@ -179,6 +179,5 @@ /* And track whether we have had a "normal" resize since the last * fullscreen resize hint was sent: */ - QString strKey = makeExtraDataKeyPerMonitor - (VBoxDefs::GUI_LastGuestSizeHintWasFullscreen); + QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHintWasFullscreen); machine.SetExtraData(strKey, isFullscreenOrSeamless() ? "true" : ""); } @@ -193,5 +192,5 @@ case KMachineState_TeleportingPausedVM: { - if ( vboxGlobal().vmRenderMode() != VBoxDefs::TimerMode + if ( vboxGlobal().vmRenderMode() != TimerMode && m_pFrameBuffer && @@ -222,5 +221,5 @@ || m_previousState == KMachineState_Restoring) { - if (vboxGlobal().vmRenderMode() != VBoxDefs::TimerMode && m_pFrameBuffer) + if (vboxGlobal().vmRenderMode() != TimerMode && m_pFrameBuffer) { /* Reset the pixmap to free memory: */ @@ -271,5 +270,5 @@ switch (vboxGlobal().vmRenderMode()) { - case VBoxDefs::QGLMode: + case QGLMode: pViewport = new VBoxGLWidget(session().GetConsole(), this, NULL); break; @@ -289,5 +288,5 @@ { #ifdef VBOX_GUI_USE_QIMAGE - case VBoxDefs::QImageMode: + case QImageMode: { UIFrameBuffer* pFrameBuffer = uisession()->frameBuffer(screenId()); @@ -316,13 +315,13 @@ #endif /* VBOX_GUI_USE_QIMAGE */ #ifdef VBOX_GUI_USE_QGLFB - case VBoxDefs::QGLMode: + case QGLMode: m_pFrameBuffer = new UIFrameBufferQGL(this); break; -// case VBoxDefs::QGLOverlayMode: +// case QGLOverlayMode: // m_pFrameBuffer = new UIQGLOverlayFrameBuffer(this); // break; #endif /* VBOX_GUI_USE_QGLFB */ #ifdef VBOX_GUI_USE_SDL - case VBoxDefs::SDLMode: + case SDLMode: { /* Indicate that we are doing all drawing stuff ourself: */ @@ -362,5 +361,5 @@ #if 0 // TODO: Enable DDraw frame buffer! #ifdef VBOX_GUI_USE_DDRAW - case VBoxDefs::DDRAWMode: + case DDRAWMode: m_pFrameBuffer = new UIDDRAWFrameBuffer(this); if (!m_pFrameBuffer || m_pFrameBuffer->address() == NULL) @@ -368,5 +367,5 @@ if (m_pFrameBuffer) delete m_pFrameBuffer; - m_mode = VBoxDefs::QImageMode; + m_mode = QImageMode; m_pFrameBuffer = new UIFrameBufferQImage(this); } @@ -375,5 +374,5 @@ #endif #ifdef VBOX_GUI_USE_QUARTZ2D - case VBoxDefs::Quartz2DMode: + case Quartz2DMode: { /* Indicate that we are doing all drawing stuff ourself: */ @@ -527,14 +526,14 @@ { /* Process pending frame-buffer resize events: */ - QApplication::sendPostedEvents(this, VBoxDefs::ResizeEventType); + QApplication::sendPostedEvents(this, ResizeEventType); if ( 0 #ifdef VBOX_GUI_USE_QIMAGE - || vboxGlobal().vmRenderMode() == VBoxDefs::QImageMode + || vboxGlobal().vmRenderMode() == QImageMode #endif #ifdef VBOX_GUI_USE_SDL - || vboxGlobal().vmRenderMode() == VBoxDefs::SDLMode + || vboxGlobal().vmRenderMode() == SDLMode #endif #ifdef VBOX_GUI_USE_QUARTZ2D - || vboxGlobal().vmRenderMode() == VBoxDefs::Quartz2DMode + || vboxGlobal().vmRenderMode() == Quartz2DMode #endif #ifdef VBOX_WITH_VIDEOHWACCEL @@ -674,6 +673,5 @@ /* Load machine view hint: */ - QString strKey = makeExtraDataKeyPerMonitor - (VBoxDefs::GUI_LastGuestSizeHint); + QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHint); QString strValue = machine.GetExtraData(strKey); @@ -706,6 +704,5 @@ /* Save machine view hint: */ - QString strKey = makeExtraDataKeyPerMonitor - (VBoxDefs::GUI_LastGuestSizeHint); + QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHint); QString strValue = QString("%1,%2").arg(sizeHint.width()).arg(sizeHint.height()); machine.SetExtraData(strKey, strValue); @@ -838,5 +835,5 @@ { # ifdef VBOX_GUI_USE_QUARTZ2D - if (vboxGlobal().vmRenderMode() == VBoxDefs::Quartz2DMode) + if (vboxGlobal().vmRenderMode() == Quartz2DMode) { /* If the render mode is Quartz2D we could use the CGImageRef @@ -951,5 +948,5 @@ } -VBoxDefs::RenderMode UIMachineView::getRenderMode() const +RenderMode UIMachineView::getRenderMode() const { if (visualStateType() != UIVisualStateType_Scale) @@ -964,11 +961,11 @@ { #ifdef VBOX_GUI_USE_QUARTZ2D - case VBoxDefs::Quartz2DMode: - return VBoxDefs::Quartz2DMode; + case Quartz2DMode: + return Quartz2DMode; #endif /* VBOX_GUI_USE_QUARTZ2D */ default: #ifdef VBOX_GUI_USE_QIMAGE - case VBoxDefs::QImageMode: - return VBoxDefs::QImageMode; + case QImageMode: + return QImageMode; #endif /* VBOX_GUI_USE_QIMAGE */ break; @@ -982,5 +979,5 @@ switch (pEvent->type()) { - case VBoxDefs::RepaintEventType: + case RepaintEventType: { UIRepaintEvent *pPaintEvent = static_cast(pEvent); @@ -992,5 +989,5 @@ #ifdef Q_WS_MAC /* Event posted OnShowWindow: */ - case VBoxDefs::ShowWindowEventType: + case ShowWindowEventType: { /* Dunno what Qt3 thinks a window that has minimized to the dock should be - it is not hidden, @@ -1006,5 +1003,5 @@ #ifdef VBOX_WITH_VIDEOHWACCEL - case VBoxDefs::VHWACommandProcessType: + case VHWACommandProcessType: { m_pFrameBuffer->doProcessVHWACommand(pEvent); @@ -1103,5 +1100,5 @@ #ifdef VBOX_GUI_USE_QUARTZ2D - if (vboxGlobal().vmRenderMode() == VBoxDefs::Quartz2DMode && m_pFrameBuffer) + if (vboxGlobal().vmRenderMode() == Quartz2DMode && m_pFrameBuffer) { m_pFrameBuffer->paintEvent(pPaintEvent); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h (revision 41689) @@ -25,4 +25,5 @@ /* GUI includes: */ +#include "UIDefs.h" #include "UIMachineDefs.h" #ifdef Q_WS_MAC @@ -183,5 +184,5 @@ /** Returns the current rendering mode. * @note contains special case logic for scale mode. */ - VBoxDefs::RenderMode getRenderMode() const; + RenderMode getRenderMode() const; /* Cross-platforms event processors: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp (revision 41689) @@ -284,5 +284,5 @@ /* Check if there is a close hock script defined. */ - const QString& strScript = m.GetExtraData(VBoxDefs::GUI_CloseActionHook); + const QString& strScript = m.GetExtraData(GUI_CloseActionHook); if (!strScript.isEmpty()) { @@ -298,5 +298,5 @@ /* Check which close actions are disallowed: */ - QStringList restictedActionsList = m.GetExtraData(VBoxDefs::GUI_RestrictedCloseActions).split(','); + QStringList restictedActionsList = m.GetExtraData(GUI_RestrictedCloseActions).split(','); bool fIsStateSavingAllowed = !restictedActionsList.contains("SaveState", Qt::CaseInsensitive); bool fIsACPIShutdownAllowed = !restictedActionsList.contains("Shutdown", Qt::CaseInsensitive); @@ -333,5 +333,5 @@ /* Read the last user's choice for the given VM: */ - QStringList lastAction = m.GetExtraData(VBoxDefs::GUI_LastCloseAction).split(','); + QStringList lastAction = m.GetExtraData(GUI_LastCloseAction).split(','); /* Check which button should be initially chosen: */ @@ -473,5 +473,5 @@ { /* Read the last user's choice for the given VM: */ - QStringList prevAction = m.GetExtraData(VBoxDefs::GUI_LastCloseAction).split(','); + QStringList prevAction = m.GetExtraData(GUI_LastCloseAction).split(','); /* Memorize the last user's choice for the given VM: */ QString lastAction = strPowerOff; @@ -487,5 +487,5 @@ if (dlg.mCbDiscardCurState->isChecked()) (lastAction += ",") += strDiscardCurState; - m.SetExtraData(VBoxDefs::GUI_LastCloseAction, lastAction); + m.SetExtraData(GUI_LastCloseAction, lastAction); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp (revision 41689) @@ -771,5 +771,5 @@ { #if 0 // TODO: Move that to fullscreen event-handler: - if (vboxGlobal().vmRenderMode() != VBoxDefs::SDLMode) + if (vboxGlobal().vmRenderMode() != SDLMode) { /* try to automatically scroll the guest canvas if the @@ -798,5 +798,5 @@ int iVw = m_views[uScreenId]->visibleWidth(), iVh = m_views[uScreenId]->visibleHeight(); - if (vboxGlobal().vmRenderMode() != VBoxDefs::SDLMode) + if (vboxGlobal().vmRenderMode() != SDLMode) { /* Try to automatically scroll the guest canvas if the Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp (revision 41689) @@ -25,4 +25,5 @@ /* GUI includes: */ +#include "UIDefs.h" #include "UIMultiScreenLayout.h" #include "UIActionPoolRuntime.h" @@ -99,5 +100,5 @@ { /* If the user ever selected a combination in the view menu, we have the following entry: */ - QString strTest = machine.GetExtraData(QString("%1%2").arg(VBoxDefs::GUI_VirtualScreenToHostScreen).arg(i)); + QString strTest = machine.GetExtraData(QString("%1%2").arg(GUI_VirtualScreenToHostScreen).arg(i)); bool fOk; int cScreen = strTest.toInt(&fOk); @@ -113,5 +114,5 @@ * to the target screens and they will magically open there in * seamless/fullscreen also. */ - QString strTest1 = machine.GetExtraData(VBoxDefs::GUI_LastWindowPosition + (i > 0 ? QString::number(i): "")); + QString strTest1 = machine.GetExtraData(GUI_LastNormalWindowPosition + (i > 0 ? QString::number(i): "")); QRegExp posParser("(-?\\d+),(-?\\d+),(-?\\d+),(-?\\d+)"); if (posParser.exactMatch(strTest1)) @@ -257,5 +258,5 @@ { int iHostScreen = m_pScreenMap->value(i); - machine.SetExtraData(QString("%1%2").arg(VBoxDefs::GUI_VirtualScreenToHostScreen).arg(i), QString::number(iHostScreen)); + machine.SetExtraData(QString("%1%2").arg(GUI_VirtualScreenToHostScreen).arg(i), QString::number(iHostScreen)); QList screenActions = viewActions.at(i)->menu()->actions(); for (int w = 0; w < screenActions.size(); ++w) Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 41689) @@ -720,15 +720,15 @@ /* Is there should be First RUN Wizard? */ - strSettings = machine.GetExtraData(VBoxDefs::GUI_FirstRun); + strSettings = machine.GetExtraData(GUI_FirstRun); if (strSettings == "yes") m_fIsFirstTimeStarted = true; /* Ignore mediums mounted at runtime? */ - strSettings = machine.GetExtraData(VBoxDefs::GUI_SaveMountedAtRuntime); + strSettings = machine.GetExtraData(GUI_SaveMountedAtRuntime); if (strSettings == "no") m_fIsIgnoreRuntimeMediumsChanging = true; /* Should guest autoresize? */ - strSettings = machine.GetExtraData(VBoxDefs::GUI_AutoresizeGuest); + strSettings = machine.GetExtraData(GUI_AutoresizeGuest); QAction *pGuestAutoresizeSwitch = gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize); pGuestAutoresizeSwitch->setChecked(strSettings != "off"); @@ -752,8 +752,8 @@ { /* Disable First RUN Wizard for the since now: */ - machine.SetExtraData(VBoxDefs::GUI_FirstRun, QString()); + machine.SetExtraData(GUI_FirstRun, QString()); /* Remember if guest should autoresize: */ - machine.SetExtraData(VBoxDefs::GUI_AutoresizeGuest, + machine.SetExtraData(GUI_AutoresizeGuest, gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->isChecked() ? QString() : "off"); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h (revision 41689) @@ -23,4 +23,5 @@ #include #include +#include /* GUI includes: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (revision 41689) @@ -209,5 +209,5 @@ && m_pScreenLayout->isHostTaskbarCovert()) { - QString testStr = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_PresentationModeEnabled).toLower(); + QString testStr = vboxGlobal().virtualBox().GetExtraData(GUI_PresentationModeEnabled).toLower(); /* Default to false if it is an empty value */ if (testStr.isEmpty() || testStr == "false") Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp (revision 41689) @@ -97,5 +97,5 @@ switch (pEvent->type()) { - case VBoxDefs::ResizeEventType: + case ResizeEventType: { return guestResizeEvent(pEvent, true); @@ -201,5 +201,5 @@ * We need to do that because we cannot correctly draw in a scrolled window in SDL mode. * In all other modes, or when auto-resize is in force, this function does nothing. */ - if (vboxGlobal().vmRenderMode() == VBoxDefs::SDLMode) + if (vboxGlobal().vmRenderMode() == SDLMode) { if (!uisession()->isGuestSupportsGraphics() || !m_bIsGuestAutoresizeEnabled) Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp (revision 41689) @@ -27,4 +27,5 @@ /* GUI includes: */ +#include "UIDefs.h" #include "VBoxMiniToolBar.h" #include "UISession.h" @@ -111,12 +112,12 @@ /* Make sure mini-toolbar is necessary: */ - bool fIsActive = m.GetExtraData(VBoxDefs::GUI_ShowMiniToolBar) != "no"; + bool fIsActive = m.GetExtraData(GUI_ShowMiniToolBar) != "no"; if (!fIsActive) return; /* Get the mini-toolbar alignment: */ - bool fIsAtTop = m.GetExtraData(VBoxDefs::GUI_MiniToolBarAlignment) == "top"; + bool fIsAtTop = m.GetExtraData(GUI_MiniToolBarAlignment) == "top"; /* Get the mini-toolbar auto-hide feature availability: */ - bool fIsAutoHide = m.GetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide) != "off"; + bool fIsAutoHide = m.GetExtraData(GUI_MiniToolBarAutoHide) != "off"; m_pMiniToolBar = new VBoxMiniToolBar(centralWidget(), fIsAtTop ? VBoxMiniToolBar::AlignTop : VBoxMiniToolBar::AlignBottom, @@ -142,5 +143,5 @@ /* Save mini-toolbar settings: */ - machine().SetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide, m_pMiniToolBar->isAutoHide() ? QString() : "off"); + machine().SetExtraData(GUI_MiniToolBarAutoHide, m_pMiniToolBar->isAutoHide() ? QString() : "off"); /* Delete mini-toolbar: */ delete m_pMiniToolBar; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp (revision 41689) @@ -97,5 +97,5 @@ switch (pEvent->type()) { - case VBoxDefs::ResizeEventType: + case ResizeEventType: { return guestResizeEvent(pEvent, false); @@ -198,6 +198,5 @@ /* We send a guest size hint if needed to reverse a transition * to fullscreen or seamless. */ - QString strKey = makeExtraDataKeyPerMonitor - (VBoxDefs::GUI_LastGuestSizeHintWasFullscreen); + QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHintWasFullscreen); QString strHintSent = machine.GetExtraData(strKey); if (!strHintSent.isEmpty()) @@ -270,5 +269,5 @@ availableGeo = dwt->availableGeometry(pTopLevelWidget->pos()); - frameGeo = VBoxGlobal::normalizeGeometry(frameGeo, availableGeo, vboxGlobal().vmRenderMode() != VBoxDefs::SDLMode /* can resize? */); + frameGeo = VBoxGlobal::normalizeGeometry(frameGeo, availableGeo, vboxGlobal().vmRenderMode() != SDLMode /* can resize? */); } @@ -314,5 +313,5 @@ * We need to do that because we cannot correctly draw in a scrolled window in SDL mode. * In all other modes, or when auto-resize is in force, this function does nothing. */ - if (vboxGlobal().vmRenderMode() == VBoxDefs::SDLMode) + if (vboxGlobal().vmRenderMode() == SDLMode) { if (!uisession()->isGuestSupportsGraphics() || !m_bIsGuestAutoresizeEnabled) Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 41689) @@ -338,6 +338,6 @@ { /* Load window position settings: */ - QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastNormalWindowPosition) : - QString("%1%2").arg(VBoxDefs::GUI_LastNormalWindowPosition).arg(m_uScreenId); + QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastNormalWindowPosition) : + QString("%1%2").arg(GUI_LastNormalWindowPosition).arg(m_uScreenId); QStringList strPositionSettings = m.GetExtraDataStringList(strPositionAddress); bool ok = !strPositionSettings.isEmpty(), max = false; @@ -356,5 +356,5 @@ else ok = false; if (ok && strPositionSettings.size() > 4) - max = strPositionSettings[4] == VBoxDefs::GUI_LastWindowState_Max; + max = strPositionSettings[4] == GUI_LastWindowState_Max; QRect ar = ok ? QApplication::desktop()->availableGeometry(QPoint(x, y)) : QApplication::desktop()->availableGeometry(this); @@ -439,7 +439,7 @@ .arg(m_normalGeometry.width()).arg(m_normalGeometry.height()); if (isMaximizedChecked()) - strWindowPosition += QString(",%1").arg(VBoxDefs::GUI_LastWindowState_Max); - QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastNormalWindowPosition) : - QString("%1%2").arg(VBoxDefs::GUI_LastNormalWindowPosition).arg(m_uScreenId); + strWindowPosition += QString(",%1").arg(GUI_LastWindowState_Max); + QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastNormalWindowPosition) : + QString("%1%2").arg(GUI_LastNormalWindowPosition).arg(m_uScreenId); m.SetExtraData(strPositionAddress, strWindowPosition); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp (revision 41689) @@ -161,5 +161,5 @@ switch (pEvent->type()) { - case VBoxDefs::ResizeEventType: + case ResizeEventType: { /* Some situations require framebuffer resize events to be ignored at all, @@ -192,5 +192,5 @@ } - case VBoxDefs::RepaintEventType: + case RepaintEventType: { UIRepaintEvent *pPaintEvent = static_cast(pEvent); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp (revision 41689) @@ -29,4 +29,5 @@ /* GUI includes: */ +#include "UIDefs.h" #include "UISession.h" #include "UIMachineLogic.h" @@ -110,6 +111,6 @@ /* Load extra-data settings: */ { - QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastScaleWindowPosition) : - QString("%1%2").arg(VBoxDefs::GUI_LastScaleWindowPosition).arg(m_uScreenId); + QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastScaleWindowPosition) : + QString("%1%2").arg(GUI_LastScaleWindowPosition).arg(m_uScreenId); QStringList strPositionSettings = m.GetExtraDataStringList(strPositionAddress); @@ -130,5 +131,5 @@ else ok = false; if (ok && strPositionSettings.size() > 4) - max = strPositionSettings[4] == VBoxDefs::GUI_LastWindowState_Max; + max = strPositionSettings[4] == GUI_LastWindowState_Max; QRect ar = ok ? QApplication::desktop()->availableGeometry(QPoint(x, y)) : @@ -169,7 +170,7 @@ .arg(m_normalGeometry.width()).arg(m_normalGeometry.height()); if (isMaximizedChecked()) - strWindowPosition += QString(",%1").arg(VBoxDefs::GUI_LastWindowState_Max); - QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastScaleWindowPosition) : - QString("%1%2").arg(VBoxDefs::GUI_LastScaleWindowPosition).arg(m_uScreenId); + strWindowPosition += QString(",%1").arg(GUI_LastWindowState_Max); + QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastScaleWindowPosition) : + QString("%1%2").arg(GUI_LastScaleWindowPosition).arg(m_uScreenId); m.SetExtraData(strPositionAddress, strWindowPosition); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp (revision 41689) @@ -101,5 +101,5 @@ switch (pEvent->type()) { - case VBoxDefs::SetRegionEventType: + case SetRegionEventType: { /* Get region-update event: */ @@ -115,5 +115,5 @@ } - case VBoxDefs::ResizeEventType: + case ResizeEventType: { return guestResizeEvent(pEvent, true); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp (revision 41689) @@ -143,12 +143,12 @@ /* Make sure mini-toolbar is necessary: */ - bool fIsActive = m.GetExtraData(VBoxDefs::GUI_ShowMiniToolBar) != "no"; + bool fIsActive = m.GetExtraData(GUI_ShowMiniToolBar) != "no"; if (!fIsActive) return; /* Get the mini-toolbar alignment: */ - bool fIsAtTop = m.GetExtraData(VBoxDefs::GUI_MiniToolBarAlignment) == "top"; + bool fIsAtTop = m.GetExtraData(GUI_MiniToolBarAlignment) == "top"; /* Get the mini-toolbar auto-hide feature availability: */ - bool fIsAutoHide = m.GetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide) != "off"; + bool fIsAutoHide = m.GetExtraData(GUI_MiniToolBarAutoHide) != "off"; m_pMiniToolBar = new VBoxMiniToolBar(centralWidget(), fIsAtTop ? VBoxMiniToolBar::AlignTop : VBoxMiniToolBar::AlignBottom, @@ -192,5 +192,5 @@ /* Save mini-toolbar settings: */ - machine().SetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide, m_pMiniToolBar->isAutoHide() ? QString() : "off"); + machine().SetExtraData(GUI_MiniToolBarAutoHide, m_pMiniToolBar->isAutoHide() ? QString() : "off"); /* Delete mini-toolbar: */ delete m_pMiniToolBar; @@ -348,5 +348,5 @@ #elif defined (Q_WS_MAC) # if defined (VBOX_GUI_USE_QUARTZ2D) - if (vboxGlobal().vmRenderMode() == VBoxDefs::Quartz2DMode) + if (vboxGlobal().vmRenderMode() == Quartz2DMode) { /* If we are using the Quartz2D backend we have to trigger Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp (revision 41689) @@ -57,5 +57,5 @@ m_Shortcuts[AboutShortcut] = UIKeySequence("About"); /* Get a list of overwritten keys */ - loadExtraData(VBoxDefs::GUI_Input_SelectorShortcuts, EndShortcutType); + loadExtraData(GUI_Input_SelectorShortcuts, EndShortcutType); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 41689) @@ -146,6 +146,6 @@ /* Load toolbar/statusbar availability settings: */ CVirtualBox vbox = vboxGlobal().virtualBox(); - QString strToolbar = vbox.GetExtraData(VBoxDefs::GUI_Toolbar); - QString strStatusbar = vbox.GetExtraData(VBoxDefs::GUI_Statusbar); + QString strToolbar = vbox.GetExtraData(GUI_Toolbar); + QString strStatusbar = vbox.GetExtraData(GUI_Statusbar); bool fToolbar = strToolbar.isEmpty() || strToolbar == "true"; bool fStatusbar = strStatusbar.isEmpty() || strStatusbar == "true"; @@ -176,5 +176,5 @@ m_pBar->show(); #endif /* !Q_WS_MAC */ - vbox.SetExtraData(VBoxDefs::GUI_Toolbar, "true"); + vbox.SetExtraData(GUI_Toolbar, "true"); } else @@ -185,5 +185,5 @@ m_pBar->hide(); #endif /* !Q_WS_MAC */ - vbox.SetExtraData(VBoxDefs::GUI_Toolbar, "false"); + vbox.SetExtraData(GUI_Toolbar, "false"); } } @@ -193,10 +193,10 @@ { statusBar()->show(); - vbox.SetExtraData(VBoxDefs::GUI_Statusbar, "true"); + vbox.SetExtraData(GUI_Statusbar, "true"); } else { statusBar()->hide(); - vbox.SetExtraData(VBoxDefs::GUI_Statusbar, "false"); + vbox.SetExtraData(GUI_Statusbar, "false"); } } @@ -291,6 +291,6 @@ QString strTitle = tr("Select a virtual machine file"); QStringList extensions; - for (int i = 0; i < VBoxDefs::VBoxFileExts.size(); ++i) - extensions << QString("*.%1").arg(VBoxDefs::VBoxFileExts[i]); + for (int i = 0; i < VBoxFileExts.size(); ++i) + extensions << QString("*.%1").arg(VBoxFileExts[i]); QString strFilter = tr("Virtual machine files (%1)").arg(extensions.join(" ")); /* Create open file dialog: */ @@ -792,5 +792,5 @@ m_pVMModel->addItem(*m); /* Apply the saved sort order. */ - m_pVMModel->sortByIdList(vbox.GetExtraDataStringList(VBoxDefs::GUI_SelectorVMPositions)); + m_pVMModel->sortByIdList(vbox.GetExtraDataStringList(GUI_SelectorVMPositions)); /* Update details page. */ sltCurrentVMItemChanged(); @@ -962,5 +962,5 @@ if (!strFile.isEmpty() && QFile::exists(strFile)) { - if (VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::VBoxFileExts)) + if (VBoxGlobal::hasAllowedExtension(strFile, VBoxFileExts)) { /* VBox config files. */ @@ -977,5 +977,5 @@ sltShowAddMachineDialog(strFile); } - else if (VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::OVFFileExts)) + else if (VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts)) { /* OVF/OVA. Only one file at the time. */ @@ -983,5 +983,5 @@ break; } - else if (VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::VBoxExtPackFileExts)) + else if (VBoxGlobal::hasAllowedExtension(strFile, VBoxExtPackFileExts)) { UIGlobalSettingsExtension::doInstallation(strFile, QString(), this, NULL); @@ -1263,5 +1263,5 @@ /* We have to invert the isVisible check one time, cause this event * is sent *before* the real toggle is done. Really intuitive Trolls. */ - vbox.SetExtraData(VBoxDefs::GUI_Toolbar, !::darwinIsToolbarVisible(mVMToolBar) ? "true" : "false"); + vbox.SetExtraData(GUI_Toolbar, !::darwinIsToolbarVisible(mVMToolBar) ? "true" : "false"); break; } @@ -1684,5 +1684,5 @@ /* Restore window position: */ { - QString strWinPos = vbox.GetExtraData(VBoxDefs::GUI_LastWindowPosition); + QString strWinPos = vbox.GetExtraData(GUI_LastSelectorWindowPosition); bool ok = false, max = false; @@ -1696,5 +1696,5 @@ h = strWinPos.section(',', 3, 3).toInt(&ok); if (ok) - max = strWinPos.section(',', 4, 4) == VBoxDefs::GUI_LastWindowState_Max; + max = strWinPos.section(',', 4, 4) == GUI_LastWindowState_Max; QRect ar = ok ? QApplication::desktop()->availableGeometry(QPoint(x, y)) : @@ -1727,5 +1727,5 @@ /* Restore selected VM(s): */ { - QString strPrevVMId = vbox.GetExtraData(VBoxDefs::GUI_LastVMSelected); + QString strPrevVMId = vbox.GetExtraData(GUI_LastVMSelected); m_pVMListView->selectItemById(strPrevVMId); @@ -1734,5 +1734,5 @@ /* Restore splitter handle position: */ { - QList sizes = vbox.GetExtraDataIntList(VBoxDefs::GUI_SplitterSizes); + QList sizes = vbox.GetExtraDataIntList(GUI_SplitterSizes); if (sizes.size() == 2) @@ -1742,6 +1742,6 @@ /* Restore toolbar and statusbar visibility: */ { - QString strToolbar = vbox.GetExtraData(VBoxDefs::GUI_Toolbar); - QString strStatusbar = vbox.GetExtraData(VBoxDefs::GUI_Statusbar); + QString strToolbar = vbox.GetExtraData(GUI_Toolbar); + QString strStatusbar = vbox.GetExtraData(GUI_Statusbar); #ifdef Q_WS_MAC @@ -1775,7 +1775,7 @@ if (isMaximized()) #endif /* !Q_WS_MAC */ - strWinPos += QString(",%1").arg(VBoxDefs::GUI_LastWindowState_Max); - - vbox.SetExtraData(VBoxDefs::GUI_LastWindowPosition, strWinPos); + strWinPos += QString(",%1").arg(GUI_LastWindowState_Max); + + vbox.SetExtraData(GUI_LastSelectorWindowPosition, strWinPos); } @@ -1784,11 +1784,11 @@ UIVMItem *pItem = m_pVMListView->currentItem(); QString strCurrentVMId = pItem ? QString(pItem->id()) : QString(); - vbox.SetExtraData(VBoxDefs::GUI_LastVMSelected, strCurrentVMId); - vbox.SetExtraDataStringList(VBoxDefs::GUI_SelectorVMPositions, m_pVMModel->idList()); + vbox.SetExtraData(GUI_LastVMSelected, strCurrentVMId); + vbox.SetExtraDataStringList(GUI_SelectorVMPositions, m_pVMModel->idList()); } /* Save splitter handle position: */ { - vbox.SetExtraDataIntList(VBoxDefs::GUI_SplitterSizes, m_pSplitter->sizes()); + vbox.SetExtraDataIntList(GUI_SplitterSizes, m_pSplitter->sizes()); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp (revision 41689) @@ -1654,5 +1654,5 @@ /* Load section configuration from extra data: */ - QStringList values = vboxGlobal().virtualBox().GetExtraDataStringList(VBoxDefs::GUI_DetailsPageBoxes, + QStringList values = vboxGlobal().virtualBox().GetExtraDataStringList(GUI_DetailsPageBoxes, /* Default keys: */ QStringList() @@ -1716,5 +1716,5 @@ } /* Save section configuration to extra data: */ - vboxGlobal().virtualBox().SetExtraDataStringList(VBoxDefs::GUI_DetailsPageBoxes, m_sectionSettings.values()); + vboxGlobal().virtualBox().SetExtraDataStringList(GUI_DetailsPageBoxes, m_sectionSettings.values()); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp (revision 41689) @@ -264,5 +264,5 @@ * UIMessageCenter::confirm_machineDeletion() */ QFileInfo fi(m_strSettingsFile); - QString name = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxDefs::VBoxFileExts) ? + QString name = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxFileExts) ? fi.completeBaseName() : fi.fileName(); needsResort = name != m_strName; Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp (revision 41689) @@ -517,5 +517,5 @@ QList list = pEvent->mimeData()->urls(); QString file = list.at(0).toLocalFile(); - if (VBoxGlobal::hasAllowedExtension(file, VBoxDefs::VBoxFileExts)) + if (VBoxGlobal::hasAllowedExtension(file, VBoxFileExts)) { Qt::DropAction action = Qt::IgnoreAction; @@ -529,10 +529,10 @@ pEvent->accept(); } - }else if ( VBoxGlobal::hasAllowedExtension(file, VBoxDefs::OVFFileExts) + }else if ( VBoxGlobal::hasAllowedExtension(file, OVFFileExts) && pEvent->possibleActions().testFlag(Qt::CopyAction)) { pEvent->setDropAction(Qt::CopyAction); pEvent->accept(); - }else if ( VBoxGlobal::hasAllowedExtension(file, VBoxDefs::VBoxExtPackFileExts) + }else if ( VBoxGlobal::hasAllowedExtension(file, VBoxExtPackFileExts) && pEvent->possibleActions().testFlag(Qt::CopyAction)) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp (revision 41689) @@ -82,5 +82,5 @@ /* Load preview update interval: */ - QString strInterval = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_PreviewUpdate); + QString strInterval = vboxGlobal().virtualBox().GetExtraData(GUI_PreviewUpdate); /* Parse loaded value: */ UpdateInterval interval = m_intervals.key(strInterval, UpdateInterval_1000ms); @@ -375,5 +375,5 @@ } if (fSave && m_intervals.contains(interval)) - vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_PreviewUpdate, m_intervals[interval]); + vboxGlobal().virtualBox().SetExtraData(GUI_PreviewUpdate, m_intervals[interval]); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.cpp (revision 41689) @@ -87,6 +87,5 @@ if (mActive) { - vboxGlobal().virtualBox().SetExtraData (VBoxDefs::GUI_TrayIconWinID, - QString::null); + vboxGlobal().virtualBox().SetExtraData(GUI_TrayIconWinID, QString::null); hide(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp (revision 41689) @@ -845,5 +845,5 @@ * the boot order or disk configuration were changed: */ if (m_fResetFirstRunFlag) - m_machine.SetExtraData(VBoxDefs::GUI_FirstRun, QString::null); + m_machine.SetExtraData(GUI_FirstRun, QString::null); /* Save settings finally: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (revision 41689) @@ -334,6 +334,6 @@ QString strTitle = tr("Select an extension package file"); QStringList extensions; - for (int i = 0; i < VBoxDefs::VBoxExtPackFileExts.size(); ++i) - extensions << QString("*.%1").arg(VBoxDefs::VBoxExtPackFileExts[i]); + for (int i = 0; i < VBoxExtPackFileExts.size(); ++i) + extensions << QString("*.%1").arg(VBoxExtPackFileExts[i]); QString strFilter = tr("Extension package files (%1)").arg(extensions.join(" ")); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp (revision 41689) @@ -49,5 +49,5 @@ /* Fill internal variables with corresponding values: */ - VBoxUpdateData updateData(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_UpdateDate)); + VBoxUpdateData updateData(vboxGlobal().virtualBox().GetExtraData(GUI_UpdateDate)); m_cache.m_fCheckEnabled = !updateData.isNoNeedToCheck(); m_cache.m_periodIndex = updateData.periodIndex(); @@ -103,5 +103,5 @@ /* Gather corresponding values from internal variables: */ VBoxUpdateData newData(m_cache.m_periodIndex, m_cache.m_branchIndex); - vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_UpdateDate, newData.data()); + vboxGlobal().virtualBox().SetExtraData(GUI_UpdateDate, newData.data()); /* Upload properties & settings to data: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (revision 41689) @@ -350,5 +350,5 @@ "the minimum amount required to switch the virtual machine to " "fullscreen or seamless mode.") - .arg(vboxGlobal().formatSize(uNeedBytes, 0, VBoxDefs::FormatSize_RoundUp)); + .arg(vboxGlobal().formatSize(uNeedBytes, 0, FormatSize_RoundUp)); return true; } @@ -362,5 +362,5 @@ strWarning = tr("you have assigned less than %1 of video memory which is " "the minimum amount required for HD Video to be played efficiently.") - .arg(vboxGlobal().formatSize(uNeedBytes, 0, VBoxDefs::FormatSize_RoundUp)); + .arg(vboxGlobal().formatSize(uNeedBytes, 0, FormatSize_RoundUp)); return true; } @@ -379,5 +379,5 @@ strWarning = tr("you have 3D Acceleration enabled for a operation system which uses the WDDM video driver. " "For maximal performance set the guest VRAM to at least %1.") - .arg(vboxGlobal().formatSize(uNeedBytes, 0, VBoxDefs::FormatSize_RoundUp)); + .arg(vboxGlobal().formatSize(uNeedBytes, 0, FormatSize_RoundUp)); return true; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp (revision 41689) @@ -90,9 +90,9 @@ generalData.m_strName = m_machine.GetName(); generalData.m_strGuestOsTypeId = m_machine.GetOSTypeId(); - QString strSaveMountedAtRuntime = m_machine.GetExtraData(VBoxDefs::GUI_SaveMountedAtRuntime); + QString strSaveMountedAtRuntime = m_machine.GetExtraData(GUI_SaveMountedAtRuntime); generalData.m_fSaveMountedAtRuntime = strSaveMountedAtRuntime != "no"; - QString strShowMiniToolBar = m_machine.GetExtraData(VBoxDefs::GUI_ShowMiniToolBar); + QString strShowMiniToolBar = m_machine.GetExtraData(GUI_ShowMiniToolBar); generalData.m_fShowMiniToolBar = strShowMiniToolBar != "no"; - QString strMiniToolBarAlignment = m_machine.GetExtraData(VBoxDefs::GUI_MiniToolBarAlignment); + QString strMiniToolBarAlignment = m_machine.GetExtraData(GUI_MiniToolBarAlignment); generalData.m_fMiniToolBarAtTop = strMiniToolBarAlignment == "top"; generalData.m_strSnapshotsFolder = m_machine.GetSnapshotFolder(); @@ -174,7 +174,7 @@ /* Advanced tab: */ m_machine.SetClipboardMode(generalData.m_clipboardMode); - m_machine.SetExtraData(VBoxDefs::GUI_SaveMountedAtRuntime, generalData.m_fSaveMountedAtRuntime ? "yes" : "no"); - m_machine.SetExtraData(VBoxDefs::GUI_ShowMiniToolBar, generalData.m_fShowMiniToolBar ? "yes" : "no"); - m_machine.SetExtraData(VBoxDefs::GUI_MiniToolBarAlignment, generalData.m_fMiniToolBarAtTop ? "top" : "bottom"); + m_machine.SetExtraData(GUI_SaveMountedAtRuntime, generalData.m_fSaveMountedAtRuntime ? "yes" : "no"); + m_machine.SetExtraData(GUI_ShowMiniToolBar, generalData.m_fShowMiniToolBar ? "yes" : "no"); + m_machine.SetExtraData(GUI_MiniToolBarAlignment, generalData.m_fMiniToolBarAtTop ? "top" : "bottom"); /* Description tab: */ m_machine.SetDescription(generalData.m_strDescription); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (revision 41689) @@ -3171,11 +3171,11 @@ { case UIMediumType_HardDisk: - strRecentMediumAddress = VBoxDefs::GUI_RecentListHD; + strRecentMediumAddress = GUI_RecentListHD; break; case UIMediumType_DVD: - strRecentMediumAddress = VBoxDefs::GUI_RecentListCD; + strRecentMediumAddress = GUI_RecentListCD; break; case UIMediumType_Floppy: - strRecentMediumAddress = VBoxDefs::GUI_RecentListFD; + strRecentMediumAddress = GUI_RecentListFD; break; default: Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp (revision 41689) @@ -31,5 +31,4 @@ #include "UIMachineSettingsUSB.h" #include "UIMachineSettingsUSBFilterDetails.h" -#include "VBoxDefs.h" #include "COMEnumsWrapper.h" @@ -43,7 +42,4 @@ #include "CExtPackManager.h" #include "CExtPack.h" - -/* Using declarations: */ -using namespace VBoxGlobalDefs; /** @@ -420,5 +416,5 @@ usbData.m_fUSBEnabled = mGbUSB->isChecked(); /* USB 2.0 (EHCI): */ - CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(UI_ExtPackName); + CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName); usbData.m_fEHCIEnabled = extPack.isNull() || !extPack.GetUsable() ? false : mCbUSB2->isChecked(); @@ -579,5 +575,5 @@ NOREF(strWarningText); #ifdef VBOX_WITH_EXTPACK - CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(UI_ExtPackName); + CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName); if (mGbUSB->isChecked() && mCbUSB2->isChecked() && (extPack.isNull() || !extPack.GetUsable())) { @@ -587,6 +583,6 @@ "After this you will be able to re-enable USB 2.0. " "It will be disabled in the meantime unless you cancel the current settings changes.") - .arg(UI_ExtPackName); - msgCenter().remindAboutUnsupportedUSB2(UI_ExtPackName, this); + .arg(GUI_ExtPackName); + msgCenter().remindAboutUnsupportedUSB2(GUI_ExtPackName, this); return true; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp (revision 41689) @@ -20,5 +20,4 @@ /* Local includes */ #include "UIHotKeyEditor.h" -#include "VBoxDefs.h" #include "VBoxGlobal.h" Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp (revision 41689) @@ -62,5 +62,5 @@ QString strWizardName = nameForType(m_type); /* Load mode settings: */ - QStringList wizards = vboxGlobal().virtualBox().GetExtraDataStringList(VBoxDefs::GUI_HideDescriptionForWizards); + QStringList wizards = vboxGlobal().virtualBox().GetExtraDataStringList(GUI_HideDescriptionForWizards); /* Switch mode: */ @@ -89,5 +89,5 @@ /* Save mode settings: */ - vboxGlobal().virtualBox().SetExtraDataStringList(VBoxDefs::GUI_HideDescriptionForWizards, wizards); + vboxGlobal().virtualBox().SetExtraDataStringList(GUI_HideDescriptionForWizards, wizards); /* Prepare: */ @@ -551,5 +551,5 @@ return UIWizardMode_Basic; /* Get mode from extra-data: */ - QStringList wizards = vboxGlobal().virtualBox().GetExtraDataStringList(VBoxDefs::GUI_HideDescriptionForWizards); + QStringList wizards = vboxGlobal().virtualBox().GetExtraDataStringList(GUI_HideDescriptionForWizards); if (wizards.contains(nameForType(type))) return UIWizardMode_Expert; Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 41689) @@ -124,8 +124,8 @@ /* Save attributes to GUI extra data: */ StorageType storageType = field("storageType").value(); - vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_Export_StorageType, QString::number(storageType)); - vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_Export_Username, m_pLeUsername->text()); - vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_Export_Hostname, m_pLeHostname->text()); - vboxGlobal().virtualBox().SetExtraData(VBoxDefs::GUI_Export_Bucket, m_pLeBucket->text()); + vboxGlobal().virtualBox().SetExtraData(GUI_Export_StorageType, QString::number(storageType)); + vboxGlobal().virtualBox().SetExtraData(GUI_Export_Username, m_pLeUsername->text()); + vboxGlobal().virtualBox().SetExtraData(GUI_Export_Hostname, m_pLeHostname->text()); + vboxGlobal().virtualBox().SetExtraData(GUI_Export_Bucket, m_pLeBucket->text()); #endif return true; Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp (revision 41689) @@ -59,5 +59,5 @@ QString settingsFile = machine.GetSettingsFilePath(); QFileInfo fi(settingsFile); - strName = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxDefs::VBoxFileExts) ? fi.completeBaseName() : fi.fileName(); + strName = VBoxGlobal::hasAllowedExtension(fi.completeSuffix(), VBoxFileExts) ? fi.completeBaseName() : fi.fileName(); pixIcon = QPixmap(":/os_other.png").scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (revision 41689) @@ -38,5 +38,5 @@ /* Load storage-type from GUI extra data: */ bool ok; - StorageType storageType = StorageType(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_Export_StorageType).toInt(&ok)); + StorageType storageType = StorageType(vboxGlobal().virtualBox().GetExtraData(GUI_Export_StorageType).toInt(&ok)); if (ok) setStorageType(storageType); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (revision 41689) @@ -42,7 +42,7 @@ /* Select default settings: */ #if 0 - m_pUsernameEditor->setText(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_Export_Username)); - m_pHostnameEditor->setText(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_Export_Hostname)); - m_pBucketEditor->setText(vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_Export_Bucket)); + m_pUsernameEditor->setText(vboxGlobal().virtualBox().GetExtraData(GUI_Export_Username)); + m_pHostnameEditor->setText(vboxGlobal().virtualBox().GetExtraData(GUI_Export_Hostname)); + m_pBucketEditor->setText(vboxGlobal().virtualBox().GetExtraData(GUI_Export_Bucket)); #else /* Do nothing for now... */ @@ -307,5 +307,5 @@ { const QString &strFile = m_pFileSelector->path().toLower(); - fResult = VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::OVFFileExts); + fResult = VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts); if (fResult) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp (revision 41689) @@ -232,5 +232,5 @@ { const QString &strFile = m_pFileSelector->path().toLower(); - fResult = VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::OVFFileExts); + fResult = VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts); if (fResult) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp (revision 41689) @@ -77,5 +77,5 @@ { /* Make sure appliance file has allowed extension and exists: */ - return VBoxGlobal::hasAllowedExtension(m_pFileSelector->path().toLower(), VBoxDefs::OVFFileExts) && + return VBoxGlobal::hasAllowedExtension(m_pFileSelector->path().toLower(), OVFFileExts) && QFileInfo(m_pFileSelector->path()).exists(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp (revision 41689) @@ -92,5 +92,5 @@ { /* Make sure appliance file has allowed extension and exists and appliance widget is valid: */ - return VBoxGlobal::hasAllowedExtension(m_pFileSelector->path().toLower(), VBoxDefs::OVFFileExts) && + return VBoxGlobal::hasAllowedExtension(m_pFileSelector->path().toLower(), OVFFileExts) && QFileInfo(m_pFileSelector->path()).exists() && m_pApplianceWidget->isValid(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (revision 41689) @@ -24,5 +24,4 @@ #include "UIWizardNewVMPageBasic3.h" #include "UIWizardNewVMPageExpert.h" -#include "VBoxDefs.h" #include "VBoxGlobal.h" #include "UIMessageCenter.h" @@ -33,7 +32,4 @@ #include "CExtPackManager.h" #include "CStorageController.h" - -/* Using declarations: */ -using namespace VBoxGlobalDefs; UIWizardNewVM::UIWizardNewVM(QWidget *pParent) @@ -76,5 +72,5 @@ * Selecting an existing virtual hard drive will cancel the FirstRun wizard. */ if (field("virtualDiskId").toString().isNull() || !field("virtualDisk").value().isNull()) - m_machine.SetExtraData(VBoxDefs::GUI_FirstRun, "yes"); + m_machine.SetExtraData(GUI_FirstRun, "yes"); } @@ -104,5 +100,5 @@ * introduced by the new distribution model. */ CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager(); - if (manager.IsExtPackUsable(UI_ExtPackName)) + if (manager.IsExtPackUsable(GUI_ExtPackName)) usbController.SetEnabledEhci(true); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp (revision 41688) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp (revision 41689) @@ -27,5 +27,4 @@ #include "UIWizardNewVMPageBasic3.h" #include "UIWizardNewVM.h" -#include "VBoxDefs.h" #include "UIMessageCenter.h" #include "UIIconPool.h"