Changeset 45280 in vbox for trunk/src

Timestamp:

Apr 2, 2013 10:48:56 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Message-center cleanup (part 14).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (1 diff)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -478 +478 @@
 void UIMessageCenter::cannotDiscardSavedState(const CConsole &console)
 {
-    /* preserve the current error info before calling the object again */
+    /* 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));
-}
-
-void UIMessageCenter::notifyAboutCollisionOnGroupRemovingCantBeResolved(const QString &strName, const QString &strGroupName)
-{
-    message(&vboxGlobal().selectorWnd(),
-            MessageType_Error,
+            tr("Failed to discard the saved state of the virtual machine <b>%1</b>.").arg(console.GetMachine().GetName()),
+            formatErrorInfo(res));
+}
+
+void UIMessageCenter::cannotSetGroups(const CMachine &machine)
+{
+    /* Preserve error-info: */
+    COMResult res(machine);
+    /* Compose machine name: */
+    QString strName = machine.GetName();
+    if (strName.isEmpty())
+        strName = QFileInfo(machine.GetSettingsFilePath()).baseName();
+    /* Show the message: */
+    message(mainWindowShown(), MessageType_Error,
+            tr("Failed to set groups of the virtual machine <b>%1</b>.").arg(strName),
+            formatErrorInfo(res));
+}
+
+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),
-            0, /* auto-confirm id */
-            QIMessageBox::Ok | QIMessageBox::Default);
-}
-
-int UIMessageCenter::askAboutCollisionOnGroupRemoving(const QString &strName, const QString &strGroupName)
-{
-    return message(&vboxGlobal().selectorWnd(),
-                   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 */
-                   QIMessageBox::Ok,
-                   QIMessageBox::Cancel | QIMessageBox::Escape | QIMessageBox::Default,
-                   0,
-                   tr("Rename"));
+               .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"));
 }
 
@@ -622 +628 @@
         0 /* pcszAutoConfirmId */,
         tr("Discard", "saved state"));
-}
-
-void UIMessageCenter::cannotSetGroups(const CMachine &machine)
-{
-    /* Preserve error-info: */
-    COMResult res(machine);
-    /* Compose machine name: */
-    QString strName = machine.GetName();
-    if (strName.isEmpty())
-        strName = QFileInfo(machine.GetSettingsFilePath()).baseName();
-    /* Show the message: */
-    message(mainWindowShown(), MessageType_Error,
-            tr("Failed to set groups of the virtual machine <b>%1</b>.").arg(strName),
-            formatErrorInfo(res));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -215 +215 @@
     void cannotDeleteMachine(const CMachine &machine, const CProgress &progress);
     void cannotDiscardSavedState(const CConsole &console);
-    void notifyAboutCollisionOnGroupRemovingCantBeResolved(const QString &strName, const QString &strGroupName);
-    int askAboutCollisionOnGroupRemoving(const QString &strName, const QString &strGroupName);
+    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);
     int confirmMachineRemoval(const QList<CMachine> &machines);
     bool confirmDiscardSavedState(const QString &strNames);
-    void cannotSetGroups(const CMachine &machine);
     bool remindAboutInaccessibleMedia();
     bool confirmVMReset(const QString &strNames);

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -353 +353 @@
     /* Make sure this machine can be opened: */
     CMachine newMachine = vbox.OpenMachine(strTmpFile);
-    if (!vbox.isOk() || newMachine.isNull())
+    if (!vbox.isOk())
     {
         msgCenter().cannotOpenMachine(vbox, strTmpFile);

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -759 +759 @@
                 else if (pCollisionSibling->type() == UIGChooserItemType_Group)
                 {
-                    msgCenter().notifyAboutCollisionOnGroupRemovingCantBeResolved(strItemName, pParentItem->name());
+                    msgCenter().cannotResolveCollisionAutomatically(strItemName, pParentItem->name());
                     return;
                 }
@@ -765 +765 @@
             else if (pItem->type() == UIGChooserItemType_Group)
             {
-                if (msgCenter().askAboutCollisionOnGroupRemoving(strItemName, pParentItem->name()) == QIMessageBox::Ok)
+                if (msgCenter().confirmAutomaticCollisionResolve(strItemName, pParentItem->name()))
                     toBeRenamed << pItem;
                 else
@@ -1999 +1999 @@
         const QStringList &oldGroupList = m_oldLists.value(strId);
         const UIStringSet &oldGroupSet = UIStringSet::fromList(oldGroupList);
-        /* Make sure group set was changed: */
+        /* Make sure group set changed: */
         if (newGroupSet == oldGroupSet)
             continue;