Changeset 91669 in vbox for trunk

Timestamp:

Oct 11, 2021 6:11:33 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147396

Message:

FE/Qt: UIFilePathSelector: Bugfixes for r147128 and few commits before; Recent list separator position should be dynamical since presence of ResetId item is dynamical as well; We should compare old and new paths with native-separators taken into account; When changing to recent list item, we should switch to Path item back early otherwise lineEdit will contain stale data.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIFilePathSelector.cpp (modified) (7 diffs)
• UIFilePathSelector.h (modified) (3 diffs)

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

@@ -60 +60 @@
     , m_enmMode(Mode_Folder)
     , m_strInitialPath(QDir::current().absolutePath())
+    , m_fResetEnabled(true)
     , m_fEditable(true)
     , m_fModified(false)
@@ -66 +67 @@
     , m_fToolTipOverriden(false)
     , m_pCopyAction(new QAction(this))
+    , m_iRecentListSeparatorPosition(ResetId + 1)
     , m_enmRecentMediaListType(UIMediumDeviceType_Invalid)
 {
@@ -154 +156 @@
 void UIFilePathSelector::setResetEnabled(bool fEnabled)
 {
+    /* Cache requested state: */
+    m_fResetEnabled = fEnabled;
+
+    /* Update recent list separator position: */
+    m_iRecentListSeparatorPosition = fEnabled ? ResetId + 1 : ResetId;
+
     if (!fEnabled && count() - 1 == ResetId)
         removeItem(ResetId);
@@ -344 +352 @@
 void UIFilePathSelector::onActivated(int iIndex)
 {
-    switch (iIndex)
-    {
-        case SelectId:
-        {
-            selectPath();
-            break;
-        }
-        case ResetId:
-        {
-            if (m_strDefaultPath.isEmpty())
-                changePath(QString());
-            else
-                changePath(m_strDefaultPath);
-            break;
-        }
-        default:
-        {
-            if (iIndex >= RecentListSeparator)
-            {
-                changePath(itemText(iIndex));
-                update();
-            }
-            break;
-        }
-    }
+    /* Since the presence of ResetId and position of recent list separator
+     * are dynamical now, we should control condition more carefully: */
+    if (iIndex == SelectId)
+        selectPath();
+    else if (m_fResetEnabled && iIndex == ResetId)
+    {
+        if (m_strDefaultPath.isEmpty())
+            changePath(QString());
+        else
+            changePath(m_strDefaultPath);
+    }
+    else if (iIndex >= m_iRecentListSeparatorPosition)
+    {
+        /* Switch back to Path item early, lineEdit() in refreshText()
+         * should be related to this exactly item: */
+        setCurrentIndex(PathId);
+        changePath(itemText(iIndex));
+    }
+
     setCurrentIndex(PathId);
     setFocus();
@@ -390 +392 @@
                                     bool fRefreshText /* = true */)
 {
-    const QString strOldPath = m_strPath;
+    const QString strOldPath = QDir::toNativeSeparators(m_strPath);
     setPath(strPath, fRefreshText);
     if (!m_fModified && m_strPath != strOldPath)
@@ -613 +615 @@
 {
     /* Remove the recent media list from the end of the combo: */
-    while (count() >= static_cast<int>(RecentListSeparator))
-    {
+    while (count() >= m_iRecentListSeparatorPosition)
         removeItem(count() - 1);
-    }
 
 
@@ -641 +641 @@
         return;
 
-    insertSeparator(RecentListSeparator);
+    insertSeparator(m_iRecentListSeparatorPosition);
     foreach (const QString strPath, recentMedia)
         addItem(strPath);

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

@@ -66 +66 @@
         PathId = 0,
         SelectId,
-        ResetId,
-        RecentListSeparator
+        ResetId
     };
 
@@ -205 +204 @@
     QString  m_strNoneToolTipFocused;
 
+    /** Holds whether editor has Reset action. */
+    bool     m_fResetEnabled;
+
     /** Holds whether the path is editable. */
     bool     m_fEditable;
@@ -224 +226 @@
     QString m_strDefaultPath;
 
+    /** Holds the recent list separator position. */
+    int                 m_iRecentListSeparatorPosition;
     /** Holds whether medium type for recent media list. If it is UIMediumDeviceType_Invalid the recent list is not shown. */
     UIMediumDeviceType  m_enmRecentMediaListType;