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

Timestamp:

May 5, 2021 12:38:50 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161. Saving extra data and closing com stuff not in dtor but in respective slots

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIGuestProcessControlWidget.cpp (modified) (4 diffs)
• guestctrl/UIGuestProcessControlWidget.h (modified) (2 diffs)
• logviewer/UIVMLogViewerWidget.cpp (modified) (2 diffs)
• runtime/information/UIVMInformationDialog.cpp (modified) (3 diffs)
• runtime/information/UIVMInformationDialog.h (modified) (2 diffs)
• softkeyboard/UISoftKeyboard.cpp (modified) (3 diffs)
• softkeyboard/UISoftKeyboard.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.cpp

@@ -315 +315 @@
 UIGuestProcessControlWidget::~UIGuestProcessControlWidget()
 {
-    saveSettings();
-    cleanupListener();
 }
 
@@ -393 +391 @@
                 this, &UIGuestProcessControlWidget::sltGuestSessionUnregistered);
     }
+    connect(&uiCommon(), &UICommon::sigAskToCommitData,
+            this, &UIGuestProcessControlWidget::sltSaveSettings);
+    connect(&uiCommon(), &UICommon::sigAskToDetachCOM,
+            this, &UIGuestProcessControlWidget::sltCleanupListener);
 }
 
@@ -558 +560 @@
 }
 
-void UIGuestProcessControlWidget::saveSettings()
+void UIGuestProcessControlWidget::sltSaveSettings()
 {
     if (!m_pSplitter)
@@ -565 +567 @@
 }
 
-void UIGuestProcessControlWidget::cleanupListener()
+void UIGuestProcessControlWidget::sltCleanupListener()
 {
     /* Unregister everything: */

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.h

@@ -71 +71 @@
     void sltCloseSessionOrProcess();
     void sltShowProperties();
+    void sltSaveSettings();
+    void sltCleanupListener();
 
 private:
@@ -82 +84 @@
     void addGuestSession(CGuestSession guestSession);
     void loadSettings();
-    void cleanupListener();
-    void saveSettings();
 
     CGuest                    m_comGuest;

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -174 +174 @@
 UIVMLogViewerWidget::~UIVMLogViewerWidget()
 {
-    /* In machine UI context we perform cleanup during destruction.
-       UIMachineLogic makes sure this happens early enough: */
-    if (m_enmEmbedding == EmbedTo_Dialog)
-        sltSaveOptions();
 }
 
@@ -770 +766 @@
     if (loadedFont != QFont())
         m_font = loadedFont;
-    /* In manager UI we cleanup by listening the sigAskToCommitData signal: */
-    if (m_enmEmbedding == EmbedTo_Stack)
-        connect(&uiCommon(), &UICommon::sigAskToCommitData,
-                this, &UIVMLogViewerWidget::sltSaveOptions);
+    connect(&uiCommon(), &UICommon::sigAskToCommitData,
+            this, &UIVMLogViewerWidget::sltSaveOptions);
 }
 

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

@@ -69 +69 @@
 UIVMInformationDialog::~UIVMInformationDialog()
 {
-    saveSettings();
 }
 
@@ -118 +117 @@
 }
 
-void UIVMInformationDialog::saveSettings()
+void UIVMInformationDialog::sltSaveSettings()
 {
     /* Save window geometry: */
@@ -135 +134 @@
     /* Load settings: */
     loadSettings();
+    connect(&uiCommon(), &UICommon::sigAskToCommitData,
+            this, &UIVMInformationDialog::sltSaveSettings);
 }
 

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

@@ -73 +73 @@
     /** Handles tab-widget page change. */
     void sltHandlePageChanged(int iIndex);
+    void sltSaveSettings();
 
 private:
@@ -90 +91 @@
     /** Loads settings. */
     void loadSettings();
-    void saveSettings();
 
     /** @name Widget variables.

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -3867 +3867 @@
 UISoftKeyboard::~UISoftKeyboard()
 {
-    saveSettings();
-    keyboard().ReleaseKeys();
 }
 
@@ -4217 +4215 @@
 
     connect(this, &UISoftKeyboard::sigHelpRequested, &msgCenter(), &UIMessageCenter::sltHandleHelpRequest);
-}
-
-void UISoftKeyboard::saveSettings()
+    connect(&uiCommon(), &UICommon::sigAskToCommitData, this, &UISoftKeyboard::sltSaveSettings);
+    connect(&uiCommon(), &UICommon::sigAskToCommitData, this, &UISoftKeyboard::sltReleaseKeys);
+}
+
+void UISoftKeyboard::sltSaveSettings()
 {
     /* Save geometry to extradata: */
@@ -4243 +4243 @@
 }
 
+void UISoftKeyboard::sltReleaseKeys()
+{
+    keyboard().ReleaseKeys();
+}
+
 void UISoftKeyboard::loadSettings()
 {

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.h

@@ -104 +104 @@
     void sltResetKeyboard();
     void sltHandleHelpRequest();
+    void sltSaveSettings();
+    void sltReleaseKeys();
 
 private:
@@ -109 +111 @@
     void prepareObjects();
     void prepareConnections();
-    void saveSettings();
     void loadSettings();
     void configure();