Changeset 100330 in vbox

Timestamp:

Jun 29, 2023 11:15:59 AM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Implementing slots for content browser's navigation actions.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

• UIVisoContentBrowser.cpp (modified) (10 diffs)
• UIVisoContentBrowser.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

@@ -401 +401 @@
     if (!pClickedItem)
         return;
+    if (!pClickedItem->isDirectory())
+        return;
     QString strISOPath = pClickedItem->data(UICustomFileSystemModelData_ISOFilePath).toString();
     if (pClickedItem->isUpDirectory())
-    {
-        QModelIndex currentRoot = m_pTableProxyModel->mapToSource(m_pTableView->rootIndex());
-        /* Go up if we are not already in root: */
-        if (currentRoot != m_pModel->rootIndex())
-        {
-            setTableRootIndex(currentRoot.parent());
-        }
-    }
+        goUp();
     else if (!strISOPath.isEmpty())
     {
@@ -561 +556 @@
     m_pRenameAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Rename);
     m_pResetAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Reset);
-    m_pGoHome = m_pActionPool->action(UIActionIndex_M_VISOCreator_VisoContent_GoHome);
     m_pGoUp = m_pActionPool->action(UIActionIndex_M_VISOCreator_VisoContent_GoUp);
     m_pGoForward = m_pActionPool->action(UIActionIndex_M_VISOCreator_VisoContent_GoForward);
@@ -571 +565 @@
     AssertReturnVoid(m_pResetAction);
     AssertReturnVoid(m_pToolBar);
-    AssertReturnVoid(m_pGoHome);
     AssertReturnVoid(m_pGoUp);
     AssertReturnVoid(m_pGoForward);
@@ -582 +575 @@
     m_pToolBar->addAction(m_pGoForward);
     m_pToolBar->addAction(m_pGoUp);
-    m_pToolBar->addAction(m_pGoHome);
     m_pToolBar->addSeparator();
     m_pToolBar->addAction(m_pRemoveAction);
@@ -636 +628 @@
         connect(m_pRenameAction, &QAction::triggered,
                 this,&UIVisoContentBrowser::sltItemRenameAction);
+
+    if (m_pGoUp)
+        connect(m_pGoUp, &QAction::triggered, this, &UIVisoContentBrowser::sltGoUp);
+    if (m_pGoForward)
+        connect(m_pGoForward, &QAction::triggered, this, &UIVisoContentBrowser::sltGoForward);
+    if (m_pGoBackward)
+        connect(m_pGoBackward, &QAction::triggered, this, &UIVisoContentBrowser::sltGoBackward);
 }
 
@@ -643 +642 @@
         return 0;
     return m_pModel->rootItem();
+}
+
+UICustomFileSystemItem* UIVisoContentBrowser::startItem()
+{
+    UICustomFileSystemItem* pRoot = rootItem();
+
+    if (!pRoot || pRoot->childCount() <= 0)
+        return 0;
+    return pRoot->child(0);
 }
 
@@ -669 +677 @@
         m_pTableView->setRootIndex(tableIndex);
     updateNavigationWidgetPath(currentPath());
+    if (m_pGoUp)
+        m_pGoUp->setEnabled(!onStartItem());
 }
 
@@ -844 +854 @@
     if (m_pTableProxyModel)
         m_pTableProxyModel->invalidate();
-
-
 }
 
@@ -885 +893 @@
     menu.addAction(m_pResetAction);
     menu.exec(pSender->mapToGlobal(point));
+}
+
+void UIVisoContentBrowser::sltGoUp()
+{
+    goUp();
 }
 
@@ -922 +935 @@
 }
 
+bool UIVisoContentBrowser::onStartItem()
+{
+    if (!m_pTableView || !m_pModel)
+        return false;
+    QModelIndex index = m_pTableProxyModel->mapToSource(m_pTableView->rootIndex());
+    UICustomFileSystemItem *pItem = static_cast<UICustomFileSystemItem*>((index).internalPointer());
+    if (!index.isValid() || !pItem)
+        return false;
+    if (pItem != startItem())
+        return false;
+    return true;
+}
+
+void UIVisoContentBrowser::goUp()
+{
+    AssertReturnVoid(m_pTableProxyModel);
+    AssertReturnVoid(m_pTableView);
+    QModelIndex currentRoot = m_pTableProxyModel->mapToSource(m_pTableView->rootIndex());
+    if (!currentRoot.isValid())
+        return;
+    /* Go up if we are not already in root: */
+    if (!onStartItem())
+    {
+        setTableRootIndex(currentRoot.parent());
+    }
+}
 #include "UIVisoContentBrowser.moc"

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.h

@@ -85 +85 @@
     void sltResetAction();
     void sltItemRenameAction();
+    void sltGoUp();
 
 protected:
@@ -107 +108 @@
     void                    initializeModel();
     UICustomFileSystemItem *rootItem();
+    /* Child of root. */
+    UICustomFileSystemItem *startItem();
 
     /** @name Index conversion functions. These are half-smart and tries to determine the source model before conversion.
@@ -128 +131 @@
      *  in the table view. */
     QList<UICustomFileSystemItem*> tableSelectedItems();
+    bool                           onStartItem();
+    void                           goUp();
     UIVisoContentTableView       *m_pTableView;
     UICustomFileSystemModel      *m_pModel;