Changeset 2185 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• include/VBoxUtils.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)
• src/VBoxSelectorWnd.cpp (modified) (2 diffs)
• ui/VBoxVMSettingsDlg.ui (modified) (2 diffs)
• ui/VBoxVMSettingsDlg.ui.h (modified) (4 diffs)

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

@@ -134 +134 @@
 };
 
-class QIConstrainKeeper : public QObject
-{
-    Q_OBJECT
-
-public:
-
-    QIConstrainKeeper (QWidget*);
-
-private:
-
-    bool eventFilter (QObject*, QEvent*);
-};
-
 // VBoxGlobal
 ////////////////////////////////////////////////////////////////////////////////

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

@@ -126 +126 @@
 };
 
+/** 
+ *  Watches the given widget and makes sure the minimum widget size set by the layout
+ *  manager does never get smaller than the previous minimum size set by the
+ *  layout manager. This way, widgets with dynamic contents (i.e. text on some
+ *  toggle buttons) will be able only to grow, never shrink, to avoid flicker
+ *  during alternate contents updates (Pause -> Resume -> Pause -> ...).
+ * 
+ *  @todo not finished
+ */
+class QIConstraintKeeper : public QObject
+{
+    Q_OBJECT
+
+public:
+
+    QIConstraintKeeper (QWidget *aParent) : QObject (aParent)
+    {
+        aParent->setMinimumSize (aParent->size());
+        aParent->installEventFilter (this);
+    }
+
+private:
+
+    bool eventFilter (QObject *aObject, QEvent *aEvent)
+    {
+        if (aObject == parent() && aEvent->type() == QEvent::Resize)
+        {
+            QResizeEvent *ev = static_cast<QResizeEvent*> (aEvent);
+            QSize oldSize = ev->oldSize();
+            QSize newSize = ev->size();
+            int maxWidth = newSize.width() > oldSize.width() ?
+                newSize.width() : oldSize.width();
+            int maxHeight = newSize.height() > oldSize.height() ?
+                newSize.height() : oldSize.height();
+            if (maxWidth > oldSize.width() || maxHeight > oldSize.height())
+                ((QWidget*)parent())->setMinimumSize (maxWidth, maxHeight);
+        }
+        return QObject::eventFilter (aObject, aEvent);
+    }
+};
+
 #endif // __VBoxUtils_h__
 

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

@@ -470 +470 @@
 
 #endif /* Q_WS_WIN */
-
-// QIConstrainKeeper
-////////////////////////////////////////////////////////////////////////////////
-
-QIConstrainKeeper::QIConstrainKeeper (QWidget *aParent) : QObject (aParent)
-{
-    aParent->setMinimumSize (aParent->size());
-    aParent->installEventFilter (this);
-}
-
-bool QIConstrainKeeper::eventFilter (QObject *aObject, QEvent *aEvent)
-{
-    if (aObject == parent() && aEvent->type() == QEvent::Resize)
-    {
-        QResizeEvent *ev = static_cast<QResizeEvent*> (aEvent);
-        QSize oldSize = ev->oldSize();
-        QSize newSize = ev->size();
-        int maxWidth = newSize.width() > oldSize.width() ?
-            newSize.width() : oldSize.width();
-        int maxHeight = newSize.height() > oldSize.height() ?
-            newSize.height() : oldSize.height();
-        if (maxWidth > oldSize.width() || maxHeight > oldSize.height())
-            ((QWidget*)parent())->setMinimumSize (maxWidth, maxHeight);
-    }
-    return QObject::eventFilter (aObject, aEvent);
-}
 
 // VBoxGlobal

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

@@ -982 +982 @@
         case QEvent::Show:
         {
+        /// @todo improve
+#if 0
             /* Constrain StartVM button size */
             QObjectList *list = queryList ("QToolButton",
@@ -988 +990 @@
                 static_cast<QToolButton*> (list->first()) : 0;
             if (actionButton)
-                new QIConstrainKeeper (actionButton);
+                new QIConstraintKeeper (actionButton);
+#endif
             break;
         }

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()