Changeset 2350 in vbox for trunk

Timestamp:

Apr 26, 2007 9:15:08 AM (18 years ago)

Author:

vboxsync

Message:

Made “AutoMaximize height” – keeping maximum height in case of resizing – feature optional. Used for whatsThisLabels of VM & Global Settings.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

trunk/src/VBox/Frontends/VirtualBox/include/QIRichLabel.h

@@ -80 +80 @@
    void setFixedHeight (int);
 
+   void setMaxHeightMode (bool);
+
 public slots:
    virtual void setText( const QString &);
@@ -103 +105 @@
 
 signals:
-   void         textChanged();
    void         clickedOnLink (const QString&);
 
@@ -134 +135 @@
    QLabelPrivate *d;
    QSimpleRichText *doc;
+   bool        mMaxHeightMode;
 
    friend class QTipLabel;

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

@@ -93 +93 @@
 void QIRichLabel::init()
 {
+   mMaxHeightMode = false;
    baseheight = 0;
    lpixmap = 0;
@@ -169 +170 @@
    updateLabel (osh);
 
-   if ((int)baseheight < heightForWidth (width()))
+   if (mMaxHeightMode && (int)baseheight < heightForWidth (width()))
    {
        baseheight = heightForWidth (width());
        QFrame::setFixedHeight (baseheight);
    }
-   emit textChanged();
 }
 
@@ -261 +261 @@
          adjustSize();           // calls resize which repaints
    }
+}
+
+
+void QIRichLabel::setMaxHeightMode (bool aEnabled)
+{
+    mMaxHeightMode = aEnabled;
 }
 

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

@@ -303 +303 @@
 #endif
 
+    whatsThisLabel->setMaxHeightMode (true);
     whatsThisLabel->setFocusPolicy (QWidget::NoFocus);
     whatsThisLabel->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);

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

@@ -418 +418 @@
 #endif
 
+    whatsThisLabel->setMaxHeightMode (true);
     whatsThisLabel->setFocusPolicy (QWidget::NoFocus);
     whatsThisLabel->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);