Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp (revision 45361) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp (revision 45362) @@ -306,10 +306,9 @@ switch (iButton & AlertButtonMask) { - case AlertButton_Ok: strText = tr("OK"); role = QDialogButtonBox::AcceptRole; break; - case AlertButton_Cancel: strText = tr("Cancel"); role = QDialogButtonBox::RejectRole; break; - case AlertButton_Yes: strText = tr("Yes"); role = QDialogButtonBox::YesRole; break; - case AlertButton_No: strText = tr("No"); role = QDialogButtonBox::NoRole; break; - case AlertButton_Ignore: strText = tr("Ignore"); role = QDialogButtonBox::AcceptRole; break; - case AlertButton_Copy: strText = tr("Copy"); role = QDialogButtonBox::ActionRole; break; + case AlertButton_Ok: strText = tr("OK"); role = QDialogButtonBox::AcceptRole; break; + case AlertButton_Cancel: strText = tr("Cancel"); role = QDialogButtonBox::RejectRole; break; + case AlertButton_Choice1: strText = tr("Yes"); role = QDialogButtonBox::YesRole; break; + case AlertButton_Choice2: strText = tr("No"); role = QDialogButtonBox::NoRole; break; + case AlertButton_Copy: strText = tr("Copy"); role = QDialogButtonBox::ActionRole; break; default: AssertMsgFailed(("Type %d is not supported!", iButton)); Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.h (revision 45361) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.h (revision 45362) @@ -43,8 +43,7 @@ AlertButton_Ok = 0x1, /* 00000000 00000001 */ AlertButton_Cancel = 0x2, /* 00000000 00000010 */ - AlertButton_Yes = 0x4, /* 00000000 00000100 */ - AlertButton_No = 0x8, /* 00000000 00001000 */ - AlertButton_Ignore = 0x10, /* 00000000 00010000 */ - AlertButton_Copy = 0x20, /* 00000000 00100000 */ + AlertButton_Choice1 = 0x4, /* 00000000 00000100 */ + AlertButton_Choice2 = 0x8, /* 00000000 00001000 */ + AlertButton_Copy = 0x10, /* 00000000 00010000 */ AlertButtonMask = 0xFF /* 00000000 11111111 */ }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 45361) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (revision 45362) @@ -579,6 +579,6 @@ message(mainWindowShown(), MessageType_Question, strText, 0 /* auto-confirm id */, - AlertButton_Yes, - AlertButton_No | AlertButtonOption_Default, + AlertButton_Choice1, + AlertButton_Choice2 | AlertButtonOption_Default, AlertButton_Cancel | AlertButtonOption_Escape, tr("Delete all files"), @@ -618,5 +618,5 @@ "ignore this message.

"), "warnAboutInaccessibleMedia", - tr("Check", "inaccessible media message box"), tr("Cancel"), false); + tr("Ignore"), tr("Check", "inaccessible media message box")); } @@ -968,7 +968,7 @@ .arg(strControllerName), 0 /* auto-confirm id */, - AlertButton_Yes, - AlertButton_No, - AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape, + AlertButton_Choice1, + AlertButton_Choice2 | AlertButtonOption_Default, + AlertButton_Cancel | AlertButtonOption_Escape, tr("Create &new disk", "add attachment routine"), tr("&Choose existing disk", "add attachment routine")); @@ -983,7 +983,7 @@ .arg(strControllerName), 0 /* auto-confirm id */, - AlertButton_Yes, - AlertButton_No, - AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape, + AlertButton_Choice1 | AlertButtonOption_Default, + AlertButton_Choice2, + AlertButton_Cancel | AlertButtonOption_Escape, tr("&Choose disk", "add attachment routine"), tr("Leave &empty", "add attachment routine")); @@ -998,7 +998,7 @@ .arg(strControllerName), 0 /* auto-confirm id */, - AlertButton_Yes, - AlertButton_No, - AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape, + AlertButton_Choice1 | AlertButtonOption_Default, + AlertButton_Choice2, + AlertButton_Cancel | AlertButtonOption_Escape, tr("&Choose disk", "add attachment routine"), tr("Leave &empty", "add attachment routine")); @@ -1225,6 +1225,6 @@ .arg(strLocation), 0 /* auto-confirm id */, - AlertButton_Yes, - AlertButton_No | AlertButtonOption_Default, + AlertButton_Choice1, + AlertButton_Choice2 | AlertButtonOption_Default, AlertButton_Cancel | AlertButtonOption_Escape, tr("Delete", "hard disk storage"), @@ -1704,6 +1704,6 @@ .arg(strLogFolder), 0 /* auto-confirm id */, - QIMessageBox::tr("Ok"), - QIMessageBox::tr("Ignore")); + QIMessageBox::tr("OK"), + tr("Ignore")); } @@ -1928,5 +1928,5 @@ .arg(VBoxGlobal::formatSize(uMinVRAM)), 0 /* auto-confirm id */, - QIMessageBox::tr("Ignore")); + tr("Ignore")); } @@ -1949,5 +1949,5 @@ .arg(VBoxGlobal::formatSize(uMinVRAM)), 0 /* auto-confirm id */, - QIMessageBox::tr("Ignore")); + tr("Ignore")); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 45361) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 45362) @@ -1161,5 +1161,5 @@ if (rc == AlertButton_Cancel) return; - deleteStorage = rc == AlertButton_Yes; + deleteStorage = rc == AlertButton_Choice1; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 45361) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 45362) @@ -192,5 +192,5 @@ /* Warn the user about inaccessible medium: */ - if (it != list.end() && msgCenter().warnAboutInaccessibleMedia()) + if (it != list.end() && !msgCenter().warnAboutInaccessibleMedia()) { /* Open the MM window (without refresh): */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp (revision 45361) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp (revision 45362) @@ -1466,5 +1466,5 @@ /* Get iterated machine: */ CMachine &machine = machines[iMachineIndex]; - if (iResultCode == AlertButton_Yes) + if (iResultCode == AlertButton_Choice1) { /* Unregister machine first: */ @@ -1490,5 +1490,5 @@ } } - else + else if (iResultCode == AlertButton_Choice2) { /* Just unregister machine: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (revision 45361) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (revision 45362) @@ -3046,7 +3046,7 @@ { int iAnswer = msgCenter().confirmHardDiskAttachmentCreation(strControllerName, this); - if (iAnswer == AlertButton_Yes) + if (iAnswer == AlertButton_Choice1) strMediumId = getWithNewHDWizard(); - else if (iAnswer == AlertButton_No) + else if (iAnswer == AlertButton_Choice2) strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_HardDisk, this, strMachineFolder); break; @@ -3055,7 +3055,7 @@ { int iAnswer = msgCenter().confirmOpticalAttachmentCreation(strControllerName, this); - if (iAnswer == AlertButton_Yes) + if (iAnswer == AlertButton_Choice1) strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_DVD, this, strMachineFolder); - else if (iAnswer == AlertButton_No) + else if (iAnswer == AlertButton_Choice2) strMediumId = vboxGlobal().findMedium(strMediumId).id(); break; @@ -3064,7 +3064,7 @@ { int iAnswer = msgCenter().confirmFloppyAttachmentCreation(strControllerName, this); - if (iAnswer == AlertButton_Yes) + if (iAnswer == AlertButton_Choice1) strMediumId = vboxGlobal().openMediumWithFileOpenDialog(UIMediumType_Floppy, this, strMachineFolder); - else if (iAnswer == AlertButton_No) + else if (iAnswer == AlertButton_Choice2) strMediumId = vboxGlobal().findMedium(strMediumId).id(); break;