icon. This icon, together "
- "with the mouse icon placed nearby, indicate the current keyboard "
- "and mouse capture state."
- "You have clicked the mouse inside the Virtual Machine display " - "or pressed the host key. This will cause the Virtual Machine to " - "capture the host mouse pointer (only if the mouse pointer " - "integration is not currently supported by the guest OS) and the " - "keyboard, which will make them unavailable to other applications " - "running on your host machine." - "
" - "You can press the host key at any time to uncapture the "
- "keyboard and mouse (if it is captured) and return them to normal "
- "operation. The currently assigned host key is shown on the status bar "
- "at the bottom of the Virtual Machine window, next to the "
- " icon. This icon, together "
- "with the mouse icon placed nearby, indicate the current keyboard "
- "and mouse capture state."
- "
The host key is currently defined as %1.
", - "additional message box paragraph") - .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())), - "confirmInputCapture", - AlertButton_Ok | AlertButtonOption_Default, - AlertButton_Cancel | AlertButtonOption_Escape, - 0, - tr("Capture", "do input capture")); - - if (pfAutoConfirmed) - *pfAutoConfirmed = (rc & AutoConfirmed); - + tr("You have clicked the mouse inside the Virtual Machine display or pressed the host key. " + "This will cause the Virtual Machine to capture the host mouse pointer (only if the mouse pointer " + "integration is not currently supported by the guest OS) and the keyboard, which will make them " + "unavailable to other applications running on your host machine.
" + "You can press the host key at any time to uncapture the keyboard and mouse "
+ "(if it is captured) and return them to normal operation. "
+ "The currently assigned host key is shown on the status bar at the bottom of the Virtual Machine window, "
+ "next to the icon. "
+ "This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.
The host key is currently defined as %1.
", "additional message box paragraph") + .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())), + "confirmInputCapture", + AlertButton_Ok | AlertButtonOption_Default, + AlertButton_Cancel | AlertButtonOption_Escape, + 0, + tr("Capture", "do input capture")); + /* Was the message auto-confirmed? */ + fAutoConfirmed = (rc & AutoConfirmed); + /* True if "Ok" was pressed: */ return (rc & AlertButtonMask) == AlertButton_Ok; } -void UIMessageCenter::remindAboutAutoCapture() +void UIMessageCenter::remindAboutAutoCapture() const { message(mainMachineWindowShown(), MessageType_Info, - tr("You have the Auto capture keyboard option turned on. " - "This will cause the Virtual Machine to automatically capture " - "the keyboard every time the VM window is activated and make it " - "unavailable to other applications running on your host machine: " - "when the keyboard is captured, all keystrokes (including system ones " - "like Alt-Tab) will be directed to the VM." - "
" - "You can press the host key at any time to uncapture the "
- "keyboard and mouse (if it is captured) and return them to normal "
- "operation. The currently assigned host key is shown on the status bar "
- "at the bottom of the Virtual Machine window, next to the "
- " icon. This icon, together "
- "with the mouse icon placed nearby, indicate the current keyboard "
- "and mouse capture state."
- "
The host key is currently defined as %1.
", - "additional message box paragraph") - .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())), - "remindAboutAutoCapture"); -} - -void UIMessageCenter::remindAboutMouseIntegration(bool fSupportsAbsolute) -{ + tr("You have the Auto capture keyboard option turned on. " + "This will cause the Virtual Machine to automatically capture " + "the keyboard every time the VM window is activated and make it " + "unavailable to other applications running on your host machine: " + "when the keyboard is captured, all keystrokes (including system ones " + "like Alt-Tab) will be directed to the VM.
" + "You can press the host key at any time to uncapture the "
+ "keyboard and mouse (if it is captured) and return them to normal "
+ "operation. The currently assigned host key is shown on the status bar "
+ "at the bottom of the Virtual Machine window, next to the "
+ " icon. This icon, together "
+ "with the mouse icon placed nearby, indicate the current keyboard "
+ "and mouse capture state.
The host key is currently defined as %1.
", + "additional message box paragraph") + .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())), + "remindAboutAutoCapture"); +} + +void UIMessageCenter::remindAboutMouseIntegration(bool fSupportsAbsolute) const +{ + /* Do not show this async warning more than one at time: */ if (warningShown("remindAboutMouseIntegration")) return; setWarningShown("remindAboutMouseIntegration", true); + /* Show one of warnings, do not close outdated, not possible in current archi: */ static const char *kNames [2] = { @@ -1697,99 +1688,117 @@ "remindAboutMouseIntegrationOn" }; - - /* Close the previous (outdated) window if any. We use kName as - * pcszAutoConfirmId which is also used as the widget name by default. */ - { - QWidget *outdated = - VBoxGlobal::findWidget(NULL, kNames [int (!fSupportsAbsolute)], - "QIMessageBox"); - if (outdated) - outdated->close(); - } - if (fSupportsAbsolute) { message(mainMachineWindowShown(), MessageType_Info, - tr("The Virtual Machine reports that the guest OS supports " - "mouse pointer integration. This means that you do not " - "need to capture the mouse pointer to be able to use it " - "in your guest OS -- all " - "mouse actions you perform when the mouse pointer is over the " - "Virtual Machine's display are directly sent to the guest OS. " - "If the mouse is currently captured, it will be automatically " - "uncaptured." - "
" - "The mouse icon on the status bar will look like "
- "
to inform you that mouse "
- "pointer integration is supported by the guest OS and is "
- "currently turned on."
- "
Note: Some applications may behave incorrectly in " - "mouse pointer integration mode. You can always disable it for " - "the current session (and enable it again) by selecting the " - "corresponding action from the menu bar." - "
"), - kNames [1] /* auto-confirm id */); + tr("The Virtual Machine reports that the guest OS supports mouse pointer integration. " + "This means that you do not need to capture the mouse pointer to be able to use it in your guest OS -- " + "all mouse actions you perform when the mouse pointer is over the Virtual Machine's display " + "are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.
" + "The mouse icon on the status bar will look like to inform you "
+ "that mouse pointer integration is supported by the guest OS and is currently turned on.
Note: Some applications may behave incorrectly in mouse pointer integration mode. " + "You can always disable it for the current session (and enable it again) " + "by selecting the corresponding action from the menu bar.
"), + kNames [1] /* auto-confirm id */); } else { message(mainMachineWindowShown(), MessageType_Info, - tr("The Virtual Machine reports that the guest OS does not " - "support mouse pointer integration in the current video " - "mode. You need to capture the mouse (by clicking over the VM " - "display or pressing the host key) in order to use the " - "mouse inside the guest OS.
"), - kNames [0] /* auto-confirm id */); - } - + tr("The Virtual Machine reports that the guest OS does not support mouse pointer integration " + "in the current video mode. You need to capture the mouse (by clicking over the VM display " + "or pressing the host key) in order to use the mouse inside the guest OS.
"), + kNames [0] /* auto-confirm id */); + } + + /* Allow to show this async warning: */ setWarningShown("remindAboutMouseIntegration", false); } -bool UIMessageCenter::remindAboutPausedVMInput() -{ - int rc = message( - mainMachineWindowShown(), - MessageType_Info, - tr("The Virtual Machine is currently in the Paused state and " - "not able to see any keyboard or mouse input. If you want to " - "continue to work inside the VM, you need to resume it by selecting the " - "corresponding action from the menu bar.
"), - "remindAboutPausedVMInput" - ); +bool UIMessageCenter::remindAboutPausedVMInput() const +{ + int rc = message(mainMachineWindowShown(), MessageType_Info, + tr("The Virtual Machine is currently in the Paused state and " + "not able to see any keyboard or mouse input. If you want to " + "continue to work inside the VM, you need to resume it by selecting the " + "corresponding action from the menu bar.
"), + "remindAboutPausedVMInput"); return !(rc & AutoConfirmed); } -void UIMessageCenter::cannotEnterSeamlessMode(ULONG /* uWidth */, - ULONG /* uHeight */, - ULONG /* uBpp */, - ULONG64 uMinVRAM) +bool UIMessageCenter::confirmGoingFullscreen(const QString &strHotKey) const +{ + return messageOkCancel(mainMachineWindowShown(), MessageType_Info, + tr("The virtual machine window will be now switched to fullscreen mode. " + "You can go back to windowed mode at any time by pressing %1.
" + "Note that the Host key is currently defined as %2.
" + "Note that the main menu bar is hidden in fullscreen mode. " + "You can access it by pressing Host+Home.
") + .arg(strHotKey) + .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())), + "confirmGoingFullscreen", + tr("Switch")); +} + +bool UIMessageCenter::confirmGoingSeamless(const QString &strHotKey) const +{ + return messageOkCancel(mainMachineWindowShown(), MessageType_Info, + tr("The virtual machine window will be now switched to Seamless mode. " + "You can go back to windowed mode at any time by pressing %1.
" + "Note that the Host key is currently defined as %2.
" + "Note that the main menu bar is hidden in seamless mode. " + "You can access it by pressing Host+Home.
") + .arg(strHotKey) + .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())), + "confirmGoingSeamless", + tr("Switch")); +} + +bool UIMessageCenter::confirmGoingScale(const QString &strHotKey) const +{ + return messageOkCancel(mainMachineWindowShown(), MessageType_Info, + tr("The virtual machine window will be now switched to Scale mode. " + "You can go back to windowed mode at any time by pressing %1.
" + "Note that the Host key is currently defined as %2.
" + "Note that the main menu bar is hidden in scale mode. " + "You can access it by pressing Host+Home.
") + .arg(strHotKey) + .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())), + "confirmGoingScale", + tr("Switch")); +} + +bool UIMessageCenter::cannotEnterFullscreenMode(ULONG /* uWidth */, ULONG /* uHeight */, ULONG /* uBpp */, ULONG64 uMinVRAM) const +{ + return messageOkCancel(mainMachineWindowShown(), MessageType_Warning, + tr("Could not switch the guest display to fullscreen mode due to insufficient guest video memory.
" + "You should configure the virtual machine to have at least %1 of video memory.
" + "Press Ignore to switch to fullscreen mode anyway or press Cancel to cancel the operation.
") + .arg(VBoxGlobal::formatSize(uMinVRAM)), + 0 /* auto-confirm id */, + QIMessageBox::tr("Ignore")); +} + +void UIMessageCenter::cannotEnterSeamlessMode(ULONG /* uWidth */, ULONG /* uHeight */, ULONG /* uBpp */, ULONG64 uMinVRAM) const { message(mainMachineWindowShown(), MessageType_Error, - tr("Could not enter seamless mode due to insufficient guest " - "video memory.
" - "You should configure the virtual machine to have at " - "least %1 of video memory.
") - .arg(VBoxGlobal::formatSize(uMinVRAM))); -} - -int UIMessageCenter::cannotEnterFullscreenMode(ULONG /* uWidth */, - ULONG /* uHeight */, - ULONG /* uBpp */, - ULONG64 uMinVRAM) -{ - return message(mainMachineWindowShown(), MessageType_Warning, - tr("Could not switch the guest display to fullscreen mode due " - "to insufficient guest video memory.
" - "You should configure the virtual machine to have at " - "least %1 of video memory.
" - "Press Ignore to switch to fullscreen mode anyway " - "or press Cancel to cancel the operation.
") - .arg(VBoxGlobal::formatSize(uMinVRAM)), - 0 /* auto-confirm id */, - AlertButton_Ignore | AlertButtonOption_Default, - AlertButton_Cancel | AlertButtonOption_Escape); -} - -void UIMessageCenter::cannotSwitchScreenInSeamless(quint64 uMinVRAM) + tr("Could not enter seamless mode due to insufficient guest " + "video memory.
" + "You should configure the virtual machine to have at " + "least %1 of video memory.
") + .arg(VBoxGlobal::formatSize(uMinVRAM))); +} + +bool UIMessageCenter::cannotSwitchScreenInFullscreen(quint64 uMinVRAM) const +{ + return messageOkCancel(mainMachineWindowShown(), MessageType_Warning, + tr("Could not change the guest screen to this host screen due to insufficient guest video memory.
" + "You should configure the virtual machine to have at least %1 of video memory.
" + "Press Ignore to switch the screen anyway or press Cancel to cancel the operation.
") + .arg(VBoxGlobal::formatSize(uMinVRAM)), + 0 /* auto-confirm id */, + QIMessageBox::tr("Ignore")); +} + +void UIMessageCenter::cannotSwitchScreenInSeamless(quint64 uMinVRAM) const { message(mainMachineWindowShown(), MessageType_Error, @@ -1798,62 +1807,5 @@ "You should configure the virtual machine to have at " "least %1 of video memory.
") - .arg(VBoxGlobal::formatSize(uMinVRAM))); -} - -int UIMessageCenter::cannotSwitchScreenInFullscreen(quint64 uMinVRAM) -{ - return message(mainMachineWindowShown(), MessageType_Warning, - tr("Could not change the guest screen to this host screen " - "due to insufficient guest video memory.
" - "You should configure the virtual machine to have at " - "least %1 of video memory.
" - "Press Ignore to switch the screen anyway " - "or press Cancel to cancel the operation.
") - .arg(VBoxGlobal::formatSize(uMinVRAM)), - 0 /* auto-confirm id */, - AlertButton_Ignore | AlertButtonOption_Default, - AlertButton_Cancel | AlertButtonOption_Escape); -} - -bool UIMessageCenter::confirmGoingFullscreen(const QString &strHotKey) -{ - return messageOkCancel(mainMachineWindowShown(), MessageType_Info, - tr("The virtual machine window will be now switched to fullscreen mode. " - "You can go back to windowed mode at any time by pressing %1.
" - "Note that the Host key is currently defined as %2.
" - "Note that the main menu bar is hidden in fullscreen mode. " - "You can access it by pressing Host+Home.
") - .arg(strHotKey) - .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())), - "confirmGoingFullscreen", - tr("Switch", "fullscreen")); -} - -bool UIMessageCenter::confirmGoingSeamless(const QString &strHotKey) -{ - return messageOkCancel(mainMachineWindowShown(), MessageType_Info, - tr("The virtual machine window will be now switched to Seamless mode. " - "You can go back to windowed mode at any time by pressing %1.
" - "Note that the Host key is currently defined as %2.
" - "Note that the main menu bar is hidden in seamless mode. " - "You can access it by pressing Host+Home.
") - .arg(strHotKey) - .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())), - "confirmGoingSeamless", - tr("Switch", "seamless")); -} - -bool UIMessageCenter::confirmGoingScale(const QString &strHotKey) -{ - return messageOkCancel(mainMachineWindowShown(), MessageType_Info, - tr("The virtual machine window will be now switched to Scale mode. " - "You can go back to windowed mode at any time by pressing %1.
" - "Note that the Host key is currently defined as %2.
" - "Note that the main menu bar is hidden in scale mode. " - "You can access it by pressing Host+Home.
") - .arg(strHotKey) - .arg(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())), - "confirmGoingScale", - tr("Switch", "scale")); + .arg(VBoxGlobal::formatSize(uMinVRAM))); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 45332) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 45333) @@ -300,23 +300,21 @@ /* API: Runtime UI warnings: */ void showRuntimeError(const CConsole &console, bool fFatal, const QString &strErrorId, const QString &strErrorMsg) const; - bool warnAboutVirtNotEnabled64BitsGuest(bool fHWVirtExSupported); - bool warnAboutVirtNotEnabledGuestRequired(bool fHWVirtExSupported); - bool cannotStartWithoutNetworkIf(const QString &strMachineName, const QString &strIfNames); - void cannotStartMachine(const CConsole &console, const QString &strName); - void cannotStartMachine(const CProgress &progress, const QString &strName); - void cannotSendACPIToMachine(); - bool confirmInputCapture(bool *pfAutoConfirmed = NULL); - void remindAboutAutoCapture(); - void remindAboutMouseIntegration(bool fSupportsAbsolute); - bool remindAboutPausedVMInput(); - void cannotEnterSeamlessMode(ULONG uWidth, ULONG uHeight, - ULONG uBpp, ULONG64 uMinVRAM); - int cannotEnterFullscreenMode(ULONG uWidth, ULONG uHeight, - ULONG uBpp, ULONG64 uMinVRAM); - void cannotSwitchScreenInSeamless(quint64 uMinVRAM); - int cannotSwitchScreenInFullscreen(quint64 uMinVRAM); - bool confirmGoingFullscreen(const QString &strHotKey); - bool confirmGoingSeamless(const QString &strHotKey); - bool confirmGoingScale(const QString &strHotKey); + bool warnAboutVirtNotEnabled64BitsGuest(bool fHWVirtExSupported) const; + bool warnAboutVirtNotEnabledGuestRequired(bool fHWVirtExSupported) const; + bool cannotStartWithoutNetworkIf(const QString &strMachineName, const QString &strIfNames) const; + void cannotStartMachine(const CConsole &console, const QString &strName) const; + void cannotStartMachine(const CProgress &progress, const QString &strName) const; + void cannotSendACPIToMachine() const; + bool confirmInputCapture(bool &fAutoConfirmed) const; + void remindAboutAutoCapture() const; + void remindAboutMouseIntegration(bool fSupportsAbsolute) const; + bool remindAboutPausedVMInput() const; + bool confirmGoingFullscreen(const QString &strHotKey) const; + bool confirmGoingSeamless(const QString &strHotKey) const; + bool confirmGoingScale(const QString &strHotKey) const; + bool cannotEnterFullscreenMode(ULONG uWidth, ULONG uHeight, ULONG uBpp, ULONG64 uMinVRAM) const; + void cannotEnterSeamlessMode(ULONG uWidth, ULONG uHeight, ULONG uBpp, ULONG64 uMinVRAM) const; + bool cannotSwitchScreenInFullscreen(quint64 uMinVRAM) const; + void cannotSwitchScreenInSeamless(quint64 uMinVRAM) const; void cannotAttachUSBDevice(const CConsole &console, const QString &device); void cannotAttachUSBDevice(const CConsole &console, const QString &device, Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (revision 45332) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (revision 45333) @@ -1285,5 +1285,5 @@ setAutoCaptureDisabled(true); bool fIsAutoConfirmed = false; - ok = msgCenter().confirmInputCapture(&fIsAutoConfirmed); + ok = msgCenter().confirmInputCapture(fIsAutoConfirmed); if (fIsAutoConfirmed) setAutoCaptureDisabled(false); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp (revision 45332) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp (revision 45333) @@ -877,7 +877,7 @@ * the capture state is to be defined by the dialog result itself: */ uisession()->setAutoCaptureDisabled(true); - bool autoConfirmed = false; - bool ok = msgCenter().confirmInputCapture(&autoConfirmed); - if (autoConfirmed) + bool fIsAutoConfirmed = false; + bool ok = msgCenter().confirmInputCapture(fIsAutoConfirmed); + if (fIsAutoConfirmed) uisession()->setAutoCaptureDisabled(false); /* Otherwise, the disable flag will be reset in the next console view's focus in event (since @@ -889,5 +889,5 @@ * otherwise the mouse is immediately ungrabbed again: */ qApp->processEvents(); -#endif +#endif /* Q_WS_X11 */ machineLogic()->keyboardHandler()->captureKeyboard(uScreenId); captureMouse(uScreenId); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp (revision 45332) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp (revision 45333) @@ -226,5 +226,5 @@ msgCenter().cannotSwitchScreenInSeamless((((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M); else - fSuccess = msgCenter().cannotSwitchScreenInFullscreen((((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M) != AlertButton_Cancel; + fSuccess = msgCenter().cannotSwitchScreenInFullscreen((((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (revision 45332) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (revision 45333) @@ -60,7 +60,5 @@ if (availBits < usedBits) { - int result = msgCenter().cannotEnterFullscreenMode(0, 0, 0, - (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M); - if (result == AlertButton_Cancel) + if (!msgCenter().cannotEnterFullscreenMode(0, 0, 0, (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M)) return false; }