Changeset 92427 in vbox

Timestamp:

Nov 15, 2021 2:12:20 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10141. Using action pool actions in medium selector.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

@@ -29 +29 @@
 #include "QITabWidget.h"
 #include "QIToolButton.h"
+#include "UIActionPool.h"
 #include "UICommon.h"
 #include "UIDesktopWidgetWatchdog.h"
@@ -169 +170 @@
 void UIMediumSelector::prepareActions()
 {
-    QString strPrefix("hd");
+    if (!m_pActionPool)
+        return;
+
     switch (m_enmMediumType)
     {
         case UIMediumDeviceType_DVD:
-            strPrefix = "cd";
+            m_pActionAdd = m_pActionPool->action(UIActionIndex_M_MediumSelector_AddCD);
+            m_pActionCreate = m_pActionPool->action(UIActionIndex_M_MediumSelector_CreateCD);
             break;
         case UIMediumDeviceType_Floppy:
-            strPrefix = "fd";
+            m_pActionAdd = m_pActionPool->action(UIActionIndex_M_MediumSelector_AddFD);
+            m_pActionCreate = m_pActionPool->action(UIActionIndex_M_MediumSelector_CreateFD);
             break;
         case UIMediumDeviceType_HardDisk:
@@ -182 +187 @@
         case UIMediumDeviceType_Invalid:
         default:
-            strPrefix = "hd";
-            break;
-    }
-
-    m_pActionAdd = new QAction(this);
-    if (m_pActionAdd)
-    {
-        /* Configure add-action: */
-        m_pActionAdd->setShortcut(QKeySequence(""));
-
-        m_pActionAdd->setIcon(UIIconPool::iconSetFull(QString(":/%1_add_32px.png").arg(strPrefix),
-                                                      QString(":/%1_add_16px.png").arg(strPrefix),
-                                                      QString(":/%1_add_disabled_32px.png").arg(strPrefix),
-                                                      QString(":/%1_add_disabled_16px.png").arg(strPrefix)));
-    }
-
-    m_pActionCreate = new QAction(this);
-    if (m_pActionCreate)
-    {
-        m_pActionCreate->setShortcut(QKeySequence(""));
-        m_pActionCreate->setIcon(UIIconPool::iconSetFull(QString(":/%1_create_32px.png").arg(strPrefix),
-                                                         QString(":/%1_create_16px.png").arg(strPrefix),
-                                                         QString(":/%1_create_disabled_32px.png").arg(strPrefix),
-                                                         QString(":/%1_create_disabled_16px.png").arg(strPrefix)));
-    }
-
-    m_pActionRefresh = new QAction(this);
-    if (m_pActionRefresh)
-    {
-        m_pActionRefresh->setShortcut(QKeySequence());
-        if (m_pActionRefresh && m_pActionRefresh->icon().isNull())
-            m_pActionRefresh->setIcon(UIIconPool::iconSetFull(":/refresh_32px.png", ":/refresh_16px.png",
-                                                              ":/refresh_disabled_32px.png", ":/refresh_disabled_16px.png"));
-    }
+            m_pActionAdd = m_pActionPool->action(UIActionIndex_M_MediumSelector_AddHD);
+            m_pActionCreate = m_pActionPool->action(UIActionIndex_M_MediumSelector_CreateHD);
+            break;
+    }
+
+    m_pActionRefresh = m_pActionPool->action(UIActionIndex_M_MediumSelector_Refresh);
 }