Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp (revision 41694) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp (revision 41695) @@ -1,22 +1,25 @@ /* $Id$ */ -/// @file -/// -/// VBox frontends: Qt GUI ("VirtualBox"): -/// Global definitions and function implementations +/** @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. +/* + * 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: +/* GUI includes: */ #include "UIDefs.h" -// Global definitions: +/* Global definitions: */ const char* UIDefs::GUI_RenderMode = "GUI/RenderMode"; const char* UIDefs::GUI_LanguageId = "GUI/LanguageID"; @@ -30,5 +33,5 @@ const char* UIDefs::GUI_RecentListFD = "GUI/RecentListFD"; -// Selector-window definitions: +/* Selector-window definitions: */ const char* UIDefs::GUI_Input_SelectorShortcuts = "GUI/Input/SelectorShortcuts"; const char* UIDefs::GUI_LastSelectorWindowPosition = "GUI/LastWindowPosition"; @@ -41,5 +44,5 @@ const char* UIDefs::GUI_LastVMSelected = "GUI/LastVMSelected"; -// Machine-window definitions: +/* Machine-window definitions: */ const char* UIDefs::GUI_Input_MachineShortcuts = "GUI/Input/MachineShortcuts"; const char* UIDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition"; @@ -56,15 +59,15 @@ const char* UIDefs::GUI_PassCAD = "GUI/PassCAD"; -// Mini tool-bar definitions: +/* 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: +/* Close-dialog definitions: */ const char* UIDefs::GUI_RestrictedCloseActions = "GUI/RestrictedCloseActions"; const char* UIDefs::GUI_LastCloseAction = "GUI/LastCloseAction"; const char* UIDefs::GUI_CloseActionHook = "GUI/CloseActionHook"; -// Wizards declarations: +/* Wizards definitions: */ const char* UIDefs::GUI_FirstRun = "GUI/FirstRun"; const char* UIDefs::GUI_HideDescriptionForWizards = "GUI/HideDescriptionForWizards"; @@ -74,41 +77,39 @@ const char* UIDefs::GUI_Export_Bucket = "GUI/Export/Bucket"; -// Message-center declarations: +/* Message-center definitions: */ const char* UIDefs::GUI_SuppressMessages = "GUI/SuppressMessages"; const char* UIDefs::GUI_InvertMessageOption = "GUI/InvertMessageOption"; -// Registration dialog declarations: +/* Registration dialog definitions: */ const char* UIDefs::GUI_RegistrationDlgWinID = "GUI/RegistrationDlgWinID"; const char* UIDefs::GUI_RegistrationData = "GUI/SUNOnlineData"; -// Update manager declarations: +/* Update manager definitions: */ const char* UIDefs::GUI_UpdateDate = "GUI/UpdateDate"; const char* UIDefs::GUI_UpdateCheckCount = "GUI/UpdateCheckCount"; -// Information dialog declarations: +/* Information dialog definitions: */ const char* UIDefs::GUI_InfoDlgState = "GUI/InfoDlgState"; #ifdef VBOX_WITH_DEBUGGER_GUI +/* Debugger GUI declarations: */ const char* UIDefs::GUI_DbgEnabled = "GUI/Dbg/Enabled"; const char* UIDefs::GUI_DbgAutoShow = "GUI/Dbg/AutoShow"; -#endif // VBOX_WITH_DEBUGGER_GUI +#endif /* VBOX_WITH_DEBUGGER_GUI */ #ifdef Q_WS_X11 +/* License GUI declarations: */ 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 +#endif /* Q_WS_X11 */ #ifdef Q_WS_MAC +/* Mac dock declarations: */ 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 +#endif /* Q_WS_MAC */ #ifdef VBOX_WITH_VIDEOHWACCEL +/* Video-acceleration declarations: */ const char* UIDefs::GUI_Accelerate2D_StretchLinear = "GUI/Accelerate2D/StretchLinear"; const char* UIDefs::GUI_Accelerate2D_PixformatYV12 = "GUI/Accelerate2D/PixformatYV12"; @@ -116,6 +117,14 @@ const char* UIDefs::GUI_Accelerate2D_PixformatYUY2 = "GUI/Accelerate2D/PixformatYUY2"; const char* UIDefs::GUI_Accelerate2D_PixformatAYUV = "GUI/Accelerate2D/PixformatAYUV"; -#endif // VBOX_WITH_VIDEOHWACCEL +#endif /* VBOX_WITH_VIDEOHWACCEL */ +#ifdef VBOX_GUI_WITH_SYSTRAY +/* Tray icon declarations: */ +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 */ + +/* File extensions definitions: */ QStringList UIDefs::VBoxFileExts = QStringList() << "xml" << "vbox"; QStringList UIDefs::VBoxExtPackFileExts = QStringList() << "vbox-extpack"; Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h (revision 41694) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h (revision 41695) @@ -1,33 +1,36 @@ -/// @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. +/** @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: +/* Qt includes: */ #include #include -// Other VBox defines: +/* Other VBox defines: */ #define LOG_GROUP LOG_GROUP_GUI -// Other VBox includes: +/* Other VBox includes: */ #include #include #include -// Defines: +/* Defines: */ #define MAC_LEOPARD_STYLE defined(Q_WS_MAC) && (QT_VERSION >= 0x040300) @@ -37,17 +40,17 @@ # define AssertWrapperOkMsg(w, m) \ AssertMsg (w.isOk(), (#w ": " m " (RC=0x%08X)", w.lastRC())) -#else // !DEBUG +#else /* !DEBUG */ # define AssertWrapperOk(w) do {} while (0) # define AssertWrapperOkMsg(w, m) do {} while (0) -#endif // DEBUG +#endif /* DEBUG */ #ifndef SIZEOF_ARRAY # define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0])) -#endif // SIZEOF_ARRAY - -// Global UI namespace: +#endif /* SIZEOF_ARRAY */ + +/* Global UI namespace: */ namespace UIDefs { - // VM display rendering mode: + /* VM display rendering mode: */ enum RenderMode { @@ -60,8 +63,8 @@ #ifdef VBOX_GUI_USE_QGLFB , QGLMode -#endif // VBOX_GUI_USE_QGLFB +#endif /* VBOX_GUI_USE_QGLFB */ }; - // Additional Qt event types: + /* Additional Qt event types: */ enum UIEventType { @@ -73,16 +76,16 @@ #ifdef Q_WS_WIN , ShellExecuteEventType -#endif // Q_WS_WIN +#endif /* Q_WS_WIN */ , ActivateActionEventType #ifdef Q_WS_MAC , ShowWindowEventType -#endif // Q_WS_MAC +#endif /* Q_WS_MAC */ , AddVDMUrlsEventType #ifdef VBOX_GUI_USE_QGL , VHWACommandProcessType -#endif // VBOX_GUI_USE_QGL +#endif /* VBOX_GUI_USE_QGL */ }; - // Size formatting types: + /* Size formatting types: */ enum FormatSize { @@ -92,5 +95,5 @@ }; - // Global declarations: + /* Global declarations: */ extern const char* GUI_RenderMode; extern const char* GUI_LanguageId; @@ -104,5 +107,5 @@ extern const char* GUI_RecentListFD; - // Selector-window declarations: + /* Selector-window declarations: */ extern const char* GUI_Input_SelectorShortcuts; extern const char* GUI_LastSelectorWindowPosition; @@ -115,5 +118,5 @@ extern const char* GUI_LastVMSelected; - // Machine-window declarations: + /* Machine-window declarations: */ extern const char* GUI_Input_MachineShortcuts; extern const char* GUI_LastNormalWindowPosition; @@ -130,15 +133,15 @@ extern const char* GUI_PassCAD; - // Mini tool-bar declarations: + /* Mini tool-bar declarations: */ extern const char* GUI_ShowMiniToolBar; extern const char* GUI_MiniToolBarAlignment; extern const char* GUI_MiniToolBarAutoHide; - // Close-dialog declarations: + /* Close-dialog declarations: */ extern const char* GUI_RestrictedCloseActions; extern const char* GUI_LastCloseAction; extern const char* GUI_CloseActionHook; - // Wizards declarations: + /* Wizards declarations: */ extern const char* GUI_FirstRun; extern const char* GUI_HideDescriptionForWizards; @@ -148,35 +151,39 @@ extern const char* GUI_Export_Bucket; - // Message-center declarations: + /* Message-center declarations: */ extern const char* GUI_SuppressMessages; extern const char* GUI_InvertMessageOption; - // Registration dialog declarations: + /* Registration dialog declarations: */ extern const char* GUI_RegistrationDlgWinID; extern const char* GUI_RegistrationData; - // Update manager declarations: + /* Update manager declarations: */ extern const char* GUI_UpdateDate; extern const char* GUI_UpdateCheckCount; - // Information dialog declarations: + /* Information dialog declarations: */ extern const char* GUI_InfoDlgState; #ifdef VBOX_WITH_DEBUGGER_GUI + /* Debugger GUI declarations: */ extern const char* GUI_DbgEnabled; extern const char* GUI_DbgAutoShow; -#endif // VBOX_WITH_DEBUGGER_GUI +#endif /* VBOX_WITH_DEBUGGER_GUI */ #ifdef Q_WS_X11 + /* License GUI declarations: */ extern const char* GUI_LicenseKey; -#endif // Q_WS_X11 +#endif /* Q_WS_X11 */ #ifdef Q_WS_MAC + /* Mac dock declarations: */ extern const char* GUI_RealtimeDockIconUpdateEnabled; extern const char* GUI_RealtimeDockIconUpdateMonitor; extern const char* GUI_PresentationModeEnabled; -#endif // Q_WS_MAC +#endif /* Q_WS_MAC */ #ifdef VBOX_WITH_VIDEOHWACCEL + /* Video-acceleration declarations: */ extern const char* GUI_Accelerate2D_StretchLinear; extern const char* GUI_Accelerate2D_PixformatYV12; @@ -184,18 +191,19 @@ extern const char* GUI_Accelerate2D_PixformatYUY2; extern const char* GUI_Accelerate2D_PixformatAYUV; -#endif // VBOX_WITH_VIDEOHWACCEL +#endif /* VBOX_WITH_VIDEOHWACCEL */ #ifdef VBOX_GUI_WITH_SYSTRAY + /* Tray icon declarations: */ extern const char* GUI_TrayIconWinID; extern const char* GUI_TrayIconEnabled; extern const char* GUI_MainWindowCount; -#endif // VBOX_GUI_WITH_SYSTRAY - +#endif /* VBOX_GUI_WITH_SYSTRAY */ + + /* File extensions declarations: */ extern QStringList VBoxFileExts; extern QStringList VBoxExtPackFileExts; extern QStringList OVFFileExts; } - -using namespace UIDefs; // globally +using namespace UIDefs /* globally */; #endif // __UIDefs_h__