Changeset 76768 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 11, 2019 10:54:58 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080: It is now possible to pass custom options to viso file thru the viso dialog

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• medium/viso/UIVisoConfigurationDialog.cpp (modified) (5 diffs)
• medium/viso/UIVisoConfigurationDialog.h (modified) (4 diffs)
• medium/viso/UIVisoContentBrowser.cpp (modified) (6 diffs)
• medium/viso/UIVisoContentBrowser.h (modified) (1 diff)
• medium/viso/UIVisoCreator.cpp (modified) (2 diffs)
• medium/viso/UIVisoCreator.h (modified) (1 diff)
• medium/viso/UIVisoCreatorDefs.h (modified) (1 diff)

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

@@ -2654 +2654 @@
         QStringList files = pVisoCreator->entryList();
         QString strVisoName = pVisoCreator->visoName();
+
         if (files.empty() || files[0].isEmpty())
             return QUuid();
@@ -2688 +2689 @@
                             break;
                     }
+                    /* Append custom options if any to the file: */
+                    const QStringList &customOptions = pVisoCreator->customOptions();
+                    foreach (QString strLine, customOptions)
+                        RTStrmPrintf(pStrmViso, "%s\n", strLine.toUtf8().constData());
 
                     RTStrmFlush(pStrmViso);

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationDialog.cpp

@@ -19 +19 @@
 #include <QCheckBox>
 #include <QGridLayout>
+#include <QTextEdit>
 #include <QPushButton>
 #include <QSplitter>
 #include <QStyle>
+#include <QTextBlock>
 
 /* GUI includes: */
@@ -35 +37 @@
     , m_pMainLayout(0)
     , m_pButtonBox(0)
+    , m_pVisoNameLineEdit(0)
+    , m_pCustomOptionsTextEdit(0)
     , m_visoOptions(visoOptions)
 {
@@ -50 +54 @@
 }
 
-void UIVisoConfigurationDialog::sltHandleVisoNameChange(const QString &strText)
+void UIVisoConfigurationDialog::accept()
 {
-    m_visoOptions.m_strVisoName = strText;
+    if (m_pVisoNameLineEdit)
+        m_visoOptions.m_strVisoName = m_pVisoNameLineEdit->text();
+
+    if (m_pCustomOptionsTextEdit)
+    {
+        QTextDocument *pDocument = m_pCustomOptionsTextEdit->document();
+        if (pDocument)
+        {
+            for(QTextBlock block = pDocument->begin(); block != pDocument->end()/*.isValid()*/; block = block.next())
+                    m_visoOptions.m_customOptions << block.text();
+        }
+    }
+
+    QIDialog::accept();
 }
 
@@ -62 +79 @@
         return;
 
+    /* Name edit and and label: */
+    QILabel *pVisoNameLabel = new QILabel(UIVisoCreator::tr("VISO Name:"));
+    m_pVisoNameLineEdit = new QILineEdit;
+    if (pVisoNameLabel && m_pVisoNameLineEdit)
+    {
+        m_pVisoNameLineEdit->setText(m_visoOptions.m_strVisoName);
+        pVisoNameLabel->setBuddy(m_pVisoNameLineEdit);
+        m_pMainLayout->addWidget(pVisoNameLabel, 0, 0, 1, 1);
+        m_pMainLayout->addWidget(m_pVisoNameLineEdit, 0, 1, 1, 1);
+    }
 
-    QILineEdit *pVisoNameLineEdit = new QILineEdit;
-    connect(pVisoNameLineEdit, &QILineEdit::textChanged,
-            this, &UIVisoConfigurationDialog::sltHandleVisoNameChange);
-    pVisoNameLineEdit->setText(m_visoOptions.m_strVisoName);
-    QILabel *pVisoNameLabel = new QILabel(UIVisoCreator::tr("VISO Name:"));
-    pVisoNameLabel->setBuddy(pVisoNameLineEdit);
-
-    m_pMainLayout->addWidget(pVisoNameLabel, 0, 0, 1, 1);
-    m_pMainLayout->addWidget(pVisoNameLineEdit, 0, 1, 1, 1);
+    /* Cutom Viso options stuff: */
+    QILabel *pCustomOptionsLabel = new QILabel(UIVisoCreator::tr("Custom VISO options:"));
+    m_pCustomOptionsTextEdit = new QTextEdit;
+    if (pCustomOptionsLabel && m_pCustomOptionsTextEdit)
+    {
+        m_pCustomOptionsTextEdit->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        pCustomOptionsLabel->setBuddy(m_pCustomOptionsTextEdit);
+        m_pMainLayout->addWidget(pCustomOptionsLabel, 1, 0, 1, 1, Qt::AlignTop);
+        m_pMainLayout->addWidget(m_pCustomOptionsTextEdit, 1, 1, 1, 1);
+        foreach (const QString &strLine, m_visoOptions.m_customOptions)
+            m_pCustomOptionsTextEdit->append(strLine);
+    }
 
     m_pButtonBox = new QIDialogButtonBox;
@@ -78 +108 @@
         m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
         m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(Qt::Key_Escape);
-        m_pMainLayout->addWidget(m_pButtonBox, 1, 0, 1, 2);
+        m_pMainLayout->addWidget(m_pButtonBox, 2, 0, 1, 2);
     }
     setLayout(m_pMainLayout);

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoConfigurationDialog.h

