Changeset 88659 in vbox for trunk/src

Timestamp:

Apr 22, 2021 3:59:04 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: Rework Log Viewer a bit; Save options on corresponding signal instead of call from destructor.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

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

-              r88658
+              r88659
+}
-UIVMLogViewerWidget::~UIVMLogViewerWidget()
+{
-    /* Cleanup VM Log-Viewer: */
-    cleanup();
+}
 int UIVMLogViewerWidget::defaultLogPageWidth() const
+{
 …
     if (m_pMachineSelectionMenu)
         m_pMachineSelectionMenu->move(0, 40);
+}
+void UIVMLogViewerWidget::sltSaveOptions()
+{
+    /* Save a list of currently visible panels: */
+    QStringList strNameList;
+    foreach(UIDialogPanel* pPanel, m_visiblePanelsList)
+        strNameList.append(pPanel->panelName());
+    gEDataManager->setLogViewerVisiblePanels(strNameList);
+    gEDataManager->setLogViweverOptions(m_font, m_bWrapLines, m_bShowLineNumbers);
+}
 …
     if (loadedFont != QFont())
         m_font = loadedFont;
+    connect(&uiCommon(), &UICommon::sigAskToCommitData,
+            this, &UIVMLogViewerWidget::sltSaveOptions);
+}
 …
+        }
+    }
+}
-void UIVMLogViewerWidget::saveOptions()
+{
-    /* Save a list of currently visible panels: */
-    QStringList strNameList;
-    foreach(UIDialogPanel* pPanel, m_visiblePanelsList)
-        strNameList.append(pPanel->panelName());
-    gEDataManager->setLogViewerVisiblePanels(strNameList);
-    gEDataManager->setLogViweverOptions(m_font, m_bWrapLines, m_bShowLineNumbers);
+}
-void UIVMLogViewerWidget::cleanup()
+{
-    /* Save options: */
-    saveOptions();
+}

-              r88658
+              r88659
     UIVMLogViewerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
                         bool fShowToolbar = true, const CMachine &comMachine = CMachine(), QWidget *pParent = 0);
-    /** Destructs the VM Log-Viewer. */
-    ~UIVMLogViewerWidget();
     /** Returns the width of the current log page. return 0 if there is no current log page: */
     int defaultLogPageWidth() const;
 …
 private slots:
+    /** Saves options.  */
+    void sltSaveOptions();
     /** Handles refresh action triggering. */
 …
         /** Shows the panels that have been visible the last time logviewer is closed. */
         void restorePanelVisibility();
-        /** Saves options.  */
-        void saveOptions();
-        /** Cleanups VM Log-Viewer. */
-        void cleanup();
     /** @} */

Note: See TracChangeset for help on using the changeset viewer.