Changeset 72903 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 4, 2018 7:59:39 PM (7 years ago)

Author:

vboxsync

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

123450

Message:

FE/Qt: bugref:9083 Adding an action to machine ui status bar menu for 'create new floppy disk'

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (5 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIFDCreationDialog.cpp (modified) (4 diffs)
• medium/UIFDCreationDialog.h (modified) (2 diffs)
• medium/UIMediumDefs.h (modified) (1 diff)
• medium/UIMediumSelector.cpp (modified) (1 diff)

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

@@ -59 +59 @@
 # include "QIMessageBox.h"
 # include "QIDialogButtonBox.h"
+# include "UIFDCreationDialog.h"
 # include "UIIconPool.h"
 # include "UIThreadPool.h"
@@ -2719 +2720 @@
 }
 
+QString VBoxGlobal::showCreateFloppyDiskDialog(QWidget *pParent, const QString &strMachineName, const QString &strMachineFolder)
+{
+    QString strMediumID;
+    UIFDCreationDialog *pDialog = new UIFDCreationDialog(pParent, strMachineName, strMachineFolder);
+    if (pDialog->exec())
+    {
+        strMediumID = pDialog->mediumID();
+    }
+    delete pDialog;
+    return strMediumID;
+}
+
 void VBoxGlobal::prepareStorageMenu(QMenu &menu,
                                     QObject *pListener, const char *pszSlotName,
@@ -2746 +2759 @@
                                                                "This is used for hard disks, optical media and floppies"));
 
+    /* Prepare create floppy disk action: */
+    if (enmMediumType == UIMediumType_Floppy)
+    {
+        QAction *pActionCreateFloppy = menu.addAction(UIIconPool::iconSet(":/fd_add_16px.png"),
+                                                      QString(), pListener, pszSlotName);
+        pActionCreateFloppy->setData(QVariant::fromValue(UIMediumTarget(strControllerName, comCurrentAttachment.GetPort(),
+                                                                        comCurrentAttachment.GetDevice(), enmMediumType,
+                                                                        UIMediumTarget::UIMediumTargetType_CreateFloppyDisk)));
+        pActionCreateFloppy->setText(QApplication::translate("UIMachineSettingsStorage", "Create a new floppy disk...",
+                                                             "This is used to create a new floppy disk"));
+    }
     /* Prepare ad-hoc-viso action for DVD-ROMs: */
     if (enmMediumType == UIMediumType_DVD)
@@ -2897 +2921 @@
         case UIMediumTarget::UIMediumTargetType_WithID:
         case UIMediumTarget::UIMediumTargetType_CreateAdHocVISO:
+        case UIMediumTarget::UIMediumTargetType_CreateFloppyDisk:
         {
             /* New mount-target attributes: */
@@ -2915 +2940 @@
                 /* Call for file-open dialog: */
                 const QString strMachineFolder(QFileInfo(comConstMachine.GetSettingsFilePath()).absolutePath());
-                const QString strMediumID = target.type != UIMediumTarget::UIMediumTargetType_CreateAdHocVISO
-                                          ? openMediumWithFileOpenDialog(target.mediumType,
-                                                                         windowManager().mainWindowShown(),
-                                                                         strMachineFolder)
-                                          : createVisoMediumWithFileOpenDialog(windowManager().mainWindowShown(),
-                                                                               strMachineFolder);
+                QString strMediumID;
+                if (target.type == UIMediumTarget::UIMediumTargetType_WithID)
+                    strMediumID = openMediumWithFileOpenDialog(target.mediumType, windowManager().mainWindowShown(), strMachineFolder);
+                else if(target.type == UIMediumTarget::UIMediumTargetType_CreateAdHocVISO)
+                    strMediumID = createVisoMediumWithFileOpenDialog(windowManager().mainWindowShown(), strMachineFolder);
+                else if(target.type == UIMediumTarget::UIMediumTargetType_CreateFloppyDisk)
+                    strMediumID = showCreateFloppyDiskDialog(windowManager().mainWindowShown(), comConstMachine.GetName(), strMachineFolder);
+
                 /* Return focus back: */
                 if (pLastFocusedWidget)

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

@@ -508 +508 @@
         QString createVisoMediumWithFileOpenDialog(QWidget *pParent, const QString &strFolder);
 
+        /** Creates and shows a dialog thru which user can create a new floppy disk a VISO using the file-open dialog.
+          * @param  parent            Passes the parent of the dialog,
+          * @param  strMachineName    Passes the name of the machine,
+          * @param  strMachineFolder  Passes the machine folder,
+          * returns the ID of the newly created medium if successful, an empty string otherwise.*/
+        QString showCreateFloppyDiskDialog(QWidget *pParent, const QString &strMachineName, const QString &strMachineFolder);
+
         /** Prepares storage menu according passed parameters.
           * @param  menu               Brings the #QMenu to be prepared.

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

@@ -43 +43 @@
 UIFDCreationDialog::UIFDCreationDialog(QWidget *pParent /* = 0 */,
                                        const QString &strMachineName /* = QString() */,
-                                       const QString &strMachineSettingsFilePath /* = QString() */)
+                                       const QString &strMachineFolder /* = QString() */)
    : QIWithRetranslateUI<QDialog>(pParent)
     , m_pFilePathselector(0)
     , m_strMachineName(strMachineName)
