Changeset 52657 in vbox

Timestamp:

Sep 9, 2014 3:05:09 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95973

Message:

FE/Qt: 7462: Runtime UI: Action-pool and Menu-bar Editor: Small fixes to order and contents.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• images/keyboard_16px.png (modified) ( previous)
• src/extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• src/runtime/UIActionPoolRuntime.cpp (modified) (8 diffs)
• src/runtime/UIMenuBarEditorWindow.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -2617 +2617 @@
     if (result == UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Invalid)
     {
-        result = static_cast<UIExtraDataMetaDefs::RuntimeMenuMachineActionType>(result | UIExtraDataMetaDefs::RuntimeMenuMachineActionType_KeyboardSettings);
         result = static_cast<UIExtraDataMetaDefs::RuntimeMenuMachineActionType>(result | UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SaveState);
         result = static_cast<UIExtraDataMetaDefs::RuntimeMenuMachineActionType>(result | UIExtraDataMetaDefs::RuntimeMenuMachineActionType_PowerOff);
@@ -2729 +2728 @@
     {
         result = static_cast<UIExtraDataMetaDefs::RuntimeMenuDevicesActionType>(result | UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_HardDrives);
-        result = static_cast<UIExtraDataMetaDefs::RuntimeMenuDevicesActionType>(result | UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_SharedFolders);
     }
     /* Return result: */

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

@@ -205 +205 @@
 
     UIActionMenuKeyboard(UIActionPool *pParent)
-        : UIActionMenu(pParent) {}
+        : UIActionMenu(pParent, ":/keyboard_16px.png") {}
 
 protected:
@@ -2185 +2185 @@
 
     /* 'Keyboard' submenu: */
-    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_M_Keyboard), false) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_M_Keyboard)) || fSeparator;
     updateMenuMachineKeyboard();
-    /* 'Keyboard Settings' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_M_Keyboard_S_Settings)) || fSeparator;
     /* 'Mouse' submenu: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_M_Mouse), false) || fSeparator;
@@ -2194 +2192 @@
     /* 'Mouse Integration' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_M_Mouse_T_Integration)) || fSeparator;
-
-    /* Separator: */
-    if (fSeparator)
-    {
-        pMenu->addSeparator();
-        fSeparator = false;
-    }
-
-    /* 'Type CAD' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_TypeCAD)) || fSeparator;
-#ifdef Q_WS_X11
-    /* 'Type CABS' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_TypeCABS)) || fSeparator;
-#endif /* Q_WS_X11 */
 
     /* Separator: */
@@ -2251 +2235 @@
     pMenu->clear();
 
+    /* Separator: */
+    bool fSeparator = false;
+
     /* 'Keyboard Settings' action: */
-    addAction(pMenu, action(UIActionIndexRT_M_Machine_M_Keyboard_S_Settings));
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_M_Keyboard_S_Settings)) || fSeparator;
+
+    /* Separator: */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
+    /* 'Type CAD' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_TypeCAD)) || fSeparator;
+#ifdef Q_WS_X11
+    /* 'Type CABS' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_TypeCABS)) || fSeparator;
+#endif /* Q_WS_X11 */
 
     /* Mark menu as valid: */
@@ -2576 +2577 @@
     /* 'Web Cams' submenu: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_WebCams)) || fSeparator;
+    /* 'Shared Folders' submenu: */
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_SharedFolders)) || fSeparator;
+    updateMenuDevicesSharedFolders();
     /* 'Shared Clipboard' submenu: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_SharedClipboard)) || fSeparator;
     /* 'Drag&Drop' submenu: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_DragAndDrop)) || fSeparator;
-    /* 'Shared Folders' submenu: */
-    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_SharedFolders)) || fSeparator;
-    updateMenuDevicesSharedFolders();
 
     /* Separator: */
@@ -2636 +2637 @@
     pMenu->clear();
 
+    /* Separator: */
+    bool fSeparator = false;
+
     /* 'Network Settings' action: */
-    addAction(pMenu, action(UIActionIndexRT_M_Devices_M_Network_S_Settings));
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_Network_S_Settings)) || fSeparator;
+
+    /* Separator: */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
 
     /* This menu always remains invalid.. */
@@ -2650 +2661 @@
     pMenu->clear();
 
+    /* Separator: */
+    bool fSeparator = false;
+
     /* 'USB Devices Settings' action: */
-    addAction(pMenu, action(UIActionIndexRT_M_Devices_M_USBDevices_S_Settings));
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_USBDevices_S_Settings)) || fSeparator;
+
+    /* Separator: */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
 
     /* This menu always remains invalid.. */
@@ -2679 +2700 @@
     pMenu->clear();
 
+    /* Separator: */
+    bool fSeparator = false;
+
     /* 'Video Capture Settings' action: */
-    addAction(pMenu, action(UIActionIndexRT_M_Devices_M_VideoCapture_S_Settings));
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_VideoCapture_S_Settings)) || fSeparator;
+
+    /* Separator: */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
     /* 'Start Video Capture' action: */
-    addAction(pMenu, action(UIActionIndexRT_M_Devices_M_VideoCapture_S_Settings));
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_VideoCapture_T_Start)) || fSeparator;
 
     /* Mark menu as valid: */

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

@@ -491 +491 @@
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Machine_S_ShowInformation));
         pMenu->addSeparator();
-        prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Machine_M_Keyboard_S_Settings));
+        prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Machine_M_Keyboard));
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Machine_M_Mouse_T_Integration));
         pMenu->addSeparator();
@@ -540 +540 @@
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_M_USBDevices));
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_M_WebCams));
+        prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_M_SharedFolders));
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_M_SharedClipboard));
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_M_DragAndDrop));
-        prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_M_SharedFolders));
         pMenu->addSeparator();
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_T_VRDEServer));