Changeset 102958 in vbox for trunk/src

Timestamp:

Jan 18, 2024 6:43:05 PM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: VM settings / Storage page: Simplify for Basic experience mode; Hiding controller items and actions.

Location:

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

Files:

• UIStorageSettingsEditor.cpp (modified) (4 diffs)
• UIStorageSettingsEditor.h (modified) (2 diffs)

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

@@ -3173 +3173 @@
     }
 
-    /* Choose first controller as current: */
-    AssertPtrReturnVoid(m_pTreeViewStorage);
-    const QAbstractItemModel *pModel = m_pTreeViewStorage->model();
-    AssertPtrReturnVoid(pModel);
-    const QModelIndex rootIndex = pModel->index(0, 0);
-    if (pModel->rowCount(rootIndex) > 0)
-        m_pTreeViewStorage->setCurrentIndex(pModel->index(0, 0, rootIndex));
+    /* Update root and current indexes: */
+    updateRootAndCurrentIndexes();
 
     /* Fetch recent information: */
@@ -3327 +3322 @@
 }
 
+void UIStorageSettingsEditor::handleFilterChange()
+{
+    /* First of all we could remap view's root to
+     * something more appropriate to current mode.
+     * In Basic mode we no need controllers. */
+    updateRootAndCurrentIndexes();
+
+    /* Update action visibility. In Basic mode
+     * we no need controller actions as well. */
+    m_pActionAddController->setVisible(m_fInExpertMode);
+    m_pActionRemoveController->setVisible(m_fInExpertMode);
+
+    /* We should also redraw branches if any: */
+    update();
+}
+
 void UIStorageSettingsEditor::sltHandleMediumEnumerated(const QUuid &uMediumId)
 {
@@ -4104 +4115 @@
 void UIStorageSettingsEditor::sltHandleDrawItemBranches(QPainter *pPainter, const QRect &rect, const QModelIndex &index)
 {
+    /* Do nothing for Basic experience mode:  */
+    if (!m_fInExpertMode)
+        return;
+
     /* Acquire model: */
     AssertPtrReturnVoid(m_pTreeViewStorage);
@@ -5120 +5135 @@
 }
 
+void UIStorageSettingsEditor::updateRootAndCurrentIndexes()
+{
+    /* Acquire model: */
+    AssertPtrReturnVoid(m_pTreeViewStorage);
+    const QAbstractItemModel *pModel = m_pTreeViewStorage->model();
+    AssertPtrReturnVoid(pModel);
+
+    /* What indexes we wish to make current/root of the view? */
+    QModelIndex currentIndex;
+    QModelIndex rootIndex;
+
+    /* Select the model's root index.
+     * It contains all the controllers we have: */
+    currentIndex = pModel->index(0, 0);
+    /* Map the view to this selection: */
+    rootIndex = currentIndex;
+    /* But if we have at least one controller: */
+    if (pModel->rowCount(currentIndex) > 0)
+    {
+        /* Why not select it as well?
+         * It contains all the attachments we have (there): */
+        currentIndex = pModel->index(0, 0, currentIndex);
+        /* For Basic experience mode: */
+        if (!m_fInExpertMode)
+        {
+            /* Map the view to this selection: */
+            rootIndex = currentIndex;
+            /* But if we have at least one attachment: */
+            if (pModel->rowCount(currentIndex) > 0)
+            {
+                /* Why not select it as well?
+                 * It's useful for Basic experience mode: */
+                currentIndex = pModel->index(0, 0, currentIndex);
+            }
+        }
+    }
+
+    /* Use the indexes we found: */
+    m_pTreeViewStorage->setRootIndex(rootIndex);
+    m_pTreeViewStorage->setCurrentIndex(currentIndex);
+}
+
 void UIStorageSettingsEditor::addControllerWrapper(const QString &strName, KStorageBus enmBus, KStorageControllerType enmType)
 {

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

@@ -223 +223 @@
     /** Handles show @a pEvent. */
     virtual void showEvent(QShowEvent *pEvent) RT_OVERRIDE;
+
+    /** Handles filter change. */
+    virtual void handleFilterChange() RT_OVERRIDE;
 
 private slots:
@@ -343 +346 @@
     /** Cleanups all. */
     void cleanup();
+
+    /** Updates root and current index most suitable for this editor. */
+    void updateRootAndCurrentIndexes();
 
     /** Adds controller with @a strName, @a enmBus and @a enmType. */