Changeset 76750 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 9, 2019 9:48:49 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080: Additional improvements and fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -109 +109 @@
 }
 
+void UICustomFileSystemItem::removeChildren()
+{
+    reset();
+}
+
 int UICustomFileSystemItem::columnCount() const
 {

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

@@ -61 +61 @@
     /** Removes the item from the list of children and !!DELETES!! the item. */
     void removeChild(UICustomFileSystemItem *pItem);
+    void removeChildren();
     int columnCount() const;
     QVariant data(int column) const;

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

@@ -189 +189 @@
         m_pNewDirectoryAction->setToolTip(QApplication::translate("UIVisoCreator", "Create a new directory under the current location"));
     if (m_pResetAction)
-        m_pResetAction->setToolTip(QApplication::translate("UIVisoCreator", "Remove the whole content"));
+        m_pResetAction->setToolTip(QApplication::translate("UIVisoCreator", "Reset ISO content."));
     if (m_pRenameAction)
         m_pRenameAction->setToolTip(QApplication::translate("UIVisoCreator", "Rename the selected object"));
@@ -246 +246 @@
 
     /*  Check to see if we already have a directory named strNewDirectoryName: */
-    QList<const UICustomFileSystemItem*> children = pParentItem->children();
+    const QList<const UICustomFileSystemItem*> children = pParentItem->children();
     foreach (const UICustomFileSystemItem *item, children)
     {
@@ -266 +266 @@
 void UIVisoContentBrowser::sltHandleRemoveItems()
 {
-    QVector<UICustomFileSystemItem*> selectedItems = tableSelectedItems();
-    foreach(UICustomFileSystemItem *pItem, selectedItems)
+    removeItems(tableSelectedItems());
+}
+
+void UIVisoContentBrowser::removeItems(const QList<UICustomFileSystemItem*> itemList)
+{
+    foreach(UICustomFileSystemItem *pItem, itemList)
     {
         if (!pItem)
             continue;
-        /* If the item is a directory the remove the item from iso entry list: */
-        if (pItem->type() == KFsObjType_Directory)
+        bool bFoundInMap = false;
+        for (QMap<QString, QString>::iterator iterator = m_entryMap.begin(); iterator != m_entryMap.end(); )
         {
-            for (QMap<QString, QString>::iterator iterator = m_entryMap.begin(); iterator != m_entryMap.end(); )
+            QString strIsoPath = pItem->data(UICustomFileSystemModelColumn_Path).toString();
+            if (strIsoPath.isEmpty())
+                continue;
+            if (iterator.key().startsWith(strIsoPath))
             {
-                QString strIsoPath = pItem->data(UICustomFileSystemModelColumn_Path).toString();
-                if (strIsoPath.isEmpty())
-                    continue;
-                if (iterator.key().startsWith(strIsoPath, Qt::CaseInsensitive))
-                    iterator = m_entryMap.erase(iterator);
-                else
-                    ++iterator;
+                iterator = m_entryMap.erase(iterator);
+                bFoundInMap = true;
             }
+            else
+                ++iterator;
         }
-        /* Else mark it as "removed" in the viso file entry list: */
-        else
-        {
+        if (!bFoundInMap)
             createAnIsoEntry(pItem, true /* bool bRemove */);
-        }
-    }
-
-    foreach(UICustomFileSystemItem *pItem, selectedItems)
+    }
+
+    foreach(UICustomFileSystemItem *pItem, itemList)
     {
         if (!pItem)
@@ -360 +361 @@
         m_pRemoveAction->setIcon(UIIconPool::iconSetFull(":/file_manager_delete_24px.png", ":/file_manager_delete_16px.png",
                                                      ":/file_manager_delete_disabled_24px.png", ":/file_manager_delete_disabled_16px.png"));
-        m_pRemoveAction->setEnabled(true);
+        m_pRemoveAction->setEnabled(false);
     }
 
@@ -372 +373 @@
     }
 
-    m_pResetAction = new QAction(this);
-    if (m_pResetAction)
-    {
-        m_pVerticalToolBar->addAction(m_pResetAction);
-        m_pResetAction->setIcon(UIIconPool::iconSet(":/file_manager_delete_16px.png", ":/file_manager_delete_disabled_16px.png"));
-        m_pResetAction->setEnabled(true);
-    }
-
     m_pRenameAction = new QAction(this);
     if (m_pRenameAction)
@@ -386 +379 @@
         m_pRenameAction->setIcon(UIIconPool::iconSet(":/file_manager_rename_16px.png", ":/file_manager_rename_disabled_16px.png"));
         m_pRenameAction->setEnabled(false);
+    }
+
+    m_pVerticalToolBar->addSeparator();
+
+    m_pResetAction = new QAction(this);
+    if (m_pResetAction)
+    {
+        m_pVerticalToolBar->addAction(m_pResetAction);
+        m_pResetAction->setIcon(UIIconPool::iconSet(":/cd_remove_16px.png", ":/cd_remove_disabled_16px.png"));
+        m_pResetAction->setEnabled(true);
     }
 
@@ -403 +406 @@
         connect(m_pRemoveAction, &QAction::triggered,
                 this, &UIVisoContentBrowser::sltHandleRemoveItems);
+    if (m_pResetAction)
+        connect(m_pResetAction, &QAction::triggered,
+                this, &UIVisoContentBrowser::sltHandleResetAction);
+
     if (m_pTableView->selectionModel())
         connect(m_pTableView->selectionModel(), &QItemSelectionModel::selectionChanged,
@@ -430 +437 @@
     startItem->setIsOpened(false);
 }
-
 
 void UIVisoContentBrowser::setTableRootIndex(QModelIndex index /* = QModelIndex */)
@@ -637 +643 @@
     pItem->setData(UIPathOperations::mergePaths(pItem->parentItem()->path(), pItem->name()), UICustomFileSystemModelColumn_Path);
 
-
-
     if (m_pTableProxyModel)
         m_pTableProxyModel->invalidate();
@@ -652 +656 @@
 }
 
+void UIVisoContentBrowser::sltHandleResetAction()
+{
+    if (!rootItem() || !rootItem()->child(0))
+        return;
+    rootItem()->child(0)->removeChildren();
+    m_entryMap.clear();
+    if (m_pTableProxyModel)
+        m_pTableProxyModel->invalidate();
+    if (m_pTreeProxyModel)
+        m_pTreeProxyModel->invalidate();
+}
+
 void UIVisoContentBrowser::reset()
 {
@@ -657 +673 @@
 }
 
-QVector<UICustomFileSystemItem*> UIVisoContentBrowser::tableSelectedItems()
-{
-    QVector<UICustomFileSystemItem*> selectedItems;
+QList<UICustomFileSystemItem*> UIVisoContentBrowser::tableSelectedItems()
+{
+    QList<UICustomFileSystemItem*> selectedItems;
     if (!m_pTableProxyModel)
         return selectedItems;
@@ -665 +681 @@
     if (!selectionModel || selectionModel->selectedIndexes().isEmpty())
         return selectedItems;
-    QModelIndexList list = selectionModel->selectedIndexes();
+    QModelIndexList list = selectionModel->selectedRows();
     foreach (QModelIndex index, list)
     {

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

@@ -78 +78 @@
     void sltHandleRemoveItems();
     void sltHandleTableSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+    void sltHandleResetAction();
 
 private:
@@ -91 +92 @@
     void                    updateStartItemName();
     void                    renameFileObject(UICustomFileSystemItem *pItem);
+    void                    removeItems(const QList<UICustomFileSystemItem*> itemList);
     /** Creates and entry for pItem consisting of a map item (key is iso path and value is host file system path)
      *  if @p bRemove is true then the value is the string ":remove:" which effectively removes the file object
@@ -98 +100 @@
     /** Returns a list of items which are currecntly selected
      *  in the table view. */
-    QVector<UICustomFileSystemItem*> tableSelectedItems();
+    QList<UICustomFileSystemItem*> tableSelectedItems();
+
     UICustomFileSystemModel      *m_pModel;
     UICustomFileSystemProxyModel *m_pTableProxyModel;

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

@@ -101 +101 @@
         m_pTitleLabel->setText(QApplication::translate("UIVisoCreator", "Host file system"));
     if (m_pAddAction)
-        m_pAddAction->setToolTip(QApplication::translate("UIVisoCreator", "Add selected file objects to VISO"));
+        m_pAddAction->setToolTip(QApplication::translate("UIVisoCreator", "Add selected file objects to ISO"));
 }
 
@@ -193 +193 @@
     if (bShow)
     {
-        m_pTableModel->setFilter(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Hidden);
         m_pTreeModel->setFilter(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Hidden);
+        m_pTableModel->setFilter(QDir::AllEntries | QDir::NoDot | QDir::Hidden | QDir::System);
     }
     else
     {
-        m_pTableModel->setFilter(QDir::AllDirs | QDir::NoDotAndDotDot);
         m_pTreeModel->setFilter(QDir::AllDirs | QDir::NoDotAndDotDot);
+        m_pTableModel->setFilter(QDir::AllEntries | QDir::NoDot);
     }
 }
@@ -214 +214 @@
     for (int i = 0; i < selectedIndices.size(); ++i)
     {
-        pathList << m_pTableModel->filePath(selectedIndices[i]);
+        QString strPath = m_pTableModel->filePath(selectedIndices[i]);
+        if (strPath.contains(".."))
+            continue;
+        pathList << strPath;
     }
     emit sigAddObjectsToViso(pathList);

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

@@ -55 +55 @@
     virtual void setTableRootIndex(QModelIndex index = QModelIndex()) /* override */;
     virtual void setTreeCurrentIndex(QModelIndex index = QModelIndex()) /* override */;
-
     virtual void treeSelectionChanged(const QModelIndex &selectedTreeIndex) /* override */;