Changeset 93697 in vbox for trunk/src/VBox

Timestamp:

Feb 11, 2022 3:48:03 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9371. refactoring.

Location:

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

Files:

• UIFileManagerGuestTable.cpp (modified) (21 diffs)
• UIFileManagerGuestTable.h (modified) (3 diffs)

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

@@ -53 +53 @@
 
 /*********************************************************************************************************************************
-*   UIGuestSessionCreateWidget definition.                                                                                   *
+*   UIGuestSessionWidget 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>
+class UIGuestSessionWidget : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -63 +63 @@
 signals:
 
-    void sigCreateSession(QString strUserName, QString strPassword);
+    void sigOpenSession(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. */
+    UIGuestSessionWidget(QWidget *pParent = 0);
+    /** Disables certain widget after a guest session has been opened. */
+    void switchSessionOpenMode();
+    /** Makes sure certain widgets are enabled so that a guest session can be opened. */
     void switchSessionCloseMode();
     void markForError(bool fMarkForError);
@@ -92 +92 @@
     enum ButtonMode
     {
-        ButtonMode_Create,
+        ButtonMode_Open,
         ButtonMode_Close
     };
@@ -112 +112 @@
 
 /*********************************************************************************************************************************
-*   UIGuestSessionCreateWidget implementation.                                                                                   *
+*   UIGuestSessionWidget implementation.                                                                                   *
 *********************************************************************************************************************************/
 
-UIGuestSessionCreateWidget::UIGuestSessionCreateWidget(QWidget *pParent /* = 0 */)
+UIGuestSessionWidget::UIGuestSessionWidget(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_enmButtonMode(ButtonMode_Create)
+    , m_enmButtonMode(ButtonMode_Open)
     , m_pUserNameEdit(0)
     , m_pPasswordEdit(0)
@@ -128 +128 @@
 }
 
-void UIGuestSessionCreateWidget::prepareWidgets()
+void UIGuestSessionWidget::prepareWidgets()
 {
     m_pMainLayout = new QHBoxLayout(this);
@@ -146 +146 @@
                                   0.5 * m_defaultBaseColor.blue());
         connect(m_pUserNameEdit, &QILineEdit::textChanged,
-                this, &UIGuestSessionCreateWidget::sltHandleTextChanged);
+                this, &UIGuestSessionWidget::sltHandleTextChanged);
     }
 
@@ -156 +156 @@
         m_pPasswordEdit->setEchoMode(QLineEdit::Password);
         connect(m_pPasswordEdit, &UIPasswordLineEdit::textChanged,
-                this, &UIGuestSessionCreateWidget::sltHandleTextChanged);
+                this, &UIGuestSessionWidget::sltHandleTextChanged);
     }
 
@@ -163 +163 @@
     {
         m_pMainLayout->addWidget(m_pButton);
-        connect(m_pButton, &QPushButton::clicked, this, &UIGuestSessionCreateWidget::sltButtonClick);
+        connect(m_pButton, &QPushButton::clicked, this, &UIGuestSessionWidget::sltButtonClick);
     }
     m_pStatusIconLabel = new QLabel(this);
@@ -173 +173 @@
 
     m_pMainLayout->insertStretch(-1, 1);
-    switchSessionCreateMode();
+    switchSessionOpenMode();
     retranslateUi();
 }
 
