Changeset 100548 in vbox

Timestamp:

Jul 12, 2023 12:31:50 PM (19 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Adding an action for restoring removed items back to Viso 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) (11 diffs)
• medium/viso/UIVisoContentBrowser.h (modified) (3 diffs)

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

@@ -2479 +2479 @@
         setStatusTip(QApplication::translate("UIActionPool", "Remove selected item(s) from VISO"));
         setToolTip(QApplication::translate("UIActionPool", "Remove Selected Item(s) from VISO")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
+class UIActionMenuVISOCreatorRestore : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuVISOCreatorRestore(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/file_manager_restore_24px.png",
+                         ":/file_manager_restore_16px.png",
+                         ":/file_manager_restore_disabled_24px.png",
+                         ":/file_manager_restore_disabled_16px.png")
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const RT_OVERRIDE
+    {
+        return QString("VISORestoreItem");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() RT_OVERRIDE
+    {
+        setName(QApplication::translate("UIActionPool", "&Restore"));
+        setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator"));
+        setStatusTip(QApplication::translate("UIActionPool", "Restore selected item(s)"));
+        setToolTip(QApplication::translate("UIActionPool", "Restore Selected Item(s)")
                    + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
     }
@@ -3524 +3559 @@
     m_pool[UIActionIndex_M_VISOCreator_Add] = new UIActionMenuVISOCreatorAdd(this);
     m_pool[UIActionIndex_M_VISOCreator_Remove] = new UIActionMenuVISOCreatorRemove(this);
+    m_pool[UIActionIndex_M_VISOCreator_Restore] = new UIActionMenuVISOCreatorRestore(this);
     m_pool[UIActionIndex_M_VISOCreator_CreateNewDirectory] = new UIActionMenuVISOCreatorCreateNewDirectory(this);
     m_pool[UIActionIndex_M_VISOCreator_Rename] = new UIActionMenuVISOCreatorRename(this);

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

@@ -158 +158 @@
     UIActionIndex_M_VISOCreator_Add,
     UIActionIndex_M_VISOCreator_Remove,
+    UIActionIndex_M_VISOCreator_Restore,
     UIActionIndex_M_VISOCreator_CreateNewDirectory,
     UIActionIndex_M_VISOCreator_Rename,

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

@@ -236 +236 @@
     , m_pTableProxyModel(0)
     , m_pRemoveAction(0)
+    , m_pRestoreAction(0)
     , m_pCreateNewDirectoryAction(0)
     , m_pRenameAction(0)
@@ -498 +499 @@
 }
 
+void UIVisoContentBrowser::sltRestoreItems()
+{
+    restoreItems(tableSelectedItems());
+}
+
 void UIVisoContentBrowser::removeItems(const QList<UICustomFileSystemItem*> itemList)
 {
@@ -516 +522 @@
     if (m_pTableProxyModel)
         m_pTableProxyModel->invalidate();
+}
+
+
+void UIVisoContentBrowser::restoreItems(const QList<UICustomFileSystemItem*> itemList)
+{
+    Q_UNUSED(itemList);
 }
 
@@ -579 +591 @@
 {
     m_pRemoveAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Remove);
+    m_pRestoreAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Restore);
     m_pCreateNewDirectoryAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_CreateNewDirectory);
     m_pRenameAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Rename);
@@ -587 +600 @@
 
     AssertReturnVoid(m_pRemoveAction);
+    AssertReturnVoid(m_pRestoreAction);
     AssertReturnVoid(m_pCreateNewDirectoryAction);
     AssertReturnVoid(m_pRenameAction);
@@ -596 +610 @@
 
     m_pRemoveAction->setEnabled(tableViewHasSelection());
+    m_pRestoreAction->setEnabled(tableViewHasSelection());
     m_pRenameAction->setEnabled(tableViewHasSelection());
 
@@ -603 +618 @@
     m_pToolBar->addSeparator();
     m_pToolBar->addAction(m_pRemoveAction);
-
+    m_pToolBar->addAction(m_pRestoreAction);
     m_pToolBar->addAction(m_pCreateNewDirectoryAction);
     m_pToolBar->addAction(m_pRenameAction);
@@ -622 +637 @@
     m_pSubMenu->addAction(m_pGoForward);
     m_pSubMenu->addAction(m_pGoUp);
-    m_pSubMenu->addAction(m_pGoHome);
 
     m_pSubMenu->addSeparator();
 
     m_pSubMenu->addAction(m_pRemoveAction);
+    m_pSubMenu->addAction(m_pRestoreAction);
     m_pSubMenu->addAction(m_pRenameAction);
     m_pSubMenu->addAction(m_pCreateNewDirectoryAction);
@@ -671 +686 @@
         connect(m_pRemoveAction, &QAction::triggered,
                 this, &UIVisoContentBrowser::sltRemoveItems);
+    if (m_pRestoreAction)
+        connect(m_pRestoreAction, &QAction::triggered,
+                this, &UIVisoContentBrowser::sltRestoreItems);
     if (m_pResetAction)
         connect(m_pResetAction, &QAction::triggered,
@@ -998 +1016 @@
     if (m_pRemoveAction)
         m_pRemoveAction->setEnabled(!selected.isEmpty());
+    if (m_pRestoreAction)
+        m_pRestoreAction->setEnabled(!selected.isEmpty());
     if (m_pRenameAction)
         m_pRenameAction->setEnabled(!selected.isEmpty());
@@ -1026 +1046 @@
 
     menu.addAction(m_pRemoveAction);
+    menu.addAction(m_pRestoreAction);
     menu.addAction(m_pCreateNewDirectoryAction);
     menu.addAction(m_pResetAction);

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

@@ -88 +88 @@
                               const QString &strOldName, const QString &strNewName);
     void sltRemoveItems();
+    void sltRestoreItems();
     void sltResetAction();
     void sltItemRenameAction();
@@ -124 +125 @@
     void                    renameFileObject(UICustomFileSystemItem *pItem);
     void                    removeItems(const QList<UICustomFileSystemItem*> itemList);
+    void                    restoreItems(const QList<UICustomFileSystemItem*> itemList);
     /** Creates and entry for pItem consisting of a map item (key is viso 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
@@ -151 +153 @@
 
     QAction                      *m_pRemoveAction;
+    QAction                      *m_pRestoreAction;
     QAction                      *m_pCreateNewDirectoryAction;
     QAction                      *m_pRenameAction;