Changeset 77255 in vbox

Timestamp:

Feb 11, 2019 11:11:06 AM (6 years ago)

Author:

vboxsync

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

128762

Message:

FE/Qt: bugref:9340. Adding a 'stub' create medium action to virtual medium manager

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (3 diffs)
• globals/UIActionPoolManager.h (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (6 diffs)
• medium/UIMediumManager.h (modified) (1 diff)
• medium/UIMediumSelector.cpp (modified) (1 diff)

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

@@ -1822 +1822 @@
         setStatusTip(QApplication::translate("UIActionPool", "Add a disk image file"));
         setToolTip(QApplication::translate("UIActionPool", "Add a Disk Image File (%1)").arg(shortcut().toString()));
+    }
+};
+
+/** Simple action extension, used as 'Perform Create' action class. */
+class UIActionMenuSelectorMediumPerformCreate : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorMediumPerformCreate(UIActionPool *pParent)
+        : UIActionSimple(pParent)
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+        setIcon(0, UIIconPool::iconSetFull(":/hd_create_32px.png",          ":/hd_create_16px.png",
+                                           ":/hd_create_disabled_32px.png", ":/hd_create_disabled_16px.png"));
+        setIcon(1, UIIconPool::iconSetFull(":/cd_create_32px.png",          ":/cd_create_16px.png",
+                                           ":/cd_create_disabled_32px.png", ":/cd_create_disabled_16px.png"));
+        setIcon(2, UIIconPool::iconSetFull(":/fd_create_32px.png",          ":/fd_create_16px.png",
+                                           ":/fd_create_disabled_32px.png", ":/fd_create_disabled_16px.png"));
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("CreateMedium");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence("");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "&Create..."));
+        setShortcutScope(QApplication::translate("UIActionPool", "Media Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Create a new disk image"));
+        setToolTip(QApplication::translate("UIActionPool", "Create a New Disk Image (%1)").arg(shortcut().toString()));
     }
 };
@@ -2658 +2702 @@
     m_pool[UIActionIndexST_M_Medium] = new UIActionMenuSelectorMedium(this);
     m_pool[UIActionIndexST_M_Medium_S_Add] = new UIActionMenuSelectorMediumPerformAdd(this);
+    m_pool[UIActionIndexST_M_Medium_S_Create] = new UIActionMenuSelectorMediumPerformCreate(this);
     m_pool[UIActionIndexST_M_Medium_S_Copy] = new UIActionMenuSelectorMediumPerformCopy(this);
     m_pool[UIActionIndexST_M_Medium_S_Move] = new UIActionMenuSelectorMediumPerformMove(this);
@@ -3114 +3159 @@
     /* 'Add' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Add)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Create)) || fSeparator;
 
     /* Separator? */

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

@@ -133 +133 @@
     UIActionIndexST_M_Medium,
     UIActionIndexST_M_Medium_S_Add,
+    UIActionIndexST_M_Medium_S_Create,
     UIActionIndexST_M_Medium_S_Copy,
     UIActionIndexST_M_Medium_S_Move,

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

@@ -492 +492 @@
 }
 
+void UIMediumManagerWidget::sltCreateMedium()
+{
+}
+
 void UIMediumManagerWidget::sltCopyMedium()
 {
@@ -637 +641 @@
     {
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add));
+        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Create));
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Search));
         menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Refresh));
@@ -731 +736 @@
     /* First of all, add actions which has smaller shortcut scope: */
     addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add));
+    addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Create));
     addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy));
     addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Move));
@@ -742 +748 @@
     connect(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add), &QAction::triggered,
             this, &UIMediumManagerWidget::sltAddMedium);
+    connect(m_pActionPool->action(UIActionIndexST_M_Medium_S_Create), &QAction::triggered,
+            this, &UIMediumManagerWidget::sltCreateMedium);
     connect(m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy), &QAction::triggered,
             this, &UIMediumManagerWidget::sltCopyMedium);
@@ -800 +808 @@
         /* Add toolbar actions: */
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Create));
         m_pToolBar->addSeparator();
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy));
@@ -1071 +1080 @@
     {
         m_pActionPool->action(UIActionIndexST_M_Medium_S_Add)->setState((int)enmCurrentMediumType);
+        m_pActionPool->action(UIActionIndexST_M_Medium_S_Create)->setState((int)enmCurrentMediumType);
         m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy)->setState((int)enmCurrentMediumType);
         m_pActionPool->action(UIActionIndexST_M_Medium_S_Move)->setState((int)enmCurrentMediumType);

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -168 +168 @@
         /** Handles command to add medium. */
         void sltAddMedium();
+        /** Handles command to create medium. */
+        void sltCreateMedium();
         /** Handles command to copy medium. */
         void sltCopyMedium();

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

@@ -446 +446 @@
     QUuid uMediumId;
 
-    if (m_enmMediumType == UIMediumDeviceType_Floppy)
-        uMediumId = vboxGlobal().showCreateFloppyDiskDialog(this, m_strMachineName, m_strMachineFolder);
-    else if (m_enmMediumType == UIMediumDeviceType_HardDisk)
-        uMediumId = vboxGlobal().createHDWithNewHDWizard(this, m_strMachineGuestOSTypeId, m_strMachineName, m_strMachineFolder);
-    else if (m_enmMediumType == UIMediumDeviceType_DVD)
-        uMediumId = vboxGlobal().createVisoMediumWithVisoCreator(this, m_strMachineName, m_strMachineFolder);
-
+    switch (m_enmMediumType)
+    {
+        case UIMediumDeviceType_Floppy:
+            uMediumId = vboxGlobal().showCreateFloppyDiskDialog(this, m_strMachineName, m_strMachineFolder);
+            break;
+        case UIMediumDeviceType_HardDisk:
+            uMediumId = vboxGlobal().createHDWithNewHDWizard(this, m_strMachineGuestOSTypeId, m_strMachineName, m_strMachineFolder);
+            break;
+        case UIMediumDeviceType_DVD:
+            uMediumId = vboxGlobal().createVisoMediumWithVisoCreator(this, m_strMachineName, m_strMachineFolder);
+            break;
+        default:
+            break;
+    }
     if (!uMediumId.isNull())
     {