Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp (revision 45358)
@@ -80,5 +80,5 @@
else
{
- msgCenter().cannotOpenLicenseFile(this, strLicenseFileName);
+ msgCenter().cannotOpenLicenseFile(strLicenseFileName, this);
return QDialog::Rejected;
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 45358)
@@ -87,8 +87,8 @@
const QString &strMessage,
const QString &strDetails /* = QString() */,
- const char *pcszAutoConfirmId /* = 0 */,
- int iButton1 /* = 0 */,
- int iButton2 /* = 0 */,
- int iButton3 /* = 0 */,
+ const char *pcszAutoConfirmId /*= 0*/,
+ int iButton1 /*= 0*/,
+ int iButton2 /*= 0*/,
+ int iButton3 /*= 0*/,
const QString &strButtonText1 /* = QString() */,
const QString &strButtonText2 /* = QString() */,
@@ -121,7 +121,7 @@
bool fDefaultOptionValue /* = true */,
const QString &strDetails /* = QString() */,
- int iButton1 /* = 0 */,
- int iButton2 /* = 0 */,
- int iButton3 /* = 0 */,
+ int iButton1 /*= 0*/,
+ int iButton2 /*= 0*/,
+ int iButton3 /*= 0*/,
const QString &strButtonName1 /* = QString() */,
const QString &strButtonName2 /* = QString() */,
@@ -208,5 +208,5 @@
const QString &strTitle,
const QString &strImage /* = "" */,
- QWidget *pParent /* = 0 */,
+ QWidget *pParent /*= 0*/,
int cMinDuration /* = 2000 */)
{
@@ -607,5 +607,5 @@
}
-bool UIMessageCenter::remindAboutInaccessibleMedia() const
+bool UIMessageCenter::warnAboutInaccessibleMedia() const
{
return messageOkCancel(mainWindowShown(), MessageType_Warning,
@@ -617,5 +617,5 @@
"see what media are inaccessible, or press Ignore to "
"ignore this message."),
- "remindAboutInaccessibleMedia",
+ "warnAboutInaccessibleMedia",
tr("Check", "inaccessible media message box"), tr("Cancel"), false);
}
@@ -851,63 +851,5 @@
}
-void UIMessageCenter::cannotAccessUSB(const COMBaseWithEI &object) const
-{
- /* If IMachine::GetUSBController(), IHost::GetUSBDevices() etc. return
- * E_NOTIMPL, it means the USB support is intentionally missing
- * (as in the OSE version). Don't show the error message in this case. */
- COMResult res(object);
- if (res.rc() == E_NOTIMPL)
- return;
- /* Show the message: */
- message(mainWindowShown(), res.isWarning() ? MessageType_Warning : MessageType_Error,
- tr("Failed to access the USB subsystem."),
- formatErrorInfo(res),
- "cannotAccessUSB");
-}
-
-void UIMessageCenter::cannotSetSystemProperties(const CSystemProperties &properties) const
-{
- message(mainWindowShown(), MessageType_Critical,
- tr("Failed to set global VirtualBox properties."),
- formatErrorInfo(properties));
-}
-
-void UIMessageCenter::cannotSaveMachineSettings(const CMachine &machine, QWidget *pParent /*= 0*/) const
-{
- /* Preserve error-info: */
- COMResult res(machine);
- /* Show the message: */
- message(pParent ? pParent : mainWindowShown(), MessageType_Error,
- tr("Failed to save the settings of the virtual machine %1 to %2.")
- .arg(machine.GetName(), machine.GetSettingsFilePath()),
- formatErrorInfo(res));
-}
-
-void UIMessageCenter::warnAboutStateChange(QWidget *pParent /*= 0*/) const
-{
- /* Do not show this async warning more than one at time: */
- if (warningShown("warnAboutStateChange"))
- return;
- setWarningShown("warnAboutStateChange", true);
- /* Show the message: */
- message(pParent ? pParent : mainWindowShown(), MessageType_Warning,
- tr("The virtual machine that you are changing has been started. "
- "Only certain settings can be changed while a machine is running. "
- "All other changes will be lost if you close this window now."));
- /* Allow to show this async warning: */
- setWarningShown("warnAboutStateChange", false);
-}
-
-bool UIMessageCenter::confirmSettingsReloading(QWidget *pParent /*= 0*/) const
-{
- return messageOkCancel(pParent ? pParent : mainWindowShown(), MessageType_Question,
- tr("The machine settings were changed while you were editing them. "
- "You currently have unsaved setting changes.
"
- "Would you like to reload the changed settings or to keep your own changes?
"),
- 0 /* auto-confirm id */,
- tr("Reload settings"), tr("Keep changes"));
-}
-
-bool UIMessageCenter::confirmDeletingHostInterface(const QString &strName, QWidget *pParent /*= 0*/) const
+bool UIMessageCenter::confirmHostInterfaceRemoval(const QString &strName, QWidget *pParent /*= 0*/) const
{
return messageOkCancel(pParent ? pParent : mainWindowShown(), MessageType_Question,
@@ -925,5 +867,99 @@
}
-int UIMessageCenter::askAboutHardDiskAttachmentCreation(const QString &strControllerName, QWidget *pParent /*= 0*/) const
+void UIMessageCenter::cannotCreateHostInterface(const CHost &host, QWidget *pParent /*= 0*/)
+{
+ message(pParent ? pParent : mainWindowShown(), MessageType_Error,
+ tr("Failed to create the host network interface."),
+ formatErrorInfo(host));
+}
+
+void UIMessageCenter::cannotCreateHostInterface(const CProgress &progress, QWidget *pParent /*= 0*/)
+{
+ message(pParent ? pParent : mainWindowShown(), MessageType_Error,
+ tr("Failed to create the host network interface."),
+ !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+}
+
+void UIMessageCenter::cannotRemoveHostInterface(const CHost &host, const QString &strName, QWidget *pParent /*= 0*/)
+{
+ message(pParent ? pParent : mainWindowShown(), MessageType_Error,
+ tr("Failed to remove the host network interface %1.")
+ .arg(strName),
+ formatErrorInfo(host));
+}
+
+void UIMessageCenter::cannotRemoveHostInterface(const CProgress &progress, const QString &strName, QWidget *pParent /*= 0*/)
+{
+ message(pParent ? pParent : mainWindowShown(), MessageType_Error,
+ tr("Failed to remove the host network interface %1.")
+ .arg(strName),
+ !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+}
+
+void UIMessageCenter::cannotSetSystemProperties(const CSystemProperties &properties, QWidget *pParent /*= 0*/) const
+{
+ message(pParent ? pParent : mainWindowShown(), MessageType_Critical,
+ tr("Failed to set global VirtualBox properties."),
+ formatErrorInfo(properties));
+}
+
+void UIMessageCenter::warnAboutUnaccessibleUSB(const COMBaseWithEI &object, QWidget *pParent /*= 0*/) const
+{
+ /* If IMachine::GetUSBController(), IHost::GetUSBDevices() etc. return
+ * E_NOTIMPL, it means the USB support is intentionally missing
+ * (as in the OSE version). Don't show the error message in this case. */
+ COMResult res(object);
+ if (res.rc() == E_NOTIMPL)
+ return;
+ /* Show the message: */
+ message(pParent ? pParent : mainWindowShown(), res.isWarning() ? MessageType_Warning : MessageType_Error,
+ tr("Failed to access the USB subsystem."),
+ formatErrorInfo(res),
+ "warnAboutUnaccessibleUSB");
+}
+
+void UIMessageCenter::warnAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent)
+{
+ if (warningShown("warnAboutUnsupportedUSB2"))
+ return;
+ setWarningShown("warnAboutUnsupportedUSB2", true);
+
+ message(pParent ? pParent : mainMachineWindowShown(), MessageType_Warning,
+ tr("USB 2.0 is currently enabled for this virtual machine. "
+ "However, this requires the %1 to be installed.
"
+ "Please install the Extension Pack from the VirtualBox download site. "
+ "After this you will be able to re-enable USB 2.0. "
+ "It will be disabled in the meantime unless you cancel the current settings changes.
")
+ .arg(strExtPackName));
+
+ setWarningShown("warnAboutUnsupportedUSB2", false);
+}
+
+void UIMessageCenter::warnAboutStateChange(QWidget *pParent /*= 0*/) const
+{
+ /* Do not show this async warning more than one at time: */
+ if (warningShown("warnAboutStateChange"))
+ return;
+ setWarningShown("warnAboutStateChange", true);
+ /* Show the message: */
+ message(pParent ? pParent : mainWindowShown(), MessageType_Warning,
+ tr("The virtual machine that you are changing has been started. "
+ "Only certain settings can be changed while a machine is running. "
+ "All other changes will be lost if you close this window now."));
+ /* Allow to show this async warning: */
+ setWarningShown("warnAboutStateChange", false);
+}
+
+bool UIMessageCenter::confirmSettingsReloading(QWidget *pParent /*= 0*/) const
+{
+ return messageOkCancel(pParent ? pParent : mainWindowShown(), MessageType_Question,
+ tr("The machine settings were changed while you were editing them. "
+ "You currently have unsaved setting changes.
"
+ "Would you like to reload the changed settings or to keep your own changes?
"),
+ 0 /* auto-confirm id */,
+ tr("Reload settings"), tr("Keep changes"));
+}
+
+int UIMessageCenter::confirmHardDiskAttachmentCreation(const QString &strControllerName, QWidget *pParent /*= 0*/) const
{
return message(pParent ? pParent : mainWindowShown(), MessageType_Question,
@@ -939,5 +975,5 @@
}
-int UIMessageCenter::askAboutOpticalAttachmentCreation(const QString &strControllerName, QWidget *pParent /*= 0*/) const
+int UIMessageCenter::confirmOpticalAttachmentCreation(const QString &strControllerName, QWidget *pParent /*= 0*/) const
{
return message(pParent ? pParent : mainWindowShown(), MessageType_Question,
@@ -954,5 +990,5 @@
}
-int UIMessageCenter::askAboutFloppyAttachmentCreation(const QString &strControllerName, QWidget *pParent /*= 0*/) const
+int UIMessageCenter::confirmFloppyAttachmentCreation(const QString &strControllerName, QWidget *pParent /*= 0*/) const
{
return message(pParent ? pParent : mainWindowShown(), MessageType_Question,
@@ -979,4 +1015,35 @@
}
+void UIMessageCenter::cannotAttachDevice(const CMachine &machine, UIMediumType type,
+ const QString &strLocation, const StorageSlot &storageSlot,
+ QWidget *pParent /*= 0*/)
+{
+ QString strMessage;
+ switch (type)
+ {
+ case UIMediumType_HardDisk:
+ {
+ strMessage = tr("Failed to attach the hard disk (%1) to the slot %2 of the machine %3.")
+ .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
+ break;
+ }
+ case UIMediumType_DVD:
+ {
+ strMessage = tr("Failed to attach the CD/DVD device (%1) to the slot %2 of the machine %3.")
+ .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
+ break;
+ }
+ case UIMediumType_Floppy:
+ {
+ strMessage = tr("Failed to attach the floppy device (%1) to the slot %2 of the machine %3.")
+ .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
+ break;
+ }
+ default:
+ break;
+ }
+ message(pParent ? pParent : mainWindowShown(), MessageType_Error, strMessage, formatErrorInfo(machine));
+}
+
void UIMessageCenter::warnAboutIncorrectPort(QWidget *pParent /*= 0*/) const
{
@@ -991,4 +1058,63 @@
tr("There are unsaved changes in the port forwarding configuration.
"
"If you proceed your changes will be discarded.
"));
+}
+
+void UIMessageCenter::cannotCreateSharedFolder(const CMachine &machine, const QString &strMachineName,
+ const QString &strName, const QString &strPath,
+ QWidget *pParent /*= 0*/)
+{
+ message(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
+ tr("Failed to create the shared folder %1 (pointing to "
+ "%2) for the virtual machine %3.")
+ .arg(strName, strPath, strMachineName),
+ formatErrorInfo(machine));
+}
+
+void UIMessageCenter::cannotCreateSharedFolder(const CConsole &console, const QString &strMachineName,
+ const QString &strName, const QString &strPath,
+ QWidget *pParent /*= 0*/)
+{
+ message(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
+ tr("Failed to create the shared folder %1 (pointing to "
+ "%2) for the virtual machine %3.")
+ .arg(strName, strPath, strMachineName),
+ formatErrorInfo(console));
+}
+
+void UIMessageCenter::cannotRemoveSharedFolder(const CMachine &machine, const QString &strMachineName,
+ const QString &strName, const QString &strPath,
+ QWidget *pParent /*= 0*/)
+{
+ message(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
+ tr("Failed to remove the shared folder %1 (pointing to "
+ "%2) from the virtual machine %3.
"
+ "Please close all programs in the guest OS that "
+ "may be using this shared folder and try again.
")
+ .arg(strName, strPath, strMachineName),
+ formatErrorInfo(machine));
+}
+
+void UIMessageCenter::cannotRemoveSharedFolder(const CConsole &console, const QString &strMachineName,
+ const QString &strName, const QString &strPath,
+ QWidget *pParent /*= 0*/)
+{
+ message(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
+ tr("Failed to remove the shared folder %1 (pointing to "
+ "%2) from the virtual machine %3.
"
+ "Please close all programs in the guest OS that "
+ "may be using this shared folder and try again.
")
+ .arg(strName, strPath, strMachineName),
+ formatErrorInfo(console));
+}
+
+void UIMessageCenter::cannotSaveMachineSettings(const CMachine &machine, QWidget *pParent /*= 0*/) const
+{
+ /* Preserve error-info: */
+ COMResult res(machine);
+ /* Show the message: */
+ message(pParent ? pParent : mainWindowShown(), MessageType_Error,
+ tr("Failed to save the settings of the virtual machine %1 to %2.")
+ .arg(machine.GetName(), machine.GetSettingsFilePath()),
+ formatErrorInfo(res));
}
@@ -2208,12 +2334,28 @@
}
-void UIMessageCenter::cannotOpenLicenseFile(QWidget *pParent, const QString &strPath)
-{
- message(pParent, MessageType_Error,
- tr("Failed to open the license file %1. "
- "Check file permissions.").arg(strPath));
-}
-
-bool UIMessageCenter::askForOverridingFile(const QString &strPath, QWidget *pParent /* = 0 */)
+#ifdef VBOX_WITH_DRAG_AND_DROP
+void UIMessageCenter::cannotDropData(const CGuest &guest, QWidget *pParent /*= 0*/) const
+{
+ message(pParent ? pParent : mainWindowShown(), MessageType_Error,
+ tr("Failed to drop data."),
+ formatErrorInfo(guest));
+}
+
+void UIMessageCenter::cannotDropData(const CProgress &progress, QWidget *pParent /*= 0*/) const
+{
+ message(pParent ? pParent : mainWindowShown(), MessageType_Error,
+ tr("Failed to drop data."),
+ !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+}
+#endif /* VBOX_WITH_DRAG_AND_DROP */
+
+void UIMessageCenter::cannotOpenLicenseFile(const QString &strPath, QWidget *pParent /*= 0*/)
+{
+ message(pParent ? pParent : mainWindowShown(), MessageType_Error,
+ tr("Failed to open the license file %1. Check file permissions.")
+ .arg(strPath));
+}
+
+bool UIMessageCenter::confirmOverridingFile(const QString &strPath, QWidget *pParent /*= 0*/)
{
return messageYesNo(pParent, MessageType_Question,
@@ -2223,9 +2365,9 @@
}
-bool UIMessageCenter::askForOverridingFiles(const QVector &strPaths, QWidget *pParent /* = 0 */)
+bool UIMessageCenter::confirmOverridingFiles(const QVector &strPaths, QWidget *pParent /*= 0*/)
{
/* If it is only one file use the single question versions above: */
if (strPaths.size() == 1)
- return askForOverridingFile(strPaths.at(0), pParent);
+ return confirmOverridingFile(strPaths.at(0), pParent);
else if (strPaths.size() > 1)
return messageYesNo(pParent, MessageType_Question,
@@ -2238,14 +2380,14 @@
}
-bool UIMessageCenter::askForOverridingFileIfExists(const QString &strPath, QWidget *pParent /* = 0 */)
+bool UIMessageCenter::confirmOverridingFileIfExists(const QString &strPath, QWidget *pParent /*= 0*/)
{
QFileInfo fi(strPath);
if (fi.exists())
- return askForOverridingFile(strPath, pParent);
+ return confirmOverridingFile(strPath, pParent);
else
return true;
}
-bool UIMessageCenter::askForOverridingFilesIfExists(const QVector &strPaths, QWidget *pParent /* = 0 */)
+bool UIMessageCenter::confirmOverridingFilesIfExists(const QVector &strPaths, QWidget *pParent /*= 0*/)
{
QVector existingFiles;
@@ -2258,7 +2400,7 @@
/* If it is only one file use the single question versions above: */
if (existingFiles.size() == 1)
- return askForOverridingFileIfExists(existingFiles.at(0), pParent);
+ return confirmOverridingFileIfExists(existingFiles.at(0), pParent);
else if (existingFiles.size() > 1)
- return askForOverridingFiles(existingFiles, pParent);
+ return confirmOverridingFiles(existingFiles, pParent);
else
return true;
@@ -2332,161 +2474,7 @@
}
-void UIMessageCenter::cannotCreateHostInterface(const CHost &host, QWidget *pParent /* = 0 */)
-{
- message(pParent ? pParent : mainWindowShown(), MessageType_Error,
- tr("Failed to create the host-only network interface."),
- formatErrorInfo(host));
-}
-
-void UIMessageCenter::cannotCreateHostInterface(const CProgress &progress, QWidget *pParent /* = 0 */)
-{
- message(pParent ? pParent : mainWindowShown(), MessageType_Error,
- tr("Failed to create the host-only network interface."),
- formatErrorInfo(progress.GetErrorInfo()));
-}
-
-void UIMessageCenter::cannotRemoveHostInterface(const CHost &host, const CHostNetworkInterface &iface, QWidget *pParent /* = 0 */)
-{
- message(pParent ? pParent : mainWindowShown(), MessageType_Error,
- tr("Failed to remove the host network interface %1.")
- .arg(iface.GetName()),
- formatErrorInfo(host));
-}
-
-void UIMessageCenter::cannotRemoveHostInterface(const CProgress &progress, const CHostNetworkInterface &iface, QWidget *pParent /* = 0 */)
-{
- message(pParent ? pParent : mainWindowShown(), MessageType_Error,
- tr("Failed to remove the host network interface %1.")
- .arg(iface.GetName()),
- formatErrorInfo(progress.GetErrorInfo()));
-}
-
-void UIMessageCenter::cannotAttachDevice(const CMachine &machine, UIMediumType type,
- const QString &strLocation, const StorageSlot &storageSlot,
- QWidget *pParent /* = 0 */)
-{
- QString strMessage;
- switch (type)
- {
- case UIMediumType_HardDisk:
- {
- strMessage = tr("Failed to attach the hard disk (%1) to the slot %2 of the machine %3.")
- .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
- break;
- }
- case UIMediumType_DVD:
- {
- strMessage = tr("Failed to attach the CD/DVD device (%1) to the slot %2 of the machine %3.")
- .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
- break;
- }
- case UIMediumType_Floppy:
- {
- strMessage = tr("Failed to attach the floppy device (%1) to the slot %2 of the machine %3.")
- .arg(strLocation).arg(gpConverter->toString(storageSlot)).arg(CMachine(machine).GetName());
- break;
- }
- default:
- break;
- }
- message(pParent ? pParent : mainWindowShown(), MessageType_Error, strMessage, formatErrorInfo(machine));
-}
-
-void UIMessageCenter::cannotCreateSharedFolder(const CMachine &machine, const QString &strName,
- const QString &strPath, QWidget *pParent /* = 0 */)
-{
- message(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
- tr("Failed to create the shared folder %1 "
- "(pointing to %2) "
- "for the virtual machine %3.")
- .arg(strName)
- .arg(strPath)
- .arg(CMachine(machine).GetName()),
- formatErrorInfo(machine));
-}
-
-void UIMessageCenter::cannotRemoveSharedFolder(const CMachine &machine, const QString &strName,
- const QString &strPath, QWidget *pParent /* = 0 */)
-{
- message(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
- tr("Failed to remove the shared folder %1 "
- "(pointing to %2) "
- "from the virtual machine %3.")
- .arg(strName)
- .arg(strPath)
- .arg(CMachine(machine).GetName()),
- formatErrorInfo(machine));
-}
-
-void UIMessageCenter::cannotCreateSharedFolder(const CConsole &console, const QString &strName,
- const QString &strPath, QWidget *pParent /* = 0 */)
-{
- message(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
- tr("Failed to create the shared folder %1 "
- "(pointing to %2) "
- "for the virtual machine %3.")
- .arg(strName)
- .arg(strPath)
- .arg(CConsole(console).GetMachine().GetName()),
- formatErrorInfo(console));
-}
-
-void UIMessageCenter::cannotRemoveSharedFolder(const CConsole &console, const QString &strName,
- const QString &strPath, QWidget *pParent /* = 0 */)
-{
- message(pParent ? pParent : mainMachineWindowShown(), MessageType_Error,
- tr("Failed to remove the shared folder %1 "
- "(pointing to %2) "
- "from the virtual machine %3.
"
- "Please close all programs in the guest OS that "
- "may be using this shared folder and try again.
")
- .arg(strName)
- .arg(strPath)
- .arg(CConsole(console).GetMachine().GetName()),
- formatErrorInfo(console));
-}
-
-#ifdef VBOX_WITH_DRAG_AND_DROP
-void UIMessageCenter::cannotDropData(const CGuest &guest,
- QWidget *pParent /* = 0 */) const
-{
- message(pParent ? pParent : mainWindowShown(),
- MessageType_Error,
- tr("Failed to drop data."),
- formatErrorInfo(guest));
-}
-
-void UIMessageCenter::cannotDropData(const CProgress &progress,
- QWidget *pParent /* = 0 */) const
-{
- AssertWrapperOk(progress);
-
- message(pParent ? pParent : mainWindowShown(),
- MessageType_Error,
- tr("Failed to drop data."),
- formatErrorInfo(progress.GetErrorInfo()));
-}
-#endif /* VBOX_WITH_DRAG_AND_DROP */
-
void UIMessageCenter::remindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP)
{
emit sigRemindAboutWrongColorDepth(uRealBPP, uWantedBPP);
-}
-
-void UIMessageCenter::remindAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent)
-{
- if (warningShown("remindAboutUnsupportedUSB2"))
- return;
- setWarningShown("remindAboutUnsupportedUSB2", true);
-
- message(pParent ? pParent : mainMachineWindowShown(), MessageType_Warning,
- tr("USB 2.0 is currently enabled for this virtual machine. "
- "However, this requires the %1 to be installed.
"
- "Please install the Extension Pack from the VirtualBox download site. "
- "After this you will be able to re-enable USB 2.0. "
- "It will be disabled in the meantime unless you cancel the current settings changes.
")
- .arg(strExtPackName));
-
- setWarningShown("remindAboutUnsupportedUSB2", false);
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h (revision 45358)
@@ -222,5 +222,5 @@
void cannotRemoveMachine(const CMachine &machine) const;
void cannotRemoveMachine(const CMachine &machine, const CProgress &progress) const;
- bool remindAboutInaccessibleMedia() const;
+ bool warnAboutInaccessibleMedia() const;
bool confirmDiscardSavedState(const QString &strNames) const;
bool confirmResetMachine(const QString &strNames) const;
@@ -248,17 +248,29 @@
void cannotRemoveSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName) const;
- /* API: Settings warnings: */
- void cannotAccessUSB(const COMBaseWithEI &object) const;
- void cannotSetSystemProperties(const CSystemProperties &properties) const;
- void cannotSaveMachineSettings(const CMachine &machine, QWidget *pParent = 0) const;
+ /* API: Global settings warnings: */
+ bool confirmHostInterfaceRemoval(const QString &strName, QWidget *pParent = 0) const;
+ void cannotCreateHostInterface(const CHost &host, QWidget *pParent = 0);
+ void cannotCreateHostInterface(const CProgress &progress, QWidget *pParent = 0);
+ void cannotRemoveHostInterface(const CHost &host, const QString &strName, QWidget *pParent = 0);
+ void cannotRemoveHostInterface(const CProgress &progress, const QString &strName, QWidget *pParent = 0);
+ void cannotSetSystemProperties(const CSystemProperties &properties, QWidget *pParent = 0) const;
+
+ /* API: Machine settings warnings: */
+ void warnAboutUnaccessibleUSB(const COMBaseWithEI &object, QWidget *pParent = 0) const;
+ void warnAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent = 0);
void warnAboutStateChange(QWidget *pParent = 0) const;
bool confirmSettingsReloading(QWidget *pParent = 0) const;
- bool confirmDeletingHostInterface(const QString &strName, QWidget *pParent = 0) const;
- int askAboutHardDiskAttachmentCreation(const QString &strControllerName, QWidget *pParent = 0) const;
- int askAboutOpticalAttachmentCreation(const QString &strControllerName, QWidget *pParent = 0) const;
- int askAboutFloppyAttachmentCreation(const QString &strControllerName, QWidget *pParent = 0) const;
+ int confirmHardDiskAttachmentCreation(const QString &strControllerName, QWidget *pParent = 0) const;
+ int confirmOpticalAttachmentCreation(const QString &strControllerName, QWidget *pParent = 0) const;
+ int confirmFloppyAttachmentCreation(const QString &strControllerName, QWidget *pParent = 0) const;
int confirmRemovingOfLastDVDDevice(QWidget *pParent = 0) const;
+ void cannotAttachDevice(const CMachine &machine, UIMediumType type, const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0);
void warnAboutIncorrectPort(QWidget *pParent = 0) const;
bool confirmCancelingPortForwardingDialog(QWidget *pParent = 0) const;
+ void cannotCreateSharedFolder(const CMachine &machine, const QString &strMachineName, const QString &strName, const QString &strPath, QWidget *pParent = 0);
+ void cannotCreateSharedFolder(const CConsole &console, const QString &strMachineName, const QString &strName, const QString &strPath, QWidget *pParent = 0);
+ void cannotRemoveSharedFolder(const CMachine &machine, const QString &strMachineName, const QString &strName, const QString &strPath, QWidget *pParent = 0);
+ void cannotRemoveSharedFolder(const CConsole &console, const QString &strMachineName, const QString &strName, const QString &strPath, QWidget *pParent = 0);
+ void cannotSaveMachineSettings(const CMachine &machine, QWidget *pParent = 0) const;
/* API: Virtual Medium Manager warnings: */
@@ -356,13 +368,20 @@
void warnAboutExtPackInstalled(const QString &strPackName, QWidget *pParent = 0) const;
+#ifdef VBOX_WITH_DRAG_AND_DROP
+ /* API: Drag&drop warnings: */
+ void cannotDropData(const CGuest &guest, QWidget *pParent = 0) const;
+ void cannotDropData(const CProgress &progress, QWidget *pParent = 0) const;
+#endif /* VBOX_WITH_DRAG_AND_DROP */
+
/* API: License-viewer warnings: */
- void cannotOpenLicenseFile(QWidget *pParent, const QString &strPath);
+ void cannotOpenLicenseFile(const QString &strPath, QWidget *pParent = 0);
/* API: File-dialog warnings: */
- bool askForOverridingFile(const QString &strPath, QWidget *pParent = 0);
- bool askForOverridingFiles(const QVector &strPaths, QWidget *pParent = 0);
- bool askForOverridingFileIfExists(const QString &strPath, QWidget *pParent = 0);
- bool askForOverridingFilesIfExists(const QVector &strPaths, QWidget *pParent = 0);
-
+ bool confirmOverridingFile(const QString &strPath, QWidget *pParent = 0);
+ bool confirmOverridingFiles(const QVector &strPaths, QWidget *pParent = 0);
+ bool confirmOverridingFileIfExists(const QString &strPath, QWidget *pParent = 0);
+ bool confirmOverridingFilesIfExists(const QVector &strPaths, QWidget *pParent = 0);
+
+ /* API: Static helpers: */
static QString formatRC(HRESULT rc);
static QString formatErrorInfo(const COMErrorInfo &info, HRESULT wrapperRC = S_OK);
@@ -371,28 +390,10 @@
static QString formatErrorInfo(const COMResult &rc);
- /* Stuff supporting interthreading: */
- void cannotCreateHostInterface(const CHost &host, QWidget *pParent = 0);
- void cannotCreateHostInterface(const CProgress &progress, QWidget *pParent = 0);
- void cannotRemoveHostInterface(const CHost &host, const CHostNetworkInterface &iface, QWidget *pParent = 0);
- void cannotRemoveHostInterface(const CProgress &progress, const CHostNetworkInterface &iface, QWidget *pParent = 0);
- void cannotAttachDevice(const CMachine &machine, UIMediumType type,
- const QString &strLocation, const StorageSlot &storageSlot, QWidget *pParent = 0);
- void cannotCreateSharedFolder(const CMachine &machine, const QString &strName,
- const QString &strPath, QWidget *pParent = 0);
- void cannotRemoveSharedFolder(const CMachine &machine, const QString &strName,
- const QString &strPath, QWidget *pParent = 0);
- void cannotCreateSharedFolder(const CConsole &console, const QString &strName,
- const QString &strPath, QWidget *pParent = 0);
- void cannotRemoveSharedFolder(const CConsole &console, const QString &strName,
- const QString &strPath, QWidget *pParent = 0);
-#ifdef VBOX_WITH_DRAG_AND_DROP
- void cannotDropData(const CGuest &guest, QWidget *pParent = 0) const;
- void cannotDropData(const CProgress &progress, QWidget *pParent = 0) const;
-#endif /* VBOX_WITH_DRAG_AND_DROP */
+ /* API: Async stuff: */
void remindAboutWrongColorDepth(ulong uRealBPP, ulong uWantedBPP);
- void remindAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent = 0);
public slots:
+ /* Handlers: Help menu stuff: */
void sltShowHelpWebDialog();
void sltShowHelpAboutDialog();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp (revision 45358)
@@ -94,9 +94,8 @@
CProgress progress = guest.DragHGPutData(screenId, format, dv);
- if ( guest.isOk()
- && !progress.isNull())
+ if (guest.isOk())
{
msgCenter().showModalProgressDialog(progress, tr("Dropping data ..."), ":/progress_dnd_hg_90px.png", pParent);
- if (!progress.GetCanceled() && progress.isOk() && progress.GetResultCode() != 0)
+ if (!progress.GetCanceled() && (!progress.isOk() || progress.GetResultCode() != 0))
{
msgCenter().cannotDropData(progress, pParent);
@@ -185,34 +184,38 @@
* want the data in the specified mime-type. */
CProgress progress = guest.DragGHDropped(mimeType, UIDnDHandler::toVBoxDnDAction(m_defAction));
- if ( guest.isOk()
- && !progress.isNull())
+ if (guest.isOk())
{
msgCenter().showModalProgressDialog(progress, tr("Dropping data ..."), ":/progress_dnd_gh_90px.png", m_pParent);
- if (!progress.GetCanceled() && progress.isOk() && progress.GetResultCode() != 0)
- msgCenter().cannotDropData(progress, m_pParent);
- else if (!progress.GetCanceled())
+ if (!progress.GetCanceled())
{
- /* After the data is successfully arrived from the guest, we
- * query it from Main. */
- QVector data = guest.DragGHGetData();
- if (!data.isEmpty())
+ if (progress.isOk() && progress.GetResultCode() == 0)
{
-// printf("qt data (%d, %d, '%s'): %s\n", data.size(), type, qPrintable(mimeType), data.data());
- /* Todo: not sure what to add here more: needs more testing. */
- switch (type)
+ /* After the data is successfully arrived from the guest, we query it from Main. */
+ QVector data = guest.DragGHGetData();
+ if (!data.isEmpty())
{
- case QVariant::String: m_data = QVariant(QString(reinterpret_cast(data.data()))); break;
- case QVariant::ByteArray:
+ /* Todo: not sure what to add here more: needs more testing. */
+ switch (type)
{
- QByteArray ba(reinterpret_cast(data.constData()), data.size());
- m_data = QVariant(ba);
- break;
+ case QVariant::String:
+ {
+ m_data = QVariant(QString(reinterpret_cast(data.data())));
+ break;
+ }
+ case QVariant::ByteArray:
+ {
+ QByteArray ba(reinterpret_cast(data.constData()), data.size());
+ m_data = QVariant(ba);
+ break;
+ }
+ default: break;
}
- default: break;
}
+ m_fState = Finished;
}
- m_fState = Finished;
+ else
+ msgCenter().cannotDropData(progress, m_pParent);
}
- if (progress.GetCanceled())
+ else
m_fState = Canceled;
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 45358)
@@ -192,5 +192,5 @@
/* Warn the user about inaccessible medium: */
- if (it != list.end() && msgCenter().remindAboutInaccessibleMedia())
+ if (it != list.end() && msgCenter().warnAboutInaccessibleMedia())
{
/* Open the MM window (without refresh): */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp (revision 45358)
@@ -466,5 +466,5 @@
/* If properties are not OK => show the error: */
if (!newProperties.isOk())
- msgCenter().cannotSetSystemProperties(newProperties);
+ msgCenter().cannotSetSystemProperties(newProperties, this);
/* Else save the new settings if they were changed: */
else if (!(newSettings == settings))
@@ -530,5 +530,5 @@
/* Show the host error message if any: */
if (!host.isReallyOk())
- msgCenter().cannotAccessUSB(host);
+ msgCenter().warnAboutUnaccessibleUSB(host, this);
/* Check if USB is implemented: */
CHostUSBDeviceFilterVector filters = host.GetUSBDeviceFilters();
@@ -1116,5 +1116,5 @@
/* Show the machine error message if any: */
if (!m_machine.isReallyOk() && !controller.isNull() && controller.GetEnabled())
- msgCenter().cannotAccessUSB(m_machine);
+ msgCenter().warnAboutUnaccessibleUSB(m_machine, this);
/* Check if USB is implemented: */
if (controller.isNull() || !controller.GetProxyAvailable())
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (revision 45358)
@@ -205,5 +205,5 @@
{
/* Show installation progress: */
- msgCenter().showModalProgressDialog(progress, tr("Extensions"), "", pParent);
+ msgCenter().showModalProgressDialog(progress, tr("Extensions"), ":/progress_install_guest_additions_90px.png", pParent);
if (!progress.GetCanceled())
{
@@ -422,5 +422,5 @@
{
/* Show uninstallation progress: */
- msgCenter().showModalProgressDialog(progress, tr("Extensions"), "", this);
+ msgCenter().showModalProgressDialog(progress, tr("Extensions"), ":/progress_install_guest_additions_90px.png", this);
if (progress.isOk() && progress.GetResultCode() == 0)
{
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp (revision 45358)
@@ -419,7 +419,6 @@
if (host.isOk())
{
- msgCenter().showModalProgressDialog(progress, tr("Networking"),
- ":/nw_32px.png", window(), 0);
- if (progress.GetResultCode() == 0)
+ msgCenter().showModalProgressDialog(progress, tr("Networking"), ":/nw_32px.png", this, 0);
+ if (progress.isOk() && progress.GetResultCode() == 0)
{
/* Create DHCP server: */
@@ -431,5 +430,4 @@
}
AssertMsg(!dhcp.isNull(), ("DHCP server creation failed!\n"));
-
/* Append cache with new item: */
appendCacheItem(iface);
@@ -453,5 +451,5 @@
QString strInterfaceName(pItem->name());
/* Asking user about deleting selected network interface: */
- if (!msgCenter().confirmDeletingHostInterface(strInterfaceName, this))
+ if (!msgCenter().confirmHostInterfaceRemoval(strInterfaceName, this))
return;
@@ -472,7 +470,6 @@
if (host.isOk())
{
- msgCenter().showModalProgressDialog(progress, tr("Networking"),
- ":/nw_32px.png", window(), 0);
- if (progress.GetResultCode() == 0)
+ msgCenter().showModalProgressDialog(progress, tr("Networking"), ":/nw_32px.png", this, 0);
+ if (progress.isOk() && progress.GetResultCode() == 0)
{
/* Remove list item: */
@@ -482,8 +479,8 @@
}
else
- msgCenter().cannotRemoveHostInterface(progress, iface, this);
+ msgCenter().cannotRemoveHostInterface(progress, strInterfaceName, this);
}
else
- msgCenter().cannotRemoveHostInterface(host, iface, this);
+ msgCenter().cannotRemoveHostInterface(host, strInterfaceName, this);
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp (revision 45358)
@@ -750,4 +750,6 @@
if (!sharedFolder.isNull())
{
+ /* Get machine-name: */
+ QString strMachineName(m_machine.GetName());
/* Remove existing shared folder: */
switch(sharedFoldersType)
@@ -761,5 +763,5 @@
setFailed(true);
/* Show error message: */
- msgCenter().cannotRemoveSharedFolder(m_machine, strName, strPath);
+ msgCenter().cannotRemoveSharedFolder(m_machine, strMachineName, strName, strPath, this);
/* Finish early: */
return false;
@@ -775,5 +777,5 @@
setFailed(true);
/* Show error message: */
- msgCenter().cannotRemoveSharedFolder(m_console, strName, strPath);
+ msgCenter().cannotRemoveSharedFolder(m_console, strMachineName, strName, strPath, this);
/* Finish early: */
return false;
@@ -807,4 +809,6 @@
if (sharedFolder.isNull())
{
+ /* Get machine-name: */
+ QString strMachineName(m_machine.GetName());
/* Create new shared folder: */
switch(sharedFoldersType)
@@ -818,5 +822,5 @@
setFailed(true);
/* Show error message: */
- msgCenter().cannotCreateSharedFolder(m_machine, strName, strPath);
+ msgCenter().cannotCreateSharedFolder(m_machine, strMachineName, strName, strPath, this);
/* Finish early: */
return false;
@@ -833,5 +837,5 @@
setFailed(true);
/* Show error message: */
- msgCenter().cannotCreateSharedFolder(m_console, strName, strPath);
+ msgCenter().cannotCreateSharedFolder(m_console, strMachineName, strName, strPath, this);
/* Finish early: */
return false;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (revision 45358)
@@ -3045,5 +3045,5 @@
case KDeviceType_HardDisk:
{
- int iAnswer = msgCenter().askAboutHardDiskAttachmentCreation(strControllerName, this);
+ int iAnswer = msgCenter().confirmHardDiskAttachmentCreation(strControllerName, this);
if (iAnswer == AlertButton_Yes)
strMediumId = getWithNewHDWizard();
@@ -3054,5 +3054,5 @@
case KDeviceType_DVD:
{
- int iAnswer = msgCenter().askAboutOpticalAttachmentCreation(strControllerName, this);
+ int iAnswer = msgCenter().confirmOpticalAttachmentCreation(strControllerName, this);
if (iAnswer == AlertButton_Yes)
strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_DVD, this, strMachineFolder);
@@ -3063,5 +3063,5 @@
case KDeviceType_Floppy:
{
- int iAnswer = msgCenter().askAboutFloppyAttachmentCreation(strControllerName, this);
+ int iAnswer = msgCenter().confirmFloppyAttachmentCreation(strControllerName, this);
if (iAnswer == AlertButton_Yes)
strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_Floppy, this, strMachineFolder);
@@ -3513,6 +3513,6 @@
/* Show error message: */
msgCenter().cannotAttachDevice(m_machine, mediumTypeToLocal(attachmentDeviceType),
- vboxMedium.location(),
- StorageSlot(controllerBus, iAttachmentPort, iAttachmentDevice), this);
+ vboxMedium.location(),
+ StorageSlot(controllerBus, iAttachmentPort, iAttachmentDevice), this);
}
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp (revision 45358)
@@ -573,5 +573,5 @@
"It will be disabled in the meantime unless you cancel the current settings changes.")
.arg(GUI_ExtPackName);
- msgCenter().remindAboutUnsupportedUSB2(GUI_ExtPackName, this);
+ msgCenter().warnAboutUnsupportedUSB2(GUI_ExtPackName, this);
mCbUSB2->setChecked(false);
return true;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 45357)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 45358)
@@ -97,5 +97,5 @@
QVector exists = explorer.Exists(files);
/* Check if the file exists already, if yes get confirmation for overwriting from the user. */
- if (!msgCenter().askForOverridingFiles(exists, this))
+ if (!msgCenter().confirmOverridingFiles(exists, this))
return false;
/* Ok all is confirmed so delete all the files which exists: */