Changeset 80543 in vbox for trunk/src

Timestamp:

Sep 2, 2019 9:34:46 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510: Updating Clipboard and DnD modes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMainEventListener.cpp (modified) (3 diffs)
• globals/UIMainEventListener.h (modified) (2 diffs)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (2 diffs)
• runtime/information/UIInformationRuntime.cpp (modified) (12 diffs)
• runtime/information/UIInformationRuntime.h (modified) (1 diff)

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

@@ -27 +27 @@
 #include "COMEnums.h"
 #include "CCanShowWindowEvent.h"
+#include "CClipboardModeChangedEvent.h"
 #include "CCursorPositionChangedEvent.h"
+#include "CDnDModeChangedEvent.h"
 #include "CEvent.h"
 #include "CEventSource.h"
@@ -523 +525 @@
             break;
         }
-
+        case KVBoxEventType_OnClipboardModeChanged:
+        {
+            CClipboardModeChangedEvent comEventSpecific(pEvent);
+            emit sigClipboardModeChange(comEventSpecific.GetClipboardMode());
+            break;
+        }
+        case KVBoxEventType_OnDnDModeChanged:
+        {
+            CDnDModeChangedEvent comEventSpecific(pEvent);
+            emit sigDnDModeChange(comEventSpecific.GetDndMode());
+            break;
+        }
         default: break;
     }
@@ -534 +547 @@
 
 #include "UIMainEventListener.moc"
-

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h

@@ -167 +167 @@
         /** Notifies about audio adapter state change. */
         void sigAudioAdapterChange();
+        /** Notifies about the clipboard mode change. */
+        void sigClipboardModeChange(KClipboardMode enmClipboardMode);
+        /** Notifies about the drag and drop mode change. */
+        void sigDnDModeChange(KDnDMode enmDnDMode);
     /** @} */
 
@@ -216 +220 @@
 
 #endif /* !FEQT_INCLUDED_SRC_globals_UIMainEventListener_h */
-

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

@@ -800 +800 @@
     emit sigAudioAdapterChange();
 
+}
+
+void UISession::sltClipboardModeChange(KClipboardMode enmMode)
+{
+    emit sigClipboardModeChange(enmMode);
+}
+
+void UISession::sltDnDModeChange(KDnDMode enmMode)
+{
+    emit sigDnDModeChange(enmMode);
 }
 
@@ -1189 +1199 @@
     connect(gConsoleEvents, SIGNAL(sigAudioAdapterChange()),
             this, SLOT(sltAudioAdapterChange()));
+
+    connect(gConsoleEvents, SIGNAL(sigClipboardModeChange(KClipboardMode)),
+            this, SLOT(sltClipboardModeChange(KClipboardMode)));
+
+    connect(gConsoleEvents, SIGNAL(sigDnDModeChange(KDnDMode)),
+            this, SLOT(sltDnDModeChange(KDnDMode)));
 }
 

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

@@ -336 +336 @@
     void sigGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
     void sigAudioAdapterChange();
+    void sigClipboardModeChange(KClipboardMode enmMode);
+    void sigDnDModeChange(KDnDMode enmMode);
 
     /** Notifies about host-screen count change. */
@@ -388 +390 @@
     /** Handles audio adapter change. */
     void sltAudioAdapterChange();
+    /** Handles clip board mode change. */
+    void sltClipboardModeChange(KClipboardMode enmMode);
+    /** Handles drag and drop mode change. */
+    void sltDnDModeChange(KDnDMode enmMode);
 
     /* Handlers: Display reconfiguration stuff: */

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

@@ -80 +80 @@
 
     UIRuntimeInfoWidget(QWidget *pParent, const CMachine &machine, const CConsole &console);
-    void guestMonitorChange(ulong uScreenId);
-    void guestAdditionStateChange();
-    void VRDEChange();
+    void updateScreenInfo(int iScreenId = -1);
+    void updateGAsVersion();
+    void updateVRDE();
+    void updateClipboardMode(KClipboardMode enmMode = KClipboardMode_Max);
+    void updateDnDMode(KDnDMode enmMode = KDnDMode_Max);
 
 protected:
@@ -97 +99 @@
 
     void createInfoRows();
-    void updateScreenInfo(int iScreenId = -1);
     void updateUpTime();
-    void updateGAsVersion();
-    void updateVRDE();
+
+
     /** Searches the table for the @p item of enmLine and replaces its text. if not found inserts a new
       * row to the end of the table. Assumes only one line of the @p enmLine exists. */
@@ -234 +235 @@
 {
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
+    setAlternatingRowColors(true);
     m_iFontHeight = QFontMetrics(font()).height();
 
@@ -266 +267 @@
     computeMinimumWidth();
 }
-
-void UIRuntimeInfoWidget::guestMonitorChange(ulong uScreenId)
-{
-    updateScreenInfo(uScreenId);
-}
-
-void UIRuntimeInfoWidget::guestAdditionStateChange()
-{
-    updateGAsVersion();
-}
-
-void UIRuntimeInfoWidget::VRDEChange()
-{
-    updateVRDE();
-}
-
 
 void UIRuntimeInfoWidget::retranslateUi()
