Changeset 70139 in vbox for trunk/src/VBox

Timestamp:

Dec 15, 2017 10:59:25 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: ​bugref:9072 Save/load the geometry of the logviewer dialog to/from extradata

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIManagerDialog.cpp (modified) (3 diffs)
• extensions/QIManagerDialog.h (modified) (4 diffs)
• logviewer/UIVMLogViewerDialog.cpp (modified) (2 diffs)
• logviewer/UIVMLogViewerDialog.h (modified) (1 diff)
• logviewer/UIVMLogViewerWidget.cpp (modified) (2 diffs)
• logviewer/UIVMLogViewerWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp

@@ -108 +108 @@
     /* Center according requested widget: */
     VBoxGlobal::centerWidget(this, pCenterWidget, false);
+
+    /* Load the dialog's settings from extradata */
+    loadSettings();
 }
 
@@ -211 +214 @@
 void QIManagerDialog::cleanup()
 {
+    saveSettings();
     /* Cleanup menu-bar: */
     cleanupMenuBar();
@@ -223 +227 @@
 }
 
+void QIManagerDialog::setDialogGeometry(const QRect &geometry)
+{
+#ifdef VBOX_WS_MAC
+    /* Use the old approach for OSX: */
+    move(geometry.topLeft());
+    resize(geometry.size());
+#else /* VBOX_WS_MAC */
+    /* Use the new approach for Windows/X11: */
+    VBoxGlobal::setTopLevelGeometry(this, geometry);
+#endif /* !VBOX_WS_MAC */
+
+    /* Maximize (if necessary): */
+    if (shouldBeMaximized())
+        showMaximized();
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h

@@ -124 +124 @@
           * @note Injected into prepare(), reimplement to postprocess all there. */
         virtual void finalize() {}
+        /** Loads dialog setting such as geometry from extradata. */
+        virtual void loadSettings() {}
 
         /** Cleanup menu-bar.
@@ -131 +133 @@
           * @note Normally you don't need to reimplement it. */
         void cleanup();
+        /** Saves dialog setting such as geometry into extradata. */
+        virtual void saveSettings() const {}
+
     /** @} */
 
@@ -150 +155 @@
         /** Returns button of passed @a enmType. */
         QPushButton *button(ButtonType enmType) { return m_buttons.value(enmType); }
+        /** Returns center widget. */
+        QWidget* centerWidget() const { return pCenterWidget; }
     /** @} */
 
@@ -158 +165 @@
     /** @} */
 
+        /** @name Functions related to geometry restoration.
+         * @{ */
+        /* Sets the position and size of the dialog. */
+        void setDialogGeometry(const QRect &geometry);
+        /** Returns whether the window should be maximized when geometry being restored. */
+        virtual bool shouldBeMaximized() const { return false; }
+        /** @} */
+
 private:
 

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

@@ -33 +33 @@
 
 /* GUI includes: */
+# include "UIDesktopWidgetWatchdog.h"
+# include "UIExtraDataManager.h"
 # include "UIIconPool.h"
 # include "UIVMLogViewerDialog.h"
 # include "UIVMLogViewerWidget.h"
+# include "VBoxGlobal.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -94 +97 @@
 }
 
