FE/Qt: bugref:9371. Moving file manager widget to UI common library.

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@92633 cfe28804-0f27-0410-a406-dd0f0b0b656f

4 files changed, 40 insertions, 40 deletions

diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk
index cc7643c5922..9f013fce7d7 100644
--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
@@ -714,15 +714,7 @@ VirtualBoxVM_QT_MOCHDRS = \
 	src/runtime/information/UIInformationConfiguration.h \
 	src/runtime/information/UIVMInformationDialog.h \
 	src/runtime/information/UIInformationRuntime.h \
-	src/guestctrl/UIFileManager.h \
 	src/guestctrl/UIFileManagerDialog.h \
-	src/guestctrl/UIFileManagerGuestTable.h \
-	src/guestctrl/UIFileManagerHostTable.h \
-	src/guestctrl/UIFileManagerLogPanel.h \
-	src/guestctrl/UIFileManagerOperationsPanel.h \
-	src/guestctrl/UIFileManagerOptionsPanel.h \
-	src/guestctrl/UIFileManagerGuestSessionPanel.h \
-	src/guestctrl/UIFileManagerTable.h \
 	src/guestctrl/UIGuestControlConsole.h \
 	src/guestctrl/UIGuestControlInterface.h \
 	src/guestctrl/UIGuestControlTreeItem.h \
@@ -821,6 +813,14 @@ UICommon_QT_MOCHDRS = \
 	src/globals/UIVirtualBoxEventHandler.h \
 	src/globals/UIVirtualBoxClientEventHandler.h \
 	src/globals/VBoxUtils.h \
+	src/guestctrl/UIFileManager.h \
+	src/guestctrl/UIFileManagerGuestTable.h \
+	src/guestctrl/UIFileManagerHostTable.h \
+	src/guestctrl/UIFileManagerLogPanel.h \
+	src/guestctrl/UIFileManagerOperationsPanel.h \
+	src/guestctrl/UIFileManagerOptionsPanel.h \
+	src/guestctrl/UIFileManagerGuestSessionPanel.h \
+	src/guestctrl/UIFileManagerTable.h \
 	src/helpbrowser/UIHelpBrowserDialog.h \
 	src/logviewer/UIVMLogPage.h \
 	src/logviewer/UIVMLogViewerBookmarksPanel.h \
@@ -986,13 +986,6 @@ VirtualBoxVM_QT_MOCSRCS = \
 	src/runtime/UIFrameBuffer.cpp \
 	src/runtime/UIIndicatorsPool.cpp \
 	src/runtime/information/UIInformationRuntime.cpp \
-	src/guestctrl/UIFileManager.cpp \
-	src/guestctrl/UIFileManagerLogPanel.cpp \
-	src/guestctrl/UIFileManagerOperationsPanel.cpp \
-	src/guestctrl/UIFileManagerGuestSessionPanel.cpp \
-	src/guestctrl/UIFileManagerTable.cpp \
-	src/guestctrl/UIFileManagerGuestTable.cpp \
-	src/guestctrl/UIFileManagerHostTable.cpp \
 	src/guestctrl/UIGuestProcessControlWidget.cpp \
 	src/softkeyboard/UISoftKeyboard.cpp \
 	src/widgets/UIMiniToolBar.cpp
@@ -1014,6 +1007,13 @@ UICommon_QT_MOCSRCS = \
 	src/globals/UIThreadPool.cpp \
 	src/globals/UIVirtualBoxEventHandler.cpp \
 	src/globals/UIVirtualBoxClientEventHandler.cpp \
+	src/guestctrl/UIFileManager.cpp \
+	src/guestctrl/UIFileManagerLogPanel.cpp \
+	src/guestctrl/UIFileManagerOperationsPanel.cpp \
+	src/guestctrl/UIFileManagerGuestSessionPanel.cpp \
+	src/guestctrl/UIFileManagerTable.cpp \
+	src/guestctrl/UIFileManagerGuestTable.cpp \
+	src/guestctrl/UIFileManagerHostTable.cpp \
 	src/logviewer/UIVMLogViewerFilterPanel.cpp \
 	src/logviewer/UIVMLogViewerTextEdit.cpp \
 	src/logviewer/UIVMLogViewerWidget.cpp \
@@ -1235,15 +1235,7 @@ VirtualBoxVM_SOURCES = \
 	src/runtime/information/UIInformationConfiguration.cpp \
 	src/runtime/information/UIVMInformationDialog.cpp \
 	src/runtime/information/UIInformationRuntime.cpp \
-	src/guestctrl/UIFileManager.cpp \
 	src/guestctrl/UIFileManagerDialog.cpp \
