Changeset 54349 in vbox

Timestamp:

Feb 21, 2015 1:05:04 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7253: Runtime UI: Invert state/name of the Disable Mouse-integration action.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIActionPoolRuntime.cpp (modified) (2 diffs)
• UIMachineLogic.cpp (modified) (3 diffs)
• UIMachineLogic.h (modified) (1 diff)
• UIMenuBarEditorWindow.cpp (modified) (1 diff)
• UISession.cpp (modified) (1 diff)
• seamless/UIMachineLogicSeamless.cpp (modified) (2 diffs)

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

@@ -1222 +1222 @@
     void retranslateUi()
     {
-        setName(QApplication::translate("UIActionPool", "Disable &Mouse Integration"));
-        setStatusTip(QApplication::translate("UIActionPool", "Temporarily disable host mouse pointer integration"));
+        setName(QApplication::translate("UIActionPool", "&Mouse Integration"));
+        setStatusTip(QApplication::translate("UIActionPool", "Enable host mouse pointer integration"));
     }
 };
@@ -2772 +2772 @@
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_M_Mouse), false) || fSeparator;
     updateMenuInputMouse();
+
+    /* Separator: */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
     /* 'Mouse Integration' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_M_Mouse_T_Integration)) || fSeparator;

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

@@ -595 +595 @@
     pAction->setEnabled(fIsMouseSupportsAbsolute && fIsMouseSupportsRelative && !fIsMouseHostCursorNeeded);
     if (fIsMouseHostCursorNeeded)
-        pAction->setChecked(false);
+        pAction->setChecked(true);
 }
 
@@ -1301 +1301 @@
 }
 
-void UIMachineLogic::sltToggleMouseIntegration(bool fOff)
+void UIMachineLogic::sltToggleMouseIntegration(bool fEnabled)
 {
     /* Do not process if window(s) missed! */
@@ -1308 +1308 @@
 
     /* Disable/Enable mouse-integration for all view(s): */
-    mouseHandler()->setMouseIntegrationEnabled(!fOff);
+    mouseHandler()->setMouseIntegrationEnabled(fEnabled);
 }
 

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

@@ -243 +243 @@
     /* "Machine" menu functionality: */
     void sltShowKeyboardSettings();
-    void sltToggleMouseIntegration(bool fDisabled);
+    void sltToggleMouseIntegration(bool fEnabled);
     void sltTypeCAD();
 #ifdef Q_WS_X11

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

@@ -520 +520 @@
     {
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard));
+        pMenu->addSeparator();
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration));
     }

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

@@ -1369 +1369 @@
         }
 
+        /* Input options: */
+        actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration)->setChecked(isMouseIntegrated());
+
         /* What is the default close action and the restricted are? */
         m_defaultCloseAction = gEDataManager->defaultMachineCloseAction(strMachineID);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -209 +209 @@
     UIMachineLogic::prepareActionGroups();
 
-    /* Restrict 'Disable Mouse Integration' action for 'Machine' menu: */
-    actionPool()->toRuntime()->setRestrictionForMenuInput(UIActionRestrictionLevel_Logic,
-                                                          UIExtraDataMetaDefs::RuntimeMenuInputActionType_MouseIntegration);
     /* Restrict 'Adjust Window', 'Guest Autoresize', 'Status Bar' and 'Resize' actions for 'View' menu: */
     actionPool()->toRuntime()->setRestrictionForMenuView(UIActionRestrictionLevel_Logic,
@@ -345 +342 @@
     }
 
-    /* Allow 'Disable Mouse Integration' action for 'Machine' menu: */
-    actionPool()->toRuntime()->setRestrictionForMenuInput(UIActionRestrictionLevel_Logic,
-                                                          UIExtraDataMetaDefs::RuntimeMenuInputActionType_Invalid);
     /* Allow 'Adjust Window', 'Guest Autoresize', 'Status Bar' and 'Resize' actions for 'View' menu: */
     actionPool()->toRuntime()->setRestrictionForMenuView(UIActionRestrictionLevel_Logic,