Changeset 54505 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 25, 2015 5:12:48 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7614: Make sure 'desired' and 'actual' option values have different NLS to let the user distinguish them.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIVMInfoDialog.cpp (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• runtime/UIIndicatorsPool.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp

@@ -614 +614 @@
         CMachineDebugger debugger = console.GetDebugger();
         QString strVirtualization = debugger.GetHWVirtExEnabled() ?
-            VBoxGlobal::tr("Enabled", "details report (VT-x/AMD-V)") :
-            VBoxGlobal::tr("Disabled", "details report (VT-x/AMD-V)");
+            VBoxGlobal::tr("Active", "details report (VT-x/AMD-V)") :
+            VBoxGlobal::tr("Inactive", "details report (VT-x/AMD-V)");
         QString strNestedPaging = debugger.GetHWVirtExNestedPagingEnabled() ?
-            VBoxGlobal::tr("Enabled", "details report (Nested Paging)") :
-            VBoxGlobal::tr("Disabled", "details report (Nested Paging)");
+            VBoxGlobal::tr("Active", "details report (Nested Paging)") :
+            VBoxGlobal::tr("Inactive", "details report (Nested Paging)");
         QString strUnrestrictedExecution = debugger.GetHWVirtExUXEnabled() ?
-            VBoxGlobal::tr("Enabled", "details report (Unrestricted Execution)") :
-            VBoxGlobal::tr("Disabled", "details report (Unrestricted Execution)");
+            VBoxGlobal::tr("Active", "details report (Unrestricted Execution)") :
+            VBoxGlobal::tr("Inactive", "details report (Unrestricted Execution)");
         QString strParavirtProvider = gpConverter->toString(m.GetEffectiveParavirtProvider());
 

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

@@ -1790 +1790 @@
 }
 
-bool UIMessageCenter::warnAboutVirtNotEnabled64BitsGuest(bool fHWVirtExSupported) const
+bool UIMessageCenter::warnAboutVirtExInactiveFor64BitsGuest(bool fHWVirtExSupported) const
 {
     if (fHWVirtExSupported)
         return questionBinary(0, MessageType_Error,
-                              tr("<p>VT-x/AMD-V hardware acceleration has been enabled, but is "
-                                 "not operational. Your 64-bit guest will fail to detect a "
-                                 "64-bit CPU and will not be able to boot.</p><p>Please ensure "
-                                 "that you have enabled VT-x/AMD-V properly in the BIOS of your "
-                                 "host computer.</p>"),
+                              tr("<p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. "
+                                 "Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</p>"
+                                 "<p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p>"),
                               0 /* auto-confirm id */,
                               tr("Close VM"), tr("Continue"));
@@ -1804 +1802 @@
         return questionBinary(0, MessageType_Error,
                               tr("<p>VT-x/AMD-V hardware acceleration is not available on your system. "
-                                 "Your 64-bit guest will fail to detect a 64-bit CPU and will "
-                                 "not be able to boot."),
+                                 "Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot."),
                               0 /* auto-confirm id */,
                               tr("Close VM"), tr("Continue"));
 }
 
-bool UIMessageCenter::warnAboutVirtNotEnabledGuestRequired(bool fHWVirtExSupported) const
+bool UIMessageCenter::warnAboutVirtExInactiveForRecommendedGuest(bool fHWVirtExSupported) const
 {
     if (fHWVirtExSupported)

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

@@ -279 +279 @@
     bool remindAboutGuruMeditation(const QString &strLogFolder);
     void warnAboutVBoxSVCUnavailable() const;
-    bool warnAboutVirtNotEnabled64BitsGuest(bool fHWVirtExSupported) const;
-    bool warnAboutVirtNotEnabledGuestRequired(bool fHWVirtExSupported) const;
+    bool warnAboutVirtExInactiveFor64BitsGuest(bool fHWVirtExSupported) const;
+    bool warnAboutVirtExInactiveForRecommendedGuest(bool fHWVirtExSupported) const;
     bool cannotStartWithoutNetworkIf(const QString &strMachineName, const QString &strIfNames) const;
     void cannotStartMachine(const CConsole &console, const QString &strName) const;

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

@@ -989 +989 @@
     /* System */
     {
+#ifdef VBOX_WITH_FULL_DETAILS_REPORT
         /* BIOS Settings holder */
         CBIOSSettings biosSettings = aMachine.GetBIOSSettings();
+#endif /* VBOX_WITH_FULL_DETAILS_REPORT */
 
         /* System details row count: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -838 +838 @@
         bool bVirtEnabled = debugger.GetHWVirtExEnabled();
         QString virtualization = bVirtEnabled ?
-            VBoxGlobal::tr("Enabled", "details report (VT-x/AMD-V)") :
-            VBoxGlobal::tr("Disabled", "details report (VT-x/AMD-V)");
+            VBoxGlobal::tr("Active", "details report (VT-x/AMD-V)") :
+            VBoxGlobal::tr("Inactive", "details report (VT-x/AMD-V)");
 
         /* Nested Paging feature: */
         bool bNestEnabled = debugger.GetHWVirtExNestedPagingEnabled();
         QString nestedPaging = bNestEnabled ?
-            VBoxGlobal::tr("Enabled", "details report (Nested Paging)") :
-            VBoxGlobal::tr("Disabled", "details report (Nested Paging)");
+            VBoxGlobal::tr("Active", "details report (Nested Paging)") :
+            VBoxGlobal::tr("Inactive", "details report (Nested Paging)");
 
         /* Unrestricted Execution feature: */
         bool bUXEnabled = debugger.GetHWVirtExUXEnabled();
         QString unrestrictExec = bUXEnabled ?
-            VBoxGlobal::tr("Enabled", "details report (Unrestricted Execution)") :
-            VBoxGlobal::tr("Disabled", "details report (Unrestricted Execution)");
+            VBoxGlobal::tr("Active", "details report (Unrestricted Execution)") :
+            VBoxGlobal::tr("Inactive", "details report (Unrestricted Execution)");
 
         /* CPU Execution Cap feature: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1849 +1849 @@
     const bool fRecommendVirtEx = vboxGlobal().virtualBox().GetGuestOSType(guest().GetOSTypeId()).GetRecommendedVirtEx();
     AssertMsg(!fIs64BitsGuest || fRecommendVirtEx, ("Virtualization support missed for 64bit guest!\n"));
-    bool fIsVirtEnabled = debugger().GetHWVirtExEnabled();
-    if (fRecommendVirtEx && !fIsVirtEnabled)
+    const bool fIsVirtActive = debugger().GetHWVirtExEnabled();
+    if (fRecommendVirtEx && !fIsVirtActive)
     {
         /* Check whether vt-x / amd-v supported: */
@@ -1861 +1861 @@
         bool fShouldWeClose;
         if (fIs64BitsGuest)
-            fShouldWeClose = msgCenter().warnAboutVirtNotEnabled64BitsGuest(fVTxAMDVSupported);
+            fShouldWeClose = msgCenter().warnAboutVirtExInactiveFor64BitsGuest(fVTxAMDVSupported);
         else
-            fShouldWeClose = msgCenter().warnAboutVirtNotEnabledGuestRequired(fVTxAMDVSupported);
+            fShouldWeClose = msgCenter().warnAboutVirtExInactiveForRecommendedGuest(fVTxAMDVSupported);
 
         /* If user asked to close VM: */