Changeset 88903 in vbox

Timestamp:

May 6, 2021 1:47:30 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161. Saving log viewer widget options immediately as they change.

Location:

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

Files:

• UIVMLogViewerDialog.cpp (modified) (1 diff)
• UIVMLogViewerDialog.h (modified) (1 diff)
• UIVMLogViewerWidget.cpp (modified) (12 diffs)
• UIVMLogViewerWidget.h (modified) (4 diffs)

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

@@ -66 +66 @@
     , m_comMachine(comMachine)
 {
+}
+
+UIVMLogViewerDialog::~UIVMLogViewerDialog()
+{
+    UIVMLogViewerWidget *pWidget = qobject_cast<UIVMLogViewerWidget*>(widget());
+    if (pWidget)
+        pWidget->setDialogBeingClosed(true);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.h

@@ -78 +78 @@
       * @param  comMachine     Brings the machine reference. */
     UIVMLogViewerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CMachine &comMachine);
+    ~UIVMLogViewerDialog();
 
 protected:

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

@@ -164 +164 @@
     , m_pCornerButton(0)
     , m_pMachineSelectionMenu(0)
+    , m_fDialogBeingClosed(false)
 {
     /* Prepare VM Log-Viewer: */
@@ -289 +290 @@
 }
 
+void UIVMLogViewerWidget::setDialogBeingClosed(bool fFlag)
+{
+    m_fDialogBeingClosed = fFlag;
+}
+
 bool UIVMLogViewerWidget::shouldBeMaximized() const
 {
@@ -294 +300 @@
 }
 
-void UIVMLogViewerWidget::sltSaveOptions()
-{
+void UIVMLogViewerWidget::saveOptions()
+{
+    gEDataManager->setLogViweverOptions(m_font, m_bWrapLines, m_bShowLineNumbers);
+}
+
+void UIVMLogViewerWidget::savePanelVisibility()
+{
+    if (m_fDialogBeingClosed)
+        return;
     /* Save a list of currently visible panels: */
     QStringList strNameList;
@@ -301 +314 @@
         strNameList.append(pPanel->panelName());
     gEDataManager->setLogViewerVisiblePanels(strNameList);
-    gEDataManager->setLogViweverOptions(m_font, m_bWrapLines, m_bShowLineNumbers);
 }
 
@@ -508 +520 @@
             pLogPage->setShowLineNumbers(m_bShowLineNumbers);
     }
+    saveOptions();
 }
 
@@ -523 +536 @@
             pLogPage->setWrapLines(m_bWrapLines);
     }
+    saveOptions();
 }
 
@@ -536 +550 @@
             pLogPage->setCurrentFont(m_font);
     }
+    saveOptions();
 }
 
@@ -549 +564 @@
             pLogPage->setCurrentFont(m_font);
     }
+    saveOptions();
 }
 
@@ -563 +579 @@
         m_pOptionsPanel->setFontSizeInPoints(m_font.pointSize());
     }
+    saveOptions();
 }
 
@@ -766 +783 @@
     if (loadedFont != QFont())
         m_font = loadedFont;
-    connect(&uiCommon(), &UICommon::sigAskToCommitData,
-            this, &UIVMLogViewerWidget::sltSaveOptions);
 }
 
@@ -1054 +1069 @@
     m_visiblePanelsList.removeOne(panel);
     manageEscapeShortCut();
+    savePanelVisibility();
 }
 
@@ -1069 +1085 @@
         m_visiblePanelsList.push_back(panel);
     manageEscapeShortCut();
+    savePanelVisibility();
 }
 

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

@@ -89 +89 @@
     QFont currentFont() const;
 
+    /** Sets m_fDialogBeingClosed. */
+    void setDialogBeingClosed(bool fFlag);
+
 protected:
 
@@ -95 +98 @@
 
 private slots:
-
-    /** Saves options.  */
-    void sltSaveOptions();
 
     /** Rereads the log file shown in the current tab. */
@@ -152 +152 @@
         /** Prepares toolbar. */
         void prepareToolBar();
+        void saveOptions();
         /** Loads options.  */
         void loadOptions();
+        void savePanelVisibility();
         /** Shows the panels that have been visible the last time logviewer is closed. */
         void restorePanelVisibility();
@@ -246 +248 @@
     QIToolButton *m_pCornerButton;
     UIMachineListMenu *m_pMachineSelectionMenu;
+    /** This is set to true by the parent dialog. This is necessary not to save
+      * visible panel list during destruction since they are hidden automatically during that. */
+    bool m_fDialogBeingClosed;
     friend class UIVMLogViewerFilterPanel;
     friend class UIVMLogViewerPanel;