Changeset 54337 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 20, 2015 5:12:21 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7462: Runtime UI: Extend Input menu / Keyboard sub-menu with few additional combinations. Rework NLS set for those conbinations to be separate.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• runtime/UIActionPoolRuntime.cpp (modified) (4 diffs)
• runtime/UIActionPoolRuntime.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (3 diffs)
• runtime/UIMachineLogic.h (modified) (1 diff)

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

@@ -650 +650 @@
         case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCABS:          strResult = "TypeCABS"; break;
 #endif /* Q_WS_X11 */
+        case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCtrlBreak:     strResult = "TypeCtrlBreak"; break;
+        case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeInsert:        strResult = "TypeInsert"; break;
         case UIExtraDataMetaDefs::RuntimeMenuInputActionType_All:               strResult = "All"; break;
         default:
@@ -674 +676 @@
     keys << "TypeCABS";          values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCABS;
 #endif /* Q_WS_X11 */
+    keys << "TypeCtrlBreak";     values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCtrlBreak;
+    keys << "TypeInsert";        values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeInsert;
     keys << "All";               values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_All;
     /* Invalid type for unknown words: */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -416 +416 @@
         RuntimeMenuInputActionType_TypeCABS          = RT_BIT(5),
 #endif /* Q_WS_X11 */
+        RuntimeMenuInputActionType_TypeCtrlBreak     = RT_BIT(6),
+        RuntimeMenuInputActionType_TypeInsert        = RT_BIT(7),
         RuntimeMenuInputActionType_All               = 0xFFFF
     };

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

@@ -1125 +1125 @@
     void retranslateUi()
     {
-        setName(QApplication::translate("UIActionPool", "&Insert Ctrl-Alt-Del"));
-        setStatusTip(QApplication::translate("UIActionPool", "Send the Ctrl-Alt-Del sequence to the virtual machine"));
+        setName(QApplication::translate("UIActionPool", "&Insert %1").arg("Ctrl-Alt-Del"));
+        setStatusTip(QApplication::translate("UIActionPool", "Send the %1 sequence to the virtual machine").arg("Ctrl-Alt-Del"));
     }
 };
@@ -1161 +1161 @@
     void retranslateUi()
     {
-        setName(QApplication::translate("UIActionPool", "Ins&ert Ctrl-Alt-Backspace"));
-        setStatusTip(QApplication::translate("UIActionPool", "Send the Ctrl-Alt-Backspace sequence to the virtual machine"));
+        setName(QApplication::translate("UIActionPool", "&Insert %1").arg("Ctrl-Alt-Backspace"));
+        setStatusTip(QApplication::translate("UIActionPool", "Send the %1 sequence to the virtual machine").arg("Ctrl-Alt-Backspace"));
     }
 };
 #endif /* Q_WS_X11 */
+
+class UIActionSimplePerformTypeCtrlBreak : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimplePerformTypeCtrlBreak(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/hostkey_16px.png", ":/hostkey_disabled_16px.png") {}
+
+protected:
+
+    /** Returns action extra-data ID. */
+    virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCtrlBreak; }
+    /** Returns action extra-data key. */
+    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCtrlBreak); }
+    /** Returns whether action is allowed. */
+    virtual bool isAllowed() const { return actionPool()->toRuntime()->isAllowedInMenuInput(UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCtrlBreak); }
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("TypeCtrlBreak");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Insert %1").arg("Ctrl-Break"));
+        setStatusTip(QApplication::translate("UIActionPool", "Send the %1 sequence to the virtual machine").arg("Ctrl-Break"));
+    }
+};
+
+class UIActionSimplePerformTypeInsert : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimplePerformTypeInsert(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/hostkey_16px.png", ":/hostkey_disabled_16px.png") {}
+
+protected:
+
+    /** Returns action extra-data ID. */
+    virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeInsert; }
+    /** Returns action extra-data key. */
+    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeInsert); }
+    /** Returns whether action is allowed. */
+    virtual bool isAllowed() const { return actionPool()->toRuntime()->isAllowedInMenuInput(UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeInsert); }
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("TypeInsert");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Insert %1").arg("Insert"));
+        setStatusTip(QApplication::translate("UIActionPool", "Send the %1 sequence to the virtual machine").arg("Insert"));
+    }
+};
 
 class UIActionMenuDevices : public UIActionMenu
@@ -2036 +2096 @@
     m_pool[UIActionIndexRT_M_Input_S_TypeCABS] = new UIActionSimplePerformTypeCABS(this);
 #endif /* Q_WS_X11 */
+    m_pool[UIActionIndexRT_M_Input_S_TypeCtrlBreak] = new UIActionSimplePerformTypeCtrlBreak(this);
+    m_pool[UIActionIndexRT_M_Input_S_TypeInsert] = new UIActionSimplePerformTypeInsert(this);
 
     /* 'Devices' actions: */
@@ -2744 +2806 @@
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_S_TypeCABS)) || fSeparator;
 #endif /* Q_WS_X11 */
+    /* 'Type Ctrl-Break' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_S_TypeCtrlBreak)) || fSeparator;
+    /* 'Type Insert' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_S_TypeInsert)) || fSeparator;
 
     /* Mark menu as valid: */

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

@@ -84 +84 @@
     UIActionIndexRT_M_Input_S_TypeCABS,
 #endif /* Q_WS_X11 */
+    UIActionIndexRT_M_Input_S_TypeCtrlBreak,
+    UIActionIndexRT_M_Input_S_TypeInsert,
 
     /* 'Devices' menu actions: */

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

@@ -919 +919 @@
     m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_Input_S_TypeCABS));
 #endif /* Q_WS_X11 */
+    m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_Input_S_TypeCtrlBreak));
+    m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_Input_S_TypeInsert));
 
     /* Move actions into running-n-paused actions group: */
@@ -1017 +1019 @@
             this, SLOT(sltTypeCABS()));
 #endif /* Q_WS_X11 */
+    connect(actionPool()->action(UIActionIndexRT_M_Input_S_TypeCtrlBreak), SIGNAL(triggered()),
+            this, SLOT(sltTypeCtrlBreak()));
+    connect(actionPool()->action(UIActionIndexRT_M_Input_S_TypeInsert), SIGNAL(triggered()),
+            this, SLOT(sltTypeInsert()));
 
     /* 'Devices' actions connections: */
@@ -1315 +1321 @@
 {
     static QVector<LONG> sequence(6);
-    sequence[0] = 0x1d; /* Ctrl down */
-    sequence[1] = 0x38; /* Alt down */
-    sequence[2] = 0x0E; /* Backspace down */
-    sequence[3] = 0x8E; /* Backspace up */
-    sequence[4] = 0xb8; /* Alt up */
-    sequence[5] = 0x9d; /* Ctrl up */
+    sequence[0] = 0x1d;        /* Ctrl down */
+    sequence[1] = 0x38;        /* Alt down */
+    sequence[2] = 0x0E;        /* Backspace down */
+    sequence[3] = 0x0E | 0x80; /* Backspace up */
+    sequence[4] = 0x38 | 0x80; /* Alt up */
+    sequence[5] = 0x1d | 0x80; /* Ctrl up */
     keyboard().PutScancodes(sequence);
     AssertWrapperOk(keyboard());
 }
 #endif /* Q_WS_X11 */
+
+void UIMachineLogic::sltTypeCtrlBreak()
+{
+    static QVector<LONG> sequence(4);
+    sequence[0] = 0x1d;        /* Ctrl down */
+    sequence[1] = 0x46;        /* Break down */
+    sequence[2] = 0x46 | 0x80; /* Break up */
+    sequence[3] = 0x1d | 0x80; /* Ctrl up */
+    keyboard().PutScancodes(sequence);
+    AssertWrapperOk(keyboard());
+}
+
+void UIMachineLogic::sltTypeInsert()
+{
+    static QVector<LONG> sequence(4);
+    sequence[0] = 0xE0;        /* Extended flag */
+    sequence[1] = 0x52;        /* Insert down */
+    sequence[2] = 0xE0;        /* Extended flag */
+    sequence[3] = 0x52 | 0x80; /* Insert up */
+    keyboard().PutScancodes(sequence);
+    AssertWrapperOk(keyboard());
+}
 
 void UIMachineLogic::sltTakeSnapshot()

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

@@ -248 +248 @@
     void sltTypeCABS();
 #endif /* Q_WS_X11 */
+    void sltTypeCtrlBreak();
+    void sltTypeInsert();
     void sltTakeSnapshot();
     void sltShowInformationDialog();