Changeset 64162 in vbox for trunk/src

Timestamp:

Oct 6, 2016 12:29:30 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 74): Make data commits listener of QIStyledItemDelegate optional.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIStyledItemDelegate.h (modified) (2 diffs)
• runtime/UIAddDiskEncryptionPasswordDialog.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsInput.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStyledItemDelegate.h

@@ -38 +38 @@
     QIStyledItemDelegate(QObject *pParent)
         : QStyledItemDelegate(pParent)
+        , m_fWatchForEditorDataCommits(false)
         , m_fWatchForEditorEnterKeyTriggering(false)
     {}
 
+    /** Defines whether delegate should watch for the editor's data commits. */
+    void setWatchForEditorDataCommits(bool fWatch) { m_fWatchForEditorDataCommits = fWatch; }
     /** Defines whether delegate should watch for the editor's Enter key triggering. */
     void setWatchForEditorEnterKeyTriggering(bool fWatch) { m_fWatchForEditorEnterKeyTriggering = fWatch; }
 
-private:
+protected:
 
     /** Returns the widget used to edit the item specified by @a index.
       * The @a pParent widget and style @a option are used to control how the editor widget appears. */
-    QWidget* createEditor(QWidget *pParent, const QStyleOptionViewItem &option, const QModelIndex &index) const
+    virtual QWidget *createEditor(QWidget *pParent, const QStyleOptionViewItem &option, const QModelIndex &index) const /* override */
     {
         /* Call to base-class to get actual editor created: */
         QWidget *pEditor = QStyledItemDelegate::createEditor(pParent, option, index);
 
-        connect(pEditor, SIGNAL(sigCommitData(QWidget*)), this, SIGNAL(commitData(QWidget*)));
+        /* Watch for editor data commits, redirect to listeners: */
+        if (m_fWatchForEditorDataCommits)
+            connect(pEditor, SIGNAL(sigCommitData(QWidget *)), this, SIGNAL(commitData(QWidget *)));
 
         /* Watch for editor Enter key triggering, redirect to listeners: */
@@ -63 +68 @@
     }
 
+private:
+
+    /** Holds whether delegate should watch for the editor's data commits. */
+    bool m_fWatchForEditorDataCommits : 1;
     /** Holds whether delegate should watch for the editor's Enter key triggering. */
-    bool m_fWatchForEditorEnterKeyTriggering;
+    bool m_fWatchForEditorEnterKeyTriggering : 1;
 };
 

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

@@ -408 +408 @@
         setItemDelegate(pStyledItemDelegate);
         /* Configure item delegate: */
+        pStyledItemDelegate->setWatchForEditorDataCommits(true);
         pStyledItemDelegate->setWatchForEditorEnterKeyTriggering(true);
         connect(pStyledItemDelegate, SIGNAL(sigEditorEnterKeyTriggered()),

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

@@ -603 +603 @@
     /* Set configured item editor factory for table delegate: */
     pStyledItemDelegate->setItemEditorFactory(pNewItemEditorFactory);
+
+    /* Configure item delegate: */
+    pStyledItemDelegate->setWatchForEditorDataCommits(true);
 }