Changeset 72182 in vbox for trunk/src

Timestamp:

May 9, 2018 8:03:15 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref: 6769 Set the tooltip of the UIVMNamePathSelector to machine folder as an additional hint to user

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UINameAndSystemEditor.cpp (modified) (2 diffs)
• widgets/UINameAndSystemEditor.h (modified) (2 diffs)
• widgets/UIVMNamePathSelector.cpp (modified) (5 diffs)
• widgets/UIVMNamePathSelector.h (modified) (4 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (4 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.h (modified) (3 diffs)

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

@@ -334 +334 @@
     connect(m_pNamePathSelector, &UIVMNamePathSelector::sigNameChanged,
             this, &UINameAndSystemEditor::sigNameChanged);
+    connect(m_pNamePathSelector, &UIVMNamePathSelector::sigPathChanged,
+            this, &UINameAndSystemEditor::sigPathChanged);
     connect(m_pComboFamily, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &UINameAndSystemEditor::sltFamilyChanged);
@@ -346 +348 @@
     m_pNamePathSelector->setNameFieldValidator(strValidatorString);
 }
+
+void UINameAndSystemEditor::setMachineFilePath(const QString &strPath)
+{
+    if (!m_pNamePathSelector)
+        return;
+    m_pNamePathSelector->setToolTipText(strPath);
+}

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

@@ -49 +49 @@
     /** Notifies listeners about VM name change. */
     void sigNameChanged(const QString &strNewName);
+    void sigPathChanged(const QString &strName);
 
     /** Notifies listeners about VM OS type change. */
@@ -73 +74 @@
 
     void setNameFieldValidator(const QString &strValidatorString);
+
+    /** Forwards the machine name to UIVMNamePathSelector member instance. */
+    void setMachineFilePath(const QString &strPath);
 
 protected:

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

@@ -98 +98 @@
         connect(m_pName, &QILineEdit::textChanged,
                 this, &UIVMNamePathSelector::sigNameChanged);
-
     }
 
@@ -116 +115 @@
     m_pPath->setText(path);
     m_pPath->setFixedWidthByText(path);
+    emit sigPathChanged(path);
 }
 
@@ -136 +136 @@
 void UIVMNamePathSelector::retranslateUi()
 {
-    setToolTip(tr("The Virtual Machine files will be saved under ..."));
+    if (m_strToolTipText.isEmpty())
+        return;
+    QString strToolTip = "The Virtual Machine files will be saved under " + m_strToolTipText;
+    setToolTip(tr(qPrintable(strToolTip)));
 }
 
@@ -146 +149 @@
     if (!strSelectedPath.isEmpty())
     {
-        m_pPath->setText(strSelectedPath);
+        setPath(strSelectedPath);
     }
 }
@@ -156 +159 @@
     m_pName->setValidator(new QRegExpValidator(QRegExp(strValidatorString), this));
 }
+
+void UIVMNamePathSelector::setToolTipText(const QString &strToolTipText)
+{
+    if (m_strToolTipText == strToolTipText)
+        return;
+    m_strToolTipText = strToolTipText;
+    retranslateUi();
+}
+
+const QString& UIVMNamePathSelector::toolTipText() const
+{
+    return m_strToolTipText;
+}

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

@@ -38 +38 @@
 
     void sigNameChanged(const QString &strName);
+    void sigPathChanged(const QString &strName);
 
 public:
@@ -45 +46 @@
 public slots:
 
-    QString path() const;
-    void    setPath(const QString &path);
+    QString        path() const;
+    void           setPath(const QString &path);
 
-    QString name() const;
-    void    setName(const QString &name);
-    void    setNameFieldValidator(const QString &strValidatorString);
+    QString        name() const;
+    void           setName(const QString &name);
+    void           setNameFieldValidator(const QString &strValidatorString);
+
+    void           setToolTipText(const QString &strToolTipText);
+    const QString& toolTipText() const;
 
 protected:
@@ -62 +66 @@
 private:
 
-    void         prepareWidgets();
-    QString      defaultMachineFolder() const;
+    void          prepareWidgets();
+    QString       defaultMachineFolder() const;
 
     QHBoxLayout  *m_pMainLayout;
@@ -70 +74 @@
     QILabel      *m_pSeparator;
     QIToolButton *m_pFileDialogButton;
-
+    /** Tooltip set is set by clients of this widget. */
+    QString       m_strToolTipText;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp

@@ -215 +215 @@
 }
 
-bool UIWizardNewVMPage1::createMachineFolder()
-{
-    if (!m_pNameAndSystemEditor)
-        return false;
-    /* Cleanup previosly created folder if any: */
-    if (machineFolderCreated() && !cleanupMachineFolder())
-    {
-        msgCenter().cannotRemoveMachineFolder(m_strMachineFolder, thisImp());
-        return false;
-    }
-
+void UIWizardNewVMPage1::composeMachineFilePath()
+{
     /* Get VBox: */
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    /* Get default machine folder: */
-    //const QString strMachineFolder = vbox.GetSystemProperties().GetDefaultMachineFolder();
 
     /* Compose machine filename: */
@@ -241 +230 @@
     m_strMachineBaseName = fileInfo.completeBaseName();
 
+    if (m_pNameAndSystemEditor)
+        m_pNameAndSystemEditor->setMachineFilePath(m_strMachineFolder);
+}
+
+bool UIWizardNewVMPage1::createMachineFolder()
+{
+    if (!m_pNameAndSystemEditor)
+        return false;
+    /* Cleanup previosly created folder if any: */
+    if (machineFolderCreated() && !cleanupMachineFolder())
+    {
+        msgCenter().cannotRemoveMachineFolder(m_strMachineFolder, thisImp());
+        return false;
+    }
+
+    composeMachineFilePath();
+
     /* Make sure that folder doesn't exists: */
     if (QDir(m_strMachineFolder).exists())
@@ -286 +292 @@
 
     /* Setup connections: */
-    connect(m_pNameAndSystemEditor, SIGNAL(sigNameChanged(const QString &)), this, SLOT(sltNameChanged(const QString &)));
-    connect(m_pNameAndSystemEditor, SIGNAL(sigOsTypeChanged()), this, SLOT(sltOsTypeChanged()));
+    connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMPageBasic1::sltNameChanged);
+    connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged, this, &UIWizardNewVMPageBasic1::sltPathChanged);
+    connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMPageBasic1::sltOsTypeChanged);
 
     /* Register fields: */
@@ -301 +308 @@
     /* Call to base-class: */
     onNameChanged(strNewName);
+    composeMachineFilePath();
+}
+
+void UIWizardNewVMPageBasic1::sltPathChanged(const QString &strNewPath)
+{
+    composeMachineFilePath();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h

@@ -56 +56 @@
     void setMachineBaseName(const QString &strMachineBaseName) { m_strMachineBaseName = strMachineBaseName; }
 
+    /** calls CVirtualBox::ComposeMachineFilename(...) and sets related member variables */
+    void composeMachineFilePath();
+
     /** Full path (including the file name) of the machine's configuration file. */
     QString m_strMachineFilePath;
@@ -66 +69 @@
     UINameAndSystemEditor *m_pNameAndSystemEditor;
 
-    /** Variables: */
     QString m_strGroup;
     bool m_fSupportsHWVirtEx;
@@ -94 +96 @@
     /* Handlers: */
     void sltNameChanged(const QString &strNewText);
+    void sltPathChanged(const QString &strNewPath);
     void sltOsTypeChanged();