+void UIVMLogViewerDialog::loadSettings()
+{
+    const UIVMLogViewerWidget *pWidget = qobject_cast<const UIVMLogViewerWidget *>(widget());
+
+    /* Restore window geometry: */
+    /* Getting available geometry to calculate default geometry: */
+    const QRect desktopRect = gpDesktop->availableGeometry(this);
+    int iDefaultWidth = desktopRect.width() / 2;
+    int iDefaultHeight = desktopRect.height() * 3 / 4;
+
+    /* Try obtain the default width of the current logviewer */
+    if (pWidget)
+    {
+        int width =  pWidget->defaultLogPageWidth();
+        if (width != 0)
+            iDefaultWidth = width;
+    }
+
+    QRect defaultGeometry(0, 0, iDefaultWidth, iDefaultHeight);
+    if (centerWidget())
+        defaultGeometry.moveCenter(centerWidget()->geometry().center());
+
+    /* Load geometry from extradata: */
+    QRect geometry = gEDataManager->logWindowGeometry(this, defaultGeometry);
+
+    /* Restore geometry: */
+    LogRel2(("GUI: UIVMLogViewer: Restoring geometry to: Origin=%dx%d, Size=%dx%d\n",
+             geometry.x(), geometry.y(), geometry.width(), geometry.height()));
+    setDialogGeometry(geometry);
+}
+
+void UIVMLogViewerDialog::saveSettings() const
+{
+    /* Save window geometry to extradata: */
+    const QRect saveGeometry = geometry();
+#ifdef VBOX_WS_MAC
+    gEDataManager->setLogWindowGeometry(saveGeometry, ::darwinIsWindowMaximized(this));
+#else /* !VBOX_WS_MAC */
+    gEDataManager->setLogWindowGeometry(saveGeometry, isMaximized());
+#endif /* !VBOX_WS_MAC */
+    LogRel2(("GUI: UIVMLogViewer: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
+             saveGeometry.x(), saveGeometry.y(), saveGeometry.width(), saveGeometry.height()));
+}
+
+bool UIVMLogViewerDialog::shouldBeMaximized() const
+{
+    return gEDataManager->logWindowShouldBeMaximized();
+}
+

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

@@ -58 +58 @@
 
 public:
+
     UIVMLogViewerDialog(QWidget *pCenterWidget, const CMachine &machine);
 
 protected:
-    virtual void configure() /* override */;
-    virtual void configureCentralWidget() /* override */;
-    virtual void finalize() /* override */;
+
+    /** @name Prepare/cleanup cascade.
+     * @{ */
+        virtual void configure() /* override */;
+        virtual void configureCentralWidget() /* override */;
+        virtual void finalize() /* override */;
+        virtual void saveSettings() const /* override */;
+        virtual void loadSettings() /* override */;
+    /** @} */
+    /* Reads the related extradata to determine if the dialog should be maximized. */
+    virtual bool shouldBeMaximized() const /* override */;
 
 private:
+
     void retranslateUi();
 

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

@@ -28 +28 @@
 # endif
 # include <QPlainTextEdit>
+# include <QScrollBar>
 
 /* GUI includes: */
@@ -70 +71 @@
 }
 
-int UIVMLogViewerWidget::currentLogPagewidth() const
-{
-    if(!currentLogPage())
+int UIVMLogViewerWidget::defaultLogPageWidth() const
+{
+    if(!m_pViewerContainer)
         return 0;
 
-    QTextDocument *pTextDocument = currentLogPage()->document();
-    if(!pTextDocument)
+    QWidget *pContainer = m_pViewerContainer->currentWidget();
+    if(!pContainer)
         return 0;
-    /* Adjust text-edit size: */
-    pTextDocument->adjustSize();
-    /* Get corresponding QTextDocument size: */
-    QSize textSize = pTextDocument->size().toSize();
-    return textSize.width();
+
+    QPlainTextEdit *pBrowser = pContainer->findChild<QPlainTextEdit*>();
+    if (!pBrowser)
+        return 0;
+    /* Compute a width for 132 characters plus scrollbar and frame width: */
+    int iDefaultWidth = pBrowser->fontMetrics().width(QChar('x')) * 132 +
+                        pBrowser->verticalScrollBar()->width() +
+                        pBrowser->frameWidth() * 2;
+
+    return iDefaultWidth;
 }
 

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

@@ -58 +58 @@
     ~UIVMLogViewerWidget();
     /* Returns the width of the current log page. return 0 if there is no current log page: */
-    int currentLogPagewidth() const;
+    int defaultLogPageWidth() const;
 
     /** Returns the menu. */