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

Timestamp:

Jun 27, 2018 2:03:43 PM (7 years ago)

Author:

vboxsync

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

123230

Message:

FE/Qt: In logviewer check if the widget is being going away before managing close button

Location:

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

Files:

• UIVMLogViewerDialog.cpp (modified) (2 diffs)
• UIVMLogViewerDialog.h (modified) (4 diffs)
• UIVMLogViewerWidget.cpp (modified) (3 diffs)
• UIVMLogViewerWidget.h (modified) (2 diffs)

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

@@ -58 +58 @@
     : QIWithRetranslateUI<QIManagerDialog>(pCenterWidget)
     , m_comMachine(machine)
+    , pWidget(0)
 {
+}
+
+UIVMLogViewerDialog::~UIVMLogViewerDialog()
+{
+    if (pWidget)
+        pWidget->setBeingClosed(true);
 }
 
@@ -74 +81 @@
 {
     /* Create widget: */
-    UIVMLogViewerWidget *pWidget = new UIVMLogViewerWidget(EmbedTo_Dialog, this, m_comMachine);
+    pWidget = new UIVMLogViewerWidget(EmbedTo_Dialog, this, m_comMachine);
     if (pWidget)
     {

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

@@ -36 +36 @@
 class QVBoxLayout;
 class UIVMLogViewerDialog;
+class UIVMLogViewerWidget;
 class CMachine;
 
@@ -44 +45 @@
 public:
     UIVMLogViewerDialogFactory(const CMachine &machine);
-
+    
 protected:
     /** Creates derived @a pDialog instance.
@@ -62 +63 @@
 
     UIVMLogViewerDialog(QWidget *pCenterWidget, const CMachine &machine);
+    ~UIVMLogViewerDialog();
 
 protected:
@@ -84 +86 @@
     void retranslateUi();
     CMachine m_comMachine;
+    UIVMLogViewerWidget *pWidget;
 };
 

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

@@ -79 +79 @@
     , m_bWrapLines(false)
     , m_font(QFontDatabase::systemFont(QFontDatabase::FixedFont))
+    , m_fBeingClosed(false)
 {
     /* Prepare VM Log-Viewer: */
@@ -853 +854 @@
 void UIVMLogViewerWidget::manageEscapeShortCut()
 {
+    if (m_fBeingClosed)
+        return;
     /* if there is no visible panels give the escape shortcut to parent dialog: */
     if (m_visiblePanelsList.isEmpty())
@@ -999 +1002 @@
     return logPage->currentFont();
 }
+
+void UIVMLogViewerWidget::setBeingClosed(bool flag)
+{
+    m_fBeingClosed = flag;
+}

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

@@ -75 +75 @@
     /** Sets the machine whose logs to show. */
     void setMachine(const CMachine &machine);
-
     QFont currentFont() const;
+    void setBeingClosed(bool flag);
 
 protected:
@@ -229 +229 @@
         QFont m_font;
     /** @} */
-
+    bool m_fBeingClosed;
     friend class UIVMLogViewerBookmarksPanel;
     friend class UIVMLogViewerFilterPanel;