Changeset 100348 in vbox

Timestamp:

Jul 3, 2023 2:03:27 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Adding an action for removing imported ISO content.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -2646 +2646 @@
         setStatusTip(QApplication::translate("UIActionPool", "Import ISO into the VISO content."));
         setToolTip(QApplication::translate("UIActionPool", "Import Selected ISO(s) into the VISO content.")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
+
+class UIActionMenuVISOCreatorRemoveISO : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuVISOCreatorRemoveISO(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/cd_remove_16px.png", ":/cd_remove_32px.png", ":/cd_remove_disabled_16px.png", ":/cd_remove_disabled_32px.png")
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const RT_OVERRIDE
+    {
+        return QString("ISORemove");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() RT_OVERRIDE
+    {
+        setName(QApplication::translate("UIActionPool", "ISORemove"));
+        setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator"));
+        setStatusTip(QApplication::translate("UIActionPool", "Remove ISO into the VISO content."));
+        setToolTip(QApplication::translate("UIActionPool", "Remove Selected ISO(s) into the VISO content.")
                    + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
     }
@@ -3465 +3498 @@
     m_pool[UIActionIndex_M_VISOCreator_Open] = new UIActionMenuVISOCreatorOpen(this);
     m_pool[UIActionIndex_M_VISOCreator_ImportISO] = new UIActionMenuVISOCreatorImportISO(this);
+    m_pool[UIActionIndex_M_VISOCreator_RemoveISO] = new UIActionMenuVISOCreatorRemoveISO(this);
 
     m_pool[UIActionIndex_M_VISOCreator_VisoContent_GoHome] = new UIActionMenuVISOCreatorGoHome(this);

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

@@ -163 +163 @@
     UIActionIndex_M_VISOCreator_Open,
     UIActionIndex_M_VISOCreator_ImportISO,
+    UIActionIndex_M_VISOCreator_RemoveISO,
     UIActionIndex_M_VISOCreator_VisoContent_GoHome,
     UIActionIndex_M_VISOCreator_VisoContent_GoUp,

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

@@ -267 +267 @@
                                                   const QString &strDirPath /* = QString() */)
 {
+    /* We can import only a ISO file into VISO:*/
+    if (!importedISOPath().isEmpty())
+        return;
     if (!pParentItem)
-        pParentItem = rootItem()->children()[0];
+    {
+        pParentItem = startItem();
+        setTableRootIndex(m_pModel->index(pParentItem));
+    }
     if (!m_pTableView || !pParentItem)
         return;
@@ -312 +318 @@
     if (m_pTableProxyModel)
         m_pTableProxyModel->invalidate();
-}
-
+    emit sigISOContentImportedOrRemoved(true /* imported*/);
+}
+
+void UIVisoContentBrowser::removeISOContentFromViso()
+{
+    UICustomFileSystemItem* pParentItem = startItem();
+    AssertReturnVoid(pParentItem);
+    AssertReturnVoid(m_pModel);
+
+    QList<UICustomFileSystemItem*> itemsToDelete;
+    /* Delete all children of startItem that were imported from an ISO: */
+    for (int i = 0; i < pParentItem->childCount(); ++i)
+    {
+        UICustomFileSystemItem* pItem = pParentItem->child(i);
+        if (!pItem || pItem->data(UICustomFileSystemModelData_ISOFilePath).toString().isEmpty())
+            continue;
+        itemsToDelete << pItem;
+    }
+
+    foreach (UICustomFileSystemItem *pItem, itemsToDelete)
+            m_pModel->deleteItem(pItem);
+    if (m_pTableProxyModel)
+        m_pTableProxyModel->invalidate();
+
+    setImportedISOPath();
+    emit sigISOContentImportedOrRemoved(false /* imported*/);
+}
 
 void UIVisoContentBrowser::addObjectsToViso(const QStringList &pathList)
@@ -545 +576 @@
         m_pTableView->hideColumn(UICustomFileSystemModelData_Size);
         m_pTableView->hideColumn(UICustomFileSystemModelData_ChangeTime);
+        m_pTableView->hideColumn(UICustomFileSystemModelData_ISOFilePath);
 
         m_pTableView->setSortingEnabled(true);
@@ -606 +638 @@
 }
 
-void UIVisoContentBrowser::setImportedISOPath(const QString &strPath)
+void UIVisoContentBrowser::setImportedISOPath(const QString &strPath /* = QString() */)
 {
     if (m_strImportedISOPath == strPath)

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

@@ -56 +56 @@
 
     void sigTableSelectionChanged(bool fIsSelectionEmpty);
+    void sigISOContentImportedOrRemoved(bool fImportedr);
 
 public:
@@ -65 +66 @@
                                 UICustomFileSystemItem *pParentItem = 0,
                                 const QString &strDirPath = QString());
+    void removeISOContentFromViso();
     /** Adds file objests from the host file system. @p pathList consists of list of paths to there objects. */
     void addObjectsToViso(const QStringList &pathList);
@@ -77 +79 @@
 
     const QString &importedISOPath() const;
-    void setImportedISOPath(const QString &strPath);
+    void setImportedISOPath(const QString &strPath = QString());
 
 public slots:

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

@@ -261 +261 @@
     , m_pOpenAction(0)
     , m_pImportISOAction(0)
+    , m_pRemoveISOAction(0)
     , m_pMainLayout(0)
     , m_pHostBrowser(0)
@@ -414 +415 @@
 void UIVisoCreatorWidget::sltISOImportAction()
 {
-    if (!m_pHostBrowser)
+    if (!m_pHostBrowser || !m_pVISOContentBrowser)
         return;
     QStringList selectedObjectPaths = m_pHostBrowser->selectedPathList();
@@ -420 +421 @@
         return;
     m_pVISOContentBrowser->importISOContentToViso(selectedObjectPaths[0]);
+}
+
+void UIVisoCreatorWidget::sltISORemoveAction()
+{
+    if (!m_pVISOContentBrowser)
+        return;
+    m_pVISOContentBrowser->removeISOContentFromViso();
+}
+
+void UIVisoCreatorWidget::sltISOContentImportedOrRemoved(bool fImported)
+{
+    if (m_pImportISOAction)
+        m_pImportISOAction->setEnabled(!fImported);
+    if (m_pRemoveISOAction)
+        m_pRemoveISOAction->setEnabled(fImported);
 }
 
@@ -510 +526 @@
         connect(m_pVISOContentBrowser, &UIVisoContentBrowser::sigTableSelectionChanged,
                 this, &UIVisoCreatorWidget::sltContentBrowserTableSelectionChanged);
+        connect(m_pVISOContentBrowser, &UIVisoContentBrowser::sigISOContentImportedOrRemoved,
+                this, &UIVisoCreatorWidget::sltISOContentImportedOrRemoved);
     }
 
