Changeset 75788 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 28, 2018 1:18:29 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Improving file operation panel (just a tiny bit).

Location:

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

Files:

• UIGuestControlFileManagerOperationsPanel.cpp (modified) (17 diffs)
• UIGuestControlFileManagerOperationsPanel.h (modified) (2 diffs)

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

@@ -22 +22 @@
 /* Qt includes: */
 # include <QHBoxLayout>
-# include <QHeaderView>
 # include <QLabel>
 # include <QMenu>
 # include <QProgressBar>
-# include <QTableWidget>
+# include <QScrollArea>
+# include <QStyle>
+
 
 /* GUI includes: */
 # include "QIToolButton.h"
+# include "QILabel.h"
 # include "UIErrorString.h"
 # include "UIIconPool.h"
@@ -47 +49 @@
 *********************************************************************************************************************************/
 
-class UIFileOperationProgressWidget : public QIWithRetranslateUI<QWidget>
+class UIFileOperationProgressWidget : public QIWithRetranslateUI<QFrame>
 {
 
@@ -66 +68 @@
 protected:
 
-    void retranslateUi() /* override */;
+    virtual void retranslateUi() /* override */;
+    // virtual void focusInEvent(QFocusEvent *pEvent) /* override */;
+    // virtual void focusOutEvent(QFocusEvent *pEvent) /* override */;
 
 private slots:
@@ -86 +90 @@
     QProgressBar           *m_pProgressBar;
     QIToolButton           *m_pCancelButton;
+    QILabel                *m_pStatusLabel;
 };
 
@@ -94 +99 @@
 
 UIFileOperationProgressWidget::UIFileOperationProgressWidget(const CProgress &comProgress, QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : QIWithRetranslateUI<QFrame>(pParent)
     , m_comProgress(comProgress)
     , m_pEventHandler(0)
@@ -100 +105 @@
     , m_pProgressBar(0)
     , m_pCancelButton(0)
+    , m_pStatusLabel(0)
 {
     prepare();
-    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
+    setFocusPolicy(Qt::ClickFocus);
+    setFrameStyle(QFrame::Panel);
+    setLineWidth(0);
+    setStyleSheet("QFrame:focus {  border-width: 1px; border-style: dashed; border-color: black; }");
+
 }
 
@@ -130 +140 @@
 }
 
+// void UIFileOperationProgressWidget::focusInEvent(QFocusEvent *pEvent)
+// {
+//     Q_UNUSED(pEvent);
+//     //setFrameStyle(QFrame::Panel);
+//     setLineWidth(3);
+//     printf("booo\n");
+//     repaint();
+// }
+
+// void UIFileOperationProgressWidget::focusOutEvent(QFocusEvent *pEvent)
+// {
+//     Q_UNUSED(pEvent);
+//     //setFrameStyle(QFrame::NoFrame);
+//     setLineWidth(0);
+// }
+
 void UIFileOperationProgressWidget::prepare()
 {
@@ -141 +167 @@
     if (!m_pMainLayout)
         return;
-    m_pMainLayout->setSpacing(0);
+    //m_pMainLayout->setSpacing(0);
 
     m_pCancelButton = new QIToolButton;
@@ -162 +188 @@
         m_pProgressBar->setMaximum(100);
         m_pProgressBar->setTextVisible(true);
-        m_pProgressBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
+        //   m_pProgressBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
         m_pMainLayout->addWidget(m_pProgressBar);
+    }
+    m_pStatusLabel = new QILabel;
+    if (m_pStatusLabel)
+    {
+        m_pMainLayout->addWidget(m_pStatusLabel);
+        m_pStatusLabel->setText(UIGuestControlFileManager::tr("Idle"));
     }
     setLayout(m_pMainLayout);
@@ -177 +209 @@
     connect(m_pEventHandler, &UIProgressEventHandler::sigProgressTaskComplete,
             this, &UIFileOperationProgressWidget::sltHandleProgressComplete);
+    m_pStatusLabel->setText(UIGuestControlFileManager::tr("Working"));
 }
 
@@ -190 +223 @@
     Q_UNUSED(iPercent);
     m_pProgressBar->setValue(iPercent);
+
 }
 
@@ -199 +233 @@
 
     if (!m_comProgress.isOk() || m_comProgress.GetResultCode() != 0)
+    {
         emit sigProgressFail(UIErrorString::formatErrorInfo(m_comProgress), FileManagerLogType_Error);
+        if (m_pStatusLabel)
+            m_pStatusLabel->setText(UIGuestControlFileManager::tr("Failed"));
+    }
     else
+    {
         emit sigProgressComplete(m_comProgress.GetId());
+        if (m_pStatusLabel)
+            m_pStatusLabel->setText(UIGuestControlFileManager::tr("Succeeded"));
+    }
 }
 
@@ -210 +252 @@
     if (m_pCancelButton)
         m_pCancelButton->setEnabled(false);
+    if (m_pStatusLabel)
+        m_pStatusLabel->setText(UIGuestControlFileManager::tr("Canceled"));
+    if (m_pProgressBar)
+        m_pProgressBar->setEnabled(false);
 }
 
@@ -220 +266 @@
                                                                                    QWidget *pParent)
     : UIGuestControlFileManagerPanel(pManagerWidget, pParent)
-    , m_pTableWidget(0)
+    , m_pScrollArea(0)
+    , m_pContainerWidget(0)
+    , m_pContainerLayout(0)
+    , m_pContainerSpaceItem(0)
 {
     prepare();
@@ -227 +276 @@
 void UIGuestControlFileManagerOperationsPanel::addNewProgress(const CProgress &comProgress)
 {
-    if (!m_pTableWidget)
-        return;
-
-    /** Insert the row to the top of the table since inserting to the bottom causes a strange stacking
-     *  effect of the widgets: */
-    m_pTableWidget->insertRow(0);
+    if (!m_pContainerLayout)
+        return;
+
     UIFileOperationProgressWidget *pOperationsWidget = new UIFileOperationProgressWidget(comProgress);
-    m_pTableWidget->setCellWidget(0, 0, pOperationsWidget);
+    if (!pOperationsWidget)
+        return;
+    m_pContainerLayout->insertWidget(m_pContainerLayout->count() - 1, pOperationsWidget);
+
     connect(pOperationsWidget, &UIFileOperationProgressWidget::sigProgressComplete,
             this, &UIGuestControlFileManagerOperationsPanel::sigFileOperationComplete);
     connect(pOperationsWidget, &UIFileOperationProgressWidget::sigProgressFail,
             this, &UIGuestControlFileManagerOperationsPanel::sigFileOperationFail);
-    /* Trying to make the the rows look a bit less shitty */
-    //m_pTableWidget->resizeRowsToContents();
-    //m_pTableWidget->horizontalHeader()->setStretchLastSection(true);
-    m_pTableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
-    //m_pTableWidget->scrollToBottom();
 }
 
@@ -255 +299 @@
     if (!mainLayout())
         return;
-    m_pTableWidget = new QTableWidget();
-
-    if (m_pTableWidget)
-    {
-        m_pTableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
-        m_pTableWidget->setColumnCount(TableColumn_Max);
-        m_pTableWidget->verticalHeader()->hide();
-        m_pTableWidget->horizontalHeader()->hide();
-        m_pTableWidget->setShowGrid(false);
-        mainLayout()->addWidget(m_pTableWidget);
-    }
+
+
+    m_pScrollArea = new QScrollArea;
+    m_pContainerWidget = new QWidget;
+    m_pContainerLayout = new QVBoxLayout;
+    if (!m_pScrollArea || !m_pContainerWidget || !m_pContainerLayout)
+        return;
+
+    m_pScrollArea->setBackgroundRole(QPalette::Window);
+    m_pScrollArea->setWidgetResizable(true);
+
+    mainLayout()->addWidget(m_pScrollArea);
+
+    m_pScrollArea->setWidget(m_pContainerWidget);
+    m_pContainerWidget->setLayout(m_pContainerLayout);
+    m_pContainerLayout->addStretch(4);
 }
 
@@ -296 +345 @@
 void UIGuestControlFileManagerOperationsPanel::sltCleanFinished()
 {
-    QList<int> listOfRowsToRemove;
-    for (int i = 0; i < m_pTableWidget->rowCount(); ++i)
-    {
-        UIFileOperationProgressWidget* pProgressWidget =
-            qobject_cast<UIFileOperationProgressWidget*>(m_pTableWidget->cellWidget(i, TableColumn_Progress));
-        if (pProgressWidget)
-        {
-            if (pProgressWidget->isCanceled() || pProgressWidget->isCompleted())
-                listOfRowsToRemove << i;
-        }
-    }
-    foreach (int row, listOfRowsToRemove)
-    {
-        /* This will delete the progress widget as well: */
-        m_pTableWidget->removeRow(row);
-    }
+    // QList<int> listOfRowsToRemove;
+    // for (int i = 0; i < m_pListView->count(); ++i)
+    // {
+    //     UIFileOperationProgressWidget* pProgressWidget =
+    //         qobject_cast<UIFileOperationProgressWidget*>(m_pListView->itemWidget(m_pListView->item(i)));
+    //     if (pProgressWidget)
+    //     {
+    //         if (pProgressWidget->isCanceled() || pProgressWidget->isCompleted())
+    //             listOfRowsToRemove << i;
+    //     }
+    // }
+    // foreach (int row, listOfRowsToRemove)
+    // {
+    //     /* This will delete the progress widget as well: */
+    //     QListWidgetItem *pItem = m_pListView->takeItem(row);
+    //     delete m_pListView->itemWidget(pItem);
+    //     delete pItem;
+    // }
 }
 
 void UIGuestControlFileManagerOperationsPanel::sltCleanAll()
 {
-    m_pTableWidget->clearContents();
-    m_pTableWidget->setRowCount(0);
+    //m_pListView->clear();
+    //m_pListView->setRowCount(0);
 }
 

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

@@ -28 +28 @@
 /* Forward declarations: */
 class CProgress;
-class QTableWidget;
+class QScrollArea;
+class QSpacerItem;
+class QVBoxLayout;
+
+class UIFileOperationModel;
 class UIFileOperationProgressWidget;
 class UIGuestControlFileManager;
 
 
-/** UIVMLogViewerPanel extension hosting a QTableWidget which in turn has a special QWidget extension
+/** UIVMLogViewerPanel extension hosting a QListWidget which in turn has a special QWidget extension
   * to manage multiple CProgress instances. This is particulary used in monitoring file operations. */
 class UIGuestControlFileManagerOperationsPanel : public UIGuestControlFileManagerPanel
@@ -69 +73 @@
 private:
 
-    enum TableColumn
-    {
-        TableColumn_Progress,
-        TableColumn_Info,
-        TableColumn_Max
-    };
-
     /** @name Member variables.
       * @{ */
-        QTableWidget *m_pTableWidget;
+        QScrollArea *m_pScrollArea;
+        QWidget     *m_pContainerWidget;
+        QVBoxLayout *m_pContainerLayout;
+        QSpacerItem *m_pContainerSpaceItem;
     /** @} */
+
+
 
 };