Changeset 102061 in vbox for trunk/src/VBox

Timestamp:

Nov 10, 2023 12:39:35 PM (18 months ago)

Author:

vboxsync

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

160170

Message:

FE/Qt: bugref:10513: VM Settings / General page / Description tab: Adjust layout to be more suitable to latest changes in advanced dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• editors/UIDescriptionEditor.cpp (modified) (2 diffs)
• machine/UIMachineSettingsGeneral.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDescriptionEditor.cpp

@@ -72 +72 @@
     /* Calculate on the basis of font metrics: */
     QFontMetrics fm(m_pTextEdit->font());
-    // approx. 100 symbols, not very precise:
-    const int iWidth = fm.averageCharWidth() * 100;
-    // exact. 5 symbols, quite precise:
-    const int iHeight = fm.lineSpacing() * 5
+    // approx. 50 symbols, not very precise:
+    const int iWidth = fm.averageCharWidth() * 50;
+    // exact. 7 symbols, quite precise:
+    const int iHeight = fm.lineSpacing() * 7
                       + m_pTextEdit->document()->documentMargin() * 2
                       + m_pTextEdit->frameWidth() * 2;
@@ -101 +101 @@
             m_pTextEdit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
             m_pTextEdit->setAcceptRichText(false);
-#ifdef VBOX_WS_MAC
-            m_pTextEdit->setMinimumHeight(150);
-#endif
 
             pLayout->addWidget(m_pTextEdit);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -315 +315 @@
     if (m_pEditorDescription)
         newGeneralData.m_strDescription = m_pEditorDescription->value().isEmpty()
-                                 ? QString() : m_pEditorDescription->value();
+                                        ? QString() : m_pEditorDescription->value();
 
     /* Gather new 'Encryption' data: */
@@ -443 +443 @@
 {
     /* 'Basic' tab: */
-    AssertPtrReturnVoid(pWidget);
-    AssertPtrReturnVoid(m_pTabWidget);
-    AssertPtrReturnVoid(m_pTabWidget->focusProxy());
-    AssertPtrReturnVoid(m_pEditorNameAndSystem);
-    setTabOrder(pWidget, m_pTabWidget->focusProxy());
-    setTabOrder(m_pTabWidget->focusProxy(), m_pEditorNameAndSystem);
+    if (pWidget && m_pTabWidget && m_pTabWidget->focusProxy())
+        setTabOrder(pWidget, m_pTabWidget->focusProxy());
+    if (m_pTabWidget && m_pTabWidget->focusProxy() && m_pEditorNameAndSystem)
+        setTabOrder(m_pTabWidget->focusProxy(), m_pEditorNameAndSystem);
 
     /* 'Advanced' tab: */
-    AssertPtrReturnVoid(m_pEditorSnapshotFolder);
-    AssertPtrReturnVoid(m_pEditorClipboard);
-    AssertPtrReturnVoid(m_pEditorDragAndDrop);
-    setTabOrder(m_pEditorNameAndSystem, m_pEditorSnapshotFolder);
-    setTabOrder(m_pEditorSnapshotFolder, m_pEditorClipboard);
-    setTabOrder(m_pEditorClipboard, m_pEditorDragAndDrop);
+    if (m_pEditorNameAndSystem && m_pEditorSnapshotFolder)
+        setTabOrder(m_pEditorNameAndSystem, m_pEditorSnapshotFolder);
+    if (m_pEditorSnapshotFolder && m_pEditorClipboard)
+        setTabOrder(m_pEditorSnapshotFolder, m_pEditorClipboard);
+    if (m_pEditorClipboard && m_pEditorDragAndDrop)
+        setTabOrder(m_pEditorClipboard, m_pEditorDragAndDrop);
 
     /* 'Description' tab: */
-    AssertPtrReturnVoid(m_pEditorDescription);
-    setTabOrder(m_pEditorDragAndDrop, m_pEditorDescription);
+    if (m_pEditorDragAndDrop && m_pEditorDescription)
+        setTabOrder(m_pEditorDragAndDrop, m_pEditorDescription);
 }
 
@@ -481 +479 @@
 {
     /* Polish 'Basic' availability: */
-    AssertPtrReturnVoid(m_pEditorNameAndSystem);
-    m_pEditorNameAndSystem->setNameStuffEnabled(isMachineOffline() || isMachineSaved());
-    m_pEditorNameAndSystem->setPathStuffEnabled(isMachineOffline());
-    m_pEditorNameAndSystem->setOSTypeStuffEnabled(isMachineOffline());
+    if (m_pEditorNameAndSystem)
+    {
+        m_pEditorNameAndSystem->setNameStuffEnabled(isMachineOffline() || isMachineSaved());
+        m_pEditorNameAndSystem->setPathStuffEnabled(isMachineOffline());
+        m_pEditorNameAndSystem->setOSTypeStuffEnabled(isMachineOffline());
+    }
 
     /* Polish 'Advanced' availability: */
-    AssertPtrReturnVoid(m_pEditorSnapshotFolder);
-    AssertPtrReturnVoid(m_pEditorClipboard);
-    AssertPtrReturnVoid(m_pEditorDragAndDrop);
-    m_pEditorSnapshotFolder->setEnabled(isMachineOffline());
-    m_pEditorClipboard->setEnabled(isMachineInValidMode());
-    m_pEditorDragAndDrop->setEnabled(isMachineInValidMode());
+    if (m_pEditorSnapshotFolder)
+        m_pEditorSnapshotFolder->setEnabled(isMachineOffline());
+    if (m_pEditorClipboard)
+        m_pEditorClipboard->setEnabled(isMachineInValidMode());
+    if (m_pEditorDragAndDrop)
+        m_pEditorDragAndDrop->setEnabled(isMachineInValidMode());
 
     /* Polish 'Description' availability: */
-    AssertPtrReturnVoid(m_pEditorDescription);
-    m_pEditorDescription->setEnabled(isMachineInValidMode());
+    if (m_pEditorDescription)
+        m_pEditorDescription->setEnabled(isMachineInValidMode());
 
     /* Polish 'Encryption' availability: */
-    AssertPtrReturnVoid(m_pEditorDiskEncryptionSettings);
-    m_pEditorDiskEncryptionSettings->setEnabled(isMachineOffline());
+    if (m_pEditorDiskEncryptionSettings)
+        m_pEditorDiskEncryptionSettings->setEnabled(isMachineOffline());
 }