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

Timestamp:

Jun 5, 2014 11:23:55 AM (11 years ago)

Author:

vboxsync

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

94198

Message:

FE/Qt: 6660: Advanced extra-data management framework: Integrate GUI_LastNormalWindowPosition, GUI_LastScaleWindowPosition, GUI_LastWindowState_Max.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (2 diffs)
• runtime/scale/UIMachineWindowScale.cpp (modified) (2 diffs)

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

@@ -510 +510 @@
 }
 
+QRect UIExtraDataManager::machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strId) const
+{
+    /* Choose corresponding key: */
+    QString strKey;
+    switch (visualStateType)
+    {
+        case UIVisualStateType_Normal: strKey = GUI_LastNormalWindowPosition; break;
+        case UIVisualStateType_Scale:  strKey = GUI_LastScaleWindowPosition; break;
+        default: AssertFailedReturn(QRect());
+    }
+    /* Append with screen-index: */
+    if (uScreenIndex)
+        strKey += QString::number(uScreenIndex);
+
+    /* Load corresponding extra-data: */
+    const QStringList data = extraDataStringList(strKey, strId);
+
+    /* 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);
+
+    /* Return geometry (loaded or null): */
+    return fOk ? QRect(iX, iY, iW, iH) : QRect();
+}
+
+bool UIExtraDataManager::isMachineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strId) const
+{
+    /* Choose corresponding key: */
+    QString strKey;
+    switch (visualStateType)
+    {
+        case UIVisualStateType_Normal: strKey = GUI_LastNormalWindowPosition; break;
+        case UIVisualStateType_Scale:  strKey = GUI_LastScaleWindowPosition; break;
+        default: AssertFailedReturn(false);
+    }
+    /* Append with screen-index: */
+    if (uScreenIndex)
+        strKey += QString::number(uScreenIndex);
+
+    /* Load corresponding extra-data: */
+    const QStringList data = extraDataStringList(strKey, strId);
+
+    /* Make sure 5th item has required value: */
+    return data.size() == 5 && data[4] == GUI_LastWindowState_Max;
+}
+
+void UIExtraDataManager::setMachineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QRect &geometry, bool fMaximized, const QString &strId)
+{
+    /* Choose corresponding key: */
+    QString strKey;
+    switch (visualStateType)
+    {
+        case UIVisualStateType_Normal: strKey = GUI_LastNormalWindowPosition; break;
+        case UIVisualStateType_Scale:  strKey = GUI_LastScaleWindowPosition; break;
+        default: AssertFailedReturnVoid();
+    }
+    /* Append with screen-index: */
+    if (uScreenIndex)
+        strKey += QString::number(uScreenIndex);
+
+    /* 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_LastWindowState_Max;
+
+    /* Re-cache corresponding extra-data: */
+    setExtraDataStringList(strKey, data, strId);
+}
+
 bool UIExtraDataManager::isFirstRun(const QString &strId) const
 {

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

@@ -173 +173 @@
     /** Defines selector-window preview update @a interval. */
     void setSelectorWindowPreviewUpdateInterval(PreviewUpdateIntervalType interval);
+
+    /** Returns geometry for machine-window with @a uScreenIndex in @a visualStateType. */
+    QRect machineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strId) const;
+    /** Returns whether machine-window with @a uScreenIndex in @a visualStateType should be maximized or not. */
+    bool isMachineWindowShouldBeMaximized(UIVisualStateType visualStateType, ulong uScreenIndex, const QString &strId) const;
+    /** Defines geometry for machine-window with @a uScreenIndex in @a visualStateType as @a geometry and @a fMaximized. */
+    void setMachineWindowGeometry(UIVisualStateType visualStateType, ulong uScreenIndex, const QRect &geometry, bool fMaximized, const QString &strId);
 
     /** Returns whether this machine started for the first time. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -432 +432 @@
     CMachine m = machine();
 
-    /* Load extra-data settings: */
-    {
-        /* Load window position settings: */
-        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastNormalWindowPosition) :
-                                     QString("%1%2").arg(GUI_LastNormalWindowPosition).arg(m_uScreenId);
-        QStringList strPositionSettings = m.GetExtraDataStringList(strPositionAddress);
-        bool ok = !strPositionSettings.isEmpty(), max = false;
-        int x = 0, y = 0, w = 0, h = 0;
-        if (ok && strPositionSettings.size() > 0)
-            x = strPositionSettings[0].toInt(&ok);
-        else ok = false;
-        if (ok && strPositionSettings.size() > 1)
-            y = strPositionSettings[1].toInt(&ok);
-        else ok = false;
-        if (ok && strPositionSettings.size() > 2)
-            w = strPositionSettings[2].toInt(&ok);
-        else ok = false;
-        if (ok && strPositionSettings.size() > 3)
-            h = strPositionSettings[3].toInt(&ok);
-        else ok = false;
-        if (ok && strPositionSettings.size() > 4)
-            max = strPositionSettings[4] == GUI_LastWindowState_Max;
-        QRect ar = ok ? QApplication::desktop()->availableGeometry(QPoint(x, y)) :
-                        QApplication::desktop()->availableGeometry(this);
-
-        /* If previous parameters were read correctly: */
-        if (ok)
+    /* Load window geometry: */
+    {
+        /* Load extra-data: */
+        QRect geo = gEDataManager->machineWindowGeometry(machineLogic()->visualStateType(),
+                                                         m_uScreenId, vboxGlobal().managedVMUuid());
+
+        /* If we do have proper geometry: */
+        if (!geo.isNull())
         {
-            /* If previous machine state is SAVED: */
+            /* If previous machine-state was SAVED: */
             if (m.GetState() == KMachineState_Saved)
             {
-                /* Restore window size and position: */
-                m_normalGeometry = QRect(x, y, w, h);
+                /* Restore window geometry: */
+                m_normalGeometry = geo;
                 setGeometry(m_normalGeometry);
             }
-            /* If previous machine state was not SAVED: */
+            /* If previous machine-state was NOT SAVED: */
             else
             {
                 /* Restore only window position: */
-                m_normalGeometry = QRect(x, y, width(), height());
+                m_normalGeometry = QRect(geo.x(), geo.y(), width(), height());
                 setGeometry(m_normalGeometry);
-                /* Normalize to the optimal size: */
+                /* And normalize to the optimal-size: */
                 normalizeGeometry(false);
             }
-            /* Maximize if needed: */
-            if (max)
+
+            /* Maximize (if necessary): */
+            if (gEDataManager->isMachineWindowShouldBeMaximized(machineLogic()->visualStateType(),
+                                                                m_uScreenId, vboxGlobal().managedVMUuid()))
                 setWindowState(windowState() | Qt::WindowMaximized);
         }
+        /* If we do NOT have proper geometry: */
         else
         {
+            /* Get available geometry, for screen with (x,y) coords if possible: */
+            QRect availableGeo = !geo.isNull() ? QApplication::desktop()->availableGeometry(QPoint(geo.x(), geo.y())) :
+                                                 QApplication::desktop()->availableGeometry(this);
+
             /* Normalize to the optimal size: */
             normalizeGeometry(true);
-            /* Move newly created window to the screen center: */
+            /* Move newly created window to the screen-center: */
             m_normalGeometry = geometry();
-            m_normalGeometry.moveCenter(ar.center());
+            m_normalGeometry.moveCenter(availableGeo.center());
             setGeometry(m_normalGeometry);
         }
@@ -534 +522 @@
 void UIMachineWindowNormal::saveSettings()
 {
-    /* Get machine: */
-    CMachine m = machine();
-
-    /* Save extra-data settings: */
-    {
-        QString strWindowPosition = QString("%1,%2,%3,%4")
-                                    .arg(m_normalGeometry.x()).arg(m_normalGeometry.y())
-                                    .arg(m_normalGeometry.width()).arg(m_normalGeometry.height());
-        if (isMaximizedChecked())
-            strWindowPosition += QString(",%1").arg(GUI_LastWindowState_Max);
-        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastNormalWindowPosition) :
-                                     QString("%1%2").arg(GUI_LastNormalWindowPosition).arg(m_uScreenId);
-        m.SetExtraData(strPositionAddress, strWindowPosition);
+    /* Save window geometry: */
+    {
+        gEDataManager->setMachineWindowGeometry(machineLogic()->visualStateType(),
+                                                m_uScreenId, m_normalGeometry,
+                                                isMaximizedChecked(), vboxGlobal().managedVMUuid());
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -105 +105 @@
     /* Load extra-data settings: */
     {
-        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastScaleWindowPosition) :
-                                     QString("%1%2").arg(GUI_LastScaleWindowPosition).arg(m_uScreenId);
-        QStringList strPositionSettings = m.GetExtraDataStringList(strPositionAddress);
-
-        bool ok = !strPositionSettings.isEmpty(), max = false;
-        int x = 0, y = 0, w = 0, h = 0;
-
-        if (ok && strPositionSettings.size() > 0)
-            x = strPositionSettings[0].toInt(&ok);
-        else ok = false;
-        if (ok && strPositionSettings.size() > 1)
-            y = strPositionSettings[1].toInt(&ok);
-        else ok = false;
-        if (ok && strPositionSettings.size() > 2)
-            w = strPositionSettings[2].toInt(&ok);
-        else ok = false;
-        if (ok && strPositionSettings.size() > 3)
-            h = strPositionSettings[3].toInt(&ok);
-        else ok = false;
-        if (ok && strPositionSettings.size() > 4)
-            max = strPositionSettings[4] == GUI_LastWindowState_Max;
-
-        QRect ar = ok ? QApplication::desktop()->availableGeometry(QPoint(x, y)) :
-                        QApplication::desktop()->availableGeometry(this);
-
-        /* If previous parameters were read correctly: */
-        if (ok)
-        {
-            /* Restore window size and position: */
-            m_normalGeometry = QRect(x, y, w, h);
+        /* Load extra-data: */
+        QRect geo = gEDataManager->machineWindowGeometry(machineLogic()->visualStateType(),
+                                                         m_uScreenId, vboxGlobal().managedVMUuid());
+
+        /* If we do have proper geometry: */
+        if (!geo.isNull())
+        {
+            /* Restore window geometry: */
+            m_normalGeometry = geo;
             setGeometry(m_normalGeometry);
-            /* Maximize if needed: */
-            if (max)
+
+            /* Maximize (if necessary): */
+            if (gEDataManager->isMachineWindowShouldBeMaximized(machineLogic()->visualStateType(),
+                                                                m_uScreenId, vboxGlobal().managedVMUuid()))
                 setWindowState(windowState() | Qt::WindowMaximized);
         }
+        /* If we do NOT have proper geometry: */
         else
         {
+            /* Get available geometry, for screen with (x,y) coords if possible: */
+            QRect availableGeo = !geo.isNull() ? QApplication::desktop()->availableGeometry(QPoint(geo.x(), geo.y())) :
+                                                 QApplication::desktop()->availableGeometry(this);
+
             /* Resize to default size: */
             resize(640, 480);
-            qApp->processEvents();
-            /* Move newly created window to the screen center: */
+            /* Move newly created window to the screen-center: */
             m_normalGeometry = geometry();
-            m_normalGeometry.moveCenter(ar.center());
+            m_normalGeometry.moveCenter(availableGeo.center());
             setGeometry(m_normalGeometry);
         }
@@ -158 +143 @@
     CMachine m = machine();
 
-    /* Save extra-data settings: */
-    {
-        QString strWindowPosition = QString("%1,%2,%3,%4")
-                                    .arg(m_normalGeometry.x()).arg(m_normalGeometry.y())
-                                    .arg(m_normalGeometry.width()).arg(m_normalGeometry.height());
-        if (isMaximizedChecked())
-            strWindowPosition += QString(",%1").arg(GUI_LastWindowState_Max);
-        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(GUI_LastScaleWindowPosition) :
-                                     QString("%1%2").arg(GUI_LastScaleWindowPosition).arg(m_uScreenId);
-        m.SetExtraData(strPositionAddress, strWindowPosition);
+    /* Save window geometry: */
+    {
+        gEDataManager->setMachineWindowGeometry(machineLogic()->visualStateType(),
+                                                m_uScreenId, m_normalGeometry,
+                                                isMaximizedChecked(), vboxGlobal().managedVMUuid());
     }