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

Timestamp:

Aug 22, 2018 7:03:19 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9085: A bit of fixes and missed part for r124533.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• globals/UIActionPoolRuntime.cpp (modified) (5 diffs)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UIMachineLogic.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -687 +687 @@
         case UIExtraDataMetaDefs::RuntimeMenuInputActionType_Mouse:              strResult = "Mouse"; break;
         case UIExtraDataMetaDefs::RuntimeMenuInputActionType_MouseIntegration:   strResult = "MouseIntegration"; break;
+        case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeHostKeyCombo:   strResult = "TypeHostKeyCombo"; break;
         case UIExtraDataMetaDefs::RuntimeMenuInputActionType_All:                strResult = "All"; break;
         default:
@@ -715 +716 @@
     keys << "Mouse";              values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_Mouse;
     keys << "MouseIntegration";   values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_MouseIntegration;
+    keys << "TypeHostKeyCombo";   values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeHostKeyCombo;
     keys << "All";                values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_All;
     /* Invalid type for unknown words: */

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

@@ -1816 +1816 @@
 };
 
-/** Toggle action extension, used as 'Perform Host Key Combo press/release' action class. */
+/** Toggle action extension, used as 'Perform Host Key Combo Press/Release' action class. */
 class UIActionToggleRuntimePerformTypeHostKeyCombo : public UIActionToggle
 {
@@ -1825 +1825 @@
     /** Constructs action passing @a pParent to the base-class. */
     UIActionToggleRuntimePerformTypeHostKeyCombo(UIActionPool *pParent)
-        : UIActionToggle
-          (pParent,
-           ":/vm_pause_on_16px.png", ":/vm_pause_16px.png",
-           ":/vm_pause_on_disabled_16px.png", ":/vm_pause_disabled_16px.png",
-           true)
+        : UIActionToggle(pParent, true)
     {}
 
@@ -1853 +1849 @@
     virtual QString shortcutExtraDataID() const /* override */
     {
-        return QString("TypeHostKeyCode");
+        return QString("TypeHostKeyCombo");
     }
 
@@ -1869 +1865 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "&Insert %1", "that means send the %1 key sequence to the virtual machine").arg("Home Key Combo"));
-        setStatusTip(QApplication::translate("UIActionPool", "Send the %1 sequence to the virtual machine").arg("Home Key Combo"));
+        setName(QApplication::translate("UIActionPool", "&Insert %1", "that means send the %1 key sequence to the virtual machine").arg("Host Key Combo"));
+        setStatusTip(QApplication::translate("UIActionPool", "Send the %1 sequence to the virtual machine").arg("Host Key Combo"));
     }
 };
@@ -4034 +4030 @@
     /* 'Type Alt Print Screen' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeAltPrintScreen)) || fSeparator;
+    /* 'Type Host Key Combo' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_M_Keyboard_T_TypeHostKeyCombo)) || fSeparator;
 

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

@@ -1681 +1681 @@
 }
 
-void UIMachineLogic::sltTypeHostKeyComboPressRelease(bool actionToggle)
+void UIMachineLogic::sltTypeHostKeyComboPressRelease(bool fToggleSequence)
 {
     QList<unsigned> shortCodes = UIHostCombo::modifiersToScanCodes(gEDataManager->hostKeyCombination());
-    QVector <LONG> codes;
+    QVector<LONG> codes;
     foreach (unsigned idxCode, shortCodes)
     {
-        /* Check if we need to include extend code for this key: */
+        /* Check if we need to include extended code for this key: */
         if (idxCode & 0x100)
             codes << 0xE0;
-        if (actionToggle)
+        if (fToggleSequence)
         {
             /* Add the press code: */
-             codes << (idxCode & 0x7F);
+            codes << (idxCode & 0x7F);
         }
         else

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

@@ -269 +269 @@
     void sltTypePrintScreen();
     void sltTypeAltPrintScreen();
-    void sltTypeHostKeyComboPressRelease(bool);
+    void sltTypeHostKeyComboPressRelease(bool fToggleSequence);
     void sltTakeSnapshot();
     void sltShowInformationDialog();