Changeset 60834 in vbox for trunk/src

Timestamp:

May 4, 2016 2:39:00 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​​​​​​​bugref:6769: Rework/cleanup for VM properties editor (part 07): Allow to edit VM location under given condition.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UINameAndSystemEditor.cpp (modified) (7 diffs)
• UINameAndSystemEditor.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp

@@ -29 +29 @@
 /* GUI includes: */
 # include "UINameAndSystemEditor.h"
+# include "UIFilePathSelector.h"
+
+/* COM includes: */
+# include "CSystemProperties.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -39 +43 @@
 
 
-UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent)
+UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent, bool fChooseLocation /* = false */)
     : QIWithRetranslateUI<QWidget>(pParent)
+    , m_fChooseLocation(fChooseLocation)
     , m_fSupportsHWVirtEx(false)
     , m_fSupportsLongMode(false)
@@ -48 +53 @@
     , m_pIconType(0)
     , m_pEditorName(0)
+    , m_pEditorLocation(0)
     , m_pComboFamily(0)
     , m_pComboType(0)
@@ -95 +101 @@
         }
 
-        /* Create VM name editor: */
-        m_pEditorName = new QLineEdit;
-        AssertPtrReturnVoid(m_pEditorName);
-        {
-            /* Configure VM name editor: */
-            m_pEditorName->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-            m_pLabelName->setBuddy(m_pEditorName);
-            /* Add VM name editor into main-layout: */
-            pMainLayout->addWidget(m_pEditorName, 0, 1, 1, 2);
+        if (!m_fChooseLocation)
+        {
+            /* Create VM name editor: */
+            m_pEditorName = new QLineEdit;
+            AssertPtrReturnVoid(m_pEditorName);
+            {
+                /* Configure VM name editor: */
+                m_pEditorName->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+                m_pLabelName->setBuddy(m_pEditorName);
+                /* Add VM name editor into main-layout: */
+                pMainLayout->addWidget(m_pEditorName, 0, 1, 1, 2);
+            }
+        }
+        else
+        {
+            /* Create VM location editor: */
+            m_pEditorLocation = new UIFilePathSelector;
+            AssertPtrReturnVoid(m_pEditorLocation);
+            {
+                /* Configure advanced VM name editor: */
+                m_pEditorLocation->setResetEnabled(false);
+                m_pEditorLocation->setMode(UIFilePathSelector::Mode_File_Save);
+                m_pEditorLocation->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+                m_pEditorLocation->setHomeDir(vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder());
+                m_pLabelName->setBuddy(m_pEditorLocation);
+                /* Add advanced VM name editor into main-layout: */
+                pMainLayout->addWidget(m_pEditorLocation, 0, 1, 1, 2);
+            }
         }
 
@@ -196 +221 @@
 {
     /* Prepare connections: */
-    connect(m_pEditorName, SIGNAL(textChanged(const QString &)), this, SIGNAL(sigNameChanged(const QString &)));
+    if (!m_fChooseLocation)
+        connect(m_pEditorName, SIGNAL(textChanged(const QString &)), this, SIGNAL(sigNameChanged(const QString &)));
+    else
+        connect(m_pEditorLocation, SIGNAL(pathChanged(const QString &)), this, SIGNAL(sigNameChanged(const QString &)));
     connect(m_pComboFamily, SIGNAL(currentIndexChanged(int)), this, SLOT(sltFamilyChanged(int)));
     connect(m_pComboType, SIGNAL(currentIndexChanged(int)), this, SLOT(sltTypeChanged(int)));
@@ -203 +231 @@
 QString UINameAndSystemEditor::name() const
 {
-    return m_pEditorName->text();
+    if (!m_fChooseLocation)
+        return m_pEditorName->text();
+    else
+        return m_pEditorLocation->path();
 }
 
 void UINameAndSystemEditor::setName(const QString &strName)
 {
-    m_pEditorName->setText(strName);
+    if (!m_fChooseLocation)
+        m_pEditorName->setText(strName);
+    else
+        m_pEditorLocation->setPath(strName);
 }
 
@@ -240 +274 @@
     m_pLabelFamily->setText(tr("&Type:"));
     m_pLabelType->setText(tr("&Version:"));
-    m_pEditorName->setWhatsThis(tr("Holds the name of the virtual machine."));
+    if (!m_fChooseLocation)
+        m_pEditorName->setWhatsThis(tr("Holds the name of the virtual machine."));
+    else
+        m_pEditorLocation->setWhatsThis(tr("Holds the location of the virtual machine."));
     m_pComboFamily->setWhatsThis(tr("Selects the operating system family that "
                                     "you plan to install into this virtual machine."));

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h

@@ -30 +30 @@
 class QLineEdit;
 class QComboBox;
+class UIFilePathSelector;
 
 /** QWidget extension providing complex editor for basic VM parameters. */
@@ -48 +49 @@
 public:
 
-    /** Constructs VM parameters editor on the basis of passed @a pParent. */
-    UINameAndSystemEditor(QWidget *pParent);
+    /** Constructs VM parameters editor on the basis of passed @a pParent.
+      * @param fChooseFullPath determine whether we should propose to choose location. */
+    UINameAndSystemEditor(QWidget *pParent, bool fChooseLocation = false);
 
     /** Returns the VM name editor. */
@@ -97 +99 @@
     /** Holds the currently chosen OS type IDs on per-family basis. */
     QMap<QString, QString>  m_currentIds;
+    /** Holds whether we should propose to choose a full path. */
+    bool                    m_fChooseLocation;
     /** Holds whether host supports hardware virtualization. */
     bool                    m_fSupportsHWVirtEx;
@@ -112 +116 @@
     /** Holds the VM name editor instance. */
     QLineEdit              *m_pEditorName;
+    /** Holds the VM location editor instance. */
+    UIFilePathSelector     *m_pEditorLocation;
     /** Holds the VM OS family combo instance. */
     QComboBox              *m_pComboFamily;