@@ -28 +28 @@
 
 /* Forward declarations: */
+class QGridLayout;
+class QTextEdit;
+class QIDialogButtonBox;
+class QILineEdit;
 class QITabWidget;
-class QGridLayout;
-class QIDialogButtonBox;
 
 class SHARED_LIBRARY_STUFF UIVisoConfigurationDialog : public QIDialog
@@ -37 +39 @@
 
 public:
-
     UIVisoConfigurationDialog(const VisoOptions &visoOptions,
                               QWidget *pParent = 0);
@@ -43 +44 @@
     const VisoOptions &visoOptions() const;
 
-private slots:
+public slots:
 
-    void sltHandleVisoNameChange(const QString &strText);
+    void accept() /* override */;
+
 
 private:
@@ -54 +56 @@
     QGridLayout          *m_pMainLayout;
     QIDialogButtonBox    *m_pButtonBox;
+    QILineEdit           *m_pVisoNameLineEdit;
+    QTextEdit           *m_pCustomOptionsTextEdit;
     VisoOptions          m_visoOptions;
+
     friend class UIVisoCreator;
 };

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

@@ -256 +256 @@
         m_pRenameAction->setToolTip(QApplication::translate("UIVisoCreator", "Rename the selected object"));
 
-
     UICustomFileSystemItem *pRootItem = rootItem();
     if (pRootItem)
@@ -338 +337 @@
         if (!pItem)
             continue;
+        QString strIsoPath = pItem->data(UICustomFileSystemModelColumn_Path).toString();
+        if (strIsoPath.isEmpty())
+            continue;
+
         bool bFoundInMap = false;
         for (QMap<QString, QString>::iterator iterator = m_entryMap.begin(); iterator != m_entryMap.end(); )
         {
-            QString strIsoPath = pItem->data(UICustomFileSystemModelColumn_Path).toString();
-            if (strIsoPath.isEmpty())
-                continue;
             if (iterator.key().startsWith(strIsoPath))
             {
@@ -465 +465 @@
     if (m_pRenameAction)
     {
-        m_pVerticalToolBar->addAction(m_pRenameAction);
+        /** @todo Handle rename correctly in the m_entryMap as well and then enable this rename action. */
+        /* m_pVerticalToolBar->addAction(m_pRenameAction); */
         m_pRenameAction->setIcon(UIIconPool::iconSet(":/file_manager_rename_16px.png", ":/file_manager_rename_disabled_16px.png"));
         m_pRenameAction->setEnabled(false);
@@ -507 +508 @@
         connect(m_pResetAction, &QAction::triggered,
                 this, &UIVisoContentBrowser::sltHandleResetAction);
-
+    if (m_pRenameAction)
+        connect(m_pRenameAction, &QAction::triggered,
+                this,&UIVisoContentBrowser::sltHandleItemRenameAction);
     if (m_pTableView->selectionModel())
         connect(m_pTableView->selectionModel(), &QItemSelectionModel::selectionChanged,
@@ -721 +724 @@
 }
 
+void UIVisoContentBrowser::sltHandleItemRenameAction()
+{
+    QList<UICustomFileSystemItem*> selectedItems = tableSelectedItems();
+    if (selectedItems.empty())
+        return;
+    /* This is not complete. we have to modify the entries in the m_entryMap as well: */
+    renameFileObject(selectedItems.at(0));
+}
+
 void UIVisoContentBrowser::sltHandleItemRenameAttempt(UICustomFileSystemItem *pItem, QString strOldName, QString strNewName)
 {
@@ -740 +752 @@
 
     pItem->setData(UIPathOperations::mergePaths(pItem->parentItem()->path(), pItem->name()), UICustomFileSystemModelColumn_Path);
-
     if (m_pTableProxyModel)
         m_pTableProxyModel->invalidate();

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.h

@@ -76 +76 @@
 
     void sltHandleCreateNewDirectory();
+    /** Handles the signal we get from the model during setData call. Restores the old name of the file object
+     *  to @p strOldName if need be. */
     void sltHandleItemRenameAttempt(UICustomFileSystemItem *pItem, QString strOldName, QString strNewName);
+    void sltHandleItemRenameAction();
     void sltHandleRemoveItems();
     void sltHandleTableSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -66 +66 @@
 }
 
+const QStringList &UIVisoCreator::customOptions() const
+{
+    return m_visoOptions.m_customOptions;
+}
+
 void UIVisoCreator::retranslateUi()
 {
@@ -228 +233 @@
     }
     m_visoOptions = visoOptions;
-
-}
+}

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -55 +55 @@
     QStringList entryList() const;
     const QString &visoName() const;
+    const QStringList &customOptions() const;
 
 #ifdef VBOX_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreatorDefs.h

@@ -29 +29 @@
     bool operator==(const VisoOptions &otherOptions) const
     {
-        return m_strVisoName == otherOptions.m_strVisoName;
+        return (m_strVisoName == otherOptions.m_strVisoName) &&
+            (m_customOptions == otherOptions.m_customOptions);
     }
     QString m_strVisoName;
+    /** Additions viso options to be inserted to the viso file as separate lines. */
+    QStringList m_customOptions;
 };