Changeset 75915 in vbox

Timestamp:

Dec 3, 2018 3:48:32 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Somw more improvements on the file operations panel.

Location:

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

Files:

• UIGuestControlFileManagerOperationsPanel.cpp (modified) (6 diffs)
• UIGuestControlFileManagerOperationsPanel.h (modified) (1 diff)

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

@@ -27 +27 @@
 # include <QProgressBar>
 # include <QScrollArea>
+# include <QScrollBar>
 # include <QStyle>
 
@@ -208 +209 @@
     //m_pMainLayout->setSpacing(0);
 
+    m_pProgressBar = new QProgressBar;
+    if (m_pProgressBar)
+    {
+        m_pProgressBar->setMinimum(0);
+        m_pProgressBar->setMaximum(100);
+        /* Hide the QProgressBar's text since in MacOS it never shows: */
+        m_pProgressBar->setTextVisible(false);
+        m_pMainLayout->addWidget(m_pProgressBar, 0, 0, 1, 1);
+    }
+
     m_pCancelButton = new QIToolButton;
     if (m_pCancelButton)
@@ -215 +226 @@
         if (!m_comProgress.isNull() && !m_comProgress.GetCancelable())
             m_pCancelButton->setEnabled(false);
-        m_pMainLayout->addWidget(m_pCancelButton, 0, 0, 1, 1);
-    }
-
-    m_pProgressBar = new QProgressBar;
-    if (m_pProgressBar)
-    {
-        m_pProgressBar->setMinimum(0);
-        m_pProgressBar->setMaximum(100);
-        /* Hide the QProgressBar's text since in MacOS it never shows: */
-        m_pProgressBar->setTextVisible(false);
-        m_pMainLayout->addWidget(m_pProgressBar, 0, 1, 1, 2);
-    }
+        m_pMainLayout->addWidget(m_pCancelButton, 0, 1, 1, 1);
+    }
+
     m_pStatusLabel = new QILabel;
     if (m_pStatusLabel)
     {
         m_pStatusLabel->setContextMenuPolicy(Qt::NoContextMenu);
-        m_pMainLayout->addWidget(m_pStatusLabel, 0, 3, 1, 1);
+        m_pMainLayout->addWidget(m_pStatusLabel, 0, 2, 1, 1);
     }
 
@@ -238 +240 @@
     {
         m_pPercentageLabel->setContextMenuPolicy(Qt::NoContextMenu);
-        m_pMainLayout->addWidget(m_pPercentageLabel, 1, 1, 1, 4);
+        m_pMainLayout->addWidget(m_pPercentageLabel, 1, 0, 1, 4);
     }
 
@@ -362 +364 @@
         return;
 
+    QScrollBar *pVerticalScrollBar = m_pScrollArea->verticalScrollBar();
+    if (pVerticalScrollBar)
+        QObject::connect(pVerticalScrollBar, &QScrollBar::rangeChanged, this, &UIGuestControlFileManagerOperationsPanel::sltScrollToBottom);
+
     m_pScrollArea->setBackgroundRole(QPalette::Window);
     m_pScrollArea->setWidgetResizable(true);
@@ -455 +461 @@
 }
 
+void UIGuestControlFileManagerOperationsPanel::sltScrollToBottom(int iMin, int iMax)
+{
+    Q_UNUSED(iMin);
+    if (m_pScrollArea)
+    m_pScrollArea->verticalScrollBar()->setValue(iMax);
+}
+
 #include "UIGuestControlFileManagerOperationsPanel.moc"

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

@@ -74 +74 @@
     void sltHandleWidgetFocusIn(QWidget *pWidget);
     void sltHandleWidgetFocusOut(QWidget *pWidget);
+    void sltScrollToBottom(int iMin, int iMax);
 
 private: