Changeset 105817 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 22, 2024 1:37:57 PM (8 months ago)

Author:

vboxsync

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

164530

Message:

FE/Qt: bugref:9437: Reworking GUI part; No need to pass excessive event attributes if they are not used after all; Pass QString by const ref; Do not propagate COM stuff from UISession to UIMachine as latter isn't working with COM stuff; Fixing notification-center NLS tag; Fixing coding-style.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMainEventListener.cpp (modified) (1 diff)
• globals/UIMainEventListener.h (modified) (1 diff)
• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• runtime/UIConsoleEventHandler.cpp (modified) (1 diff)
• runtime/UIConsoleEventHandler.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (2 diffs)
• runtime/UIMachine.h (modified) (3 diffs)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (2 diffs)

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

@@ -619 +619 @@
         {
             CClipboardErrorEvent comEventSpecific(pEvent);
-            emit sigClipboardError(comEventSpecific.GetId(), comEventSpecific.GetMsg(), comEventSpecific.GetRcError());
+            emit sigClipboardError(comEventSpecific.GetMsg());
             break;
         }

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

@@ -210 +210 @@
         void sigClipboardModeChange(KClipboardMode enmClipboardMode);
         /** Notifies about a clipboard error. */
-        void sigClipboardError(QString strId, QString strMsg, long rcError);
+        void sigClipboardError(const QString &strMsg);
         /** Notifies about the drag and drop mode change. */
         void sigDnDModeChange(KDnDMode enmDnDMode);

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -149 +149 @@
 
 /* static */
-void UINotificationMessage::showClipboardError(QString strId, QString strMsg, long rcError)
-{
-    RT_NOREF(strId, rcError);
-
-    UINotificationMessage::createMessage(
-        QApplication::translate("UIMessageCenter", "Shared Clipboard Error"),
-        QApplication::translate("UIMessageCenter", strMsg.toUtf8().constData()));
+void UINotificationMessage::warnAboutClipboardError(const QString &strMsg)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Shared clipboard error ..."),
+        strMsg.toUtf8().constData());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -110 +110 @@
         static void warnAboutInvalidEncryptionPassword(const QString &strPasswordId);
         /** Notifies about a clipboard error. */
-        static void showClipboardError(QString strId, QString strMsg, long rcError);
+        static void warnAboutClipboardError(const QString &strMsg);
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

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

@@ -97 +97 @@
     void sigClipboardModeChange(KClipboardMode enmMode);
     /** Notifies about a clipboard error. */
-    void sigClipboardError(QString strId, QString strMsg, long rcError);
+    void sigClipboardError(const QString &strMsg);
     /** Notifies drag and drop mode change. */
     void sigDnDModeChange(KDnDMode enmMode);

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

@@ -107 +107 @@
     void sigClipboardModeChange(KClipboardMode enmMode);
     /** Notifies about a clipboard error. */
-    void sigClipboardError(QString strId, QString strMsg, long rcError);
+    void sigClipboardError(const QString &strMsg);
     /** Notifies drag and drop mode change. */
     void sigDnDModeChange(KDnDMode enmMode);

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

@@ -1105 +1105 @@
 {
     uisession()->sltMountDVDAdHoc(strSource);
-}
-
-void UIMachine::sltClipboardError(QString strId, QString strMsg, long rcError)
-{
-    UINotificationMessage::showClipboardError(strId, strMsg, rcError);
 }
 
@@ -1557 +1552 @@
     connect(uisession(), &UISession::sigClipboardModeChange,
             this, &UIMachine::sigClipboardModeChange);
-    connect(uisession(), &UISession::sigClipboardError,
-            this, &UIMachine::sltClipboardError);
     connect(uisession(), &UISession::sigCPUExecutionCapChange,
             this, &UIMachine::sigCPUExecutionCapChange);

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

@@ -98 +98 @@
         /** Notifies about clipboard mode change. */
         void sigClipboardModeChange(KClipboardMode enmMode);
-        /** Notifies about a clipboard error. */
-        void sigClipboardError(QString strId, QString strMsg, long rcError);
         /** Notifies about CPU execution cap change. */
         void sigCPUExecutionCapChange();
@@ -750 +748 @@
     /** @} */
 
-    /** @name Clipboard stuff.
-     ** @{ */
-        /** Handles clipboard errors. */
-        void sltClipboardError(QString strId, QString strMsg, long rcError);
-    /** @} */
-
     /** @name Keyboard stuff.
      ** @{ */
@@ -809 +801 @@
         /** Handles host-screen available-area change. */
         void sltHandleHostScreenAvailableAreaChange();
+
 #ifdef VBOX_WS_MAC
         /** macOS X: Restarts display-reconfiguration watchdog timer from the beginning.

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

@@ -2477 +2477 @@
 }
 
+void UISession::sltClipboardError(const QString &strMsg)
+{
+    UINotificationMessage::warnAboutClipboardError(strMsg);
+}
+
 void UISession::sltHandleMachineStateSaved(bool fSuccess)
 {
@@ -2590 +2595 @@
             this, &UISession::sigClipboardModeChange);
     connect(m_pConsoleEventhandler, &UIConsoleEventHandler::sigClipboardError,
-            this, &UISession::sigClipboardError);
+            this, &UISession::sltClipboardError);
     connect(m_pConsoleEventhandler, &UIConsoleEventHandler::sigCPUExecutionCapChange,
             this, &UISession::sigCPUExecutionCapChange);

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

@@ -95 +95 @@
         /** Notifies about clipboard mode change. */
         void sigClipboardModeChange(KClipboardMode enmMode);
-        /** Notifies about a clipboard error. */
-        void sigClipboardError(QString strId, QString strMsg, long rcError);
         /** Notifies about CPU execution cap change. */
         void sigCPUExecutionCapChange();
@@ -647 +645 @@
     /** @} */
 
+    /** @name Clipboard stuff.
+     ** @{ */
+        /** Handles clipboard errors. */
+        void sltClipboardError(const QString &strMsg);
+    /** @} */
+
     /** @name Close stuff.
      ** @{ */