Changeset 101693 in vbox for trunk/src/VBox

Timestamp:

Oct 31, 2023 4:46:47 PM (13 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: Extend tree-view UISettingsSelector to be able to hide items; Hide them for the cases when all related editors are hidden as well.

Location:

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

Files:

• UIAdvancedSettingsDialog.cpp (modified) (2 diffs)
• UIAdvancedSettingsDialog.h (modified) (1 diff)
• UISettingsSelector.cpp (modified) (9 diffs)
• UISettingsSelector.h (modified) (2 diffs)
• editors/UIEditor.cpp (modified) (1 diff)
• editors/UIEditor.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.cpp

@@ -928 +928 @@
             /* Remember page-frame for referencing: */
             m_frames[cId] = pFrame;
+
+            /* Notify about frame visibility changes: */
+            connect(pFrame, &UISettingsPageFrame::sigVisibilityChange,
+                    this, &UIAdvancedSettingsDialog::sltHandleFrameVisibilityChange);
         }
     }
@@ -1091 +1095 @@
     foreach (UISettingsPageFrame *pFrame, m_frames.values())
         pFrame->filterOut(m_pCheckBoxMode->isChecked(), m_pEditorFilter->text());
+}
+
+void UIAdvancedSettingsDialog::sltHandleFrameVisibilityChange(bool fVisible)
+{
+    /* Acquire frame: */
+    UISettingsPageFrame *pFrame = qobject_cast<UISettingsPageFrame*>(sender());
+    AssertPtrReturnVoid(pFrame);
+
+    /* Update selector item visibility: */
+    const int iId = m_frames.key(pFrame);
+    m_pSelector->setItemVisible(iId, fVisible);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.h

@@ -200 +200 @@
     /** Handles changes done to mode checkbox or filter editor. */
     void sltHandleModeOrFilterChanged();
+    /** Handles frame visivility changes. */
+    void sltHandleFrameVisibilityChange(bool fVisible);
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.cpp

@@ -144 +144 @@
     virtual void setText(const QString &strText) { m_strText = strText; }
 
+    /** Returns whether item is hidden. */
+    virtual bool isHidden() const { return m_fHidden; }
+    /** Defines item is @a fHidden. */
+    virtual void setHidden(bool fHidden) { m_fHidden = fHidden; }
+
     /** Returns the number of children. */
     virtual int childCount() const RT_OVERRIDE { return m_children.size(); }
@@ -171 +176 @@
     /** Holds the item text. */
     QString  m_strText;
+    /** Holds whether item is hidden. */
+    bool     m_fHidden;
 
     /** Holds the list of children. */
@@ -213 +220 @@
         R_ItemName,
         R_ItemNamePoint,
+        R_ItemHidden,
     };
 
@@ -392 +400 @@
 UISelectorTreeViewItem::UISelectorTreeViewItem(QITreeView *pParent)
     : QITreeViewItem(pParent)
+    , m_fHidden(false)
 {
 }
@@ -403 +412 @@
     , m_icon(icon)
     , m_strLink(strLink)
+    , m_fHidden(false)
 {
     if (pParentItem)
@@ -657 +667 @@
                           sizeHint.height() / 2 + fm.ascent() / 2 - 1 /* base line */);
         }
+        case R_ItemHidden:
+        {
+            if (UISelectorTreeViewItem *pItem = indexToItem(specifiedIndex))
+                return pItem->isHidden() ? "hide" : "show";
+            return QString();
+        }
 
         default:
@@ -678 +694 @@
             {
                 pItem->setText(aValue.toString());
+                emit dataChanged(specifiedIndex, specifiedIndex);
+                return true;
+            }
+            return false;
+        }
+        case R_ItemHidden:
+        {
+            if (UISelectorTreeViewItem *pItem = indexToItem(specifiedIndex))
+            {
+                pItem->setHidden(aValue.toBool());
                 emit dataChanged(specifiedIndex, specifiedIndex);
                 return true;
@@ -941 +967 @@
 }
 
+void UISettingsSelectorTreeView::setItemVisible(int iID, bool fVisible)
+{
+    /* Look for the tree-view item to assign the text: */
+    QModelIndex specifiedIndex = m_pModel->findItem(iID);
+    if (specifiedIndex.isValid())
+        m_pModel->setData(specifiedIndex, !fVisible, UISelectorModel::R_ItemHidden);
+}
+
 void UISettingsSelectorTreeView::setItemText(int iID, const QString &strText)
 {
@@ -1015 +1049 @@
                 /* Configure proxy-model: */
                 m_pModelProxy->setSortRole(UISelectorModel::R_ItemId);
+                m_pModelProxy->setFilterRole(UISelectorModel::R_ItemHidden);
+                m_pModelProxy->setFilterFixedString("show");
                 m_pModelProxy->setSourceModel(m_pModel);
                 m_pTreeView->setModel(m_pModelProxy);

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.h

@@ -86 +86 @@
                              int iID, const QString &strLink, UISettingsPage *pPage = 0, int iParentID = -1) = 0;
 
+    /** Defines whether section with @a iID is @a fVisible. */
+    virtual void setItemVisible(int iID, bool fVisible) { Q_UNUSED(iID); Q_UNUSED(fVisible); }
+
     /** Defines the @a strText for section with @a iID. */
     virtual void setItemText(int iID, const QString &strText);
@@ -158 +161 @@
                              int iID, const QString &strLink, UISettingsPage *pPage = 0, int iParentID = -1) RT_OVERRIDE;
 
+    /** Defines whether section with @a iID is @a fVisible. */
+    virtual void setItemVisible(int iID, bool fVisible) RT_OVERRIDE;
+
     /** Defines the @a strText for section with @a iID. */
     virtual void setItemText(int iID, const QString &strText) RT_OVERRIDE;

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIEditor.cpp

@@ -105 +105 @@
     /* Otherwise update widget visibility usual way: */
     else
+    {
+        const bool fVisibilityChanged = isVisible() != fVisible;
         setVisible(fVisible);
+        if (fVisibilityChanged)
+            emit sigVisibilityChange(fVisible);
+    }
 
     /* Finally make sure layouts are freshly

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIEditor.h

@@ -43 +43 @@
     Q_OBJECT;
 
+signals:
+
+    /** Notifies listeners about visibility changes. */
+    void sigVisibilityChange(bool fVisible);
+
 public: