Changeset 9386 in vbox for trunk

Timestamp:

Jun 4, 2008 12:49:29 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Renamed QIRichLabel to QILabel. From now QAbstractWizard uses the new global QILabel.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (2 diffs)
• include/QIAbstractWizard.h (modified) (1 diff)
• include/QILabel.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox4/include/QIRichLabel.h ) (6 diffs)
• include/QILabel_p.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox4/include/QIRichLabel_p.h ) (2 diffs)
• include/QIMessageBox.h (modified) (3 diffs)
• src/QIAbstractWizard.cpp (modified) (2 diffs)
• src/QILabel.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox4/src/QIRichLabel.cpp ) (6 diffs)
• src/QIMessageBox.cpp (modified) (2 diffs)
• src/VBoxDiskImageManagerDlg.cpp (modified) (2 diffs)
• src/VBoxRegistrationDlg.cpp (modified) (1 diff)
• ui/VBoxGlobalSettingsDlg.ui (modified) (2 diffs)
• ui/VBoxGlobalSettingsDlg.ui.h (modified) (2 diffs)
• ui/VBoxNewHDWzd.ui (modified) (1 diff)
• ui/VBoxNewVMWzd.ui (modified) (1 diff)
• ui/VBoxRegistrationDlg.ui (modified) (1 diff)
• ui/VBoxVMFirstRunWzd.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -442 +442 @@
         include/QIStateIndicator.h \
         include/QIMessageBox.h \
-        include/QIRichLabel.h \
-        include/QIRichLabel_p.h \
+        include/QILabel.h \
+        include/QILabel_p.h \
         include/QIAbstractWizard.h \
         include/QIListView.h \
@@ -526 +526 @@
         src/QIStatusBar.cpp \
         src/QIMessageBox.cpp \
-        src/QIRichLabel.cpp \
+        src/QILabel.cpp \
         src/QIAbstractWizard.cpp \
         src/QIDialog.cpp \

trunk/src/VBox/Frontends/VirtualBox4/include/QIAbstractWizard.h

@@ -67 +67 @@
  *  2. Tries to take into account horizontal scrollbar if present to avoid
  *     vertical scrollbar appearing.
+ *
+ * --> uses now global QILabel
  */
-class QILabel : public QLabel
-{
-    Q_OBJECT;
-
-public:
-
-    QILabel (QWidget *aParent);
-
-    QSize sizeHint() const;
-    void updateSizeHint();
-
-private:
-
-    QSize mOwnSizeHint;
-};
 
 /**

trunk/src/VBox/Frontends/VirtualBox4/include/QILabel.h

@@ -2 +2 @@
  *
  * VBox frontends: Qt GUI ("VirtualBox"):
- * VirtualBox Qt extensions: QIRichLabel class declaration
+ * VirtualBox Qt extensions: QILabel class declaration
  */
 
@@ -25 +25 @@
  */
 
-#ifndef __QIRichLabel_h__
-#define __QIRichLabel_h__
+#ifndef __QILabel_h__
+#define __QILabel_h__
 
 /* Qt includes */
@@ -33 +33 @@
 class QILabelPrivate;
 
-class QIRichLabel: public QWidget
+class QILabel: public QWidget
 {
     Q_OBJECT;
@@ -39 +39 @@
 public:
 
-    QIRichLabel (QWidget *aParent = NULL, Qt::WindowFlags aFlags = 0);
-    QIRichLabel (const QString &aText, QWidget *aParent = NULL, Qt::WindowFlags aFlags = 0);
+    QILabel (QWidget *aParent = NULL, Qt::WindowFlags aFlags = 0);
+    QILabel (const QString &aText, QWidget *aParent = NULL, Qt::WindowFlags aFlags = 0);
 
     /* QLabel extensions */
     bool fullSizeSelection () const;
     void setFullSizeSelection (bool bOn);
+
+    void updateSizeHint();
 
     /* Default QLabel methods */
@@ -70 +72 @@
     bool wordWrap() const;
 
+    /* Default QWidget methods */
+    void setSizePolicy (QSizePolicy aPolicy);
+    void setMinimumSize (const QSize &aSize);
+
 public slots:
 
@@ -93 +99 @@
 };
 
-#endif // __QIRichLabel_h__
+#endif // __QILabel_h__
+

trunk/src/VBox/Frontends/VirtualBox4/include/QILabel_p.h

@@ -70 +70 @@
     void setFullSizeSelection (bool bOn);
 
+    void updateSizeHint()
+    {
+        if (minimumWidth() > 0)
+            mOwnSizeHint = QSize (minimumWidth(),
+                                  heightForWidth (minimumWidth()));
+    }
+
+    QSize sizeHint() const
+    {
+        /* If there is an updated sizeHint() present - using it. */
+        return mOwnSizeHint.isValid() ? mOwnSizeHint : QLabel::sizeHint();
+    }
+
 protected:
 
@@ -115 +128 @@
     static const QRegExp mCopyRegExp;
     static QRegExp mElideRegExp;
+    QSize mOwnSizeHint;
 };
 

trunk/src/VBox/Frontends/VirtualBox4/include/QIMessageBox.h

@@ -31 +31 @@
 #include <QTextEdit>
 
-class QIRichLabel;
+class QILabel;
 class QLabel;
 class QPushButton;
@@ -106 +106 @@
     int mButton0, mButton1, mButton2, mButtonEsc;
     QLabel *mIconLabel;
-    QIRichLabel *mTextLabel;
+    QILabel *mTextLabel;
     QPushButton *mButton0PB, *mButton1PB, *mButton2PB;
     QCheckBox *mFlagCB, *mFlagCB_Main, *mFlagCB_Details;
@@ -116 +116 @@
 
 #endif
+

trunk/src/VBox/Frontends/VirtualBox4/src/QIAbstractWizard.cpp

@@ -22 +22 @@
 
 #include "QIAbstractWizard.h"
+#include "QILabel.h"
 
 /* Qt includes */
@@ -67 +68 @@
     QTextEdit::setText (aText);
     updateSizeHint();
-}
-
-
-QILabel::QILabel (QWidget *aParent)
-    : QLabel (aParent)
-{
-}
-
-QSize QILabel::sizeHint() const
-{
-    /* If there is an updated sizeHint() present - using it. */
-    return mOwnSizeHint.isValid() ? mOwnSizeHint : QLabel::sizeHint();
-}
-
-void QILabel::updateSizeHint()
-{
-    if (minimumWidth() > 0)
-        mOwnSizeHint = QSize (minimumWidth(),
-                              heightForWidth (minimumWidth()));
 }
 

trunk/src/VBox/Frontends/VirtualBox4/src/QILabel.cpp

@@ -2 +2 @@
  *
  * VBox frontends: Qt GUI ("VirtualBox"):
- * VirtualBox Qt extensions: QIRichLabel class implementation
+ * VirtualBox Qt extensions: QILabel class implementation
  */
 
@@ -25 +25 @@
  */
 
-#include "QIRichLabel.h"
-#include "QIRichLabel_p.h"
+#include "QILabel.h"
+#include "QILabel_p.h"
 #include "VBoxGlobal.h"
 
@@ -36 +36 @@
 /* @todo: Compare the minimal size behavior in the qt3 & qt4 version. */
 
-QIRichLabel::QIRichLabel (QWidget *aParent /* = NULL */, Qt::WindowFlags aFlags /* = 0 */)
+QILabel::QILabel (QWidget *aParent /* = NULL */, Qt::WindowFlags aFlags /* = 0 */)
     : QWidget (aParent, aFlags)
     , mLabel (NULL)
@@ -43 +43 @@
 }
 
-QIRichLabel::QIRichLabel (const QString &aText, QWidget *aParent /* = NULL */, Qt::WindowFlags aFlags /* = 0 */)
+QILabel::QILabel (const QString &aText, QWidget *aParent /* = NULL */, Qt::WindowFlags aFlags /* = 0 */)
     : QWidget (aParent, aFlags)
     , mLabel (NULL)
@@ -51 +51 @@
 }
 
-bool QIRichLabel::fullSizeSelection () const
-{
-    mLabel->fullSizeSelection();
-}
-
-void QIRichLabel::setFullSizeSelection (bool bOn)
+bool QILabel::fullSizeSelection () const
+{
+    return mLabel->fullSizeSelection();
+}
+
+void QILabel::setFullSizeSelection (bool bOn)
 {
     mLabel->setFullSizeSelection (bOn);
 }
 
-void QIRichLabel::init()
+void QILabel::updateSizeHint()
+{
+    mLabel->updateSizeHint();
+}
+
+void QILabel::init()
 {
     QHBoxLayout *layout = new QHBoxLayout (this);
@@ -76 +81 @@
 /* Default QLabel methods */
 
-Qt::Alignment QIRichLabel::alignment () const
+Qt::Alignment QILabel::alignment () const
 {
     return mLabel->alignment();
 }
 
-QWidget *QIRichLabel::buddy () const
+QWidget *QILabel::buddy () const
 {
     return mLabel->buddy();
 }
 
-bool QIRichLabel::hasScaledContents () const
+bool QILabel::hasScaledContents () const
 {
     return mLabel->hasScaledContents();
 }
 
-int QIRichLabel::indent () const
+int QILabel::indent () const
 {
     return mLabel->indent();
 }
 
-int QIRichLabel::margin () const
+int QILabel::margin () const
 {
     return mLabel->margin();
 }
 
-QMovie *QIRichLabel::movie () const
+QMovie *QILabel::movie () const
 {
     return mLabel->movie();
 }
 
-bool QIRichLabel::openExternalLinks () const
+bool QILabel::openExternalLinks () const
 {
     return mLabel->openExternalLinks();
 }
 
-const QPicture *QIRichLabel::picture () const
+const QPicture *QILabel::picture () const
 {
     return mLabel->picture();
 }
 
-const QPixmap *QIRichLabel::pixmap () const
+const QPixmap *QILabel::pixmap () const
 {
     return mLabel->pixmap();
 }
 
-void QIRichLabel::setAlignment (Qt::Alignment aAlignment) 
+void QILabel::setAlignment (Qt::Alignment aAlignment) 
 { 
     mLabel->setAlignment (aAlignment); 
 }
 
-void QIRichLabel::setBuddy (QWidget *aBuddy)
+void QILabel::setBuddy (QWidget *aBuddy)
 {
     mLabel->setBuddy (aBuddy);
 }
 
-void QIRichLabel::setIndent (int aIndent)
+void QILabel::setIndent (int aIndent)
 {
     mLabel->setIndent (aIndent);
 }
 
-void QIRichLabel::setMargin (int aMargin)
+void QILabel::setMargin (int aMargin)
 {
     mLabel->setMargin (aMargin);
 }
 
-void QIRichLabel::setOpenExternalLinks (bool aOpen)
+void QILabel::setOpenExternalLinks (bool aOpen)
 { 
     mLabel->setOpenExternalLinks (aOpen); 
 }
 
-void QIRichLabel::setScaledContents (bool aOn)
+void QILabel::setScaledContents (bool aOn)
 {
     mLabel->setScaledContents (aOn);
 }
 
-void QIRichLabel::setTextFormat (Qt::TextFormat aFormat)
+void QILabel::setTextFormat (Qt::TextFormat aFormat)
 {
     mLabel->setTextFormat (aFormat);
 }
 
-void QIRichLabel::setTextInteractionFlags (Qt::TextInteractionFlags aFlags) 
+void QILabel::setTextInteractionFlags (Qt::TextInteractionFlags aFlags) 
 { 
     mLabel->setTextInteractionFlags (aFlags); 
 }
 
-void QIRichLabel::setWordWrap (bool aOn) 
+void QILabel::setWordWrap (bool aOn) 
 { 
     mLabel->setWordWrap (aOn); 
 }
 
-QString QIRichLabel::text () const
+QString QILabel::text () const
 {
     return mLabel->fullText();
 }
 
-Qt::TextFormat QIRichLabel::textFormat () const
+Qt::TextFormat QILabel::textFormat () const
 {
     return mLabel->textFormat();
 }
 
-Qt::TextInteractionFlags QIRichLabel::textInteractionFlags () const
+Qt::TextInteractionFlags QILabel::textInteractionFlags () const
 {
     return mLabel->textInteractionFlags();
 }
 
-bool QIRichLabel::wordWrap () const
+bool QILabel::wordWrap () const
 {
     return mLabel->wordWrap();
 }
 
-void QIRichLabel::clear()
+void QILabel::setSizePolicy (QSizePolicy aPolicy)
+{
+    mLabel->setSizePolicy (aPolicy);
+    QWidget::setSizePolicy (aPolicy);
+}
+
+void QILabel::setMinimumSize (const QSize &aSize)
+{
+    mLabel->setMinimumSize (aSize);
+    QWidget::setMinimumSize (aSize);
+}
+
+void QILabel::clear()
 {
     mLabel->clearAll();
 }
 
-void QIRichLabel::setMovie (QMovie *aMovie)
+void QILabel::setMovie (QMovie *aMovie)
 {
     mLabel->setMovie (aMovie);
 }
 
-void QIRichLabel::setNum (int aNum)
+void QILabel::setNum (int aNum)
 {
     mLabel->setNum (aNum);
 }
 
-void QIRichLabel::setNum (double aNum)
+void QILabel::setNum (double aNum)
 {
     mLabel->setNum (aNum);
 }
 
-void QIRichLabel::setPicture (const QPicture &aPicture)
+void QILabel::setPicture (const QPicture &aPicture)
 {
     mLabel->setPicture (aPicture);
 }
 
-void QIRichLabel::setPixmap (const QPixmap &aPixmap)
+void QILabel::setPixmap (const QPixmap &aPixmap)
 {
     mLabel->setPixmap (aPixmap);
 }
 
-void QIRichLabel::setText (const QString &aText)
+void QILabel::setText (const QString &aText)
 {
     mLabel->setFullText (aText);

trunk/src/VBox/Frontends/VirtualBox4/src/QIMessageBox.cpp

@@ -25 +25 @@
 
 #include "QIMessageBox.h"
-#include "QIRichLabel.h"
+#include "QILabel.h"
 #include "QIDialogButtonBox.h"
 
@@ -82 +82 @@
     hLayout->addLayout (messageVBoxLayout);
 
-    mTextLabel = new QIRichLabel (aText, NULL);
+    mTextLabel = new QILabel (aText, NULL);
     mTextLabel->setAlignment (Qt::AlignLeft | Qt::AlignTop);
     mTextLabel->setWordWrap (true);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp

@@ -23 +23 @@
 #include "VBoxDiskImageManagerDlg.h"
 #include "VBoxToolBar.h"
-#include "QIRichLabel.h"
+#include "QILabel.h"
 #include "VBoxNewHDWzd.h"
 #include "VBoxProblemReporter.h"
@@ -192 +192 @@
 };
 
-class InfoPaneLabel : public QIRichLabel
+class InfoPaneLabel : public QILabel
 {
 public:
 
     InfoPaneLabel (QWidget *aParent, QLabel *aLabel = 0)
-        : QIRichLabel (aParent), mLabel (aLabel) {}
+        : QILabel (aParent), mLabel (aLabel) {}
 
     QLabel* label() const { return mLabel; }

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxRegistrationDlg.cpp

@@ -244 +244 @@
              this, SLOT (revalidate (QIWidgetValidator *)));
     connect (mTimeout, SIGNAL (timeout()), this, SLOT (processTimeout()));
-    /* TODO: Implement mouse on link click for QILabel:
-     * connect (mTextRegInfo, SIGNAL (clickedOnLink (const QString &)),
-     *          &vboxGlobal(), SLOT (openURL (const QString &))); */
 
     /* Setup initial dialog parameters. */

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

@@ -1308 +1308 @@
     <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>
+    <include location="local" impldecl="in implementation">QILabel.h</include>
 </includes>
 <forwards>
     <forward>class VBoxUSBMenu</forward>
-    <forward>class QIRichLabel</forward>
+    <forward>class QILabel</forward>
 </forwards>
 <variables>
@@ -1327 +1327 @@
     <variable access="private">VBoxUSBMenu *usbDevicesMenu;</variable>
     <variable access="private">bool mLanguageChanged;</variable>
-    <variable access="private">QIRichLabel *whatsThisLabel;</variable>
+    <variable access="private">QILabel *whatsThisLabel;</variable>
 </variables>
 <slots>

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

@@ -30 +30 @@
 *****************************************************************************/
 
+#include "QILabel.h"
+
 #include <iprt/err.h>
 #include <iprt/param.h>
@@ -303 +305 @@
 
 #warning port me
-    whatsThisLabel = new QIRichLabel (this);
+    whatsThisLabel = new QILabel (this);
 //    VBoxGlobalSettingsDlgLayout->addWidget (whatsThisLabel, 2, 1);
 

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewHDWzd.ui

@@ -948 +948 @@
    <class>QILabel</class>
    <extends>QLabel</extends>
-   <header>QIAbstractWizard.h</header>
+   <header>QILabel.h</header>
   </customwidget>
   <customwidget>

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewVMWzd.ui

@@ -1213 +1213 @@
    <class>QILabel</class>
    <extends>QLabel</extends>
-   <header>QIAbstractWizard.h</header>
+   <header>QILabel.h</header>
   </customwidget>
   <customwidget>

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxRegistrationDlg.ui

@@ -255 +255 @@
    <class>QILabel</class>
    <extends>QLabel</extends>
-   <header>QIAbstractWizard.h</header>
+   <header>QILabel.h</header>
   </customwidget>
  </customwidgets>

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMFirstRunWzd.ui

@@ -849 +849 @@
    <class>QILabel</class>
    <extends>QLabel</extends>
-   <header>QIAbstractWizard.h</header>
+   <header>QILabel.h</header>
   </customwidget>
   <customwidget>