-void UIGuestSessionCreateWidget::sltButtonClick()
-{
-    if (m_enmButtonMode == ButtonMode_Create && m_pUserNameEdit && m_pPasswordEdit)
-        emit sigCreateSession(m_pUserNameEdit->text(), m_pPasswordEdit->text());
+void UIGuestSessionWidget::sltButtonClick()
+{
+    if (m_enmButtonMode == ButtonMode_Open && m_pUserNameEdit && m_pPasswordEdit)
+        emit sigOpenSession(m_pUserNameEdit->text(), m_pPasswordEdit->text());
     else if (m_enmButtonMode == ButtonMode_Close)
         emit sigCloseSession();
 }
 
-void UIGuestSessionCreateWidget::sltHandleTextChanged(const QString &strText)
+void UIGuestSessionWidget::sltHandleTextChanged(const QString &strText)
 {
     Q_UNUSED(strText);
@@ -191 +191 @@
 }
 
-void UIGuestSessionCreateWidget::retranslateUi()
+void UIGuestSessionWidget::retranslateUi()
 {
     if (m_pUserNameEdit)
@@ -207 +207 @@
     if (m_pButton)
     {
-        if (m_enmButtonMode == ButtonMode_Create)
+        if (m_enmButtonMode == ButtonMode_Open)
         {
-            m_pButton->setText(QApplication::translate("UIFileManager", "Create Session"));
-            m_pButton->setToolTip(QApplication::translate("UIFileManager", "Create Session"));
+            m_pButton->setText(QApplication::translate("UIFileManager", "Open Session"));
+            m_pButton->setToolTip(QApplication::translate("UIFileManager", "Open Session"));
         }
         else
@@ -220 +220 @@
 }
 
-void UIGuestSessionCreateWidget::keyPressEvent(QKeyEvent * pEvent)
-{
-    /* Emit sigCreateSession upon enter press: */
+void UIGuestSessionWidget::keyPressEvent(QKeyEvent * pEvent)
+{
+    /* Emit sigOpenSession 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());
+            sigOpenSession(m_pUserNameEdit->text(), m_pPasswordEdit->text());
     }
     QWidget::keyPressEvent(pEvent);
 }
 
-void UIGuestSessionCreateWidget::showEvent(QShowEvent *pEvent)
+void UIGuestSessionWidget::showEvent(QShowEvent *pEvent)
 {
     QIWithRetranslateUI<QWidget>::showEvent(pEvent);
@@ -239 +239 @@
 }
 
-void UIGuestSessionCreateWidget::switchSessionCreateMode()
+void UIGuestSessionWidget::switchSessionOpenMode()
 {
     if (m_pUserNameEdit)
@@ -245 +245 @@
     if (m_pPasswordEdit)
         m_pPasswordEdit->setEnabled(true);
-    m_enmButtonMode = ButtonMode_Create;
+    m_enmButtonMode = ButtonMode_Open;
     retranslateUi();
 }
 
-void UIGuestSessionCreateWidget::switchSessionCloseMode()
+void UIGuestSessionWidget::switchSessionCloseMode()
 {
     if (m_pUserNameEdit)
@@ -259 +259 @@
 }
 
-void UIGuestSessionCreateWidget::markForError(bool fMarkForError)
+void UIGuestSessionWidget::markForError(bool fMarkForError)
 {
     if (m_fMarkedForError == fMarkForError)
@@ -285 +285 @@
 }
 
-void UIGuestSessionCreateWidget::setStatusLabelIconAndToolTip(const QIcon &icon, const QString &strToolTip)
+void UIGuestSessionWidget::setStatusLabelIconAndToolTip(const QIcon &icon, const QString &strToolTip)
 {
     if (!m_pStatusIconLabel)
@@ -294 +294 @@
 }
 
-void UIGuestSessionCreateWidget::setLoginWidgetsEnabled(bool fEnabled)
+void UIGuestSessionWidget::setLoginWidgetsEnabled(bool fEnabled)
 {
     if (m_pUserNameEdit)
@@ -462 +462 @@
         {
             case State_InvalidMachineReference:
-                strWarningText = UIFileManager::tr("Machine reference is invalid.");
+                strWarningText = UIFileManager::tr("<p>Machine reference is invalid.</p>");
                 icon = UIIconPool::iconSet(":/status_error_16px.png");
                 break;
             case State_MachineNotRunning:
-                strWarningText = UIFileManager::tr("File manager cannot work since the selected guest is not currently running.");
+                strWarningText = UIFileManager::tr("<p>File manager cannot work since the selected guest is not currently running.</p>");
                 icon = UIIconPool::iconSet(":/status_error_16px.png");
                 break;
             case State_NoGuestAdditions:
-                strWarningText = UIFileManager::tr("File manager cannot work since the selected guest does not have the guest additions.");
+                strWarningText = UIFileManager::tr("<p>File manager cannot work since the selected guest does not have the guest additions.</p>");
                 icon = UIIconPool::iconSet(":/status_error_16px.png");
                 break;
             case State_SessionPossible:
-                strWarningText = UIFileManager::tr("Enter a valid user name and password to initiate the file manager.");
+                strWarningText = UIFileManager::tr("<p>Enter a valid user name and password to initiate the file manager.</p>");
                 icon = UIIconPool::iconSet(":/session_info_16px.png");
                 break;
             case State_SessionRunning:
-                strWarningText = UIFileManager::tr("Guest control session is running.");
+                strWarningText = UIFileManager::tr("<p>Guest control session is running.</p>");
                 icon = UIIconPool::iconSet(":/status_check_16px.png");
                 break;
@@ -1073 +1073 @@
     if (m_pMainLayout)
     {
-        m_pGuestSessionWidget = new UIGuestSessionCreateWidget;
+        m_pGuestSessionWidget = new UIGuestSessionWidget;
         if (m_pGuestSessionWidget)
         {
             m_pMainLayout->addWidget(m_pGuestSessionWidget, m_pMainLayout->rowCount(), 0, 1, m_pMainLayout->columnCount());
             m_pGuestSessionWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
-            connect(m_pGuestSessionWidget, &UIGuestSessionCreateWidget::sigCreateSession,
-                    this, &UIFileManagerGuestTable::sltCreateGuestSession);
-            connect(m_pGuestSessionWidget, &UIGuestSessionCreateWidget::sigCloseSession,
+            connect(m_pGuestSessionWidget, &UIGuestSessionWidget::sigOpenSession,
+                    this, &UIFileManagerGuestTable::sltOpenGuestSession);
+            connect(m_pGuestSessionWidget, &UIGuestSessionWidget::sigCloseSession,
                     this, &UIFileManagerGuestTable::sltHandleCloseSessionRequest);
         }
@@ -1333 +1333 @@
 }
 
-void UIFileManagerGuestTable::sltCreateGuestSession(QString strUserName, QString strPassword)
+void UIFileManagerGuestTable::sltOpenGuestSession(QString strUserName, QString strPassword)
 {
     if (strUserName.isEmpty())
@@ -1411 +1411 @@
         m_pGuestSessionWidget->setLoginWidgetsEnabled(m_enmState == State_SessionPossible || m_enmState == State_SessionRunning);
         if (m_enmState == State_SessionPossible)
-            m_pGuestSessionWidget->switchSessionCreateMode();
+            m_pGuestSessionWidget->switchSessionOpenMode();
         else if (m_enmState == State_SessionRunning)
             m_pGuestSessionWidget->switchSessionCloseMode();

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

@@ -44 +44 @@
 class UIActionPool;
 class UICustomFileSystemItem;
-class UIGuestSessionCreateWidget;
+class UIGuestSessionWidget;
 
 /** This class scans the guest file system by using the VBox Guest Control API
@@ -98 +98 @@
     void sltGuestSessionRegistered(CGuestSession guestSession);
     void sltGuestSessionStateChanged(const CGuestSessionStateChangedEvent &cEvent);
-    void sltCreateGuestSession(QString strUserName, QString strPassword);
+    void sltOpenGuestSession(QString strUserName, QString strPassword);
     void sltHandleCloseSessionRequest();
     void sltMachineStateChange(const QUuid &uMachineId, const KMachineState state);
@@ -157 +157 @@
     CEventListener m_comGuestListener;
     CEventListener m_comConsoleListener;
-    UIGuestSessionCreateWidget *m_pGuestSessionWidget;
+    UIGuestSessionWidget *m_pGuestSessionWidget;
     /** True if this table is the current table in parents tab widget. */
     bool m_fIsCurrent;