Changeset 72545 in vbox for trunk

Timestamp:

Jun 13, 2018 2:24:53 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: ​bugref:6769 Adding a way to provide an appliance wide home folder

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIApplianceEditorWidget.cpp (modified) (14 diffs)
• widgets/UIApplianceEditorWidget.h (modified) (4 diffs)
• widgets/UIApplianceImportEditorWidget.cpp (modified) (4 diffs)
• widgets/UIApplianceImportEditorWidget.h (modified) (2 diffs)
• wizards/importappliance/UIWizardImportAppPageBasic2.cpp (modified) (2 diffs)
• wizards/importappliance/UIWizardImportAppPageBasic2.h (modified) (1 diff)

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

@@ -194 +194 @@
     /** Cache currently stored values, such as @a finalStates, @a finalValues and @a finalExtraValues. */
     virtual void putBack(QVector<BOOL> &finalStates, QVector<QString> &finalValues, QVector<QString> &finalExtraValues) /* override */;
+
+    KVirtualSystemDescriptionType  systemDescriptionType() const;
 
 private:
@@ -287 +289 @@
         childItem(i)->putBack(finalStates, finalValues, finalExtraValues);
 }
-
 
 /*********************************************************************************************************************************
@@ -523 +524 @@
                     case KVirtualSystemDescriptionType_SoundCard:              value = UIIconPool::iconSet(":/sound_16px.png"); break;
                     case KVirtualSystemDescriptionType_BaseFolder:             value = vboxGlobal().icon(QFileIconProvider::Folder); break;
-                    case KVirtualSystemDescriptionType_PrimaryGroup:              value = UIIconPool::iconSet(":/vm_group_name_16px.png"); break;
+                    case KVirtualSystemDescriptionType_PrimaryGroup:           value = UIIconPool::iconSet(":/vm_group_name_16px.png"); break;
                     default: break;
                 }
@@ -918 +919 @@
             {
                 m_strConfigValue = pComboBox->itemData(pComboBox->currentIndex()).toString();
-                printf("%s\n", qPrintable(pComboBox->itemData(pComboBox->currentIndex()).toString()));
                 fDone = true;
             }
@@ -964 +964 @@
 }
 
+
+KVirtualSystemDescriptionType  UIVirtualHardwareItem::systemDescriptionType() const
+{
+    return m_enmVSDType;
+}
 
 /*********************************************************************************************************************************
@@ -1162 +1167 @@
 }
 
+
+void UIApplianceModel::setVirtualSystemBaseFolder(const QString& path)
+{
+    if (!m_pRootItem)
+        return;
+    /* For each Virtual System: */
+    for (int i = 0; i < m_pRootItem->childCount(); ++i)
+    {
+        UIVirtualSystemItem *pVirtualSystem = dynamic_cast<UIVirtualSystemItem*>(m_pRootItem->childItem(i));
+        if (!pVirtualSystem)
+            continue;
+        int iItemCount = pVirtualSystem->childCount();
+        for (int j = 0; j < iItemCount; ++j)
+        {
+            UIVirtualHardwareItem *pHardwareItem = dynamic_cast<UIVirtualHardwareItem*>(pVirtualSystem->childItem(j));
+            if (!pHardwareItem)
+                continue;
+            if (pHardwareItem->systemDescriptionType() != KVirtualSystemDescriptionType_BaseFolder)
+                continue;
+            QVariant data(path);
+            pHardwareItem->setData(ApplianceViewSection_ConfigValue, data, Qt::EditRole);
+            QModelIndex index = createIndex(pHardwareItem->row(), 0, pHardwareItem);
+            emit dataChanged(index, index);
+        }
+    }
+}
 
 /*********************************************************************************************************************************
@@ -1369 +1400 @@
 
     /* Create layout: */
-    QVBoxLayout *pLayout = new QVBoxLayout(this);
+    m_pLayout = new QVBoxLayout(this);
     {
         /* Configure information layout: */
-        pLayout->setContentsMargins(0, 0, 0, 0);
+        m_pLayout->setContentsMargins(0, 0, 0, 0);
 
         /* Create information pane: */
@@ -1378 +1409 @@
         {
             /* Create information layout: */
-            QVBoxLayout *pLayoutInformation = new QVBoxLayout(m_pPaneInformation);
+            QVBoxLayout *m_pLayoutInformation = new QVBoxLayout(m_pPaneInformation);
             {
                 /* Configure information layout: */
-                pLayoutInformation->setContentsMargins(0, 0, 0, 0);
+                m_pLayoutInformation->setContentsMargins(0, 0, 0, 0);
 
                 /* Create tree-view: */
@@ -1394 +1425 @@
 
                     /* Add tree-view into information layout: */
-                    pLayoutInformation->addWidget(m_pTreeViewSettings);
+                    m_pLayoutInformation->addWidget(m_pTreeViewSettings);
                 }
 
@@ -1404 +1435 @@
 
                     /* Add tree-view into information layout: */
-                    pLayoutInformation->addWidget(m_pCheckBoxReinitMACs);
+                    m_pLayoutInformation->addWidget(m_pCheckBoxReinitMACs);
                 }
             }
 
             /* Add information pane into layout: */
-            pLayout->addWidget(m_pPaneInformation);
+            m_pLayout->addWidget(m_pPaneInformation);
         }
 
@@ -1420 +1451 @@
 
             /* Create warning layout: */
-            QVBoxLayout *pLayoutWarning = new QVBoxLayout(m_pPaneWarning);
+            QVBoxLayout *m_pLayoutWarning = new QVBoxLayout(m_pPaneWarning);
             {
                 /* Configure warning layout: */
-                pLayoutWarning->setContentsMargins(0, 0, 0, 0);
+                m_pLayoutWarning->setContentsMargins(0, 0, 0, 0);
 
                 /* Create label: */
@@ -1429 +1460 @@
                 {
                     /* Add label into warning layout: */
-                    pLayoutWarning->addWidget(m_pLabelWarning);
+                    m_pLayoutWarning->addWidget(m_pLabelWarning);
                 }
 
@@ -1441 +1472 @@
 
                     /* Add text-edit into warning layout: */
-                    pLayoutWarning->addWidget(m_pTextEditWarning);
+                    m_pLayoutWarning->addWidget(m_pTextEditWarning);
                 }
             }
 
             /* Add warning pane into layout: */
-            pLayout->addWidget(m_pPaneWarning);
+            m_pLayout->addWidget(m_pPaneWarning);
         }
     }
@@ -1488 +1519 @@
     }
 }
+
+void UIApplianceEditorWidget::setVirtualSystemBaseFolder(const QString& path)
+{
+    if (!m_pModel)
+        return;
+    m_pModel->setVirtualSystemBaseFolder(path);
+}

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

@@ -38 +38 @@
 class QTextEdit;
 class QITreeView;
-
+class QVBoxLayout;
 
 /** Appliance tree-view section types. */
@@ -101 +101 @@
     /** Cache currently stored values. */
     void putBack();
+
+    void setVirtualSystemBaseFolder(const QString& path);
 
 private:
@@ -211 +213 @@
     virtual void retranslateUi() /* override */;
 
+    void setVirtualSystemBaseFolder(const QString& path);
+
     /** Holds the currently set appliance reference. */
     CAppliance         *m_pAppliance;
     /** Holds the Appliance model reference. */
     UIApplianceModel *m_pModel;
+
+    QVBoxLayout *m_pLayout;
 
     /** Holds the information pane instance. */
@@ -246 +252 @@
 
 #endif /* !___UIApplianceEditorWidget_h___ */
-

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

@@ -23 +23 @@
 # include <QCheckBox>
 # include <QTextEdit>
+# include <QVBoxLayout>
 
 /* GUI includes: */
+# include "QIRichTextLabel.h"
 # include "QITreeView.h"
 # include "UIApplianceImportEditorWidget.h"
+# include "UIFilePathSelector.h"
+# include "UIMessageCenter.h"
+# include "UIWizardImportApp.h"
 # include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
 
 /* COM includes: */
 # include "CAppliance.h"
+# include "CSystemProperties.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -57 +62 @@
     /* Show the MAC check box */
     m_pCheckBoxReinitMACs->setHidden(false);
+
+    m_pPathSelectorLabel = new QIRichTextLabel(this);
+    if (m_pPathSelectorLabel)
+    {
+        m_pLayout->addWidget(m_pPathSelectorLabel);
+    }
+    m_pPathSelector = new UIFilePathSelector(this);
+    if (m_pPathSelector)
+    {
+        m_pPathSelector->setResetEnabled(true);
+        m_pPathSelector->setDefaultPath(vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder());
+        m_pPathSelector->setPath(vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder());
+        connect(m_pPathSelector, &UIFilePathSelector::pathChanged, this, &UIApplianceImportEditorWidget::sltHandlePathChanged);
+        m_pLayout->addWidget(m_pPathSelector);
+    }
+    m_pLayout->addStretch();
+    retranslateUi();
 }
 
@@ -137 +159 @@
         }
     }
+    /* Make sure we initialize model items with correct base folder path: */
+    if (m_pPathSelector)
+        sltHandlePathChanged(m_pPathSelector->path());
+
     return fResult;
 }
@@ -199 +225 @@
 }
 
+void UIApplianceImportEditorWidget::retranslateUi()
+{
+    UIApplianceEditorWidget::retranslateUi();
+    m_pPathSelectorLabel->setText(UIWizardImportApp::tr("You can modify the base folder which will host "
+                                                        "all the virtual machines. Virtual home folders "
+                                                        "can also be individually modified."));
+
+}
+
+void UIApplianceImportEditorWidget::sltHandlePathChanged(const QString &newPath)
+{
+    setVirtualSystemBaseFolder(newPath);
+}

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

@@ -22 +22 @@
 #include "UIApplianceEditorWidget.h"
 
+/* Forward declarations: */
+class UIFilePathSelector;
+class QIRichTextLabel;
+
 class UIApplianceImportEditorWidget: public UIApplianceEditorWidget
 {
@@ -34 +38 @@
 
     QList<QPair<QString, QString> > licenseAgreements() const;
+
+protected:
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */;
+
+private slots:
+
+    void sltHandlePathChanged(const QString &newPath);
+
+private:
+
+    QIRichTextLabel    *m_pPathSelectorLabel;
+    UIFilePathSelector *m_pPathSelector;
 };
 
 #endif /* __UIApplianceImportEditorWidget_h__ */
-

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp

@@ -21 +21 @@
 
 /* Global includes: */
+# include <QLabel>
+# include <QPointer>
+# include <QPushButton>
+# include <QTextBrowser>
 # include <QVBoxLayout>
-# include <QTextBrowser>
-# include <QPushButton>
-# include <QPointer>
-# include <QLabel>
 
 /* Local includes: */
+# include "QIDialogButtonBox.h"
+# include "QIRichTextLabel.h"
+# include "UIWizardImportApp.h"
 # include "UIWizardImportAppPageBasic2.h"
-# include "UIWizardImportApp.h"
-# include "QIRichTextLabel.h"
-# include "QIDialogButtonBox.h"
 
 /* COM includes: */
@@ -296 +296 @@
     m_pTextBrowser->setText(QString("<table>%1</table>").arg(strTableContent));
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.h

@@ -113 +113 @@
 
 #endif /* !___UIWizardImportAppPageBasic2_h___ */
-