Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc (revision 75903) @@ -206,12 +206,4 @@ images/file_manager_log_disabled_16px.png images/file_manager_log_disabled_32px.png - images/file_manager_move_to_guest_16px.png - images/file_manager_move_to_guest_24px.png - images/file_manager_move_to_guest_disabled_16px.png - images/file_manager_move_to_guest_disabled_24px.png - images/file_manager_move_to_host_16px.png - images/file_manager_move_to_host_24px.png - images/file_manager_move_to_host_disabled_16px.png - images/file_manager_move_to_host_disabled_24px.png images/file_manager_new_directory_16px.png images/file_manager_new_directory_24px.png @@ -384,4 +376,8 @@ images/machine_warning_16px.png images/media_manager_16px.png + images/media_manager_24px.png + images/media_manager_32px.png + images/media_manager_disabled_16px.png + images/media_manager_disabled_24px.png Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x2.qrc =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x2.qrc (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x2.qrc (revision 75903) @@ -206,12 +206,4 @@ images/x2/file_manager_log_disabled_16px_x2.png images/x2/file_manager_log_disabled_32px_x2.png - images/x2/file_manager_move_to_guest_16px_x2.png - images/x2/file_manager_move_to_guest_24px_x2.png - images/x2/file_manager_move_to_guest_disabled_16px_x2.png - images/x2/file_manager_move_to_guest_disabled_24px_x2.png - images/x2/file_manager_move_to_host_16px_x2.png - images/x2/file_manager_move_to_host_24px_x2.png - images/x2/file_manager_move_to_host_disabled_16px_x2.png - images/x2/file_manager_move_to_host_disabled_24px_x2.png images/x2/file_manager_new_directory_16px_x2.png images/x2/file_manager_new_directory_24px_x2.png @@ -378,4 +370,8 @@ images/x2/machine_details_manager_disabled_16px_x2.png images/x2/machine_details_manager_disabled_24px_x2.png + images/x2/machine_warning_16px_x2.png + images/x2/media_manager_16px_x2.png + images/x2/media_manager_24px_x2.png + images/x2/media_manager_32px_x2.png Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc (revision 75903) @@ -1,8 +1,4 @@ - images/media_manager_24px.png - images/media_manager_32px.png - images/media_manager_disabled_16px.png - images/media_manager_disabled_24px.png images/meditation_32px.png images/menubar_16px.png Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc (revision 75903) @@ -1,8 +1,4 @@ - images/x2/machine_warning_16px_x2.png - images/x2/media_manager_16px_x2.png - images/x2/media_manager_24px_x2.png - images/x2/media_manager_32px_x2.png images/x2/media_manager_disabled_16px_x2.png images/x2/media_manager_disabled_24px_x2.png Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 75903) @@ -1607,78 +1607,4 @@ }; -/** Simple action extension, used as 'Move to Guest' in guest control file manager action class. */ -class UIActionMenuGuestControlFileManagerMoveToGuest : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionMenuGuestControlFileManagerMoveToGuest(UIActionPool *pParent) - : UIActionSimple(pParent, - ":/file_manager_move_to_guest_24px.png", ":/file_manager_move_to_guest_16px.png", - ":/file_manager_move_to_guest_disabled_24px.png", ":/file_manager_move_to_guest_disabled_16px.png"){} - -protected: - - /** Returns shortcut extra-data ID. */ - virtual QString shortcutExtraDataID() const /* override */ - { - return QString("FileManagerMoveToGuest"); - } - - /** Returns default shortcut. */ - virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */ - { - return QKeySequence(); - } - - /** Handles translation event. */ - virtual void retranslateUi() /* override */ - { - setName(QApplication::translate("UIActionPool", "Move to guest")); - setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); - setToolTip(QApplication::translate("UIActionPool", "Move the Selected Object(s) from Host to Guest")); - setStatusTip(QApplication::translate("UIActionPool", "Move the selected object(s) from host to guest")); - } -}; - -/** Simple action extension, used as 'Move to Host' in guest control file manager action class. */ -class UIActionMenuGuestControlFileManagerMoveToHost : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionMenuGuestControlFileManagerMoveToHost(UIActionPool *pParent) - : UIActionSimple(pParent, - ":/file_manager_move_to_host_24px.png", ":/file_manager_move_to_host_16px.png", - ":/file_manager_move_to_host_disabled_24px.png", ":/file_manager_move_to_host_disabled_16px.png"){} - -protected: - - /** Returns shortcut extra-data ID. */ - virtual QString shortcutExtraDataID() const /* override */ - { - return QString("FileManagerMoveToHost"); - } - - /** Returns default shortcut. */ - virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */ - { - return QKeySequence(); - } - - /** Handles translation event. */ - virtual void retranslateUi() /* override */ - { - setName(QApplication::translate("UIActionPool", "Move to host")); - setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); - setToolTip(QApplication::translate("UIActionPool", "Move the Selected Object(s) from Guest to Host")); - setStatusTip(QApplication::translate("UIActionPool", "Move the selected object(s) from guest to host")); - } -}; - /** Toggle action extension, used to toggle 'File Manager Options' panel in guest control file manager. */ class UIActionMenuGuestControlFileManagerOptions : public UIActionToggle @@ -2510,6 +2436,4 @@ m_pool[UIActionIndex_M_GuestControlFileManager_S_CopyToGuest] = new UIActionMenuGuestControlFileManagerCopyToGuest(this); m_pool[UIActionIndex_M_GuestControlFileManager_S_CopyToHost] = new UIActionMenuGuestControlFileManagerCopyToHost(this); - m_pool[UIActionIndex_M_GuestControlFileManager_S_MoveToGuest] = new UIActionMenuGuestControlFileManagerMoveToGuest(this); - m_pool[UIActionIndex_M_GuestControlFileManager_S_MoveToHost] = new UIActionMenuGuestControlFileManagerMoveToHost(this); m_pool[UIActionIndex_M_GuestControlFileManager_T_Options] = new UIActionMenuGuestControlFileManagerOptions(this); Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 75903) @@ -104,6 +104,4 @@ UIActionIndex_M_GuestControlFileManager_S_CopyToGuest, UIActionIndex_M_GuestControlFileManager_S_CopyToHost, - UIActionIndex_M_GuestControlFileManager_S_MoveToGuest, - UIActionIndex_M_GuestControlFileManager_S_MoveToHost, UIActionIndex_M_GuestControlFileManager_T_Options, UIActionIndex_M_GuestControlFileManager_T_Log, Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75903) @@ -255,6 +255,4 @@ connect(m_pGuestFileTable, &UIGuestFileTable::sigNewFileOperation, this, &UIGuestControlFileManager::sltReceieveNewFileOperation); - connect(m_pGuestFileTable, &UIGuestFileTable::sigCacheHostFileObjectsForDeletion, - this, &UIGuestControlFileManager::sltCacheHostFileObjectsForDeletion); connect(m_pGuestFileTable, &UIGuestFileTable::sigDeleteConfirmationOptionChanged, this, &UIGuestControlFileManager::sltHandleOptionsUpdated); @@ -336,6 +334,4 @@ m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToHost)); m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToGuest)); - m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToHost)); - m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToGuest)); m_pVerticalToolBar->addWidget(bottomSpacerWidget); @@ -345,8 +341,4 @@ this, &UIGuestControlFileManager::sltCopyHostToGuest); - connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToHost), &QAction::triggered, - this, &UIGuestControlFileManager::sltMoveGuestToHost); - connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToGuest), &QAction::triggered, - this, &UIGuestControlFileManager::sltMoveHostToGuest); layout ->addWidget(m_pVerticalToolBar); } @@ -495,20 +487,10 @@ void UIGuestControlFileManager::sltCopyGuestToHost() { - copyMoveToHost(false); + copyToHost(); } void UIGuestControlFileManager::sltCopyHostToGuest() { - copyMoveToGuest(false); -} - -void UIGuestControlFileManager::sltMoveGuestToHost() -{ - copyMoveToHost(true); -} - -void UIGuestControlFileManager::sltMoveHostToGuest() -{ - copyMoveToGuest(true); + copyToGuest(); } @@ -550,10 +532,7 @@ void UIGuestControlFileManager::sltFileOperationComplete(QUuid progressId) { + Q_UNUSED(progressId); if (!m_pGuestFileTable || !m_pHostFileTable) return; - - /* The following call deletes file objects whose paths have been cached for later deletion: */ - m_pGuestFileTable->continueWithMove(progressId); - m_pHostFileTable->continueWithMove(progressId); m_pHostFileTable->refresh(); @@ -561,11 +540,4 @@ } -void UIGuestControlFileManager::sltCacheHostFileObjectsForDeletion(const QUuid &moveProgessId, - const QStringList &hostPathList) -{ - if (m_pHostFileTable) - m_pHostFileTable->updateDeleteAfterCopyCache(moveProgessId, hostPathList); -} - void UIGuestControlFileManager::sltHandleOptionsUpdated() { @@ -576,19 +548,19 @@ } -void UIGuestControlFileManager::copyMoveToHost(bool fIsMove) +void UIGuestControlFileManager::copyToHost() { if (!m_pGuestFileTable || !m_pHostFileTable) return; QString hostDestinationPath = m_pHostFileTable->currentDirectoryPath(); - m_pGuestFileTable->copyGuestToHost(hostDestinationPath, fIsMove); + m_pGuestFileTable->copyGuestToHost(hostDestinationPath); m_pHostFileTable->refresh(); } -void UIGuestControlFileManager::copyMoveToGuest(bool fIsMove) +void UIGuestControlFileManager::copyToGuest() { if (!m_pGuestFileTable || !m_pHostFileTable) return; QStringList hostSourcePathList = m_pHostFileTable->selectedItemPathList(); - m_pGuestFileTable->copyHostToGuest(hostSourcePathList, fIsMove); + m_pGuestFileTable->copyHostToGuest(hostSourcePathList); m_pGuestFileTable->refresh(); } @@ -834,5 +806,5 @@ sources << "/home/serkan/misos/xenialpup-7.5-uefi.iso"; if ( m_pGuestFileTable) - m_pGuestFileTable->copyHostToGuest(sources, false, "/home/vbox/test"); + m_pGuestFileTable->copyHostToGuest(sources, "/home/vbox/test"); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h (revision 75903) @@ -115,11 +115,8 @@ void sltCopyGuestToHost(); void sltCopyHostToGuest(); - void sltMoveGuestToHost(); - void sltMoveHostToGuest(); void sltPanelActionToggled(bool fChecked); void sltListDirectoriesBeforeChanged(); void sltReceieveNewFileOperation(const CProgress &comProgress); void sltFileOperationComplete(QUuid progressId); - void sltCacheHostFileObjectsForDeletion(const QUuid &moveProgessId, const QStringList &hostPathList); /** Performs whatever necessary when some signal about option change has been receieved. */ void sltHandleOptionsUpdated(); @@ -168,6 +165,6 @@ - assigned it to the most recently "unhidden" panel */ void manageEscapeShortCut(); - void copyMoveToGuest(bool fIsMove); - void copyMoveToHost(bool fIsMove); + void copyToGuest(); + void copyToHost(); template QStringList getFsObjInfoStringList(const T &fsObjectInfo) const; Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp (revision 75903) @@ -1472,9 +1472,4 @@ } -void UIGuestControlFileTable::continueWithMove(const QUuid &progressId) -{ - deleteByPath(m_deleteAfterCopyCache.value(progressId, QStringList())); -} - void UIGuestControlFileTable::sltReceiveDirectoryStatistics(UIDirectoryStatistics statistics) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.h (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.h (revision 75903) @@ -263,6 +263,4 @@ static const unsigned m_iKiloByte; static QString humanReadableSize(ULONG64 size); - /** Deletes the file objects whose stored in the m_pDeleteAfterCopyCache */ - void continueWithMove(const QUuid &progressId); public slots: @@ -353,7 +351,4 @@ /** The set of actions which need some selection to work on. Like cut, copy etc. */ QSet 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 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. Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp (revision 75903) @@ -330,5 +330,5 @@ } -void UIGuestFileTable::copyHostToGuest(const QStringList &hostSourcePathList, bool fDeleteAfterSuccessfulCopy /* = false */, +void UIGuestFileTable::copyHostToGuest(const QStringList &hostSourcePathList, const QString &strDestination /* = QString() */) { @@ -357,11 +357,7 @@ return; emit sigNewFileOperation(progress); - /* Cache the progress id and host source file objects' path in case of move operation. we will delete - * these when/if we receieve progress completed notification: */ - if (fDeleteAfterSuccessfulCopy) - emit sigCacheHostFileObjectsForDeletion(progress.GetId(), sourcePaths.toList()); -} - -void UIGuestFileTable::copyGuestToHost(const QString& hostDestinationPath, bool fDeleteAfterSuccessfulCopy /* = false */) +} + +void UIGuestFileTable::copyGuestToHost(const QString& hostDestinationPath) { if (!checkGuestSession()) @@ -386,8 +382,4 @@ return; emit sigNewFileOperation(progress); - /* Cache the progress id and source file objects' path in case of move operation. we will delete - * these when/if we receieve progress completed notification: */ - if (fDeleteAfterSuccessfulCopy) - m_deleteAfterCopyCache[progress.GetId()] = sourcePaths.toList(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.h (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.h (revision 75903) @@ -42,6 +42,6 @@ UIGuestFileTable(UIActionPool *pActionPool, QWidget *pParent = 0); void initGuestFileTable(const CGuestSession &session); - void copyGuestToHost(const QString& hostDestinationPath, bool fDeleteAfterSuccessfulCopy = false); - void copyHostToGuest(const QStringList &hostSourcePathList, bool fDeleteAfterSuccessfulCopy = false, + void copyGuestToHost(const QString& hostDestinationPath); + void copyHostToGuest(const QStringList &hostSourcePathList, const QString &strDestination = QString()); @@ -49,5 +49,4 @@ void sigNewFileOperation(const CProgress &comProgress); - void sigCacheHostFileObjectsForDeletion(const QUuid &moveProgessId, const QStringList &hostPathList); protected: Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp (revision 75903) @@ -133,9 +133,4 @@ prepareActionConnections(); retranslateUi(); -} - -void UIHostFileTable::updateDeleteAfterCopyCache(const QUuid &progressId, const QStringList &sourceObjectsList) -{ - m_deleteAfterCopyCache[progressId] = sourceObjectsList; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.h (revision 75902) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.h (revision 75903) @@ -34,5 +34,4 @@ UIHostFileTable(UIActionPool *pActionPool, QWidget *pParent = 0); - void updateDeleteAfterCopyCache(const QUuid &progressId, const QStringList &sourceObjectsList); protected: