Changeset 56954 in vbox for trunk

Timestamp:

Jul 16, 2015 2:31:31 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 7676: Encryption support: User-oriented improvement: Focus password table again if password validation failed.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIAddDiskEncryptionPasswordDialog.cpp (modified) (2 diffs)

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

@@ -204 +204 @@
         case Qt::Key_Return:
             emit sigEnterKeyTriggered();
+            pEvent->accept();
             break;
         default:
@@ -457 +458 @@
         const QString strPassword = m_pTableEncryptionData->encryptionPasswords().value(strPasswordId);
         if (!isPasswordValid(strMediumId, strPassword))
-            return msgCenter().warnAboutInvalidEncryptionPassword(strPasswordId, this);
+        {
+            msgCenter().warnAboutInvalidEncryptionPassword(strPasswordId, this);
+            AssertPtrReturnVoid(m_pTableEncryptionData);
+            m_pTableEncryptionData->setFocus();
+            m_pTableEncryptionData->editFirstIndex();
+            return;
+        }
     }
     /* Call to base-class: */