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

Timestamp:

Nov 27, 2018 7:22:31 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Implementing what's needed for guest-to-guest copy/cut operations. Not fully working. I will wait until we have an API function.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIGuestControlFileTable.cpp (modified) (3 diffs)
• UIGuestControlFileTable.h (modified) (5 diffs)
• UIGuestFileTable.cpp (modified) (3 diffs)
• UIGuestFileTable.h (modified) (1 diff)
• UIHostFileTable.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp

@@ -681 +681 @@
 UIGuestControlFileTable::UIGuestControlFileTable(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
     :QIWithRetranslateUI<QWidget>(pParent)
+    , m_eFileOperationType(FileOperationType_None)
     , m_pRootItem(0)
     , m_pLocationLabel(0)
@@ -1129 +1130 @@
 void UIGuestControlFileTable::sltCopy()
 {
-
     m_copyCutBuffer = selectedItemPathList();
-    // if (!m_copyCutBuffer.isEmpty())
-    //     m_pPaste->setEnabled(true);
-    // else
-    //     m_pPaste->setEnabled(false);
+    m_eFileOperationType = FileOperationType_Copy;
+    setPasteActionEnabled(true);
 }
 
@@ -1140 +1138 @@
 {
     m_copyCutBuffer = selectedItemPathList();
-    // if (!m_copyCutBuffer.isEmpty())
-    //     m_pPaste->setEnabled(true);
-    // else
-    //     m_pPaste->setEnabled(false);
+    m_eFileOperationType = FileOperationType_Cut;
+    setPasteActionEnabled(true);
 }
 
 void UIGuestControlFileTable::sltPaste()
 {
-    // paste them
     m_copyCutBuffer.clear();
-    //m_pPaste->setEnabled(false);
+
+    m_eFileOperationType = FileOperationType_None;
+    setPasteActionEnabled(false);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.h

@@ -286 +286 @@
 
 protected:
+    /** This enum is used when performing a gueest-to-guest or host-to-host
+     *  file operations. Paths of source file objects are kept in a single buffer
+     *  and a flag to determine if it is a cut or copy operation is needed */
+    enum FileOperationType
+    {
+        FileOperationType_Copy,
+        FileOperationType_Cut,
+        FileOperationType_None,
+        FileOperationType_Max
+    };
 
     void retranslateUi();
@@ -308 +318 @@
     virtual void     createFileViewContextMenu(const QWidget *pWidget, const QPoint &point) = 0;
     virtual bool     event(QEvent *pEvent) /* override */;
+    /** @name Copy/Cut guest-to-guest (host-to-host) stuff.
+     * @{ */
+        /** Disable/enable paste action depending on the m_eFileOperationType. */
+        virtual void  setPasteActionEnabled(bool fEnabled) = 0;
+        virtual void  pasteCutCopiedObjects() = 0;
+        /** stores the type of the pending guest-to-guest (host-to-host) file operation. */
+        FileOperationType m_eFileOperationType;
+    /** @} */
+
     QString          fileTypeString(FileObjectType type);
     /* @p item index is item location in model not in 'proxy' model */
@@ -331 +350 @@
     /** Stores the drive letters the file system has (for windows system). For non-windows
      *  systems this is empty and for windows system it should at least contain C:/ */
-    QStringList m_driveLetterList;
+    QStringList              m_driveLetterList;
     /** The set of actions which need some selection to work on. Like cut, copy etc. */
-    QSet<QAction*> m_selectionDependentActions;
+    QSet<QAction*>           m_selectionDependentActions;
     /** Paths of the source file objects are stored in this map to delete those
      * after the copy progress completed notification is receieved */
-    QMap<QUuid, QStringList>  m_deleteAfterCopyCache;
+    QMap<QUuid, QStringList> m_deleteAfterCopyCache;
+    /** The absolue path list of the file objects which user has chosen to cut/copy. this
+     *  list will be cleaned after a paste operation or overwritten by a subsequent cut/copy.
+     *  Currently only used by the guest side. */
+    QStringList              m_copyCutBuffer;
 
 private slots:
@@ -360 +383 @@
      *  drive letter are direct children of the start directory. On other systems start directory is '/' */
     void            populateStartDirectory(UIFileTableItem *startItem);
+    /** Root index of the m_pModel */
     QModelIndex     currentRootIndex() const;
     /* Searches the content of m_pSearchLineEdit within the current items' names and selects the item if found. */
@@ -375 +399 @@
     QGridLayout     *m_pMainLayout;
     QComboBox       *m_pLocationComboBox;
-    /** The absolue path list of the file objects which user has chosen to cut/copy. this
-     *  list will be cleaned after a paste operation or overwritten by a subsequent cut/copy */
-    QStringList      m_copyCutBuffer;
     QILineEdit      *m_pSearchLineEdit;
     QILabel         *m_pWarningLabel;

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp

@@ -591 +591 @@
     }
     setSelectionDependentActionsEnabled(false);
+    setPasteActionEnabled(false);
 }
 
@@ -607 +608 @@
     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Rename));
     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_CreateNewDirectory));
-    /* Hide cut, copy, and paste for now. We will implement those
-       when we have an API for host file operations: */
     menu.addSeparator();
     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Copy));
@@ -620 +619 @@
     menu.exec(pWidget->mapToGlobal(point));
 }
+
+void UIGuestFileTable::setPasteActionEnabled(bool fEnabled)
+{
+    m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Paste)->setEnabled(fEnabled);
+}
+
+void UIGuestFileTable::pasteCutCopiedObjects()
+{
+    /** Wait until we have a API function that would take multiple source objects
+     *  and return a single IProgress instance: */
+    // QVector<KFileCopyFlag> fileCopyFlags;
+    // QVector<KDirectoryCopyFlag> directoryCopyFlags;
+
+    // foreach (const QString &strPath, m_copyCutBuffer)
+    // {
+
+    // }
+}
+
 
 void UIGuestFileTable::prepareActionConnections()

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.h

@@ -64 +64 @@
     virtual void    prepareToolbar() /* override */;
     virtual void    createFileViewContextMenu(const QWidget *pWidget, const QPoint &point) /* override */;
+    /** @name Copy/Cut guest-to-guest stuff.
+     * @{ */
+        /** Disable/enable paste action depending on the m_eFileOperationType. */
+        virtual void  setPasteActionEnabled(bool fEnabled) /* override */;
+        virtual void  pasteCutCopiedObjects() /* override */;
+    /** @} */
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.h

@@ -51 +51 @@
     virtual void    prepareToolbar() /* override */;
     virtual void    createFileViewContextMenu(const QWidget *pWidget, const QPoint &point) /* override */;
+    /** @name Copy/Cut host-to-host stuff. Currently not implemented.
+     * @{ */
+        /** Disable/enable paste action depending on the m_eFileOperationType. */
+        virtual void  setPasteActionEnabled(bool) /* override */{}
+        virtual void  pasteCutCopiedObjects() /* override */{}
+    /** @} */
 
 private: