Changeset 2185 in vbox for trunk/src/VBox/Frontends/VirtualBox/ui

Timestamp:

Apr 18, 2007 2:48:10 PM (18 years ago)

Author:

vboxsync

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

20516

Message:

FE/Qt: Undone most of the changes from changeset:20500 and changeset:20506.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMSettingsDlg.ui (modified) (2 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui

@@ -2805 +2805 @@
     <variable access="private">VBoxMediaComboBox *cbISOFloppy;</variable>
     <variable access="private">VBoxUSBMenu *usbDevicesMenu;</variable>
-    <variable access="private">QLabel *whatsThisLabel;</variable>
+    <variable access="private">QIRichLabel *whatsThisLabel;</variable>
     <variable access="private">BootItemsList *tblBootOrder;</variable>
 </variables>
@@ -2841 +2841 @@
     <slot>cdMediaChanged()</slot>
     <slot>fdMediaChanged()</slot>
+    <slot>processAdjustSize()</slot>
     <slot>updateInterfaces( QWidget* )</slot>
     <slot>networkPageUpdate( QWidget* )</slot>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -404 +404 @@
     whatsThisCandidate = NULL;
 
-    whatsThisLabel = new QLabel (this, "whatsThisLabel");
-    whatsThisLabel->setTextFormat (Qt::RichText);
+    whatsThisLabel = new QIRichLabel (this, "whatsThisLabel");
     VBoxVMSettingsDlgLayout->addWidget (whatsThisLabel, 2, 1);
 
     whatsThisLabel->setFocusPolicy (QWidget::NoFocus);
-    whatsThisLabel->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
+    whatsThisLabel->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
     whatsThisLabel->setBackgroundMode (QLabel::PaletteMidlight);
     whatsThisLabel->setFrameShape (QLabel::Box);
@@ -419 +418 @@
                                        QLabel::AlignTop));
 
-    whatsThisLabel->setMinimumHeight (whatsThisLabel->frameWidth() * 2 +
+    whatsThisLabel->setFixedHeight (whatsThisLabel->frameWidth() * 2 +
                                       6 /* seems that RichText adds some margin */ +
                                       whatsThisLabel->fontMetrics().lineSpacing() * 3);
@@ -425 +424 @@
                                      6 /* seems that RichText adds some margin */ +
                                      whatsThisLabel->fontMetrics().width ('m') * 40);
+    /// @todo possibly, remove after QIConstraintKeeper is properly done
+    connect (whatsThisLabel, SIGNAL (textChanged()), this, SLOT (processAdjustSize())); 
 
     /*
@@ -799 +800 @@
     VBoxGlobal::centerWidget (this, parentWidget());
 
-    new QIConstrainKeeper (whatsThisLabel);
-}
+    /// @todo improve
+#if 0
+    new QIConstraintKeeper (whatsThisLabel);
+#endif
+}
+
+/// @todo possibly, remove after QIConstraintKeeper is properly done
+/// (should be at least possible to move this functionality into it)
+void VBoxVMSettingsDlg::processAdjustSize()              
+{                
+    int newHeight = minimumSize().height();              
+    int oldHeight = height();            
+    if (newHeight > oldHeight)           
+        resize (minimumSize());                  
+}                
 
 void VBoxVMSettingsDlg::updateShortcuts()