-	src/guestctrl/UIFileManagerGuestTable.cpp \
-	src/guestctrl/UIFileManagerHostTable.cpp \
-	src/guestctrl/UIFileManagerLogPanel.cpp \
-	src/guestctrl/UIFileManagerOperationsPanel.cpp \
-	src/guestctrl/UIFileManagerOptionsPanel.cpp \
-	src/guestctrl/UIFileManagerGuestSessionPanel.cpp \
-	src/guestctrl/UIFileManagerTable.cpp \
 	src/guestctrl/UIGuestControlConsole.cpp \
 	src/guestctrl/UIGuestControlInterface.cpp \
 	src/guestctrl/UIGuestControlTreeItem.cpp \
@@ -1371,6 +1363,14 @@ UICommon_SOURCES = \
 	src/globals/UIVersion.cpp \
 	src/globals/UIVirtualBoxEventHandler.cpp \
 	src/globals/UIVirtualBoxClientEventHandler.cpp \
+	src/guestctrl/UIFileManager.cpp \
+	src/guestctrl/UIFileManagerGuestTable.cpp \
+	src/guestctrl/UIFileManagerHostTable.cpp \
+	src/guestctrl/UIFileManagerLogPanel.cpp \
+	src/guestctrl/UIFileManagerOperationsPanel.cpp \
+	src/guestctrl/UIFileManagerOptionsPanel.cpp \
+	src/guestctrl/UIFileManagerGuestSessionPanel.cpp \
+	src/guestctrl/UIFileManagerTable.cpp \
 	src/helpbrowser/UIHelpBrowserDialog.cpp \
 	src/logviewer/UIVMLogPage.cpp \
 	src/logviewer/UIVMLogViewerBookmarksPanel.cpp \
diff --git a/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp b/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp
index e9a34e596f0..c5c1268432d 100644
--- a/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp
@@ -112,7 +112,7 @@ UIFileOperationsList::UIFileOperationsList(QWidget *pParent)
 *********************************************************************************************************************************/
 
 UIFileManager::UIFileManager(EmbedTo enmEmbedding, UIActionPool *pActionPool,
-                                                     const CMachine &comMachine, QWidget *pParent, bool fShowToolbar /* = true */)
+                             const CMachine &comMachine, QWidget *pParent, bool fShowToolbar /* = true */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_comMachine(comMachine)
     , m_pMainLayout(0)
diff --git a/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h b/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h
index fcc051dcddb..32fc236bac0 100644
--- a/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h
+++ b/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h
@@ -82,7 +82,7 @@ private:
 /** A QWidget extension. it includes a QWidget extension for initiating a guest session
  *  one host and one guest file table views, a log viewer
  *  and some other file manager related widgets. */
-class UIFileManager : public QIWithRetranslateUI<QWidget>
+class SHARED_LIBRARY_STUFF UIFileManager : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
 
diff --git a/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp b/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp
index dfcf347756c..cdb2581b6ec 100644
--- a/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp
@@ -216,23 +216,23 @@ void UIToolPaneMachine::openTool(UIToolType enmType)
             }
             case UIToolType_FileManager:
             {
-                m_pPaneFileManager = 0;
-
-                // UIFileManager::UIFileManager(EmbedTo enmEmbedding, UIActionPool *pActionPool,
-                //                                      const CGuest &comGuest, QWidget *pParent, bool fShowToolbar /* = true */)
-
-                AssertPtrReturnVoid(m_pPaneFileManager);
+                if (!m_items.isEmpty())
+                {
+                    m_pPaneFileManager = new UIFileManager(EmbedTo_Stack, m_pActionPool,
+                                                           uiCommon().virtualBox().FindMachine(m_items[0]->id().toString()),
+                                                           0, false /* fShowToolbar */);
+                    AssertPtrReturnVoid(m_pPaneFileManager);
 #ifndef VBOX_WS_MAC
-                const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
-                m_pPaneFileManager->setContentsMargins(iMargin, 0, iMargin, 0);
+                    const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4;
+                    m_pPaneFileManager->setContentsMargins(iMargin, 0, iMargin, 0);
 #endif
-
-                /* Configure pane: */
-                m_pPaneFileManager->setProperty("ToolType", QVariant::fromValue(UIToolType_FileManager));
-                //m_pPaneFileManager->setSelectedVMListItems(m_items);
-                /* Add into layout: */
-                m_pLayout->addWidget(m_pPaneFileManager);
-                m_pLayout->setCurrentWidget(m_pPaneFileManager);
+                    /* Configure pane: */
+                    m_pPaneFileManager->setProperty("ToolType", QVariant::fromValue(UIToolType_FileManager));
+                    //m_pPaneFileManager->setSelectedVMListItems(m_items);
+                    /* Add into layout: */
+                    m_pLayout->addWidget(m_pPaneFileManager);
+                    m_pLayout->setCurrentWidget(m_pPaneFileManager);
+                }
                 break;
             }
             default: