Changeset 91445 in vbox for trunk/src/VBox

Timestamp:

Sep 28, 2021 6:16:17 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: Updating the recent media list of the UIFilePathSelector.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (1 diff)
• globals/UICommon.h (modified) (1 diff)
• settings/editors/UINameAndSystemEditor.cpp (modified) (2 diffs)
• widgets/UIFilePathSelector.cpp (modified) (6 diffs)
• widgets/UIFilePathSelector.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -2342 +2342 @@
         default: break;
     }
+    emit sigRecentMediaListUpdated(enmMediumType);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -120 +120 @@
         /** Notifies listeners about medium-enumeration finished. */
         void sigMediumEnumerationFinished();
+        /** Notifies listeners about update of recently media list. */
+        void sigRecentMediaListUpdated(UIMediumDeviceType enmMediumType);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -25 +25 @@
 #include "QILineEdit.h"
 #include "UICommon.h"
-#include "UIExtraDataManager.h"
 #include "UIIconPool.h"
 #include "UIFilePathSelector.h"
@@ -514 +513 @@
                 m_pImageSelector->setFileDialogFilters("ISO Images(*.iso *.ISO)");
                 m_pImageSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
-                m_pImageSelector->setRecentPathList(gEDataManager->recentListOfOpticalDisks());
+                m_pImageSelector->setRecentMediaListType(UIMediumDeviceType_DVD);
 
                 m_pMainLayout->addWidget(m_pImageSelector, iRow, 1, 1, 2);

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

@@ -34 +34 @@
 #include "QIToolButton.h"
 #include "UICommon.h"
+#include "UIExtraDataManager.h"
 #include "UIIconPool.h"
 #include "UIFilePathSelector.h"
@@ -65 +66 @@
     , m_fToolTipOverriden(false)
     , m_pCopyAction(new QAction(this))
+    , m_enmRecentMediaListType(UIMediumDeviceType_Invalid)
 {
 #ifdef VBOX_WS_WIN
@@ -98 +100 @@
     connect(this, static_cast<void(UIFilePathSelector::*)(int)>(&UIFilePathSelector::activated), this, &UIFilePathSelector::onActivated);
     connect(m_pCopyAction, &QAction::triggered, this, &UIFilePathSelector::copyToClipboard);
+    connect(&uiCommon(), &UICommon::sigRecentMediaListUpdated, this, &UIFilePathSelector::sltRecentMediaListUpdated);
 
     /* Editable by default: */
@@ -194 +197 @@
 }
 
-void UIFilePathSelector::setRecentPathList(const QStringList &recentPathList)
-{
-    while (count() >= static_cast<int>(RecentListSeparator))
-    {
-        removeItem(count() - 1);
-    }
-    insertSeparator(RecentListSeparator);
-
-    foreach (const QString strPath, recentPathList)
-        addItem(strPath);
+void UIFilePathSelector::setRecentMediaListType(UIMediumDeviceType enmMediumType)
+{
+    m_enmRecentMediaListType = enmMediumType;
+    sltRecentMediaListUpdated(enmMediumType);
+}
+
+UIMediumDeviceType UIFilePathSelector::recentMediaListType() const
+{
+    return m_enmRecentMediaListType;
 }
 
@@ -547 +549 @@
          * and text have be corresponding real stored path
          * which can be absolute or relative. */
-        //if (lineEdit()->text() != m_strPath)
+        if (lineEdit()->text() != m_strPath)
             setItemText(PathId, m_strPath);
         setItemIcon(PathId, QIcon());
@@ -607 +609 @@
     }
 }
+
+void UIFilePathSelector::sltRecentMediaListUpdated(UIMediumDeviceType enmMediumType)
+{
+    /* Remove the recent media list from the end of the combo: */
+    while (count() >= static_cast<int>(RecentListSeparator))
+    {
+        removeItem(count() - 1);
+    }
+
+
+    if (enmMediumType != m_enmRecentMediaListType)
+        return;
+    QStringList recentMedia;
+
+    switch (enmMediumType)
+    {
+        case UIMediumDeviceType_DVD:
+            recentMedia = gEDataManager->recentListOfOpticalDisks();
+            break;
+        case UIMediumDeviceType_Floppy:
+            recentMedia = gEDataManager->recentListOfFloppyDisks();
+            break;
+        case UIMediumDeviceType_HardDisk:
+            recentMedia = gEDataManager->recentListOfHardDrives();
+            break;
+        default:
+            break;
+    }
+
+    if (recentMedia.isEmpty())
+        return;
+
+    insertSeparator(RecentListSeparator);
+    foreach (const QString strPath, recentMedia)
+        addItem(strPath);
+
+}

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

@@ -26 +26 @@
 #include "QIWithRetranslateUI.h"
 #include "UILibraryDefs.h"
+#include "UIMediumDefs.h"
 
 /* Forward declarations: */
@@ -122 +123 @@
     const QString& defaultPath() const;
 
-    void setRecentPathList(const QStringList &recentPathList);
+    void setRecentMediaListType(UIMediumDeviceType enmMediumType);
+    UIMediumDeviceType recentMediaListType() const;
 
 public slots:
@@ -161 +163 @@
     /** Refreshes combo-box text according to chosen path. */
     void refreshText();
+
+    void sltRecentMediaListUpdated(UIMediumDeviceType enmMediumType);
 
 private:
@@ -219 +223 @@
     /** Path is set to m_strDefaultPath when it is reset. */
     QString m_strDefaultPath;
+
+    /** Holds whether medium type for recent media list. If it is UIMediumDeviceType_Invalid the recent list is not shown. */
+    UIMediumDeviceType  m_enmRecentMediaListType;
 };