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

Timestamp:

Jul 18, 2023 12:35:45 PM (19 months ago)

Author:

vboxsync

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

158460

Message:

FE/Qt: bugref:9080. Make sure selection dependent actions are enabled/disabled during reset operation.

Location:

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

Files:

• UIVisoBrowserBase.h (modified) (1 diff)
• UIVisoContentBrowser.cpp (modified) (10 diffs)
• UIVisoContentBrowser.h (modified) (3 diffs)
• UIVisoHostBrowser.h (modified) (1 diff)

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

@@ -62 +62 @@
     ~UIVisoBrowserBase();
     virtual void showHideHiddenObjects(bool bShow) = 0;
-    virtual bool tableViewHasSelection() const = 0;
 
 public slots:

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

@@ -179 +179 @@
     void sigNewItemsDropped(QStringList pathList);
 
+
 public:
 
@@ -185 +186 @@
     void dropEvent(QDropEvent *event);
     void dragMoveEvent(QDragMoveEvent *event);
+    bool hasSelection() const;
 };
 
@@ -199 +201 @@
 {
     event->acceptProposedAction();
+}
+
+bool UIVisoContentTableView::hasSelection() const
+{
+    if (!selectionModel())
+        return false;
+    return selectionModel()->hasSelection();
 }
 
@@ -643 +652 @@
     AssertReturnVoid(m_pGoBackward);
 
-    m_pRemoveAction->setEnabled(tableViewHasSelection());
-    m_pRestoreAction->setEnabled(tableViewHasSelection());
-    m_pRenameAction->setEnabled(tableViewHasSelection());
+    m_pRemoveAction->setEnabled(m_pTableView->hasSelection());
+    m_pRestoreAction->setEnabled(m_pTableView->hasSelection());
+    m_pRenameAction->setEnabled(m_pTableView->hasSelection());
 
     m_pToolBar->addAction(m_pGoBackward);
@@ -787 +796 @@
     if (m_pGoUp)
         m_pGoUp->setEnabled(!onStartItem());
+    m_pTableView->clearSelection();
+    enableDisableSelectionDependentActions();
 }
 
@@ -820 +831 @@
 {
     Q_UNUSED(bShow);
-}
-
-bool UIVisoContentBrowser::tableViewHasSelection() const
-{
-    if (!m_pTableView)
-        return false;
-    QItemSelectionModel *pSelectionModel = m_pTableView->selectionModel();
-    if (!pSelectionModel)
-        return false;
-    return pSelectionModel->hasSelection();
 }
 
@@ -1079 +1080 @@
     emit sigTableSelectionChanged(selected.isEmpty());
 
-    if (m_pRemoveAction)
-        m_pRemoveAction->setEnabled(!selected.isEmpty());
-    if (m_pRestoreAction)
-        m_pRestoreAction->setEnabled(!selected.isEmpty());
-    if (m_pRenameAction)
-        m_pRenameAction->setEnabled(!selected.isEmpty());
+    enableDisableSelectionDependentActions();
 }
 
@@ -1091 +1087 @@
     if (!rootItem() || !rootItem()->child(0))
         return;
+    goToStart();
     rootItem()->child(0)->removeChildren();
     m_entryMap.clear();
@@ -1174 +1171 @@
     /* Go up if we are not already in root: */
     if (!onStartItem())
-    {
         setTableRootIndex(currentRoot.parent());
-    }
+}
+
+void UIVisoContentBrowser::goToStart()
+{
+    while(!onStartItem())
+        goUp();
 }
 
@@ -1202 +1203 @@
 }
 
+void UIVisoContentBrowser::enableDisableSelectionDependentActions()
+{
+    AssertReturnVoid(m_pTableView);
+
+    bool fSelection = m_pTableView->hasSelection();
+    if (m_pRemoveAction)
+        m_pRemoveAction->setEnabled(fSelection);
+    if (m_pRestoreAction)
+        m_pRestoreAction->setEnabled(fSelection);
+    if (m_pRenameAction)
+        m_pRenameAction->setEnabled(fSelection);
+}
+
 #include "UIVisoContentBrowser.moc"

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

@@ -73 +73 @@
     QStringList entryList();
     virtual void showHideHiddenObjects(bool bShow)  override final;
-    virtual bool tableViewHasSelection() const final override;
+
     void parseVisoFileContent(const QString &strFileName);
     void prepareMainMenu(QMenu *pMenu);
@@ -134 +134 @@
     QString                 currentPath() const;
     UICustomFileSystemItem* searchItemByPath(const QString &strPath);
-
+    void                    goToStart();
     /** Returns a list of items which are currecntly selected
      *  in the table view. */
@@ -147 +147 @@
     const UICustomFileSystemItem*  currentDirectoryItem() const;
     void                           markRemovedUnremovedItemParents(UICustomFileSystemItem *pItem, bool fRemoved);
+    void                           enableDisableSelectionDependentActions();
     UIVisoContentTableView        *m_pTableView;
     UICustomFileSystemModel       *m_pModel;

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

@@ -58 +58 @@
     QString      currentPath() const;
     void         setCurrentPath(const QString &strPath);
-    virtual bool tableViewHasSelection() const final override;
+    bool tableViewHasSelection() const;
     /* The list of path of the selected file objects. */
     QStringList selectedPathList() const;