Changeset 80554 in vbox

Timestamp:

Sep 2, 2019 2:27:53 PM (6 years ago)

Author:

vboxsync

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

133061

Message:

FE/Qt: bugref:9510: Adding some missing connections.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIConsoleEventHandler.cpp (modified) (4 diffs)
• UIConsoleEventHandler.h (modified) (2 diffs)
• information/UIInformationConfiguration.cpp (modified) (3 diffs)
• information/UIInformationRuntime.cpp (modified) (7 diffs)
• information/UIInformationRuntime.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp

@@ -27 +27 @@
 
 /* COM includes: */
+#include "COMEnums.h"
 #include "CEventListener.h"
 #include "CEventSource.h"
@@ -81 +82 @@
     /** Notifies about audio adapter state change. */
     void sigAudioAdapterChange();
+    /** Notifies clipboard mode change. */
+    void sigClipboardModeChange(KClipboardMode enmMode);
+    /** Notifies drag and drop mode change. */
+    void sigDnDModeChange(KDnDMode enmMode);
 
 public:
@@ -270 +275 @@
             this, SLOT(sltShowWindow(qint64 &)),
             Qt::DirectConnection);
-    connect(m_pQtListener->getWrapped(), SIGNAL(sigAudioAdapterChange()),
-            this, SIGNAL(sigAudioAdapterChange()),
+    connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigAudioAdapterChange,
+            this, &UIConsoleEventHandlerProxy::sigAudioAdapterChange,
+            Qt::DirectConnection);
+   connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigClipboardModeChange,
+            this, &UIConsoleEventHandlerProxy::sigClipboardModeChange,
+            Qt::DirectConnection);
+   connect(m_pQtListener->getWrapped(), &UIMainEventListener::sigDnDModeChange,
+            this, &UIConsoleEventHandlerProxy::sigDnDModeChange,
             Qt::DirectConnection);
 }
@@ -434 +445 @@
             this, SIGNAL(sigAudioAdapterChange()),
             Qt::QueuedConnection);
+    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigClipboardModeChange,
+            this, &UIConsoleEventHandler::sigClipboardModeChange,
+            Qt::QueuedConnection);
+    connect(m_pProxy, &UIConsoleEventHandlerProxy::sigDnDModeChange,
+            this, &UIConsoleEventHandler::sigDnDModeChange,
+            Qt::QueuedConnection);
 }
 
 #include "UIConsoleEventHandler.moc"
-

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.h

@@ -87 +87 @@
     /** Notifies about audio adapter state change. */
     void sigAudioAdapterChange();
+    /** Notifies clipboard mode change. */
+    void sigClipboardModeChange(KClipboardMode enmMode);
+    /** Notifies drag and drop mode change. */
+    void sigDnDModeChange(KDnDMode enmMode);
 
 public:
@@ -123 +127 @@
 
 #endif /* !FEQT_INCLUDED_SRC_runtime_UIConsoleEventHandler_h */
-

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

@@ -71 +71 @@
 }
 
-
 void UIInformationConfiguration::createTableItems()
 {
@@ -140 +139 @@
     m_pTableWidget->resizeColumnToContents(2);
 }
-
-
 
 void UIInformationConfiguration::prepareObjects()
@@ -166 +163 @@
 }
 
-
-
 void UIInformationConfiguration::insertInfoRows(const UITextTable &table, const QFontMetrics &fontMetrics,
                                                 QTextDocument &textDocument, int &iMaxColumn1Length)

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

@@ -71 +71 @@
 /*********************************************************************************************************************************
 *   UIRuntimeInfoWidget definition.                                                                                     *
-******************************************************************1***************************************************************/
+*********************************************************************************************************************************/
+/** A QTablWidget extention to show some runtime attributes. Some of these are updated in response to IConsole events. Uptime field
+  * is updated thru a QTimer. */
 class UIRuntimeInfoWidget : public QIWithRetranslateUI<QTableWidget>
 {
@@ -1230 +1232 @@
     QVector<QString> allNames;// = new ArrayList<IUnknown>();
     QVector<CUnknown> allObjects;// = new ArrayList<IUnknown>();
-
     QVector<QString>  aReturnNames;
     QVector<CUnknown>  aReturnObjects;
@@ -1238 +1239 @@
     QVector<ULONG>  aReturnDataIndices;
     QVector<ULONG>  aReturnDataLengths;
-
+    /* Make a query to CPerformanceCollector to fetch some metrics (e.g RAM usage): */
     QVector<LONG> returnData = m_performanceMonitor.QueryMetricsData(m_nameList,
                                                                      m_objectList,
@@ -1250 +1251 @@
     quint64 iTotalRAM = 0;
     quint64 iFreeRAM = 0;
-
+    /* Parse the result we get from CPerformanceCollector to get respective values: */
     for (int i = 0; i < aReturnNames.size(); ++i)
     {
@@ -1366 +1367 @@
     m_performanceMonitor = uiCommon().virtualBox().GetPerformanceCollector();
     m_machineDebugger = m_console.GetDebugger();
-
     if (m_performanceMonitor.isNull())
         return;
@@ -1392 +1392 @@
     m_subMetrics.insert(m_strCPUMetricName, UIMetric(m_strCPUMetricName, "%", iMaximumQueueSize));
     {
-
         /* Network metric: */
         UIMetric networkMetric(m_strNetworkMetricName, "B", iMaximumQueueSize);
@@ -1542 +1541 @@
         return;
     }
-
     NetMetric.addData(0, iReceiveRate);
     NetMetric.addData(1, iTransmitRate);

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

@@ -152 +152 @@
 
 private slots:
-
+    /** Reads the metric values for several sources and calls corresponding update functions. */
     void sltTimeout();
-    void sltGuestAdditionsStateChange();
-    void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
-    void sltVRDEChange();
-    void sltClipboardChange(KClipboardMode enmMode);
-    void sltDnDModeChange(KDnDMode enmMode);
+    /** @name These functions are connected to API events and implement necessary updates.
+      * @{ */
+        void sltGuestAdditionsStateChange();
+        void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
+        void sltVRDEChange();
+        void sltClipboardChange(KClipboardMode enmMode);
+        void sltDnDModeChange(KDnDMode enmMode);
+    /** @} */
 
 private:
 
-    /** Prepares layout. */
     void prepareObjects();
     void prepareMetrics();
@@ -175 +177 @@
     QString dataColorString(const QString &strChartName, int iDataIndex);
     void runTimeAttributes();
-
     QVector<DebuggerMetricData> getTotalCounterFromDegugger(const QString &strQuery);