Changeset 78024 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 5, 2019 10:19:23 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Improvements on the bread crumbs widget.

Location:

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

Files:

• UIFileManagerTable.cpp (modified) (17 diffs)
• UIFileManagerTable.h (modified) (1 diff)

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

@@ -83 +83 @@
 
     UIFileManagerBreadCrumbs(QWidget *pParent = 0);
-    void setPath(const QString &strPath, bool fUnderlineLast = false);
+    void setPath(const QString &strPath);
 };
 
@@ -90 +90 @@
 *   UIFileManagerNavigationWidget definition.                                                                                    *
 *********************************************************************************************************************************/
-
+/** UIFileManagerNavigationWidget contains a UIFileManagerBreadCrumbs, QComboBox for history and a QToolButton.
+  * basically it is a container for these mentioned widgets. */
 class UIFileManagerNavigationWidget : public QWidget
 {
@@ -105 +106 @@
     void reset();
 
+protected:
+
+    virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
+
 private slots:
 
@@ -115 +120 @@
     void prepare();
 
-    QStackedWidget *m_pContainer;
-    UIFileManagerBreadCrumbs *m_pBreadCrumbs;
+    QStackedWidget               *m_pContainer;
+    UIFileManagerBreadCrumbs     *m_pBreadCrumbs;
     UIFileManagerHistoryComboBox *m_pHistoryComboBox;
-    QToolButton    *m_pSwitchButton;
+    QToolButton                  *m_pSwitchButton;
+    QString                       m_strPath;
 };
 
@@ -238 +244 @@
     :QWidget(pParent)
     , m_pContainer(0)
+    , m_pBreadCrumbs(0)
+    , m_pHistoryComboBox(0)
     , m_pSwitchButton(0)
 {
@@ -245 +253 @@
 void UIFileManagerNavigationWidget::setPath(const QString &strLocation)
 {
+    m_strPath = strLocation;
+
     if (m_pBreadCrumbs)
         m_pBreadCrumbs->setPath(strLocation);
@@ -265 +275 @@
     if (m_pHistoryComboBox)
     {
-        /** @todo disconnect here. */
+        disconnect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
+                   this, &UIFileManagerNavigationWidget::sigPathChanged);
         m_pHistoryComboBox->clear();
-    }
+        connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
+                this, &UIFileManagerNavigationWidget::sigPathChanged);
+    }
+
+    if (m_pBreadCrumbs)
+        m_pBreadCrumbs->setPath(QString());
+}
+
+void UIFileManagerNavigationWidget::resizeEvent(QResizeEvent *pEvent)
+{
+    if (m_pBreadCrumbs)
+        m_pBreadCrumbs->setPath(m_strPath);
+
+    QWidget::resizeEvent(pEvent);
 }
 
@@ -279 +303 @@
 
     m_pContainer = new QStackedWidget;
-
     if (m_pContainer)
     {
@@ -285 +308 @@
         m_pHistoryComboBox = new UIFileManagerHistoryComboBox;
 
-        connect(m_pBreadCrumbs, &UIFileManagerBreadCrumbs::linkActivated,
-                this, &UIFileManagerNavigationWidget::sigPathChanged);
-
-        connect(m_pHistoryComboBox, &UIFileManagerHistoryComboBox::sigHidePopup,
-                this, &UIFileManagerNavigationWidget::sltHandleHidePopup);
-
-        connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
-                this, &UIFileManagerNavigationWidget::sigPathChanged);
-
-        m_pContainer->addWidget(m_pBreadCrumbs);
-        m_pContainer->addWidget(m_pHistoryComboBox);
-        m_pContainer->setCurrentIndex(0);
-
+        if (m_pBreadCrumbs && m_pHistoryComboBox)
+        {
+            m_pBreadCrumbs->setIndent(0.5 * qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin));
+
+            connect(m_pBreadCrumbs, &UIFileManagerBreadCrumbs::linkActivated,
+                    this, &UIFileManagerNavigationWidget::sigPathChanged);
+            connect(m_pHistoryComboBox, &UIFileManagerHistoryComboBox::sigHidePopup,
+                    this, &UIFileManagerNavigationWidget::sltHandleHidePopup);
+            connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
+                    this, &UIFileManagerNavigationWidget::sigPathChanged);
+
+            m_pContainer->addWidget(m_pBreadCrumbs);
+            m_pContainer->addWidget(m_pHistoryComboBox);
+            m_pContainer->setCurrentIndex(0);
+        }
         pLayout->addWidget(m_pContainer);
     }
 
     m_pSwitchButton = new QToolButton;
-
     if (m_pSwitchButton)
     {
@@ -318 +342 @@
                 this, &UIFileManagerNavigationWidget::sltHandleSwitch);
     }
-
     setLayout(pLayout);
 }
@@ -357 +380 @@
     setFont(mFont);
 
-}
-
-void UIFileManagerBreadCrumbs::setPath(const QString &strPath, bool fUnderlineLast /* = false */)
+    setFrameShape(QFrame::Box);
+    setLineWidth(1);
+    //setFixedHeight(10);
+    setAutoFillBackground(true);
+    QPalette newPalette = palette();
+    newPalette.setColor(QPalette::Background, qApp->palette().color(QPalette::Light));
+
+    setPalette(newPalette);
+}
+
+void UIFileManagerBreadCrumbs::setPath(const QString &strPath)
 {
     const QChar separator('/');
@@ -365 +396 @@
     QStringList folderList = UIPathOperations::pathTrail(strPath);
     folderList.push_front(separator);
+
     QString strLabelText;
-    QString strPathUpto;
+    QVector<QString> strPathUpto;
+    strPathUpto.resize(folderList.size());
+
     for (int i = 0; i < folderList.size(); ++i)
     {
         QString strFolder = UIPathOperations::removeTrailingDelimiters(folderList.at(i));
+        if (i != 0)
+            strPathUpto[i] = strPathUpto[i - 1];
         if (i == 0 || i == folderList.size() - 1)
-            strPathUpto.append(QString("%1").arg(strFolder));
+            strPathUpto[i].append(QString("%1").arg(strFolder));
         else
-            strPathUpto.append(QString("%1%2").arg(strFolder).arg(separator));
-        if (fUnderlineLast && i == folderList.size() - 1)
-            strLabelText.append(QString("<a href=\"%1\" style=\"color:black;text-decoration:underline;\">%2</a>").arg(strPathUpto).arg(strFolder));
-        else
-            strLabelText.append(QString("<a href=\"%1\" style=\"color:black;text-decoration:none;\">%2</a>").arg(strPathUpto).arg(strFolder));
+            strPathUpto[i].append(QString("%1%2").arg(strFolder).arg(separator));
+    }
+
+    int iWidth = 0;
+    for (int i = folderList.size() - 1; i >= 0; --i)
+    {
+        QString strFolder = UIPathOperations::removeTrailingDelimiters(folderList.at(i));
+        QString strWord = QString("<a href=\"%1\" style=\"color:black;text-decoration:none;\">%2</a>").arg(strPathUpto[i]).arg(strFolder);
+
         if (i < folderList.size() - 1)
-            strLabelText.append("<b> > </b>");
+        {
+            iWidth += fontMetrics().width(" > ");
+            strWord.append("<b> > </b>");
+        }
+        iWidth += fontMetrics().width(strFolder);
+
+        if (iWidth < width())
+            strLabelText.prepend(strWord);
+
     }
     setText(strLabelText);
-
 }
 
@@ -612 +659 @@
 *********************************************************************************************************************************/
 const unsigned UIFileManagerTable::m_iKiloByte = 1024; /**< Our kilo bytes are a power of two! (bird) */
+
 UIFileManagerTable::UIFileManagerTable(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
     :QIWithRetranslateUI<QWidget>(pParent)
@@ -659 +707 @@
     if (m_pToolBar)
     {
-        m_pMainLayout->addWidget(m_pToolBar, 0, 0, 1, 5);
+        m_pMainLayout->addWidget(m_pToolBar, 0, 0, 1, 7);
     }
 
     m_pLocationLabel = new QILabel;
     if (m_pLocationLabel)
-    {
         m_pMainLayout->addWidget(m_pLocationLabel, 1, 0, 1, 1);
-    }
 
     m_pNavigationWidget = new UIFileManagerNavigationWidget;
     if (m_pNavigationWidget)
     {
-        m_pNavigationWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+        m_pNavigationWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
         connect(m_pNavigationWidget, &UIFileManagerNavigationWidget::sigPathChanged,
                 this, &UIFileManagerTable::sltHandleNavigationWidgetPathChange);
-        m_pMainLayout->addWidget(m_pNavigationWidget, 1, 1, 1, 4);
+        m_pMainLayout->addWidget(m_pNavigationWidget, 1, 1, 1, 6);
     }
 
@@ -691 +737 @@
     if (m_pView)
     {
-        m_pMainLayout->addWidget(m_pView, 2, 0, 5, 5);
+        m_pMainLayout->addWidget(m_pView, 2, 0, 5, 7);
 
         QHeaderView *pHorizontalHeader = m_pView->horizontalHeader();
@@ -719 +765 @@
     if (m_pWarningLabel)
     {
-        m_pMainLayout->addWidget(m_pWarningLabel, 2, 0, 5, 5);
+        m_pMainLayout->addWidget(m_pWarningLabel, 2, 0, 5, 7);
         QFont labelFont = m_pWarningLabel->font();
         float fSizeMultiplier = 1.5f;
@@ -737 +783 @@
     if (m_pSearchLineEdit)
     {
-        m_pMainLayout->addWidget(m_pSearchLineEdit, 8, 0, 1, 5);
+        m_pMainLayout->addWidget(m_pSearchLineEdit, 8, 0, 1, 7);
         m_pSearchLineEdit->hide();
         m_pSearchLineEdit->setClearButtonEnabled(true);

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

@@ -239 +239 @@
     UIActionPool            *m_pActionPool;
     UIToolBar               *m_pToolBar;
-
     /** Stores the drive letters the file system has (for windows system). For non-windows
      *  systems this is empty and for windows system it should at least contain C:/ */