Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 64658) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 64659) @@ -669,15 +669,17 @@ switch (runtimeMenuInputActionType) { - case UIExtraDataMetaDefs::RuntimeMenuInputActionType_Keyboard: strResult = "Keyboard"; break; - case UIExtraDataMetaDefs::RuntimeMenuInputActionType_KeyboardSettings: strResult = "KeyboardSettings"; break; - case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCAD: strResult = "TypeCAD"; break; + case UIExtraDataMetaDefs::RuntimeMenuInputActionType_Keyboard: strResult = "Keyboard"; break; + case UIExtraDataMetaDefs::RuntimeMenuInputActionType_KeyboardSettings: strResult = "KeyboardSettings"; break; + case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCAD: strResult = "TypeCAD"; break; #ifdef VBOX_WS_X11 - case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCABS: strResult = "TypeCABS"; break; + case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCABS: strResult = "TypeCABS"; break; #endif /* VBOX_WS_X11 */ - case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCtrlBreak: strResult = "TypeCtrlBreak"; break; - case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeInsert: strResult = "TypeInsert"; break; - case UIExtraDataMetaDefs::RuntimeMenuInputActionType_Mouse: strResult = "Mouse"; break; - case UIExtraDataMetaDefs::RuntimeMenuInputActionType_MouseIntegration: strResult = "MouseIntegration"; break; - case UIExtraDataMetaDefs::RuntimeMenuInputActionType_All: strResult = "All"; break; + case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCtrlBreak: strResult = "TypeCtrlBreak"; break; + case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeInsert: strResult = "TypeInsert"; break; + case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypePrintScreen: strResult = "TypePrintScreen"; break; + case UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeAltPrintScreen: strResult = "TypeAltPrintScreen"; break; + case UIExtraDataMetaDefs::RuntimeMenuInputActionType_Mouse: strResult = "Mouse"; break; + case UIExtraDataMetaDefs::RuntimeMenuInputActionType_MouseIntegration: strResult = "MouseIntegration"; break; + case UIExtraDataMetaDefs::RuntimeMenuInputActionType_All: strResult = "All"; break; default: { @@ -694,16 +696,18 @@ /* Here we have some fancy stuff allowing us * to search through the keys using 'case-insensitive' rule: */ - QStringList keys; QList values; - keys << "Keyboard"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_Keyboard; - keys << "KeyboardSettings"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_KeyboardSettings; - keys << "TypeCAD"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCAD; + QStringList keys; QList values; + keys << "Keyboard"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_Keyboard; + keys << "KeyboardSettings"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_KeyboardSettings; + keys << "TypeCAD"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCAD; #ifdef VBOX_WS_X11 - keys << "TypeCABS"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCABS; + keys << "TypeCABS"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCABS; #endif /* VBOX_WS_X11 */ - keys << "TypeCtrlBreak"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCtrlBreak; - keys << "TypeInsert"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeInsert; - keys << "Mouse"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_Mouse; - keys << "MouseIntegration"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_MouseIntegration; - keys << "All"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_All; + keys << "TypeCtrlBreak"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeCtrlBreak; + keys << "TypeInsert"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeInsert; + keys << "TypePrintScreen"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypePrintScreen; + keys << "TypeAltPrintScreen"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeAltPrintScreen; + keys << "Mouse"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_Mouse; + keys << "MouseIntegration"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_MouseIntegration; + keys << "All"; values << UIExtraDataMetaDefs::RuntimeMenuInputActionType_All; /* Invalid type for unknown words: */ if (!keys.contains(strRuntimeMenuInputActionType, Qt::CaseInsensitive)) Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 64658) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 64659) @@ -426,16 +426,18 @@ enum RuntimeMenuInputActionType { - RuntimeMenuInputActionType_Invalid = 0, - RuntimeMenuInputActionType_Keyboard = RT_BIT(0), - RuntimeMenuInputActionType_KeyboardSettings = RT_BIT(1), - RuntimeMenuInputActionType_TypeCAD = RT_BIT(2), + RuntimeMenuInputActionType_Invalid = 0, + RuntimeMenuInputActionType_Keyboard = RT_BIT(0), + RuntimeMenuInputActionType_KeyboardSettings = RT_BIT(1), + RuntimeMenuInputActionType_TypeCAD = RT_BIT(2), #ifdef VBOX_WS_X11 - RuntimeMenuInputActionType_TypeCABS = RT_BIT(3), + RuntimeMenuInputActionType_TypeCABS = RT_BIT(3), #endif /* VBOX_WS_X11 */ - RuntimeMenuInputActionType_TypeCtrlBreak = RT_BIT(4), - RuntimeMenuInputActionType_TypeInsert = RT_BIT(5), - RuntimeMenuInputActionType_Mouse = RT_BIT(6), - RuntimeMenuInputActionType_MouseIntegration = RT_BIT(7), - RuntimeMenuInputActionType_All = 0xFFFF + RuntimeMenuInputActionType_TypeCtrlBreak = RT_BIT(4), + RuntimeMenuInputActionType_TypeInsert = RT_BIT(5), + RuntimeMenuInputActionType_TypePrintScreen = RT_BIT(6), + RuntimeMenuInputActionType_TypeAltPrintScreen = RT_BIT(7), + RuntimeMenuInputActionType_Mouse = RT_BIT(8), + RuntimeMenuInputActionType_MouseIntegration = RT_BIT(9), + RuntimeMenuInputActionType_All = 0xFFFF }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 64658) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 64659) @@ -1188,4 +1188,64 @@ setName(QApplication::translate("UIActionPool", "&Insert %1", "that means send the %1 key sequence to the virtual machine").arg("Insert")); setStatusTip(QApplication::translate("UIActionPool", "Send the %1 sequence to the virtual machine").arg("Insert")); + } +}; + +class UIActionSimplePerformTypePrintScreen : public UIActionSimple +{ + Q_OBJECT; + +public: + + UIActionSimplePerformTypePrintScreen(UIActionPool *pParent) + : UIActionSimple(pParent, ":/hostkey_16px.png", ":/hostkey_disabled_16px.png") {} + +protected: + + /** Returns action extra-data ID. */ + virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypePrintScreen; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypePrintScreen); } + /** Returns whether action is allowed. */ + virtual bool isAllowed() const { return actionPool()->toRuntime()->isAllowedInMenuInput(UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypePrintScreen); } + + QString shortcutExtraDataID() const + { + return QString("TypePrintScreen"); + } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "&Insert %1", "that means send the %1 key sequence to the virtual machine").arg("Print Screen")); + setStatusTip(QApplication::translate("UIActionPool", "Send the %1 sequence to the virtual machine").arg("Print Screen")); + } +}; + +class UIActionSimplePerformTypeAltPrintScreen : public UIActionSimple +{ + Q_OBJECT; + +public: + + UIActionSimplePerformTypeAltPrintScreen(UIActionPool *pParent) + : UIActionSimple(pParent, ":/hostkey_16px.png", ":/hostkey_disabled_16px.png") {} + +protected: + + /** Returns action extra-data ID. */ + virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeAltPrintScreen; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeAltPrintScreen); } + /** Returns whether action is allowed. */ + virtual bool isAllowed() const { return actionPool()->toRuntime()->isAllowedInMenuInput(UIExtraDataMetaDefs::RuntimeMenuInputActionType_TypeAltPrintScreen); } + + QString shortcutExtraDataID() const + { + return QString("TypeAltPrintScreen"); + } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "&Insert %1", "that means send the %1 key sequence to the virtual machine").arg("Alt Print Screen")); + setStatusTip(QApplication::translate("UIActionPool", "Send the %1 sequence to the virtual machine").arg("Alt Print Screen")); } }; @@ -2145,4 +2205,6 @@ m_pool[UIActionIndexRT_M_Input_M_Keyboard_S_TypeCtrlBreak] = new UIActionSimplePerformTypeCtrlBreak(this); m_pool[UIActionIndexRT_M_Input_M_Keyboard_S_TypeInsert] = new UIActionSimplePerformTypeInsert(this); + m_pool[UIActionIndexRT_M_Input_M_Keyboard_S_TypePrintScreen] = new UIActionSimplePerformTypePrintScreen(this); + m_pool[UIActionIndexRT_M_Input_M_Keyboard_S_TypeAltPrintScreen] = new UIActionSimplePerformTypeAltPrintScreen(this); m_pool[UIActionIndexRT_M_Input_M_Mouse] = new UIActionMenuMouse(this); m_pool[UIActionIndexRT_M_Input_M_Mouse_T_Integration] = new UIActionToggleMouseIntegration(this); @@ -2868,4 +2930,8 @@ /* 'Type Insert' action: */ fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeInsert)) || fSeparator; + /* 'Type Print Screen' action: */ + fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_M_Keyboard_S_TypePrintScreen)) || fSeparator; + /* 'Type Alt Print Screen' action: */ + fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeAltPrintScreen)) || fSeparator; /* Mark menu as valid: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h (revision 64658) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h (revision 64659) @@ -88,4 +88,6 @@ UIActionIndexRT_M_Input_M_Keyboard_S_TypeCtrlBreak, UIActionIndexRT_M_Input_M_Keyboard_S_TypeInsert, + UIActionIndexRT_M_Input_M_Keyboard_S_TypePrintScreen, + UIActionIndexRT_M_Input_M_Keyboard_S_TypeAltPrintScreen, UIActionIndexRT_M_Input_M_Mouse, UIActionIndexRT_M_Input_M_Mouse_T_Integration, Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 64658) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 64659) @@ -1019,4 +1019,6 @@ m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeCtrlBreak)); m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeInsert)); + m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypePrintScreen)); + m_pRunningActions->addAction(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeAltPrintScreen)); /* Move actions into running-n-paused actions group: */ @@ -1131,4 +1133,8 @@ connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeInsert), SIGNAL(triggered()), this, SLOT(sltTypeInsert())); + connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypePrintScreen), SIGNAL(triggered()), + this, SLOT(sltTypePrintScreen())); + connect(actionPool()->action(UIActionIndexRT_M_Input_M_Keyboard_S_TypeAltPrintScreen), SIGNAL(triggered()), + this, SLOT(sltTypeAltPrintScreen())); connect(actionPool()->action(UIActionIndexRT_M_Input_M_Mouse_T_Integration), SIGNAL(toggled(bool)), this, SLOT(sltToggleMouseIntegration(bool))); @@ -1505,4 +1511,36 @@ } +void UIMachineLogic::sltTypePrintScreen() +{ + static QVector sequence(8); + sequence[0] = 0xE0; /* Extended flag */ + sequence[1] = 0x2A; /* Print.. down */ + sequence[2] = 0xE0; /* Extended flag */ + sequence[3] = 0x37; /* ..Screen down */ + sequence[4] = 0xE0; /* Extended flag */ + sequence[5] = 0x37 | 0x80; /* ..Screen up */ + sequence[6] = 0xE0; /* Extended flag */ + sequence[7] = 0x2A | 0x80; /* Print.. up */ + keyboard().PutScancodes(sequence); + AssertWrapperOk(keyboard()); +} + +void UIMachineLogic::sltTypeAltPrintScreen() +{ + static QVector sequence(10); + sequence[0] = 0x38; /* Alt down */ + sequence[1] = 0xE0; /* Extended flag */ + sequence[2] = 0x2A; /* Print.. down */ + sequence[3] = 0xE0; /* Extended flag */ + sequence[4] = 0x37; /* ..Screen down */ + sequence[5] = 0xE0; /* Extended flag */ + sequence[6] = 0x37 | 0x80; /* ..Screen up */ + sequence[7] = 0xE0; /* Extended flag */ + sequence[8] = 0x2A | 0x80; /* Print.. up */ + sequence[9] = 0x38 | 0x80; /* Alt up */ + keyboard().PutScancodes(sequence); + AssertWrapperOk(keyboard()); +} + void UIMachineLogic::sltTakeSnapshot() { Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h (revision 64658) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h (revision 64659) @@ -265,4 +265,6 @@ void sltTypeCtrlBreak(); void sltTypeInsert(); + void sltTypePrintScreen(); + void sltTypeAltPrintScreen(); void sltTakeSnapshot(); void sltShowInformationDialog();