Changeset 55329 in vbox for trunk/src/VBox

Timestamp:

Apr 17, 2015 1:27:10 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: VM settings: Alter few ExtPack related NLS.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsDisplay.cpp (modified) (1 diff)
• UIMachineSettingsGeneral.cpp (modified) (3 diffs)
• UIMachineSettingsUSB.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -397 +397 @@
 
 #ifdef VBOX_WITH_EXTPACK
+        /* VRDE Extension Pack presence test: */
         CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
         if (m_pCheckboxRemoteDisplay->isChecked() && (extPack.isNull() || !extPack.GetUsable()))
         {
             message.second << tr("Remote Display is currently enabled for this virtual machine. "
-                                 "However, this requires the <b>%1</b> to be installed. "
+                                 "However, this requires the <i>%1</i> to be installed. "
                                  "Please install the Extension Pack from the VirtualBox download site as "
                                  "otherwise your VM will be started with Remote Display disabled.")

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -31 +31 @@
 /* COM includes: */
 # include "CMedium.h"
+# include "CExtPack.h"
+# include "CExtPackManager.h"
 # include "CMediumAttachment.h"
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -398 +400 @@
     if (m_pCheckBoxEncryption->isChecked())
     {
+#ifdef VBOX_WITH_EXTPACK
+        /* Encryption Extension Pack presence test: */
+        const CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
+        if (extPack.isNull() || !extPack.GetUsable())
+        {
+            message.second << tr("You are trying to encrypt this virtual machine. "
+                                 "However, this requires the <i>%1</i> to be installed. "
+                                 "Please install the Extension Pack from the VirtualBox download site.")
+                                 .arg(GUI_ExtPackName);
+            fPass = false;
+        }
+#endif /* VBOX_WITH_EXTPACK */
+
         /* Cipher should be chosen if once changed: */
         AssertPtrReturn(m_pComboCipher, false);
@@ -405 +420 @@
             if (m_pComboCipher->currentIndex() == 0)
                 message.second << tr("Encryption cipher type not specified.");
+            fPass = false;
         }
+
         /* Password should be entered and confirmed if once changed: */
         AssertPtrReturn(m_pEditorEncryptionPassword, false);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -501 +501 @@
 
 #ifdef VBOX_WITH_EXTPACK
-    /* USB 2.0 Extension Pack presence test: */
+    /* USB 2.0/3.0 Extension Pack presence test: */
     CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
     if (   mGbUSB->isChecked()
@@ -509 +509 @@
         /* Prepare message: */
         UIValidationMessage message;
-        message.second << tr("USB 2.0 is currently enabled for this virtual machine. "
-                             "However, this requires the <b>%1</b> to be installed. "
+        message.second << tr("USB 2.0/3.0 is currently enabled for this virtual machine. "
+                             "However, this requires the <i>%1</i> to be installed. "
                              "Please install the Extension Pack from the VirtualBox download site "
                              "or disable USB 2.0 to be able to start the machine.")