Changeset 64259 in vbox

Timestamp:

Oct 13, 2016 3:50:07 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 88): Preferences: Input page: Cleanup/rework: Reuse common enum.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsInput.cpp (modified) (12 diffs)
• UIGlobalSettingsInput.h (modified) (2 diffs)

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

@@ -44 +44 @@
 
 
+/** Column index enumerator. */
+enum UIHotKeyColumnIndex
+{
+    UIHotKeyColumnIndex_Description,
+    UIHotKeyColumnIndex_Sequence,
+    UIHotKeyColumnIndex_Max
+};
+
+
 /* Global settings / Input page / Cache / Shortcut cache item: */
 struct UIShortcutCacheItem
@@ -119 +128 @@
         switch (m_iColumn)
         {
-            case 0: return m_order == Qt::AscendingOrder ? item1.description < item2.description : item1.description > item2.description;
-            case 1: return m_order == Qt::AscendingOrder ? item1.currentSequence < item2.currentSequence : item1.currentSequence > item2.currentSequence;
+            case UIHotKeyColumnIndex_Description:
+                return m_order == Qt::AscendingOrder ? item1.description < item2.description : item1.description > item2.description;
+            case UIHotKeyColumnIndex_Sequence:
+                return m_order == Qt::AscendingOrder ? item1.currentSequence < item2.currentSequence : item1.currentSequence > item2.currentSequence;
             default: break;
         }
@@ -196 +207 @@
 
 public:
-
-    /* Hot-key table field indexes: */
-    enum Section
-    {
-        Section_Name = 0,
-        Section_Value = 1
-    };
 
     /* Constructor: */
@@ -310 +314 @@
     switch (index.column())
     {
-        case UIHotKeyTable::Section_Name: return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
-        case UIHotKeyTable::Section_Value: return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
+        case UIHotKeyColumnIndex_Description: return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+        case UIHotKeyColumnIndex_Sequence: return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
         default: break;
     }
@@ -330 +334 @@
             switch (iSection)
             {
-                case UIHotKeyTable::Section_Name: return tr("Name");
-                case UIHotKeyTable::Section_Value: return tr("Shortcut");
+                case UIHotKeyColumnIndex_Description: return tr("Name");
+                case UIHotKeyColumnIndex_Sequence: return tr("Shortcut");
                 default: break;
             }
@@ -356 +360 @@
             switch (index.column())
             {
-                case UIHotKeyTable::Section_Name:
+                case UIHotKeyColumnIndex_Description:
                 {
                     /* Return shortcut description: */
                     return m_filteredShortcuts[iIndex].description;
                 }
-                case UIHotKeyTable::Section_Value:
+                case UIHotKeyColumnIndex_Sequence:
                 {
                     /* If that is host-combo cell: */
@@ -386 +390 @@
             switch (index.column())
             {
-                case UIHotKeyTable::Section_Value: return m_filteredShortcuts[iIndex].key == UIHostCombo::hostComboCacheKey() ?
-                                                        QVariant::fromValue(UIHostComboWrapper(m_filteredShortcuts[iIndex].currentSequence)) :
-                                                        QVariant::fromValue(UIHotKey(m_type == UIActionPoolType_Runtime ?
-                                                                                     UIHotKeyType_Simple : UIHotKeyType_WithModifiers,
-                                                                                     m_filteredShortcuts[iIndex].currentSequence,
-                                                                                     m_filteredShortcuts[iIndex].defaultSequence));
+                case UIHotKeyColumnIndex_Sequence: return m_filteredShortcuts[iIndex].key == UIHostCombo::hostComboCacheKey() ?
+                                                          QVariant::fromValue(UIHostComboWrapper(m_filteredShortcuts[iIndex].currentSequence)) :
+                                                          QVariant::fromValue(UIHotKey(m_type == UIActionPoolType_Runtime ?
+                                                                                       UIHotKeyType_Simple : UIHotKeyType_WithModifiers,
+                                                                                       m_filteredShortcuts[iIndex].currentSequence,
+                                                                                       m_filteredShortcuts[iIndex].defaultSequence));
                 default: break;
             }
@@ -404 +408 @@
             switch (index.column())
             {
-                case UIHotKeyTable::Section_Value:
+                case UIHotKeyColumnIndex_Sequence:
                 {
                     if (m_filteredShortcuts[iIndex].key != UIHostCombo::hostComboCacheKey() &&
@@ -421 +425 @@
             switch (index.column())
             {
-                case UIHotKeyTable::Section_Value:
+                case UIHotKeyColumnIndex_Sequence:
                 {
                     if (m_duplicatedSequences.contains(m_filteredShortcuts[iIndex].key))
@@ -450 +454 @@
             switch (index.column())
             {
-                case UIHotKeyTable::Section_Value:
+                case UIHotKeyColumnIndex_Sequence:
                 {
                     /* Get index: */
@@ -557 +561 @@
 
     /* Configure sorting: */
-    sortByColumn(Section_Name, Qt::AscendingOrder);
+    sortByColumn(UIHotKeyColumnIndex_Description, Qt::AscendingOrder);
     setSortingEnabled(true);
 }
@@ -575 +579 @@
     horizontalHeader()->setStretchLastSection(false);
 #if QT_VERSION >= 0x050000
-    horizontalHeader()->setSectionResizeMode(Section_Name, QHeaderView::Interactive);
-    horizontalHeader()->setSectionResizeMode(Section_Value, QHeaderView::Stretch);
+    horizontalHeader()->setSectionResizeMode(UIHotKeyColumnIndex_Description, QHeaderView::Interactive);
+    horizontalHeader()->setSectionResizeMode(UIHotKeyColumnIndex_Sequence, QHeaderView::Stretch);
 #else /* QT_VERSION < 0x050000 */
-    horizontalHeader()->setResizeMode(Section_Name, QHeaderView::Interactive);
-    horizontalHeader()->setResizeMode(Section_Value, QHeaderView::Stretch);
+    horizontalHeader()->setResizeMode(UIHotKeyColumnIndex_Description, QHeaderView::Interactive);
+    horizontalHeader()->setResizeMode(UIHotKeyColumnIndex_Sequence, QHeaderView::Stretch);
 #endif /* QT_VERSION < 0x050000 */
 

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

@@ -21 +21 @@
 /* Qt includes: */
 #include <QAbstractTableModel>
-#include <QTableView>
 
 /* GUI includes: */
@@ -34 +33 @@
 class UIHotKeyTableModel;
 class UIHotKeyTable;
+
 
 /* Global settings / Input page: */