Changeset 72913 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 5, 2018 9:30:09 AM (7 years ago)

Author:

vboxsync

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

123460

Message:

FE/Qt: bugref:9083 Adding a checkbox to enable floppy formatting while creation

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIFDCreationDialog.cpp (modified) (6 diffs)
• UIFDCreationDialog.h (modified) (3 diffs)

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

@@ -21 +21 @@
 
 /* Qt includes */
+# include<QCheckBox>
 # include<QDialogButtonBox>
 # include<QDir>
@@ -46 +47 @@
    : QIWithRetranslateUI<QDialog>(pParent)
     , m_pFilePathselector(0)
-    , m_strMachineName(strMachineName)
-    , m_strMachineFolder(strMachineFolder)
     , m_pPathLabel(0)
     , m_pSizeLabel(0)
     , m_pSizeCombo(0)
     , m_pButtonBox(0)
+    , m_pFormatCheckBox(0)
+    , m_strMachineName(strMachineName)
+    , m_strMachineFolder(strMachineFolder)
 {
 
@@ -73 +75 @@
     if (m_pButtonBox)
         m_pButtonBox->button(QDialogButtonBox::Ok)->setText("Create");
+    if (m_pFormatCheckBox)
+        m_pFormatCheckBox->setText(QApplication::translate("UIMediumManager", "Format disk as FAT12"));
     if (m_pSizeCombo)
     {
-        m_pSizeCombo->setItemText(FDSize_2_88M, QApplication::translate("UIMediumManager", "2.88M"));
+        //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"));
@@ -126 +130 @@
     {
         pMainLayout->addWidget(m_pSizeCombo, 1, 1, 1, 1);
-        m_pSizeCombo->insertItem(FDSize_2_88M, "2.88M", 2949120);
+        //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);
@@ -135 +139 @@
     }
 
+    m_pFormatCheckBox = new QCheckBox;
+    if (m_pFormatCheckBox)
+    {
+        pMainLayout->addWidget(m_pFormatCheckBox, 2, 1, 1, 1);
+        m_pFormatCheckBox->setCheckState(Qt::Checked);
+    }
+
     m_pButtonBox =
         new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
     if (m_pButtonBox)
     {
-        pMainLayout->addWidget(m_pButtonBox, 2, 0, 1, 3);
+        pMainLayout->addWidget(m_pButtonBox, 3, 0, 1, 3);
         connect(m_pButtonBox, &QDialogButtonBox::accepted, this, &UIFDCreationDialog::accept);
         connect(m_pButtonBox, &QDialogButtonBox::rejected, this, &UIFDCreationDialog::reject);
@@ -177 +188 @@
         return;
     }
+
     QVector<KMediumVariant> variants(1, KMediumVariant_Fixed);
+    /* Decide if formatting the disk is required: */
+    if (m_pFormatCheckBox && m_pFormatCheckBox->checkState() == Qt::Checked)
+        variants.push_back(KMediumVariant_Formatted);
     CProgress progress = newMedium.CreateBaseStorage(m_pSizeCombo->currentData().toLongLong(), variants);
 

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

@@ -27 +27 @@
 
 /* Forward declarations: */
+class QCheckBox;
+class QComboBox;
 class QDialogButtonBox;
 class QLabel;
-class QComboBox;
 class UIFilePathSelector;
 
@@ -59 +60 @@
     enum FDSize
     {
-        FDSize_2_88M,
+        //FDSize_2_88M,
         FDSize_1_44M,
         FDSize_1_2M,
@@ -67 +68 @@
     void                prepare();
     QString             getDefaultFolder() const;
+
     UIFilePathSelector *m_pFilePathselector;
-    QString             m_strMachineName;
-    QString             m_strMachineFolder;
     QLabel             *m_pPathLabel;
     QLabel             *m_pSizeLabel;
     QComboBox          *m_pSizeCombo;
     QDialogButtonBox   *m_pButtonBox;
+    QCheckBox          *m_pFormatCheckBox;
+    QString             m_strMachineName;
+    QString             m_strMachineFolder;
     QString             m_strMediumID;
 };