Changeset 93185 in vbox for trunk

Timestamp:

Jan 11, 2022 2:18:59 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9371. Relocating the warning label.

Location:

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

Files:

• UIFileManagerGuestTable.cpp (modified) (6 diffs)
• UIFileManagerGuestTable.h (modified) (2 diffs)
• UIFileManagerTable.cpp (modified) (3 diffs)
• UIFileManagerTable.h (modified) (1 diff)

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

@@ -378 +378 @@
     , m_comMachine(comMachine)
     , m_pGuestSessionPanel(0)
+    , m_pWarningLabelContainer(0)
+    , m_pWarningLabel(0)
+    , m_pWarningIconLabel(0)
     , m_fIsCurrent(false)
 {
@@ -383 +386 @@
         m_strTableName = m_comMachine.GetName();
     prepareToolbar();
+    prepareWarningLabels();
     prepareGuestSessionPanel();
     prepareActionConnections();
@@ -420 +424 @@
         m_pLocationLabel->setText(UIFileManager::tr("Guest File System:"));
 
-    if (m_pWarningLabel)
+    if (m_pWarningLabel && m_pWarningIconLabel)
     {
         QString strWarningText;
@@ -427 +431 @@
             case State_InvalidMachineReference:
                 strWarningText = UIFileManager::tr("Machine reference is invalid.");
+                m_pWarningIconLabel->setPixmap(QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical).pixmap(QSize(16, 16)));
                 break;
             case State_MachineNotRunning:
                 strWarningText = UIFileManager::tr("File manager cannot work since the selected guest is not currenly running.");
+                m_pWarningIconLabel->setPixmap(QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(QSize(16, 16)));
                 break;
             case State_NoGuestAdditions:
                 strWarningText = UIFileManager::tr("File manager cannot work since the selected guest does not have the guest additions.");
+                m_pWarningIconLabel->setPixmap(QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(QSize(16, 16)));
                 break;
             case State_SessionPossible:
+                strWarningText = UIFileManager::tr("Enter a valid user name and password to initiate the file manager.");
+                m_pWarningIconLabel->setPixmap(QApplication::style()->standardIcon(QStyle::SP_FileDialogInfoView).pixmap(QSize(16, 16)));
+                break;
             default:
                 break;
@@ -440 +450 @@
         m_pWarningLabel->setText(QString("<p>%1</p>").arg(strWarningText));
     }
-
+    if (m_pWarningIconLabel)
+    {
+
+    }
     UIFileManagerTable::retranslateUi();
 }
@@ -1032 +1045 @@
             m_pMainLayout->addWidget(m_pGuestSessionPanel, m_pMainLayout->rowCount(), 0, 1, m_pMainLayout->columnCount());
             m_pGuestSessionPanel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
-            //sltHandleGuestSessionPanelShown();
             connect(m_pGuestSessionPanel, &UIGuestSessionCreateWidget::sigCreateSession,
                     this, &UIFileManagerGuestTable::sltCreateGuestSession);
             connect(m_pGuestSessionPanel, &UIGuestSessionCreateWidget::sigCloseSession,
                     this, &UIFileManagerGuestTable::sltHandleCloseSessionRequest);
-            // connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigHidePanel,
-            //         this, &UIFileManagerGuestTable::sltHandleGuestSessionPanelHidden);
-            // connect(m_pGuestSessionPanel, &UIFileManagerGuestSessionPanel::sigShowPanel,
-            //         this, &UIFileManagerGuestTable::sltHandleGuestSessionPanelShown);
+        }
+    }
+}
+
+void UIFileManagerGuestTable::prepareWarningLabels()
+{
+    if (m_pMainLayout)
+    {
+        m_pWarningLabelContainer = new QWidget(this);
+        QHBoxLayout *pContainerLayout = new QHBoxLayout(m_pWarningLabelContainer);
+        m_pWarningLabelContainer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+        m_pMainLayout->addWidget(m_pWarningLabelContainer, m_pMainLayout->rowCount(), 0, 1, m_pMainLayout->columnCount());
+
+        m_pWarningIconLabel = new QILabel(this);
+        if (m_pWarningIconLabel)
+        {
+            pContainerLayout->addWidget(m_pWarningIconLabel);
+            m_pWarningIconLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+        }
+        m_pWarningLabel = new QILabel(this);
+        if (m_pWarningLabel)
+        {
+            pContainerLayout->addWidget(m_pWarningLabel);
+            m_pWarningLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Maximum);
+            m_pWarningLabel->setVisible(false);
         }
     }

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

@@ -135 +135 @@
     void cleanupConsoleListener();
     void prepareGuestSessionPanel();
+    void prepareWarningLabels();
     bool openGuestSession(const QString& strUserName, const QString& strPassword);
     void closeGuestSession();
@@ -158 +159 @@
     CEventListener m_comConsoleListener;
     UIGuestSessionCreateWidget *m_pGuestSessionPanel;
+    QWidget         *m_pWarningLabelContainer;
+    QILabel         *m_pWarningLabel;
+    QILabel         *m_pWarningIconLabel;
     /** True if this table is the current table in parents tab widget. */
     bool m_fIsCurrent;

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

@@ -705 +705 @@
     , m_pToolBar(0)
     , m_pMainLayout(0)
-    , m_pWarningLabel(0)
     , m_pModel(0)
     , m_pView(0)
@@ -813 +812 @@
         m_sessionWidgets << m_pView;
     }
-    m_pWarningLabel = new QILabel(this);
-    if (m_pWarningLabel)
-    {
-        m_pMainLayout->addWidget(m_pWarningLabel, 2, 0, 5, 7);
-        QFont labelFont = m_pWarningLabel->font();
-        float fSizeMultiplier = 1.f;
-        if (labelFont.pointSize() != -1)
-            labelFont.setPointSize(fSizeMultiplier * labelFont.pointSize());
-        else
-            labelFont.setPixelSize(fSizeMultiplier * labelFont.pixelSize());
-        labelFont.setBold(false);
-        m_pWarningLabel->setFont(labelFont);
-        m_pWarningLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-        m_pWarningLabel->setWordWrap(true);
-    }
-    m_pWarningLabel->setVisible(false);
 
     m_pSearchLineEdit = new QILineEdit;
@@ -1471 +1454 @@
     if (pEvent->type() == QEvent::EnabledChange)
     {
-        m_pWarningLabel->setVisible(!isEnabled());
         m_pView->setVisible(isEnabled());
         retranslateUi();

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

@@ -257 +257 @@
     /** This name is appended to the log messages which are shown in the log panel. */
     QString          m_strTableName;
-    QILabel         *m_pWarningLabel;
 
 private slots: