Changeset 30751 in vbox

Timestamp:

Jul 8, 2010 9:21:06 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: New running VM core: Few little fixes for initial selector window & machine window(s) positioning.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxSelectorWnd.cpp (modified) (2 diffs)
• globals/VBoxDefs.cpp (modified) (1 diff)
• globals/VBoxDefs.h (modified) (1 diff)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (3 diffs)

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

@@ -635 +635 @@
             h = winPos.section (',', 3, 3).toInt (&ok);
         if (ok)
-            max = winPos.section (',', 4, 4) == VBoxDefs::GUI_LastWindowPosition_Max;
+            max = winPos.section (',', 4, 4) == VBoxDefs::GUI_LastWindowState_Max;
 
         QRect ar = ok ? QApplication::desktop()->availableGeometry (QPoint (x, y)) :
@@ -779 +779 @@
         if (isMaximized())
 #endif /* !Q_WS_MAC */
-            winPos += QString (",%1").arg (VBoxDefs::GUI_LastWindowPosition_Max);
+            winPos += QString (",%1").arg (VBoxDefs::GUI_LastWindowState_Max);
 
         vbox.SetExtraData (VBoxDefs::GUI_LastWindowPosition, winPos);

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.cpp

@@ -21 +21 @@
 #include <VBoxDefs.h>
 
-const char* VBoxDefs::GUI_LastWindowPosition = "GUI/LastWindowPostion";
-const char* VBoxDefs::GUI_LastWindowPosition_Max = "max";
+const char* VBoxDefs::GUI_LastWindowPosition = "GUI/LastWindowPosition";
+const char* VBoxDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition";
+const char* VBoxDefs::GUI_LastWindowState_Max = "max";
 const char* VBoxDefs::GUI_LastGuestSizeHint = "GUI/LastGuestSizeHint";
 const char* VBoxDefs::GUI_Toolbar = "GUI/Toolbar";

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxDefs.h

@@ -100 +100 @@
 
     static const char* GUI_LastWindowPosition;
-    static const char* GUI_LastWindowPosition_Max;
+    static const char* GUI_LastNormalWindowPosition;
+    static const char* GUI_LastWindowState_Max;
     static const char* GUI_SplitterSizes;
     static const char* GUI_Toolbar;

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

@@ -513 +513 @@
     /* Load extra-data settings: */
     {
-        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastWindowPosition) :
-                                     QString("%1%2").arg(VBoxDefs::GUI_LastWindowPosition).arg(m_uScreenId);
-        QString strPositionSettings = machine.GetExtraData(strPositionAddress);
-
-        bool ok = false, max = false;
+        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastNormalWindowPosition) :
+                                     QString("%1%2").arg(VBoxDefs::GUI_LastNormalWindowPosition).arg(m_uScreenId);
+        QStringList strPositionSettings = machine.GetExtraDataStringList(strPositionAddress);
+
+        bool ok = true, max = false;
         int x = 0, y = 0, w = 0, h = 0;
-        x = strPositionSettings.section(',', 0, 0).toInt(&ok);
-        if (ok)
-            y = strPositionSettings.section(',', 1, 1).toInt(&ok);
-        if (ok)
-            w = strPositionSettings.section(',', 2, 2).toInt(&ok);
-        if (ok)
-            h = strPositionSettings.section(',', 3, 3).toInt(&ok);
-        if (ok)
-            max = strPositionSettings.section(',', 4, 4) == VBoxDefs::GUI_LastWindowPosition_Max;
+        if (ok && strPositionSettings.size() > 0)
+            x = strPositionSettings[0].toInt(&ok);
+        if (ok && strPositionSettings.size() > 1)
+            y = strPositionSettings[1].toInt(&ok);
+        if (ok && strPositionSettings.size() > 2)
+            w = strPositionSettings[2].toInt(&ok);
+        if (ok && strPositionSettings.size() > 3)
+            h = strPositionSettings[3].toInt(&ok);
+        if (ok && strPositionSettings.size() > 4)
+            max = strPositionSettings[4] == VBoxDefs::GUI_LastWindowState_Max;
 
         QRect ar = ok ? QApplication::desktop()->availableGeometry(QPoint(x, y)) :
                         QApplication::desktop()->availableGeometry(machineWindow());
 
-        if (ok /* if previous parameters were read correctly */)
+        /* If previous parameters were read correctly: */
+        if (ok)
         {
+            /* If previous machine state is SAVED: */
             if (machine.GetState() == KMachineState_Saved)
             {
-                /* restore from a saved state: restore window size and position */
+                /* Restore window size and position: */
                 m_normalGeometry = QRect(x, y, w, h);
                 setGeometry(m_normalGeometry);
             }
+            /* If previous machine state is not SAVED: */
             else
             {
-                /* not restored from a saved state: restore only the last position */
-                move(x, y);
+                /* Restore only window position: */
+                m_normalGeometry = QRect(x, y, width(), height());
+                setGeometry(m_normalGeometry);
                 if (machineView())
                     machineView()->normalizeGeometry(false /* adjust position? */);
-
             }
-
             /* Maximize if needed: */
             if (max)
@@ -558 +561 @@
             if (machineView())
                 machineView()->normalizeGeometry(true /* adjust position? */);
-
             /* Move newly created window to the screen center: */
             m_normalGeometry = geometry();
@@ -614 +616 @@
                                     .arg(m_normalGeometry.width()).arg(m_normalGeometry.height());
         if (isMaximizedChecked())
-            strWindowPosition += QString(",%1").arg(VBoxDefs::GUI_LastWindowPosition_Max);
-        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastWindowPosition) :
-                                     QString("%1%2").arg(VBoxDefs::GUI_LastWindowPosition).arg(m_uScreenId);
+            strWindowPosition += QString(",%1").arg(VBoxDefs::GUI_LastWindowState_Max);
+        QString strPositionAddress = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastNormalWindowPosition) :
+                                     QString("%1%2").arg(VBoxDefs::GUI_LastNormalWindowPosition).arg(m_uScreenId);
         machine.SetExtraData(strPositionAddress, strWindowPosition);
     }