Changeset 74978 in vbox

Timestamp:

Oct 22, 2018 6:17:14 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Sync action separator rules between tools panes and corresponding dialogs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolSelector.cpp (modified) (3 diffs)
• hostnetwork/UIHostNetworkManager.cpp (modified) (3 diffs)
• medium/UIMediumManager.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolSelector.cpp

@@ -2776 +2776 @@
     /* 'Add' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Add)) || fSeparator;
+
+    /* Separator? */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
     /* 'Copy' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Copy)) || fSeparator;
@@ -2784 +2792 @@
     /* 'Release' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Release)) || fSeparator;
-
-    /* Separator? */
-    if (fSeparator)
-    {
-        pMenu->addSeparator();
-        fSeparator = false;
-    }
-
     /* 'Properties' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_T_Details)) || fSeparator;
@@ -2834 +2834 @@
     /* 'Create' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Network_S_Create)) || fSeparator;
+
+    /* Separator? */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
     /* 'Remove' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Network_S_Remove)) || fSeparator;
-
-    /* Separator? */
-    if (fSeparator)
-    {
-        pMenu->addSeparator();
-        fSeparator = false;
-    }
-
     /* 'Properties' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Network_T_Details)) || fSeparator;

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -663 +663 @@
     {
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Remove));
-        menu.addSeparator();
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Network_T_Details));
     }
@@ -669 +668 @@
     {
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Create));
-//        menu.addSeparator();
 //        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Refresh));
     }
@@ -743 +741 @@
         /* Add toolbar actions: */
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Create));
+        m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Remove));
-        m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Network_T_Details));
 //        m_pToolBar->addSeparator();

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -635 +635 @@
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Remove));
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Release));
-        menu.addSeparator();
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Details));
     }
@@ -641 +640 @@
     {
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add));
-        menu.addSeparator();
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Refresh));
     }
@@ -779 +777 @@
         /* Add toolbar actions: */
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add));
+        m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Move));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Remove));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Release));
-        m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Details));
         m_pToolBar->addSeparator();