Changeset 57496 in vbox for trunk/src/VBox

Timestamp:

Aug 21, 2015 1:17:10 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 7961: LogWindow: Increasing default size and saving/restoring previous geometry.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIVMLogViewer.cpp (modified) (6 diffs)
• UIVMLogViewer.h (modified) (2 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp

@@ -29 +29 @@
 # include <QScrollBar>
 # include <QTextEdit>
+# include <QDesktopWidget>
 
 /* GUI includes: */
@@ -38 +39 @@
 # include "UIMessageCenter.h"
 # include "VBoxUtils.h"
+# include "UIExtraDataManager.h"
 
 /* COM includes: */
@@ -412 +414 @@
     refresh();
 
+    /* Load settings: */
+    loadSettings();
+
     /* Loading language constants */
     retranslateUi();
@@ -418 +423 @@
 UIVMLogViewer::~UIVMLogViewer()
 {
+    /* Save settings: */
+    saveSettings();
+
     if (!m_machine.isNull())
         m_viewers.remove(m_machine.GetName());
@@ -564 +572 @@
         return;
 
-    m_fIsPolished = true;
-
-    /* Resize the whole log-viewer to fit 80 symbols in
-     * text-browser for the first time started: */
-    QTextEdit *pFirstPage = currentLogPage();
-    if (pFirstPage)
-    {
-        int fullWidth = pFirstPage->fontMetrics().width(QChar('x')) * 80 +
-                        pFirstPage->verticalScrollBar()->width() +
-                        pFirstPage->frameWidth() * 2 +
-                        /* m_pViewerContainer margin */ 10 * 2 +
-                        /* CentralWidget margin */ 10 * 2;
-        resize(fullWidth, height());
-    }
+    m_fIsPolished = true;   
 
     /* Make sure the log view widget has the focus */
     QWidget *pCurrentLogPage = currentLogPage();
     if (pCurrentLogPage)
-        pCurrentLogPage->setFocus();
-
-    /* Explicit widget centering relatively to it's parent: */
-    VBoxGlobal::centerWidget(this, parentWidget(), false);
+        pCurrentLogPage->setFocus(); 
 }
 
@@ -644 +636 @@
 }
 
+void UIVMLogViewer::loadSettings()
+{
+    /* Restore window geometry: */
+    {
+        /* Getting available geometry to calculate default geometry: */
+        const QRect desktopRect = QApplication::desktop()->availableGeometry(this);
+        int iDefaultWidth = desktopRect.width() * 0.5;
+        int iDefaultHeight = desktopRect.height() * 0.75;
+
+        /* Calculate default width to fit 132 characters: */
+        QTextEdit *pCurrentLogPage = currentLogPage();
+        if (pCurrentLogPage)
+        {
+            iDefaultWidth = pCurrentLogPage->fontMetrics().width(QChar('x')) * 132 +
+                pCurrentLogPage->verticalScrollBar()->width() +
+                pCurrentLogPage->frameWidth() * 2 +
+                /* m_pViewerContainer margin */ 10 * 2 +
+                /* CentralWidget margin */ 10 * 2;
+        }
+        QRect defaultGeometry(0, 0, iDefaultWidth, iDefaultHeight);
+        defaultGeometry.moveCenter(parentWidget()->geometry().center());
+
+        /* Load geometry: */
+        m_geometry = gEDataManager->logWindowGeometry(this, defaultGeometry);
+#ifdef Q_WS_MAC
+        move(m_geometry.topLeft());
+        resize(m_geometry.size());
+#else /* Q_WS_MAC */
+        setGeometry(m_geometry);
+#endif /* !Q_WS_MAC */
+        LogRel(("GUI: UIVMLogViewer: Geometry loaded to: %dx%d @ %dx%d\n",
+                m_geometry.x(), m_geometry.y(), m_geometry.width(), m_geometry.height()));
+
+        /* Maximize (if necessary): */
+        if (gEDataManager->logWindowShouldBeMaximized())
+            showMaximized();
+    }
+}
+
+void UIVMLogViewer::saveSettings()
+{
+    /* Save window geometry: */
+    {
+        /* Save geometry: */
+        const QRect save_geometry = geometry();
+#ifdef Q_WS_MAC
+        gEDataManager->setLogWindowGeometry(save_geometry, ::darwinIsWindowMaximized(this));
+#else /* Q_WS_MAC */
+        gEDataManager->setLogWindowGeometry(save_geometry, isMaximized());
+#endif /* !Q_WS_MAC */
+        LogRel(("GUI: UIVMLogViewer: Geometry saved as: %dx%d @ %dx%d\n",
+                save_geometry.x(), save_geometry.y(), save_geometry.width(), save_geometry.height()));
+    }
+}
+
 #include "UIVMLogViewer.moc"
 

trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.h

@@ -82 +82 @@
     QTextEdit* createLogPage(const QString &strPage);
 
+    /** Load settings helper. */
+    void loadSettings();
+
+    /** Save settings helper. */
+    void saveSettings();
+
     /* Array containing all VM Log Viewers: */
     static VMLogViewerMap m_viewers;
@@ -91 +97 @@
     UIVMLogViewerSearchPanel *m_pSearchPanel;
     LogBook m_book;
+
+    /** Current dialog geometry. */
+    QRect m_geometry;
 
     /* Buttons: */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -165 +165 @@
 #endif /* DEBUG */
 
+/* Virtual Machine: Logging dialog: */
+const char* UIExtraDataDefs::GUI_LogWindowGeometry = "GUI/LogWindowGeometry";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -287 +287 @@
     /** @} */
 #endif /* DEBUG */
+
+        /** Holds log-window geometry. */
+        extern const char* GUI_LogWindowGeometry;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1804 +1804 @@
            << GUI_Dbg_Enabled << GUI_Dbg_AutoShow
 #endif /* VBOX_WITH_DEBUGGER_GUI */
-           << GUI_ExtraDataManager_Geometry << GUI_ExtraDataManager_SplitterHints;
+           << GUI_ExtraDataManager_Geometry << GUI_ExtraDataManager_SplitterHints
+           << GUI_LogWindowGeometry;
 }
 #endif /* DEBUG */
@@ -3620 +3621 @@
 }
 #endif /* DEBUG */
+
+QRect UIExtraDataManager::logWindowGeometry(QWidget *pWidget, const QRect &defaultGeometry)
+{
+    /* Get corresponding extra-data: */
+    const QStringList data = extraDataStringList(GUI_LogWindowGeometry);
+
+    /* Parse loaded data: */
+    int iX = 0, iY = 0, iW = 0, iH = 0;
+    bool fOk = data.size() >= 4;    
+    do
+    {
+        if (!fOk) break;
+        iX = data[0].toInt(&fOk);
+        if (!fOk) break;
+        iY = data[1].toInt(&fOk);
+        if (!fOk) break;
+        iW = data[2].toInt(&fOk);
+        if (!fOk) break;
+        iH = data[3].toInt(&fOk);
+    }
+    while (0);
+
+    /* Use geometry (loaded or default): */
+    QRect geometry = fOk ? QRect(iX, iY, iW, iH) : defaultGeometry;
+
+    /* Take widget into account: */
+    if (pWidget)
+        geometry.setSize(geometry.size().expandedTo(pWidget->minimumSizeHint()));
+
+    /* In Windows Qt fails to reposition out of screen window properly, so moving to centre: */
+#ifdef Q_WS_WIN
+    /* Get screen-geometry [of screen with point (iX, iY) if possible]: */
+    const QRect screenGeometry = QApplication::desktop()->availableGeometry(QPoint(iX, iY));
+
+    /* Make sure resulting geometry is within current bounds: */
+    if (!screenGeometry.contains(geometry, true))
+        geometry.moveCenter(defaultGeometry.center());
+#endif /* Q_WS_WIN */
+
+    /* Return result: */
+    return geometry;
+}
+
+bool UIExtraDataManager::logWindowShouldBeMaximized()
+{
+    /* Get corresponding extra-data: */
+    const QStringList data = extraDataStringList(GUI_LogWindowGeometry);
+
+    /* Make sure 5th item has required value: */
+    return data.size() == 5 && data[4] == GUI_Geometry_State_Max;
+}
+
+void UIExtraDataManager::setLogWindowGeometry(const QRect &geometry, bool fMaximized)
+{
+    /* Serialize passed values: */
+    QStringList data;
+    data << QString::number(geometry.x());
+    data << QString::number(geometry.y());
+    data << QString::number(geometry.width());
+    data << QString::number(geometry.height());
+    if (fMaximized)
+        data << GUI_Geometry_State_Max;
+
+    /* Re-cache corresponding extra-data: */
+    setExtraDataStringList(GUI_LogWindowGeometry, data);
+}
 
 void UIExtraDataManager::sltExtraDataChange(QString strMachineID, QString strKey, QString strValue)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -534 +534 @@
 #endif /* DEBUG */
 
+    /** @name Virtual Machine: Logwindow dialog
+      * @{ */
+        /** Returns log-window geometry using @a pWidget and @a defaultGeometry as hints. */
+        QRect logWindowGeometry(QWidget *pWidget, const QRect &defaultGeometry);
+        /** Returns whether log-window should be maximized or not. */
+        bool logWindowShouldBeMaximized();
+        /** Defines log-window @a geometry and @a fMaximized state. */
+        void setLogWindowGeometry(const QRect &geometry, bool fMaximized);
+    /** @} */
+
 private slots: