Changeset 72869 in vbox for trunk/src/VBox

Timestamp:

Jul 4, 2018 11:31:55 AM (7 years ago)

Author:

vboxsync

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

123414

Message:

FE/Qt: bugref:9083 Adding a create floppy dialog to the UIMediumSelector. fix take

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.h (modified) (1 diff)
• medium/UIFDCreationDialog.cpp (modified) (3 diffs)
• medium/UIFDCreationDialog.h (modified) (3 diffs)
• medium/UIMediumDefs.cpp (modified) (2 diffs)
• medium/UIMediumDefs.h (modified) (1 diff)
• medium/UIMediumSelector.cpp (modified) (1 diff)

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

@@ -539 +539 @@
 
 #endif /* !___UIMessageCenter_h___ */
-

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

@@ -21 +21 @@
 
 /* Qt includes */
-# include<QVBoxLayout>
-
-/* Other includes */
+# include<QDialogButtonBox>
+# include<QDir>
+# include<QGridLayout>
+# include<QLabel>
+# include<QPushButton>
+
+/* GUI includes */
 # include "UIFDCreationDialog.h"
 # include "UIFilePathSelector.h"
+# include "UIMessageCenter.h"
 # include "VBoxGlobal.h"
+
+/* COM includes: */
+# include "CSystemProperties.h"
+# include "CMedium.h"
+# include "CMediumFormat.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -38 +48 @@
     , m_strMachineName(strMachineName)
     , m_strMachineSettingsFilePath(strMachineSettingsFilePath)
+    , m_pPathLabel(0)
+    , m_pSizeLabel(0)
+    , m_pSizeCombo(0)
+    , m_pButtonBox(0)
 {
 
@@ -52 +66 @@
 void UIFDCreationDialog::retranslateUi()
 {
-
+    setWindowTitle(QApplication::translate("UIMediumManager", "Create a Floppy Disk"));
+    if (m_pPathLabel)
+        m_pPathLabel->setText(QApplication::translate("UIMediumManager", "File Path:"));
+    if (m_pSizeLabel)
+        m_pSizeLabel->setText(QApplication::translate("UIMediumManager", "Size:"));
+    if (m_pButtonBox)
+        m_pButtonBox->button(QDialogButtonBox::Ok)->setText("Create");
+    if (m_pSizeCombo)
+    {
+        m_pSizeCombo->setItemText(FDSize_2_88M, QApplication::translate("UIMediumManager", "2.88M"));
+        m_pSizeCombo->setItemText(FDSize_1_44M, QApplication::translate("UIMediumManager", "1.44M"));
+        m_pSizeCombo->setItemText(FDSize_1_2M, QApplication::translate("UIMediumManager", "1.2M"));
+        m_pSizeCombo->setItemText(FDSize_720K, QApplication::translate("UIMediumManager", "720K"));
+        m_pSizeCombo->setItemText(FDSize_360K, QApplication::translate("UIMediumManager", "360K"));
+    }
 }
 
 void UIFDCreationDialog::prepare()
 {
+
+#ifndef VBOX_WS_MAC
+    setWindowIcon(QIcon(":/vm_settings_16px.png"));
+#endif
+
     setWindowModality(Qt::WindowModal);
-
-    QVBoxLayout *pMainLayout = new QVBoxLayout;
+    setSizeGripEnabled(false);
+
+
+    QGridLayout *pMainLayout = new QGridLayout;
     if (!pMainLayout)
         return;
     setLayout(pMainLayout);
+
+    m_pPathLabel = new QLabel;
+    if (m_pPathLabel)
+    {
+        pMainLayout->addWidget(m_pPathLabel, 0, 0, 1, 1);
+        m_pPathLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    }
 
     m_pFilePathselector = new UIFilePathSelector;
     if (m_pFilePathselector)
     {
-        pMainLayout->addWidget(m_pFilePathselector);
+        pMainLayout->addWidget(m_pFilePathselector, 0, 1, 1, 2);
         m_pFilePathselector->setMode(UIFilePathSelector::Mode_File_Save);
-    }
-}
+        QString strFolder = getDefaultFolder();
+        m_pFilePathselector->setDefaultPath(strFolder);
+        m_pFilePathselector->setPath(strFolder);
+    }
+
+    m_pSizeLabel = new QLabel;
+    if (m_pSizeLabel)
+    {
+        pMainLayout->addWidget(m_pSizeLabel, 1, 0, 1, 1);
+        m_pSizeLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    }
+
+    m_pSizeCombo = new QComboBox;
+    if (m_pSizeCombo)
+    {
+        pMainLayout->addWidget(m_pSizeCombo, 1, 1, 1, 2);
+        m_pSizeCombo->insertItem(FDSize_2_88M, "2.88M", 2949120);
+        m_pSizeCombo->insertItem(FDSize_1_44M, "1.44M", 1474560);
+        m_pSizeCombo->insertItem(FDSize_1_2M, "1.2M", 1228800);
+        m_pSizeCombo->insertItem(FDSize_720K, "720K", 737280);
+        m_pSizeCombo->insertItem(FDSize_360K, "360K", 368640);
+        m_pSizeCombo->setCurrentIndex(FDSize_1_44M);
+
+    }
+
+    m_pButtonBox =
+        new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
+    if (m_pButtonBox)
+    {
+        pMainLayout->addWidget(m_pButtonBox, 2, 0, 1, 3);
+        connect(m_pButtonBox, &QDialogButtonBox::accepted, this, &UIFDCreationDialog::accept);
+        connect(m_pButtonBox, &QDialogButtonBox::rejected, this, &UIFDCreationDialog::reject);
+    }
+    retranslateUi();
+}
+
+QString UIFDCreationDialog::getDefaultFolder() const
+{
+    QString strPreferredExtension = UIMediumDefs::getPreferredExtensionForMedium(KDeviceType_Floppy);
+
+    QString strInitialPath = QFileInfo(m_strMachineSettingsFilePath).absolutePath();
+    if (strInitialPath.isEmpty())
+        strInitialPath = vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
+
+    if (strInitialPath.isEmpty())
+        return strInitialPath;
+
+    strInitialPath = QDir(strInitialPath).absoluteFilePath(m_strMachineName + "." + strPreferredExtension);
+    return strInitialPath;
+}
+
+void UIFDCreationDialog::accept()
+{
+    QVector<CMediumFormat>  mediumFormats = UIMediumDefs::getFormatsForDeviceType(KDeviceType_Floppy);
+
+    if (m_pFilePathselector->path().isEmpty() || mediumFormats.isEmpty())
+        return;
+
+    CVirtualBox vbox = vboxGlobal().virtualBox();
+
+    CMedium newMedium = vbox.CreateMedium(mediumFormats[0].GetName(), m_pFilePathselector->path(),
+                                          KAccessMode_ReadWrite, KDeviceType_Floppy);
+    if (!vbox.isOk())
+    {
+        msgCenter().cannotCreateMediumStorage(vbox, m_pFilePathselector->path(), this);
+        return;
+    }
+    QVector<KMediumVariant> variants(1, KMediumVariant_Fixed);
+    CProgress progress = newMedium.CreateBaseStorage(m_pSizeCombo->currentData().toLongLong(), variants);
+
+    if (!newMedium.isOk())
+    {
+        msgCenter().cannotCreateMediumStorage(newMedium, m_pFilePathselector->path(), this);
+        return;
+    }
+    /* Show creation progress: */
+    msgCenter().showModalProgressDialog(progress, windowTitle(), ":/progress_media_create_90px.png", this);
+    if (progress.GetCanceled())
+        return;
+
+    if (!progress.isOk() || progress.GetResultCode() != 0)
+    {
+        msgCenter().cannotCreateHardDiskStorage(progress, m_pFilePathselector->path(), this);
+        return;
+    }
+
+    /* After a successful creation and initilization of the floppy disk we call base class accept
+       effectively closing this dialog: */
+    QDialog::accept();
+}

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

@@ -27 +27 @@
 
 /* Forward declarations: */
+class QDialogButtonBox;
+class QLabel;
+class QComboBox;
 class UIFilePathSelector;
 
@@ -40 +43 @@
     UIFDCreationDialog(QWidget *pParent = 0,
                        const QString &strMachineName = QString(),
-                       const QString &strMachineSettingsFilePath = QString()
-                       );
+                       const QString &strMachineSettingsFilePath = QString());
+
+    virtual void accept() /* override */;
 
 protected:
@@ -51 +55 @@
 
 private:
-
-    void prepare();
-
+    enum FDSize
+    {
+        FDSize_2_88M,
+        FDSize_1_44M,
+        FDSize_1_2M,
+        FDSize_720K,
+        FDSize_360K
+    };
+    void                prepare();
+    QString             getDefaultFolder() const;
     UIFilePathSelector *m_pFilePathselector;
     QString             m_strMachineName;
     QString             m_strMachineSettingsFilePath;