-    , m_strMachineSettingsFilePath(strMachineSettingsFilePath)
+    , m_strMachineFolder(strMachineFolder)
     , m_pPathLabel(0)
     , m_pSizeLabel(0)
@@ -150 +150 @@
     QString strPreferredExtension = UIMediumDefs::getPreferredExtensionForMedium(KDeviceType_Floppy);
 
-    QString strInitialPath = QFileInfo(m_strMachineSettingsFilePath).absolutePath();
+    QString strInitialPath = m_strMachineFolder;
     if (strInitialPath.isEmpty())
         strInitialPath = vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
@@ -195 +195 @@
         return;
     }
+    /* Store the id of the newly create medium: */
+    m_strMediumID = newMedium.GetId();
 
     /* After a successful creation and initilization of the floppy disk we call base class accept
@@ -200 +202 @@
     QDialog::accept();
 }
+
+QString UIFDCreationDialog::mediumID() const
+{
+    return m_strMediumID;
+}

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

@@ -43 +43 @@
     UIFDCreationDialog(QWidget *pParent = 0,
                        const QString &strMachineName = QString(),
-                       const QString &strMachineSettingsFilePath = QString());
+                       const QString &strMachineFolder = QString());
 
     virtual void accept() /* override */;
+    /* Return the mediumID */
+    QString mediumID() const;
 
 protected:
@@ -67 +69 @@
     UIFilePathSelector *m_pFilePathselector;
     QString             m_strMachineName;
-    QString             m_strMachineSettingsFilePath;
+    QString             m_strMachineFolder;
     QLabel             *m_pPathLabel;
     QLabel             *m_pSizeLabel;
     QComboBox          *m_pSizeCombo;
     QDialogButtonBox   *m_pButtonBox;
+    QString             m_strMediumID;
 };
 

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

@@ -85 +85 @@
 {
     /** Medium-target types. */
-    enum UIMediumTargetType { UIMediumTargetType_WithID, UIMediumTargetType_WithLocation, UIMediumTargetType_CreateAdHocVISO };
+    enum UIMediumTargetType
+    {
+        UIMediumTargetType_WithID,
+        UIMediumTargetType_WithLocation,
+        UIMediumTargetType_CreateAdHocVISO,
+        UIMediumTargetType_CreateFloppyDisk
+    };
 
     /** Medium-target constructor. */

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

@@ -480 +480 @@
 void UIMediumSelector::sltCreateMedium()
 {
-
-    UIFDCreationDialog *pDialog = new UIFDCreationDialog(this, m_strMachineName, m_strMachineSettingsFilePath);
+    QString strMachineFolder = QFileInfo(m_strMachineSettingsFilePath).absolutePath();
+    UIFDCreationDialog *pDialog = new UIFDCreationDialog(this, m_strMachineName, strMachineFolder);
     if (pDialog->exec())
     {