Changeset 71059 in vbox

Timestamp:

Feb 19, 2018 4:32:29 PM (7 years ago)

Author:

vboxsync

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

120922

Message:

FE/Qt: bugref:6699 Initialize guest session tree widget correctly

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl

Files:

• UIGuestControlTreeItem.cpp (modified) (5 diffs)
• UIGuestControlTreeItem.h (modified) (1 diff)
• UIInformationGuestSession.cpp (modified) (4 diffs)
• UIInformationGuestSession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlTreeItem.cpp

@@ -195 +195 @@
 {
     prepare();
+    initProcessSubTree();
 }
 
@@ -203 +204 @@
 {
     prepare();
-
+    initProcessSubTree();
 }
 
@@ -240 +241 @@
 }
 
+void UIGuestSessionTreeItem::initProcessSubTree()
+{
+    if (!m_comGuestSession.isOk())
+        return;
+    QVector<CGuestProcess> processes = m_comGuestSession.GetProcesses();
+    for(int  i =0; i < processes.size(); ++i)
+        addGuestProcess(processes[i]);
+}
+
 void UIGuestSessionTreeItem::sltGuestSessionUpdated()
 {
@@ -250 +260 @@
     if (!guestProcess.isOk())
         return;
+    addGuestProcess(guestProcess);
+}
+
+void UIGuestSessionTreeItem::addGuestProcess(CGuestProcess guestProcess)
+{
     QStringList strList;
     strList
@@ -255 +270 @@
         << QString("Process Name: %1").arg(guestProcess.GetName())
         << QString("Process Status: %1").arg(processStatusString(guestProcess.GetStatus()));
+
     /*UIGuestProcessTreeItem *newItem = */new UIGuestProcessTreeItem(this, guestProcess, strList);
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlTreeItem.h

@@ -96 +96 @@
     virtual void cleanupListener()  /* override */;
     virtual void setColumnText()  /* override */;
-
+    void addGuestProcess(CGuestProcess guestProcess);
+    void initProcessSubTree();
     CGuestSession m_comGuestSession;
 

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

@@ -135 +135 @@
 private slots:
 
-    void sltExpandAll(bool bExpand)
+    void sltExpandAll()
     {
         expandCollapseAll(true);
@@ -177 +177 @@
     prepareObjects();
     prepareConnections();
+    initGuestSessionTree();
 }
 
@@ -331 +332 @@
 }
 
+void UIInformationGuestSession::initGuestSessionTree()
+{
+    if (!m_comGuest.isOk())
+        return;
+
+    QVector<CGuestSession> sessions = m_comGuest.GetSessions();
+    for (int i = 0; i < sessions.size(); ++i)
+    {
+        addGuestSession(sessions.at(i));
+    }
+}
+
 void UIInformationGuestSession::cleanupListener()
 {
@@ -357 +370 @@
     if (!guestSession.isOk())
         return;
-
+    addGuestSession(guestSession);
+}
+
+void UIInformationGuestSession::addGuestSession(CGuestSession guestSession)
+{
     UIGuestSessionTreeItem* sessionTreeItem = new UIGuestSessionTreeItem(m_pTreeWidget, guestSession);
     connect(sessionTreeItem, &UIGuestSessionTreeItem::sigGuessSessionUpdated,

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIInformationGuestSession.h

@@ -66 +66 @@
     void prepareConnections();
     void prepareListener();
+    void initGuestSessionTree();
     void updateTreeWidget();
     void cleanupListener();
+    void addGuestSession(CGuestSession guestSession);
+
     CGuest                    m_comGuest;
     QVBoxLayout              *m_pMainLayout;