VirtualBox

Changeset 40142 in vbox for trunk/src


Ignore:
Timestamp:
Feb 16, 2012 9:42:38 AM (13 years ago)
Author:
vboxsync
Message:

FE/Qt: 6073: Switch VirtualBox wizards into new QIRichTextLabel: All the QILabel text-fields replaced with QIRichTextLabel, ui files reworked accordingly, cleaned up.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichTextLabel.cpp

    r40043 r40142  
    2828    : QWidget(pParent)
    2929    , m_pTextEdit(new QTextEdit(this))
     30    , m_iMinimumTextWidth(0)
    3031{
     32    /* Setup self: */
     33    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
    3134    /* Setup text-edit: */
    3235    m_pTextEdit->setReadOnly(true);
     36    m_pTextEdit->setFocusPolicy(Qt::NoFocus);
    3337    m_pTextEdit->setFrameShape(QFrame::NoFrame);
    3438    m_pTextEdit->viewport()->setAutoFillBackground(false);
    … …  
    4145}
    4246
     47/* Text getter: */
     48QString QIRichTextLabel::text() const
     49{
     50    return m_pTextEdit->toHtml();
     51}
     52
    4353/* Minimum text-width setter: */
    4454void QIRichTextLabel::setMinimumTextWidth(int iMinimumTextWidth)
    4555{
     56    /* Remember minimum text width: */
     57    m_iMinimumTextWidth = iMinimumTextWidth;
     58
    4659    /* Get corresponding QTextDocument: */
    4760    QTextDocument *pTextDocument = m_pTextEdit->document();
    4861    /* Bug in QTextDocument (?) : setTextWidth doesn't work from the first time. */
    49     for (int iTry = 0; pTextDocument->textWidth() != iMinimumTextWidth && iTry < 3; ++iTry)
    50         pTextDocument->setTextWidth(iMinimumTextWidth);
     62    for (int iTry = 0; pTextDocument->textWidth() != m_iMinimumTextWidth && iTry < 3; ++iTry)
     63        pTextDocument->setTextWidth(m_iMinimumTextWidth);
     64    /* Get corresponding QTextDocument size: */
     65    QSize size = pTextDocument->size().toSize();
     66
     67    /* Resize to content size: */
     68    m_pTextEdit->setMinimumSize(size);
     69    layout()->activate();
    5170}
    5271
    … …  
    5574{
    5675    /* Set text: */
    57     m_pTextEdit->setText(strText);
     76    m_pTextEdit->setHtml(strText);
     77
    5878    /* Get corresponding QTextDocument: */
    5979    QTextDocument *pTextDocument = m_pTextEdit->document();
     80    /* Adjust text-edit size: */
     81    pTextDocument->adjustSize();
    6082    /* Get corresponding QTextDocument size: */
    6183    QSize size = pTextDocument->size().toSize();
    62     /* Check if current size is valid, otherwise adjust it: */
    63     if (!size.isValid())
    64     {
    65         pTextDocument->adjustSize();
    66         size = pTextDocument->size().toSize();
    67     }
    68     /* Resize to content size: */
    69     m_pTextEdit->setMinimumSize(size);
     84
     85    /* Set minimum text width to corresponding value: */
     86    setMinimumTextWidth(m_iMinimumTextWidth == 0 ? size.width() : m_iMinimumTextWidth);
    7087}
    7188

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichTextLabel.h

    r40043 r40142  
    2828{
    2929    Q_OBJECT;
     30    Q_PROPERTY(QString text READ text WRITE setText);
    3031
    3132public:
    … …  
    3334    /* Constructor: */
    3435    QIRichTextLabel(QWidget *pParent = 0);
     36
     37    /* Text getter: */
     38    QString text() const;
    3539
    3640public slots:
    … …  
    4650    /* QTextEdit private member: */
    4751    QTextEdit *m_pTextEdit;
     52
     53    /* Minimum text-width: */
     54    int m_iMinimumTextWidth;
    4855};
    4956

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.cpp

    r40044 r40142  
    77
    88/*
    9  * Copyright (C) 2009-2010 Oracle Corporation
     9 * Copyright (C) 2009-2012 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1818 */
    1919
    20 /* Global includes */
     20/* Global includes: */
    2121#include <QAbstractButton>
    2222#include <QLayout>
    23 #include <QTextEdit>
    24 
    25 /* Local includes */
     23#include <qmath.h>
     24
     25/* Local includes: */
    2626#include "QIWizard.h"
    27 #include "QILabel.h"
    2827#include "VBoxGlobal.h"
    29 
    30 /* System includes */
    31 #include <math.h>
     28#include "QIRichTextLabel.h"
    3229
    3330QIWizard::QIWizard(QWidget *pParent)
    3431    : QIWithRetranslateUI<QWizard>(pParent)
    35     , m_iMinimumContentWidth(0)
    3632{
    3733#ifdef Q_WS_MAC
    … …  
    4238}
    4339
     40int     QIWizard::addPage(QIWizardPage *pPage)
     41{
     42    /* Configure page first: */
     43    configurePage(pPage);
     44
     45    /* Add page finally: */
     46    return QWizard::addPage(pPage);
     47}
     48
     49void QIWizard::setPage(int iId, QIWizardPage *pPage)
     50{
     51    /* Configure page first: */
     52    configurePage(pPage);
     53
     54    /* Add page finally: */
     55    QWizard::setPage(iId, pPage);
     56}
     57
     58void QIWizard::retranslateAllPages()
     59{
     60    QList<QIWizardPage*> pages = findChildren<QIWizardPage*>();
     61    for(int i = 0; i < pages.size(); ++i)
     62        qobject_cast<QIWizardPage*>(pages.at((i)))->retranslate();
     63}
     64
    4465void QIWizard::resizeToGoldenRatio()
    4566{
    46     /* Random initial QILabel width() to be adjusted! */
    47     int iLabelsWidth = 400;
    48     resizeAccordingLabelWidth(iLabelsWidth);
    49 
    50     /* Label delta for 'golden ratio' calculation. */
    51     int iLabelDelta = width() - iLabelsWidth;
    52 
    53     /* Calculating nearest 'golden ratio' width. */
    54     int iGoldRatioWidth = (int)sqrt(1.61 * width() * height());
    55     int iNewLabelWidth = iGoldRatioWidth - iLabelDelta;
     67    /* Use some small (!) initial QIRichTextLabel width: */
     68    int iInitialLabelWidth = 200;
     69
     70    /* Resize wizard according that initial width,
     71     * actually there could be other content
     72     * which wants to be wider than that initial width. */
     73    resizeAccordingLabelWidth(iInitialLabelWidth);
     74
     75    /* Get all the pages: */
     76    QList<QIWizardPage*> pages = findChildren<QIWizardPage*>();
     77    /* Get some (first) of those pages: */
     78    QIWizardPage *pSomePage = pages[0];
     79
     80    /* Calculate actual label width: */
     81    int iPageWidth = pSomePage->width();
     82    int iLeft, iTop, iRight, iBottom;
     83    pSomePage->layout()->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
     84    int iCurrentLabelWidth = iPageWidth - iLeft - iRight;
     85
     86    /* Calculate summary margin length, including margins of the page and wizard: */
     87    int iMarginsLength = width() - iCurrentLabelWidth;
     88
     89    /* Calculating nearest to 'golden ratio' label width: */
     90    int iCurrentWizardWidth = width();
     91    int iCurrentWizardHeight = height();
     92#ifndef Q_WS_MAC
     93    /* We should take into account watermar thought its not assigned yet: */
     94    QPixmap watermarkPixmap(m_strWatermarkName);
     95    int iWatermarkWidth = watermarkPixmap.width();
     96    iCurrentWizardWidth += iWatermarkWidth;
     97#endif /* !Q_WS_MAC */
     98    int iGoldenRatioWidth = (int)qSqrt((float)1.6 * iCurrentWizardWidth * iCurrentWizardHeight);
     99    int iProposedLabelWidth = iGoldenRatioWidth - iMarginsLength;
     100#ifndef Q_WS_MAC
     101    /* We should take into account watermar thought its not assigned yet: */
     102    iProposedLabelWidth -= iWatermarkWidth;
     103#endif /* !Q_WS_MAC */
     104
     105    /* Choose maximum between current and proposed label width: */
     106    int iNewLabelWidth = qMax(iCurrentLabelWidth, iProposedLabelWidth);
     107
     108    /* Finally resize wizard according new label width,
     109     * taking into account all the content and 'golden ratio' rule: */
    56110    resizeAccordingLabelWidth(iNewLabelWidth);
    57     m_iMinimumContentWidth = iNewLabelWidth;
    58 }
    59 
     111
     112#ifndef Q_WS_MAC
     113    /* Really assign watermark: */
     114    if (!m_strWatermarkName.isEmpty())
     115        assignWatermarkHelper();
     116#endif /* !Q_WS_MAC */
     117}
     118
     119#ifndef Q_WS_MAC
    60120void QIWizard::assignWatermark(const QString &strWatermark)
    61121{
    62     /* Create initial watermark. */
    63     QPixmap pixWaterMark(strWatermark);
    64 
     122    if (wizardStyle() != QWizard::AeroStyle)
     123        m_strWatermarkName = strWatermark;
     124}
     125#else
     126void QIWizard::assignBackground(const QString &strBackground)
     127{
     128    setPixmap(QWizard::BackgroundPixmap, strBackground);
     129}
     130#endif
     131
     132void QIWizard::configurePage(QIWizardPage *pPage)
     133{
     134    /* Page margins: */
     135    switch (wizardStyle())
     136    {
     137        case QWizard::ClassicStyle:
     138        {
     139            int iLeft, iTop, iRight, iBottom;
     140            pPage->layout()->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
     141            pPage->layout()->setContentsMargins(iLeft, iTop, 0, 0);
     142            break;
     143        }
     144        default:
     145            break;
     146    }
     147}
     148
     149void QIWizard::resizeAccordingLabelWidth(int iLabelsWidth)
     150{
     151    /* Unfortunately QWizard hides some of useful API in private part,
     152     * and also have few layouting bugs which could be easy fixed
     153     * by that API, so we will use QWizard::restart() method
     154     * to call the same functionality indirectly...
     155     * Early call restart() which is usually goes on show()! */
     156    restart();
     157
     158    /* Update QIRichTextLabel(s) text-width(s): */
     159    QList<QIRichTextLabel*> labels = findChildren<QIRichTextLabel*>();
     160    foreach (QIRichTextLabel *pLabel, labels)
     161        pLabel->setMinimumTextWidth(iLabelsWidth);
     162
     163    /* Now we have correct label size-hint(s) for all the pages.
     164     * We have to make sure all the pages uses maximum available size-hint. */
     165    QSize maxOfSizeHints;
     166    QList<QIWizardPage*> pages = findChildren<QIWizardPage*>();
     167    /* Search for the maximum available size-hint: */
     168    foreach (QIWizardPage *pPage, pages)
     169    {
     170        maxOfSizeHints.rwidth() = pPage->sizeHint().width() > maxOfSizeHints.width() ?
     171                                  pPage->sizeHint().width() : maxOfSizeHints.width();
     172        maxOfSizeHints.rheight() = pPage->sizeHint().height() > maxOfSizeHints.height() ?
     173                                   pPage->sizeHint().height() : maxOfSizeHints.height();
     174    }
     175    /* Use that size-hint for all the pages: */
     176    foreach (QIWizardPage *pPage, pages)
     177        pPage->setMinimumSize(maxOfSizeHints);
     178
     179    /* Relayout widgets: */
     180    QList<QLayout*> layouts = findChildren<QLayout*>();
     181    foreach(QLayout *pLayout, layouts)
     182        pLayout->activate();
     183
     184    /* Unfortunately QWizard hides some of useful API in private part,
     185     * BUT it also have few layouting bugs which could be easy fixed
     186     * by that API, so we will use QWizard::restart() method
     187     * to call the same functionality indirectly...
     188     * And now we call restart() after layout activation procedure! */
     189    restart();
     190
     191    /* Resize it to minimum size: */
     192    resize(QSize(0, 0));
     193}
     194
     195#ifndef Q_WS_MAC
     196int QIWizard::proposedWatermarkHeight()
     197{
     198    /* We should calculate suitable height for watermark pixmap,
     199     * for that we have to take into account:
     200     * 1. wizard-layout top-margin (for modern style),
     201     * 2. wizard-header height,
     202     * 3. margin between wizard-header and wizard-page,
     203     * 4. wizard-page height,
     204     * 5. wizard-layout bottom-margin (for modern style). */
     205
     206    /* Get current application style: */
     207    QStyle *pStyle = QApplication::style();
     208
     209    /* Acquire wizard-layout top-margin: */
     210    int iTopMargin = 0;
     211    if (wizardStyle() == QWizard::ModernStyle)
     212        iTopMargin = pStyle->pixelMetric(QStyle::PM_LayoutTopMargin);
     213
     214    /* We have no direct access to QWizardHeader inside QWizard private data...
     215     * From Qt sources it seems title font is hardcoded as current font point-size + 4: */
     216    QFont titleFont(QApplication::font());
     217    titleFont.setPointSize(titleFont.pointSize() + 4);
     218    QFontMetrics titleFontMetrics(titleFont);
     219    int iTitleHeight = titleFontMetrics.height();
     220
     221    /* We have no direct access to margin between QWizardHeader and wizard-pages...
     222     * From Qt sources it seems its hardcoded as just 7 pixels: */
     223    int iMarginBetweenTitleAndPage = 7;
     224
     225    /* Also we should get any page height: */
     226    QList<QIWizardPage*> pages = findChildren<QIWizardPage*>();
     227    int iPageHeight = pages[0]->height();
     228
     229    /* Acquire wizard-layout bottom-margin: */
     230    int iBottomMargin = 0;
     231    if (wizardStyle() == QWizard::ModernStyle)
     232        iBottomMargin = pStyle->pixelMetric(QStyle::PM_LayoutBottomMargin);
     233
     234    /* Finally, calculate summary height: */
     235    return iTopMargin + iTitleHeight + iMarginBetweenTitleAndPage + iPageHeight + iBottomMargin;
     236}
     237
     238void QIWizard::assignWatermarkHelper()
     239{
     240    /* Create initial watermark: */
     241    QPixmap pixWaterMark(m_strWatermarkName);
    65242    /* Convert watermark to image which
    66      * allows to manage pixel data directly. */
     243     * allows to manage pixel data directly: */
    67244    QImage imgWatermark = pixWaterMark.toImage();
    68 
    69     /* Use the right-top watermark pixel as frame color */
     245    /* Use the right-top watermark pixel as frame color: */
    70246    QRgb rgbFrame = imgWatermark.pixel(imgWatermark.width() - 1, 0);
    71 
    72     /* Take into account button's height */
    73     int iPageHeight = height() - button(QWizard::CancelButton)->height();
    74 
    75     /* Create final image on the basis of incoming, applying the rules. */
    76     QImage imgWatermarkNew(imgWatermark.width(), qMax(imgWatermark.height(), iPageHeight), imgWatermark.format());
     247    /* Create final image on the basis of incoming, applying the rules: */
     248    QImage imgWatermarkNew(imgWatermark.width(), qMax(imgWatermark.height(), proposedWatermarkHeight()), imgWatermark.format());
    77249    for (int y = 0; y < imgWatermarkNew.height(); ++ y)
    78250    {
    … …  
    100272        }
    101273    }
    102 
    103274    /* Convert processed image to pixmap and assign it to wizard's watermark. */
    104275    QPixmap pixWatermarkNew = QPixmap::fromImage(imgWatermarkNew);
    105276    setPixmap(QWizard::WatermarkPixmap, pixWatermarkNew);
    106277}
    107 
    108 void QIWizard::assignBackground(const QString &strBg)
    109 {
    110     setPixmap(QWizard::BackgroundPixmap, strBg);
    111 }
    112 
    113 void QIWizard::resizeAccordingLabelWidth(int iLabelsWidth)
    114 {
    115     /* Update QILabels size-hints */
    116     QList<QILabel*> labels = findChildren<QILabel*>();
    117     foreach (QILabel *pLabel, labels)
    118     {
    119         pLabel->useSizeHintForWidth(iLabelsWidth);
    120         pLabel->updateGeometry();
    121     }
    122 
    123     /* Unfortunately QWizard hides some of useful API in private part,
    124      * BUT it also have few layouting bugs which could be easy fixed
    125      * by that API, so we will use QWizard::restart() method
    126      * to call the same functionality indirectly...
    127      * Early call restart() which is usually goes on show()! */
    128     restart();
    129 
    130     /* Now we have correct size-hints calculated for all the pages.
    131      * We have to make sure all the pages uses maximum size-hint
    132      * of all the available. */
    133     QSize maxOfSizeHints;
    134     QList<QIWizardPage*> pages = findChildren<QIWizardPage*>();
    135     /* Search for the maximum available size-hint */
    136     foreach (QIWizardPage *pPage, pages)
    137     {
    138         maxOfSizeHints.rwidth() = pPage->sizeHint().width() > maxOfSizeHints.width() ?
    139                                   pPage->sizeHint().width() : maxOfSizeHints.width();
    140         maxOfSizeHints.rheight() = pPage->sizeHint().height() > maxOfSizeHints.height() ?
    141                                    pPage->sizeHint().height() : maxOfSizeHints.height();
    142     }
    143     /* Use that size-hint for all the pages */
    144     foreach (QIWizardPage *pPage, pages)
    145     {
    146         pPage->setMinimumSizeHint(maxOfSizeHints);
    147         pPage->updateGeometry();
    148     }
    149 
    150     /* Reactivate layouts tree */
    151     QList<QLayout*> layouts = findChildren<QLayout*>();
    152     foreach (QLayout *pLayout, layouts)
    153         pLayout->activate();
    154 
    155     /* Unfortunately QWizard hides some of useful API in private part,
    156      * BUT it also have few layouting bugs which could be easy fixed
    157      * by that API, so we will use QWizard::restart() method
    158      * to call the same functionality indirectly...
    159      * And now we call restart() after layout update procedure! */
    160     restart();
    161 
    162     /* Resize to minimum possible size */
    163     resize(minimumSizeHint());
    164 }
    165 
    166 void QIWizard::retranslateAllPages()
    167 {
    168     QList<QIWizardPage*> pages = findChildren<QIWizardPage*>();
    169     for(int i=0; i < pages.size(); ++i)
    170         static_cast<QIWizardPage*>(pages.at((i)))->retranslateUi();
    171 }
     278#endif /* !Q_WS_MAC */
    172279
    173280QIWizardPage::QIWizardPage()
    … …  
    175282}
    176283
    177 QSize QIWizardPage::minimumSizeHint() const
    178 {
    179     return m_MinimumSizeHint.isValid() ? m_MinimumSizeHint : QWizardPage::minimumSizeHint();
    180 }
    181 
    182 void QIWizardPage::setMinimumSizeHint(const QSize &minimumSizeHint)
    183 {
    184     m_MinimumSizeHint = minimumSizeHint;
     284QIWizard* QIWizardPage::wizard() const
     285{
     286    return qobject_cast<QIWizard*>(QWizardPage::wizard());
    185287}
    186288
    … …  
    212314}
    213315
    214 QIWizard* QIWizardPage::wizard() const
    215 {
    216     return qobject_cast<QIWizard*>(QWizardPage::wizard());
    217 }
    218 

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWizard.h

    r40044 r40142  
    66
    77/*
    8  * Copyright (C) 2009-2010 Oracle Corporation
     8 * Copyright (C) 2009-2012 Oracle Corporation
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2020#define __QIWizard_h__
    2121
    22 /* Global includes */
     22/* Global includes: */
    2323#include <QWizard>
    2424
    25 /* Local includes */
     25/* Local includes: */
    2626#include "QIWithRetranslateUI.h"
    2727
    28 /* Global forwards */
    29 class QTextEdit;
     28/* Forward declarations: */
     29class QIWizardPage;
    3030
     31/* QWizard class reimplementation with extended funtionality. */
    3132class QIWizard : public QIWithRetranslateUI<QWizard>
    3233{
    … …  
    3536public:
    3637
     38    /* Constructor: */
    3739    QIWizard(QWidget *pParent);
    38 
    39     int minimumContentWidth() const { return m_iMinimumContentWidth; }
    4040
    4141protected:
    4242
     43    /* Page related methods: */
     44    int addPage(QIWizardPage *pPage);
     45    void setPage(int iId, QIWizardPage *pPage);
     46
     47    /* Translation stuff: */
     48    void retranslateAllPages();
     49
     50    /* Adjusting stuff: */
    4351    void resizeToGoldenRatio();
     52
     53    /* Design stuff: */
     54#ifndef Q_WS_MAC
    4455    void assignWatermark(const QString &strWaterMark);
    45     void assignBackground(const QString &strBg);
    46 
    47     void retranslateAllPages();
     56#else
     57    void assignBackground(const QString &strBackground);
     58#endif
    4859
    4960private:
    5061
     62    /* Helpers: */
     63    void configurePage(QIWizardPage *pPage);
    5164    void resizeAccordingLabelWidth(int iLabelWidth);
    52 
    53     int m_iMinimumContentWidth;
     65#ifndef Q_WS_MAC
     66    int proposedWatermarkHeight();
     67    void assignWatermarkHelper();
     68    QString m_strWatermarkName;
     69#endif /* !Q_WS_MAC */
    5470};
    5571
     72/* QWizardPage class reimplementation with extended funtionality. */
    5673class QIWizardPage : public QIWithRetranslateUI<QWizardPage>
    5774{
    5875    Q_OBJECT;
    5976
    60     friend class QIWizard;
    61 
    6277public:
    6378
     79    /* Constructor: */
    6480    QIWizardPage();
    6581
    66     QSize minimumSizeHint() const;
    67     void setMinimumSizeHint(const QSize &minimumSizeHint);
     82    /* Translation stuff: */
     83    void retranslate() { retranslateUi(); }
    6884
    6985protected:
    7086
     87    /* Helpers: */
     88    QIWizard* wizard() const;
    7189    QString standardHelpText() const;
    72 
    7390    void startProcessing();
    7491    void endProcessing();
    75 
    76     QIWizard* wizard() const;
    77 
    78 private:
    79 
    80     QSize m_MinimumSizeHint;
    8192};
    8293

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp

    r39096 r40142  
    77
    88/*
    9  * Copyright (C) 2011 Oracle Corporation
     9 * Copyright (C) 2011-2012 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    5151    retranslateAllPages();
    5252
    53     /* Resize wizard to 'golden ratio': */
    54     resizeToGoldenRatio();
    55 
    56 #ifdef Q_WS_MAC
     53#ifndef Q_WS_MAC
     54    /* Assign watermark: */
     55    assignWatermark(":/vmw_clone.png");
     56#else /* Q_WS_MAC */
    5757    setMinimumSize(QSize(600, 400));
    5858    /* Assign background image: */
    5959    assignBackground(":/vmw_clone_bg.png");
    60 #else /* Q_WS_MAC */
    61     /* Assign watermark: */
    62     assignWatermark(":/vmw_clone.png");
    6360#endif /* Q_WS_MAC */
     61
     62    /* Resize wizard to 'golden ratio': */
     63    resizeToGoldenRatio();
    6464}
    6565

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizardPage1.ui

    r38189 r40142  
    44 VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
    55
    6      Copyright (C) 2011 Oracle Corporation
     6     Copyright (C) 2011-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="verticalLayout">
    3327   <item>
    34     <widget class="QILabel" name="m_pLabel">
     28    <widget class="QIRichTextLabel" name="m_pLabel">
    3529     <property name="text">
    3630      <string>&lt;p&gt;This wizard will help you to create a clone of your virtual machine.&lt;/p&gt;</string>
    37      </property>
    38      <property name="wordWrap">
    39       <bool>true</bool>
    4031     </property>
    4132    </widget>
    4233   </item>
    4334   <item>
    44     <widget class="QILabel" name="m_pLabel2">
     35    <widget class="QIRichTextLabel" name="m_pLabel2">
    4536     <property name="text">
    4637      <string>&lt;p&gt;Please choose a name for the new virtual machine:&lt;/p&gt;</string>
    47      </property>
    48      <property name="wordWrap">
    49       <bool>true</bool>
    5038     </property>
    5139    </widget>
    … …  
    6553   </item>
    6654   <item>
    67     <spacer name="verticalSpacer">
     55    <spacer name="m_pSpacer">
    6856     <property name="orientation">
    6957      <enum>Qt::Vertical</enum>
    7058     </property>
    71      <property name="sizeHint" stdset="0">
     59     <property name="sizeHint">
    7260      <size>
    73        <width>1</width>
    74        <height>1</height>
     61       <width>0</width>
     62       <height>0</height>
    7563      </size>
    7664     </property>
    … …  
    8169 <customwidgets>
    8270  <customwidget>
    83    <class>QILabel</class>
    84    <extends>QLabel</extends>
    85    <header>QILabel.h</header>
     71   <class>QIRichTextLabel</class>
     72   <extends>QWidget</extends>
     73   <header>QIRichTextLabel.h</header>
    8674  </customwidget>
    8775 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizardPage2.ui

    r38241 r40142  
    44 VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
    55
    6      Copyright (C) 2011 Oracle Corporation
     6     Copyright (C) 2011-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="verticalLayout">
    3327   <item>
    34     <widget class="QILabel" name="m_pLabel">
    35      <property name="text">
    36       <string></string>
    37      </property>
    38      <property name="wordWrap">
    39       <bool>true</bool>
    40      </property>
    41     </widget>
     28    <widget class="QIRichTextLabel" name="m_pLabel"/>
    4229   </item>
    4330   <item>
    … …  
    6350      <enum>Qt::Vertical</enum>
    6451     </property>
    65      <property name="sizeHint" stdset="0">
     52     <property name="sizeHint">
    6653      <size>
    6754       <width>0</width>
    … …  
    7562 <customwidgets>
    7663  <customwidget>
    77    <class>QILabel</class>
    78    <extends>QLabel</extends>
    79    <header>QILabel.h</header>
     64   <class>QIRichTextLabel</class>
     65   <extends>QWidget</extends>
     66   <header>QIRichTextLabel.h</header>
    8067  </customwidget>
    8168 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizardPage3.ui

    r38102 r40142  
    44 VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
    55
    6      Copyright (C) 2011 Oracle Corporation
     6     Copyright (C) 2011-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="verticalLayout">
    3327   <item>
    34     <widget class="QILabel" name="m_pLabel">
    35      <property name="text">
    36       <string></string>
    37      </property>
    38      <property name="wordWrap">
    39       <bool>true</bool>
    40      </property>
    41     </widget>
     28    <widget class="QIRichTextLabel" name="m_pLabel"/>
    4229   </item>
    4330   <item>
    … …  
    7057      <enum>Qt::Vertical</enum>
    7158     </property>
    72      <property name="sizeHint" stdset="0">
     59     <property name="sizeHint">
    7360      <size>
    7461       <width>0</width>
    … …  
    8269 <customwidgets>
    8370  <customwidget>
    84    <class>QILabel</class>
    85    <extends>QLabel</extends>
    86    <header>QILabel.h</header>
     71   <class>QIRichTextLabel</class>
     72   <extends>QWidget</extends>
     73   <header>QIRichTextLabel.h</header>
    8774  </customwidget>
    8875 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp

    r39096 r40142  
    77
    88/*
    9  * Copyright (C) 2009-2010 Oracle Corporation
     9 * Copyright (C) 2009-2012 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    6868    retranslateAllPages();
    6969
     70#ifndef Q_WS_MAC
     71    /* Assign watermark */
     72    assignWatermark(":/vmw_ovf_export.png");
     73#else /* Q_WS_MAC */
     74    /* Assign background image */
     75    assignBackground(":/vmw_ovf_export_bg.png");
     76#endif /* Q_WS_MAC */
     77
    7078    /* Resize to 'golden ratio' */
    7179    resizeToGoldenRatio();
    72 
    73 #ifdef Q_WS_MAC
    74     /* Assign background image */
    75     assignBackground(":/vmw_ovf_export_bg.png");
    76 #else /* Q_WS_MAC */
    77     /* Assign watermark */
    78     assignWatermark(":/vmw_ovf_export.png");
    79 #endif /* Q_WS_MAC */
    8080
    8181    /* Setup connections */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage1.ui

    r28800 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2010 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pLayout1">
    33    <property name="bottomMargin" >
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pPage1Text1">
    38      <property name="wordWrap">
    39       <bool>true</bool>
    40      </property>
    41     </widget>
     28    <widget class="QIRichTextLabel" name="m_pPage1Text1"/>
    4229   </item>
    4330   <item>
    … …  
    4835 <customwidgets>
    4936  <customwidget>
    50    <class>QILabel</class>
    51    <extends>QLabel</extends>
    52    <header>QILabel.h</header>
     37   <class>QIRichTextLabel</class>
     38   <extends>QWidget</extends>
     39   <header>QIRichTextLabel.h</header>
    5340  </customwidget>
    5441 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage2.ui

    r33417 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2010 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pLayout1">
    33    <property name="bottomMargin" >
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pPage3Text1">
     28    <widget class="QIRichTextLabel" name="m_pPage3Text1">
    3829     <property name="text">
    3930      <string>Please specify the target for the OVF export. You can choose between a local file system export, uploading the OVF to the Sun Cloud service or an S3 storage server.</string>
    40      </property>
    41      <property name="wordWrap">
    42       <bool>true</bool>
    4331     </property>
    4432    </widget>
    … …  
    6654   </item>
    6755   <item>
    68     <spacer name="m_pSpacer1">
     56    <spacer name="m_pSpacer">
    6957     <property name="orientation">
    7058      <enum>Qt::Vertical</enum>
    7159     </property>
    72      <property name="sizeHint" stdset="0">
     60     <property name="sizeHint">
    7361      <size>
    7462       <width>0</width>
    75        <height>252</height>
     63       <height>0</height>
    7664      </size>
    7765     </property>
    … …  
    8270 <customwidgets>
    8371  <customwidget>
    84    <class>QILabel</class>
    85    <extends>QLabel</extends>
    86    <header>QILabel.h</header>
     72   <class>QIRichTextLabel</class>
     73   <extends>QWidget</extends>
     74   <header>QIRichTextLabel.h</header>
    8775  </customwidget>
    8876 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage3.ui

    r33656 r40142  
    44 VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
    55
    6      Copyright (C) 2009-2010 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="verticalLayout">
    3327   <item>
    34     <widget class="QILabel" name="m_pPage4Text1">
    35      <property name="wordWrap">
    36       <bool>true</bool>
    37      </property>
    38     </widget>
     28    <widget class="QIRichTextLabel" name="m_pPage4Text1"/>
    3929   </item>
    4030   <item>
    … …  
    147137   </item>
    148138   <item>
    149     <spacer name="m_pSpacer1">
     139    <spacer name="m_pSpacer">
    150140     <property name="orientation">
    151141      <enum>Qt::Vertical</enum>
    152142     </property>
    153      <property name="sizeHint" stdset="0">
     143     <property name="sizeHint">
    154144      <size>
    155        <width>579</width>
    156        <height>144</height>
     145       <width>0</width>
     146       <height>0</height>
    157147      </size>
    158148     </property>
    … …  
    163153 <customwidgets>
    164154  <customwidget>
    165    <class>QILabel</class>
    166    <extends>QLabel</extends>
    167    <header>QILabel.h</header>
     155   <class>QIRichTextLabel</class>
     156   <extends>QWidget</extends>
     157   <header>QIRichTextLabel.h</header>
    168158  </customwidget>
    169159  <customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage4.ui

    r38410 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2010 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pLayout1">
    33    <property name="bottomMargin" >
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pPage2Text1">
     28    <widget class="QIRichTextLabel" name="m_pPage2Text1">
    3829     <property name="text">
    3930      <string>Here you can change additional configuration values of the selected virtual machines. You can modify most of the properties shown by double-clicking on the items.</string>
    40      </property>
    41      <property name="wordWrap">
    42       <bool>true</bool>
    4331     </property>
    4432    </widget>
    … …  
    5846 <customwidgets>
    5947  <customwidget>
    60    <class>QILabel</class>
    61    <extends>QLabel</extends>
    62    <header>QILabel.h</header>
     48   <class>QIRichTextLabel</class>
     49   <extends>QWidget</extends>
     50   <header>QIRichTextLabel.h</header>
    6351  </customwidget>
    6452  <customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzd.cpp

    r40044 r40142  
    77
    88/*
    9  * Copyright (C) 2008-2011 Oracle Corporation
     9 * Copyright (C) 2008-2012 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    4949    retranslateAllPages();
    5050
     51#ifndef Q_WS_MAC
     52    /* Assign watermark */
     53    assignWatermark(":/vmw_first_run.png");
     54#else /* Q_WS_MAC */
     55    /* Assign background image */
     56    assignBackground(":/vmw_first_run_bg.png");
     57#endif /* Q_WS_MAC */
     58
    5159    /* Resize to 'golden ratio' */
    5260    resizeToGoldenRatio();
    53 
    54 #ifdef Q_WS_MAC
    55     /* Assign background image */
    56     assignBackground(":/vmw_first_run_bg.png");
    57 #else /* Q_WS_MAC */
    58     /* Assign watermark */
    59     assignWatermark(":/vmw_first_run.png");
    60 #endif /* Q_WS_MAC */
    6161}
    6262
    … …  
    281281    ;
    282282
    283     m_pSummaryText->setMinimumTextWidth(wizard()->minimumContentWidth());
    284283    m_pSummaryText->setText("<table cellspacing=0 cellpadding=0>" + summary + "</table>");
    285284}

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzdPage1.ui

    r28800 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2010 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pLayout1">
    33    <property name="bottomMargin" >
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pPage1Text1Var1">
    38      <property name="wordWrap">
    39       <bool>true</bool>
    40      </property>
    41     </widget>
     28    <widget class="QIRichTextLabel" name="m_pPage1Text1Var1"/>
    4229   </item>
    4330   <item>
    44     <widget class="QILabel" name="m_pPage1Text1Var2">
    45      <property name="wordWrap">
    46       <bool>true</bool>
    47      </property>
    48     </widget>
     31    <widget class="QIRichTextLabel" name="m_pPage1Text1Var2"/>
    4932   </item>
    5033   <item>
    51     <spacer name="m_pSpacer1">
    52      <property name="sizeHint" stdset="0">
     34    <spacer name="m_pSpacer">
     35     <property name="orientation">
     36      <enum>Qt::Vertical</enum>
     37     </property>
     38     <property name="sizeHint">
    5339      <size>
    5440       <width>0</width>
    … …  
    6248 <customwidgets>
    6349  <customwidget>
    64    <class>QILabel</class>
    65    <extends>QLabel</extends>
    66    <header>QILabel.h</header>
     50   <class>QIRichTextLabel</class>
     51   <extends>QWidget</extends>
     52   <header>QIRichTextLabel.h</header>
    6753  </customwidget>
    6854 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzdPage2.ui

    r34548 r40142  
    44 VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
    55
    6      Copyright (C) 2009-2010 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pLayout1">
    33    <property name="bottomMargin">
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pPage2Text1Var1">
     28    <widget class="QIRichTextLabel" name="m_pPage2Text1Var1">
    3829     <property name="text">
    3930      <string>&lt;p&gt;Select the media which contains the setup program of the operating system you want to install. This media must be bootable, otherwise the setup program will not be able to start.&lt;/p&gt;</string>
    40      </property>
    41      <property name="wordWrap">
    42       <bool>true</bool>
    4331     </property>
    4432    </widget>
    4533   </item>
    4634   <item>
    47     <widget class="QILabel" name="m_pPage2Text1Var2">
     35    <widget class="QIRichTextLabel" name="m_pPage2Text1Var2">
    4836     <property name="text">
    4937      <string>&lt;p&gt;Select the media that contains the operating system you want to work with. This media must be bootable, otherwise the operating system will not be able to start.&lt;/p&gt;</string>
    50      </property>
    51      <property name="wordWrap">
    52       <bool>true</bool>
    5338     </property>
    5439    </widget>
    … …  
    5641   <item>
    5742    <widget class="QGroupBox" name="m_pCntSource">
     43     <property name="sizePolicy">
     44      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     45       <horstretch>0</horstretch>
     46       <verstretch>0</verstretch>
     47      </sizepolicy>
     48     </property>
    5849     <property name="title">
    5950      <string>Media Source</string>
    … …  
    7465   </item>
    7566   <item>
    76     <spacer name="m_pSpacer1">
     67    <spacer name="m_pSpacer">
    7768     <property name="orientation">
    7869      <enum>Qt::Vertical</enum>
    7970     </property>
    80      <property name="sizeHint" stdset="0">
     71     <property name="sizeHint">
    8172      <size>
    8273       <width>0</width>
    … …  
    9586  </customwidget>
    9687  <customwidget>
    97    <class>QILabel</class>
    98    <extends>QLabel</extends>
    99    <header>QILabel.h</header>
     88   <class>QIRichTextLabel</class>
     89   <extends>QWidget</extends>
     90   <header>QIRichTextLabel.h</header>
    10091  </customwidget>
    10192  <customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzdPage3.ui

    r40044 r40142  
    44 VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
    55
    6      Copyright (C) 2009-2011 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pLayout1">
    33    <property name="bottomMargin">
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pPage3Text1Var1">
     28    <widget class="QIRichTextLabel" name="m_pPage3Text1Var1">
    3829     <property name="text">
    3930      <string>&lt;p&gt;You have selected the following media to boot from:&lt;/p&gt;</string>
    40      </property>
    41      <property name="wordWrap">
    42       <bool>true</bool>
    4331     </property>
    4432    </widget>
    4533   </item>
    4634   <item>
    47     <widget class="QILabel" name="m_pPage3Text1Var2">
     35    <widget class="QIRichTextLabel" name="m_pPage3Text1Var2">
    4836     <property name="text">
    4937      <string>&lt;p&gt;You have selected the following media to boot an operating system from:&lt;/p&gt;</string>
    50      </property>
    51      <property name="wordWrap">
    52       <bool>true</bool>
    5338     </property>
    5439    </widget>
    … …  
    5843   </item>
    5944   <item>
    60     <widget class="QILabel" name="m_pPage3Text2Var1">
     45    <widget class="QIRichTextLabel" name="m_pPage3Text2Var1">
    6146     <property name="text">
    6247      <string>&lt;p&gt;If the above is correct, press the &lt;b&gt;Finish&lt;/b&gt; button. Once you press it, the selected media will be temporarily mounted on the virtual machine and the machine will start execution.&lt;/p&gt;&lt;p&gt;Please note that when you close the virtual machine, the specified media will be automatically unmounted and the boot device will be set back to the first hard disk.&lt;/p&gt;&lt;p&gt;Depending on the type of the setup program, you may need to manually unmount (eject) the media after the setup program reboots the virtual machine, to prevent the installation process from starting again. You can do this by selecting the corresponding &lt;b&gt;Unmount...&lt;/b&gt; action in the &lt;b&gt;Devices&lt;/b&gt; menu.&lt;/p&gt;</string>
    63      </property>
    64      <property name="wordWrap">
    65       <bool>true</bool>
    6648     </property>
    6749    </widget>
    6850   </item>
    6951   <item>
    70     <widget class="QILabel" name="m_pPage3Text2Var2">
     52    <widget class="QIRichTextLabel" name="m_pPage3Text2Var2">
    7153     <property name="text">
    7254      <string>&lt;p&gt;If the above is correct, press the &lt;b&gt;Finish&lt;/b&gt; button. Once you press it, the selected media will be mounted on the virtual machine and the machine will start execution.&lt;/p&gt;</string>
    73      </property>
    74      <property name="wordWrap">
    75       <bool>true</bool>
    7655     </property>
    7756    </widget>
    7857   </item>
    7958   <item>
    80     <spacer name="m_pSpacer1">
     59    <spacer name="m_pSpacer">
    8160     <property name="orientation">
    8261      <enum>Qt::Vertical</enum>
    8362     </property>
    84      <property name="sizeHint" stdset="0">
     63     <property name="sizeHint">
    8564      <size>
    8665       <width>0</width>
    … …  
    9473 <customwidgets>
    9574  <customwidget>
    96    <class>QILabel</class>
    97    <extends>QLabel</extends>
    98    <header>QILabel.h</header>
    99   </customwidget>
    100   <customwidget>
    10175   <class>QIRichTextLabel</class>
    10276   <extends>QWidget</extends>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.cpp

    r38412 r40142  
    77
    88/*
    9  * Copyright (C) 2009-2010 Oracle Corporation
     9 * Copyright (C) 2009-2012 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    123123    retranslateAllPages();
    124124
     125#ifndef Q_WS_MAC
     126    /* Assign watermark */
     127    assignWatermark(":/vmw_ovf_import.png");
     128#else /* Q_WS_MAC */
     129    /* Assign background image */
     130    assignBackground(":/vmw_ovf_import_bg.png");
     131#endif /* Q_WS_MAC */
     132
    125133    /* Resize to 'golden ratio' */
    126134    resizeToGoldenRatio();
    127 
    128     /* Assign watermark */
    129 #ifdef Q_WS_MAC
    130     /* Assign background image */
    131     assignBackground(":/vmw_ovf_import_bg.png");
    132 #else /* Q_WS_MAC */
    133     assignWatermark(":/vmw_ovf_import.png");
    134 #endif /* Q_WS_MAC */
    135135
    136136    /* Configure 'Restore Defaults' button */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzdPage1.ui

    r28800 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2010 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pLayout1">
    33    <property name="bottomMargin">
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pPage1Text1">
    38      <property name="wordWrap">
    39       <bool>true</bool>
    40      </property>
    41     </widget>
     28    <widget class="QIRichTextLabel" name="m_pPage1Text1"/>
    4229   </item>
    4330   <item>
    … …  
    4532   </item>
    4633   <item>
    47     <spacer name="m_pSpacer1">
    48      <property name="sizeHint" stdset="0">
     34    <spacer name="m_pSpacer">
     35     <property name="orientation">
     36      <enum>Qt::Vertical</enum>
     37     </property>
     38     <property name="sizeHint">
    4939      <size>
    5040       <width>0</width>
    51        <height>252</height>
     41       <height>0</height>
    5242      </size>
    5343     </property>
    … …  
    5848 <customwidgets>
    5949  <customwidget>
    60    <class>QILabel</class>
    61    <extends>QLabel</extends>
    62    <header>QILabel.h</header>
     50   <class>QIRichTextLabel</class>
     51   <extends>QWidget</extends>
     52   <header>QIRichTextLabel.h</header>
    6353  </customwidget>
    6454  <customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzdPage2.ui

    r38412 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2010 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pLayout1">
    33    <property name="bottomMargin">
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pPage2Text1">
     28    <widget class="QIRichTextLabel" name="m_pPage2Text1">
    3829     <property name="text">
    3930      <string>These are the virtual machines contained in the appliance and the suggested settings of the imported VirtualBox machines. You can change many of the properties shown by double-clicking on the items and disable others using the check boxes below.</string>
    40      </property>
    41      <property name="wordWrap">
    42       <bool>true</bool>
    4331     </property>
    4432    </widget>
    … …  
    5846 <customwidgets>
    5947  <customwidget>
    60    <class>QILabel</class>
    61    <extends>QLabel</extends>
    62    <header>QILabel.h</header>
     48   <class>QIRichTextLabel</class>
     49   <extends>QWidget</extends>
     50   <header>QIRichTextLabel.h</header>
    6351  </customwidget>
    6452  <customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.cpp

    r40095 r40142  
    77
    88/*
    9  * Copyright (C) 2006-2011 Oracle Corporation
     9 * Copyright (C) 2006-2012 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    209209    retranslateAllPages();
    210210
     211#ifndef Q_WS_MAC
     212    /* Assign watermark: */
     213    assignWatermark(":/vmw_new_harddisk.png");
     214#else /* Q_WS_MAC */
     215    /* Assign background image: */
     216    assignBackground(":/vmw_new_harddisk_bg.png");
     217#endif /* Q_WS_MAC */
     218
    211219    /* Resize wizard to 'golden ratio': */
    212220    resizeToGoldenRatio();
    213 
    214 #ifdef Q_WS_MAC
    215     /* Assign background image: */
    216     assignBackground(":/vmw_new_harddisk_bg.png");
    217 #else /* Q_WS_MAC */
    218     /* Assign watermark: */
    219     assignWatermark(":/vmw_new_harddisk.png");
    220 #endif /* Q_WS_MAC */
    221221}
    222222
    … …  
    993993    .arg(UINewHDWizard::tr("Size", "summary"), sizeFormatted, sizeUnformatted);
    994994
    995     m_pSummaryText->setMinimumTextWidth(wizard()->minimumContentWidth());
    996995    m_pSummaryText->setText("<table cellspacing=0 cellpadding=0>" + strSummary + "</table>");
    997996}

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizardPageFormat.ui

    r37406 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2011 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pMainLayout">
    33    <property name="bottomMargin" >
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pLabel">
    38      <property name="wordWrap">
    39       <bool>true</bool>
    40      </property>
    41     </widget>
     28    <widget class="QIRichTextLabel" name="m_pLabel"/>
    4229   </item>
    4330   <item>
    4431    <widget class="QGroupBox" name="m_pFormatContainer">
     32     <property name="sizePolicy">
     33      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     34       <horstretch>0</horstretch>
     35       <verstretch>0</verstretch>
     36      </sizepolicy>
     37     </property>
    4538     <property name="title">
    4639      <string>File type</string>
    … …  
    5144   <item>
    5245    <spacer name="m_pSpacer">
    53      <property name="sizeHint" stdset="0">
     46     <property name="orientation">
     47      <enum>Qt::Vertical</enum>
     48     </property>
     49     <property name="sizeHint">
    5450      <size>
    5551       <width>0</width>
    … …  
    6359 <customwidgets>
    6460  <customwidget>
    65    <class>QILabel</class>
    66    <extends>QLabel</extends>
    67    <header>QILabel.h</header>
     61   <class>QIRichTextLabel</class>
     62   <extends>QWidget</extends>
     63   <header>QIRichTextLabel.h</header>
    6864  </customwidget>
    6965 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizardPageOptions.ui

    r37406 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2011 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pMainLayout">
    33    <property name="bottomMargin" >
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pLabel1">
    38      <property name="wordWrap">
    39       <bool>true</bool>
    40      </property>
    41     </widget>
     28    <widget class="QIRichTextLabel" name="m_pLabel1"/>
    4229   </item>
    4330   <item>
    4431    <widget class="QGroupBox" name="m_pLocationCnt">
     32     <property name="sizePolicy">
     33      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     34       <horstretch>0</horstretch>
     35       <verstretch>0</verstretch>
     36      </sizepolicy>
     37     </property>
    4538     <property name="title">
    4639      <string>&amp;Location</string>
    … …  
    6154   </item>
    6255   <item>
    63     <widget class="QILabel" name="m_pLabel2">
    64      <property name="wordWrap">
    65       <bool>true</bool>
    66      </property>
    67     </widget>
     56    <widget class="QIRichTextLabel" name="m_pLabel2"/>
    6857   </item>
    6958   <item>
    7059    <widget class="QGroupBox" name="m_pSizeCnt">
     60     <property name="sizePolicy">
     61      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     62       <horstretch>0</horstretch>
     63       <verstretch>0</verstretch>
     64      </sizepolicy>
     65     </property>
    7166     <property name="title">
    7267      <string>&amp;Size</string>
    … …  
    137132   <item>
    138133    <spacer name="m_pSpacer">
    139      <property name="sizeHint" stdset="0">
     134     <property name="orientation">
     135      <enum>Qt::Vertical</enum>
     136     </property>
     137     <property name="sizeHint">
    140138      <size>
    141139       <width>0</width>
    … …  
    154152  </customwidget>
    155153  <customwidget>
    156    <class>QILabel</class>
    157    <extends>QLabel</extends>
    158    <header>QILabel.h</header>
     154   <class>QIRichTextLabel</class>
     155   <extends>QWidget</extends>
     156   <header>QIRichTextLabel.h</header>
    159157  </customwidget>
    160158  <customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizardPageSummary.ui

    r40044 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2011 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pMainLayout">
    33    <property name="bottomMargin" >
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pLabel1">
    38      <property name="wordWrap">
    39       <bool>true</bool>
    40      </property>
    41     </widget>
     28    <widget class="QIRichTextLabel" name="m_pLabel1"/>
    4229   </item>
    4330   <item>
    … …  
    4532   </item>
    4633   <item>
    47     <widget class="QILabel" name="m_pLabel2">
    48      <property name="wordWrap">
    49       <bool>true</bool>
    50      </property>
    51     </widget>
     34    <widget class="QIRichTextLabel" name="m_pLabel2"/>
    5235   </item>
    5336   <item>
    5437    <spacer name="m_pSpacer">
    55      <property name="sizeHint" stdset="0">
     38     <property name="orientation">
     39      <enum>Qt::Vertical</enum>
     40     </property>
     41     <property name="sizeHint">
    5642      <size>
    5743       <width>0</width>
    … …  
    6551 <customwidgets>
    6652  <customwidget>
    67    <class>QILabel</class>
    68    <extends>QLabel</extends>
    69    <header>QILabel.h</header>
    70   </customwidget>
    71   <customwidget>
    7253   <class>QIRichTextLabel</class>
    7354   <extends>QWidget</extends>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizardPageVariant.ui

    r37406 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2011 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pMainLayout">
    33    <property name="bottomMargin" >
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pLabel">
    38      <property name="wordWrap">
    39       <bool>true</bool>
    40      </property>
    41     </widget>
     28    <widget class="QIRichTextLabel" name="m_pLabel"/>
    4229   </item>
    4330   <item>
    4431    <widget class="QGroupBox" name="m_pVariantContainer">
     32     <property name="sizePolicy">
     33      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     34       <horstretch>0</horstretch>
     35       <verstretch>0</verstretch>
     36      </sizepolicy>
     37     </property>
    4538     <property name="title">
    4639      <string>Storage details</string>
    … …  
    5144   <item>
    5245    <spacer name="m_pSpacer">
    53      <property name="sizeHint" stdset="0">
     46     <property name="orientation">
     47      <enum>Qt::Vertical</enum>
     48     </property>
     49     <property name="sizeHint">
    5450      <size>
    5551       <width>0</width>
    … …  
    6359 <customwidgets>
    6460  <customwidget>
    65    <class>QILabel</class>
    66    <extends>QLabel</extends>
    67    <header>QILabel.h</header>
     61   <class>QIRichTextLabel</class>
     62   <extends>QWidget</extends>
     63   <header>QIRichTextLabel.h</header>
    6864  </customwidget>
    6965 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizardPageWelcome.ui

    r37682 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2011 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424   </rect>
    2525  </property>
    26   <property name="sizePolicy">
    27    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    28     <horstretch>0</horstretch>
    29     <verstretch>0</verstretch>
    30    </sizepolicy>
    31   </property>
    3226  <layout class="QVBoxLayout" name="m_pMainLayout">
    33    <property name="bottomMargin" >
    34     <number>0</number>
    35    </property>
    3627   <item>
    37     <widget class="QILabel" name="m_pLabel">
    38      <property name="wordWrap">
    39       <bool>true</bool>
    40      </property>
    41     </widget>
     28    <widget class="QIRichTextLabel" name="m_pLabel"/>
    4229   </item>
    4330   <item>
    4431    <widget class="QGroupBox" name="m_pSourceDiskContainer">
     32     <property name="sizePolicy">
     33      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     34       <horstretch>0</horstretch>
     35       <verstretch>0</verstretch>
     36      </sizepolicy>
     37     </property>
    4538     <property name="title">
    4639      <string>Virtual disk to copy</string>
    … …  
    6558   <item>
    6659    <spacer name="m_pSpacer">
    67      <property name="sizeHint" stdset="0">
     60     <property name="orientation">
     61      <enum>Qt::Vertical</enum>
     62     </property>
     63     <property name="sizeHint">
    6864      <size>
    6965       <width>0</width>
    … …  
    8278  </customwidget>
    8379  <customwidget>
    84    <class>QILabel</class>
    85    <extends>QLabel</extends>
    86    <header>QILabel.h</header>
     80   <class>QIRichTextLabel</class>
     81   <extends>QWidget</extends>
     82   <header>QIRichTextLabel.h</header>
    8783  </customwidget>
    8884  <customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

    r40044 r40142  
    77
    88/*
    9  * Copyright (C) 2006-2011 Oracle Corporation
     9 * Copyright (C) 2006-2012 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    154154    retranslateAllPages();
    155155
     156#ifndef Q_WS_MAC
     157    /* Assign watermark */
     158    assignWatermark(":/vmw_new_welcome.png");
     159#else /* Q_WS_MAC */
     160    /* Assign background image */
     161    assignBackground(":/vmw_new_welcome_bg.png");
     162#endif /* Q_WS_MAC */
     163
    156164    /* Resize to 'golden ratio' */
    157165    resizeToGoldenRatio();
    158 
    159 #ifdef Q_WS_MAC
    160     /* Assign background image */
    161     assignBackground(":/vmw_new_welcome_bg.png");
    162 #else /* Q_WS_MAC */
    163     /* Assign watermark */
    164     assignWatermark(":/vmw_new_welcome.png");
    165 #endif /* Q_WS_MAC */
    166166}
    167167
    … …  
    677677    }
    678678
    679     m_pSummaryText->setMinimumTextWidth(wizard()->minimumContentWidth());
    680679    m_pSummaryText->setText("<table cellspacing=0 cellpadding=0>" + summary + "</table>");
    681680

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzdPage1.ui

    r28800 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 <class>UINewVMWzdPage1</class>
    1717 <widget class="QWidget" name="UINewVMWzdPage1">
    18   <property name="sizePolicy">
    19    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    20     <horstretch>0</horstretch>
    21     <verstretch>0</verstretch>
    22    </sizepolicy>
    23   </property>
    2418  <property name="geometry">
    2519   <rect>
    … …  
    3024   </rect>
    3125  </property>
    32   <property name="sizePolicy">
    33    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    34     <horstretch>0</horstretch>
    35     <verstretch>0</verstretch>
    36    </sizepolicy>
    37   </property>
    3826  <layout class="QVBoxLayout" name="m_pLayout1">
    39    <property name="bottomMargin" >
    40     <number>0</number>
    41    </property>
    4227   <item>
    43     <widget class="QILabel" name="m_pPage1Text1">
    44      <property name="wordWrap">
    45       <bool>true</bool>
    46      </property>
    47     </widget>
     28    <widget class="QIRichTextLabel" name="m_pPage1Text1"/>
    4829   </item>
    4930   <item>
    50     <spacer name="m_pSpacer1">
    51      <property name="sizeHint" stdset="0">
     31    <spacer name="m_pSpacer">
     32     <property name="orientation" >
     33      <enum>Qt::Vertical</enum>
     34     </property>
     35     <property name="sizeHint">
    5236      <size>
    5337       <width>0</width>
    … …  
    6145 <customwidgets>
    6246  <customwidget>
    63    <class>QILabel</class>
    64    <extends>QLabel</extends>
    65    <header>QILabel.h</header>
     47   <class>QIRichTextLabel</class>
     48   <extends>QWidget</extends>
     49   <header>QIRichTextLabel.h</header>
    6650  </customwidget>
    6751 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzdPage2.ui

    r28800 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 <class>UINewVMWzdPage2</class>
    1717 <widget class="QWidget" name="UINewVMWzdPage2">
    18   <property name="sizePolicy">
    19    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    20     <horstretch>0</horstretch>
    21     <verstretch>0</verstretch>
    22    </sizepolicy>
    23   </property>
    2418  <property name="geometry">
    2519   <rect>
    … …  
    3024   </rect>
    3125  </property>
    32   <property name="sizePolicy">
    33    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    34     <horstretch>0</horstretch>
    35     <verstretch>0</verstretch>
    36    </sizepolicy>
    37   </property>
    3826  <layout class="QVBoxLayout" name="m_pLayout1">
    39    <property name="bottomMargin" >
    40     <number>0</number>
    41    </property>
    4227   <item>
    43     <widget class="QILabel" name="m_pPage2Text1">
     28    <widget class="QIRichTextLabel" name="m_pPage2Text1">
    4429     <property name="text">
    4530      <string>&lt;p&gt;Enter a name for the new virtual machine and select the type of the guest operating system you plan to install onto the virtual machine.&lt;/p&gt;&lt;p&gt;The name of the virtual machine usually indicates its software and hardware configuration. It will be used by all VirtualBox components to identify your virtual machine.&lt;/p&gt;</string>
    46      </property>
    47      <property name="wordWrap">
    48       <bool>true</bool>
    4931     </property>
    5032    </widget>
    … …  
    5234   <item>
    5335    <widget class="QGroupBox" name="m_pNameEditorCnt">
     36     <property name="sizePolicy">
     37      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     38       <horstretch>0</horstretch>
     39       <verstretch>0</verstretch>
     40      </sizepolicy>
     41     </property>
    5442     <property name="title">
    5543      <string>N&amp;ame</string>
    … …  
    6452   <item>
    6553    <widget class="QGroupBox" name="m_pTypeSelectorCnt">
     54     <property name="sizePolicy">
     55      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     56       <horstretch>0</horstretch>
     57       <verstretch>0</verstretch>
     58      </sizepolicy>
     59     </property>
    6660     <property name="title">
    6761      <string>OS &amp;Type</string>
    … …  
    7569   </item>
    7670   <item>
    77     <spacer name="m_pSpacer1">
    78      <property name="sizeHint" stdset="0">
     71    <spacer name="m_pSpacer">
     72     <property name="orientation" >
     73      <enum>Qt::Vertical</enum>
     74     </property>
     75     <property name="sizeHint">
    7976      <size>
    8077       <width>0</width>
    … …  
    8885 <customwidgets>
    8986  <customwidget>
    90    <class>QILabel</class>
    91    <extends>QLabel</extends>
    92    <header>QILabel.h</header>
     87   <class>QIRichTextLabel</class>
     88   <extends>QWidget</extends>
     89   <header>QIRichTextLabel.h</header>
    9390  </customwidget>
    9491  <customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzdPage3.ui

    r28800 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 <class>UINewVMWzdPage3</class>
    1717 <widget class="QWidget" name="UINewVMWzdPage3">
    18   <property name="sizePolicy">
    19    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    20     <horstretch>0</horstretch>
    21     <verstretch>0</verstretch>
    22    </sizepolicy>
    23   </property>
    2418  <property name="geometry">
    2519   <rect>
    … …  
    3024   </rect>
    3125  </property>
    32   <property name="sizePolicy">
    33    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    34     <horstretch>0</horstretch>
    35     <verstretch>0</verstretch>
    36    </sizepolicy>
    37   </property>
    3826  <layout class="QVBoxLayout" name="m_pLayout1">
    39    <property name="bottomMargin" >
    40     <number>0</number>
    41    </property>
    4227   <item>
    43     <widget class="QILabel" name="m_pPage3Text1">
     28    <widget class="QIRichTextLabel" name="m_pPage3Text1">
    4429     <property name="text">
    4530      <string>&lt;p&gt;Select the amount of base memory (RAM) in megabytes to be allocated to the virtual machine.&lt;/p&gt;</string>
    46      </property>
    47      <property name="wordWrap">
    48       <bool>true</bool>
    4931     </property>
    5032    </widget>
    5133   </item>
    5234   <item>
    53     <widget class="QILabel" name="m_pPage3Text2">
    54      <property name="wordWrap">
    55       <bool>true</bool>
    56      </property>
    57     </widget>
     35    <widget class="QIRichTextLabel" name="m_pPage3Text2"/>
    5836   </item>
    5937   <item>
    6038    <widget class="QGroupBox" name="m_pMemoryCnt">
     39     <property name="sizePolicy">
     40      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     41       <horstretch>0</horstretch>
     42       <verstretch>0</verstretch>
     43      </sizepolicy>
     44     </property>
    6145     <property name="title">
    6246      <string>Base &amp;Memory Size</string>
    … …  
    8266       <widget class="QILineEdit" name="m_pRamEditor">
    8367        <property name="sizePolicy">
    84          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
     68         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
    8569          <horstretch>0</horstretch>
    8670          <verstretch>0</verstretch>
    … …  
    9175      <item row="0" column="4">
    9276       <widget class="QLabel" name="m_pRamUnits">
     77        <property name="sizePolicy">
     78         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
     79          <horstretch>0</horstretch>
     80          <verstretch>0</verstretch>
     81         </sizepolicy>
     82        </property>
    9383        <property name="text">
    9484         <string>MB</string>
    … …  
    9989       <widget class="QLabel" name="m_pRamMin">
    10090        <property name="sizePolicy">
    101          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
     91         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
    10292          <horstretch>0</horstretch>
    10393          <verstretch>0</verstretch>
    … …  
    111101         <enum>Qt::Horizontal</enum>
    112102        </property>
    113         <property name="sizeHint" stdset="0">
     103        <property name="sizeHint">
    114104         <size>
    115105          <width>0</width>
    … …  
    122112       <widget class="QLabel" name="m_pRamMax">
    123113        <property name="sizePolicy">
    124          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
     114         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
    125115          <horstretch>0</horstretch>
    126116          <verstretch>0</verstretch>
    … …  
    134124   <item>
    135125    <spacer name="m_pSpacer2">
    136      <property name="sizeHint" stdset="0">
     126     <property name="orientation">
     127      <enum>Qt::Vertical</enum>
     128     </property>
     129     <property name="sizeHint">
    137130      <size>
    138131       <width>0</width>
    … …  
    146139 <customwidgets>
    147140  <customwidget>
    148    <class>QILabel</class>
    149    <extends>QLabel</extends>
    150    <header>QILabel.h</header>
     141   <class>QIRichTextLabel</class>
     142   <extends>QWidget</extends>
     143   <header>QIRichTextLabel.h</header>
    151144  </customwidget>
    152145  <customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzdPage4.ui

    r38169 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 <class>UINewVMWzdPage4</class>
    1717 <widget class="QWidget" name="UINewVMWzdPage4">
    18   <property name="sizePolicy">
    19    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    20     <horstretch>0</horstretch>
    21     <verstretch>0</verstretch>
    22    </sizepolicy>
    23   </property>
    2418  <property name="geometry">
    2519   <rect>
    … …  
    3024   </rect>
    3125  </property>
    32   <property name="sizePolicy">
    33    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    34     <horstretch>0</horstretch>
    35     <verstretch>0</verstretch>
    36    </sizepolicy>
    37   </property>
    3826  <layout class="QVBoxLayout" name="m_pLayout1">
    39    <property name="bottomMargin" >
    40     <number>0</number>
    41    </property>
    4227   <item>
    43     <widget class="QILabel" name="m_pPage4Text1">
     28    <widget class="QIRichTextLabel" name="m_pPage4Text1">
    4429     <property name="text">
    4530      <string>&lt;p&gt;If you wish you can now add a start-up disk to the new machine. You can either create a new virtual disk or select one from the list or from another location using the folder icon.&lt;/p&gt;&lt;p&gt;If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the machine is created.&lt;/p&gt;</string>
    46      </property>
    47      <property name="wordWrap">
    48       <bool>true</bool>
    4931     </property>
    5032    </widget>
    5133   </item>
    5234   <item>
    53     <widget class="QILabel" name="m_pPage4Text2">
    54      <property name="wordWrap">
    55       <bool>true</bool>
    56      </property>
    57     </widget>
     35    <widget class="QIRichTextLabel" name="m_pPage4Text2"/>
    5836   </item>
    5937   <item>
    6038    <widget class="QGroupBox" name="m_pBootHDCnt">
     39     <property name="sizePolicy">
     40      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     41       <horstretch>0</horstretch>
     42       <verstretch>0</verstretch>
     43      </sizepolicy>
     44     </property>
    6145     <property name="title">
    6246      <string>Start-up &amp;Disk</string>
    … …  
    10084   </item>
    10185   <item>
    102     <spacer name="m_pSpacer1">
    103      <property name="sizeHint" stdset="0">
     86    <spacer name="m_pSpacer">
     87     <property name="orientation">
     88      <enum>Qt::Vertical</enum>
     89     </property>
     90     <property name="sizeHint">
    10491      <size>
    10592       <width>0</width>
    … …  
    118105  </customwidget>
    119106  <customwidget>
    120    <class>QILabel</class>
    121    <extends>QLabel</extends>
    122    <header>QILabel.h</header>
     107   <class>QIRichTextLabel</class>
     108   <extends>QWidget</extends>
     109   <header>QIRichTextLabel.h</header>
    123110  </customwidget>
    124111  <customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzdPage5.ui

    r40044 r40142  
    44 VBox frontends: Qt4 GUI ("VirtualBox"):
    55
    6      Copyright (C) 2009-2011 Oracle Corporation
     6     Copyright (C) 2009-2012 Oracle Corporation
    77
    88     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1616 <class>UINewVMWzdPage5</class>
    1717 <widget class="QWidget" name="UINewVMWzdPage5">
    18   <property name="sizePolicy">
    19    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    20     <horstretch>0</horstretch>
    21     <verstretch>0</verstretch>
    22    </sizepolicy>
    23   </property>
    2418  <property name="geometry">
    2519   <rect>
    … …  
    3024   </rect>
    3125  </property>
    32   <property name="sizePolicy">
    33    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
    34     <horstretch>0</horstretch>
    35     <verstretch>0</verstretch>
    36    </sizepolicy>
    37   </property>
    3826  <layout class="QVBoxLayout" name="m_pLayout1">
    39    <property name="bottomMargin" >
    40     <number>0</number>
    41    </property>
    4227   <item>
    43     <widget class="QILabel" name="m_pPage5Text1">
     28    <widget class="QIRichTextLabel" name="m_pPage5Text1">
    4429     <property name="text">
    4530      <string>&lt;p&gt;You are going to create a new virtual machine with the following parameters:&lt;/p&gt;</string>
    46      </property>
    47      <property name="wordWrap">
    48       <bool>true</bool>
    4931     </property>
    5032    </widget>
    … …  
    5436   </item>
    5537   <item>
    56     <widget class="QILabel" name="m_pPage5Text2">
    57      <property name="wordWrap">
    58       <bool>true</bool>
    59      </property>
    60     </widget>
     38    <widget class="QIRichTextLabel" name="m_pPage5Text2"/>
    6139   </item>
    6240   <item>
    63     <spacer name="m_pSpacer1">
    64      <property name="sizeHint" stdset="0">
     41    <spacer name="m_pSpacer">
     42     <property name="orientation">
     43      <enum>Qt::Vertical</enum>
     44     </property>
     45     <property name="sizeHint">
    6546      <size>
    6647       <width>0</width>
    … …  
    7455 <customwidgets>
    7556  <customwidget>
    76    <class>QILabel</class>
    77    <extends>QLabel</extends>
    78    <header>QILabel.h</header>
    79   </customwidget>
    80   <customwidget>
    8157   <class>QIRichTextLabel</class>
    8258   <extends>QWidget</extends>
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette