Changeset 72227 in vbox for trunk

Timestamp:

May 17, 2018 8:11:13 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:6769: Replacing the path line edit with a label UIVMNamePathSelector

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/widgets/UIVMNamePathSelector.cpp (modified) (7 diffs)
• src/widgets/UIVMNamePathSelector.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -1178 +1178 @@
         src/widgets/UIPortForwardingTable.cpp \
         src/widgets/UIProgressDialog.cpp \
-        src/widgets/UIStatusBarEditorWindow.cpp
+        src/widgets/UIStatusBarEditorWindow.cpp \
+        src/widgets/UIVMNamePathSelector.cpp
 
  ifdef VBOX_GUI_WITH_NETWORK_MANAGER

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIVMNamePathSelector.cpp

@@ -21 +21 @@
 
 /* Qt includes: */
+# include <QFontMetrics>
 # include <QDir>
 # include <QHBoxLayout>
@@ -40 +41 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+const float UIVMNamePathSelector::s_fPathLabelWidthWeight = 0.65;
+
+class UIPathLabel : public QLabel
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIPathLabel(QWidget *parent = 0);
+
+    int maxWidth() const;
+    void setMaxWidth(int width);
+    void setText(const QString &text);
+
+private:
+
+    /** Compact the text this is not wider than maxWidth */
+    void compactText();
+
+    int m_maxWidth;
+    QString m_strOriginalText;
+};
+
+UIPathLabel::UIPathLabel(QWidget *parent /* = 0*/)
+    :QLabel(parent)
+    , m_maxWidth(0)
+{
+}
+
+void UIPathLabel::compactText()
+{
+    QFontMetrics fontMetrics = this->fontMetrics();
+    QString strCompactedText = fontMetrics.elidedText(m_strOriginalText, Qt::ElideMiddle, m_maxWidth);
+    QLabel::setText(strCompactedText);
+}
+
+int UIPathLabel::maxWidth() const
+{
+    return m_maxWidth;
+}
+
+void UIPathLabel::setMaxWidth(int width)
+{
+    if (m_maxWidth == width)
+        return;
+    m_maxWidth = width;
+    compactText();
+}
+
+void UIPathLabel::setText(const QString &text)
+{
+    if (m_strOriginalText == text)
+        return;
+
+    m_strOriginalText = text;
+    compactText();
+}
+
+
 UIVMNamePathSelector::UIVMNamePathSelector(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
@@ -45 +106 @@
     , m_pPath(0)
     , m_pName(0)
-    , m_pSeparator(0)
     ,m_pFileDialogButton(0)
 {
@@ -85 +145 @@
     }
 
-    m_pPath = new QILineEdit;
+    m_pPath = new UIPathLabel;
     if (m_pPath)
     {
         m_pMainLayout->addWidget(m_pPath);
-        m_pPath->setReadOnly(true);
         setPath(defaultMachineFolder());
-    }
-    m_pSeparator = new QILabel;
-    if (m_pSeparator)
-    {
-        m_pSeparator->setText(QDir::separator());
-        m_pMainLayout->addWidget(m_pSeparator);
+        m_pPath->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     }
 
@@ -121 +175 @@
         return;
     m_strNonNativePath = path;
+
     if (m_pPath)
     {
         QString nativePath(QDir::toNativeSeparators(path));
+        /** make sure we have a trailing seperator */
+        if (!nativePath.isEmpty() && !nativePath.endsWith(QDir::toNativeSeparators("/")))
+            nativePath += QDir::toNativeSeparators("/");
         m_pPath->setText(nativePath);
-        m_pPath->setFixedWidthByText(nativePath);
     }
     emit sigPathChanged(m_strNonNativePath);
@@ -155 +212 @@
 }
 
+void UIVMNamePathSelector::resizeEvent(QResizeEvent *pEvent)
+{
+    QWidget::resizeEvent(pEvent);
+
+    if (m_pPath)
+        m_pPath->setMaxWidth(s_fPathLabelWidthWeight * width());
+}
+
 void UIVMNamePathSelector::sltOpenPathSelector()
 {
@@ -184 +249 @@
     return m_strToolTipText;
 }
+
+#include "UIVMNamePathSelector.moc"

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIVMNamePathSelector.h

@@ -27 +27 @@
 /* Forward declarations: */
 class QHBoxLayout;
-class QILabel;
 class QILineEdit;
 class QIToolButton;
+class UIPathLabel;
 
 class SHARED_LIBRARY_STUFF UIVMNamePathSelector : public QIWithRetranslateUI<QWidget>
@@ -59 +59 @@
 
     void retranslateUi() /* override */;
+    virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
 
 private slots:
@@ -70 +71 @@
 
     QHBoxLayout  *m_pMainLayout;
-    QILineEdit   *m_pPath;
+    UIPathLabel  *m_pPath;
     QILineEdit   *m_pName;
-    QILabel      *m_pSeparator;
     QIToolButton *m_pFileDialogButton;
     /** Tooltip set is set by clients of this widget. */
@@ -78 +78 @@
     /** Path string whose separators are not converted to native ones. */
     QString       m_strNonNativePath;
+    /** This widget's width is multiplied with this weight to compute max.
+     * width the path label can have */
+    static const float s_fPathLabelWidthWeight;
 };