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

Timestamp:

Apr 8, 2015 1:40:04 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99434

Message:

FE/Qt: 7676: Runtime UI: Disk Encryption (DE) support: Add Password dialog: Handle last password editor Enter/Return as dialog accept.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIAddDiskEncryptionPasswordDialog.cpp (modified) (7 diffs)
• UIAddDiskEncryptionPasswordDialog.h (modified) (1 diff)

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

@@ -68 +68 @@
     void sigCommitData(QWidget *pThis);
 
+    /** Notifies listeners about Enter/Return key triggering. */
+    void sigEnterKeyTriggered();
+
 public:
 
@@ -83 +86 @@
     /** Prepare routine. */
     void prepare();
+
+    /** Key press @a pEvent handler. */
+    void keyPressEvent(QKeyEvent *pEvent);
 
     /** Property: Returns the current password of the editor. */
@@ -154 +160 @@
     void sigDataChanged();
 
+    /** Notifies listeners about editor's Enter/Return key triggering. */
+    void sigEditorEnterKeyTriggered();
+
 public:
 
@@ -203 +212 @@
     connect(this, SIGNAL(textChanged(const QString&)),
             this, SLOT(sltPasswordChanged(const QString&)));
+}
+
+void UIPasswordEditor::keyPressEvent(QKeyEvent *pEvent)
+{
+    /* Call to base-class: */
+    QLineEdit::keyPressEvent(pEvent);
+
+    /* Broadcast Enter/Return key press: */
+    switch (pEvent->key())
+    {
+        case Qt::Key_Enter:
+        case Qt::Key_Return:
+            emit sigEnterKeyTriggered();
+            break;
+        default:
+            break;
+    }
 }
 
@@ -467 +493 @@
         delete itemDelegate();
         setItemDelegate(pStyledItemDelegate);
+        /* Configure item delegate: */
+        pStyledItemDelegate->setWatchForEditorEnterKeyTriggering(true);
+        connect(pStyledItemDelegate, SIGNAL(sigEditorEnterKeyTriggered()),
+                this, SIGNAL(sigEditorEnterKeyTriggered()));
     }
 
@@ -507 +537 @@
     AssertPtrReturn(m_pTableEncryptionData, EncryptionPasswordMap());
     return m_pTableEncryptionData->encryptionPasswords();
+}
+
+void UIAddDiskEncryptionPasswordDialog::sltEditorEnterKeyTriggered()
+{
+    if (m_pButtonBox->button(QDialogButtonBox::Ok)->isEnabled())
+        accept();
 }
 
@@ -536 +572 @@
                 connect(m_pTableEncryptionData, SIGNAL(sigDataChanged()),
                         this, SLOT(sltDataChanged()));
+                connect(m_pTableEncryptionData, SIGNAL(sigEditorEnterKeyTriggered()),
+                        this, SLOT(sltEditorEnterKeyTriggered()));
                 m_pTableEncryptionData->setFocus();
                 m_pTableEncryptionData->editFirstIndex();

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

@@ -59 +59 @@
     void sltDataChanged() { revalidate(); }
 
+    /** Handles editor's Enter/Return key triggering. */
+    void sltEditorEnterKeyTriggered();
+
 private: