diff options
Diffstat (limited to 'src/widgets/widgets')
39 files changed, 951 insertions, 68 deletions
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index 3f9b28a883..cdadde5cc1 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -52,6 +52,8 @@ #include "qaccessible.h" #endif +#include <algorithm> + QT_BEGIN_NAMESPACE #define AUTO_REPEAT_DELAY 300 @@ -231,7 +233,7 @@ void QButtonGroup::addButton(QAbstractButton *button, int id) if (ids.isEmpty()) d->mapping[button] = -2; else { - qSort(ids); + std::sort(ids.begin(), ids.end()); d->mapping[button] = ids.first()-1; } } else { @@ -575,6 +577,20 @@ void QAbstractButtonPrivate::emitReleased() #endif } +void QAbstractButtonPrivate::emitToggled(bool checked) +{ + Q_Q(QAbstractButton); + QPointer<QAbstractButton> guard(q); + emit q->toggled(checked); +#ifndef QT_NO_BUTTONGROUP + if (guard && group) { + emit group->buttonToggled(group->id(q), checked); + if (guard && group) + emit group->buttonToggled(q, checked); + } +#endif +} + /*! Constructs an abstract button with a \a parent. */ @@ -758,7 +774,7 @@ void QAbstractButton::setChecked(bool checked) if (guard && checked) d->notifyChecked(); if (guard) - emit toggled(checked); + d->emitToggled(checked); #ifndef QT_NO_ACCESSIBILITY diff --git a/src/widgets/widgets/qabstractbutton_p.h b/src/widgets/widgets/qabstractbutton_p.h index 4585728848..a148e60717 100644 --- a/src/widgets/widgets/qabstractbutton_p.h +++ b/src/widgets/widgets/qabstractbutton_p.h @@ -103,6 +103,7 @@ public: void emitPressed(); void emitReleased(); void emitClicked(); + void emitToggled(bool checked); }; QT_END_NAMESPACE diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index 900e95f4da..e7827055fb 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -167,6 +167,7 @@ QT_BEGIN_NAMESPACE QAbstractScrollAreaPrivate::QAbstractScrollAreaPrivate() :hbar(0), vbar(0), vbarpolicy(Qt::ScrollBarAsNeeded), hbarpolicy(Qt::ScrollBarAsNeeded), + shownOnce(false), sizeAdjustPolicy(QAbstractScrollArea::AdjustIgnored), viewport(0), cornerWidget(0), left(0), top(0), right(0), bottom(0), xoffset(0), yoffset(0), viewportFilter(0) #ifdef Q_WS_WIN @@ -527,6 +528,19 @@ void QAbstractScrollAreaPrivate::layoutChildren() } /*! + \enum QAbstractScrollArea::SizeAdjustPolicy + \since 5.2 + + This enum specifies how the size hint of the QAbstractScrollArea should + adjust when the size of the viewport changes. + + \value AdjustIgnored The scroll area will behave like before - and not do any adjust. + \value AdjustToContents The scroll area will always adjust to the viewport + \value AdjustToContentsOnFirstShow The scroll area will adjust to its viewport the first time it is shown. +*/ + + +/*! \internal Creates a new QAbstractScrollAreaPrivate, \a dd with the given \a parent. @@ -983,6 +997,13 @@ bool QAbstractScrollArea::event(QEvent *e) case QEvent::Resize: d->layoutChildren(); break; + case QEvent::Show: + if (!d->shownOnce && d->sizeAdjustPolicy == QAbstractScrollArea::AdjustToContentsOnFirstShow) { + d->sizeHint = QSize(); + updateGeometry(); + } + d->shownOnce = true; + return QFrame::event(e); case QEvent::Paint: { QStyleOption option; option.initFrom(this); @@ -1533,17 +1554,70 @@ QSize QAbstractScrollArea::minimumSizeHint() const } /*! + Returns the sizeHint property of the scroll area. The size is determined by using + viewportSizeHint() plus some extra space for scroll bars, if needed. \reimp */ QSize QAbstractScrollArea::sizeHint() const { - return QSize(256, 192); -#if 0 Q_D(const QAbstractScrollArea); - int h = qMax(10, fontMetrics().height()); - int f = 2 * d->frameWidth; - return QSize((6 * h) + f, (4 * h) + f); -#endif + if (d->sizeAdjustPolicy == QAbstractScrollArea::AdjustIgnored) + return QSize(256, 192); + + if (!d->sizeHint.isValid() || d->sizeAdjustPolicy == QAbstractScrollArea::AdjustToContents) { + const int f = 2 * d->frameWidth; + const QSize frame( f, f ); + const QSize scrollbars(d->vbarpolicy == Qt::ScrollBarAlwaysOn ? d->vbar->sizeHint().width() : 0, + d->hbarpolicy == Qt::ScrollBarAlwaysOn ? d->hbar->sizeHint().height() : 0); + d->sizeHint = frame + scrollbars + viewportSizeHint(); + } + return d->sizeHint; +} + +/*! + \since 5.2 + Returns the recommended size for the viewport. + The default implementation returns viewport()->sizeHint(). + Note that the size is just the viewport's size, without any scroll bars visible. + */ +QSize QAbstractScrollArea::viewportSizeHint() const +{ + Q_D(const QAbstractScrollArea); + if (d->viewport) { + const QSize sh = d->viewport->sizeHint(); + if (sh.isValid()) { + return sh; + } + } + const int h = qMax(10, fontMetrics().height()); + return QSize(6 * h, 4 * h); +} + +/*! + \since 5.2 + \property QAbstractScrollArea::sizeAdjustPolicy + This property holds the policy describing how the size of the scroll area changes when the + size of the viewport changes. + + The default policy is QAbstractScrollArea::AdjustIgnored. + Changing this property might actually resize the scrollarea. +*/ + +QAbstractScrollArea::SizeAdjustPolicy QAbstractScrollArea::sizeAdjustPolicy() const +{ + Q_D(const QAbstractScrollArea); + return d->sizeAdjustPolicy; +} + +void QAbstractScrollArea::setSizeAdjustPolicy(SizeAdjustPolicy policy) +{ + Q_D(QAbstractScrollArea); + if (d->sizeAdjustPolicy == policy) + return; + + d->sizeAdjustPolicy = policy; + d->sizeHint = QSize(); + updateGeometry(); } /*! @@ -1559,16 +1633,6 @@ void QAbstractScrollArea::setupViewport(QWidget *viewport) Q_UNUSED(viewport); } -/*! - \internal - - This method is reserved for future use. -*/ -QSize QAbstractScrollArea::viewportSizeHint() const -{ - return QSize(); -} - QT_END_NAMESPACE #include "moc_qabstractscrollarea.cpp" diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h index ccf16b5e5c..fb9562db1b 100644 --- a/src/widgets/widgets/qabstractscrollarea.h +++ b/src/widgets/widgets/qabstractscrollarea.h @@ -56,13 +56,22 @@ class QAbstractScrollAreaPrivate; class Q_WIDGETS_EXPORT QAbstractScrollArea : public QFrame { Q_OBJECT + + Q_ENUMS(SizeAdjustPolicy) Q_PROPERTY(Qt::ScrollBarPolicy verticalScrollBarPolicy READ verticalScrollBarPolicy WRITE setVerticalScrollBarPolicy) Q_PROPERTY(Qt::ScrollBarPolicy horizontalScrollBarPolicy READ horizontalScrollBarPolicy WRITE setHorizontalScrollBarPolicy) + Q_PROPERTY(SizeAdjustPolicy sizeAdjustPolicy READ sizeAdjustPolicy WRITE setSizeAdjustPolicy) public: explicit QAbstractScrollArea(QWidget* parent=0); ~QAbstractScrollArea(); + enum SizeAdjustPolicy { + AdjustIgnored, + AdjustToContentsOnFirstShow, + AdjustToContents + }; + Qt::ScrollBarPolicy verticalScrollBarPolicy() const; void setVerticalScrollBarPolicy(Qt::ScrollBarPolicy); QScrollBar *verticalScrollBar() const; @@ -89,6 +98,9 @@ public: virtual void setupViewport(QWidget *viewport); + SizeAdjustPolicy sizeAdjustPolicy() const; + void setSizeAdjustPolicy(SizeAdjustPolicy policy); + protected: QAbstractScrollArea(QAbstractScrollAreaPrivate &dd, QWidget *parent = 0); void setViewportMargins(int left, int top, int right, int bottom); diff --git a/src/widgets/widgets/qabstractscrollarea_p.h b/src/widgets/widgets/qabstractscrollarea_p.h index 34d767fe29..3093c2f812 100644 --- a/src/widgets/widgets/qabstractscrollarea_p.h +++ b/src/widgets/widgets/qabstractscrollarea_p.h @@ -75,6 +75,10 @@ public: QScrollBar *hbar, *vbar; Qt::ScrollBarPolicy vbarpolicy, hbarpolicy; + bool shownOnce; + mutable QSize sizeHint; + QAbstractScrollArea::SizeAdjustPolicy sizeAdjustPolicy; + QWidget *viewport; QWidget *cornerWidget; QRect cornerPaintingRect; diff --git a/src/widgets/widgets/qbuttongroup.cpp b/src/widgets/widgets/qbuttongroup.cpp index f22910007f..c484b154fd 100644 --- a/src/widgets/widgets/qbuttongroup.cpp +++ b/src/widgets/widgets/qbuttongroup.cpp @@ -174,6 +174,27 @@ */ /*! + \fn void QButtonGroup::buttonToggled(QAbstractButton *button, bool checked) + \since 5.2 + + This signal is emitted when the given \a button is toggled. + \a checked is true if the button is checked, or false if the button is unchecked. + + \sa QAbstractButton::toggled() +*/ + +/*! + \fn void QButtonGroup::buttonToggled(int id, bool checked) + \since 5.2 + + This signal is emitted when a button with the given \a id is toggled. + \a checked is true if the button is checked, or false if the button is unchecked. + + \sa QAbstractButton::toggled() +*/ + + +/*! \fn void QButtonGroup::addButton(QAbstractButton *button, int id = -1); Adds the given \a button to the button group. If \a id is -1, diff --git a/src/widgets/widgets/qbuttongroup.h b/src/widgets/widgets/qbuttongroup.h index 84fe26e0df..06656bf18c 100644 --- a/src/widgets/widgets/qbuttongroup.h +++ b/src/widgets/widgets/qbuttongroup.h @@ -85,7 +85,8 @@ Q_SIGNALS: void buttonPressed(int); void buttonReleased(QAbstractButton *); void buttonReleased(int); - + void buttonToggled(QAbstractButton *, bool); + void buttonToggled(int, bool); private: Q_DISABLE_COPY(QButtonGroup) diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index afe8f1c3f4..90310308c3 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -407,7 +407,7 @@ void QComboBoxPrivateContainer::leaveEvent(QEvent *) } QComboBoxPrivateContainer::QComboBoxPrivateContainer(QAbstractItemView *itemView, QComboBox *parent) - : QFrame(parent, Qt::Popup), combo(parent), view(0), top(0), bottom(0) + : QFrame(parent, Qt::Popup), combo(parent), view(0), top(0), bottom(0), maybeIgnoreMouseButtonRelease(false) { // we need the combobox and itemview Q_ASSERT(parent); @@ -667,10 +667,15 @@ bool QComboBoxPrivateContainer::eventFilter(QObject *o, QEvent *e) } } break; + case QEvent::MouseButtonPress: + maybeIgnoreMouseButtonRelease = false; + break; case QEvent::MouseButtonRelease: { + bool ignoreEvent = maybeIgnoreMouseButtonRelease && popupTimer.elapsed() < QApplication::doubleClickInterval(); + QMouseEvent *m = static_cast<QMouseEvent *>(e); if (isVisible() && view->rect().contains(m->pos()) && view->currentIndex().isValid() - && !blockMouseReleaseTimer.isActive() + && !blockMouseReleaseTimer.isActive() && !ignoreEvent && (view->currentIndex().flags() & Qt::ItemIsEnabled) && (view->currentIndex().flags() & Qt::ItemIsSelectable)) { combo->hidePopup(); @@ -2086,6 +2091,20 @@ QString QComboBox::currentText() const } /*! + \property QComboBox::currentData + \brief the data for the current item + \since 5.2 + + By default, for an empty combo box or a combo box in which no current + item is set, this property contains an invalid QVariant. +*/ +QVariant QComboBox::currentData(int role) const +{ + Q_D(const QComboBox); + return d->currentIndex.data(role); +} + +/*! Returns the text for the given \a index in the combobox. */ QString QComboBox::itemText(int index) const @@ -2548,6 +2567,7 @@ void QComboBox::showPopup() container->setUpdatesEnabled(false); #endif + bool startTimer = !container->isVisible(); container->raise(); container->show(); container->updateScrollers(); @@ -2567,6 +2587,10 @@ void QComboBox::showPopup() if (QApplication::keypadNavigationEnabled()) view()->setEditFocus(true); #endif + if (startTimer) { + container->popupTimer.start(); + container->maybeIgnoreMouseButtonRelease = true; + } } /*! @@ -2862,6 +2886,11 @@ void QComboBox::mousePressEvent(QMouseEvent *e) } #endif showPopup(); + // The code below ensures that regular mousepress and pick item still works + // If it was not called the viewContainer would ignore event since it didn't have + // a mousePressEvent first. + if (d->viewContainer()) + d->viewContainer()->maybeIgnoreMouseButtonRelease = false; } else { #ifdef QT_KEYPAD_NAVIGATION if (QApplication::keypadNavigationEnabled() && sc == QStyle::SC_ComboBoxEditField && d->lineEdit) { diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 2fafe79f7a..0002cd08cb 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -66,6 +66,7 @@ class Q_WIDGETS_EXPORT QComboBox : public QWidget Q_PROPERTY(int count READ count) Q_PROPERTY(QString currentText READ currentText WRITE setCurrentText NOTIFY currentTextChanged USER true) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) + Q_PROPERTY(QVariant currentData READ currentData) Q_PROPERTY(int maxVisibleItems READ maxVisibleItems WRITE setMaxVisibleItems) Q_PROPERTY(int maxCount READ maxCount WRITE setMaxCount) Q_PROPERTY(InsertPolicy insertPolicy READ insertPolicy WRITE setInsertPolicy) @@ -167,8 +168,8 @@ public: void setModelColumn(int visibleColumn); int currentIndex() const; - QString currentText() const; + QVariant currentData(int role = Qt::UserRole) const; QString itemText(int index) const; QIcon itemIcon(int index) const; diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h index 07ba9b0925..1ad2aa455a 100644 --- a/src/widgets/widgets/qcombobox_p.h +++ b/src/widgets/widgets/qcombobox_p.h @@ -254,6 +254,10 @@ private: QAbstractItemView *view; QComboBoxPrivateScroller *top; QComboBoxPrivateScroller *bottom; + bool maybeIgnoreMouseButtonRelease; + QElapsedTimer popupTimer; + + friend class QComboBox; }; class QComboMenuDelegate : public QAbstractItemDelegate diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp index bc5d84e259..226969cdd1 100644 --- a/src/widgets/widgets/qdialogbuttonbox.cpp +++ b/src/widgets/widgets/qdialogbuttonbox.cpp @@ -669,6 +669,21 @@ QDialogButtonBox::QDialogButtonBox(Qt::Orientation orientation, QWidget *parent) } /*! + \since 5.2 + + Constructs a horizontal button box with the given \a parent, containing + the standard buttons specified by \a buttons. + + \sa orientation, addButton() +*/ +QDialogButtonBox::QDialogButtonBox(StandardButtons buttons, QWidget *parent) + : QWidget(*new QDialogButtonBoxPrivate(Qt::Horizontal), parent, 0) +{ + d_func()->initLayout(); + d_func()->createStandardButtons(buttons); +} + +/*! Constructs a button box with the given \a orientation and \a parent, containing the standard buttons specified by \a buttons. diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h index 6715c590e2..d8e1a997d4 100644 --- a/src/widgets/widgets/qdialogbuttonbox.h +++ b/src/widgets/widgets/qdialogbuttonbox.h @@ -115,7 +115,8 @@ public: QDialogButtonBox(QWidget *parent = 0); QDialogButtonBox(Qt::Orientation orientation, QWidget *parent = 0); - QDialogButtonBox(StandardButtons buttons, Qt::Orientation orientation = Qt::Horizontal, + explicit QDialogButtonBox(StandardButtons buttons, QWidget *parent = 0); + QDialogButtonBox(StandardButtons buttons, Qt::Orientation orientation, QWidget *parent = 0); ~QDialogButtonBox(); diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp index 5f929caf03..0b0efa2bdf 100644 --- a/src/widgets/widgets/qfontcombobox.cpp +++ b/src/widgets/widgets/qfontcombobox.cpp @@ -54,6 +54,88 @@ QT_BEGIN_NAMESPACE +static QFontDatabase::WritingSystem writingSystemFromScript(QLocale::Script script) +{ + switch (script) { + case QLocale::ArabicScript: + return QFontDatabase::Arabic; + case QLocale::CyrillicScript: + return QFontDatabase::Cyrillic; + case QLocale::GurmukhiScript: + return QFontDatabase::Gurmukhi; + case QLocale::SimplifiedHanScript: + return QFontDatabase::SimplifiedChinese; + case QLocale::TraditionalHanScript: + return QFontDatabase::TraditionalChinese; + case QLocale::LatinScript: + return QFontDatabase::Latin; + case QLocale::ArmenianScript: + return QFontDatabase::Armenian; + case QLocale::BengaliScript: + return QFontDatabase::Bengali; + case QLocale::DevanagariScript: + return QFontDatabase::Devanagari; + case QLocale::GeorgianScript: + return QFontDatabase::Georgian; + case QLocale::GreekScript: + return QFontDatabase::Greek; + case QLocale::GujaratiScript: + return QFontDatabase::Gujarati; + case QLocale::HebrewScript: + return QFontDatabase::Hebrew; + case QLocale::JapaneseScript: + return QFontDatabase::Japanese; + case QLocale::KhmerScript: + return QFontDatabase::Khmer; + case QLocale::KannadaScript: + return QFontDatabase::Kannada; + case QLocale::KoreanScript: + return QFontDatabase::Korean; + case QLocale::LaoScript: + return QFontDatabase::Lao; + case QLocale::MalayalamScript: + return QFontDatabase::Malayalam; + case QLocale::MyanmarScript: + return QFontDatabase::Myanmar; + case QLocale::TamilScript: + return QFontDatabase::Tamil; + case QLocale::TeluguScript: + return QFontDatabase::Telugu; + case QLocale::ThaanaScript: + return QFontDatabase::Thaana; + case QLocale::ThaiScript: + return QFontDatabase::Thai; + case QLocale::TibetanScript: + return QFontDatabase::Tibetan; + case QLocale::SinhalaScript: + return QFontDatabase::Sinhala; + case QLocale::SyriacScript: + return QFontDatabase::Syriac; + case QLocale::OriyaScript: + return QFontDatabase::Oriya; + case QLocale::OghamScript: + return QFontDatabase::Ogham; + case QLocale::RunicScript: + return QFontDatabase::Runic; + case QLocale::NkoScript: + return QFontDatabase::Nko; + default: + return QFontDatabase::Any; + } +} + +static QFontDatabase::WritingSystem writingSystemFromLocale() +{ + QStringList uiLanguages = QLocale::system().uiLanguages(); + QLocale::Script script; + if (!uiLanguages.isEmpty()) + script = QLocale(uiLanguages.at(0)).script(); + else + script = QLocale::system().script(); + + return writingSystemFromScript(script); +} + static QFontDatabase::WritingSystem writingSystemForFont(const QFont &font, bool *hasLatin) { QList<QFontDatabase::WritingSystem> writingSystems = QFontDatabase().writingSystems(font.family()); @@ -66,7 +148,22 @@ static QFontDatabase::WritingSystem writingSystemForFont(const QFont &font, bool if (writingSystems.isEmpty()) return QFontDatabase::Any; - QFontDatabase::WritingSystem system = writingSystems.last(); + QFontDatabase::WritingSystem system = writingSystemFromLocale(); + + if (writingSystems.contains(system)) + return system; + + if (system == QFontDatabase::TraditionalChinese + && writingSystems.contains(QFontDatabase::SimplifiedChinese)) { + return QFontDatabase::SimplifiedChinese; + } + + if (system == QFontDatabase::SimplifiedChinese + && writingSystems.contains(QFontDatabase::TraditionalChinese)) { + return QFontDatabase::TraditionalChinese; + } + + system = writingSystems.last(); if (!*hasLatin) { // we need to show something diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 816e7be8fd..adf70fde66 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -350,7 +350,7 @@ void QLineEdit::setPlaceholderText(const QString& placeholderText) Q_D(QLineEdit); if (d->placeholderText != placeholderText) { d->placeholderText = placeholderText; - if (!hasFocus()) + if (d->control->text().isEmpty()) update(); } } @@ -419,6 +419,96 @@ bool QLineEdit::hasFrame() const return d->frame; } +/*! + \enum QLineEdit::ActionPosition + + This enum type describes how a line edit should display the action widgets to be + added. + + \value LeadingPosition The widget is displayed to the left of the text + when using layout direction \c Qt::LeftToRight or to + the right when using \c Qt::RightToLeft, respectively. + + \value TrailingPosition The widget is displayed to the right of the text + when using layout direction \c Qt::LeftToRight or to + the left when using \c Qt::RightToLeft, respectively. + + \sa addAction(), removeAction(), QWidget::layoutDirection + + \since 5.2 +*/ + +/*! + \fn void QLineEdit::addAction(QAction *action) + \overload + \internal +*/ + +/*! + \overload + + Adds the \a action to the list of actions at the \a position. + + \since 5.2 +*/ + +void QLineEdit::addAction(QAction *action, ActionPosition position) +{ + Q_D(QLineEdit); + QWidget::addAction(action); + d->addAction(action, 0, position); +} + +/*! + \overload + + Creates a new action with the given \a icon at the \a position. + + \since 5.2 +*/ + +QAction *QLineEdit::addAction(const QIcon &icon, ActionPosition position) +{ + QAction *result = new QAction(icon, QString(), this); + addAction(result, position); + return result; +} + +/*! + \property QLineEdit::clearButtonEnabled + \brief Whether the line edit displays a clear button when it is not empty. + + If enabled, the line edit displays a trailing \e clear button when it contains + some text, otherwise the line edit does not show a clear button (the + default). + + \sa addAction(), removeAction() + \since 5.2 +*/ + +static const char clearButtonActionNameC[] = "_q_qlineeditclearaction"; + +void QLineEdit::setClearButtonEnabled(bool enable) +{ + Q_D(QLineEdit); + if (enable == isClearButtonEnabled()) + return; + if (enable) { + QAction *clearAction = new QAction(d->clearButtonIcon(), QString(), this); + clearAction->setObjectName(QLatin1String(clearButtonActionNameC)); + d->addAction(clearAction, 0, QLineEdit::TrailingPosition, QLineEditPrivate::SideWidgetClearButton | QLineEditPrivate::SideWidgetFadeInWithText); + } else { + QAction *clearAction = findChild<QAction *>(QLatin1String(clearButtonActionNameC)); + Q_ASSERT(clearAction); + removeAction(clearAction); + delete clearAction; + } +} + +bool QLineEdit::isClearButtonEnabled() const +{ + return findChild<QAction *>(QLatin1String(clearButtonActionNameC)); +} void QLineEdit::setFrame(bool enable) { @@ -605,7 +695,7 @@ QSize QLineEdit::sizeHint() const + d->topTextMargin + d->bottomTextMargin + d->topmargin + d->bottommargin; int w = fm.width(QLatin1Char('x')) * 17 + 2*d->horizontalMargin - + d->leftTextMargin + d->rightTextMargin + + d->effectiveLeftTextMargin() + d->effectiveRightTextMargin() + d->leftmargin + d->rightmargin; // "some" QStyleOptionFrameV2 opt; initStyleOption(&opt); @@ -966,7 +1056,6 @@ void QLineEdit::setDragEnabled(bool b) d->dragEnabled = b; } - /*! \property QLineEdit::cursorMoveStyle \brief the movement style of cursor in this line edit @@ -1349,8 +1438,11 @@ bool QLineEdit::event(QEvent * e) || style()->styleHint(QStyle::SH_BlinkCursorWhenTextSelected, &opt, this)) d->setCursorVisible(true); } + } else if (e->type() == QEvent::ActionRemoved) { + d->removeAction(static_cast<QActionEvent *>(e)); + } else if (e->type() == QEvent::Resize) { + d->positionSideWidgets(); } - #ifdef QT_KEYPAD_NAVIGATION if (QApplication::keypadNavigationEnabled()) { if (e->type() == QEvent::EnterEditFocus) { @@ -1776,9 +1868,9 @@ void QLineEdit::paintEvent(QPaintEvent *) initStyleOption(&panel); style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, &p, this); r = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this); - r.setX(r.x() + d->leftTextMargin); + r.setX(r.x() + d->effectiveLeftTextMargin()); r.setY(r.y() + d->topTextMargin); - r.setRight(r.right() - d->rightTextMargin); + r.setRight(r.right() - d->effectiveRightTextMargin()); r.setBottom(r.bottom() - d->bottomTextMargin); p.setClipRect(r); @@ -1982,6 +2074,13 @@ void QLineEdit::contextMenuEvent(QContextMenuEvent *event) } } +static inline void setActionIcon(QAction *action, const QString &name) +{ + const QIcon icon = QIcon::fromTheme(name); + if (!icon.isNull()) + action->setIcon(icon); +} + /*! This function creates the standard context menu which is shown when the user clicks on the line edit with the right mouse button. It is called from the default contextMenuEvent() handler. @@ -1998,10 +2097,12 @@ QMenu *QLineEdit::createStandardContextMenu() if (!isReadOnly()) { action = popup->addAction(QLineEdit::tr("&Undo") + ACCEL_KEY(QKeySequence::Undo)); action->setEnabled(d->control->isUndoAvailable()); + setActionIcon(action, QStringLiteral("edit-undo")); connect(action, SIGNAL(triggered()), SLOT(undo())); action = popup->addAction(QLineEdit::tr("&Redo") + ACCEL_KEY(QKeySequence::Redo)); action->setEnabled(d->control->isRedoAvailable()); + setActionIcon(action, QStringLiteral("edit-redo")); connect(action, SIGNAL(triggered()), SLOT(redo())); popup->addSeparator(); @@ -2012,17 +2113,20 @@ QMenu *QLineEdit::createStandardContextMenu() action = popup->addAction(QLineEdit::tr("Cu&t") + ACCEL_KEY(QKeySequence::Cut)); action->setEnabled(!d->control->isReadOnly() && d->control->hasSelectedText() && d->control->echoMode() == QLineEdit::Normal); + setActionIcon(action, QStringLiteral("edit-cut")); connect(action, SIGNAL(triggered()), SLOT(cut())); } action = popup->addAction(QLineEdit::tr("&Copy") + ACCEL_KEY(QKeySequence::Copy)); action->setEnabled(d->control->hasSelectedText() && d->control->echoMode() == QLineEdit::Normal); + setActionIcon(action, QStringLiteral("edit-copy")); connect(action, SIGNAL(triggered()), SLOT(copy())); if (!isReadOnly()) { action = popup->addAction(QLineEdit::tr("&Paste") + ACCEL_KEY(QKeySequence::Paste)); action->setEnabled(!d->control->isReadOnly() && !QApplication::clipboard()->text().isEmpty()); + setActionIcon(action, QStringLiteral("edit-paste")); connect(action, SIGNAL(triggered()), SLOT(paste())); } #endif @@ -2030,6 +2134,7 @@ QMenu *QLineEdit::createStandardContextMenu() if (!isReadOnly()) { action = popup->addAction(QLineEdit::tr("Delete")); action->setEnabled(!d->control->isReadOnly() && !d->control->text().isEmpty() && d->control->hasSelectedText()); + setActionIcon(action, QStringLiteral("edit-delete")); connect(action, SIGNAL(triggered()), d->control, SLOT(_q_deleteSelected())); } @@ -2069,8 +2174,15 @@ void QLineEdit::changeEvent(QEvent *ev) initStyleOption(&opt); d->control->setPasswordCharacter(style()->styleHint(QStyle::SH_LineEdit_PasswordCharacter, &opt, this)); } + d->m_iconSize = QSize(); update(); break; + case QEvent::LayoutDirectionChange: + foreach (const QLineEditPrivate::SideWidgetEntry &e, d->trailingSideWidgets) // Refresh icon to show arrow in right direction. + if (e.flags & QLineEditPrivate::SideWidgetClearButton) + static_cast<QLineEditIconButton *>(e.widget)->setIcon(d->clearButtonIcon()); + d->positionSideWidgets(); + break; default: break; } diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h index e2b944314b..3d52863db2 100644 --- a/src/widgets/widgets/qlineedit.h +++ b/src/widgets/widgets/qlineedit.h @@ -59,12 +59,14 @@ class QCompleter; class QStyleOptionFrame; class QAbstractSpinBox; class QDateTimeEdit; +class QIcon; +class QToolButton; class Q_WIDGETS_EXPORT QLineEdit : public QWidget { Q_OBJECT - Q_ENUMS(EchoMode) + Q_ENUMS(ActionPosition EchoMode) Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask) Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged USER true) Q_PROPERTY(int maxLength READ maxLength WRITE setMaxLength) @@ -83,8 +85,13 @@ class Q_WIDGETS_EXPORT QLineEdit : public QWidget Q_PROPERTY(bool acceptableInput READ hasAcceptableInput) Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText) Q_PROPERTY(Qt::CursorMoveStyle cursorMoveStyle READ cursorMoveStyle WRITE setCursorMoveStyle) - + Q_PROPERTY(bool clearButtonEnabled READ isClearButtonEnabled WRITE setClearButtonEnabled) public: + enum ActionPosition { + LeadingPosition, + TrailingPosition + }; + explicit QLineEdit(QWidget* parent=0); explicit QLineEdit(const QString &, QWidget* parent=0); ~QLineEdit(); @@ -102,6 +109,9 @@ public: void setFrame(bool); bool hasFrame() const; + void setClearButtonEnabled(bool enable); + bool isClearButtonEnabled() const; + enum EchoMode { Normal, NoEcho, Password, PasswordEchoOnEdit }; EchoMode echoMode() const; void setEchoMode(EchoMode); @@ -164,6 +174,16 @@ public: void getTextMargins(int *left, int *top, int *right, int *bottom) const; QMargins textMargins() const; +#ifdef Q_NO_USING_KEYWORD + inline void addAction(QAction *action) + { QWidget::addAction(action); } +#else + using QWidget::addAction; +#endif + + void addAction(QAction *action, ActionPosition position); + QAction *addAction(const QIcon &icon, ActionPosition position); + public Q_SLOTS: void setText(const QString &); void clear(); @@ -240,6 +260,7 @@ private: #endif Q_PRIVATE_SLOT(d_func(), void _q_selectionChanged()) Q_PRIVATE_SLOT(d_func(), void _q_updateNeeded(const QRect &)) + Q_PRIVATE_SLOT(d_func(), void _q_textChanged(const QString &)) }; #endif // QT_NO_LINEEDIT diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 1999216e65..99d6d0b8d9 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -44,8 +44,10 @@ #ifndef QT_NO_LINEEDIT +#include "qvariant.h" #include "qabstractitemview.h" #include "qdrag.h" +#include "qwidgetaction.h" #include "qclipboard.h" #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" @@ -53,6 +55,7 @@ #ifndef QT_NO_IM #include "qinputmethod.h" #include "qlist.h" +#include <qpropertyanimation.h> #endif QT_BEGIN_NAMESPACE @@ -219,9 +222,9 @@ QRect QLineEditPrivate::adjustedContentsRect() const QStyleOptionFrameV2 opt; q->initStyleOption(&opt); QRect r = q->style()->subElementRect(QStyle::SE_LineEditContents, &opt, q); - r.setX(r.x() + leftTextMargin); + r.setX(r.x() + effectiveLeftTextMargin()); r.setY(r.y() + topTextMargin); - r.setRight(r.right() - rightTextMargin); + r.setRight(r.right() - effectiveRightTextMargin()); r.setBottom(r.bottom() - bottomTextMargin); return r; } @@ -297,6 +300,170 @@ void QLineEditPrivate::drag() #endif // QT_NO_DRAGANDDROP +QLineEditIconButton::QLineEditIconButton(QWidget *parent) + : QToolButton(parent) + , m_opacity(0) +{ +#ifndef QT_NO_CURSOR + setCursor(Qt::ArrowCursor); +#endif + setFocusPolicy(Qt::NoFocus); +} + +void QLineEditIconButton::paintEvent(QPaintEvent *) +{ + QPainter painter(this); + // Note isDown should really use the active state but in most styles + // this has no proper feedback + QIcon::Mode state = QIcon::Disabled; + if (isEnabled()) + state = isDown() ? QIcon::Selected : QIcon::Normal; + const QPixmap iconPixmap = icon().pixmap(QSize(IconButtonSize, IconButtonSize), + state, QIcon::Off); + QRect pixmapRect = QRect(0, 0, iconPixmap.width(), iconPixmap.height()); + pixmapRect.moveCenter(rect().center()); + painter.setOpacity(m_opacity); + painter.drawPixmap(pixmapRect, iconPixmap); +} + +void QLineEditIconButton::setOpacity(qreal value) +{ + if (!qFuzzyCompare(m_opacity, value)) { + m_opacity = value; + update(); + } +} + +void QLineEditIconButton::startOpacityAnimation(qreal endValue) +{ + QPropertyAnimation *animation = new QPropertyAnimation(this, QByteArrayLiteral("opacity")); + animation->setDuration(160); + animation->setEndValue(endValue); + animation->start(QAbstractAnimation::DeleteWhenStopped); +} + +void QLineEditPrivate::_q_textChanged(const QString &text) +{ + if (hasSideWidgets()) { + const int newTextSize = text.size(); + if (!newTextSize || !lastTextSize) { + lastTextSize = newTextSize; + const bool fadeIn = newTextSize > 0; + foreach (const SideWidgetEntry &e, leadingSideWidgets) { + if (e.flags & SideWidgetFadeInWithText) + static_cast<QLineEditIconButton *>(e.widget)->animateShow(fadeIn); + } + foreach (const SideWidgetEntry &e, trailingSideWidgets) { + if (e.flags & SideWidgetFadeInWithText) + static_cast<QLineEditIconButton *>(e.widget)->animateShow(fadeIn); + } + } + } +} + +QSize QLineEditPrivate::iconSize() const +{ + if (!m_iconSize.isValid()) // This might require style-specific handling (pixel metric). + m_iconSize = QSize(QLineEditIconButton::IconButtonSize + 6, QLineEditIconButton::IconButtonSize + 2); + return m_iconSize; +} + +QIcon QLineEditPrivate::clearButtonIcon() const +{ + Q_Q(const QLineEdit); + QStyleOptionFrameV2 styleOption; + q->initStyleOption(&styleOption); + return QIcon(q->style()->standardPixmap(QStyle::SP_LineEditClearButton, &styleOption, q)); +} + +void QLineEditPrivate::positionSideWidgets() +{ + Q_Q(QLineEdit); + if (hasSideWidgets()) { + const QRect contentRect = q->rect(); + const QSize iconSize = QLineEditPrivate::iconSize(); + const int delta = QLineEditIconButton::IconMargin + iconSize.width(); + QRect widgetGeometry(QPoint(QLineEditIconButton::IconMargin, (contentRect.height() - iconSize.height()) / 2), iconSize); + foreach (const SideWidgetEntry &e, leftSideWidgetList()) { + e.widget->setGeometry(widgetGeometry); + widgetGeometry.moveLeft(widgetGeometry.left() + delta); + } + widgetGeometry.moveLeft(contentRect.width() - iconSize.width() - QLineEditIconButton::IconMargin); + foreach (const SideWidgetEntry &e, rightSideWidgetList()) { + e.widget->setGeometry(widgetGeometry); + widgetGeometry.moveLeft(widgetGeometry.left() - delta); + } + } +} + +QLineEditPrivate::PositionIndexPair QLineEditPrivate::findSideWidget(const QAction *a) const +{ + for (int i = 0; i < leadingSideWidgets.size(); ++i) { + if (a == leadingSideWidgets.at(i).action) + return PositionIndexPair(QLineEdit::LeadingPosition, i); + } + for (int i = 0; i < trailingSideWidgets.size(); ++i) { + if (a == trailingSideWidgets.at(i).action) + return PositionIndexPair(QLineEdit::TrailingPosition, i); + } + return PositionIndexPair(QLineEdit::LeadingPosition, -1); +} + +QWidget *QLineEditPrivate::addAction(QAction *newAction, QAction *before, QLineEdit::ActionPosition position, int flags) +{ + Q_Q(QLineEdit); + if (!newAction) + return 0; + QWidget *w = 0; + // Store flags about QWidgetAction here since removeAction() may be called from ~QAction, + // in which a qobject_cast<> no longer works. + if (QWidgetAction *widgetAction = qobject_cast<QWidgetAction *>(newAction)) { + if ((w = widgetAction->requestWidget(q))) + flags |= SideWidgetCreatedByWidgetAction; + } + if (!w) { + QLineEditIconButton *toolButton = new QLineEditIconButton(q); + toolButton->setIcon(newAction->icon()); + toolButton->setOpacity(lastTextSize > 0 || !(flags & SideWidgetFadeInWithText) ? 1 : 0); + if (flags & SideWidgetClearButton) + QObject::connect(toolButton, SIGNAL(clicked()), q, SLOT(clear())); + toolButton->setDefaultAction(newAction); + w = toolButton; + } + if (!hasSideWidgets()) { // initial setup. + QObject::connect(q, SIGNAL(textChanged(QString)), q, SLOT(_q_textChanged(QString))); + lastTextSize = q->text().size(); + } + // If there is a 'before' action, it takes preference + PositionIndexPair positionIndex = before ? findSideWidget(before) : PositionIndexPair(position, -1); + SideWidgetEntryList &list = positionIndex.first == QLineEdit::TrailingPosition ? trailingSideWidgets : leadingSideWidgets; + if (positionIndex.second < 0) + positionIndex.second = list.size(); + list.insert(positionIndex.second, SideWidgetEntry(w, newAction, flags)); + positionSideWidgets(); + w->show(); + return w; +} + +void QLineEditPrivate::removeAction(const QActionEvent *e) +{ + Q_Q(QLineEdit); + QAction *action = e->action(); + const PositionIndexPair positionIndex = findSideWidget(action); + if (positionIndex.second == -1) + return; + SideWidgetEntryList &list = positionIndex.first == QLineEdit::TrailingPosition ? trailingSideWidgets : leadingSideWidgets; + SideWidgetEntry entry = list.takeAt(positionIndex.second); + if (entry.flags & SideWidgetCreatedByWidgetAction) + static_cast<QWidgetAction *>(entry.action)->releaseWidget(entry.widget); + else + delete entry.widget; + positionSideWidgets(); + if (!hasSideWidgets()) // Last widget, remove connection + QObject::disconnect(q, SIGNAL(textChanged(QString)), q, SLOT(_q_textChanged(QString))); + q->update(); +} + QT_END_NAMESPACE #endif diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index 4eb35b7dc6..8fe45972ff 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -58,7 +58,9 @@ #ifndef QT_NO_LINEEDIT #include "private/qwidget_p.h" #include "QtWidgets/qlineedit.h" +#include "QtWidgets/qtoolbutton.h" #include "QtGui/qtextlayout.h" +#include "QtGui/qicon.h" #include "QtWidgets/qstyleoption.h" #include "QtCore/qbasictimer.h" #include "QtWidgets/qcompleter.h" @@ -69,16 +71,55 @@ QT_BEGIN_NAMESPACE +// QLineEditIconButton: This is a simple helper class that represents clickable icons that fade in with text + +class QLineEditIconButton : public QToolButton +{ + Q_OBJECT + Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity) +public: + enum { IconMargin = 4, IconButtonSize = 16 }; + + explicit QLineEditIconButton(QWidget *parent = 0); + + qreal opacity() const { return m_opacity; } + void setOpacity(qreal value); + void animateShow(bool visible) { startOpacityAnimation(visible ? 1.0 : 0.0); } + +protected: + void paintEvent(QPaintEvent *event); + +private: + void startOpacityAnimation(qreal endValue); + + qreal m_opacity; +}; + class Q_AUTOTEST_EXPORT QLineEditPrivate : public QWidgetPrivate { Q_DECLARE_PUBLIC(QLineEdit) public: + enum SideWidgetFlag { + SideWidgetFadeInWithText = 0x1, + SideWidgetCreatedByWidgetAction = 0x2, + SideWidgetClearButton = 0x4 + }; + + struct SideWidgetEntry { + SideWidgetEntry(QWidget *w = 0, QAction *a = 0, int _flags = 0) : widget(w), action(a), flags(_flags) {} + + QWidget *widget; + QAction *action; + int flags; + }; + typedef QList<SideWidgetEntry> SideWidgetEntryList; QLineEditPrivate() : control(0), frame(1), contextMenuEnabled(1), cursorVisible(0), dragEnabled(0), clickCausedFocus(0), hscroll(0), vscroll(0), alignment(Qt::AlignLeading | Qt::AlignVCenter), - leftTextMargin(0), topTextMargin(0), rightTextMargin(0), bottomTextMargin(0) + leftTextMargin(0), topTextMargin(0), rightTextMargin(0), bottomTextMargin(0), + lastTextSize(0) { } @@ -145,15 +186,50 @@ public: QBasicTimer dndTimer; void drag(); #endif + void _q_textChanged(const QString &); - int leftTextMargin; + int leftTextMargin; // use effectiveLeftTextMargin() in case of icon. int topTextMargin; - int rightTextMargin; + int rightTextMargin; // use effectiveRightTextMargin() in case of icon. int bottomTextMargin; QString placeholderText; + + QWidget *addAction(QAction *newAction, QAction *before, QLineEdit::ActionPosition, int flags = 0); + void removeAction(const QActionEvent *e); + QSize iconSize() const; + QIcon clearButtonIcon() const; + void positionSideWidgets(); + inline bool hasSideWidgets() const { return !leadingSideWidgets.isEmpty() || !trailingSideWidgets.isEmpty(); } + inline const SideWidgetEntryList &leftSideWidgetList() const + { return q_func()->layoutDirection() == Qt::LeftToRight ? leadingSideWidgets : trailingSideWidgets; } + inline const SideWidgetEntryList &rightSideWidgetList() const + { return q_func()->layoutDirection() == Qt::LeftToRight ? trailingSideWidgets : leadingSideWidgets; } + + int effectiveLeftTextMargin() const; + int effectiveRightTextMargin() const; + +private: + typedef QPair<QLineEdit::ActionPosition, int> PositionIndexPair; + + PositionIndexPair findSideWidget(const QAction *a) const; + + SideWidgetEntryList leadingSideWidgets; + SideWidgetEntryList trailingSideWidgets; + int lastTextSize; + mutable QSize m_iconSize; }; +inline int QLineEditPrivate::effectiveLeftTextMargin() const +{ + return leftTextMargin + leftSideWidgetList().size() * (QLineEditIconButton::IconMargin + iconSize().width()); +} + +inline int QLineEditPrivate::effectiveRightTextMargin() const +{ + return rightTextMargin + rightSideWidgetList().size() * (QLineEditIconButton::IconMargin + iconSize().width()); +} + #endif // QT_NO_LINEEDIT QT_END_NAMESPACE diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index 13c9bf8deb..fd94dadac6 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -178,6 +178,8 @@ #include <qmath.h> #include <private/qlayoutengine_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE using namespace QMdi; @@ -465,9 +467,9 @@ void MinOverlapPlacer::getCandidatePlacements(const QSize &size, const QList<QRe } QList<int> xlist = xset.values(); - qSort(xlist.begin(), xlist.end()); + std::sort(xlist.begin(), xlist.end()); QList<int> ylist = yset.values(); - qSort(ylist.begin(), ylist.end()); + std::sort(ylist.begin(), ylist.end()); foreach (int y, ylist) foreach (int x, xlist) diff --git a/src/widgets/widgets/qpushbutton_p.h b/src/widgets/widgets/qpushbutton_p.h index 93069d295f..142df04825 100644 --- a/src/widgets/widgets/qpushbutton_p.h +++ b/src/widgets/widgets/qpushbutton_p.h @@ -39,6 +39,9 @@ ** ****************************************************************************/ +#ifndef QPUSHBUTTON_P_H +#define QPUSHBUTTON_P_H + #include "private/qabstractbutton_p.h" // @@ -88,3 +91,5 @@ public: }; QT_END_NAMESPACE + +#endif // QPUSHBUTTON_P_H diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp index 93c335c56b..2a6d4620d7 100644 --- a/src/widgets/widgets/qscrollarea.cpp +++ b/src/widgets/widgets/qscrollarea.cpp @@ -407,6 +407,18 @@ QSize QScrollArea::sizeHint() const return sz.boundedTo(QSize(36 * h, 24 * h)); } +/*! + \reimp + */ +QSize QScrollArea::viewportSizeHint() const +{ + Q_D(const QScrollArea); + if (d->widget) { + return d->resizable ? d->widget->sizeHint() : d->widget->size(); + } + const int h = fontMetrics().height(); + return QSize(6 * h, 4 * h); +} /*! diff --git a/src/widgets/widgets/qscrollarea.h b/src/widgets/widgets/qscrollarea.h index 576c9bc9e0..70af5fbbd7 100644 --- a/src/widgets/widgets/qscrollarea.h +++ b/src/widgets/widgets/qscrollarea.h @@ -69,6 +69,8 @@ public: void setWidgetResizable(bool resizable); QSize sizeHint() const; + QSize viewportSizeHint() const; + bool focusNextPrevChild(bool next); Qt::Alignment alignment() const; diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index e1e2723a2d..05b8935bb5 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -510,6 +510,11 @@ void QScrollBar::wheelEvent(QWheelEvent *event) Q_D(QScrollBar); if (d->scrollByDelta(event->orientation(), event->modifiers(), delta)) event->accept(); + + if (event->phase() == Qt::ScrollBegin) + d->setTransient(false); + else if (event->phase() == Qt::ScrollEnd) + d->setTransient(true); } #endif diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp index 0ce5473ad8..bf4e130d4e 100644 --- a/src/widgets/widgets/qspinbox.cpp +++ b/src/widgets/widgets/qspinbox.cpp @@ -78,6 +78,8 @@ public: q->setInputMethodHints(Qt::ImhDigitsOnly); setLayoutItemMargins(QStyle::SE_SpinBoxLayoutItem); } + + int displayIntegerBase; }; class QDoubleSpinBoxPrivate : public QAbstractSpinBoxPrivate @@ -425,6 +427,38 @@ void QSpinBox::setRange(int minimum, int maximum) } /*! + \property QSpinBox::displayIntegerBase + + \brief the base used to display the value of the spin box + + The default displayIntegerBase value is 10. + + \sa textFromValue(), valueFromText() + \since 5.2 +*/ + +int QSpinBox::displayIntegerBase() const +{ + Q_D(const QSpinBox); + return d->displayIntegerBase; +} + +void QSpinBox::setDisplayIntegerBase(int base) +{ + Q_D(QSpinBox); + // Falls back to base 10 on invalid bases (like QString) + if (base < 2 || base > 36) { + qWarning("QSpinBox::setDisplayIntegerBase: Invalid base (%d)", base); + base = 10; + } + + if (base != d->displayIntegerBase) { + d->displayIntegerBase = base; + d->updateEdit(); + } +} + +/*! This virtual function is used by the spin box whenever it needs to display the given \a value. The default implementation returns a string containing \a value printed in the standard way using @@ -444,9 +478,18 @@ void QSpinBox::setRange(int minimum, int maximum) QString QSpinBox::textFromValue(int value) const { - QString str = locale().toString(value); - if (qAbs(value) >= 1000 || value == INT_MIN) { - str.remove(locale().groupSeparator()); + Q_D(const QSpinBox); + QString str; + + if (d->displayIntegerBase != 10) { + str = QString::number(qAbs(value), d->displayIntegerBase); + if (value < 0) + str.prepend('-'); + } else { + str = locale().toString(value); + if (qAbs(value) >= 1000 || value == INT_MIN) { + str.remove(locale().groupSeparator()); + } } return str; @@ -926,6 +969,7 @@ QSpinBoxPrivate::QSpinBoxPrivate() minimum = QVariant((int)0); maximum = QVariant((int)99); value = minimum; + displayIntegerBase = 10; singleStep = QVariant((int)1); type = QVariant::Int; } @@ -1003,11 +1047,15 @@ QVariant QSpinBoxPrivate::validateAndInterpret(QString &input, int &pos, state = QValidator::Invalid; // special-case -0 will be interpreted as 0 and thus not be invalid with a range from 0-100 } else { bool ok = false; - num = locale.toInt(copy, &ok); - if (!ok && copy.contains(locale.groupSeparator()) && (max >= 1000 || min <= -1000)) { - QString copy2 = copy; - copy2.remove(locale.groupSeparator()); - num = locale.toInt(copy2, &ok); + if (displayIntegerBase != 10) { + num = copy.toInt(&ok, displayIntegerBase); + } else { + num = locale.toInt(copy, &ok); + if (!ok && copy.contains(locale.groupSeparator()) && (max >= 1000 || min <= -1000)) { + QString copy2 = copy; + copy2.remove(locale.groupSeparator()); + num = locale.toInt(copy2, &ok); + } } QSBDEBUG() << __FILE__ << __LINE__<< "num is set to" << num; if (!ok) { diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h index 4963f87a1a..98e809e141 100644 --- a/src/widgets/widgets/qspinbox.h +++ b/src/widgets/widgets/qspinbox.h @@ -61,6 +61,7 @@ class Q_WIDGETS_EXPORT QSpinBox : public QAbstractSpinBox Q_PROPERTY(int maximum READ maximum WRITE setMaximum) Q_PROPERTY(int singleStep READ singleStep WRITE setSingleStep) Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged USER true) + Q_PROPERTY(int displayIntegerBase READ displayIntegerBase WRITE setDisplayIntegerBase) public: explicit QSpinBox(QWidget *parent = 0); @@ -87,6 +88,8 @@ public: void setRange(int min, int max); + int displayIntegerBase() const; + void setDisplayIntegerBase(int base); protected: bool event(QEvent *event); diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp index 746c02e4e2..b2a0d3f8b8 100644 --- a/src/widgets/widgets/qsplashscreen.cpp +++ b/src/widgets/widgets/qsplashscreen.cpp @@ -200,7 +200,7 @@ void QSplashScreen::repaint() is kept up to date with what your application is doing (e.g., loading files). - \sa Qt::Alignment, clearMessage() + \sa Qt::Alignment, clearMessage(), message() */ void QSplashScreen::showMessage(const QString &message, int alignment, const QColor &color) @@ -214,6 +214,20 @@ void QSplashScreen::showMessage(const QString &message, int alignment, } /*! + \since 5.2 + + Returns the message that is currently displayed on the splash screen. + + \sa showMessage(), clearMessage() +*/ + +QString QSplashScreen::message() const +{ + Q_D(const QSplashScreen); + return d->currStatus; +} + +/*! Removes the message being displayed on the splash screen \sa showMessage() diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h index a1af8e45ef..e675c2e7af 100644 --- a/src/widgets/widgets/qsplashscreen.h +++ b/src/widgets/widgets/qsplashscreen.h @@ -63,6 +63,7 @@ public: const QPixmap pixmap() const; void finish(QWidget *w); void repaint(); + QString message() const; public Q_SLOTS: void showMessage(const QString &message, int alignment = Qt::AlignLeft, diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index 031763b80c..1f3646ea6e 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -1404,19 +1404,24 @@ int QSplitter::closestLegalPosition(int pos, int index) \property QSplitter::opaqueResize \brief whether resizing is opaque - Opaque resizing is on by default. + The default resize behavior is style dependent (determined by the + SH_Splitter_OpaqueResize style hint). However, you can override it + by calling setOpaqueResize() + + \sa QStyle::StyleHint */ bool QSplitter::opaqueResize() const { Q_D(const QSplitter); - return d->opaque; + return d->opaqueResizeSet ? d->opaque : style()->styleHint(QStyle::SH_Splitter_OpaqueResize, 0, this); } void QSplitter::setOpaqueResize(bool on) { Q_D(QSplitter); + d->opaqueResizeSet = true; d->opaque = on; } @@ -1589,7 +1594,7 @@ static const qint32 SplitterMagic = 0xff; QByteArray QSplitter::saveState() const { Q_D(const QSplitter); - int version = 0; + int version = 1; QByteArray data; QDataStream stream(&data, QIODevice::WriteOnly); @@ -1605,6 +1610,7 @@ QByteArray QSplitter::saveState() const stream << qint32(handleWidth()); stream << opaqueResize(); stream << qint32(orientation()); + stream << d->opaqueResizeSet; return data; } @@ -1627,7 +1633,7 @@ QByteArray QSplitter::saveState() const bool QSplitter::restoreState(const QByteArray &state) { Q_D(QSplitter); - int version = 0; + int version = 1; QByteArray sd = state; QDataStream stream(&sd, QIODevice::ReadOnly); QList<int> list; @@ -1638,7 +1644,7 @@ bool QSplitter::restoreState(const QByteArray &state) stream >> marker; stream >> v; - if (marker != SplitterMagic || v != version) + if (marker != SplitterMagic || v > version) return false; stream >> list; @@ -1657,6 +1663,9 @@ bool QSplitter::restoreState(const QByteArray &state) setOrientation(Qt::Orientation(i)); d->doResize(); + if (v >= 1) + stream >> d->opaqueResizeSet; + return true; } diff --git a/src/widgets/widgets/qsplitter_p.h b/src/widgets/widgets/qsplitter_p.h index f1e050b8f6..0d0e134f58 100644 --- a/src/widgets/widgets/qsplitter_p.h +++ b/src/widgets/widgets/qsplitter_p.h @@ -83,7 +83,7 @@ class QSplitterPrivate : public QFramePrivate Q_DECLARE_PUBLIC(QSplitter) public: QSplitterPrivate() : rubberBand(0), opaque(true), firstShow(true), - childrenCollapsible(true), compatMode(false), handleWidth(-1), blockChildAdd(false) {} + childrenCollapsible(true), compatMode(false), handleWidth(-1), blockChildAdd(false), opaqueResizeSet(false) {} QPointer<QRubberBand> rubberBand; mutable QList<QSplitterLayoutStruct *> list; @@ -94,6 +94,7 @@ public: bool compatMode : 8; int handleWidth; bool blockChildAdd; + bool opaqueResizeSet; inline int pick(const QPoint &pos) const { return orient == Qt::Horizontal ? pos.x() : pos.y(); } diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index b975035dcf..aa7677869c 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -329,6 +329,26 @@ void QTabBar::initStyleOption(QStyleOptionTab *option, int tabIndex) const \sa moveTab() */ +/*! + \fn void QTabBar::tabBarClicked(int index) + + This signal is emitted when user clicks on a tab at an \a index. + + \a index is the index of a clicked tab, or -1 if no tab is under the cursor. + + \since 5.2 +*/ + +/*! + \fn void QTabBar::tabBarDoubleClicked(int index) + + This signal is emitted when the user double clicks on a tab at \a index. + + \a index refers to the tab clicked, or -1 if no tab is under the cursor. + + \since 5.2 +*/ + int QTabBarPrivate::extraWidth() const { Q_Q(const QTabBar); @@ -1703,11 +1723,37 @@ void QTabBarPrivate::moveTab(int index, int offset) q_func()->update(); } + +/*! + \reimp +*/ +void QTabBar::mouseDoubleClickEvent(QMouseEvent *event) +{ + Q_D(QTabBar); + + const QPoint pos = event->pos(); + const bool isEventInCornerButtons = (!d->leftB->isHidden() && d->leftB->geometry().contains(pos)) + || (!d->rightB->isHidden() && d->rightB->geometry().contains(pos)); + if (!isEventInCornerButtons) { + const int index = tabAt(pos); + emit tabBarDoubleClicked(index); + } +} + /*!\reimp */ void QTabBar::mousePressEvent(QMouseEvent *event) { Q_D(QTabBar); + + const QPoint pos = event->pos(); + const bool isEventInCornerButtons = (!d->leftB->isHidden() && d->leftB->geometry().contains(pos)) + || (!d->rightB->isHidden() && d->rightB->geometry().contains(pos)); + if (!isEventInCornerButtons) { + const int index = d->indexAtPos(pos); + emit tabBarClicked(index); + } + if (event->button() != Qt::LeftButton) { event->ignore(); return; diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index 72c19ab520..1f7b8f6b03 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -173,6 +173,8 @@ Q_SIGNALS: void currentChanged(int index); void tabCloseRequested(int index); void tabMoved(int from, int to); + void tabBarClicked(int index); + void tabBarDoubleClicked(int index); protected: virtual QSize tabSizeHint(int index) const; @@ -186,6 +188,7 @@ protected: void showEvent(QShowEvent *); void hideEvent(QHideEvent *); void paintEvent(QPaintEvent *); + void mouseDoubleClickEvent(QMouseEvent *); void mousePressEvent (QMouseEvent *); void mouseMoveEvent (QMouseEvent *); void mouseReleaseEvent (QMouseEvent *); diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index 7468144146..8c6e70b8d7 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -138,6 +138,10 @@ public: } *animation; void startAnimation(QTabBarPrivate *priv, int duration) { + if (!priv->isAnimated()) { + priv->moveTabFinished(priv->tabList.indexOf(*this)); + return; + } if (!animation) animation = new TabBarAnimation(this, priv); animation->setStartValue(dragOffset); @@ -162,6 +166,7 @@ public: int indexAtPos(const QPoint &p) const; + inline bool isAnimated() const { Q_Q(const QTabBar); return q->style()->styleHint(QStyle::SH_Widget_Animate, 0, q); } inline bool validIndex(int index) const { return index >= 0 && index < tabList.count(); } void setCurrentNextEnabledIndex(int offset); diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp index 4df55e2537..9d14c01490 100644 --- a/src/widgets/widgets/qtabwidget.cpp +++ b/src/widgets/widgets/qtabwidget.cpp @@ -172,6 +172,26 @@ QT_BEGIN_NAMESPACE \sa setTabsClosable() */ +/*! + \fn void QTabWidget::tabBarClicked(int index) + + This signal is emitted when user clicks on a tab at an \a index. + + \a index refers to the tab clicked, or -1 if no tab is under the cursor. + + \since 5.2 +*/ + +/*! + \fn void QTabWidget::tabBarDoubleClicked(int index) + + This signal is emitted when the user double clicks on a tab at an \a index. + + \a index is the index of a clicked tab, or -1 if no tab is under the cursor. + + \since 5.2 +*/ + class QTabWidgetPrivate : public QWidgetPrivate { Q_DECLARE_PUBLIC(QTabWidget) @@ -693,6 +713,10 @@ void QTabWidget::setTabBar(QTabBar* tb) this, SLOT(_q_showTab(int))); connect(d->tabs, SIGNAL(tabMoved(int,int)), this, SLOT(_q_tabMoved(int,int))); + connect(d->tabs, SIGNAL(tabBarClicked(int)), + this, SIGNAL(tabBarClicked(int))); + connect(d->tabs, SIGNAL(tabBarDoubleClicked(int)), + this, SIGNAL(tabBarDoubleClicked(int))); if (d->tabs->tabsClosable()) connect(d->tabs, SIGNAL(tabCloseRequested(int)), this, SIGNAL(tabCloseRequested(int))); diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index 1a1eb2ef2b..83c2e31d28 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -151,6 +151,8 @@ public Q_SLOTS: Q_SIGNALS: void currentChanged(int index); void tabCloseRequested(int index); + void tabBarClicked(int index); + void tabBarDoubleClicked(int index); protected: virtual void tabInserted(int index); diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 4b3bf6de65..4e0c682493 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -773,6 +773,35 @@ QTextDocument *QTextEdit::document() const } /*! + \since 5.2 + + \property QTextEdit::placeholderText + \brief the editor placeholder text + + Setting this property makes the editor display a grayed-out + placeholder text as long as the document() is empty. + + By default, this property contains an empty string. + + \sa document() +*/ +QString QTextEdit::placeholderText() const +{ + Q_D(const QTextEdit); + return d->placeholderText; +} + +void QTextEdit::setPlaceholderText(const QString &placeholderText) +{ + Q_D(QTextEdit); + if (d->placeholderText != placeholderText) { + d->placeholderText = placeholderText; + if (d->control->document()->isEmpty()) + d->viewport->update(); + } +} + +/*! Sets the visible \a cursor. */ void QTextEdit::setTextCursor(const QTextCursor &cursor) @@ -1499,6 +1528,13 @@ void QTextEdit::paintEvent(QPaintEvent *e) Q_D(QTextEdit); QPainter p(d->viewport); d->paint(&p, e); + if (!d->placeholderText.isEmpty() && d->control->document()->isEmpty()) { + QColor col = palette().text().color(); + col.setAlpha(128); + p.setPen(col); + const int margin = int(document()->documentMargin()); + p.drawText(d->viewport->rect().adjusted(margin, margin, -margin, -margin), Qt::AlignTop | Qt::TextWordWrap, d->placeholderText); + } } void QTextEditPrivate::_q_currentCharFormatChanged(const QTextCharFormat &fmt) diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index e1471848e7..06ec5fb889 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -85,6 +85,7 @@ class Q_WIDGETS_EXPORT QTextEdit : public QAbstractScrollArea Q_PROPERTY(int cursorWidth READ cursorWidth WRITE setCursorWidth) Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags) Q_PROPERTY(QTextDocument *document READ document WRITE setDocument DESIGNABLE false) + Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText) public: enum LineWrapMode { NoWrap, @@ -108,6 +109,9 @@ public: void setDocument(QTextDocument *document); QTextDocument *document() const; + void setPlaceholderText(const QString &placeholderText); + QString placeholderText() const; + void setTextCursor(const QTextCursor &cursor); QTextCursor textCursor() const; diff --git a/src/widgets/widgets/qtextedit_p.h b/src/widgets/widgets/qtextedit_p.h index 1ce68dc23e..daa6eb5ed0 100644 --- a/src/widgets/widgets/qtextedit_p.h +++ b/src/widgets/widgets/qtextedit_p.h @@ -130,6 +130,8 @@ public: QString anchorToScrollToWhenVisible; + QString placeholderText; + #ifdef QT_KEYPAD_NAVIGATION QBasicTimer deleteAllTimer; #endif diff --git a/src/widgets/widgets/qwidgetanimator.cpp b/src/widgets/widgets/qwidgetanimator.cpp index bbd96ca29a..1209ade536 100644 --- a/src/widgets/widgets/qwidgetanimator.cpp +++ b/src/widgets/widgets/qwidgetanimator.cpp @@ -91,24 +91,28 @@ void QWidgetAnimator::animate(QWidget *widget, const QRect &_final_geometry, boo QRect(QPoint(-500 - widget->width(), -500 - widget->height()), widget->size()); #ifndef QT_NO_ANIMATION - AnimationMap::const_iterator it = m_animation_map.constFind(widget); - if (it != m_animation_map.constEnd() && (*it)->endValue().toRect() == final_geometry) - return; + //If the QStyle has animations, animate + if (widget->style()->styleHint(QStyle::SH_Widget_Animate, 0, widget)) { + AnimationMap::const_iterator it = m_animation_map.constFind(widget); + if (it != m_animation_map.constEnd() && (*it)->endValue().toRect() == final_geometry) + return; - QPropertyAnimation *anim = new QPropertyAnimation(widget, "geometry", widget); - anim->setDuration(animate ? 200 : 0); - anim->setEasingCurve(QEasingCurve::InOutQuad); - anim->setEndValue(final_geometry); - m_animation_map[widget] = anim; - connect(anim, SIGNAL(finished()), SLOT(animationFinished())); - anim->start(QPropertyAnimation::DeleteWhenStopped); -#else + QPropertyAnimation *anim = new QPropertyAnimation(widget, "geometry", widget); + anim->setDuration(animate ? 200 : 0); + anim->setEasingCurve(QEasingCurve::InOutQuad); + anim->setEndValue(final_geometry); + m_animation_map[widget] = anim; + connect(anim, SIGNAL(finished()), SLOT(animationFinished())); + anim->start(QPropertyAnimation::DeleteWhenStopped); + } else +#endif //QT_NO_ANIMATION + { //we do it in one shot widget->setGeometry(final_geometry); #ifndef QT_NO_MAINWINDOW m_mainWindowLayout->animationFinished(widget); #endif //QT_NO_MAINWINDOW -#endif //QT_NO_ANIMATION + } } bool QWidgetAnimator::animating() const diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index 9212f942c5..d10001a305 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -427,7 +427,7 @@ bool QWidgetLineControl::fixup() // this function assumes that validate currentl m_validator->fixup(textCopy); if (m_validator->validate(textCopy, cursorCopy) == QValidator::Acceptable) { if (textCopy != m_text || cursorCopy != m_cursor) - internalSetText(textCopy, cursorCopy); + internalSetText(textCopy, cursorCopy, false); return true; } } @@ -672,7 +672,7 @@ bool QWidgetLineControl::finishChange(int validateFromState, bool update, bool e m_validInput = (m_validator->validate(textCopy, cursorCopy) != QValidator::Invalid); if (m_validInput) { if (m_text != textCopy) { - internalSetText(textCopy, cursorCopy); + internalSetText(textCopy, cursorCopy, false); return true; } m_cursor = cursorCopy; diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index de06d4454a..0255183c87 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -2126,6 +2126,13 @@ void QWidgetTextControlPrivate::editFocusEvent(QEvent *e) #endif #ifndef QT_NO_CONTEXTMENU +static inline void setActionIcon(QAction *action, const QString &name) +{ + const QIcon icon = QIcon::fromTheme(name); + if (!icon.isNull()) + action->setIcon(icon); +} + QMenu *QWidgetTextControl::createStandardContextMenu(const QPointF &pos, QWidget *parent) { Q_D(QWidgetTextControl); @@ -2145,17 +2152,21 @@ QMenu *QWidgetTextControl::createStandardContextMenu(const QPointF &pos, QWidget if (d->interactionFlags & Qt::TextEditable) { a = menu->addAction(tr("&Undo") + ACCEL_KEY(QKeySequence::Undo), this, SLOT(undo())); a->setEnabled(d->doc->isUndoAvailable()); + setActionIcon(a, QStringLiteral("edit-undo")); a = menu->addAction(tr("&Redo") + ACCEL_KEY(QKeySequence::Redo), this, SLOT(redo())); a->setEnabled(d->doc->isRedoAvailable()); + setActionIcon(a, QStringLiteral("edit-redo")); menu->addSeparator(); a = menu->addAction(tr("Cu&t") + ACCEL_KEY(QKeySequence::Cut), this, SLOT(cut())); a->setEnabled(d->cursor.hasSelection()); + setActionIcon(a, QStringLiteral("edit-cut")); } if (showTextSelectionActions) { a = menu->addAction(tr("&Copy") + ACCEL_KEY(QKeySequence::Copy), this, SLOT(copy())); a->setEnabled(d->cursor.hasSelection()); + setActionIcon(a, QStringLiteral("edit-copy")); } if ((d->interactionFlags & Qt::LinksAccessibleByKeyboard) @@ -2169,9 +2180,11 @@ QMenu *QWidgetTextControl::createStandardContextMenu(const QPointF &pos, QWidget #if !defined(QT_NO_CLIPBOARD) a = menu->addAction(tr("&Paste") + ACCEL_KEY(QKeySequence::Paste), this, SLOT(paste())); a->setEnabled(canPaste()); + setActionIcon(a, QStringLiteral("edit-paste")); #endif a = menu->addAction(tr("Delete"), this, SLOT(_q_deleteSelected())); a->setEnabled(d->cursor.hasSelection()); + setActionIcon(a, QStringLiteral("edit-delete")); } |