Changeset 100601 in vbox

Timestamp:

Jul 17, 2023 12:13:50 PM (20 months ago)

Author:

vboxsync

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

158431

Message:

FE/Qt: bugref:9080. Setting tooltips of parent items when a file object is removed.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (3 diffs)
• globals/UICustomFileSystemModel.h (modified) (2 diffs)
• medium/viso/UIVisoContentBrowser.cpp (modified) (4 diffs)
• medium/viso/UIVisoContentBrowser.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.cpp

@@ -290 +290 @@
 }
 
+void UICustomFileSystemItem::setToolTip(const QString &strToolTip)
+{
+    m_strToolTip = strToolTip;
+}
+
+const QString &UICustomFileSystemItem::toolTip() const
+{
+    return m_strToolTip;
+}
+
 
 /*********************************************************************************************************************************
@@ -500 +510 @@
             else
                 return QIcon(":/file_manager_folder_16px.png");
-
         }
         else if (item->isFile())
@@ -521 +530 @@
     if (role == Qt::ToolTipRole)
     {
-        return QString(item->path());
+        if (!item->toolTip().isEmpty())
+            return QString(item->toolTip());
     }
     return QVariant();

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.h

@@ -119 +119 @@
     bool isRemovedFromViso() const;
 
+    void setToolTip(const QString &strToolTip);
+    const QString &toolTip() const;
+
 private:
 
@@ -135 +138 @@
     /** True if the file object is hidden in the file system. */
     bool             m_fIsHidden;
+    QString          m_strToolTip;
 };
 

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

@@ -521 +521 @@
             createVisoEntry(pItem->path(), pItem->data(UICustomFileSystemModelData_LocalPath).toString(), true /* bool bRemove */);
 
-        pItem->setRemovedFromViso(true);
+        markRemovedUnremovedItemParents(pItem, true);
     }
     if (m_pTableProxyModel)
@@ -527 +527 @@
 }
 
+void UIVisoContentBrowser::markRemovedUnremovedItemParents(UICustomFileSystemItem *pItem, bool fRemoved)
+{
+    Q_UNUSED(fRemoved);
+    pItem->setRemovedFromViso(true);
+    UICustomFileSystemItem *pParent = pItem->parentItem();
+    while (pParent)
+    {
+        pParent->setToolTip(QApplication::translate("UIVisoCreatorWidget", "Child/children removed"));
+        pParent = pParent->parentItem();
+    }
+}
 
 void UIVisoContentBrowser::restoreItems(const QList<UICustomFileSystemItem*> itemList)
@@ -905 +916 @@
 void UIVisoContentBrowser::processRemovedEntries(const QStringList &removedEntries)
 {
+    QList<UICustomFileSystemItem*> itemList;
     foreach (const QString &strPath, removedEntries)
     {
@@ -910 +922 @@
         UICustomFileSystemItem *pItem = searchItemByPath(strPath);
         if (pItem)
-        {
-            pItem->setRemovedFromViso(true);
-            createVisoEntry(strPath,  QString(), true);
-        }
-    }
+            itemList << pItem;
+    }
+    removeItems(itemList);
 }
 

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

@@ -146 +146 @@
     void                           processRemovedEntries(const QStringList &removedEntries);
     const UICustomFileSystemItem*  currentDirectoryItem() const;
+    void                           markRemovedUnremovedItemParents(UICustomFileSystemItem *pItem, bool fRemoved);
     UIVisoContentTableView        *m_pTableView;
     UICustomFileSystemModel       *m_pModel;