+    QLabel             *m_pPathLabel;
+    QLabel             *m_pSizeLabel;
+    QComboBox          *m_pSizeCombo;
+    QDialogButtonBox   *m_pButtonBox;
 };
 

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

@@ -22 +22 @@
 /* GUI includes: */
 # include "UIMediumDefs.h"
+# include "VBoxGlobal.h"
+
+/* COM includes: */
+# include "CMediumFormat.h"
+# include "CSystemProperties.h"
 
 /* COM includes: */
@@ -104 +109 @@
     return MediumBackends(comVBox, KDeviceType_Floppy);
 }
+
+QString UIMediumDefs::getPreferredExtensionForMedium(KDeviceType enmDeviceType)
+{
+    CSystemProperties comSystemProperties = vboxGlobal().virtualBox().GetSystemProperties();
+    QVector<CMediumFormat> mediumFormats = comSystemProperties.GetMediumFormats();
+    for (int i = 0; i < mediumFormats.size(); ++i)
+    {
+        /* File extensions */
+        QVector <QString> fileExtensions;
+        QVector <KDeviceType> deviceTypes;
+
+        mediumFormats[i].DescribeFileExtensions(fileExtensions, deviceTypes);
+        if (fileExtensions.size() != deviceTypes.size())
+            continue;
+        for (int a = 0; a < fileExtensions.size(); ++a)
+        {
+            if (deviceTypes[a] == enmDeviceType)
+                return fileExtensions[a];
+        }
+    }
+    return QString();
+}
+
+QVector<CMediumFormat> UIMediumDefs::getFormatsForDeviceType(KDeviceType enmDeviceType)
+{
+    CSystemProperties comSystemProperties = vboxGlobal().virtualBox().GetSystemProperties();
+    QVector<CMediumFormat> mediumFormats = comSystemProperties.GetMediumFormats();
+    QVector<CMediumFormat> formatList;
+    for (int i = 0; i < mediumFormats.size(); ++i)
+    {
+        /* File extensions */
+        QVector <QString> fileExtensions;
+        QVector <KDeviceType> deviceTypes;
+
+        mediumFormats[i].DescribeFileExtensions(fileExtensions, deviceTypes);
+        if (deviceTypes.contains(enmDeviceType))
+            formatList.push_back(mediumFormats[i]);
+    }
+    return formatList;
+}

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

@@ -73 +73 @@
     /** Returns which floppy disk formats are currently supported by @a comVBox. */
     QList<QPair<QString, QString> > FloppyBackends(const CVirtualBox &comVBox);
+
+    /** Returns the first file extension of the list of file extension support for the @a enmDeviceType. */
+   QString getPreferredExtensionForMedium(KDeviceType enmDeviceType);
+   QVector<CMediumFormat>  getFormatsForDeviceType(KDeviceType enmDeviceType);
 }
 /* Using this namespace globally: */

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

@@ -481 +481 @@
 {
 
-    UIFDCreationDialog *pDialog = new UIFDCreationDialog(this, m_strMachineSettingsFilePath, m_strMachineName);
-    pDialog->exec();
-
-    // QVector<CMediumFormat>  mediumFormats = vboxGlobal().getFormatsForDeviceType(UIMediumDefs::mediumTypeToGlobal(m_enmMediumType));
-    // if (mediumFormats.isEmpty())
-    //     return;
-    // QString strMachineFolder = QFileInfo(m_strMachineSettingsFilePath).absolutePath();
-    // QString strMediumPath =vboxGlobal().getNewMediumPath(m_enmMediumType, this,
-    //                                             strMachineFolder, m_strMachineName);
-    // if (strMediumPath.isEmpty())
-    //     return;
-    // //
-    // CVirtualBox vbox = vboxGlobal().virtualBox();
-
-    // CMedium newMedium = vbox.CreateMedium(mediumFormats[0].GetName(), strMediumPath,
-    //                                       KAccessMode_ReadWrite, UIMediumDefs::mediumTypeToGlobal(m_enmMediumType));
-    // if (!vbox.isOk())
-    // {
-    //     msgCenter().cannotCreateHardDiskStorage(vbox, strMediumPath, this);
-    //     return;
-    // }
-
-
+    UIFDCreationDialog *pDialog = new UIFDCreationDialog(this, m_strMachineName, m_strMachineSettingsFilePath);
+    if (pDialog->exec())
+    {
+        sltHandleRefresh();
+    }
+    delete pDialog;
 }