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

Timestamp:

Feb 11, 2019 1:49:58 PM (6 years ago)

Author:

vboxsync

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

128771

Message:

FE/Qt: bugref:9340. some refactoring in floppy creation dialog

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -2765 +2765 @@
     QWidget *pDialogParent = windowManager().realParentWindow(pParent);
 
-    UIFDCreationDialog *pDialog = new UIFDCreationDialog(pParent, strMachineName, strMachineFolder);
+    UIFDCreationDialog *pDialog = new UIFDCreationDialog(pParent, strMachineFolder, strMachineName);
     if (!pDialog)
         return QUuid();

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

@@ -37 +37 @@
 
 
-UIFDCreationDialog::UIFDCreationDialog(QWidget *pParent /* = 0 */,
-                                       const QString &strMachineName /* = QString() */,
-                                       const QString &strMachineFolder /* = QString() */)
+UIFDCreationDialog::UIFDCreationDialog(QWidget *pParent,
+                                           const QString &strDefaultFolder,
+                                           const QString &strMachineName /* = QString() */)
    : QIWithRetranslateUI<QDialog>(pParent)
     , m_pFilePathselector(0)
@@ -47 +47 @@
     , m_pButtonBox(0)
     , m_pFormatCheckBox(0)
+    , m_strDefaultFolder(strDefaultFolder)
     , m_strMachineName(strMachineName)
-    , m_strMachineFolder(strMachineFolder)
 {
 
@@ -63 +63 @@
 void UIFDCreationDialog::retranslateUi()
 {
-    setWindowTitle(QString("%1 - %2").arg(m_strMachineName).arg(tr("Floppy Disk Creator")));
+    if (m_strMachineName.isEmpty())
+        setWindowTitle(QString("%1").arg(tr("Floppy Disk Creator")));
+    else
+        setWindowTitle(QString("%1 - %2").arg(m_strMachineName).arg(tr("Floppy Disk Creator")));
     if (m_pPathLabel)
         m_pPathLabel->setText(tr("File Path:"));
@@ -156 +159 @@
     QString strPreferredExtension = UIMediumDefs::getPreferredExtensionForMedium(KDeviceType_Floppy);
 
-    QString strInitialPath = m_strMachineFolder;
+    QString strInitialPath = m_strDefaultFolder;
     if (strInitialPath.isEmpty())
         strInitialPath = vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
@@ -163 +166 @@
         return strInitialPath;
 
-    QString strDiskname = VBoxGlobal::findUniqueFileName(m_strMachineFolder, m_strMachineName);
+    QString strDiskname = !(m_strMachineName.isEmpty()) ? m_strMachineName : "NewFloppyDisk";
+    strDiskname = VBoxGlobal::findUniqueFileName(m_strDefaultFolder, m_strMachineName);
 
     strInitialPath = QDir(strInitialPath).absoluteFilePath(strDiskname + "." + strPreferredExtension);

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

@@ -45 +45 @@
 public:
 
-    UIFDCreationDialog(QWidget *pParent = 0,
-                       const QString &strMachineName = QString(),
-                       const QString &strMachineFolder = QString());
+    UIFDCreationDialog(QWidget *pParent,
+                       const QString &strDefaultFolder,
+                       const QString &strMachineName = QString());
+
 
     virtual void accept() /* override */;
@@ -78 +79 @@
     QDialogButtonBox   *m_pButtonBox;
     QCheckBox          *m_pFormatCheckBox;
+    QString             m_strDefaultFolder;
     QString             m_strMachineName;
-    QString             m_strMachineFolder;
     QUuid               m_uMediumID;
 };