Changeset 60496 in vbox for trunk

Timestamp:

Apr 14, 2016 2:11:52 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​bugref:7456: Port Forwarding UI: Possibility to manually commit embedded-editor data to QITableView. It's used in Port Forwarding UI to prevent loosing edited data when dialog is closed with Ok while editor still opened.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/extensions/QITableView.cpp (modified) (2 diffs)
• src/extensions/QITableView.h (modified) (1 diff)
• src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp (modified) (1 diff)
• src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp (modified) (1 diff)
• src/widgets/UIPortForwardingTable.cpp (modified) (1 diff)
• src/widgets/UIPortForwardingTable.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -526 +526 @@
         src/extensions/QISplitter.cpp \
         src/extensions/QIAdvancedToolBar.cpp \
+        src/extensions/QITableView.cpp \
         src/extradata/UIExtraDataManager.cpp \
         src/globals/UIActionPool.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp

@@ -20 +20 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+/* Qt includes: */
+# include <QStyledItemDelegate>
+
 /* GUI includes: */
 # include "QITableView.h"
+
+/* Other VBox includes: */
+# include "iprt/assert.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
+/** QStyledItemDelegate extension used with QITableView. */
+class QITableViewStyledItemDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT;
+
+signals:
+
+    /** Notifies listeners about @a pEditor created for particular model @a index. */
+    void sigEditorCreated(QWidget *pEditor, const QModelIndex &index) const;
+
+public:
+
+    /** Constructs table-view styled-item-delegate on the basis of passed @a pParent. */
+    QITableViewStyledItemDelegate(QObject *pParent);
+
+private:
+
+    /** Returns the widget used to edit the item specified by @a index for editing.
+      * The @a pParent widget and style @a option are used to control how the editor widget appears.
+      * Besides that, we are notifying listener about editor was created for particular model @a index. */
+    virtual QWidget* createEditor(QWidget *pParent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+};
+
+
+/*********************************************************************************************************************************
+*   Class QITableViewStyledItemDelegate implementation.                                                                          *
+*********************************************************************************************************************************/
+
+QITableViewStyledItemDelegate::QITableViewStyledItemDelegate(QObject *pParent)
+    : QStyledItemDelegate(pParent)
+{
+}
+
+QWidget* QITableViewStyledItemDelegate::createEditor(QWidget *pParent, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    /* Call to base-class: */
+    QWidget *pEditor = QStyledItemDelegate::createEditor(pParent, option, index);
+    /* Notify listeners about editor created: */
+    emit sigEditorCreated(pEditor, index);
+    /* Return editor: */
+    return pEditor;
+}
+
+
+/*********************************************************************************************************************************
+*   Class QITableView implementation.                                                                                            *
+*********************************************************************************************************************************/
+
 QITableView::QITableView(QWidget *pParent)
     : QTableView(pParent)
 {
+    /* Prepare all: */
+    prepare();
+}
+
+void QITableView::makeSureEditorDataCommitted()
+{
+    /* Do we have current editor at all? */
+    QObject *pEditorObject = m_editors.value(currentIndex());
+    if (pEditorObject && pEditorObject->isWidgetType())
+    {
+        /* Cast the editor to widget type: */
+        QWidget *pEditor = qobject_cast<QWidget*>(pEditorObject);
+        AssertPtrReturnVoid(pEditor);
+        {
+            /* Commit the editor data and closes it: */
+            commitData(pEditor);
+            closeEditor(pEditor, QAbstractItemDelegate::SubmitModelCache);
+        }
+    }
+}
+
+void QITableView::prepare()
+{
+    /* Delete old delegate: */
+    delete itemDelegate();
+    /* Create new delegate: */
+    QITableViewStyledItemDelegate *pStyledItemDelegate = new QITableViewStyledItemDelegate(this);
+    AssertPtrReturnVoid(pStyledItemDelegate);
+    {
+        /* Assign newly created delegate to the table: */
+        setItemDelegate(pStyledItemDelegate);
+        /* Connect newly created delegate to the table: */
+        connect(pStyledItemDelegate, SIGNAL(sigEditorCreated(QWidget *, const QModelIndex &)),
+                this, SLOT(sltEditorCreated(QWidget *, const QModelIndex &)));
+    }
+}
+
+void QITableView::sltEditorCreated(QWidget *pEditor, const QModelIndex &index)
+{
+    /* Connect created editor to the table and store it: */
+    connect(pEditor, SIGNAL(destroyed(QObject *)), this, SLOT(sltEditorDestroyed(QObject *)));
+    m_editors[index] = pEditor;
+}
+
+void QITableView::sltEditorDestroyed(QObject *pEditor)
+{
+    /* Clear destroyed editor from the table: */
+    QModelIndex index = m_editors.key(pEditor);
+    AssertReturnVoid(index.isValid());
+    m_editors.remove(index);
 }
 
@@ -39 +143 @@
 }
 
+#include "QITableView.moc"
+

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.h

@@ -37 +37 @@
     QITableView(QWidget *pParent = 0);
 
+    /** Makes sure current editor data committed. */
+    void makeSureEditorDataCommitted();
+
 protected:
+
+    /** Prepares all. */
+    void prepare();
 
     /** Handles index change from @a previous to @a current. */
     virtual void currentChanged(const QModelIndex &current, const QModelIndex &previous) /* override */;
+
+protected slots:
+
+    /** Stores the created @a pEditor for passed @a index in the map. */
+    void sltEditorCreated(QWidget *pEditor, const QModelIndex &index);
+    /** Clears the destoyed @a pEditor from the map. */
+    void sltEditorDestroyed(QObject *pEditor);
+
+private:
+
+    /** Holds the map of editors stored for passed indexes. */
+    QMap<QModelIndex, QObject*> m_editors;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp

@@ -86 +86 @@
 void UIGlobalSettingsPortForwardingDlg::accept()
 {
+    /* Make sure both tables have their data committed: */
+    m_pIPv4Table->makeSureEditorDataCommitted();
+    m_pIPv6Table->makeSureEditorDataCommitted();
     /* Validate table: */
     bool fPassed = m_pIPv4Table->validate() && m_pIPv6Table->validate();

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp

@@ -70 +70 @@
 void UIMachineSettingsPortForwardingDlg::accept()
 {
+    /* Make sure table has own data committed: */
+    m_pTable->makeSureEditorDataCommitted();
     /* Validate table: */
     bool fPassed = m_pTable->validate();

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

@@ -691 +691 @@
 }
 
+void UIPortForwardingTable::makeSureEditorDataCommitted()
+{
+    m_pTableView->makeSureEditorDataCommitted();
+}
+
 void UIPortForwardingTable::sltAddRule()
 {

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

@@ -139 +139 @@
     bool isChanged() const { return m_fIsTableDataChanged; }
 
+    /** Makes sure current editor data committed. */
+    void makeSureEditorDataCommitted();
+
 private slots: