Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 92615)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 92616)
@@ -722,5 +722,5 @@
 	src/guestctrl/UIFileManagerOperationsPanel.h \
 	src/guestctrl/UIFileManagerOptionsPanel.h \
-	src/guestctrl/UIFileManagerSessionPanel.h \
+	src/guestctrl/UIFileManagerGuestSessionPanel.h \
 	src/guestctrl/UIFileManagerTable.h \
 	src/guestctrl/UIGuestControlConsole.h \
@@ -990,5 +990,5 @@
 	src/guestctrl/UIFileManagerLogPanel.cpp \
 	src/guestctrl/UIFileManagerOperationsPanel.cpp \
-	src/guestctrl/UIFileManagerSessionPanel.cpp \
+	src/guestctrl/UIFileManagerGuestSessionPanel.cpp \
 	src/guestctrl/UIFileManagerTable.cpp \
 	src/guestctrl/UIFileManagerGuestTable.cpp \
@@ -1243,5 +1243,5 @@
 	src/guestctrl/UIFileManagerOperationsPanel.cpp \
 	src/guestctrl/UIFileManagerOptionsPanel.cpp \
-	src/guestctrl/UIFileManagerSessionPanel.cpp \
+	src/guestctrl/UIFileManagerGuestSessionPanel.cpp \
 	src/guestctrl/UIFileManagerTable.cpp \
 	src/guestctrl/UIGuestControlConsole.cpp \
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 92615)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 92616)
@@ -1702,13 +1702,13 @@
 };
 
-/** Toggle action extension, used to toggle 'File Manager Session' panel in file manager. */
-class UIActionMenuFileManagerSession : public UIActionToggle
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuFileManagerSession(UIActionPool *pParent)
+/** Toggle action extension, used to toggle 'File Manager Guest Session' panel in file manager. */
+class UIActionMenuFileManagerGuestSession : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuFileManagerGuestSession(UIActionPool *pParent)
         : UIActionToggle(pParent)
     {
@@ -1723,5 +1723,5 @@
     virtual QString shortcutExtraDataID() const /* override */
     {
-        return QString("ToggleFileManagerSessionPanel");
+        return QString("ToggleFileManagerGuestSessionPanel");
     }
 
@@ -3106,5 +3106,5 @@
     m_pool[UIActionIndex_M_FileManager_T_Log] = new UIActionMenuFileManagerLog(this);
     m_pool[UIActionIndex_M_FileManager_T_Operations] = new UIActionMenuFileManagerOperations(this);
-    m_pool[UIActionIndex_M_FileManager_T_Session] = new UIActionMenuFileManagerSession(this);
+    m_pool[UIActionIndex_M_FileManager_T_GuestSession] = new UIActionMenuFileManagerGuestSession(this);
     m_pool[UIActionIndex_M_FileManager_S_Host_GoUp] = new UIActionMenuFileManagerGoUp(this);
     m_pool[UIActionIndex_M_FileManager_S_Guest_GoUp] = new UIActionMenuFileManagerGoUp(this);
@@ -3557,5 +3557,5 @@
 void UIActionPool::updateMenuFileManagerWrapper(UIMenu *pMenu)
 {
-    addAction(pMenu, action(UIActionIndex_M_FileManager_T_Session));
+    addAction(pMenu, action(UIActionIndex_M_FileManager_T_GuestSession));
     addAction(pMenu, action(UIActionIndex_M_FileManager_T_Options));
     addAction(pMenu, action(UIActionIndex_M_FileManager_T_Operations));
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	(revision 92615)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	(revision 92616)
@@ -112,5 +112,5 @@
     UIActionIndex_M_FileManager_T_Log,
     UIActionIndex_M_FileManager_T_Operations,
-    UIActionIndex_M_FileManager_T_Session,
+    UIActionIndex_M_FileManager_T_GuestSession,
     UIActionIndex_M_FileManager_S_Host_GoUp,
     UIActionIndex_M_FileManager_S_Guest_GoUp,
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp	(revision 92615)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp	(revision 92616)
@@ -31,5 +31,5 @@
 #include "UIIconPool.h"
 #include "UIFileManager.h"
-#include "UIFileManagerSessionPanel.h"
+#include "UIFileManagerGuestSessionPanel.h"
 #include "UIFileManagerOptionsPanel.h"
 #include "UIFileManagerLogPanel.h"
@@ -126,5 +126,5 @@
     , m_pOptionsPanel(0)
     , m_pLogPanel(0)
-    , m_pSessionPanel(0)
+    , m_pGuestSessionPanel(0)
     , m_pOperationsPanel(0)
     , m_fDialogBeingClosed(false)
@@ -246,10 +246,10 @@
 
     pTopLayout->addLayout(pFileTableContainerLayout);
-    m_pSessionPanel = new UIFileManagerSessionPanel;
-    if (m_pSessionPanel)
-    {
-        m_pSessionPanel->hide();
-        m_panelActionMap.insert(m_pSessionPanel, m_pActionPool->action(UIActionIndex_M_FileManager_T_Session));
-        pTopLayout->addWidget(m_pSessionPanel);
+    m_pGuestSessionPanel = new UIFileManagerGuestSessionPanel;
+    if (m_pGuestSessionPanel)
+    {
+        m_pGuestSessionPanel->hide();
+        m_panelActionMap.insert(m_pGuestSessionPanel, m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession));
+        pTopLayout->addWidget(m_pGuestSessionPanel);
     }
 
@@ -330,15 +330,14 @@
 {
     if (m_pQtGuestListener)
-    {
         connect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
                 this, &UIFileManager::sltGuestSessionUnregistered);
-    }
-    if (m_pSessionPanel)
-    {
-        connect(m_pSessionPanel, &UIFileManagerSessionPanel::sigCreateSession,
-                this, &UIFileManager::sltCreateSession);
-        connect(m_pSessionPanel, &UIFileManagerSessionPanel::sigCloseSession,
-                this, &UIFileManager::sltCloseSession);
-        connect(m_pSessionPanel, &UIFileManagerSessionPanel::sigHidePanel,
+
+    if (m_pGuestSessionPanel)
+    {
+        connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigCreateSession,
+                this, &UIFileManager::sltCreateGuestSession);
+        connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigCloseSession,
+                this, &UIFileManager::sltCloseGuestSession);
+        connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigHidePanel,
                 this, &UIFileManager::sltHandleHidePanel);
     }
@@ -367,5 +366,5 @@
         m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
 
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Session));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Options));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations));
@@ -376,5 +375,5 @@
         connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Log), &QAction::toggled,
                 this, &UIFileManager::sltPanelActionToggled);
-        connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Session), &QAction::toggled,
+        connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_GuestSession), &QAction::toggled,
                 this, &UIFileManager::sltPanelActionToggled);
         connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations), &QAction::toggled,
@@ -395,5 +394,4 @@
 }
 
-
 void UIFileManager::sltGuestSessionUnregistered(CGuestSession guestSession)
 {
@@ -403,16 +401,16 @@
     {
         m_comGuestSession.detach();
-        postSessionClosed();
-    }
-}
-
-void UIFileManager::sltCreateSession(QString strUserName, QString strPassword)
+        postGuestSessionClosed();
+    }
+}
+
+void UIFileManager::sltCreateGuestSession(QString strUserName, QString strPassword)
 {
     if (!UIGuestControlInterface::isGuestAdditionsAvailable(m_comGuest))
     {
         appendLog("Could not find Guest Additions", FileManagerLogType_Error);
-        postSessionClosed();
-        if (m_pSessionPanel)
-            m_pSessionPanel->markForError(true);
+        postGuestSessionClosed();
+        if (m_pGuestSessionPanel)
+            m_pGuestSessionPanel->markForError(true);
         return;
     }
@@ -420,18 +418,18 @@
     {
         appendLog("No user name is given", FileManagerLogType_Error);
-        if (m_pSessionPanel)
-            m_pSessionPanel->markForError(true);
-        return;
-    }
-    if (m_pSessionPanel)
-        m_pSessionPanel->markForError(!createSession(strUserName, strPassword));
-}
-
-void UIFileManager::sltCloseSession()
+        if (m_pGuestSessionPanel)
+            m_pGuestSessionPanel->markForError(true);
+        return;
+    }
+    if (m_pGuestSessionPanel)
+        m_pGuestSessionPanel->markForError(!createGuestSession(strUserName, strPassword));
+}
+
+void UIFileManager::sltCloseGuestSession()
 {
     if (!m_comGuestSession.isOk())
     {
         appendLog("Guest session is not valid", FileManagerLogType_Error);
-        postSessionClosed();
+        postGuestSessionClosed();
         return;
     }
@@ -444,5 +442,5 @@
     m_comGuestSession.Close();
     appendLog("Guest session is closed", FileManagerLogType_Info);
-    postSessionClosed();
+    postGuestSessionClosed();
 }
 
@@ -460,5 +458,5 @@
         {
             initFileTable();
-            postSessionCreated();
+            postGuestSessionCreated();
         }
         appendLog(QString("%1: %2").arg("Session status has changed").arg(gpConverter->toString(m_comGuestSession.GetStatus())),
@@ -578,8 +576,8 @@
 }
 