@@ -530 +548 @@
         connect(m_pImportISOAction, &QAction::triggered,
                 this, &UIVisoCreatorWidget::sltISOImportAction);
+    if (m_pRemoveISOAction)
+        connect(m_pRemoveISOAction, &QAction::triggered,
+                this, &UIVisoCreatorWidget::sltISORemoveAction);
 }
 
@@ -546 +567 @@
     if (m_pImportISOAction)
         m_pImportISOAction->setEnabled(false);
+
+    m_pRemoveISOAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_RemoveISO);
+    if (m_pRemoveISOAction)
+        m_pRemoveISOAction->setEnabled(false);
 }
 
@@ -566 +591 @@
         if (m_pImportISOAction)
             m_pMainMenu->addAction(m_pImportISOAction);
+        if (m_pRemoveISOAction)
+            m_pMainMenu->addAction(m_pRemoveISOAction);
     }
     if (m_pVISOContentBrowser)
@@ -587 +614 @@
         if (m_pImportISOAction)
             m_pVerticalToolBar->addAction(m_pImportISOAction);
+        if (m_pRemoveISOAction)
+            m_pVerticalToolBar->addAction(m_pRemoveISOAction);
 
         m_pVerticalToolBar->addWidget(bottomSpacerWidget);

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

@@ -119 +119 @@
     void sltOpenAction();
     void sltISOImportAction();
+    void sltISORemoveAction();
+    void sltISOContentImportedOrRemoved(bool fImported);
 
 private:
@@ -143 +145 @@
         QAction              *m_pOpenAction;
         QAction              *m_pImportISOAction;
+        QAction              *m_pRemoveISOAction;
     /** @} */