Changeset 45337 in vbox for trunk/src

Timestamp:

Apr 4, 2013 11:32:41 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Message-box: Reordering initialization to fix focusing issues and determine 'default' button.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp (modified) (8 diffs)

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

@@ -49 +49 @@
     /* Set caption: */
     setWindowTitle(strCaption);
-
-    /* Set focus to dialog initially: */
-    setFocus();
 
     /* Prepare content: */
@@ -200 +197 @@
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     {
+        /* Configure layout: */
+#ifdef Q_WS_MAC
+        pMainLayout->setContentsMargins(40, 11, 40, 11);
+        pMainLayout->setSpacing(15);
+#else /* !Q_WS_MAC */
+        VBoxGlobal::setLayoutMargin(pMainLayout, 11);
+        pMainLayout->setSpacing(10);
+#endif /* !Q_WS_MAC */
         /* Create top-layout: */
         QHBoxLayout *pTopLayout = new QHBoxLayout;
         {
+            /* Insert into parent layout: */
+            pMainLayout->addLayout(pTopLayout);
+            /* Configure layout: */
+            VBoxGlobal::setLayoutMargin(pTopLayout, 0);
+            pTopLayout->setSpacing(10);
             /* Create icon-label: */
             m_pIconLabel = new QLabel;
             {
+                /* Insert into parent layout: */
+                pTopLayout->addWidget(m_pIconLabel);
                 /* Configure label: */
                 m_pIconLabel->setPixmap(standardPixmap(m_iconType, this));
@@ -214 +226 @@
             m_pTextLabel = new QILabel(m_strMessage);
             {
+                /* Insert into parent layout: */
+                pTopLayout->addWidget(m_pTextLabel);
                 /* Configure label: */
                 m_pTextLabel->setWordWrap(true);
@@ -221 +235 @@
                 m_pTextLabel->setSizePolicy(sizePolicy);
             }
-            /* Configure layout: */
-            VBoxGlobal::setLayoutMargin(pTopLayout, 0);
-            pTopLayout->setSpacing(10);
-            pTopLayout->addWidget(m_pIconLabel);
-            pTopLayout->addWidget(m_pTextLabel);
         }
         /* Create details text-view: */
@@ -240 +249 @@
         m_pDetailsContainer = new QIArrowSplitter(m_pDetailsTextView);
         {
+            /* Insert into parent layout: */
+            pMainLayout->addWidget(m_pDetailsContainer);
             /* Configure container: */
             connect(m_pDetailsContainer, SIGNAL(showBackDetails()), this, SLOT(detailsBack()));
@@ -250 +261 @@
         m_pFlagCheckBox = new QCheckBox;
         {
+            /* Insert into parent layout: */
+            pMainLayout->addWidget(m_pFlagCheckBox, 0, Qt::AlignHCenter | Qt::AlignVCenter);
             /* Configure check-box: */
             m_pFlagCheckBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
@@ -258 +271 @@
         m_pButtonBox = new QIDialogButtonBox;
         {
+            /* Insert into parent layout: */
+            pMainLayout->addWidget(m_pButtonBox);
             /* Configure button-box: */
             m_pButtonBox->setCenterButtons(true);
@@ -277 +292 @@
             }
         }
-        /* Configure layout: */
-#ifdef Q_WS_MAC
-        pMainLayout->setContentsMargins(40, 11, 40, 11);
-        pMainLayout->setSpacing(15);
-#else /* !Q_WS_MAC */
-        VBoxGlobal::setLayoutMargin(pMainLayout, 11);
-        pMainLayout->setSpacing(10);
-#endif /* !Q_WS_MAC */
-        pMainLayout->addLayout(pTopLayout);
-        pMainLayout->addWidget(m_pDetailsContainer);
-        pMainLayout->addWidget(m_pFlagCheckBox, 0, Qt::AlignHCenter | Qt::AlignVCenter);
-        pMainLayout->addWidget(m_pButtonBox);
     }
 }