-void UIFileManager::postSessionCreated()
-{
-    if (m_pSessionPanel)
-        m_pSessionPanel->switchSessionCloseMode();
+void UIFileManager::postGuestSessionCreated()
+{
+    if (m_pGuestSessionPanel)
+        m_pGuestSessionPanel->switchSessionCloseMode();
     if (m_pGuestFileTable)
         m_pGuestFileTable->setEnabled(true);
@@ -588,8 +586,8 @@
 }
 
-void UIFileManager::postSessionClosed()
-{
-    if (m_pSessionPanel)
-        m_pSessionPanel->switchSessionCreateMode();
+void UIFileManager::postGuestSessionClosed()
+{
+    if (m_pGuestSessionPanel)
+        m_pGuestSessionPanel->switchSessionCreateMode();
     if (m_pGuestFileTable)
         m_pGuestFileTable->setEnabled(false);
@@ -598,6 +596,6 @@
 }
 
-bool UIFileManager::createSession(const QString& strUserName, const QString& strPassword,
-                                              const QString& strDomain /* not used currently */)
+bool UIFileManager::createGuestSession(const QString& strUserName, const QString& strPassword,
+                                  const QString& strDomain /* not used currently */)
 {
     if (!m_comGuest.isOk())
@@ -612,6 +610,6 @@
     }
     appendLog("Guest session has been created", FileManagerLogType_Info);
-    if (m_pSessionPanel)
-        m_pSessionPanel->switchSessionCloseMode();
+    if (m_pGuestSessionPanel)
+        m_pGuestSessionPanel->switchSessionCloseMode();
 
     /* Prepare session listener */
@@ -625,5 +623,4 @@
     qRegisterMetaType<CGuestSessionStateChangedEvent>();
 
-
     connect(m_pQtSessionListener->getWrapped(), &UIMainEventListener::sigGuestSessionStatedChanged,
             this, &UIFileManager::sltGuestSessionStateChanged);
@@ -631,11 +628,11 @@
     /* Wait session to start. For some reason we cannot get GuestSessionStatusChanged event
         consistently. So we wait: */
-    appendLog("Waiting the session to start", FileManagerLogType_Info);
+    appendLog("Waiting the guest session to start", FileManagerLogType_Info);
     const ULONG waitTimeout = 2000;
     KGuestSessionWaitResult waitResult = m_comGuestSession.WaitFor(KGuestSessionWaitForFlag_Start, waitTimeout);
     if (waitResult != KGuestSessionWaitResult_Start)
     {
-        appendLog("The session did not start", FileManagerLogType_Error);
-        sltCloseSession();
+        appendLog("The guest session did not start", FileManagerLogType_Error);
+        sltCloseGuestSession();
         return false;
     }
@@ -645,6 +642,6 @@
 
 void UIFileManager::prepareListener(ComObjPtr<UIMainEventListenerImpl> &QtListener,
-                                                CEventListener &comEventListener,
-                                                CEventSource comEventSource, QVector<KVBoxEventType>& eventTypes)
+                                    CEventListener &comEventListener,
+                                    CEventSource comEventSource, QVector<KVBoxEventType>& eventTypes)
 {
     if (!comEventSource.isOk())
@@ -727,6 +724,6 @@
     }
     /* Make sure Session panel is visible: */
-    if (m_pSessionPanel && !m_pSessionPanel->isVisible())
-        showPanel(m_pSessionPanel);
+    if (m_pGuestSessionPanel && !m_pGuestSessionPanel->isVisible())
+        showPanel(m_pGuestSessionPanel);
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h	(revision 92615)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h	(revision 92616)
@@ -49,5 +49,5 @@
 class UIFileManagerLogPanel;
 class UIFileManagerOperationsPanel;
-class UIFileManagerSessionPanel;
+class UIFileManagerGuestSessionPanel;
 class UIFileManagerOptionsPanel;
 class UIFileManagerGuestTable;
@@ -110,6 +110,6 @@
 
     void sltGuestSessionUnregistered(CGuestSession guestSession);
-    void sltCreateSession(QString strUserName, QString strPassword);
-    void sltCloseSession();
+    void sltCreateGuestSession(QString strUserName, QString strPassword);
+    void sltCloseGuestSession();
     void sltGuestSessionStateChanged(const CGuestSessionStateChangedEvent &cEvent);
     void sltReceieveLogOutput(QString strOutput, FileManagerLogType eLogType);
@@ -131,5 +131,5 @@
     void prepareVerticalToolBar(QHBoxLayout *layout);
     void prepareToolBar();
-    bool createSession(const QString& strUserName, const QString& strPassword,
+    bool createGuestSession(const QString& strUserName, const QString& strPassword,
                        const QString& strDomain = QString() /* not used currently */);
 
@@ -145,6 +145,6 @@
     /** @name Perform operations needed after creating/ending a guest control session
       * @{ */
-        void postSessionCreated();
-        void postSessionClosed();
+        void postGuestSessionCreated();
+        void postGuestSessionClosed();
     /** @} */
 
@@ -191,5 +191,5 @@
     UIFileManagerOptionsPanel          *m_pOptionsPanel;
     UIFileManagerLogPanel              *m_pLogPanel;
-    UIFileManagerSessionPanel          *m_pSessionPanel;
+    UIFileManagerGuestSessionPanel     *m_pGuestSessionPanel;
     UIFileManagerOperationsPanel       *m_pOperationsPanel;
     bool                                m_fDialogBeingClosed;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestSessionPanel.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestSessionPanel.cpp	(revision 92616)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestSessionPanel.cpp	(revision 92616)
@@ -0,0 +1,328 @@
+/* $Id$ */
+/** @file
+ * VBox Qt GUI - UIVMLogViewer class implementation.
+ */
+
+/*
+ * Copyright (C) 2010-2020 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+/* Qt includes: */
+#include <QCheckBox>
+#include <QHBoxLayout>
+#include <QPushButton>
+
+/* GUI includes: */
+#include "QILineEdit.h"
+#include "UIFileManagerGuestSessionPanel.h"
+
+/*********************************************************************************************************************************
+*   UIGuestSessionCreateWidget definition.                                                                                   *
+*********************************************************************************************************************************/
+/** A QWidget extension containing text entry fields for password and username and buttons to
+ *  start/stop a guest session. */
+class UIGuestSessionCreateWidget : public QIWithRetranslateUI<QWidget>
+{
+    Q_OBJECT;
+
+signals:
+
+    void sigCreateSession(QString strUserName, QString strPassword);
+    void sigCloseSession();
+
+public:
+
+    UIGuestSessionCreateWidget(QWidget *pParent = 0);
+    /** Disables certain widget after a guest session has been created. */
+    void switchSessionCreateMode();
+    /** Makes sure certain widgets are enabled so that a guest session can be created. */
+    void switchSessionCloseMode();
+    void markForError(bool fMarkForError);
+
+protected:
+
+    void retranslateUi() /* override */;
+    void keyPressEvent(QKeyEvent * pEvent) /* override */;
+    void showEvent(QShowEvent *pEvent) /* override */;
+
+private slots:
+
+    void sltCreateButtonClick();
+    void sltShowHidePassword(bool flag);
+    void sltHandleTextChanged(const QString &strText);
+
+private:
+
+    void          prepareWidgets();
+    QILineEdit   *m_pUserNameEdit;
+    QILineEdit   *m_pPasswordEdit;
+    QPushButton  *m_pCreateButton;
+    QPushButton  *m_pCloseButton;
+    QHBoxLayout  *m_pMainLayout;
+    QCheckBox    *m_pShowPasswordCheckBox;
+    QColor        m_defaultBaseColor;
+    QColor        m_errorBaseColor;
+    bool          m_fMarkedForError;
+};
+
+
+/*********************************************************************************************************************************
+*   UIGuestSessionCreateWidget implementation.                                                                                   *
+*********************************************************************************************************************************/
+
+UIGuestSessionCreateWidget::UIGuestSessionCreateWidget(QWidget *pParent /* = 0 */)
+    : QIWithRetranslateUI<QWidget>(pParent)
+    , m_pUserNameEdit(0)
+    , m_pPasswordEdit(0)
+    , m_pCreateButton(0)
+    , m_pCloseButton(0)
+    , m_pMainLayout(0)
+    , m_pShowPasswordCheckBox(0)
+    , m_fMarkedForError(0)
+{
+    prepareWidgets();
+}
+
+void UIGuestSessionCreateWidget::prepareWidgets()
+{
+    m_pMainLayout = new QHBoxLayout(this);
+    if (!m_pMainLayout)
+        return;
+
+    m_pUserNameEdit = new QILineEdit;
+    if (m_pUserNameEdit)
+    {
+        m_pMainLayout->addWidget(m_pUserNameEdit, 2);
+        m_pUserNameEdit->setPlaceholderText(QApplication::translate("UIFileManager", "User Name"));
+        m_defaultBaseColor = m_pUserNameEdit->palette().color(QPalette::Base);
+        m_errorBaseColor = QColor(m_defaultBaseColor.red(),
+                                  0.5 * m_defaultBaseColor.green(),
+                                  0.5 * m_defaultBaseColor.blue());
+        connect(m_pUserNameEdit, &QILineEdit::textChanged,
+                this, &UIGuestSessionCreateWidget::sltHandleTextChanged);
+    }
+
+    m_pPasswordEdit = new QILineEdit;
+    if (m_pPasswordEdit)
+    {
+        m_pMainLayout->addWidget(m_pPasswordEdit, 2);
+        m_pPasswordEdit->setPlaceholderText(QApplication::translate("UIFileManager", "Password"));
+        m_pPasswordEdit->setEchoMode(QLineEdit::Password);
+        connect(m_pPasswordEdit, &QILineEdit::textChanged,
+                this, &UIGuestSessionCreateWidget::sltHandleTextChanged);
+    }
+
+    m_pShowPasswordCheckBox = new QCheckBox;
+    if (m_pShowPasswordCheckBox)
+    {
+        m_pShowPasswordCheckBox->setText(QApplication::translate("UIFileManager", "Show Password"));
+        m_pMainLayout->addWidget(m_pShowPasswordCheckBox);
+        connect(m_pShowPasswordCheckBox, &QCheckBox::toggled,
+                this, &UIGuestSessionCreateWidget::sltShowHidePassword);
+    }
+
+    m_pCreateButton = new QPushButton;
+    if (m_pCreateButton)
+    {
+        m_pMainLayout->addWidget(m_pCreateButton);
+        connect(m_pCreateButton, &QPushButton::clicked, this, &UIGuestSessionCreateWidget::sltCreateButtonClick);
+    }
+
+    m_pCloseButton = new QPushButton;
+    if (m_pCloseButton)
+    {
+        m_pMainLayout->addWidget(m_pCloseButton);
+        connect(m_pCloseButton, &QPushButton::clicked, this, &UIGuestSessionCreateWidget::sigCloseSession);
+    }
+    m_pMainLayout->insertStretch(-1, 1);
+    switchSessionCreateMode();
+    retranslateUi();
+}
+
+void UIGuestSessionCreateWidget::sltCreateButtonClick()
+{
+    if (m_pUserNameEdit && m_pPasswordEdit)
+        emit sigCreateSession(m_pUserNameEdit->text(), m_pPasswordEdit->text());
+}
+
+void UIGuestSessionCreateWidget::sltShowHidePassword(bool flag)
+{
+    if (!m_pPasswordEdit)
+        return;
+    if (flag)
+        m_pPasswordEdit->setEchoMode(QLineEdit::Normal);
+    else
+        m_pPasswordEdit->setEchoMode(QLineEdit::Password);
+}
+
+void UIGuestSessionCreateWidget::sltHandleTextChanged(const QString &strText)
+{
+    Q_UNUSED(strText);
+    markForError(false);
+}
+
+void UIGuestSessionCreateWidget::retranslateUi()
+{
+    if (m_pUserNameEdit)
+    {
+        m_pUserNameEdit->setToolTip(QApplication::translate("UIFileManager", "User name to authenticate session creation"));
+        m_pUserNameEdit->setPlaceholderText(QApplication::translate("UIFileManager", "User Name"));
+
+    }
+    if (m_pPasswordEdit)
+    {
+        m_pPasswordEdit->setToolTip(QApplication::translate("UIFileManager", "Password to authenticate session creation"));
+        m_pPasswordEdit->setPlaceholderText(QApplication::translate("UIFileManager", "Password"));
+    }
+
+    if (m_pCreateButton)
+        m_pCreateButton->setText(QApplication::translate("UIFileManager", "Create Session"));
+    if (m_pCloseButton)
+        m_pCloseButton->setText(QApplication::translate("UIFileManager", "Close Session"));
+}
+
+void UIGuestSessionCreateWidget::keyPressEvent(QKeyEvent * pEvent)
+{
+    /* Emit sigCreateSession upon enter press: */
+    if (pEvent->key() == Qt::Key_Enter || pEvent->key() == Qt::Key_Return)
+    {
+        if ((m_pUserNameEdit && m_pUserNameEdit->hasFocus()) ||
+            (m_pPasswordEdit && m_pPasswordEdit->hasFocus()))
+            sigCreateSession(m_pUserNameEdit->text(), m_pPasswordEdit->text());
+    }
+    QWidget::keyPressEvent(pEvent);
+}
+
+void UIGuestSessionCreateWidget::showEvent(QShowEvent *pEvent)
+{
+    QIWithRetranslateUI<QWidget>::showEvent(pEvent);
+    if (m_pUserNameEdit)
+        m_pUserNameEdit->setFocus();
+}
+
+void UIGuestSessionCreateWidget::switchSessionCreateMode()
+{
+    if (m_pUserNameEdit)
+        m_pUserNameEdit->setEnabled(true);
+    if (m_pPasswordEdit)
+        m_pPasswordEdit->setEnabled(true);
+    if (m_pCreateButton)
+        m_pCreateButton->setEnabled(true);
+    if (m_pCloseButton)
+        m_pCloseButton->setEnabled(false);
+}
+
+void UIGuestSessionCreateWidget::switchSessionCloseMode()
+{
+    if (m_pUserNameEdit)
+        m_pUserNameEdit->setEnabled(false);
+    if (m_pPasswordEdit)
+        m_pPasswordEdit->setEnabled(false);
+    if (m_pCreateButton)
+        m_pCreateButton->setEnabled(false);
+    if (m_pCloseButton)
+        m_pCloseButton->setEnabled(true);
+}
+
+void UIGuestSessionCreateWidget::markForError(bool fMarkForError)
+{
+    if (m_fMarkedForError == fMarkForError)
+        return;
+    m_fMarkedForError = fMarkForError;
+
+        if (m_pUserNameEdit)
+        {
+            QPalette mPalette = m_pUserNameEdit->palette();
+            if (m_fMarkedForError)
+                mPalette.setColor(QPalette::Base, m_errorBaseColor);
+            else
+                mPalette.setColor(QPalette::Base, m_defaultBaseColor);
+            m_pUserNameEdit->setPalette(mPalette);
+        }
+        if (m_pPasswordEdit)
+        {
+            QPalette mPalette = m_pPasswordEdit->palette();
+            if (m_fMarkedForError)
+                mPalette.setColor(QPalette::Base, m_errorBaseColor);
+            else
+                mPalette.setColor(QPalette::Base, m_defaultBaseColor);
+            m_pPasswordEdit->setPalette(mPalette);
+        }
+}
+
+
+/*********************************************************************************************************************************
+*   UIFileManagerGuestSessionPanel implementation.                                                                        *
+*********************************************************************************************************************************/
+
+UIFileManagerGuestSessionPanel::UIFileManagerGuestSessionPanel(QWidget *pParent /* = 0 */)
+    : UIDialogPanel(pParent)
+    , m_pSessionCreateWidget(0)
+{
+    prepare();
+}
+
+void UIFileManagerGuestSessionPanel::switchSessionCloseMode()
+{
+    if (m_pSessionCreateWidget)
+        m_pSessionCreateWidget->switchSessionCloseMode();
+}
+
+void UIFileManagerGuestSessionPanel::switchSessionCreateMode()
+{
+    if (m_pSessionCreateWidget)
+        m_pSessionCreateWidget->switchSessionCreateMode();
+}
+
+QString UIFileManagerGuestSessionPanel::panelName() const
+{
+    return "GuestSessionPanel";
+}
+
+void UIFileManagerGuestSessionPanel::markForError(bool fMarkForError)
+{
+    if (m_pSessionCreateWidget)
+        m_pSessionCreateWidget->markForError(fMarkForError);
+}
+
+void UIFileManagerGuestSessionPanel::prepareWidgets()
+{
+    if (!mainLayout())
+        return;
+    m_pSessionCreateWidget = new UIGuestSessionCreateWidget;
+    if (m_pSessionCreateWidget)
+        mainLayout()->addWidget(m_pSessionCreateWidget);
+}
+
+void UIFileManagerGuestSessionPanel::prepareConnections()
+{
+    if (m_pSessionCreateWidget)
+    {
+        connect(m_pSessionCreateWidget, &UIGuestSessionCreateWidget::sigCreateSession,
+                this, &UIFileManagerGuestSessionPanel::sigCreateSession);
+        connect(m_pSessionCreateWidget, &UIGuestSessionCreateWidget::sigCloseSession,
+                this, &UIFileManagerGuestSessionPanel::sigCloseSession);
+    }
+}
+
+void UIFileManagerGuestSessionPanel::retranslateUi()
+{
+    UIDialogPanel::retranslateUi();
+
+}
+
+void UIFileManagerGuestSessionPanel::showEvent(QShowEvent *pEvent)
+{
+    markForError(false);
+    UIDialogPanel::showEvent(pEvent);
+}
+
+#include "UIFileManagerGuestSessionPanel.moc"
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestSessionPanel.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestSessionPanel.h	(revision 92616)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestSessionPanel.h	(revision 92616)
@@ -0,0 +1,63 @@
+/* $Id$ */
+/** @file
+ * VBox Qt GUI - UIVMLogViewer class declaration.
+ */
+
+/*
+ * Copyright (C) 2010-2020 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#ifndef FEQT_INCLUDED_SRC_guestctrl_UIFileManagerGuestSessionPanel_h
+#define FEQT_INCLUDED_SRC_guestctrl_UIFileManagerGuestSessionPanel_h
+#ifndef RT_WITHOUT_PRAGMA_ONCE
+# pragma once
+#endif
+
+/* GUI includes: */
+#include "UIDialogPanel.h"
+
+/* Forward declarations: */
+class UIGuestSessionCreateWidget;
+
+/** UIDialogPanel extension providing GUI for creating/stopping a guest session. */
+class UIFileManagerGuestSessionPanel : public UIDialogPanel
+{
+    Q_OBJECT;
+
+signals:
+
+    void sigCreateSession(QString strUserName, QString strPassword);
+    void sigCloseSession();
+
+public:
+
+    UIFileManagerGuestSessionPanel(QWidget *pParent = 0);
+    /** @name Enable/disable member widget wrt. guest session status.
+      * @{ */
+        void switchSessionCloseMode();
+        void switchSessionCreateMode();
+    /** @} */
+    virtual QString panelName() const /* override */;
+    void markForError(bool fMarkForError);
+
+protected:
+
+    virtual void prepareWidgets() /* override */;
+    virtual void prepareConnections() /* override */;
+    void retranslateUi();
+    void showEvent(QShowEvent *pEvent) /* override */;
+
+private:
+
+    UIGuestSessionCreateWidget *m_pSessionCreateWidget;
+};
+
+#endif /* !FEQT_INCLUDED_SRC_guestctrl_UIFileManagerGuestSessionPanel_h */
Index: unk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerSessionPanel.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerSessionPanel.cpp	(revision 92615)
+++ 	(revision )
@@ -1,328 +1,0 @@
-/* $Id$ */
-/** @file
- * VBox Qt GUI - UIVMLogViewer class implementation.
- */
-
-/*
- * Copyright (C) 2010-2020 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-/* Qt includes: */
-#include <QCheckBox>
-#include <QHBoxLayout>
-#include <QPushButton>
-
-/* GUI includes: */
-#include "QILineEdit.h"
-#include "UIFileManagerSessionPanel.h"
-
-/*********************************************************************************************************************************
-*   UIGuestSessionCreateWidget definition.                                                                                   *
-*********************************************************************************************************************************/
-/** A QWidget extension containing text entry fields for password and username and buttons to
- *  start/stop a guest session. */
-class UIGuestSessionCreateWidget : public QIWithRetranslateUI<QWidget>
-{
-    Q_OBJECT;
-
-signals:
-
-    void sigCreateSession(QString strUserName, QString strPassword);
-    void sigCloseSession();
-
-public:
-
-    UIGuestSessionCreateWidget(QWidget *pParent = 0);
-    /** Disables certain widget after a guest session has been created. */
-    void switchSessionCreateMode();
-    /** Makes sure certain widgets are enabled so that a guest session can be created. */
-    void switchSessionCloseMode();
-    void markForError(bool fMarkForError);
-
-protected:
-
-    void retranslateUi() /* override */;
-    void keyPressEvent(QKeyEvent * pEvent) /* override */;
-    void showEvent(QShowEvent *pEvent) /* override */;
-
-private slots:
-
-    void sltCreateButtonClick();
-    void sltShowHidePassword(bool flag);
-    void sltHandleTextChanged(const QString &strText);
-
-private:
-
-    void          prepareWidgets();
-    QILineEdit   *m_pUserNameEdit;
-    QILineEdit   *m_pPasswordEdit;
-    QPushButton  *m_pCreateButton;
-    QPushButton  *m_pCloseButton;
-    QHBoxLayout  *m_pMainLayout;
-    QCheckBox    *m_pShowPasswordCheckBox;
-    QColor        m_defaultBaseColor;
-    QColor        m_errorBaseColor;
-    bool          m_fMarkedForError;
-};
-
-
-/*********************************************************************************************************************************
-*   UIGuestSessionCreateWidget implementation.                                                                                   *
-*********************************************************************************************************************************/
-
-UIGuestSessionCreateWidget::UIGuestSessionCreateWidget(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
-    , m_pUserNameEdit(0)
-    , m_pPasswordEdit(0)
-    , m_pCreateButton(0)
-    , m_pCloseButton(0)
-    , m_pMainLayout(0)
-    , m_pShowPasswordCheckBox(0)
-    , m_fMarkedForError(0)
-{
-    prepareWidgets();
-}
-
-void UIGuestSessionCreateWidget::prepareWidgets()
-{
-    m_pMainLayout = new QHBoxLayout(this);
-    if (!m_pMainLayout)
-        return;
-
-    m_pUserNameEdit = new QILineEdit;
-    if (m_pUserNameEdit)
-    {
-        m_pMainLayout->addWidget(m_pUserNameEdit, 2);
-        m_pUserNameEdit->setPlaceholderText(QApplication::translate("UIFileManager", "User Name"));
-        m_defaultBaseColor = m_pUserNameEdit->palette().color(QPalette::Base);
-        m_errorBaseColor = QColor(m_defaultBaseColor.red(),
-                                  0.5 * m_defaultBaseColor.green(),
-                                  0.5 * m_defaultBaseColor.blue());
-        connect(m_pUserNameEdit, &QILineEdit::textChanged,
-                this, &UIGuestSessionCreateWidget::sltHandleTextChanged);
-    }
-
-    m_pPasswordEdit = new QILineEdit;
-    if (m_pPasswordEdit)
-    {
-        m_pMainLayout->addWidget(m_pPasswordEdit, 2);
-        m_pPasswordEdit->setPlaceholderText(QApplication::translate("UIFileManager", "Password"));
-        m_pPasswordEdit->setEchoMode(QLineEdit::Password);
-        connect(m_pPasswordEdit, &QILineEdit::textChanged,
-                this, &UIGuestSessionCreateWidget::sltHandleTextChanged);
-    }
-
-    m_pShowPasswordCheckBox = new QCheckBox;
-    if (m_pShowPasswordCheckBox)
-    {
-        m_pShowPasswordCheckBox->setText(QApplication::translate("UIFileManager", "Show Password"));
-        m_pMainLayout->addWidget(m_pShowPasswordCheckBox);
-        connect(m_pShowPasswordCheckBox, &QCheckBox::toggled,
-                this, &UIGuestSessionCreateWidget::sltShowHidePassword);
-    }
-
-    m_pCreateButton = new QPushButton;
-    if (m_pCreateButton)
-    {
-        m_pMainLayout->addWidget(m_pCreateButton);
-        connect(m_pCreateButton, &QPushButton::clicked, this, &UIGuestSessionCreateWidget::sltCreateButtonClick);
-    }
-
-    m_pCloseButton = new QPushButton;
-    if (m_pCloseButton)
-    {
-        m_pMainLayout->addWidget(m_pCloseButton);
-        connect(m_pCloseButton, &QPushButton::clicked, this, &UIGuestSessionCreateWidget::sigCloseSession);
-    }
-    m_pMainLayout->insertStretch(-1, 1);
-    switchSessionCreateMode();
-    retranslateUi();
-}
-
-void UIGuestSessionCreateWidget::sltCreateButtonClick()
-{
-    if (m_pUserNameEdit && m_pPasswordEdit)
-        emit sigCreateSession(m_pUserNameEdit->text(), m_pPasswordEdit->text());
-}
-
-void UIGuestSessionCreateWidget::sltShowHidePassword(bool flag)
-{
-    if (!m_pPasswordEdit)
-        return;
-    if (flag)
-        m_pPasswordEdit->setEchoMode(QLineEdit::Normal);
-    else
-        m_pPasswordEdit->setEchoMode(QLineEdit::Password);
-}
-
-void UIGuestSessionCreateWidget::sltHandleTextChanged(const QString &strText)
-{
-    Q_UNUSED(strText);
-    markForError(false);
-}
-
-void UIGuestSessionCreateWidget::retranslateUi()
-{
-    if (m_pUserNameEdit)
-    {
-        m_pUserNameEdit->setToolTip(QApplication::translate("UIFileManager", "User name to authenticate session creation"));
-        m_pUserNameEdit->setPlaceholderText(QApplication::translate("UIFileManager", "User Name"));
-
-    }
-    if (m_pPasswordEdit)
-    {
-        m_pPasswordEdit->setToolTip(QApplication::translate("UIFileManager", "Password to authenticate session creation"));
-        m_pPasswordEdit->setPlaceholderText(QApplication::translate("UIFileManager", "Password"));
-    }
-
-    if (m_pCreateButton)
-        m_pCreateButton->setText(QApplication::translate("UIFileManager", "Create Session"));
-    if (m_pCloseButton)
-        m_pCloseButton->setText(QApplication::translate("UIFileManager", "Close Session"));
-}
-
-void UIGuestSessionCreateWidget::keyPressEvent(QKeyEvent * pEvent)
-{
-    /* Emit sigCreateSession upon enter press: */
-    if (pEvent->key() == Qt::Key_Enter || pEvent->key() == Qt::Key_Return)
-    {
-        if ((m_pUserNameEdit && m_pUserNameEdit->hasFocus()) ||
-            (m_pPasswordEdit && m_pPasswordEdit->hasFocus()))
-            sigCreateSession(m_pUserNameEdit->text(), m_pPasswordEdit->text());
-    }
-    QWidget::keyPressEvent(pEvent);
-}
-
-void UIGuestSessionCreateWidget::showEvent(QShowEvent *pEvent)
-{
-    QIWithRetranslateUI<QWidget>::showEvent(pEvent);
-    if (m_pUserNameEdit)
-        m_pUserNameEdit->setFocus();
-}
-
-void UIGuestSessionCreateWidget::switchSessionCreateMode()
-{
-    if (m_pUserNameEdit)
-        m_pUserNameEdit->setEnabled(true);
-    if (m_pPasswordEdit)
-        m_pPasswordEdit->setEnabled(true);
-    if (m_pCreateButton)
-        m_pCreateButton->setEnabled(true);
-    if (m_pCloseButton)
-        m_pCloseButton->setEnabled(false);
-}
-
-void UIGuestSessionCreateWidget::switchSessionCloseMode()
-{
-    if (m_pUserNameEdit)
-        m_pUserNameEdit->setEnabled(false);
-    if (m_pPasswordEdit)
-        m_pPasswordEdit->setEnabled(false);
-    if (m_pCreateButton)
-        m_pCreateButton->setEnabled(false);
-    if (m_pCloseButton)
-        m_pCloseButton->setEnabled(true);
-}
-
-void UIGuestSessionCreateWidget::markForError(bool fMarkForError)
-{
-    if (m_fMarkedForError == fMarkForError)
-        return;
-    m_fMarkedForError = fMarkForError;
-
-        if (m_pUserNameEdit)
-        {
-            QPalette mPalette = m_pUserNameEdit->palette();
-            if (m_fMarkedForError)
-                mPalette.setColor(QPalette::Base, m_errorBaseColor);
-            else
-                mPalette.setColor(QPalette::Base, m_defaultBaseColor);
-            m_pUserNameEdit->setPalette(mPalette);
-        }
-        if (m_pPasswordEdit)
-        {
-            QPalette mPalette = m_pPasswordEdit->palette();
-            if (m_fMarkedForError)
-                mPalette.setColor(QPalette::Base, m_errorBaseColor);
-            else
-                mPalette.setColor(QPalette::Base, m_defaultBaseColor);
-            m_pPasswordEdit->setPalette(mPalette);
-        }
-}
-
-
-/*********************************************************************************************************************************
-*   UIFileManagerSessionPanel implementation.                                                                        *
-*********************************************************************************************************************************/
-
-UIFileManagerSessionPanel::UIFileManagerSessionPanel(QWidget *pParent /* = 0 */)
-    : UIDialogPanel(pParent)
-    , m_pSessionCreateWidget(0)
-{
-    prepare();
-}
-
-void UIFileManagerSessionPanel::switchSessionCloseMode()
-{
-    if (m_pSessionCreateWidget)
-        m_pSessionCreateWidget->switchSessionCloseMode();
-}
-
-void UIFileManagerSessionPanel::switchSessionCreateMode()
-{
-    if (m_pSessionCreateWidget)
-        m_pSessionCreateWidget->switchSessionCreateMode();
-}
-
-QString UIFileManagerSessionPanel::panelName() const
-{
-    return "SessionPanel";
-}
-
-void UIFileManagerSessionPanel::markForError(bool fMarkForError)
-{
-    if (m_pSessionCreateWidget)
-        m_pSessionCreateWidget->markForError(fMarkForError);
-}
-
-void UIFileManagerSessionPanel::prepareWidgets()
-{
-    if (!mainLayout())
-        return;
-    m_pSessionCreateWidget = new UIGuestSessionCreateWidget;
-    if (m_pSessionCreateWidget)
-        mainLayout()->addWidget(m_pSessionCreateWidget);
-}
-
-void UIFileManagerSessionPanel::prepareConnections()
-{
-    if (m_pSessionCreateWidget)
-    {
-        connect(m_pSessionCreateWidget, &UIGuestSessionCreateWidget::sigCreateSession,
-                this, &UIFileManagerSessionPanel::sigCreateSession);
-        connect(m_pSessionCreateWidget, &UIGuestSessionCreateWidget::sigCloseSession,
-                this, &UIFileManagerSessionPanel::sigCloseSession);
-    }
-}
-
-void UIFileManagerSessionPanel::retranslateUi()
-{
-    UIDialogPanel::retranslateUi();
-
-}
-
-void UIFileManagerSessionPanel::showEvent(QShowEvent *pEvent)
-{
-    markForError(false);
-    UIDialogPanel::showEvent(pEvent);
-}
-
-#include "UIFileManagerSessionPanel.moc"
Index: unk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerSessionPanel.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerSessionPanel.h	(revision 92615)
+++ 	(revision )
@@ -1,63 +1,0 @@
-/* $Id$ */
-/** @file
- * VBox Qt GUI - UIVMLogViewer class declaration.
- */
-
-/*
- * Copyright (C) 2010-2020 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#ifndef FEQT_INCLUDED_SRC_guestctrl_UIFileManagerSessionPanel_h
-#define FEQT_INCLUDED_SRC_guestctrl_UIFileManagerSessionPanel_h
-#ifndef RT_WITHOUT_PRAGMA_ONCE
-# pragma once
-#endif
-
-/* GUI includes: */
-#include "UIDialogPanel.h"
-
-/* Forward declarations: */
-class UIGuestSessionCreateWidget;
-
-/** UIDialogPanel extension providing GUI for creating/stopping a guest session. */
-class UIFileManagerSessionPanel : public UIDialogPanel
-{
-    Q_OBJECT;
-
-signals:
-
-    void sigCreateSession(QString strUserName, QString strPassword);
-    void sigCloseSession();
-
-public:
-
-    UIFileManagerSessionPanel(QWidget *pParent = 0);
-    /** @name Enable/disable member widget wrt. guest session status.
-      * @{ */
-        void switchSessionCloseMode();
-        void switchSessionCreateMode();
-    /** @} */
-    virtual QString panelName() const /* override */;
-    void markForError(bool fMarkForError);
-
-protected:
-
-    virtual void prepareWidgets() /* override */;
-    virtual void prepareConnections() /* override */;
-    void retranslateUi();
-    void showEvent(QShowEvent *pEvent) /* override */;
-
-private:
-
-    UIGuestSessionCreateWidget *m_pSessionCreateWidget;
-};
-
-#endif /* !FEQT_INCLUDED_SRC_guestctrl_UIFileManagerSessionPanel_h */
