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

Timestamp:

May 14, 2021 2:59:39 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161. saving log viewer dialog's geometry in a delayed fashion

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIGuestProcessControlWidget.cpp (modified) (7 diffs)
• guestctrl/UIGuestProcessControlWidget.h (modified) (2 diffs)
• logviewer/UIVMLogViewerDialog.cpp (modified) (2 diffs)
• logviewer/UIVMLogViewerDialog.h (modified) (2 diffs)
• runtime/information/UIVMInformationDialog.h (modified) (1 diff)

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

@@ -19 +19 @@
 #include <QApplication>
 #include <QMenu>
-#include <QSplitter>
 #include <QVBoxLayout>
 
@@ -296 +295 @@
     , m_comGuest(comGuest)
     , m_pMainLayout(0)
-    , m_pSplitter(0)
     , m_pTreeWidget(0)
     , m_enmEmbedding(enmEmbedding)
@@ -309 +307 @@
     prepareToolBar();
     initGuestSessionTree();
-    loadSettings();
     retranslateUi();
 }
@@ -338 +335 @@
     /* Configure layout: */
     m_pMainLayout->setSpacing(0);
-
-    m_pSplitter = new QSplitter;
-
-    if (!m_pSplitter)
-        return;
-
-    m_pSplitter->setOrientation(Qt::Vertical);
-
-    m_pMainLayout->addWidget(m_pSplitter);
-
-
     m_pTreeWidget = new UIGuestControlTreeWidget;
 
     if (m_pTreeWidget)
     {
-        m_pSplitter->addWidget(m_pTreeWidget);
+        m_pMainLayout->addWidget(m_pTreeWidget);
         m_pTreeWidget->setColumnCount(3);
     }
-
-    m_pSplitter->setStretchFactor(0, 2);
-    m_pSplitter->setStretchFactor(1, 1);
-
     updateTreeWidget();
 }
@@ -392 +374 @@
                 this, &UIGuestProcessControlWidget::sltGuestSessionUnregistered);
     }
-    connect(&uiCommon(), &UICommon::sigAskToCommitData,
-            this, &UIGuestProcessControlWidget::sltSaveSettings);
 }
 
@@ -559 +539 @@
 }
 
-void UIGuestProcessControlWidget::sltSaveSettings()
-{
-    if (!m_pSplitter)
-        return;
-    gEDataManager->setGuestControlProcessControlSplitterHints(m_pSplitter->sizes());
-}
-
 void UIGuestProcessControlWidget::sltCleanupListener()
 {
@@ -583 +556 @@
 }
 
-void UIGuestProcessControlWidget::loadSettings()
-{
-    if (!m_pSplitter)
-        return;
-    QList<int> splitterHints = gEDataManager->guestControlProcessControlSplitterHints();
-    if (splitterHints.size() != 2)
-        return;
-    if (splitterHints[0] != 0 && splitterHints[1] != 0)
-        m_pSplitter->setSizes(splitterHints);
-}
-
 #include "UIGuestProcessControlWidget.moc"

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

@@ -71 +71 @@
     void sltCloseSessionOrProcess();
     void sltShowProperties();
-    void sltSaveSettings();
     void sltCleanupListener();
 
@@ -83 +82 @@
     void updateTreeWidget();
     void addGuestSession(CGuestSession guestSession);
-    void loadSettings();
 
     CGuest                    m_comGuest;
     QVBoxLayout              *m_pMainLayout;
-    QSplitter                *m_pSplitter;
     UIGuestControlTreeWidget *m_pTreeWidget;
     const EmbedTo             m_enmEmbedding;

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

@@ -65 +65 @@
     , m_pActionPool(pActionPool)
     , m_comMachine(comMachine)
+    , m_iGeometrySaveTimerId(-1)
 {
 }
@@ -94 +95 @@
 }
 
-void UIVMLogViewerDialog::resizeEvent(QResizeEvent *pEvent)
-{
-    QIWithRetranslateUI<QIManagerDialog>::resizeEvent(pEvent);
-    saveDialogGeometry();
-}
-
-void UIVMLogViewerDialog::moveEvent(QMoveEvent *pEvent)
-{
-    QIWithRetranslateUI<QIManagerDialog>::moveEvent(pEvent);
-    saveDialogGeometry();
+bool UIVMLogViewerDialog::event(QEvent *pEvent)
+{
+    switch (pEvent->type())
+    {
+        case QEvent::Resize:
+        case QEvent::Move:
+        {
+            if (m_iGeometrySaveTimerId != -1)
+                killTimer(m_iGeometrySaveTimerId);
+            m_iGeometrySaveTimerId = startTimer(300);
+            break;
+        }
+        case QEvent::Timer:
+        {
+            QTimerEvent *pTimerEvent = static_cast<QTimerEvent*>(pEvent);
+            if (pTimerEvent->timerId() == m_iGeometrySaveTimerId)
+            {
+                killTimer(m_iGeometrySaveTimerId);
+                m_iGeometrySaveTimerId = -1;
+                saveDialogGeometry();
+            }
+            break;
+        }
+        default:
+            break;
+    }
+    return QIWithRetranslateUI<QIManagerDialog>::event(pEvent);
 }
 

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

@@ -86 +86 @@
         /** Handles translation event. */
         virtual void retranslateUi() /* override */;
-        virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
-        virtual void moveEvent(QMoveEvent *pEvent) /* override */;
+        virtual bool event(QEvent *pEvent) /* override */;
     /** @} */
 
@@ -123 +122 @@
     /** Holds the machine reference. */
     CMachine      m_comMachine;
+    int m_iGeometrySaveTimerId;
 };
 

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

@@ -94 +94 @@
     /** @name Widget variables.
      * @{ */
-    /** Holds the dialog tab-widget instance. */
-    QITabWidget                  *m_pTabWidget;
-    /** Holds the map of dialog tab instances. */
-    QMap<int, QWidget*>           m_tabs;
-    /** Holds the dialog button-box instance. */
-    QIDialogButtonBox            *m_pButtonBox;
-    /** Holds the machine-window reference. */
-    UIMachineWindow              *m_pMachineWindow;
+       /** Holds the dialog tab-widget instance. */
+       QITabWidget                  *m_pTabWidget;
+       /** Holds the map of dialog tab instances. */
+       QMap<int, QWidget*>           m_tabs;
+       /** Holds the dialog button-box instance. */
+       QIDialogButtonBox            *m_pButtonBox;
+       /** Holds the machine-window reference. */
+       UIMachineWindow              *m_pMachineWindow;
     /** @} */
     bool m_fCloseEmitted;