@@ -423 +408 @@
 void UIRuntimeInfoWidget::updateVRDE()
 {
-    /* VRDE information: */
     int iVRDEPort = m_console.GetVRDEServerInfo().GetPort();
     QString strVRDEInfo = (iVRDEPort == 0 || iVRDEPort == -1) ?
         m_strNotAvailable : QString("%1").arg(iVRDEPort);
    updateInfoRow(InfoRow_RemoteDesktop, QString("%1:").arg(m_strRemoteDesktopLabel), strVRDEInfo);
+}
+
+void UIRuntimeInfoWidget::updateClipboardMode(KClipboardMode enmMode /* = KClipboardMode_Max */)
+{
+    if (enmMode == KClipboardMode_Max)
+        updateInfoRow(InfoRow_ClipboardMode, QString("%1:").arg(m_strClipboardModeLabel),
+                      gpConverter->toString(m_machine.GetClipboardMode()));
+    else
+        updateInfoRow(InfoRow_ClipboardMode, QString("%1:").arg(m_strClipboardModeLabel),
+                      gpConverter->toString(enmMode));
+}
+
+void UIRuntimeInfoWidget::updateDnDMode(KDnDMode enmMode /* = KDnDMode_Max */)
+{
+    if (enmMode == KDnDMode_Max)
+        updateInfoRow(InfoRow_DnDMode, QString("%1:").arg(m_strDragAndDropLabel),
+                  gpConverter->toString(m_machine.GetDnDMode()));
+    else
+        updateInfoRow(InfoRow_DnDMode, QString("%1:").arg(m_strDragAndDropLabel),
+                      gpConverter->toString(enmMode));
 }
 
@@ -452 +456 @@
     updateUpTime();
 
-    /* Determine clipboard mode: */
-    QString strClipboardMode = gpConverter->toString(m_machine.GetClipboardMode());
-    /* Determine Drag&Drop mode: */
-    QString strDnDMode = gpConverter->toString(m_machine.GetDnDMode());
 
     /* Determine virtualization attributes: */
@@ -496 +496 @@
         strOSType = uiCommon().vmGuestOSTypeDescription(strOSType);
 
-
-    insertInfoRow(InfoRow_ClipboardMode, QString("%1:").arg(m_strClipboardModeLabel), strClipboardMode);
-    insertInfoRow(InfoRow_DnDMode, QString("%1:").arg(m_strDragAndDropLabel), strDnDMode);
+    updateClipboardMode();
+    updateDnDMode();
     insertInfoRow(InfoRow_ExecutionEngine, QString("%1:").arg(m_strExcutionEngineLabel), strExecutionEngine);
     insertInfoRow(InfoRow_NestedPaging, QString("%1:").arg(m_strNestedPagingLabel), strNestedPaging);
@@ -506 +505 @@
     insertInfoRow(InfoRow_GuestOSType, QString("%1:").arg(m_strGuestOSTypeLabel), strOSType);
     updateVRDE();
-
 
     resizeColumnToContents(0);
@@ -1119 +1117 @@
     connect(pSession, &UISession::sigGuestMonitorChange, this, &UIInformationRuntime::sltGuestMonitorChange);
     connect(pSession, &UISession::sigVRDEChange, this, &UIInformationRuntime::sltVRDEChange);
+    connect(pSession, &UISession::sigClipboardModeChange, this, &UIInformationRuntime::sltClipboardChange);
+    connect(pSession, &UISession::sigDnDModeChange, this, &UIInformationRuntime::sltDnDModeChange);
 
     prepareMetrics();
@@ -1371 +1371 @@
 {
     if (m_pRuntimeInfoWidget)
-        m_pRuntimeInfoWidget->guestAdditionStateChange();
+        m_pRuntimeInfoWidget->updateGAsVersion();
     bool fGuestAdditionsAvailable = guestAdditionsAvailable(6 /* minimum major version */);
     if (m_fGuestAdditionsAvailable == fGuestAdditionsAvailable)
@@ -1384 +1384 @@
     Q_UNUSED(screenGeo);
     if (m_pRuntimeInfoWidget)
-        m_pRuntimeInfoWidget->guestMonitorChange(uScreenId);
+        m_pRuntimeInfoWidget->updateScreenInfo(uScreenId);
 }
 
@@ -1390 +1390 @@
 {
     if (m_pRuntimeInfoWidget)
-        m_pRuntimeInfoWidget->VRDEChange();
+        m_pRuntimeInfoWidget->updateVRDE();
+}
+
+void UIInformationRuntime::sltClipboardChange(KClipboardMode enmMode)
+{
+    if (m_pRuntimeInfoWidget)
+        m_pRuntimeInfoWidget->updateClipboardMode(enmMode);
+}
+
+void UIInformationRuntime::sltDnDModeChange(KDnDMode enmMode)
+{
+    if (m_pRuntimeInfoWidget)
+        m_pRuntimeInfoWidget->updateDnDMode(enmMode);
 }
 

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

@@ -157 +157 @@
     void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
     void sltVRDEChange();
+    void sltClipboardChange(KClipboardMode enmMode);
+    void sltDnDModeChange(KDnDMode enmMode);
 
 private: