Changeset 70923 in vbox

Timestamp:

Feb 9, 2018 9:05:17 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120751

Message:

FE/Qt bugref:6699 Adding tree item class

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/runtime/information/UIGuestSessionTreeItem.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationGuestSession.cpp ) (3 diffs)
• src/runtime/information/UIGuestSessionTreeItem.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationGuestSession.h ) (2 diffs)
• src/runtime/information/UIGuestSessionsEventHandler.cpp (modified) (3 diffs)
• src/runtime/information/UIInformationGuestSession.cpp (modified) (1 diff)

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

@@ -505 +505 @@
         src/wizards/firstrun/UIWizardFirstRunPageBasic.h \
         src/runtime/information/UIGuestSessionsEventHandler.h \
+        src/runtime/information/UIGuestSessionTreeItem.h \
         src/runtime/information/UIInformationConfiguration.h \
         src/runtime/information/UIInformationDataItem.h \
@@ -835 +836 @@
         src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp \
         src/runtime/information/UIGuestSessionsEventHandler.cpp \
+        src/runtime/information/UIGuestSessionTreeItem.cpp \
         src/runtime/information/UIInformationConfiguration.cpp \
         src/runtime/information/UIInformationDataItem.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGuestSessionTreeItem.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIInformationGuestSession class implementation.
+ * VBox Qt GUI - UIGuestSessionTreeItem class implementation.
  */
 
@@ -25 +25 @@
 
 /* GUI includes: */
-# include "QITreeWidget.h"
-# include "UIInformationGuestSession.h"
+# include "UIGuestSessionTreeItem.h"
 # include "UIGuestSessionsEventHandler.h"
 # include "VBoxGlobal.h"
@@ -35 +34 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-UIInformationGuestSession::UIInformationGuestSession(QWidget *pParent, const CConsole &console)
-    : QWidget(pParent)
-    , m_comConsole(console)
-    , m_pMainLayout(0)
-    , m_pGuestSessionsEventHandler(0)
-    , m_pTreeWidget(0)
+
+UIGuestSessionTreeItem::UIGuestSessionTreeItem(QITreeWidget *pTreeWidget,
+                                               GuestSessionTreeItemType itemType)
+    :QITreeWidgetItem(pTreeWidget)
+    , m_eItemType(itemType)
 {
-    prepareEventHandler();
-    prepareLayout();
-    prepareWidgets();
 }
 
-void UIInformationGuestSession::prepareLayout()
+UIGuestSessionTreeItem::UIGuestSessionTreeItem(UIGuestSessionTreeItem *pTreeWidgetItem,
+                                               GuestSessionTreeItemType itemType)
+    :QITreeWidgetItem(pTreeWidgetItem)
+    , m_eItemType(itemType)
 {
-    /* Create layout: */
-    m_pMainLayout = new QVBoxLayout(this);
-    if (m_pMainLayout)
-    {
-        /* Configure layout: */
-        m_pMainLayout->setSpacing(0);
-    }
 }
 
-void UIInformationGuestSession::prepareWidgets()
+UIGuestSessionTreeItem::UIGuestSessionTreeItem(QITreeWidget *pTreeWidget,
+                                               const QStringList &strings, GuestSessionTreeItemType itemType)
+    :QITreeWidgetItem(pTreeWidget, strings)
+    , m_eItemType(itemType)
 {
-    m_pTreeWidget = new QITreeWidget();
-    m_pMainLayout->addWidget(m_pTreeWidget);
-    updateTreeWidget();
 }
 
-void UIInformationGuestSession::updateTreeWidget()
+UIGuestSessionTreeItem::UIGuestSessionTreeItem(UIGuestSessionTreeItem *pTreeWidgetItem,
+                                               const QStringList &strings, GuestSessionTreeItemType itemType)
+    :QITreeWidgetItem(pTreeWidgetItem, strings)
+    , m_eItemType(itemType)
 {
-    if (!m_pTreeWidget)
-        return;
-    if (!m_pGuestSessionsEventHandler)
-        return;
-
-    m_pTreeWidget->clear();
-    QVector<QITreeWidgetItem> treeItemVector;
-    m_pGuestSessionsEventHandler->populateGuestSessionsTree(m_pTreeWidget);
-    update();
 }
-
-void UIInformationGuestSession::prepareEventHandler()
-{
-    m_pGuestSessionsEventHandler = new UIGuestSessionsEventHandler(this, m_comConsole.GetGuest());
-    connect(m_pGuestSessionsEventHandler, &UIGuestSessionsEventHandler::sigGuestSessionsUpdated,
-            this, &UIInformationGuestSession::sltGuestSessionsUpdated);
-}
-
-void UIInformationGuestSession::sltGuestSessionsUpdated()
-{
-    updateTreeWidget();
-}

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGuestSessionTreeItem.h

