Changeset 64179 in vbox for trunk/src

Timestamp:

Oct 7, 2016 1:03:10 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 79): Continuing with the r111152.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp (modified) (3 diffs)

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

@@ -150 +150 @@
     /* Handler: Readiness stuff: */
     void sltHandleShortcutsLoaded();
+
+private:
+
+    /** Prepares all. */
+    void prepare();
 };
 
@@ -478 +483 @@
     /* Set object name: */
     setObjectName(strObjectName);
-
-    /* Connect model: */
+    /* Set model: */
     setModel(pModel);
-    connect(pModel, SIGNAL(sigShortcutsLoaded()), this, SLOT(sltHandleShortcutsLoaded()));
-
+
+    /* Prepare all: */
+    prepare();
+}
+
+void UIHotKeyTable::sltHandleShortcutsLoaded()
+{
+    /* Resize columns to feat contents: */
+    resizeColumnsToContents();
+
+    /* Configure sorting: */
+    sortByColumn(Section_Name, Qt::AscendingOrder);
+    setSortingEnabled(true);
+}
+
+void UIHotKeyTable::prepare()
+{
     /* Configure self: */
     setTabKeyNavigation(false);
@@ -502 +521 @@
 #endif /* QT_VERSION < 0x050000 */
 
+    /* Connect model: */
+    connect(model(), SIGNAL(sigShortcutsLoaded()), this, SLOT(sltHandleShortcutsLoaded()));
+
     /* Reinstall delegate: */
     delete itemDelegate();
     QIStyledItemDelegate *pStyledItemDelegate = new QIStyledItemDelegate(this);
     setItemDelegate(pStyledItemDelegate);
-
-    /* Create new item editor factory: */
-    QItemEditorFactory *pNewItemEditorFactory = new QItemEditorFactory;
-
-    /* Register UIHotKeyEditor as the UIHotKey editor: */
-    int iHotKeyTypeId = qRegisterMetaType<UIHotKey>();
-    QStandardItemEditorCreator<UIHotKeyEditor> *pHotKeyItemEditorCreator = new QStandardItemEditorCreator<UIHotKeyEditor>();
-    pNewItemEditorFactory->registerEditor((QVariant::Type)iHotKeyTypeId, pHotKeyItemEditorCreator);
-
-    /* Register UIHostComboEditor as the UIHostComboWrapper: */
-    int iHostComboTypeId = qRegisterMetaType<UIHostComboWrapper>();
-    QStandardItemEditorCreator<UIHostComboEditor> *pHostComboItemEditorCreator = new QStandardItemEditorCreator<UIHostComboEditor>();
-    pNewItemEditorFactory->registerEditor((QVariant::Type)iHostComboTypeId, pHostComboItemEditorCreator);
-
-    /* Set configured item editor factory for table delegate: */
-    pStyledItemDelegate->setItemEditorFactory(pNewItemEditorFactory);
-
-    /* Configure item delegate: */
-    pStyledItemDelegate->setWatchForEditorDataCommits(true);
-}
-
-void UIHotKeyTable::sltHandleShortcutsLoaded()
-{
-    /* Resize columns to feat contents: */
-    resizeColumnsToContents();
-
-    /* Configure sorting: */
-    sortByColumn(Section_Name, Qt::AscendingOrder);
-    setSortingEnabled(true);
+    AssertPtrReturnVoid(pStyledItemDelegate);
+    {
+        /* Configure item delegate: */
+        pStyledItemDelegate->setWatchForEditorDataCommits(true);
+
+        /* Create new item editor factory: */
+        QItemEditorFactory *pNewItemEditorFactory = new QItemEditorFactory;
+        AssertPtrReturnVoid(pNewItemEditorFactory);
+        {
+            /* Register UIHotKeyEditor as the UIHotKey editor: */
+            int iHotKeyTypeId = qRegisterMetaType<UIHotKey>();
+            QStandardItemEditorCreator<UIHotKeyEditor> *pHotKeyItemEditorCreator = new QStandardItemEditorCreator<UIHotKeyEditor>();
+            pNewItemEditorFactory->registerEditor((QVariant::Type)iHotKeyTypeId, pHotKeyItemEditorCreator);
+
+            /* Register UIHostComboEditor as the UIHostComboWrapper editor: */
+            int iHostComboTypeId = qRegisterMetaType<UIHostComboWrapper>();
+            QStandardItemEditorCreator<UIHostComboEditor> *pHostComboItemEditorCreator = new QStandardItemEditorCreator<UIHostComboEditor>();
+            pNewItemEditorFactory->registerEditor((QVariant::Type)iHostComboTypeId, pHostComboItemEditorCreator);
+
+            /* Assign configured item editor factory to item delegate: */
+            pStyledItemDelegate->setItemEditorFactory(pNewItemEditorFactory);
+        }
+    }
 }