Changeset 11968 in vbox for trunk

Timestamp:

Sep 2, 2008 11:11:58 AM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Fix Hard Disk UI issues: restoring edit-state of HD attachment table when getting focus, re-activating table (alt-tab), fixing F2 key functionality.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxSettingsUtils.h (modified) (1 diff)
• include/VBoxVMSettingsHD.h (modified) (3 diffs)
• src/VBoxVMSettingsHD.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxSettingsUtils.h

@@ -219 +219 @@
         emit currentChanged (aCurrent);
     }
+
+    void focusInEvent (QFocusEvent *aEvent)
+    {
+        /* Restore edit-mode on focus in. */
+        QTableView::focusInEvent (aEvent);
+        if (model()->flags (currentIndex()) & Qt::ItemIsEditable)
+            edit (currentIndex());
+    }
 };
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsHD.h

@@ -196 +196 @@
 private:
 
+    void keyPressEvent (QKeyEvent *aEvent);
     void populate (const HDSltValue &aIncluding);
 
@@ -228 +229 @@
 
 private:
+
+    void keyPressEvent (QKeyEvent *aEvent);
 
     static HDVdiEditor *mInstance;
@@ -326 +329 @@
     QAction *mDelAction;
     QAction *mVdmAction;
+    bool mWasTableSelected;
 };
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsHD.cpp

@@ -243 +243 @@
 }
 
+void HDSltEditor::keyPressEvent (QKeyEvent *aEvent)
+{
+    /* Make F2 key to show the popup. */
+    if (aEvent->key() == Qt::Key_F2)
+    {
+        aEvent->accept();
+        showPopup();
+    }
+    else
+        aEvent->ignore();
+    QComboBox::keyPressEvent (aEvent);
+}
+
 void HDSltEditor::populate (const HDSltValue &aIncluding)
 {
@@ -313 +326 @@
 {
     emit readyToCommit (this);
+}
+
+void HDVdiEditor::keyPressEvent (QKeyEvent *aEvent)
+{
+    /* Make F2 key to show the popup. */
+    if (aEvent->key() == Qt::Key_F2)
+    {
+        aEvent->accept();
+        showPopup();
+    }
+    else
+        aEvent->ignore();
+    VBoxMediaComboBox::keyPressEvent (aEvent);
 }
 
@@ -395 +421 @@
 VBoxVMSettingsHD::VBoxVMSettingsHD()
     : mValidator (0)
+    , mWasTableSelected (false)
 {
     /* Apply UI decorations */
@@ -859 +886 @@
                     break;
             }
+        } else
+        if (aEvent->type() == QEvent::WindowDeactivate)
+        {
+            /* Store focus state if it is on temporary editor. */
+            if (widget->hasFocus())
+                mWasTableSelected = true;
         }
     } else
@@ -869 +902 @@
             (index.row() == mModel->rowCount() - 1 || !index.isValid()))
             newClicked();
+    } else
+    if (aEvent->type() == QEvent::WindowActivate)
+    {
+        if (mWasTableSelected)
+        {
+            /* Restore focus state if it was on temporary editor. */
+            mWasTableSelected = false;
+            mTwAts->setFocus();
+        }
     }