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

Timestamp:

Jun 24, 2024 2:23:44 PM (8 months ago)

Author:

vboxsync

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

163616

Message:

FE/Qt: bugref:10681: UIFormEditorWidget: Moving the rest of table sub-class stuff from parent into appropriate place.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• cloud/machinesettings/UICloudMachineSettingsDialogPage.cpp (modified) (2 diffs)
• widgets/UIFormEditorWidget.cpp (modified) (10 diffs)
• widgets/UIFormEditorWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/machinesettings/UICloudMachineSettingsDialogPage.cpp

@@ -120 +120 @@
         {
             /* Push initial values to editor: */
-            m_pFormEditor->setValues(initialValues);
+            m_pFormEditor->setFormValues(initialValues);
         }
         /* If filter present: */
@@ -133 +133 @@
                     filteredValues << comValue;
             /* Push filtered values to editor: */
-            m_pFormEditor->setValues(filteredValues);
+            m_pFormEditor->setFormValues(filteredValues);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFormEditorWidget.cpp

@@ -613 +613 @@
     virtual ~UIFormEditorView() RT_OVERRIDE;
 
+protected:
+
+    /** Handles @a pEvent. */
+    virtual bool event(QEvent *pEvent) RT_OVERRIDE;
+
+protected slots:
+
+    /** Handles rows being inserted.
+      * @param  parent  Brings the parent under which new rows being inserted.
+      * @param  iStart  Brings the starting position (inclusive).
+      * @param  iStart  Brings the end position (inclusive). */
+    virtual void rowsInserted(const QModelIndex &parent, int iStart, int iEnd) RT_OVERRIDE;
+
 private:
 
@@ -619 +632 @@
     /** Cleanups everything. */
     void cleanup();
+
+    /** Adjusts table contents. */
+    void adjust();
 
     /** Holds the item editor factory instance. */
@@ -1563 +1579 @@
 }
 
+bool UIFormEditorView::event(QEvent *pEvent)
+{
+    /* Process different event-types: */
+    switch (pEvent->type())
+    {
+        /* Adjust table on show/resize events: */
+        case QEvent::Show:
+        case QEvent::Resize:
+        {
+            adjust();
+            break;
+        }
+        default:
+            break;
+    }
+
+    /* Call to base-class: */
+    return QITableView::event(pEvent);
+}
+
+void UIFormEditorView::rowsInserted(const QModelIndex &parent, int iStart, int iEnd)
+{
+    /* Call to base-class: */
+    QITableView::rowsInserted(parent, iStart, iEnd);
+
+    /* Adjust table on rows being inserted: */
+    adjust();
+}
+
 void UIFormEditorView::prepare()
 {
@@ -1627 +1672 @@
 }
 
+void UIFormEditorView::adjust()
+{
+    horizontalHeader()->setStretchLastSection(false);
+    /* If table is NOT empty: */
+    if (model()->rowCount())
+    {
+        /* Resize table to contents size-hint and emit a spare place for first column: */
+        resizeColumnsToContents();
+        const int iFullWidth = viewport()->width();
+        const int iNameWidth = horizontalHeader()->sectionSize(UIFormEditorDataType_Name);
+        const int iValueWidth = qMax(0, iFullWidth - iNameWidth);
+        horizontalHeader()->resizeSection(UIFormEditorDataType_Value, iValueWidth);
+    }
+    /* If table is empty: */
+    else
+    {
+        /* Resize table columns to be equal in size: */
+        const int iFullWidth = viewport()->width();
+        horizontalHeader()->resizeSection(UIFormEditorDataType_Name, iFullWidth / 2);
+        horizontalHeader()->resizeSection(UIFormEditorDataType_Value, iFullWidth / 2);
+    }
+    horizontalHeader()->setStretchLastSection(true);
+}
+
 
 /*********************************************************************************************************************************
@@ -1668 +1737 @@
 {
     m_pTableModel->clearForm();
-    adjustTable();
-}
-
-void UIFormEditorWidget::setValues(const QVector<CFormValue> &values)
+}
+
+void UIFormEditorWidget::setFormValues(const QVector<CFormValue> &values)
 {
     m_pTableModel->setFormValues(values);
-    adjustTable();
 }
 
@@ -1681 +1748 @@
     AssertPtrReturnVoid(m_pTableModel);
     /// @todo add some check..
-    setValues(comForm.GetValues());
+    setFormValues(comForm.GetValues());
 }
 
@@ -1688 +1755 @@
     AssertPtrReturnVoid(m_pTableModel);
     /// @todo add some check..
-    setValues(comForm.GetValues());
+    setFormValues(comForm.GetValues());
 }
 
@@ -1694 +1761 @@
 {
     m_pTableView->makeSureEditorDataCommitted();
-}
-
-bool UIFormEditorWidget::eventFilter(QObject *pObject, QEvent *pEvent)
-{
-    /* Process events for table only: */
-    if (pObject != m_pTableView)
-        return QWidget::eventFilter(pObject, pEvent);
-
-    /* Process different event-types: */
-    switch (pEvent->type())
-    {
-        case QEvent::Show:
-        case QEvent::Resize:
-        {
-            /* Adjust table: */
-            adjustTable();
-            break;
-        }
-        default:
-            break;
-    }
-
-    /* Call to base-class: */
-    return QWidget::eventFilter(pObject, pEvent);
 }
 
@@ -1741 +1784 @@
         {
             m_pTableView->setModel(pProxyModel);
-            m_pTableView->installEventFilter(this);
             pLayout->addWidget(m_pTableView);
         }
@@ -1747 +1789 @@
 }
 
-void UIFormEditorWidget::adjustTable()
-{
-    m_pTableView->horizontalHeader()->setStretchLastSection(false);
-    /* If table is NOT empty: */
-    if (m_pTableModel->rowCount())
-    {
-        /* Resize table to contents size-hint and emit a spare place for first column: */
-        m_pTableView->resizeColumnsToContents();
-        const int iFullWidth = m_pTableView->viewport()->width();
-        const int iNameWidth = m_pTableView->horizontalHeader()->sectionSize(UIFormEditorDataType_Name);
-        const int iValueWidth = qMax(0, iFullWidth - iNameWidth);
-        m_pTableView->horizontalHeader()->resizeSection(UIFormEditorDataType_Value, iValueWidth);
-    }
-    /* If table is empty: */
-    else
-    {
-        /* Resize table columns to be equal in size: */
-        const int iFullWidth = m_pTableView->viewport()->width();
-        m_pTableView->horizontalHeader()->resizeSection(UIFormEditorDataType_Name, iFullWidth / 2);
-        m_pTableView->horizontalHeader()->resizeSection(UIFormEditorDataType_Value, iFullWidth / 2);
-    }
-    m_pTableView->horizontalHeader()->setStretchLastSection(true);
-}
-
 
 #include "UIFormEditorWidget.moc"

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFormEditorWidget.h

@@ -74 +74 @@
     /** Clears form. */
     void clearForm();
-    /** Defines @a values to be edited. */
-    void setValues(const QVector<CFormValue> &values);
+    /** Defines form @a values to be edited. */
+    void setFormValues(const QVector<CFormValue> &values);
     /** Defines @a comForm to be edited. */
     void setForm(const CForm &comForm);
@@ -84 +84 @@
     void makeSureEditorDataCommitted();
 
-protected:
-
-    /** Preprocesses any Qt @a pEvent for passed @a pObject. */
-    virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
-
 private:
 
     /** Prepares all. */
     void prepare();
-
-    /** Adjusts table column sizes. */
-    void adjustTable();
 
     /** Holds the notification-center reference. */