Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 75224)
@@ -195,6 +195,9 @@
 const char *UIExtraDataDefs::GUI_InformationWindowGeometry = "GUI/InformationWindowGeometry";
 const char *UIExtraDataDefs::GUI_InformationWindowElements = "GUI/InformationWindowElements";
+
+/* Guest control UI: */
+const char *UIExtraDataDefs::GUI_GuestControl_FileManagerDialogGeometry = "GUI/GuestControl/FileManagerDialogGeometry";
+const char *UIExtraDataDefs::GUI_GuestControl_FileManagerVisiblePanels = "GUI/GuestControl/FileManagerVisiblePanels";
 const char *UIExtraDataDefs::GUI_GuestControl_ProcessControlSplitterHints = "GUI/GuestControl/ProcessControlSplitterHints";
-const char *UIExtraDataDefs::GUI_GuestControl_FileManagerDialogGeometry = "GUI/GuestControl/FileManagerDialogGeometry";
 const char *UIExtraDataDefs::GUI_GuestControl_ProcessControlDialogGeometry = "GUI/GuestControl/ProcessControlDialogGeometry";
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 75224)
@@ -348,11 +348,12 @@
         /** Holds information-window elements. */
         SHARED_LIBRARY_STUFF extern const char *GUI_InformationWindowElements;
+    /** @} */
+
+    /** @name Guest Control UI related data
+      * @{ */
+        extern const char *GUI_GuestControl_FileManagerDialogGeometry;
+        extern const char *GUI_GuestControl_FileManagerVisiblePanels;
         extern const char *GUI_GuestControl_ProcessControlSplitterHints;
         extern const char *GUI_GuestControl_ProcessControlDialogGeometry;
-    /** @} */
-
-    /** @name Guest Control UI related data
-      * @{ */
-        extern const char *GUI_GuestControl_FileManagerDialogGeometry;
     /** @} */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 75224)
@@ -4132,4 +4132,14 @@
 }
 
+void UIExtraDataManager::setGuestControlFileManagerVisiblePanels(const QStringList &panelNameList)
+{
+    setExtraDataStringList(GUI_GuestControl_FileManagerVisiblePanels, panelNameList);
+}
+
+QStringList UIExtraDataManager::guestControlFileManagerVisiblePanels()
+{
+    return extraDataStringList(GUI_GuestControl_FileManagerVisiblePanels);
+}
+
 QRect UIExtraDataManager::guestProcessControlDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry)
 {
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 75224)
@@ -627,7 +627,5 @@
       * @{ */
         void setGuestControlProcessControlSplitterHints(const QList<int> &hints);
-        void setGuestControlFileManagerSplitterHints(const QList<int> &hints);
         QList<int> guestControlProcessControlSplitterHints();
-        QList<int> guestControlFileManagerSplitterHints();
         QRect guestControlFileManagerDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry);
         bool guestControlFileManagerDialogShouldBeMaximized();
@@ -636,4 +634,6 @@
         bool guestProcessControlDialogShouldBeMaximized();
         void setGuestProcessControlDialogGeometry(const QRect &geometry, bool fMaximized);
+        void setGuestControlFileManagerVisiblePanels(const QStringList &panelNameList);
+        QStringList guestControlFileManagerVisiblePanels();
     /** @} */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp	(revision 75224)
@@ -615,8 +615,26 @@
 void UIGuestControlFileManager::saveSettings()
 {
+    /* Save a list of currently visible panels: */
+    QStringList strNameList;
+    foreach(UIGuestControlFileManagerPanel* pPanel, m_visiblePanelsList)
+        strNameList.append(pPanel->panelName());
+    gEDataManager->setGuestControlFileManagerVisiblePanels(strNameList);
 }
 
 void UIGuestControlFileManager::loadSettings()
 {
+    /* Load the visible panel list and show them: */
+    QStringList strNameList = gEDataManager->guestControlFileManagerVisiblePanels();
+    foreach(const QString strName, strNameList)
+    {
+        foreach(UIGuestControlFileManagerPanel* pPanel, m_panelActionMap.keys())
+        {
+            if (strName == pPanel->panelName())
+            {
+                showPanel(pPanel);
+                break;
+            }
+        }
+    }
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h	(revision 75224)
@@ -155,7 +155,4 @@
     UIGuestControlConsole      *m_pConsole;
     UIGuestControlInterface    *m_pControlInterface;
-    // /* m_pSessionCreateWidget is a QWidget extension enabling user to start/stop
-    //  * a Guest Control session with password/username fields etc.. */
-    // UIGuestSessionCreateWidget *m_pSessionCreateWidget;
     UIGuestFileTable           *m_pGuestFileTable;
     UIHostFileTable            *m_pHostFileTable;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.cpp	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.cpp	(revision 75224)
@@ -94,4 +94,16 @@
 }
 
+void UIGuestControlFileManagerLogPanel::appendLog(const QString &strLog)
+{
+    if (!m_pLogTextEdit)
+        return;
+    m_pLogTextEdit->append(strLog);
+}
+
+QString UIGuestControlFileManagerLogPanel::panelName() const
+{
+    return "LogPanel";
+}
+
 void UIGuestControlFileManagerLogPanel::prepareWidgets()
 {
@@ -116,10 +128,4 @@
 }
 
-void UIGuestControlFileManagerLogPanel::appendLog(const QString &strLog)
-{
-    if (!m_pLogTextEdit)
-        return;
-    m_pLogTextEdit->append(strLog);
-}
 
 #include "UIGuestControlFileManagerLogPanel.moc"
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.h	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerLogPanel.h	(revision 75224)
@@ -34,6 +34,6 @@
 
     UIGuestControlFileManagerLogPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent);
-
     void appendLog(const QString &str);
+    virtual QString panelName() const /* override */;
 
 signals:
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerPanel.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerPanel.h	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerPanel.h	(revision 75224)
@@ -41,4 +41,5 @@
     UIGuestControlFileManagerPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent);
     void setCloseButtonShortCut(QKeySequence shortCut);
+    virtual QString panelName() const = 0;
 
 protected:
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSessionPanel.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSessionPanel.cpp	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSessionPanel.cpp	(revision 75224)
@@ -238,4 +238,9 @@
 }
 
+QString UIGuestControlFileManagerSessionPanel::panelName() const
+{
+    return "SessionPanel";
+}
+
 void UIGuestControlFileManagerSessionPanel::prepareWidgets()
 {
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSessionPanel.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSessionPanel.h	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSessionPanel.h	(revision 75224)
@@ -37,4 +37,5 @@
     void switchSessionCloseMode();
     void switchSessionCreateMode();
+    virtual QString panelName() const /* override */;
 
 signals:
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.cpp	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.cpp	(revision 75224)
@@ -37,5 +37,4 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-
 UIGuestControlFileManagerSettingsPanel::UIGuestControlFileManagerSettingsPanel(UIGuestControlFileManager *pManagerWidget,
                                                                                QWidget *pParent, UIGuestControlFileManagerSettings *pFileManagerSettings)
@@ -46,4 +45,9 @@
 {
     prepare();
+}
+
+QString UIGuestControlFileManagerSettingsPanel::panelName() const
+{
+    return "SettingsPanel";
 }
 
@@ -85,11 +89,4 @@
         connect(m_pListDirectoriesOnTopCheckBox, &QCheckBox::toggled,
                 this, &UIGuestControlFileManagerSettingsPanel::sltListDirectoryCheckBoxToogled);
-    // if (m_pWrapLinesCheckBox)
-    //     connect(m_pWrapLinesCheckBox, &QCheckBox::toggled, this, &UIGuestControlFileManagerSettingsPanel::sigWrapLines);
-    // if (m_pFontSizeSpinBox)
-    //     connect(m_pFontSizeSpinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-    //             this, &UIGuestControlFileManagerSettingsPanel::sigChangeFontSizeInPoints);
-    // if (m_pResetToDefaultsButton)
-    //     connect(m_pResetToDefaultsButton, &QIToolButton::clicked, this, &UIGuestControlFileManagerSettingsPanel::sigResetToDefaults);
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.h	(revision 75223)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.h	(revision 75224)
@@ -38,4 +38,5 @@
     UIGuestControlFileManagerSettingsPanel(UIGuestControlFileManager *pManagerWidget,
                                            QWidget *pParent, UIGuestControlFileManagerSettings *pFileManagerSettings);
+    virtual QString panelName() const /* override */;
 
 signals: