diff options
Diffstat (limited to 'examples/widgets')
16 files changed, 265 insertions, 52 deletions
diff --git a/examples/widgets/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp index 15b1550fac..3630f48ef3 100644 --- a/examples/widgets/dialogs/standarddialogs/dialog.cpp +++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp @@ -124,6 +124,10 @@ Dialog::Dialog(QWidget *parent) textLabel->setFrameStyle(frameStyle); QPushButton *textButton = new QPushButton(tr("QInputDialog::get&Text()")); + multiLineTextLabel = new QLabel; + multiLineTextLabel->setFrameStyle(frameStyle); + QPushButton *multiLineTextButton = new QPushButton(tr("QInputDialog::get&MultiLineText()")); + colorLabel = new QLabel; colorLabel->setFrameStyle(frameStyle); QPushButton *colorButton = new QPushButton(tr("QColorDialog::get&Color()")); @@ -180,6 +184,7 @@ Dialog::Dialog(QWidget *parent) connect(doubleButton, SIGNAL(clicked()), this, SLOT(setDouble())); connect(itemButton, SIGNAL(clicked()), this, SLOT(setItem())); connect(textButton, SIGNAL(clicked()), this, SLOT(setText())); + connect(multiLineTextButton, SIGNAL(clicked()), this, SLOT(setMultiLineText())); connect(colorButton, SIGNAL(clicked()), this, SLOT(setColor())); connect(fontButton, SIGNAL(clicked()), this, SLOT(setFont())); connect(directoryButton, SIGNAL(clicked()), @@ -209,7 +214,9 @@ Dialog::Dialog(QWidget *parent) layout->addWidget(itemLabel, 2, 1); layout->addWidget(textButton, 3, 0); layout->addWidget(textLabel, 3, 1); - layout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding), 4, 0); + layout->addWidget(multiLineTextButton, 4, 0); + layout->addWidget(multiLineTextLabel, 4, 1); + layout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding), 5, 0); toolbox->addItem(page, tr("Input Dialogs")); const QString doNotUseNativeDialog = tr("Do not use native dialog"); @@ -330,6 +337,17 @@ void Dialog::setText() //! [3] } +void Dialog::setMultiLineText() +{ +//! [4] + bool ok; + QString text = QInputDialog::getMultiLineText(this, tr("QInputDialog::getMultiLineText()"), + tr("Address:"), "John Doe\nFreedom Street", &ok); + if (ok && !text.isEmpty()) + multiLineTextLabel->setText(text); +//! [4] +} + void Dialog::setColor() { const QColorDialog::ColorDialogOptions options = QFlag(colorDialogOptionsWidget->value()); diff --git a/examples/widgets/dialogs/standarddialogs/dialog.h b/examples/widgets/dialogs/standarddialogs/dialog.h index 27b1de98cb..d6272c440e 100644 --- a/examples/widgets/dialogs/standarddialogs/dialog.h +++ b/examples/widgets/dialogs/standarddialogs/dialog.h @@ -63,6 +63,7 @@ private slots: void setDouble(); void setItem(); void setText(); + void setMultiLineText(); void setColor(); void setFont(); void setExistingDirectory(); @@ -80,6 +81,7 @@ private: QLabel *doubleLabel; QLabel *itemLabel; QLabel *textLabel; + QLabel *multiLineTextLabel; QLabel *colorLabel; QLabel *fontLabel; QLabel *directoryLabel; diff --git a/examples/widgets/doc/src/addressbook-tutorial.qdoc b/examples/widgets/doc/src/addressbook-tutorial.qdoc index 089ab2319d..78517f80d7 100644 --- a/examples/widgets/doc/src/addressbook-tutorial.qdoc +++ b/examples/widgets/doc/src/addressbook-tutorial.qdoc @@ -77,8 +77,6 @@ */ /*! - \page tutorials-addressbook-part1.html - \example tutorials/addressbook/part1 \title Part 1 - Designing the User Interface @@ -231,8 +229,6 @@ */ /*! - \page tutorials-addressbook-part2.html - \example tutorials/addressbook/part2 \title Part 2 - Adding Addresses @@ -382,8 +378,6 @@ */ /*! - \page tutorials-addressbook-part3.html - \example tutorials/addressbook/part3 \title Part 3 - Navigating between Entries @@ -499,8 +493,6 @@ */ /*! - \page tutorials-addressbook-part4.html - \example tutorials/addressbook/part4 \title Part 4 - Editing and Removing Addresses @@ -633,8 +625,6 @@ */ /*! - \page tutorials-addressbook-part5.html - \example tutorials/addressbook/part5 \title Part 5 - Adding a Find Function @@ -777,8 +767,6 @@ */ /*! - \page tutorials-addressbook-part6.html - \example tutorials/addressbook/part6 \title Part 6 - Loading and Saving @@ -899,8 +887,6 @@ */ /*! - \page tutorials-addressbook-part7.html - \example tutorials/addressbook/part7 \title Part 7 - Additional Features diff --git a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro index b722e606d3..630beddcb8 100644 --- a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro +++ b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro @@ -1,10 +1,14 @@ QT += widgets HEADERS = mysortfilterproxymodel.h \ - window.h + window.h \ + filterwidget.h SOURCES = main.cpp \ mysortfilterproxymodel.cpp \ - window.cpp + window.cpp \ + filterwidget.cpp + +RESOURCES += customsortfiltermodel.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/customsortfiltermodel diff --git a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.qrc b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.qrc new file mode 100644 index 0000000000..47c0857d2d --- /dev/null +++ b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> + <qresource prefix="/"> + <file>images/find.png</file> + </qresource> +</RCC> diff --git a/examples/widgets/itemviews/customsortfiltermodel/filterwidget.cpp b/examples/widgets/itemviews/customsortfiltermodel/filterwidget.cpp new file mode 100644 index 0000000000..053c56d4c4 --- /dev/null +++ b/examples/widgets/itemviews/customsortfiltermodel/filterwidget.cpp @@ -0,0 +1,124 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "filterwidget.h" + +#include <QIcon> +#include <QPixmap> +#include <QImage> +#include <QMenu> +#include <QAction> +#include <QActionGroup> +#include <QToolButton> +#include <QWidgetAction> +#include <QDebug> + +FilterWidget::FilterWidget(QWidget *parent) + : QLineEdit(parent) + , m_patternGroup(new QActionGroup(this)) +{ + setClearButtonEnabled(true); + connect(this, SIGNAL(textChanged(QString)), this, SIGNAL(filterChanged())); + + QMenu *menu = new QMenu(this); + m_caseSensitivityAction = menu->addAction(tr("Case Sensitive")); + m_caseSensitivityAction->setCheckable(true); + connect(m_caseSensitivityAction, SIGNAL(toggled(bool)), this, SIGNAL(filterChanged())); + + menu->addSeparator(); + m_patternGroup->setExclusive(true); + QAction *patternAction = menu->addAction("Fixed String"); + patternAction->setData(QVariant(int(QRegExp::FixedString))); + patternAction->setCheckable(true); + patternAction->setChecked(true); + m_patternGroup->addAction(patternAction); + patternAction = menu->addAction("Regular Expression"); + patternAction->setCheckable(true); + patternAction->setData(QVariant(int(QRegExp::RegExp2))); + m_patternGroup->addAction(patternAction); + patternAction = menu->addAction("Wildcard"); + patternAction->setCheckable(true); + patternAction->setData(QVariant(int(QRegExp::Wildcard))); + m_patternGroup->addAction(patternAction); + connect(m_patternGroup, SIGNAL(triggered(QAction*)), this, SIGNAL(filterChanged())); + + const QIcon icon = QIcon(QPixmap(":/images/find.png")); + QToolButton *optionsButton = new QToolButton; + optionsButton->setCursor(Qt::ArrowCursor); + optionsButton->setFocusPolicy(Qt::NoFocus); + optionsButton->setStyleSheet("* { border: none; }"); + optionsButton->setIcon(icon); + optionsButton->setMenu(menu); + optionsButton->setPopupMode(QToolButton::InstantPopup); + + QWidgetAction *optionsAction = new QWidgetAction(this); + optionsAction->setDefaultWidget(optionsButton); + addAction(optionsAction, QLineEdit::LeadingPosition); +} + +Qt::CaseSensitivity FilterWidget::caseSensitivity() const +{ + return m_caseSensitivityAction->isChecked() ? Qt::CaseSensitive : Qt::CaseInsensitive; +} + +void FilterWidget::setCaseSensitivity(Qt::CaseSensitivity cs) +{ + m_caseSensitivityAction->setChecked(cs == Qt::CaseSensitive); +} + +static inline QRegExp::PatternSyntax patternSyntaxFromAction(const QAction *a) +{ + return static_cast<QRegExp::PatternSyntax>(a->data().toInt()); +} + +QRegExp::PatternSyntax FilterWidget::patternSyntax() const +{ + return patternSyntaxFromAction(m_patternGroup->checkedAction()); +} + +void FilterWidget::setPatternSyntax(QRegExp::PatternSyntax s) +{ + foreach (QAction *a, m_patternGroup->actions()) { + if (patternSyntaxFromAction(a) == s) { + a->setChecked(true); + break; + } + } +} diff --git a/examples/widgets/itemviews/customsortfiltermodel/filterwidget.h b/examples/widgets/itemviews/customsortfiltermodel/filterwidget.h new file mode 100644 index 0000000000..c0d0e5128d --- /dev/null +++ b/examples/widgets/itemviews/customsortfiltermodel/filterwidget.h @@ -0,0 +1,76 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef FILTERWIDGET_H +#define FILTERWIDGET_H + +#include <QLineEdit> +#include <QRegExp> + +QT_BEGIN_NAMESPACE +class QAction; +class QActionGroup; +QT_END_NAMESPACE + +Q_DECLARE_METATYPE(QRegExp::PatternSyntax) + +class FilterWidget : public QLineEdit +{ + Q_OBJECT + Q_PROPERTY(Qt::CaseSensitivity caseSensitivity READ caseSensitivity WRITE setCaseSensitivity) + Q_PROPERTY(QRegExp::PatternSyntax patternSyntax READ patternSyntax WRITE setPatternSyntax) +public: + explicit FilterWidget(QWidget *parent = 0); + + Qt::CaseSensitivity caseSensitivity() const; + void setCaseSensitivity(Qt::CaseSensitivity); + + QRegExp::PatternSyntax patternSyntax() const; + void setPatternSyntax(QRegExp::PatternSyntax); + +signals: + void filterChanged(); + +private: + QAction *m_caseSensitivityAction; + QActionGroup *m_patternGroup; +}; + +#endif // FILTERWIDGET_H diff --git a/examples/widgets/itemviews/customsortfiltermodel/images/find.png b/examples/widgets/itemviews/customsortfiltermodel/images/find.png Binary files differnew file mode 100644 index 0000000000..cbe2f31521 --- /dev/null +++ b/examples/widgets/itemviews/customsortfiltermodel/images/find.png diff --git a/examples/widgets/itemviews/customsortfiltermodel/window.cpp b/examples/widgets/itemviews/customsortfiltermodel/window.cpp index a1456bbcac..0dbc902fb8 100644 --- a/examples/widgets/itemviews/customsortfiltermodel/window.cpp +++ b/examples/widgets/itemviews/customsortfiltermodel/window.cpp @@ -42,6 +42,7 @@ #include "mysortfilterproxymodel.h" #include "window.h" +#include "filterwidget.h" //! [0] Window::Window() @@ -63,19 +64,12 @@ Window::Window() //! [2] //! [3] - filterCaseSensitivityCheckBox = new QCheckBox(tr("Case sensitive filter")); - filterCaseSensitivityCheckBox->setChecked(true); - - filterPatternLineEdit = new QLineEdit; - filterPatternLineEdit->setText("Grace|Sports"); + filterWidget = new FilterWidget; + filterWidget->setText("Grace|Sports"); + connect(filterWidget, SIGNAL(filterChanged()), this, SLOT(textFilterChanged())); filterPatternLabel = new QLabel(tr("&Filter pattern:")); - filterPatternLabel->setBuddy(filterPatternLineEdit); - - filterSyntaxComboBox = new QComboBox; - filterSyntaxComboBox->addItem(tr("Regular expression"), QRegExp::RegExp); - filterSyntaxComboBox->addItem(tr("Wildcard"), QRegExp::Wildcard); - filterSyntaxComboBox->addItem(tr("Fixed string"), QRegExp::FixedString); + filterPatternLabel->setBuddy(filterWidget); fromDateEdit = new QDateEdit; fromDateEdit->setDate(QDate(1970, 01, 01)); @@ -87,11 +81,7 @@ Window::Window() toLabel = new QLabel(tr("&To:")); toLabel->setBuddy(toDateEdit); - connect(filterPatternLineEdit, SIGNAL(textChanged(QString)), - this, SLOT(textFilterChanged())); - connect(filterSyntaxComboBox, SIGNAL(currentIndexChanged(int)), - this, SLOT(textFilterChanged())); - connect(filterCaseSensitivityCheckBox, SIGNAL(toggled(bool)), + connect(filterWidget, SIGNAL(textChanged(QString)), this, SLOT(textFilterChanged())); connect(fromDateEdit, SIGNAL(dateChanged(QDate)), this, SLOT(dateFilterChanged())); @@ -111,9 +101,7 @@ Window::Window() QGridLayout *proxyLayout = new QGridLayout; proxyLayout->addWidget(proxyView, 0, 0, 1, 3); proxyLayout->addWidget(filterPatternLabel, 1, 0); - proxyLayout->addWidget(filterPatternLineEdit, 1, 1); - proxyLayout->addWidget(filterSyntaxComboBox, 1, 2); - proxyLayout->addWidget(filterCaseSensitivityCheckBox, 2, 0, 1, 3); + proxyLayout->addWidget(filterWidget, 1, 1); proxyLayout->addWidget(fromLabel, 3, 0); proxyLayout->addWidget(fromDateEdit, 3, 1, 1, 2); proxyLayout->addWidget(toLabel, 4, 0); @@ -145,14 +133,9 @@ void Window::setSourceModel(QAbstractItemModel *model) //! [8] void Window::textFilterChanged() { - QRegExp::PatternSyntax syntax = - QRegExp::PatternSyntax(filterSyntaxComboBox->itemData( - filterSyntaxComboBox->currentIndex()).toInt()); - Qt::CaseSensitivity caseSensitivity = - filterCaseSensitivityCheckBox->isChecked() ? Qt::CaseSensitive - : Qt::CaseInsensitive; - - QRegExp regExp(filterPatternLineEdit->text(), caseSensitivity, syntax); + QRegExp regExp(filterWidget->text(), + filterWidget->caseSensitivity(), + filterWidget->patternSyntax()); proxyModel->setFilterRegExp(regExp); } //! [8] diff --git a/examples/widgets/itemviews/customsortfiltermodel/window.h b/examples/widgets/itemviews/customsortfiltermodel/window.h index c9db4ce84b..46e4974a2c 100644 --- a/examples/widgets/itemviews/customsortfiltermodel/window.h +++ b/examples/widgets/itemviews/customsortfiltermodel/window.h @@ -54,7 +54,7 @@ class QLineEdit; class QTreeView; QT_END_NAMESPACE class MySortFilterProxyModel; - +class FilterWidget; //! [0] class Window : public QWidget { @@ -76,12 +76,10 @@ private: QGroupBox *proxyGroupBox; QTreeView *sourceView; QTreeView *proxyView; - QCheckBox *filterCaseSensitivityCheckBox; QLabel *filterPatternLabel; QLabel *fromLabel; QLabel *toLabel; - QLineEdit *filterPatternLineEdit; - QComboBox *filterSyntaxComboBox; + FilterWidget *filterWidget; QDateEdit *fromDateEdit; QDateEdit *toDateEdit; }; diff --git a/examples/widgets/itemviews/spreadsheet/main.cpp b/examples/widgets/itemviews/spreadsheet/main.cpp index 1cc9205d7e..f518986bc5 100644 --- a/examples/widgets/itemviews/spreadsheet/main.cpp +++ b/examples/widgets/itemviews/spreadsheet/main.cpp @@ -42,14 +42,15 @@ #include "spreadsheet.h" #include <QApplication> +#include <QLayout> int main(int argc, char** argv) { Q_INIT_RESOURCE(spreadsheet); QApplication app(argc, argv); SpreadSheet sheet(10, 6); sheet.setWindowIcon(QPixmap(":/images/interview.png")); - sheet.resize(640, 420); sheet.show(); + sheet.layout()->setSizeConstraint(QLayout::SetFixedSize); return app.exec(); } diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp index 59d29f0e61..6fab0c2aae 100644 --- a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp +++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp @@ -64,6 +64,7 @@ SpreadSheet::SpreadSheet(int rows, int cols, QWidget *parent) toolBar->addWidget(formulaInput); table = new QTableWidget(rows, cols, this); + table->setSizeAdjustPolicy(QTableWidget::AdjustToContents); for (int c = 0; c < cols; ++c) { QString character(QChar('A' + c)); table->setHorizontalHeaderItem(c, new QTableWidgetItem(character)); diff --git a/examples/widgets/painting/gradients/gradients.cpp b/examples/widgets/painting/gradients/gradients.cpp index ffca9f5560..14858b9749 100644 --- a/examples/widgets/painting/gradients/gradients.cpp +++ b/examples/widgets/painting/gradients/gradients.cpp @@ -42,6 +42,8 @@ #include "gradients.h" #include "hoverpoints.h" +#include <algorithm> + ShadeWidget::ShadeWidget(ShadeType type, QWidget *parent) : QWidget(parent), m_shade_type(type), m_alpha_gradient(QLinearGradient(0, 0, 0, 0)) { @@ -204,7 +206,7 @@ void GradientEditor::pointsUpdated() points += m_blue_shade->points(); points += m_alpha_shade->points(); - qSort(points.begin(), points.end(), x_less_than); + std::sort(points.begin(), points.end(), x_less_than); for (int i = 0; i < points.size(); ++i) { qreal x = int(points.at(i).x()); diff --git a/examples/widgets/painting/shared/hoverpoints.cpp b/examples/widgets/painting/shared/hoverpoints.cpp index 36e0ad89b2..7a79560473 100644 --- a/examples/widgets/painting/shared/hoverpoints.cpp +++ b/examples/widgets/painting/shared/hoverpoints.cpp @@ -46,6 +46,8 @@ #include "arthurwidgets.h" #include "hoverpoints.h" +#include <algorithm> + #define printf HoverPoints::HoverPoints(QWidget *widget, PointShape shape) @@ -388,9 +390,9 @@ void HoverPoints::firePointChange() } if (m_sortType == XSort) - qSort(m_points.begin(), m_points.end(), x_less_than); + std::sort(m_points.begin(), m_points.end(), x_less_than); else if (m_sortType == YSort) - qSort(m_points.begin(), m_points.end(), y_less_than); + std::sort(m_points.begin(), m_points.end(), y_less_than); // Compensate for changed order... if (m_currentIndex != -1) { diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index 14acebc33f..693beb56f7 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -25,5 +25,6 @@ contains(QT_CONFIG, opengl(es1|es2)?) { SUBDIRS += windowcontainer } +!contains(QT_CONFIG, opengl(es1|es2)?): SUBDIRS -= windowcontainer contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= draganddrop diff --git a/examples/widgets/widgets/spinboxes/window.cpp b/examples/widgets/widgets/spinboxes/window.cpp index 8c35f93c56..acce642ec6 100644 --- a/examples/widgets/widgets/spinboxes/window.cpp +++ b/examples/widgets/widgets/spinboxes/window.cpp @@ -94,6 +94,14 @@ void Window::createSpinBoxes() priceSpinBox->setValue(99); //! [4] //! [5] + QLabel *hexLabel = new QLabel(tr("Enter a value between " + "%1 and %2:").arg('-' + QString::number(31, 16)).arg(QString::number(31, 16))); + QSpinBox *hexSpinBox = new QSpinBox; + hexSpinBox->setRange(-31, 31); + hexSpinBox->setSingleStep(1); + hexSpinBox->setValue(0); + hexSpinBox->setDisplayIntegerBase(16); + QVBoxLayout *spinBoxLayout = new QVBoxLayout; spinBoxLayout->addWidget(integerLabel); spinBoxLayout->addWidget(integerSpinBox); @@ -101,6 +109,8 @@ void Window::createSpinBoxes() spinBoxLayout->addWidget(zoomSpinBox); spinBoxLayout->addWidget(priceLabel); spinBoxLayout->addWidget(priceSpinBox); + spinBoxLayout->addWidget(hexLabel); + spinBoxLayout->addWidget(hexSpinBox); spinBoxesGroup->setLayout(spinBoxLayout); } //! [5] |
