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

Timestamp:

Jun 26, 2013 10:49:56 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Moving runtime-menu-type enum to global UI defs scope.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDefs.h (modified) (1 diff)
• runtime/UIMachineDefs.h (modified) (1 diff)
• runtime/UIMachineMenuBar.cpp (modified) (8 diffs)
• runtime/UIMachineMenuBar.h (modified) (2 diffs)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (2 diffs)

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

@@ -227 +227 @@
 Q_DECLARE_METATYPE(StorageSlot);
 
+/* Runtime UI menu types: */
+enum RuntimeMenuType
+{
+    RuntimeMenuType_Invalid = 0,
+    RuntimeMenuType_Machine = RT_BIT(0),
+    RuntimeMenuType_View    = RT_BIT(1),
+    RuntimeMenuType_Devices = RT_BIT(2),
+    RuntimeMenuType_Debug   = RT_BIT(3),
+    RuntimeMenuType_Help    = RT_BIT(4),
+    RuntimeMenuType_All     = 0xFF
+};
+
 /* Details element type: */
 enum DetailsElementType

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

@@ -66 +66 @@
 };
 
-/* Main menu enum: */
-enum UIMainMenuType
-{
-    UIMainMenuType_Machine = RT_BIT(0),
-    UIMainMenuType_Devices = RT_BIT(1),
-    UIMainMenuType_View    = RT_BIT(2),
-    UIMainMenuType_Debug   = RT_BIT(3),
-    UIMainMenuType_Help    = RT_BIT(4),
-    UIMainMenuType_All     = 0xFF
-};
-
 #endif // __UIMachineDefs_h__
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp

@@ -107 +107 @@
 }
 
-QMenu* UIMachineMenuBar::createMenu(UIMainMenuType fOptions /* = UIMainMenuType_All */)
+QMenu* UIMachineMenuBar::createMenu(RuntimeMenuType fOptions /* = RuntimeMenuType_All */)
 {
     /* Create empty menu: */
@@ -120 +120 @@
 }
 
-QMenuBar* UIMachineMenuBar::createMenuBar(UIMainMenuType fOptions /* = UIMainMenuType_All */)
+QMenuBar* UIMachineMenuBar::createMenuBar(RuntimeMenuType fOptions /* = RuntimeMenuType_All */)
 {
     /* Create empty menubar: */
@@ -133 +133 @@
 }
 
-QList<QMenu*> UIMachineMenuBar::prepareSubMenus(UIMainMenuType fOptions /* = UIMainMenuType_All */)
+QList<QMenu*> UIMachineMenuBar::prepareSubMenus(RuntimeMenuType fOptions /* = RuntimeMenuType_All */)
 {
     /* Create empty submenu list: */
@@ -139 +139 @@
 
     /* Machine submenu: */
-    if (fOptions & UIMainMenuType_Machine)
+    if (fOptions & RuntimeMenuType_Machine)
     {
         QMenu *pMenuMachine = gActionPool->action(UIActionIndexRuntime_Menu_Machine)->menu();
@@ -147 +147 @@
 
     /* View submenu: */
-    if (fOptions & UIMainMenuType_View)
+    if (fOptions & RuntimeMenuType_View)
     {
         QMenu *pMenuView = gActionPool->action(UIActionIndexRuntime_Menu_View)->menu();
@@ -155 +155 @@
 
     /* Devices submenu: */
-    if (fOptions & UIMainMenuType_Devices)
+    if (fOptions & RuntimeMenuType_Devices)
     {
         QMenu *pMenuDevices = gActionPool->action(UIActionIndexRuntime_Menu_Devices)->menu();
@@ -164 +164 @@
 #ifdef VBOX_WITH_DEBUGGER_GUI
     /* Debug submenu: */
-    if (fOptions & UIMainMenuType_Debug)
+    if (fOptions & RuntimeMenuType_Debug)
     {
         CMachine machine; /** @todo we should try get the machine here. But we'll
@@ -178 +178 @@
 
     /* Help submenu: */
-    if (fOptions & UIMainMenuType_Help)
+    if (fOptions & RuntimeMenuType_Help)
     {
         QMenu *pMenuHelp = gActionPool->action(UIActionIndex_Menu_Help)->menu();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.h

@@ -21 +21 @@
 
 /* Local includes */
-#include "UIMachineDefs.h"
+#include "UIDefs.h"
 
 /* Global includes */
@@ -40 +40 @@
     UIMachineMenuBar(const CMachine &machine);
 
-    QMenu* createMenu(UIMainMenuType fOptions = UIMainMenuType_All);
-    QMenuBar* createMenuBar(UIMainMenuType fOptions = UIMainMenuType_All);
+    QMenu* createMenu(RuntimeMenuType fOptions = RuntimeMenuType_All);
+    QMenuBar* createMenuBar(RuntimeMenuType fOptions = RuntimeMenuType_All);
 
 protected:
 
-    QList<QMenu*> prepareSubMenus(UIMainMenuType fOptions = UIMainMenuType_All);
+    QList<QMenu*> prepareSubMenus(RuntimeMenuType fOptions = RuntimeMenuType_All);
     void prepareMenuMachine(QMenu *pMenu);
     void prepareMenuView(QMenu *pMenu);

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

@@ -430 +430 @@
 }
 
-QMenu* UISession::newMenu(UIMainMenuType fOptions /* = UIMainMenuType_ALL */)
+QMenu* UISession::newMenu(RuntimeMenuType fOptions /* = RuntimeMenuType_ALL */)
 {
     /* Create new menu: */
@@ -442 +442 @@
 }
 
-QMenuBar* UISession::newMenuBar(UIMainMenuType fOptions /* = UIMainMenuType_ALL */)
+QMenuBar* UISession::newMenuBar(RuntimeMenuType fOptions /* = RuntimeMenuType_ALL */)
 {
     /* Create new menubar: */

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

@@ -26 +26 @@
 
 /* GUI includes: */
-#include "UIMachineDefs.h"
+#include "UIDefs.h"
 
 /* COM includes: */
@@ -99 +99 @@
     UIMachineLogic* machineLogic() const;
     QWidget* mainMachineWindow() const;
-    QMenu* newMenu(UIMainMenuType fOptions = UIMainMenuType_All);
-    QMenuBar* newMenuBar(UIMainMenuType fOptions = UIMainMenuType_All);
+    QMenu* newMenu(RuntimeMenuType fOptions = RuntimeMenuType_All);
+    QMenuBar* newMenuBar(RuntimeMenuType fOptions = RuntimeMenuType_All);
     QCursor cursor() const { return m_cursor; }