Changeset 2240 in vbox for trunk/src

Timestamp:

Apr 19, 2007 4:58:31 PM (18 years ago)

Author:

vboxsync

Message:

1934: Never decrease size in the layout:

Fixing minimum height of the VM & Global Settings Dialog whatsThisLabel so, that its height will never shrinks.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile (modified) (1 diff)
• src/QIRichLabel.cpp (modified) (1 diff)
• src/VBoxSelectorWnd.cpp (modified) (1 diff)
• ui/VBoxGlobalSettingsDlg.ui (modified) (3 diffs)
• ui/VBoxGlobalSettingsDlg.ui.h (modified) (2 diffs)
• ui/VBoxVMSettingsDlg.ui (modified) (1 diff)
• ui/VBoxVMSettingsDlg.ui.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile

@@ -68 +68 @@
         include/QIRichLabel.h \
         include/VMGlobalSettings.h \
+        include/VBoxUtils.h \
         include/VBoxGlobal.h \
         include/VBoxVMListBox.h \

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

@@ -169 +169 @@
    updateLabel (osh);
 
-   if (baseheight == 0)
+   if ((int)baseheight < heightForWidth (width()))
+   {
        baseheight = heightForWidth (width());
-   if ((int)baseheight < heightForWidth (width()))
-       QFrame::setFixedHeight (heightForWidth (width()));
-   else
        QFrame::setFixedHeight (baseheight);
+   }
    emit textChanged();
 }

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

@@ -980 +980 @@
             break;
         }
-        case QEvent::Show:
-        {
-        /// @todo improve
-#if 0
-            /* Constrain StartVM button size */
-            QObjectList *list = queryList ("QToolButton",
-                QString (vmStartAction->name()) + "_action_button");
-            QToolButton *actionButton = list->first() ?
-                static_cast<QToolButton*> (list->first()) : 0;
-            if (actionButton)
-                new QIConstraintKeeper (actionButton);
-#endif
-            break;
-        }
 
         default:

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

@@ -1082 +1082 @@
             </hbox>
         </widget>
-        <widget class="QLabel" row="2" column="1">
-            <property name="name">
-                <cstring>whatsThisLabel</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>0</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="backgroundMode">
-                <enum>PaletteMidlight</enum>
-            </property>
-            <property name="frameShape">
-                <enum>Box</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Sunken</enum>
-            </property>
-            <property name="margin">
-                <number>7</number>
-            </property>
-            <property name="scaledContents">
-                <bool>false</bool>
-            </property>
-            <property name="alignment">
-                <set>WordBreak|AlignJustify|AlignTop</set>
-            </property>
-        </widget>
     </grid>
 </widget>
@@ -1238 +1207 @@
     <include location="local" impldecl="in implementation">VBoxProblemReporter.h</include>
     <include location="local" impldecl="in implementation">VBoxUSBFilterSettings.h</include>
+    <include location="local" impldecl="in implementation">QIRichLabel.h</include>
 </includes>
 <forwards>
     <forward>class VBoxUSBMenu</forward>
+    <forward>class QIRichLabel</forward>
 </forwards>
 <variables>
@@ -1256 +1227 @@
     <variable access="private">VBoxUSBMenu *usbDevicesMenu;</variable>
     <variable access="private">bool mLanguageChanged;</variable>
+    <variable access="private">QIRichLabel *whatsThisLabel;</variable>
 </variables>
 <slots>

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

@@ -198 +198 @@
 
         QListViewItem::paintCell (aPainter, aGroup, aColumn, aWidth, aAlign);
-        
+
         if (mBuiltIn)
         {
@@ -288 +288 @@
     connect (whatsThisTimer, SIGNAL (timeout()), this, SLOT (updateWhatsThis()));
     whatsThisCandidate = NULL;
-    whatsThisLabel->setMinimumHeight (whatsThisLabel->frameWidth() * 2 +
+
+    whatsThisLabel = new QIRichLabel (this, "whatsThisLabel");
+    VBoxGlobalSettingsDlgLayout->addWidget (whatsThisLabel, 2, 1);
+
+    whatsThisLabel->setFocusPolicy (QWidget::NoFocus);
+    whatsThisLabel->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
+    whatsThisLabel->setBackgroundMode (QLabel::PaletteMidlight);
+    whatsThisLabel->setFrameShape (QLabel::Box);
+    whatsThisLabel->setFrameShadow (QLabel::Sunken);
+    whatsThisLabel->setMargin (7);
+    whatsThisLabel->setScaledContents (FALSE);
+    whatsThisLabel->setAlignment (int (QLabel::WordBreak |
+                                       QLabel::AlignJustify |
+                                       QLabel::AlignTop));
+
+    whatsThisLabel->setFixedHeight (whatsThisLabel->frameWidth() * 2 +
                                       6 /* seems that RichText adds some margin */ +
                                       whatsThisLabel->fontMetrics().lineSpacing() * 3);

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

@@ -2819 +2819 @@
     <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

@@ -419 +419 @@
 
     whatsThisLabel->setFixedHeight (whatsThisLabel->frameWidth() * 2 +
-                                      6 /* seems that RichText adds some margin */ +
-                                      whatsThisLabel->fontMetrics().lineSpacing() * 3);
+                                    6 /* seems that RichText adds some margin */ +
+                                    whatsThisLabel->fontMetrics().lineSpacing() * 3);
     whatsThisLabel->setMinimumWidth (whatsThisLabel->frameWidth() * 2 +
                                      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 +797 @@
 
     VBoxGlobal::centerWidget (this, parentWidget());
-
-    /// @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()