@@ -16 +16 @@
  */
 
-#ifndef ___UIInformationGuestSession_h___
-#define ___UIInformationGuestSession_h___
+#ifndef ___UIGuestSessionTreeItem_h___
+#define ___UIGuestSessionTreeItem_h___
 
-/* Qt includes: */
-#include <QWidget>
+/* GUI includes: */
+# include "QITreeWidget.h"
 
-/* COM includes: */
-#include "COMEnums.h"
-#include "CConsole.h"
 
 /* Forward declarations: */
-class QITreeWidget;
-class QVBoxLayout;
-class UIGuestSessionsEventHandler;
 
-/** QWidget extension
-  * providing GUI with guest session information and control tab in session-information window. */
-class UIInformationGuestSession : public QWidget
+
+class UIGuestSessionTreeItem : public QITreeWidgetItem
 {
+
     Q_OBJECT;
 
@@ -41 +35 @@
 public:
 
-    UIInformationGuestSession(QWidget *pParent, const CConsole &console);
+    enum GuestSessionTreeItemType{
+        SessionTreeItem = 0,
+        ProcessTreeItem,
+        GuestSessionItemTypeMax
+    };
+
+
+    /** Constructs item passing @a pTreeWidget into the base-class. */
+    UIGuestSessionTreeItem(QITreeWidget *pTreeWidget, GuestSessionTreeItemType itemType);
+    /** Constructs item passing @a pTreeWidgetItem into the base-class. */
+    UIGuestSessionTreeItem(UIGuestSessionTreeItem *pTreeWidgetItem, GuestSessionTreeItemType itemType);
+    /** Constructs item passing @a pTreeWidget and @a strings into the base-class. */
+    UIGuestSessionTreeItem(QITreeWidget *pTreeWidget, const QStringList &strings, GuestSessionTreeItemType itemType);
+    /** Constructs item passing @a pTreeWidgetItem and @a strings into the base-class. */
+    UIGuestSessionTreeItem(UIGuestSessionTreeItem *pTreeWidgetItem,
+                           const QStringList &strings, GuestSessionTreeItemType itemType);
 
 private slots:
 
-    void sltGuestSessionsUpdated();
 
 private:
-
-    void prepareLayout();
-    void prepareWidgets();
-    void prepareEventHandler();
-    void updateTreeWidget();
-
-    CConsole             m_comConsole;
-    QVBoxLayout         *m_pMainLayout;
-    UIGuestSessionsEventHandler *m_pGuestSessionsEventHandler;
-    QITreeWidget        *m_pTreeWidget;
+    GuestSessionTreeItemType m_eItemType;
 
 };
 
-#endif /* !___UIInformationGuestSession_h___ */
+#endif /* !___UIGuestSessionTreeItem_h___ */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIGuestSessionsEventHandler.cpp

@@ -24 +24 @@
 # include "UIExtraDataManager.h"
 # include "UIGuestSessionsEventHandler.h"
+# include "UIGuestSessionTreeItem.h"
 # include "UIMainEventListener.h"
 # include "VBoxGlobal.h"
@@ -564 +565 @@
                        << iterator.value()->guestSessionStatus();
         const GuestProcessMap& processMap = iterator.value()->guestProcessMap();
-        QITreeWidgetItem *treeItem = new QITreeWidgetItem(pTreeWidget, itemStringList);
+        UIGuestSessionTreeItem *treeItem = new UIGuestSessionTreeItem(pTreeWidget, itemStringList,
+                                                                      UIGuestSessionTreeItem::SessionTreeItem);
         pTreeWidget->insertTopLevelItem(iterator.key(), treeItem);
         for (GuestProcessMap::const_iterator processIterator = processMap.begin();
@@ -573 +575 @@
                               << processIterator.value()->guestProcessName()
                               << processIterator.value()->guestProcessStatus();
-            new QTreeWidgetItem(treeItem, processStringList);
+            new UIGuestSessionTreeItem(treeItem, processStringList, UIGuestSessionTreeItem::ProcessTreeItem);
         }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationGuestSession.cpp

@@ -27 +27 @@
 # include "QITreeWidget.h"
 # include "UIInformationGuestSession.h"
+# include "UIGuestSessionTreeItem.h"
 # include "UIGuestSessionsEventHandler.h"
 # include "VBoxGlobal.h"