Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	(revision 45280)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	(revision 45281)
@@ -457,31 +457,22 @@
 }
 
-void UIMessageCenter::cannotDeleteMachine(const CMachine &machine)
-{
-    /* Preserve error-info: */
-    COMResult res(machine);
-    /* Show the message: */
-    message(mainWindowShown(),
-            MessageType_Error,
-            tr("Failed to remove the virtual machine <b>%1</b>.").arg(machine.GetName()),
-            !machine.isOk() ? formatErrorInfo(machine) : formatErrorInfo(res));
-}
-
-void UIMessageCenter::cannotDeleteMachine(const CMachine &machine, const CProgress &progress)
-{
-    message(mainWindowShown(),
-            MessageType_Error,
-            tr("Failed to remove the virtual machine <b>%1</b>.").arg(machine.GetName()),
-            formatErrorInfo(progress.GetErrorInfo()));
-}
-
-void UIMessageCenter::cannotDiscardSavedState(const CConsole &console)
-{
-    /* Preserve error-info: */
-    COMResult res(console);
-    /* Show the message: */
+void UIMessageCenter::cannotResolveCollisionAutomatically(const QString &strName, const QString &strGroupName)
+{
     message(mainWindowShown(), MessageType_Error,
-            tr("Failed to discard the saved state of the virtual machine <b>%1</b>.").arg(console.GetMachine().GetName()),
-            formatErrorInfo(res));
+            tr("<p>You are trying to move machine <nobr><b>%1</b></nobr> "
+               "to group <nobr><b>%2</b></nobr> which already have sub-group <nobr><b>%1</b></nobr>.</p>"
+               "<p>Please resolve this name-conflict and try again.</p>")
+               .arg(strName, strGroupName));
+}
+
+bool UIMessageCenter::confirmAutomaticCollisionResolve(const QString &strName, const QString &strGroupName)
+{
+    return messageOkCancel(mainWindowShown(), MessageType_Question,
+                           tr("<p>You are trying to move group <nobr><b>%1</b></nobr> "
+                              "to group <nobr><b>%2</b></nobr> which already have another item with the same name.</p>"
+                              "<p>Would you like to automatically rename it?</p>")
+                              .arg(strName, strGroupName),
+                           0, /* auto-confirm id */
+                           tr("Rename"));
 }
 
@@ -500,37 +491,13 @@
 }
 
-void UIMessageCenter::cannotResolveCollisionAutomatically(const QString &strName, const QString &strGroupName)
-{
-    message(mainWindowShown(), MessageType_Error,
-            tr("<p>You are trying to move machine <nobr><b>%1</b></nobr> "
-               "to group <nobr><b>%2</b></nobr> which already have sub-group <nobr><b>%1</b></nobr>.</p>"
-               "<p>Please resolve this name-conflict and try again.</p>")
-               .arg(strName, strGroupName));
-}
-
-bool UIMessageCenter::confirmAutomaticCollisionResolve(const QString &strName, const QString &strGroupName)
+bool UIMessageCenter::confirmMachineItemRemoval(const QStringList &names)
 {
     return messageOkCancel(mainWindowShown(), MessageType_Question,
-                           tr("<p>You are trying to move group <nobr><b>%1</b></nobr> "
-                              "to group <nobr><b>%2</b></nobr> which already have another item with the same name.</p>"
-                              "<p>Would you like to automatically rename it?</p>")
-                              .arg(strName, strGroupName),
+                           tr("<p>You are about to remove following virtual "
+                              "machine items from the machine list:</p>"
+                              "<p><b>%1</b></p>"
+                              "<p>Do you wish to proceed?</p>").arg(names.join(", ")),
                            0, /* auto-confirm id */
-                           tr("Rename"));
-}
-
-int UIMessageCenter::confirmMachineItemRemoval(const QStringList &names)
-{
-    return message(&vboxGlobal().selectorWnd(),
-                   MessageType_Question,
-                   tr("<p>You are about to remove following virtual "
-                      "machine items from the machine list:</p>"
-                      "<p><b>%1</b></p>"
-                      "<p>Do you wish to proceed?</p>").arg(names.join(", ")),
-                   0, /* auto-confirm id */
-                   QIMessageBox::Ok,
-                   QIMessageBox::Cancel | QIMessageBox::Escape | QIMessageBox::Default,
-                   0,
-                   tr("Remove"));
+                           tr("Remove"));
 }
 
@@ -599,33 +566,58 @@
     /* Prepare message itself: */
     return cInacessibleMachineCount == machines.size() ?
-           message(mainWindowShown(),
-                   MessageType_Question,
-                   strText,
-                   0, /* auto-confirm id */
-                   QIMessageBox::Ok,
-                   QIMessageBox::Cancel | QIMessageBox::Escape | QIMessageBox::Default,
+           message(mainWindowShown(), MessageType_Question,
+                   strText, 0, /* auto-confirm id */
+                   QIMessageBox::Ok | QIMessageBox::Default,
+                   QIMessageBox::Cancel | QIMessageBox::Escape,
                    0,
                    tr("Remove")) :
-           message(mainWindowShown(),
-                   MessageType_Question,
-                   strText,
-                   0, /* auto-confirm id */
+           message(mainWindowShown(), MessageType_Question,
+                   strText, 0, /* auto-confirm id */
                    QIMessageBox::Yes,
-                   QIMessageBox::No,
-                   QIMessageBox::Cancel | QIMessageBox::Escape | QIMessageBox::Default,
+                   QIMessageBox::No | QIMessageBox::Default,
+                   QIMessageBox::Cancel | QIMessageBox::Escape,
                    tr("Delete all files"),
                    tr("Remove only"));
 }
 
+void UIMessageCenter::cannotRemoveMachine(const CMachine &machine)
+{
+    /* Preserve error-info: */
+    COMResult res(machine);
+    /* Show the message: */
+    message(mainWindowShown(),
+            MessageType_Error,
+            tr("Failed to remove the virtual machine <b>%1</b>.").arg(machine.GetName()),
+            !machine.isOk() ? formatErrorInfo(machine) : formatErrorInfo(res));
+}
+
+void UIMessageCenter::cannotRemoveMachine(const CMachine &machine, const CProgress &progress)
+{
+    message(mainWindowShown(),
+            MessageType_Error,
+            tr("Failed to remove the virtual machine <b>%1</b>.").arg(machine.GetName()),
+            formatErrorInfo(progress.GetErrorInfo()));
+}
+
 bool UIMessageCenter::confirmDiscardSavedState(const QString &strNames)
 {
-    return messageOkCancel(&vboxGlobal().selectorWnd(), MessageType_Question,
-        tr("<p>Are you sure you want to discard the saved state of "
-           "the following virtual machines?</p><p><b>%1</b></p>"
-           "<p>This operation is equivalent to resetting or powering off "
-           "the machine without doing a proper shutdown of the guest OS.</p>")
-           .arg(strNames),
-        0 /* pcszAutoConfirmId */,
-        tr("Discard", "saved state"));
+    return messageOkCancel(mainWindowShown(), MessageType_Question,
+                           tr("<p>Are you sure you want to discard the saved state of "
+                              "the following virtual machines?</p><p><b>%1</b></p>"
+                              "<p>This operation is equivalent to resetting or powering off "
+                              "the machine without doing a proper shutdown of the guest OS.</p>")
+                              .arg(strNames),
+                           0 /* pcszAutoConfirmId */,
+                           tr("Discard", "saved state"));
+}
+
+void UIMessageCenter::cannotDiscardSavedState(const CConsole &console)
+{
+    /* Preserve error-info: */
+    COMResult res(console);
+    /* Show the message: */
+    message(mainWindowShown(), MessageType_Error,
+            tr("Failed to discard the saved state of the virtual machine <b>%1</b>.").arg(console.GetMachine().GetName()),
+            formatErrorInfo(res));
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h	(revision 45280)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h	(revision 45281)
@@ -212,13 +212,13 @@
     void cannotOpenMachine(const CVirtualBox &vbox, const QString &strMachinePath);
     void cannotReregisterExistingMachine(const QString &strMachinePath, const QString &strMachineName);
-    void cannotDeleteMachine(const CMachine &machine);
-    void cannotDeleteMachine(const CMachine &machine, const CProgress &progress);
-    void cannotDiscardSavedState(const CConsole &console);
-    void cannotSetGroups(const CMachine &machine);
     void cannotResolveCollisionAutomatically(const QString &strName, const QString &strGroupName);
     bool confirmAutomaticCollisionResolve(const QString &strName, const QString &strGroupName);
-    int confirmMachineItemRemoval(const QStringList &names);
+    void cannotSetGroups(const CMachine &machine);
+    bool confirmMachineItemRemoval(const QStringList &names);
     int confirmMachineRemoval(const QList<CMachine> &machines);
+    void cannotRemoveMachine(const CMachine &machine);
+    void cannotRemoveMachine(const CMachine &machine, const CProgress &progress);
     bool confirmDiscardSavedState(const QString &strNames);
+    void cannotDiscardSavedState(const CConsole &console);
     bool remindAboutInaccessibleMedia();
     bool confirmVMReset(const QString &strNames);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp	(revision 45280)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp	(revision 45281)
@@ -1422,10 +1422,9 @@
 void UIGChooserModel::removeItems(const QList<UIGChooserItem*> &itemsToRemove)
 {
-    /* Show machine-items remove dialog: */
+    /* Confirm machine-items removal: */
     QStringList names;
     foreach (UIGChooserItem *pItem, itemsToRemove)
         names << pItem->name();
-    int rc = msgCenter().confirmMachineItemRemoval(names);
-    if (rc == QIMessageBox::Cancel)
+    if (!msgCenter().confirmMachineItemRemoval(names))
         return;
 
@@ -1473,5 +1472,5 @@
             if (!machine.isOk())
             {
-                msgCenter().cannotDeleteMachine(machine);
+                msgCenter().cannotRemoveMachine(machine);
                 continue;
             }
@@ -1480,5 +1479,5 @@
             if (!machine.isOk())
             {
-                msgCenter().cannotDeleteMachine(machine);
+                msgCenter().cannotRemoveMachine(machine);
                 continue;
             }
@@ -1487,5 +1486,5 @@
             if (progress.GetResultCode() != 0)
             {
-                msgCenter().cannotDeleteMachine(machine, progress);
+                msgCenter().cannotRemoveMachine(machine, progress);
                 continue;
             }
@@ -1497,5 +1496,5 @@
             if (!machine.isOk())
             {
-                msgCenter().cannotDeleteMachine(machine);
+                msgCenter().cannotRemoveMachine(machine);
                 continue;
             }