diff options
Diffstat (limited to 'src/widgets/dialogs')
30 files changed, 1960 insertions, 2502 deletions
diff --git a/src/widgets/dialogs/images/qtlogo-64.png b/src/widgets/dialogs/images/qtlogo-64.png Binary files differindex 39a4a26f39..e40b5c6fc8 100644 --- a/src/widgets/dialogs/images/qtlogo-64.png +++ b/src/widgets/dialogs/images/qtlogo-64.png diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index 9db8d5687c..22efecedc9 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qcolordialog.h" @@ -75,17 +39,33 @@ #include "private/qdialog_p.h" +#include <qpa/qplatformintegration.h> +#include <qpa/qplatformservices.h> +#include <private/qguiapplication_p.h> + +#include <QtCore/qpointer.h> + #include <algorithm> QT_BEGIN_NAMESPACE -namespace { +using namespace Qt::StringLiterals; + +namespace QtPrivate { class QColorLuminancePicker; class QColorPicker; class QColorShower; class QWellArray; +class QColorWell; class QColorPickingEventFilter; -} // unnamed namespace +} // namespace QtPrivate + +using QColorLuminancePicker = QtPrivate::QColorLuminancePicker; +using QColorPicker = QtPrivate::QColorPicker; +using QColorShower = QtPrivate::QColorShower; +using QWellArray = QtPrivate::QWellArray; +using QColorWell = QtPrivate::QColorWell; +using QColorPickingEventFilter = QtPrivate::QColorPickingEventFilter; class QColorDialogPrivate : public QDialogPrivate { @@ -122,17 +102,18 @@ public: void showAlpha(bool b); bool isAlphaVisible() const; void retranslateStrings(); + bool supportsColorPicking() const; - void _q_addCustom(); + void addCustom(); void _q_setCustom(int index, QRgb color); - void _q_newHsv(int h, int s, int v); - void _q_newColorTypedIn(QRgb rgb); - void _q_nextCustom(int, int); - void _q_newCustom(int, int); - void _q_newStandard(int, int); - void _q_pickScreenColor(); - void _q_updateColorPicking(); + void newHsv(int h, int s, int v); + void newColorTypedIn(QRgb rgb); + void nextCustom(int, int); + void newCustom(int, int); + void newStandard(int, int); + void pickScreenColor(); + void updateColorPicking(); void updateColorLabelText(const QPoint &); void updateColorPicking(const QPoint &pos); void releaseColorPicking(); @@ -141,6 +122,7 @@ public: bool handleColorPickingKeyPress(QKeyEvent *e); bool canBeNativeDialog() const override; + void setVisible(bool visible) override; QWellArray *custom; QWellArray *standard; @@ -156,7 +138,7 @@ public: QPushButton *ok; QPushButton *cancel; QPushButton *addCusBt; - QPushButton *screenColorPickerButton; + QPushButton *eyeDropperButton = nullptr; QColor selectedQColor; int nextCust; bool smallDisplay; @@ -179,7 +161,7 @@ private: //////////// QWellArray BEGIN -namespace { +namespace QtPrivate { class QWellArray : public QWidget { @@ -343,7 +325,7 @@ void QWellArray::paintCell(QPainter* p, int row, int col, const QRect &rect) const QPalette & g = palette(); QStyleOptionFrame opt; opt.initFrom(this); - int dfw = style()->pixelMetric(QStyle::PM_DefaultFrameWidth, &opt); + int dfw = style()->pixelMetric(QStyle::PM_DefaultFrameWidth, &opt, this); opt.lineWidth = dfw; opt.midLineWidth = 1; opt.rect = rect.adjusted(b, b, -b, -b); @@ -494,7 +476,7 @@ void QWellArray::keyPressEvent(QKeyEvent* e) return; } -} +} // namespace QtPrivate //////////// QWellArray END @@ -584,7 +566,7 @@ static inline void rgb2hsv(QRgb rgb, int &h, int &s, int &v) c.getHsv(&h, &s, &v); } -namespace { +namespace QtPrivate { class QColorWell : public QWellArray { @@ -734,9 +716,13 @@ private: bool crossVisible; }; +} // namespace QtPrivate + static int pWidth = 220; static int pHeight = 200; +namespace QtPrivate { + class QColorLuminancePicker : public QWidget { Q_OBJECT @@ -797,6 +783,10 @@ QColorLuminancePicker::~QColorLuminancePicker() void QColorLuminancePicker::mouseMoveEvent(QMouseEvent *m) { + if (m->buttons() == Qt::NoButton) { + m->ignore(); + return; + } setVal(y2val(m->position().toPoint().y())); } void QColorLuminancePicker::mousePressEvent(QMouseEvent *m) @@ -846,11 +836,10 @@ void QColorLuminancePicker::paintEvent(QPaintEvent *) qDrawShadePanel(&p, r, g, true); p.setPen(g.windowText().color()); p.setBrush(g.windowText()); - QPolygon a; - int y = val2y(val); - a.setPoints(3, w, y, w+5, y+5, w+5, y-5); p.eraseRect(w, 0, 5, height()); - p.drawPolygon(a); + const int y = val2y(val); + const std::array<QPoint, 3> points = {QPoint(w, y), QPoint(w + 5, y + 5), QPoint(w + 5, y - 5)}; + p.drawPolygon(points.data(), static_cast<int>(points.size())); } void QColorLuminancePicker::setCol(int h, int s , int v) @@ -931,6 +920,10 @@ void QColorPicker::setCol(int h, int s) void QColorPicker::mouseMoveEvent(QMouseEvent *m) { QPoint p = m->position().toPoint() - contentsRect().topLeft(); + if (m->buttons() == Qt::NoButton) { + m->ignore(); + return; + } setCol(p); emit newCol(hue, sat); } @@ -1197,8 +1190,8 @@ QColorShower::QColorShower(QColorDialog *parent) #else gl->addWidget(lab, 0, 0, 1, -1); #endif - connect(lab, SIGNAL(colorDropped(QRgb)), this, SIGNAL(newCol(QRgb))); - connect(lab, SIGNAL(colorDropped(QRgb)), this, SLOT(setRgb(QRgb))); + connect(lab, &QColorShowLabel::colorDropped, this, &QColorShower::newCol); + connect(lab, &QColorShowLabel::colorDropped, this, &QColorShower::setRgb); hEd = new QColSpinBox(this); hEd->setRange(0, 359); @@ -1302,12 +1295,13 @@ QColorShower::QColorShower(QColorDialog *parent) alphaLab->hide(); lblHtml = new QLabel(this); htEd = new QLineEdit(this); + htEd->setObjectName("qt_colorname_lineedit"); #ifndef QT_NO_SHORTCUT lblHtml->setBuddy(htEd); #endif #if QT_CONFIG(regularexpression) - QRegularExpression regExp(QStringLiteral("#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})")); + QRegularExpression regExp(QStringLiteral("#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})")); QRegularExpressionValidator *validator = new QRegularExpressionValidator(regExp, this); htEd->setValidator(validator); #else @@ -1324,20 +1318,20 @@ QColorShower::QColorShower(QColorDialog *parent) gl->addWidget(htEd, 5, 2, 1, /*colspan=*/ 3); #endif - connect(hEd, SIGNAL(valueChanged(int)), this, SLOT(hsvEd())); - connect(sEd, SIGNAL(valueChanged(int)), this, SLOT(hsvEd())); - connect(vEd, SIGNAL(valueChanged(int)), this, SLOT(hsvEd())); + connect(hEd, &QSpinBox::valueChanged, this, &QColorShower::hsvEd); + connect(sEd, &QSpinBox::valueChanged, this, &QColorShower::hsvEd); + connect(vEd, &QSpinBox::valueChanged, this, &QColorShower::hsvEd); - connect(rEd, SIGNAL(valueChanged(int)), this, SLOT(rgbEd())); - connect(gEd, SIGNAL(valueChanged(int)), this, SLOT(rgbEd())); - connect(bEd, SIGNAL(valueChanged(int)), this, SLOT(rgbEd())); - connect(alphaEd, SIGNAL(valueChanged(int)), this, SLOT(rgbEd())); - connect(htEd, SIGNAL(textEdited(QString)), this, SLOT(htmlEd())); + connect(rEd, &QSpinBox::valueChanged, this, &QColorShower::rgbEd); + connect(gEd, &QSpinBox::valueChanged, this, &QColorShower::rgbEd); + connect(bEd, &QSpinBox::valueChanged, this, &QColorShower::rgbEd); + connect(alphaEd, &QSpinBox::valueChanged, this, &QColorShower::rgbEd); + connect(htEd, &QLineEdit::textEdited, this, &QColorShower::htmlEd); retranslateStrings(); } -} // unnamed namespace +} // namespace QtPrivate inline QRgb QColorDialogPrivate::currentColor() const { return cs->currentColor(); } inline int QColorDialogPrivate::currentAlpha() const { return cs->currentAlpha(); } @@ -1400,11 +1394,20 @@ void QColorShower::hsvEd() void QColorShower::htmlEd() { - QColor c; QString t = htEd->text(); - c.setNamedColor(t); + if (t.isEmpty()) + return; + + if (!t.startsWith(u"#")) { + t.prepend(u"#"); + QSignalBlocker blocker(htEd); + htEd->setText(t); + } + + QColor c = QColor::fromString(t); if (!c.isValid()) return; + curCol = qRgba(c.red(), c.green(), c.blue(), currentAlpha()); rgb2hsv(curCol, hue, sat, val); @@ -1488,7 +1491,7 @@ void QColorShower::updateQColor() } //sets all widgets to display h,s,v -void QColorDialogPrivate::_q_newHsv(int h, int s, int v) +void QColorDialogPrivate::newHsv(int h, int s, int v) { if (!nativeDialogInUse) { cs->setHsv(h, s, v); @@ -1502,7 +1505,7 @@ void QColorDialogPrivate::setCurrentRgbColor(QRgb rgb) { if (!nativeDialogInUse) { cs->setRgb(rgb); - _q_newColorTypedIn(rgb); + newColorTypedIn(rgb); } } @@ -1535,7 +1538,7 @@ bool QColorDialogPrivate::selectColor(const QColor &col) const int index = int(match - standardColors); const int column = index / standardColorRows; const int row = index % standardColorRows; - _q_newStandard(row, column); + newStandard(row, column); standard->setCurrent(row, column); standard->setSelected(row, column); standard->setFocus(); @@ -1551,7 +1554,7 @@ bool QColorDialogPrivate::selectColor(const QColor &col) const int index = int(match - customColors); const int column = index / customColorRows; const int row = index % customColorRows; - _q_newCustom(row, column); + newCustom(row, column); custom->setCurrent(row, column); custom->setSelected(row, column); custom->setFocus(); @@ -1566,13 +1569,15 @@ QColor QColorDialogPrivate::grabScreenColor(const QPoint &p) QScreen *screen = QGuiApplication::screenAt(p); if (!screen) screen = QGuiApplication::primaryScreen(); - const QPixmap pixmap = screen->grabWindow(0, p.x(), p.y(), 1, 1); + const QRect screenRect = screen->geometry(); + const QPixmap pixmap = + screen->grabWindow(0, p.x() - screenRect.x(), p.y() - screenRect.y(), 1, 1); const QImage i = pixmap.toImage(); return i.pixel(0, 0); } //sets all widgets except cs to display rgb -void QColorDialogPrivate::_q_newColorTypedIn(QRgb rgb) +void QColorDialogPrivate::newColorTypedIn(QRgb rgb) { if (!nativeDialogInUse) { int h, s, v; @@ -1582,12 +1587,12 @@ void QColorDialogPrivate::_q_newColorTypedIn(QRgb rgb) } } -void QColorDialogPrivate::_q_nextCustom(int r, int c) +void QColorDialogPrivate::nextCustom(int r, int c) { nextCust = r + customColorRows * c; } -void QColorDialogPrivate::_q_newCustom(int r, int c) +void QColorDialogPrivate::newCustom(int r, int c) { const int i = r + customColorRows * c; setCurrentRgbColor(QColorDialogOptions::customColor(i)); @@ -1595,16 +1600,30 @@ void QColorDialogPrivate::_q_newCustom(int r, int c) standard->setSelected(-1,-1); } -void QColorDialogPrivate::_q_newStandard(int r, int c) +void QColorDialogPrivate::newStandard(int r, int c) { setCurrentRgbColor(QColorDialogOptions::standardColor(r + c * 6)); if (custom) custom->setSelected(-1,-1); } -void QColorDialogPrivate::_q_pickScreenColor() +void QColorDialogPrivate::pickScreenColor() { Q_Q(QColorDialog); + + auto *platformServices = QGuiApplicationPrivate::platformIntegration()->services(); + if (platformServices->hasCapability(QPlatformServices::Capability::ColorPicking)) { + if (auto *colorPicker = platformServices->colorPicker(q->windowHandle())) { + q->connect(colorPicker, &QPlatformServiceColorPicker::colorPicked, q, + [q, colorPicker](const QColor &color) { + colorPicker->deleteLater(); + q->setCurrentColor(color); + }); + colorPicker->pickColor(); + return; + } + } + if (!colorPickingEventFilter) colorPickingEventFilter = new QColorPickingEventFilter(this, q); q->installEventFilter(colorPickingEventFilter); @@ -1633,16 +1652,18 @@ void QColorDialogPrivate::_q_pickScreenColor() addCusBt->setDisabled(true); buttons->setDisabled(true); - screenColorPickerButton->setDisabled(true); - - const QPoint globalPos = QCursor::pos(); - q->setCurrentColor(grabScreenColor(globalPos)); - updateColorLabelText(globalPos); + if (eyeDropperButton) { + eyeDropperButton->setDisabled(true); + const QPoint globalPos = QCursor::pos(); + q->setCurrentColor(grabScreenColor(globalPos)); + updateColorLabelText(globalPos); + } } void QColorDialogPrivate::updateColorLabelText(const QPoint &globalPos) { - lblScreenColorInfo->setText(QColorDialog::tr("Cursor at %1, %2\nPress ESC to cancel") + if (lblScreenColorInfo) + lblScreenColorInfo->setText(QColorDialog::tr("Cursor at %1, %2\nPress ESC to cancel") .arg(globalPos.x()) .arg(globalPos.y())); } @@ -1659,10 +1680,10 @@ void QColorDialogPrivate::releaseColorPicking() #endif q->releaseKeyboard(); q->setMouseTracking(false); - lblScreenColorInfo->setText(QLatin1String("\n")); + lblScreenColorInfo->setText("\n"_L1); addCusBt->setDisabled(false); buttons->setDisabled(false); - screenColorPickerButton->setDisabled(false); + eyeDropperButton->setDisabled(false); } void QColorDialogPrivate::init(const QColor &initial) @@ -1719,17 +1740,23 @@ void QColorDialogPrivate::initWidgets() #ifndef QT_NO_SHORTCUT lblBasicColors->setBuddy(standard); #endif - q->connect(standard, SIGNAL(selected(int,int)), SLOT(_q_newStandard(int,int))); + QObjectPrivate::connect(standard, &QColorWell::selected, + this, &QColorDialogPrivate::newStandard); leftLay->addWidget(lblBasicColors); leftLay->addWidget(standard); #if !defined(QT_SMALL_COLORDIALOG) - // The screen color picker button - screenColorPickerButton = new QPushButton(); - leftLay->addWidget(screenColorPickerButton); - lblScreenColorInfo = new QLabel(QLatin1String("\n")); - leftLay->addWidget(lblScreenColorInfo); - q->connect(screenColorPickerButton, SIGNAL(clicked()), SLOT(_q_pickScreenColor())); + if (supportsColorPicking()) { + eyeDropperButton = new QPushButton(); + leftLay->addWidget(eyeDropperButton); + lblScreenColorInfo = new QLabel("\n"_L1); + leftLay->addWidget(lblScreenColorInfo); + QObjectPrivate::connect(eyeDropperButton, &QPushButton::clicked, + this, &QColorDialogPrivate::pickScreenColor); + } else { + eyeDropperButton = nullptr; + lblScreenColorInfo = nullptr; + } #endif leftLay->addStretch(); @@ -1737,10 +1764,10 @@ void QColorDialogPrivate::initWidgets() custom = new QColorWell(q, customColorRows, colorColumns, QColorDialogOptions::customColors()); custom->setAcceptDrops(true); - q->connect(custom, SIGNAL(selected(int,int)), SLOT(_q_newCustom(int,int))); - q->connect(custom, SIGNAL(currentChanged(int,int)), SLOT(_q_nextCustom(int,int))); + QObjectPrivate::connect(custom, &QColorWell::selected, this, &QColorDialogPrivate::newCustom); + QObjectPrivate::connect(custom, &QColorWell::currentChanged, this, &QColorDialogPrivate::nextCustom); - q->connect(custom, &QWellArray::colorChanged, [this] (int index, QRgb color) { + QObject::connect(custom, &QWellArray::colorChanged, q, [this] (int index, QRgb color) { QColorDialogOptions::setCustomColor(index, color); if (custom) custom->update(); @@ -1754,7 +1781,7 @@ void QColorDialogPrivate::initWidgets() leftLay->addWidget(custom); addCusBt = new QPushButton(q); - QObject::connect(addCusBt, SIGNAL(clicked()), q, SLOT(_q_addCustom())); + QObjectPrivate::connect(addCusBt, &QPushButton::clicked, this, &QColorDialogPrivate::addCustom); leftLay->addWidget(addCusBt); } else { // better color picker size for small displays @@ -1782,7 +1809,7 @@ void QColorDialogPrivate::initWidgets() pickLay->addLayout(cLay); cp = new QColorPicker(q); - cp->setFrameStyle(QFrame::Panel + QFrame::Sunken); + cp->setFrameStyle(QFrame::Panel | QFrame::Sunken); #if defined(QT_SMALL_COLORDIALOG) cp->hide(); @@ -1802,16 +1829,17 @@ void QColorDialogPrivate::initWidgets() pickLay->addStretch(); #endif - QObject::connect(cp, SIGNAL(newCol(int,int)), lp, SLOT(setCol(int,int))); - QObject::connect(lp, SIGNAL(newHsv(int,int,int)), q, SLOT(_q_newHsv(int,int,int))); + QObject::connect(cp, &QColorPicker::newCol, lp, qOverload<int, int>(&QColorLuminancePicker::setCol)); + QObjectPrivate::connect(lp, &QColorLuminancePicker::newHsv, this, &QColorDialogPrivate::newHsv); rightLay->addStretch(); cs = new QColorShower(q); pickLay->setContentsMargins(cs->gl->contentsMargins()); - QObject::connect(cs, SIGNAL(newCol(QRgb)), q, SLOT(_q_newColorTypedIn(QRgb))); - QObject::connect(cs, SIGNAL(currentColorChanged(QColor)), - q, SIGNAL(currentColorChanged(QColor))); + QObjectPrivate::connect(cs, &QColorShower::newCol, + this, &QColorDialogPrivate::newColorTypedIn); + QObject::connect(cs, &QColorShower::currentColorChanged, + q, &QColorDialog::currentColorChanged); #if defined(QT_SMALL_COLORDIALOG) topLay->addWidget(cs); #else @@ -1824,14 +1852,15 @@ void QColorDialogPrivate::initWidgets() mainLay->addWidget(buttons); ok = buttons->addButton(QDialogButtonBox::Ok); - QObject::connect(ok, SIGNAL(clicked()), q, SLOT(accept())); + QObject::connect(ok, &QPushButton::clicked, q, &QColorDialog::accept); ok->setDefault(true); cancel = buttons->addButton(QDialogButtonBox::Cancel); - QObject::connect(cancel, SIGNAL(clicked()), q, SLOT(reject())); + QObject::connect(cancel, &QPushButton::clicked, q, &QColorDialog::reject); #ifdef Q_OS_WIN32 updateTimer = new QTimer(q); - QObject::connect(updateTimer, SIGNAL(timeout()), q, SLOT(_q_updateColorPicking())); + QObjectPrivate::connect(updateTimer, &QTimer::timeout, + this, qOverload<>(&QColorDialogPrivate::updateColorPicking)); #endif retranslateStrings(); } @@ -1839,9 +1868,12 @@ void QColorDialogPrivate::initWidgets() void QColorDialogPrivate::initHelper(QPlatformDialogHelper *h) { QColorDialog *d = q_func(); - QObject::connect(h, SIGNAL(currentColorChanged(QColor)), d, SIGNAL(currentColorChanged(QColor))); - QObject::connect(h, SIGNAL(colorSelected(QColor)), d, SIGNAL(colorSelected(QColor))); - static_cast<QPlatformColorDialogHelper *>(h)->setOptions(options); + auto *colorDialogHelper = static_cast<QPlatformColorDialogHelper*>(h); + QObject::connect(colorDialogHelper, &QPlatformColorDialogHelper::currentColorChanged, + d, &QColorDialog::currentColorChanged); + QObject::connect(colorDialogHelper, &QPlatformColorDialogHelper::colorSelected, + d, &QColorDialog::colorSelected); + colorDialogHelper->setOptions(options); } void QColorDialogPrivate::helperPrepareShow(QPlatformDialogHelper *) @@ -1849,7 +1881,7 @@ void QColorDialogPrivate::helperPrepareShow(QPlatformDialogHelper *) options->setWindowTitle(q_func()->windowTitle()); } -void QColorDialogPrivate::_q_addCustom() +void QColorDialogPrivate::addCustom() { QColorDialogOptions::setCustomColor(nextCust, cs->currentColor()); if (custom) @@ -1866,12 +1898,22 @@ void QColorDialogPrivate::retranslateStrings() lblBasicColors->setText(QColorDialog::tr("&Basic colors")); lblCustomColors->setText(QColorDialog::tr("&Custom colors")); addCusBt->setText(QColorDialog::tr("&Add to Custom Colors")); - screenColorPickerButton->setText(QColorDialog::tr("&Pick Screen Color")); +#if !defined(QT_SMALL_COLORDIALOG) + if (eyeDropperButton) + eyeDropperButton->setText(QColorDialog::tr("&Pick Screen Color")); +#endif } cs->retranslateStrings(); } +bool QColorDialogPrivate::supportsColorPicking() const +{ + const auto integration = QGuiApplicationPrivate::platformIntegration(); + return integration->hasCapability(QPlatformIntegration::ScreenWindowGrabbing) + || integration->services()->hasCapability(QPlatformServices::Capability::ColorPicking); +} + bool QColorDialogPrivate::canBeNativeDialog() const { // Don't use Q_Q here! This function is called from ~QDialog, @@ -1885,12 +1927,10 @@ bool QColorDialogPrivate::canBeNativeDialog() const return false; } - QLatin1String staticName(QColorDialog::staticMetaObject.className()); - QLatin1String dynamicName(q->metaObject()->className()); - return (staticName == dynamicName); + return strcmp(QColorDialog::staticMetaObject.className(), q->metaObject()->className()) == 0; } -static const Qt::WindowFlags DefaultWindowFlags = +static const Qt::WindowFlags qcd_DefaultWindowFlags = Qt::Dialog | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint; @@ -1950,7 +1990,7 @@ QColorDialog::QColorDialog(QWidget *parent) \a initial color. */ QColorDialog::QColorDialog(const QColor &initial, QWidget *parent) - : QDialog(*new QColorDialogPrivate, parent, DefaultWindowFlags) + : QDialog(*new QColorDialogPrivate, parent, qcd_DefaultWindowFlags) { Q_D(QColorDialog); d->init(initial); @@ -2056,6 +2096,8 @@ void QColorDialog::setOptions(ColorDialogOptions options) if (!d->nativeDialogInUse) { d->buttons->setVisible(!(options & NoButtons)); d->showAlpha(options & ShowAlphaChannel); + if (d->eyeDropperButton) + d->eyeDropperButton->setVisible(!(options & NoEyeDropperButton)); } } @@ -2075,6 +2117,7 @@ QColorDialog::ColorDialogOptions QColorDialog::options() const \value ShowAlphaChannel Allow the user to select the alpha component of a color. \value NoButtons Don't display \uicontrol{OK} and \uicontrol{Cancel} buttons. (Useful for "live dialogs".) + \value NoEyeDropperButton Hide the \uicontrol{Eye Dropper} button. This value was added in Qt 6.6. \value DontUseNativeDialog Use Qt's standard color dialog instead of the operating system native color dialog. @@ -2105,27 +2148,37 @@ QColorDialog::ColorDialogOptions QColorDialog::options() const */ void QColorDialog::setVisible(bool visible) { - Q_D(QColorDialog); + // will call QColorDialogPrivate::setVisible override + QDialog::setVisible(visible); +} - if (visible){ - if (testAttribute(Qt::WA_WState_ExplicitShowHide) && !testAttribute(Qt::WA_WState_Hidden)) - return; - } else if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden)) - return; +/*! + \internal + + The implementation of QColorDialog::setVisible() has to live here so that the call + to hide() in ~QDialog calls this function; it wouldn't call the override of + QDialog::setVisible(). +*/ +void QColorDialogPrivate::setVisible(bool visible) +{ + Q_Q(QColorDialog); if (visible) - d->selectedQColor = QColor(); + selectedQColor = QColor(); - if (d->nativeDialogInUse) { - d->setNativeDialogVisible(visible); - // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below - // updates the state correctly, but skips showing the non-native version: - setAttribute(Qt::WA_DontShowOnScreen); + if (nativeDialogInUse) { + if (setNativeDialogVisible(visible)) { + // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below + // updates the state correctly, but skips showing the non-native version: + q->setAttribute(Qt::WA_DontShowOnScreen); + } else { + initWidgets(); + } } else { - setAttribute(Qt::WA_DontShowOnScreen, false); + q->setAttribute(Qt::WA_DontShowOnScreen, false); } - QDialog::setVisible(visible); + QDialogPrivate::setVisible(visible); } /*! @@ -2173,7 +2226,6 @@ QColor QColorDialog::getColor(const QColor &initial, QWidget *parent, const QStr QColorDialog::~QColorDialog() { - } /*! @@ -2187,7 +2239,7 @@ void QColorDialog::changeEvent(QEvent *e) QDialog::changeEvent(e); } -void QColorDialogPrivate::_q_updateColorPicking() +void QColorDialogPrivate::updateColorPicking() { #ifndef QT_NO_CURSOR Q_Q(QColorDialog); @@ -2213,7 +2265,6 @@ void QColorDialogPrivate::updateColorPicking(const QPoint &globalPos) // otherwise it is not possible to pre-select a custom cell for assignment. setCurrentColor(color, ShowColor); updateColorLabelText(globalPos); - } bool QColorDialogPrivate::handleColorPickingMouseMove(QMouseEvent *e) diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index 271c25f2dc..824efa8f8c 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QCOLORDIALOG_H #define QCOLORDIALOG_H @@ -62,7 +26,8 @@ public: enum ColorDialogOption { ShowAlphaChannel = 0x00000001, NoButtons = 0x00000002, - DontUseNativeDialog = 0x00000004 + DontUseNativeDialog = 0x00000004, + NoEyeDropperButton = 0x00000008, }; Q_ENUM(ColorDialogOption) @@ -108,15 +73,6 @@ protected: private: Q_DISABLE_COPY(QColorDialog) - - Q_PRIVATE_SLOT(d_func(), void _q_addCustom()) - Q_PRIVATE_SLOT(d_func(), void _q_newHsv(int h, int s, int v)) - Q_PRIVATE_SLOT(d_func(), void _q_newColorTypedIn(QRgb rgb)) - Q_PRIVATE_SLOT(d_func(), void _q_nextCustom(int, int)) - Q_PRIVATE_SLOT(d_func(), void _q_newCustom(int, int)) - Q_PRIVATE_SLOT(d_func(), void _q_newStandard(int, int)) - Q_PRIVATE_SLOT(d_func(), void _q_pickScreenColor()) - Q_PRIVATE_SLOT(d_func(), void _q_updateColorPicking()) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QColorDialog::ColorDialogOptions) diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 8b018969c8..27466d03d6 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <QtWidgets/qtwidgetsglobal.h> #if QT_CONFIG(colordialog) @@ -70,7 +34,7 @@ #include <qpa/qplatformtheme.h> #include "private/qdialog_p.h" #include "private/qguiapplication_p.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "qaccessible.h" #endif @@ -134,6 +98,9 @@ QPlatformDialogHelper *QDialogPrivate::platformHelper() const bool QDialogPrivate::canBeNativeDialog() const { + if (QCoreApplication::testAttribute(Qt::AA_DontUseNativeDialogs)) + return false; + QDialogPrivate *ncThis = const_cast<QDialogPrivate *>(this); QDialog *dialog = ncThis->q_func(); const int type = themeDialogType(dialog); @@ -182,25 +149,6 @@ void QDialogPrivate::close(int resultCode) resetModalitySetByOpen(); } -/*! - \internal - - Emits finished() signal with \a resultCode. If the \a dialogCode - is equal to 0 emits rejected(), if the \a dialogCode is equal to - 1 emits accepted(). - */ -void QDialogPrivate::finalize(int resultCode, int dialogCode) -{ - Q_Q(QDialog); - - if (dialogCode == QDialog::Accepted) - emit q->accepted(); - else if (dialogCode == QDialog::Rejected) - emit q->rejected(); - - emit q->finished(resultCode); -} - QWindow *QDialogPrivate::transientParentWindow() const { Q_Q(const QDialog); @@ -232,14 +180,6 @@ QVariant QDialogPrivate::styleHint(QPlatformDialogHelper::StyleHint hint) const return QPlatformDialogHelper::defaultStyleHint(hint); } -void QDialogPrivate::deletePlatformHelper() -{ - delete m_platformHelper; - m_platformHelper = nullptr; - m_platformHelperCreated = false; - nativeDialogInUse = false; -} - /*! \class QDialog \brief The QDialog class is the base class of dialog windows. @@ -340,7 +280,8 @@ void QDialogPrivate::deletePlatformHelper() \section1 Escape Key If the user presses the Esc key in a dialog, QDialog::reject() - will be called. This will cause the window to close: The \l{QCloseEvent}{close event} cannot be \l{QEvent::ignore()}{ignored}. + will be called. This will cause the window to close: + The \l{QCloseEvent}{close event} cannot be \l{QEvent::ignore()}{ignored}. \section1 Extensibility @@ -348,9 +289,8 @@ void QDialogPrivate::deletePlatformHelper() partial dialog that shows the most commonly used options, and a full dialog that shows all the options. Typically an extensible dialog will initially appear as a partial dialog, but with a - \uicontrol More toggle button. If the user presses the \uicontrol More button down, - the dialog is expanded. The \l{Extension Example} shows how to achieve - extensible dialogs using Qt. + \uicontrol More toggle button. If the user presses the + \uicontrol More button down, the dialog is expanded. \target return \section1 Return Value (Modal Dialogs) @@ -380,8 +320,15 @@ void QDialogPrivate::deletePlatformHelper() \snippet dialogs/dialogs.cpp 0 + A dialog with an extension: + + \snippet dialogs/dialogs.cpp extension + + By setting the \l{QLayout::}{sizeConstraint} property of the dialog's + layout to \l{QLayout::}{SetFixedSize}, the dialog will not be resizable + by the user, and will automatically shrink when the extension gets hidden. + \sa QDialogButtonBox, QTabWidget, QWidget, QProgressDialog, - {fowler}{GUI Design Handbook: Dialogs, Standard}, {Extension Example}, {Standard Dialogs Example} */ @@ -654,9 +601,22 @@ int QDialog::exec() void QDialog::done(int r) { + QPointer<QDialog> guard(this); + Q_D(QDialog); d->close(r); - d->finalize(r, r); + + if (!guard) + return; + + int dialogCode = d->dialogCode(); + if (dialogCode == QDialog::Accepted) + emit accepted(); + else if (dialogCode == QDialog::Rejected) + emit rejected(); + + if (guard) + emit finished(r); } /*! @@ -784,35 +744,42 @@ void QDialog::closeEvent(QCloseEvent *e) void QDialog::setVisible(bool visible) { Q_D(QDialog); - if (!testAttribute(Qt::WA_DontShowOnScreen) && d->canBeNativeDialog() && d->setNativeDialogVisible(visible)) + + if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden) != visible) + return; + + d->setVisible(visible); +} + +void QDialogPrivate::setVisible(bool visible) +{ + Q_Q(QDialog); + if (!q->testAttribute(Qt::WA_DontShowOnScreen) && canBeNativeDialog() && setNativeDialogVisible(visible)) return; // We should not block windows by the invisible modal dialog // if a platform-specific dialog is implemented as an in-process // Qt window, because in this case it will also be blocked. - const bool dontBlockWindows = testAttribute(Qt::WA_DontShowOnScreen) - && d->styleHint(QPlatformDialogHelper::DialogIsQtWindow).toBool(); + const bool dontBlockWindows = q->testAttribute(Qt::WA_DontShowOnScreen) + && styleHint(QPlatformDialogHelper::DialogIsQtWindow).toBool(); Qt::WindowModality oldModality; bool wasModalitySet; if (dontBlockWindows) { - oldModality = windowModality(); - wasModalitySet = testAttribute(Qt::WA_SetWindowModality); - setWindowModality(Qt::NonModal); + oldModality = q->windowModality(); + wasModalitySet = q->testAttribute(Qt::WA_SetWindowModality); + q->setWindowModality(Qt::NonModal); } if (visible) { - if (testAttribute(Qt::WA_WState_ExplicitShowHide) && !testAttribute(Qt::WA_WState_Hidden)) - return; - - QWidget::setVisible(visible); + q->QWidget::setVisible(visible); // Window activation might be prevented. We can't test isActiveWindow here, // as the window will be activated asynchronously by the window manager. - if (!testAttribute(Qt::WA_ShowWithoutActivating)) { - QWidget *fw = window()->focusWidget(); + if (!q->testAttribute(Qt::WA_ShowWithoutActivating)) { + QWidget *fw = q->window()->focusWidget(); if (!fw) - fw = this; + fw = q; /* The following block is to handle a special case, and does not @@ -825,14 +792,14 @@ void QDialog::setVisible(bool visible) have to use [widget*]->setFocus() themselves... */ #if QT_CONFIG(pushbutton) - if (d->mainDef && fw->focusPolicy() == Qt::NoFocus) { + if (mainDef && fw->focusPolicy() == Qt::NoFocus) { QWidget *first = fw; while ((first = first->nextInFocusChain()) != fw && first->focusPolicy() == Qt::NoFocus) ; - if (first != d->mainDef && qobject_cast<QPushButton*>(first)) - d->mainDef->setFocus(); + if (first != mainDef && qobject_cast<QPushButton*>(first)) + mainDef->setFocus(); } - if (!d->mainDef && isWindow()) { + if (!mainDef && q->isWindow()) { QWidget *w = fw; while ((w = w->nextInFocusChain()) != fw) { QPushButton *pb = qobject_cast<QPushButton *>(w); @@ -849,38 +816,36 @@ void QDialog::setVisible(bool visible) } } -#ifndef QT_NO_ACCESSIBILITY - QAccessibleEvent event(this, QAccessible::DialogStart); +#if QT_CONFIG(accessibility) + QAccessibleEvent event(q, QAccessible::DialogStart); QAccessible::updateAccessibility(&event); #endif } else { - if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden)) - return; -#ifndef QT_NO_ACCESSIBILITY - if (isVisible()) { - QAccessibleEvent event(this, QAccessible::DialogEnd); +#if QT_CONFIG(accessibility) + if (q->isVisible()) { + QAccessibleEvent event(q, QAccessible::DialogEnd); QAccessible::updateAccessibility(&event); } #endif // Reimplemented to exit a modal event loop when the dialog is hidden. - QWidget::setVisible(visible); - if (d->eventLoop) - d->eventLoop->exit(); + q->QWidget::setVisible(visible); + if (eventLoop) + eventLoop->exit(); } if (dontBlockWindows) { - setWindowModality(oldModality); - setAttribute(Qt::WA_SetWindowModality, wasModalitySet); + q->setWindowModality(oldModality); + q->setAttribute(Qt::WA_SetWindowModality, wasModalitySet); } #if QT_CONFIG(pushbutton) const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme(); - if (d->mainDef && isActiveWindow() + if (mainDef && q->isActiveWindow() && theme->themeHint(QPlatformTheme::DialogSnapToDefaultButton).toBool()) - QCursor::setPos(d->mainDef->mapToGlobal(d->mainDef->rect().center())); + QCursor::setPos(mainDef->mapToGlobal(mainDef->rect().center())); #endif } diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index 8c50642a64..4d11fe2d8d 100644 --- a/src/widgets/dialogs/qdialog.h +++ b/src/widgets/dialogs/qdialog.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QDIALOG_H #define QDIALOG_H diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h index 7c7e8f89a7..bac33bdea9 100644 --- a/src/widgets/dialogs/qdialog_p.h +++ b/src/widgets/dialogs/qdialog_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QDIALOG_P_H #define QDIALOG_P_H @@ -87,10 +51,11 @@ public: {} ~QDialogPrivate(); + virtual void setVisible(bool visible); + QWindow *transientParentWindow() const; bool setNativeDialogVisible(bool visible); QVariant styleHint(QPlatformDialogHelper::StyleHint hint) const; - void deletePlatformHelper(); #if QT_CONFIG(pushbutton) QPointer<QPushButton> mainDef; @@ -123,7 +88,9 @@ public: virtual bool canBeNativeDialog() const; void close(int resultCode); - void finalize(int resultCode, int dialogCode); + +protected: + virtual int dialogCode() const { return rescode; } private: virtual void initHelper(QPlatformDialogHelper *) {} @@ -138,7 +105,7 @@ template <typename T> class QAutoPointer { QPointer<T> o; public: - explicit QAutoPointer(T *t) noexcept : o(t) {} + Q_NODISCARD_CTOR explicit QAutoPointer(T *t) noexcept : o(t) {} ~QAutoPointer() { delete o; } T *operator->() const noexcept { return get(); } diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp index ba57faa898..2b5681f79b 100644 --- a/src/widgets/dialogs/qerrormessage.cpp +++ b/src/widgets/dialogs/qerrormessage.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qerrormessage.h" @@ -62,17 +26,17 @@ QT_BEGIN_NAMESPACE -namespace { -struct Message { - QString content; - QString type; -}; -} +using namespace Qt::StringLiterals; class QErrorMessagePrivate : public QDialogPrivate { Q_DECLARE_PUBLIC(QErrorMessage) public: + struct Message { + QString content; + QString type; + }; + QPushButton * ok; QCheckBox * again; QTextEdit * errors; @@ -86,8 +50,46 @@ public: bool isMessageToBeShown(const QString &message, const QString &type) const; bool nextPending(); void retranslateStrings(); + + void setVisible(bool) override; + +private: + void initHelper(QPlatformDialogHelper *) override; + void helperPrepareShow(QPlatformDialogHelper *) override; }; + +void QErrorMessagePrivate::initHelper(QPlatformDialogHelper *helper) +{ + Q_Q(QErrorMessage); + auto *messageDialogHelper = static_cast<QPlatformMessageDialogHelper *>(helper); + QObject::connect(messageDialogHelper, &QPlatformMessageDialogHelper::checkBoxStateChanged, q, + [this](Qt::CheckState state) { + again->setCheckState(state); + } + ); + QObject::connect(messageDialogHelper, &QPlatformMessageDialogHelper::clicked, q, + [this](QPlatformDialogHelper::StandardButton, QPlatformDialogHelper::ButtonRole) { + Q_Q(QErrorMessage); + q->accept(); + } + ); +} + +void QErrorMessagePrivate::helperPrepareShow(QPlatformDialogHelper *helper) +{ + Q_Q(QErrorMessage); + auto *messageDialogHelper = static_cast<QPlatformMessageDialogHelper *>(helper); + QSharedPointer<QMessageDialogOptions> options = QMessageDialogOptions::create(); + options->setText(currentMessage); + options->setWindowTitle(q->windowTitle()); + options->setText(QErrorMessage::tr("An error occurred")); + options->setInformativeText(currentMessage); + options->setStandardIcon(QMessageDialogOptions::Critical); + options->setCheckBox(again->text(), again->checkState()); + messageDialogHelper->setOptions(options); +} + namespace { class QErrorMessageTextView : public QTextEdit { @@ -183,16 +185,28 @@ static QString msgType2i18nString(QtMsgType t) return QCoreApplication::translate("QErrorMessage", messages[t]); } -static void jump(QtMsgType t, const QMessageLogContext & /*context*/, const QString &m) +static QtMessageHandler originalMessageHandler = nullptr; + +static void jump(QtMsgType t, const QMessageLogContext &context, const QString &m) { + const auto forwardToOriginalHandler = qScopeGuard([&] { + if (originalMessageHandler) + originalMessageHandler(t, context, m); + }); + if (!qtMessageHandler) return; - QString rich = QLatin1String("<p><b>") + msgType2i18nString(t) + QLatin1String("</b></p>") + auto *defaultCategory = QLoggingCategory::defaultCategory(); + if (context.category && defaultCategory + && qstrcmp(context.category, defaultCategory->categoryName()) != 0) + return; + + QString rich = "<p><b>"_L1 + msgType2i18nString(t) + "</b></p>"_L1 + Qt::convertFromPlainText(m, Qt::WhiteSpaceNormal); // ### work around text engine quirk - if (rich.endsWith(QLatin1String("</p>"))) + if (rich.endsWith("</p>"_L1)) rich.chop(4); if (!metFatal) { @@ -212,6 +226,10 @@ static void jump(QtMsgType t, const QMessageLogContext & /*context*/, const QStr /*! Constructs and installs an error handler window with the given \a parent. + + The default \l{Qt::WindowModality} {window modality} of the dialog + depends on the platform. The window modality can be overridden via + setWindowModality() before calling showMessage(). */ QErrorMessage::QErrorMessage(QWidget * parent) @@ -219,6 +237,10 @@ QErrorMessage::QErrorMessage(QWidget * parent) { Q_D(QErrorMessage); +#if defined(Q_OS_MACOS) + setWindowModality(parent ? Qt::WindowModal : Qt::ApplicationModal); +#endif + d->icon = new QLabel(this); d->errors = new QErrorMessageTextView(this); d->again = new QCheckBox(this); @@ -235,7 +257,9 @@ QErrorMessage::QErrorMessage(QWidget * parent) grid->setRowStretch(0, 42); #if QT_CONFIG(messagebox) - d->icon->setPixmap(QMessageBox::standardIcon(QMessageBox::Information)); + const auto iconSize = style()->pixelMetric(QStyle::PM_MessageBoxIconSize, nullptr, this); + const auto icon = style()->standardIcon(QStyle::SP_MessageBoxInformation, nullptr, this); + d->icon->setPixmap(icon.pixmap(QSize(iconSize, iconSize), devicePixelRatio())); d->icon->setAlignment(Qt::AlignHCenter | Qt::AlignTop); #endif d->again->setChecked(true); @@ -253,10 +277,12 @@ QErrorMessage::~QErrorMessage() { if (this == qtMessageHandler) { qtMessageHandler = nullptr; - QtMessageHandler tmp = qInstallMessageHandler(nullptr); - // in case someone else has later stuck in another... - if (tmp != jump) - qInstallMessageHandler(tmp); + QtMessageHandler currentMessagHandler = qInstallMessageHandler(nullptr); + if (currentMessagHandler != jump) + qInstallMessageHandler(currentMessagHandler); + else + qInstallMessageHandler(originalMessageHandler); + originalMessageHandler = nullptr; } } @@ -276,8 +302,12 @@ void QErrorMessage::done(int a) } d->currentMessage.clear(); d->currentType.clear(); - if (!d->nextPending()) { - QDialog::done(a); + + QDialog::done(a); + + if (d->nextPending()) { + show(); + } else { if (this == qtMessageHandler && metFatal) exit(1); } @@ -288,6 +318,12 @@ void QErrorMessage::done(int a) Returns a pointer to a QErrorMessage object that outputs the default Qt messages. This function creates such an object, if there isn't one already. + + The object will only output log messages of QLoggingCategory::defaultCategory(). + + The object will forward all messages to the original message handler. + + \sa qInstallMessageHandler */ QErrorMessage * QErrorMessage::qtHandler() @@ -296,7 +332,7 @@ QErrorMessage * QErrorMessage::qtHandler() qtMessageHandler = new QErrorMessage(nullptr); qAddPostRoutine(deleteStaticcQErrorMessage); // clean up qtMessageHandler->setWindowTitle(QCoreApplication::applicationName()); - qInstallMessageHandler(jump); + originalMessageHandler = qInstallMessageHandler(jump); } return qtMessageHandler; } @@ -324,6 +360,7 @@ bool QErrorMessagePrivate::nextPending() #endif currentMessage = std::move(message); currentType = std::move(type); + again->setChecked(true); return true; } } @@ -369,6 +406,21 @@ void QErrorMessage::showMessage(const QString &message, const QString &type) show(); } +void QErrorMessagePrivate::setVisible(bool visible) +{ + Q_Q(QErrorMessage); + + if (canBeNativeDialog()) + setNativeDialogVisible(visible); + + // Update WA_DontShowOnScreen based on whether the native dialog was shown, + // so that QDialog::setVisible(visible) below updates the QWidget state correctly, + // but skips showing the non-native version. + q->setAttribute(Qt::WA_DontShowOnScreen, nativeDialogInUse); + + QDialogPrivate::setVisible(visible); +} + /*! \reimp */ diff --git a/src/widgets/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h index 220694e54e..55f0ac058e 100644 --- a/src/widgets/dialogs/qerrormessage.h +++ b/src/widgets/dialogs/qerrormessage.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QERRORMESSAGE_H #define QERRORMESSAGE_H diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 935cfeb409..22e6d44e6f 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #define QT_NO_URL_CAST_FROM_STRING @@ -88,18 +52,23 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + Q_GLOBAL_STATIC(QUrl, lastVisitedDir) /*! \class QFileDialog - \brief The QFileDialog class provides a dialog that allow users to select files or directories. + \brief The QFileDialog class provides a dialog that allows users to select files or directories. \ingroup standard-dialogs \inmodule QtWidgets - The QFileDialog class enables a user to traverse the file system in - order to select one or many files or a directory. + The QFileDialog class enables a user to traverse the file system + to select one or many files or a directory. + + \image qtquickdialogs-filedialog-gtk.png - The easiest way to create a QFileDialog is to use the static functions. + The easiest way to create a QFileDialog is to use the static functions, + such as \l getOpenFileName(). \snippet code/src_gui_dialogs_qfiledialog.cpp 0 @@ -124,7 +93,7 @@ Q_GLOBAL_STATIC(QUrl, lastVisitedDir) AnyFile, meaning that the user can select any file, or even specify a file that doesn't exist. This mode is useful for creating a "Save As" file dialog. Use ExistingFile if the user must select an - existing file, or \l Directory if only a directory may be selected. + existing file, or \l Directory if only a directory can be selected. See the \l QFileDialog::FileMode enum for the complete list of modes. The fileMode property contains the mode of operation for the dialog; @@ -133,9 +102,9 @@ Q_GLOBAL_STATIC(QUrl, lastVisitedDir) \snippet code/src_gui_dialogs_qfiledialog.cpp 3 - In the above example, the filter is set to \c{"Images (*.png *.xpm *.jpg)"}, - this means that only files with the extension \c png, \c xpm, - or \c jpg will be shown in the QFileDialog. You can apply + In the above example, the filter is set to \c{"Images (*.png *.xpm *.jpg)"}. + This means that only files with the extension \c png, \c xpm, + or \c jpg are shown in the QFileDialog. You can apply several filters by using setNameFilters(). Use selectNameFilter() to select one of the filters you've given as the file dialog's default filter. @@ -149,7 +118,7 @@ Q_GLOBAL_STATIC(QUrl, lastVisitedDir) \snippet code/src_gui_dialogs_qfiledialog.cpp 4 - The last important function you will need to use when creating your + The last important function you need to use when creating your own file dialog is selectedFiles(). \snippet code/src_gui_dialogs_qfiledialog.cpp 5 @@ -164,15 +133,16 @@ Q_GLOBAL_STATIC(QUrl, lastVisitedDir) The \l{dialogs/standarddialogs}{Standard Dialogs} example shows how to use QFileDialog as well as other built-in Qt dialogs. - By default, a platform-native file dialog will be used if the platform has - one. In that case, the widgets which would otherwise be used to construct the - dialog will not be instantiated, so related accessors such as layout() and - itemDelegate() will return null. You can set the \l DontUseNativeDialog option to - ensure that the widget-based implementation will be used instead of the - native dialog. + By default, a platform-native file dialog is used if the platform has + one. In that case, the widgets that would otherwise be used to construct the + dialog are not instantiated, so related accessors such as layout() and + itemDelegate() return null. Also, not all platforms show file dialogs + with a title bar, so be aware that the caption text might not be visible to + the user. You can set the \l DontUseNativeDialog option or set the + \l{Qt::AA_DontUseNativeDialogs}{AA_DontUseNativeDialogs} application attribute + to ensure that the widget-based implementation is used instead of the native dialog. - \sa QDir, QFileInfo, QFile, QColorDialog, QFontDialog, {Standard Dialogs Example}, - {Qt Widgets - Application Example} + \sa QDir, QFileInfo, QFile, QColorDialog, QFontDialog, {Standard Dialogs Example} */ /*! @@ -185,8 +155,8 @@ Q_GLOBAL_STATIC(QUrl, lastVisitedDir) /*! \enum QFileDialog::ViewMode - This enum describes the view mode of the file dialog; i.e. what - information about each file will be displayed. + This enum describes the view mode of the file dialog; that is, what + information about each file is displayed. \value Detail Displays an icon, a name, and details for each item in the directory. @@ -200,7 +170,7 @@ Q_GLOBAL_STATIC(QUrl, lastVisitedDir) \enum QFileDialog::FileMode This enum is used to indicate what the user may select in the file - dialog; i.e. what the dialog will return if the user clicks OK. + dialog; that is, what the dialog returns if the user clicks OK. \value AnyFile The name of a file, whether it exists or not. \value ExistingFile The name of a single existing file. @@ -216,37 +186,43 @@ Q_GLOBAL_STATIC(QUrl, lastVisitedDir) /*! \enum QFileDialog::Option - \value ShowDirsOnly Only show directories in the file dialog. By - default both files and directories are shown. (Valid only in the - \l Directory file mode.) + Options that influence the behavior of the dialog. - \value DontResolveSymlinks Don't resolve symlinks in the file - dialog. By default symlinks are resolved. - - \value DontConfirmOverwrite Don't ask for confirmation if an - existing file is selected. By default confirmation is requested. + \value ShowDirsOnly Only show directories. By + default, both files and directories are shown.\br + This option is only effective in the \l Directory file mode. - Note: This opption is not supported on macOS when using the - native file dialog. + \value DontResolveSymlinks Don't resolve symlinks. + By default, symlinks are resolved. - \value DontUseNativeDialog Don't use the native file dialog. By - default, the native file dialog is used unless you use a subclass - of QFileDialog that contains the Q_OBJECT macro, or the platform - does not have a native dialog of the type that you require. + \value DontConfirmOverwrite Don't ask for confirmation if an + existing file is selected. By default, confirmation is requested.\br + This option is only effective if \l acceptMode is \l {QFileDialog::}{AcceptSave}). + It is furthermore not used on macOS for native file dialogs. - \b{Note:} This option must be set before changing dialog properties - or showing the dialog. + \value DontUseNativeDialog Don't use a platform-native file dialog, + but the widget-based one provided by Qt.\br + By default, a native file dialog is shown unless you use a subclass + of QFileDialog that contains the Q_OBJECT macro, the global + \l{Qt::}{AA_DontUseNativeDialogs} application attribute is set, or the platform + does not have a native dialog of the type that you require.\br + For the option to be effective, you must set it before changing + other properties of the dialog, or showing the dialog. - \value ReadOnly Indicates that the model is readonly. + \value ReadOnly Indicates that the model is read-only. \value HideNameFilterDetails Indicates if the file name filter details are hidden or not. - \value DontUseCustomDirectoryIcons Always use the default directory icon. - Some platforms allow the user to set a different icon. Custom icon lookup - cause a big performance impact over network or removable drives. - Setting this will enable the QFileIconProvider::DontUseCustomDirectoryIcons - option in the icon provider. This enum value was added in Qt 5.2. + \value DontUseCustomDirectoryIcons Always use the default directory icon.\br + Some platforms allow the user to set a different icon, but custom icon lookup + might cause significant performance issues over network or removable drives.\br + Setting this will enable the + \l{QAbstractFileIconProvider::}{DontUseCustomDirectoryIcons} + option in \l{iconProvider()}.\br + This enum value was added in Qt 5.2. + + \sa options, testOption */ /*! @@ -413,7 +389,7 @@ QFileDialog::~QFileDialog() \snippet filedialogurls/filedialogurls.cpp 0 - The file dialog will then look like this: + Then the file dialog looks like this: \image filedialogurls.png @@ -451,6 +427,7 @@ QByteArray QFileDialog::saveState() const int version = 4; QByteArray data; QDataStream stream(&data, QIODevice::WriteOnly); + stream.setVersion(QDataStream::Qt_5_0); stream << qint32(QFileDialogMagic); stream << qint32(version); @@ -485,6 +462,7 @@ bool QFileDialog::restoreState(const QByteArray &state) Q_D(QFileDialog); QByteArray sd = state; QDataStream stream(&sd, QIODevice::ReadOnly); + stream.setVersion(QDataStream::Qt_5_0); if (stream.atEnd()) return false; QStringList history; @@ -555,14 +533,19 @@ QFileDialogPrivate::~QFileDialogPrivate() void QFileDialogPrivate::initHelper(QPlatformDialogHelper *h) { - QFileDialog *d = q_func(); - QObject::connect(h, SIGNAL(fileSelected(QUrl)), d, SLOT(_q_emitUrlSelected(QUrl))); - QObject::connect(h, SIGNAL(filesSelected(QList<QUrl>)), d, SLOT(_q_emitUrlsSelected(QList<QUrl>))); - QObject::connect(h, SIGNAL(currentChanged(QUrl)), d, SLOT(_q_nativeCurrentChanged(QUrl))); - QObject::connect(h, SIGNAL(directoryEntered(QUrl)), d, SLOT(_q_nativeEnterDirectory(QUrl))); - QObject::connect(h, SIGNAL(filterSelected(QString)), d, SIGNAL(filterSelected(QString))); - static_cast<QPlatformFileDialogHelper *>(h)->setOptions(options); - nativeDialogInUse = true; + Q_Q(QFileDialog); + auto *fileDialogHelper = static_cast<QPlatformFileDialogHelper *>(h); + QObjectPrivate::connect(fileDialogHelper, &QPlatformFileDialogHelper::fileSelected, + this, &QFileDialogPrivate::emitUrlSelected); + QObjectPrivate::connect(fileDialogHelper, &QPlatformFileDialogHelper::filesSelected, + this, &QFileDialogPrivate::emitUrlsSelected); + QObjectPrivate::connect(fileDialogHelper, &QPlatformFileDialogHelper::currentChanged, + this, &QFileDialogPrivate::nativeCurrentChanged); + QObjectPrivate::connect(fileDialogHelper, &QPlatformFileDialogHelper::directoryEntered, + this, &QFileDialogPrivate::nativeEnterDirectory); + QObject::connect(fileDialogHelper, &QPlatformFileDialogHelper::filterSelected, + q, &QFileDialog::filterSelected); + fileDialogHelper->setOptions(options); } void QFileDialogPrivate::helperPrepareShow(QPlatformDialogHelper *) @@ -683,7 +666,7 @@ void QFileDialogPrivate::retranslateStrings() if (proxyModel) abstractModel = proxyModel; #endif - int total = qMin(abstractModel->columnCount(QModelIndex()), actions.count() + 1); + const int total = qMin(abstractModel->columnCount(QModelIndex()), int(actions.size() + 1)); for (int i = 1; i < total; ++i) { actions.at(i - 1)->setText(QFileDialog::tr("Show ") + abstractModel->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString()); } @@ -704,7 +687,7 @@ void QFileDialogPrivate::emitFilesSelected(const QStringList &files) { Q_Q(QFileDialog); emit q->filesSelected(files); - if (files.count() == 1) + if (files.size() == 1) emit q->fileSelected(files.first()); } @@ -721,9 +704,7 @@ bool QFileDialogPrivate::canBeNativeDialog() const return false; } - QLatin1String staticName(QFileDialog::staticMetaObject.className()); - QLatin1String dynamicName(q->metaObject()->className()); - return (staticName == dynamicName); + return strcmp(QFileDialog::staticMetaObject.className(), q->metaObject()->className()) == 0; } bool QFileDialogPrivate::usingWidgets() const @@ -736,7 +717,7 @@ bool QFileDialogPrivate::usingWidgets() const Sets the given \a option to be enabled if \a on is true; otherwise, clears the given \a option. - Options (particularly the DontUseNativeDialogs option) should be set + Options (particularly the \l DontUseNativeDialog option) should be set before changing dialog properties or showing the dialog. Setting options while the dialog is visible is not guaranteed to have @@ -771,12 +752,12 @@ bool QFileDialog::testOption(Option option) const /*! \property QFileDialog::options - \brief the various options that affect the look and feel of the dialog + \brief The various options that affect the look and feel of the dialog. \since 4.5 By default, all options are disabled. - Options (particularly the DontUseNativeDialogs option) should be set + Options (particularly the \l DontUseNativeDialog option) should be set before changing dialog properties or showing the dialog. Setting options while the dialog is visible is not guaranteed to have @@ -798,8 +779,10 @@ void QFileDialog::setOptions(Options options) d->options->setOptions(QFileDialogOptions::FileDialogOptions(int(options))); - if ((options & DontUseNativeDialog) && !d->usingWidgets()) + if (options & DontUseNativeDialog) { + d->nativeDialogInUse = false; d->createWidgets(); + } if (d->usingWidgets()) { if (changed & DontResolveSymlinks) @@ -843,11 +826,11 @@ QFileDialog::Options QFileDialog::options() const /*! \since 4.5 - This function connects one of its signals to the slot specified by \a receiver - and \a member. The specific signal depends is filesSelected() if fileMode is - ExistingFiles and fileSelected() if fileMode is anything else. + This function shows the dialog, and connects the slot specified by \a receiver + and \a member to the signal that informs about selection changes. If the fileMode is + ExistingFiles, this is the filesSelected() signal, otherwise it is the fileSelected() signal. - The signal will be disconnected from the slot when the dialog is closed. + The signal is disconnected from the slot when the dialog is closed. */ void QFileDialog::open(QObject *receiver, const char *member) { @@ -868,54 +851,61 @@ void QFileDialog::open(QObject *receiver, const char *member) */ void QFileDialog::setVisible(bool visible) { - Q_D(QFileDialog); - if (visible){ - if (testAttribute(Qt::WA_WState_ExplicitShowHide) && !testAttribute(Qt::WA_WState_Hidden)) - return; - } else if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden)) - return; + // will call QFileDialogPrivate::setVisible override + QDialog::setVisible(visible); +} - if (d->canBeNativeDialog()){ - if (d->setNativeDialogVisible(visible)){ - // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below +/*! + \internal + + The logic has to live here so that the call to hide() in ~QDialog calls + this function; it wouldn't call an override of QDialog::setVisible(). +*/ +void QFileDialogPrivate::setVisible(bool visible) +{ + Q_Q(QFileDialog); + + if (canBeNativeDialog()){ + if (setNativeDialogVisible(visible)){ + // Set WA_DontShowOnScreen so that QDialogPrivate::setVisible(visible) below // updates the state correctly, but skips showing the non-native version: - setAttribute(Qt::WA_DontShowOnScreen); + q->setAttribute(Qt::WA_DontShowOnScreen); #if QT_CONFIG(fscompleter) // So the completer doesn't try to complete and therefore show a popup - if (!d->nativeDialogInUse) - d->completer->setModel(nullptr); + if (!nativeDialogInUse) + completer->setModel(nullptr); #endif } else { - d->createWidgets(); - setAttribute(Qt::WA_DontShowOnScreen, false); + createWidgets(); + q->setAttribute(Qt::WA_DontShowOnScreen, false); #if QT_CONFIG(fscompleter) - if (!d->nativeDialogInUse) { - if (d->proxyModel != nullptr) - d->completer->setModel(d->proxyModel); + if (!nativeDialogInUse) { + if (proxyModel != nullptr) + completer->setModel(proxyModel); else - d->completer->setModel(d->model); + completer->setModel(model); } #endif } } - if (visible && d->usingWidgets()) - d->qFileDialogUi->fileNameEdit->setFocus(); + if (visible && usingWidgets()) + qFileDialogUi->fileNameEdit->setFocus(); - QDialog::setVisible(visible); + QDialogPrivate::setVisible(visible); } /*! \internal set the directory to url */ -void QFileDialogPrivate::_q_goToUrl(const QUrl &url) +void QFileDialogPrivate::goToUrl(const QUrl &url) { //The shortcut in the side bar may have a parent that is not fetched yet (e.g. an hidden file) //so we force the fetching QFileSystemModelPrivate::QFileSystemNode *node = model->d_func()->node(url.toLocalFile(), true); QModelIndex idx = model->d_func()->index(node); - _q_enterDirectory(idx); + enterDirectory(idx); } /*! @@ -929,7 +919,7 @@ void QFileDialogPrivate::_q_goToUrl(const QUrl &url) \note On iOS, if you set \a directory to \l{QStandardPaths::standardLocations()} {QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).last()}, - a native image picker dialog will be used for accessing the user's photo album. + a native image picker dialog is used for accessing the user's photo album. The filename returned can be loaded using QFile and related APIs. For this to be enabled, the Info.plist assigned to QMAKE_INFO_PLIST in the project file must contain the key \c NSPhotoLibraryUsageDescription. See @@ -962,10 +952,10 @@ void QFileDialog::setDirectory(const QString &directory) d->qFileDialogUi->newFolderButton->setEnabled(d->model->flags(root) & Qt::ItemIsDropEnabled); if (root != d->rootIndex()) { #if QT_CONFIG(fscompleter) - if (directory.endsWith(QLatin1Char('/'))) + if (directory.endsWith(u'/')) d->completer->setCompletionPrefix(newDirectory); else - d->completer->setCompletionPrefix(newDirectory + QLatin1Char('/')); + d->completer->setCompletionPrefix(newDirectory + u'/'); #endif d->setRootIndex(root); } @@ -1064,7 +1054,7 @@ static inline QString fileFromPath(const QString &rootPath, QString path) if (path.at(0) == QDir::separator() #ifdef Q_OS_WIN //On Windows both cases can happen - || path.at(0) == QLatin1Char('/') + || path.at(0) == u'/' #endif ) { path.remove(0, 1); @@ -1088,8 +1078,8 @@ void QFileDialog::selectFile(const QString &filename) if (QFileInfo(filename).isRelative()) { url = d->options->initialDirectory(); QString path = url.path(); - if (!path.endsWith(QLatin1Char('/'))) - path += QLatin1Char('/'); + if (!path.endsWith(u'/')) + path += u'/'; url.setPath(path + filename); } else { url = QUrl::fromLocalFile(filename); @@ -1136,43 +1126,58 @@ void QFileDialog::selectUrl(const QUrl &url) } #ifdef Q_OS_UNIX +static QString homeDirFromPasswdEntry(const QString &path, const QByteArray &userName) +{ +#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM) + passwd pw; + passwd *tmpPw; + long bufSize = ::sysconf(_SC_GETPW_R_SIZE_MAX); + if (bufSize == -1) + bufSize = 1024; + QVarLengthArray<char, 1024> buf(bufSize); + int err = 0; +# if defined(Q_OS_SOLARIS) && (_POSIX_C_SOURCE - 0 < 199506L) + tmpPw = getpwnam_r(userName.constData(), &pw, buf.data(), buf.size()); +# else + err = getpwnam_r(userName.constData(), &pw, buf.data(), buf.size(), &tmpPw); +# endif + if (err || !tmpPw) + return path; + return QFile::decodeName(pw.pw_dir); +#else + passwd *pw = getpwnam(userName.constData()); + if (!pw) + return path; + return QFile::decodeName(pw->pw_dir); +#endif // defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM) +} + Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path) { - if (!path.startsWith(QLatin1Char('~'))) + if (!path.startsWith(u'~')) return path; - int separatorPosition = path.indexOf(QDir::separator()); - if (separatorPosition < 0) - separatorPosition = path.size(); - if (separatorPosition == 1) { - return QDir::homePath() + QStringView{path}.mid(1); - } else { + + if (path.size() == 1) // '~' + return QDir::homePath(); + + QStringView sv(path); + const qsizetype sepIndex = sv.indexOf(QDir::separator()); + if (sepIndex == 1) // '~/' or '~/a/b/c' + return QDir::homePath() + sv.sliced(1); + #if defined(Q_OS_VXWORKS) || defined(Q_OS_INTEGRITY) - const QString homePath = QDir::homePath(); + if (sepIndex == -1) + return QDir::homePath(); + return QDir::homePath() + sv.sliced(sepIndex); #else - const QByteArray userName = QStringView{path}.mid(1, separatorPosition - 1).toLocal8Bit(); -# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM) - passwd pw; - passwd *tmpPw; - char buf[200]; - const int bufSize = sizeof(buf); - int err = 0; -# if defined(Q_OS_SOLARIS) && (_POSIX_C_SOURCE - 0 < 199506L) - tmpPw = getpwnam_r(userName.constData(), &pw, buf, bufSize); -# else - err = getpwnam_r(userName.constData(), &pw, buf, bufSize, &tmpPw); -# endif - if (err || !tmpPw) - return path; - const QString homePath = QString::fromLocal8Bit(pw.pw_dir); -# else - passwd *pw = getpwnam(userName.constData()); - if (!pw) - return path; - const QString homePath = QString::fromLocal8Bit(pw->pw_dir); -# endif -#endif - return homePath + QStringView{path}.mid(separatorPosition); - } + const qsizetype userNameLen = sepIndex != -1 ? sepIndex - strlen("~") // '~user/a/b' + : path.size() - strlen("~"); // '~user' + const QByteArray userName = sv.sliced(1, userNameLen).toLocal8Bit(); + QString homePath = homeDirFromPasswdEntry(path, userName); + if (sepIndex == -1) + return homePath; + return homePath + sv.sliced(sepIndex); +#endif // defined(Q_OS_VXWORKS) || defined(Q_OS_INTEGRITY) } #endif @@ -1184,7 +1189,7 @@ QStringList QFileDialogPrivate::typedFiles() const Q_Q(const QFileDialog); QStringList files; QString editText = lineEdit()->text(); - if (!editText.contains(QLatin1Char('"'))) { + if (!editText.contains(u'"')) { #ifdef Q_OS_UNIX const QString prefix = q->directory().absolutePath() + QDir::separator(); if (QFile::exists(prefix + editText)) @@ -1198,7 +1203,7 @@ QStringList QFileDialogPrivate::typedFiles() const } else { // " is used to separate files like so: "file1" "file2" "file3" ... // ### need escape character for filenames with quotes (") - QStringList tokens = editText.split(QLatin1Char('\"')); + QStringList tokens = editText.split(u'\"'); for (int i=0; i<tokens.size(); ++i) { if ((i % 2) == 0) continue; // Every even token is a separator @@ -1250,8 +1255,9 @@ QStringList QFileDialogPrivate::addDefaultSuffixToFiles(const QStringList &files QFileInfo info(name); // if the filename has no suffix, add the default suffix const QString defaultSuffix = options->defaultSuffix(); - if (!defaultSuffix.isEmpty() && !info.isDir() && name.lastIndexOf(QLatin1Char('.')) == -1) - name += QLatin1Char('.') + defaultSuffix; + if (!defaultSuffix.isEmpty() && !info.isDir() && !info.fileName().contains(u'.')) + name += u'.' + defaultSuffix; + if (info.isAbsolute()) { files.append(name); } else { @@ -1259,8 +1265,8 @@ QStringList QFileDialogPrivate::addDefaultSuffixToFiles(const QStringList &files // This check is needed since we might be at the root directory // and on Windows it already ends with slash. QString path = rootPath(); - if (!path.endsWith(QLatin1Char('/'))) - path += QLatin1Char('/'); + if (!path.endsWith(u'/')) + path += u'/'; path += name; files.append(path); } @@ -1271,14 +1277,16 @@ QStringList QFileDialogPrivate::addDefaultSuffixToFiles(const QStringList &files QList<QUrl> QFileDialogPrivate::addDefaultSuffixToUrls(const QList<QUrl> &urlsToFix) const { QList<QUrl> urls; - const int numUrlsToFix = urlsToFix.size(); - urls.reserve(numUrlsToFix); - for (int i = 0; i < numUrlsToFix; ++i) { - QUrl url = urlsToFix.at(i); - // if the filename has no suffix, add the default suffix - const QString defaultSuffix = options->defaultSuffix(); - if (!defaultSuffix.isEmpty() && !url.path().endsWith(QLatin1Char('/')) && url.path().lastIndexOf(QLatin1Char('.')) == -1) - url.setPath(url.path() + QLatin1Char('.') + defaultSuffix); + urls.reserve(urlsToFix.size()); + // if the filename has no suffix, add the default suffix + const QString defaultSuffix = options->defaultSuffix(); + for (QUrl url : urlsToFix) { + if (!defaultSuffix.isEmpty()) { + const QString urlPath = url.path(); + const auto idx = urlPath.lastIndexOf(u'/'); + if (idx != (urlPath.size() - 1) && !QStringView{urlPath}.mid(idx + 1).contains(u'.')) + url.setPath(urlPath + u'.' + defaultSuffix); + } urls.append(url); } return urls; @@ -1299,12 +1307,9 @@ QStringList QFileDialog::selectedFiles() const QStringList files; const QList<QUrl> userSelectedFiles = d->userSelectedFiles(); files.reserve(userSelectedFiles.size()); - for (const QUrl &file : userSelectedFiles) { - if (file.isLocalFile() || file.isEmpty()) - files.append(file.toLocalFile()); - else - files.append(file.toString()); - } + for (const QUrl &file : userSelectedFiles) + files.append(file.toString(QUrl::PreferLocalFile)); + if (files.isEmpty() && d->usingWidgets()) { const FileMode fm = fileMode(); if (fm != ExistingFile && fm != ExistingFiles) @@ -1345,9 +1350,9 @@ QStringList qt_make_filter_list(const QString &filter) if (filter.isEmpty()) return QStringList(); - QString sep(QLatin1String(";;")); - if (!filter.contains(sep) && filter.contains(QLatin1Char('\n'))) - sep = QLatin1Char('\n'); + auto sep = ";;"_L1; + if (!filter.contains(sep) && filter.contains(u'\n')) + sep = "\n"_L1; return filter.split(sep); } @@ -1383,11 +1388,10 @@ QStringList qt_strip_filters(const QStringList &filters) #if QT_CONFIG(regularexpression) QStringList strippedFilters; static const QRegularExpression r(QString::fromLatin1(QPlatformFileDialogHelper::filterRegExp)); - const int numFilters = filters.count(); - strippedFilters.reserve(numFilters); - for (int i = 0; i < numFilters; ++i) { + strippedFilters.reserve(filters.size()); + for (const QString &filter : filters) { QString filterName; - auto match = r.match(filters[i]); + auto match = r.match(filter); if (match.hasMatch()) filterName = match.captured(1); strippedFilters.append(filterName.simplified()); @@ -1408,25 +1412,24 @@ QStringList qt_strip_filters(const QStringList &filters) assumption that the file extension determines the file type is not consistent on every operating system. It is possible to have a file with no dot in its name (for example, \c Makefile). In a native Windows file - dialog, \b{*.*} will match such files, while in other types of file dialogs - it may not. So it is better to use \b{*} if you mean to select any file. + dialog, \b{*.*} matches such files, while in other types of file dialogs + it might not match. So, it's better to use \b{*} if you mean to select any file. \snippet code/src_gui_dialogs_qfiledialog.cpp 7 \l setMimeTypeFilters() has the advantage of providing all possible name filters for each file type. For example, JPEG images have three possible extensions; if your application can open such files, selecting the - \c image/jpeg mime type as a filter will allow you to open all of them. + \c image/jpeg mime type as a filter allows you to open all of them. */ void QFileDialog::setNameFilters(const QStringList &filters) { Q_D(QFileDialog); QStringList cleanedFilters; - const int numFilters = filters.count(); - cleanedFilters.reserve(numFilters); - for (int i = 0; i < numFilters; ++i) { - cleanedFilters << filters[i].simplified(); - } + cleanedFilters.reserve(filters.size()); + for (const QString &filter : filters) + cleanedFilters << filter.simplified(); + d->options->setNameFilters(cleanedFilters); if (!d->usingWidgets()) @@ -1441,7 +1444,7 @@ void QFileDialog::setNameFilters(const QStringList &filters) else d->qFileDialogUi->fileTypeCombo->addItems(cleanedFilters); - d->_q_useNameFilter(0); + d->useNameFilter(0); } /*! @@ -1481,7 +1484,7 @@ void QFileDialog::selectNameFilter(const QString &filter) } if (i >= 0) { d->qFileDialogUi->fileTypeCombo->setCurrentIndex(i); - d->_q_useNameFilter(d->qFileDialogUi->fileTypeCombo->currentIndex()); + d->useNameFilter(d->qFileDialogUi->fileTypeCombo->currentIndex()); } } @@ -1548,8 +1551,8 @@ static QString nameFilterForMime(const QString &mimeType) if (mime.isDefault()) { return QFileDialog::tr("All files (*)"); } else { - const QString patterns = mime.globPatterns().join(QLatin1Char(' ')); - return mime.comment() + QLatin1String(" (") + patterns + QLatin1Char(')'); + const QString patterns = mime.globPatterns().join(u' '); + return mime.comment() + " ("_L1 + patterns + u')'; } } return QString(); @@ -1639,7 +1642,7 @@ QString QFileDialog::selectedMimeTypeFilter() const for (const auto &mimeType: mimeTypes) { QString filter = nameFilterForMime(mimeType); if (testOption(HideNameFilterDetails)) - filter = qt_strip_filters({ filter }).first(); + filter = qt_strip_filters({ filter }).constFirst(); if (filter == nameFilter) { mimeTypeFilter = mimeType; break; @@ -1653,7 +1656,7 @@ QString QFileDialog::selectedMimeTypeFilter() const /*! \property QFileDialog::viewMode - \brief the way files and directories are displayed in the dialog + \brief The way files and directories are displayed in the dialog. By default, the \c Detail mode is used to display information about files and directories. @@ -1667,9 +1670,9 @@ void QFileDialog::setViewMode(QFileDialog::ViewMode mode) if (!d->usingWidgets()) return; if (mode == Detail) - d->_q_showDetailsView(); + d->showDetailsView(); else - d->_q_showListView(); + d->showListView(); } QFileDialog::ViewMode QFileDialog::viewMode() const @@ -1682,14 +1685,14 @@ QFileDialog::ViewMode QFileDialog::viewMode() const /*! \property QFileDialog::fileMode - \brief the file mode of the dialog + \brief The file mode of the dialog. The file mode defines the number and type of items that the user is expected to select in the dialog. By default, this property is set to AnyFile. - This function will set the labels for the FileName and + This function sets the labels for the FileName and \l{QFileDialog::}{Accept} \l{DialogLabel}s. It is possible to set custom text after the call to setFileMode(). @@ -1723,7 +1726,7 @@ void QFileDialog::setFileMode(QFileDialog::FileMode mode) d->updateFileNameLabel(); d->updateOkButtonText(); d->qFileDialogUi->fileTypeCombo->setEnabled(!testOption(ShowDirsOnly)); - d->_q_updateOkButton(); + d->updateOkButton(); } QFileDialog::FileMode QFileDialog::fileMode() const @@ -1734,7 +1737,7 @@ QFileDialog::FileMode QFileDialog::fileMode() const /*! \property QFileDialog::acceptMode - \brief the accept mode of the dialog + \brief The accept mode of the dialog. The action mode defines whether the dialog is for opening or saving files. @@ -1753,7 +1756,7 @@ void QFileDialog::setAcceptMode(QFileDialog::AcceptMode mode) QDialogButtonBox::StandardButton button = (mode == AcceptOpen ? QDialogButtonBox::Open : QDialogButtonBox::Save); d->qFileDialogUi->buttonBox->setStandardButtons(button | QDialogButtonBox::Cancel); d->qFileDialogUi->buttonBox->button(button)->setEnabled(false); - d->_q_updateOkButton(); + d->updateOkButton(); if (mode == AcceptSave) { d->qFileDialogUi->lookInCombo->setEditable(false); } @@ -1762,14 +1765,14 @@ void QFileDialog::setAcceptMode(QFileDialog::AcceptMode mode) /*! \property QFileDialog::supportedSchemes - \brief the URL schemes that the file dialog should allow navigating to. + \brief The URL schemes that the file dialog should allow navigating to. \since 5.6 Setting this property allows to restrict the type of URLs the - user will be able to select. It is a way for the application to declare - the protocols it will support to fetch the file content. An empty list + user can select. It is a way for the application to declare + the protocols it supports to fetch the file content. An empty list means that no restriction is applied (the default). - Supported for local files ("file" scheme) is implicit and always enabled; + Support for local files ("file" scheme) is implicit and always enabled; it is not necessary to include it in the restriction. */ @@ -1804,7 +1807,7 @@ QLineEdit *QFileDialogPrivate::lineEdit() const { return (QLineEdit*)qFileDialogUi->fileNameEdit; } -int QFileDialogPrivate::maxNameLength(const QString &path) +long QFileDialogPrivate::maxNameLength(const QString &path) { #if defined(Q_OS_UNIX) return ::pathconf(QFile::encodeName(path).data(), _PC_NAME_MAX); @@ -1851,10 +1854,10 @@ QFileDialog::AcceptMode QFileDialog::acceptMode() const /*! \property QFileDialog::defaultSuffix - \brief suffix added to the filename if no other suffix was specified + \brief Suffix added to the filename if no other suffix was specified. - This property specifies a string that will be added to the - filename if it has no suffix already. The suffix is typically + This property specifies a string that is added to the + filename if it has no suffix yet. The suffix is typically used to indicate the file type (e.g. "txt" indicates a text file). @@ -1892,7 +1895,7 @@ void QFileDialogComboBox::setHistory(const QStringList &paths) //On windows the popup display the "C:\", convert to nativeSeparators const QUrl url = idx.isValid() ? QUrl::fromLocalFile(QDir::toNativeSeparators(idx.data(QFileSystemModel::FilePathRole).toString())) - : QUrl(QLatin1String("file:")); + : QUrl("file:"_L1); if (url.isValid()) list.append(url); urlModel->setUrls(list); @@ -2057,40 +2060,41 @@ QString QFileDialog::labelText(DialogLabel label) const \snippet code/src_gui_dialogs_qfiledialog.cpp 8 The function creates a modal file dialog with the given \a parent widget. - If \a parent is not \nullptr, the dialog will be shown centered over the + If \a parent is not \nullptr, the dialog is shown centered over the parent widget. - The file dialog's working directory will be set to \a dir. If \a dir - includes a file name, the file will be selected. Only files that match the - given \a filter are shown. The filter selected is set to \a selectedFilter. + The file dialog's working directory is set to \a dir. If \a dir + includes a file name, the file is selected. Only files that match the + given \a filter are shown. The selected filter is set to \a selectedFilter. The parameters \a dir, \a selectedFilter, and \a filter may be empty strings. If you want multiple filters, separate them with ';;', for example: \snippet code/src_gui_dialogs_qfiledialog.cpp 14 - The \a options argument holds various options about how to run the dialog, - see the QFileDialog::Option enum for more information on the flags you can + The \a options argument holds various options about how to run the dialog. + See the QFileDialog::Option enum for more information on the flags you can pass. - The dialog's caption is set to \a caption. If \a caption is not specified + The dialog's caption is set to \a caption. If \a caption is not specified, then a default caption will be used. - On Windows, and \macos, this static function will use the - native file dialog and not a QFileDialog. + On Windows, and \macos, this static function uses the + native file dialog and not a QFileDialog. Note that the \macos native file + dialog does not show a title bar. - On Windows the dialog will spin a blocking modal event loop that will not - dispatch any QTimers, and if \a parent is not \nullptr then it will position + On Windows the dialog spins a blocking modal event loop that does not + dispatch any QTimers, and if \a parent is not \nullptr then it positions the dialog just below the parent's title bar. On Unix/X11, the normal behavior of the file dialog is to resolve and follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp}, - the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If - \a options includes DontResolveSymlinks, the file dialog will treat + the file dialog changes to \c{/var/tmp} after entering \c{/usr/tmp}. If + \a options includes DontResolveSymlinks, the file dialog treats symlinks as regular directories. \warning Do not delete \a parent during the execution of the dialog. If you - want to do this, you should create the dialog yourself using one of the + want to do this, you must create the dialog yourself using one of the QFileDialog constructors. \sa getOpenFileNames(), getSaveFileName(), getExistingDirectory() @@ -2118,21 +2122,21 @@ QString QFileDialog::getOpenFileName(QWidget *parent, The function is used similarly to QFileDialog::getOpenFileName(). In particular \a parent, \a caption, \a dir, \a filter, \a selectedFilter - and \a options are used in the exact same way. + and \a options are used in exactly the same way. The main difference with QFileDialog::getOpenFileName() comes from the ability offered to the user to select a remote file. That's why the return type and the type of \a dir is QUrl. The \a supportedSchemes argument allows to restrict the type of URLs the - user will be able to select. It is a way for the application to declare + user is able to select. It is a way for the application to declare the protocols it will support to fetch the file content. An empty list means that no restriction is applied (the default). - Supported for local files ("file" scheme) is implicit and always enabled; + Support for local files ("file" scheme) is implicit and always enabled; it is not necessary to include it in the restriction. - When possible, this static function will use the native file dialog and - not a QFileDialog. On platforms which don't support selecting remote + When possible, this static function uses the native file dialog and + not a QFileDialog. On platforms that don't support selecting remote files, Qt will allow to select only local files. \sa getOpenFileName(), getOpenFileUrls(), getSaveFileUrl(), getExistingDirectoryUrl() @@ -2166,32 +2170,33 @@ QUrl QFileDialog::getOpenFileUrl(QWidget *parent, } /*! - This is a convenience static function that will return one or more existing + This is a convenience static function that returns one or more existing files selected by the user. \snippet code/src_gui_dialogs_qfiledialog.cpp 9 This function creates a modal file dialog with the given \a parent widget. - If \a parent is not \nullptr, the dialog will be shown centered over the + If \a parent is not \nullptr, the dialog is shown centered over the parent widget. - The file dialog's working directory will be set to \a dir. If \a dir - includes a file name, the file will be selected. The filter is set to + The file dialog's working directory is set to \a dir. If \a dir + includes a file name, the file is selected. The filter is set to \a filter so that only those files which match the filter are shown. The filter selected is set to \a selectedFilter. The parameters \a dir, - \a selectedFilter and \a filter may be empty strings. If you need multiple + \a selectedFilter and \a filter can be empty strings. If you need multiple filters, separate them with ';;', for instance: \snippet code/src_gui_dialogs_qfiledialog.cpp 14 - The dialog's caption is set to \a caption. If \a caption is not specified - then a default caption will be used. + The dialog's caption is set to \a caption. If \a caption is not specified, + then a default caption is used. - On Windows, and \macos, this static function will use the - native file dialog and not a QFileDialog. + On Windows and \macos, this static function uses the + native file dialog and not a QFileDialog. Note that the \macos native file + dialog does not show a title bar. - On Windows the dialog will spin a blocking modal event loop that will not - dispatch any QTimers, and if \a parent is not \nullptr then it will position + On Windows the dialog spins a blocking modal event loop that does not + dispatch any QTimers, and if \a parent is not \nullptr then it positions the dialog just below the parent's title bar. On Unix/X11, the normal behavior of the file dialog is to resolve and @@ -2202,7 +2207,7 @@ QUrl QFileDialog::getOpenFileUrl(QWidget *parent, pass. \warning Do not delete \a parent during the execution of the dialog. If you - want to do this, you should create the dialog yourself using one of the + want to do this, you must create the dialog yourself using one of the QFileDialog constructors. \sa getOpenFileName(), getSaveFileName(), getExistingDirectory() @@ -2219,23 +2224,19 @@ QStringList QFileDialog::getOpenFileNames(QWidget *parent, filter, selectedFilter, options, schemes); QStringList fileNames; fileNames.reserve(selectedUrls.size()); - for (const QUrl &url : selectedUrls) { - if (url.isLocalFile() || url.isEmpty()) - fileNames << url.toLocalFile(); - else - fileNames << url.toString(); - } + for (const QUrl &url : selectedUrls) + fileNames.append(url.toString(QUrl::PreferLocalFile)); return fileNames; } /*! - This is a convenience static function that will return one or more existing + This is a convenience static function that returns one or more existing files selected by the user. If the user presses Cancel, it returns an empty list. The function is used similarly to QFileDialog::getOpenFileNames(). In particular \a parent, \a caption, \a dir, \a filter, \a selectedFilter - and \a options are used in the exact same way. + and \a options are used in exactly the same way. The main difference with QFileDialog::getOpenFileNames() comes from the ability offered to the user to select remote files. That's why @@ -2243,14 +2244,14 @@ QStringList QFileDialog::getOpenFileNames(QWidget *parent, and QUrl. The \a supportedSchemes argument allows to restrict the type of URLs the - user will be able to select. It is a way for the application to declare - the protocols it will support to fetch the file content. An empty list + user can select. It is a way for the application to declare + the protocols it supports to fetch the file content. An empty list means that no restriction is applied (the default). - Supported for local files ("file" scheme) is implicit and always enabled; + Support for local files ("file" scheme) is implicit and always enabled; it is not necessary to include it in the restriction. - When possible, this static function will use the native file dialog and - not a QFileDialog. On platforms which don't support selecting remote + When possible, this static function uses the native file dialog and + not a QFileDialog. On platforms that don't support selecting remote files, Qt will allow to select only local files. \sa getOpenFileNames(), getOpenFileUrl(), getSaveFileUrl(), getExistingDirectoryUrl() @@ -2284,15 +2285,16 @@ QList<QUrl> QFileDialog::getOpenFileUrls(QWidget *parent, } /*! - This is a convenience static function that will return the content of a file + This is a convenience static function that returns the content of a file selected by the user. - This function is used to access local files on Qt for WebAssembly, where the web - sandbox places restrictions on how such access may happen. Its implementation will - make the browser display a native file dialog, where the user makes the file selection - based on the parameter \a nameFilter. + Use this function to access local files on Qt for WebAssembly, if the web sandbox + restricts file access. Its implementation enables displaying a native file dialog in + the browser, where the user selects a file based on the \a nameFilter parameter. - It can also be used on other platforms, where it will fall back to using QFileDialog. + \a parent is ignored on Qt for WebAssembly. Pass \a parent on other platforms, to make + the popup a child of another widget. If the platform doesn't support native file + dialogs, the function falls back to QFileDialog. The function is asynchronous and returns immediately. The \a fileOpenCompleted callback will be called when a file has been selected and its contents have been @@ -2301,9 +2303,10 @@ QList<QUrl> QFileDialog::getOpenFileUrls(QWidget *parent, \snippet code/src_gui_dialogs_qfiledialog.cpp 15 \since 5.13 */ -void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::function<void(const QString &, const QByteArray &)> &fileOpenCompleted) +void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::function<void(const QString &, const QByteArray &)> &fileOpenCompleted, QWidget *parent) { #ifdef Q_OS_WASM + Q_UNUSED(parent); auto openFileImpl = std::make_shared<std::function<void(void)>>(); QString fileName; QByteArray fileContent; @@ -2328,20 +2331,15 @@ void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::funct openFileImpl.reset(); }; - auto qtFilterStringToWebAcceptString = [](const QString &qtString) { - // The Qt and Web name filter string formats are similar, but - // not identical. - return qtString.toStdString(); // ### TODO - }; - - QWasmLocalFileAccess::openFile(qtFilterStringToWebAcceptString(nameFilter), fileDialogClosed, acceptFile, fileContentReady); + QWasmLocalFileAccess::openFile(nameFilter.toStdString(), fileDialogClosed, acceptFile, fileContentReady); }; (*openFileImpl)(); #else - QFileDialog *dialog = new QFileDialog(); + QFileDialog *dialog = new QFileDialog(parent); dialog->setFileMode(QFileDialog::ExistingFile); - dialog->selectNameFilter(nameFilter); + dialog->setNameFilter(nameFilter); + dialog->setAttribute(Qt::WA_DeleteOnClose); auto fileSelected = [=](const QString &fileName) { QByteArray fileContent; @@ -2353,13 +2351,7 @@ void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::funct fileOpenCompleted(fileName, fileContent); }; - auto dialogClosed = [=](int code) { - Q_UNUSED(code); - dialog->deleteLater(); - }; - - connect(dialog, &QFileDialog::fileSelected, fileSelected); - connect(dialog, &QFileDialog::finished, dialogClosed); + connect(dialog, &QFileDialog::fileSelected, dialog, fileSelected); dialog->show(); #endif } @@ -2369,23 +2361,26 @@ void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::funct a file name and location chosen by the user. \a fileNameHint can be provided to suggest a file name to the user. - This function is used to save files to the local file system on Qt for WebAssembly, where - the web sandbox places restrictions on how such access may happen. Its implementation will - make the browser display a native file dialog, where the user makes the file selection. + Use this function to save content to local files on Qt for WebAssembly, if the web sandbox + restricts file access. Its implementation enables displaying a native file dialog in the + browser, where the user specifies an output file based on the \a fileNameHint argument. - It can also be used on other platforms, where it will fall back to using QFileDialog. + \a parent is ignored on Qt for WebAssembly. Pass \a parent on other platforms, to make + the popup a child of another widget. If the platform doesn't support native file + dialogs, the function falls back to QFileDialog. The function is asynchronous and returns immediately. \snippet code/src_gui_dialogs_qfiledialog.cpp 16 \since 5.14 */ -void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString &fileNameHint) +void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString &fileNameHint, QWidget *parent) { #ifdef Q_OS_WASM - QWasmLocalFileAccess::saveFile(fileContent.constData(), fileContent.size(), fileNameHint.toStdString()); + Q_UNUSED(parent); + QWasmLocalFileAccess::saveFile(fileContent, fileNameHint.toStdString()); #else - QFileDialog *dialog = new QFileDialog(); + QFileDialog *dialog = new QFileDialog(parent); dialog->setAcceptMode(QFileDialog::AcceptSave); dialog->setFileMode(QFileDialog::AnyFile); dialog->selectFile(fileNameHint); @@ -2398,19 +2393,14 @@ void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString & } }; - auto dialogClosed = [=](int code) { - Q_UNUSED(code); - dialog->deleteLater(); - }; - - connect(dialog, &QFileDialog::fileSelected, fileSelected); - connect(dialog, &QFileDialog::finished, dialogClosed); + connect(dialog, &QFileDialog::fileSelected, dialog, fileSelected); + dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->show(); #endif } /*! - This is a convenience static function that will return a file name selected + This is a convenience static function that returns a file name selected by the user. The file does not have to exist. It creates a modal file dialog with the given \a parent widget. If @@ -2419,8 +2409,8 @@ void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString & \snippet code/src_gui_dialogs_qfiledialog.cpp 11 - The file dialog's working directory will be set to \a dir. If \a dir - includes a file name, the file will be selected. Only files that match the + The file dialog's working directory is set to \a dir. If \a dir + includes a file name, the file is selected. Only files that match the \a filter are shown. The filter selected is set to \a selectedFilter. The parameters \a dir, \a selectedFilter, and \a filter may be empty strings. Multiple filters are separated with ';;'. For instance: @@ -2435,24 +2425,24 @@ void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString & desired value. The dialog's caption is set to \a caption. If \a caption is not specified, - a default caption will be used. + a default caption is used. - On Windows, and \macos, this static function will use the + On Windows, and \macos, this static function uses the native file dialog and not a QFileDialog. - On Windows the dialog will spin a blocking modal event loop that will not - dispatch any QTimers, and if \a parent is not \nullptr then it will - position the dialog just below the parent's title bar. On \macos, with its + On Windows the dialog spins a blocking modal event loop that does not + dispatch any QTimers, and if \a parent is not \nullptr then it + positions the dialog just below the parent's title bar. On \macos, with its native file dialog, the filter argument is ignored. On Unix/X11, the normal behavior of the file dialog is to resolve and follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp}, - the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If - \a options includes DontResolveSymlinks the file dialog will treat symlinks + the file dialog changes to \c{/var/tmp} after entering \c{/usr/tmp}. If + \a options includes DontResolveSymlinks, the file dialog treats symlinks as regular directories. \warning Do not delete \a parent during the execution of the dialog. If you - want to do this, you should create the dialog yourself using one of the + want to do this, you must create the dialog yourself using one of the QFileDialog constructors. \sa getOpenFileName(), getOpenFileNames(), getExistingDirectory() @@ -2480,21 +2470,21 @@ QString QFileDialog::getSaveFileName(QWidget *parent, The function is used similarly to QFileDialog::getSaveFileName(). In particular \a parent, \a caption, \a dir, \a filter, \a selectedFilter - and \a options are used in the exact same way. + and \a options are used in exactly the same way. The main difference with QFileDialog::getSaveFileName() comes from the ability offered to the user to select a remote file. That's why the return type and the type of \a dir is QUrl. The \a supportedSchemes argument allows to restrict the type of URLs the - user will be able to select. It is a way for the application to declare - the protocols it will support to save the file content. An empty list + user can select. It is a way for the application to declare + the protocols it supports to save the file content. An empty list means that no restriction is applied (the default). - Supported for local files ("file" scheme) is implicit and always enabled; + Support for local files ("file" scheme) is implicit and always enabled; it is not necessary to include it in the restriction. - When possible, this static function will use the native file dialog and - not a QFileDialog. On platforms which don't support selecting remote + When possible, this static function uses the native file dialog and + not a QFileDialog. On platforms that don't support selecting remote files, Qt will allow to select only local files. \sa getSaveFileName(), getOpenFileUrl(), getOpenFileUrls(), getExistingDirectoryUrl() @@ -2529,42 +2519,45 @@ QUrl QFileDialog::getSaveFileUrl(QWidget *parent, } /*! - This is a convenience static function that will return an existing + This is a convenience static function that returns an existing directory selected by the user. \snippet code/src_gui_dialogs_qfiledialog.cpp 12 This function creates a modal file dialog with the given \a parent widget. - If \a parent is not \nullptr, the dialog will be shown centered over the + If \a parent is not \nullptr, the dialog is shown centered over the parent widget. The dialog's working directory is set to \a dir, and the caption is set to - \a caption. Either of these may be an empty string in which case the - current directory and a default caption will be used respectively. + \a caption. Either of these can be an empty string in which case the + current directory and a default caption are used respectively. - The \a options argument holds various options about how to run the dialog, - see the QFileDialog::Option enum for more information on the flags you can + The \a options argument holds various options about how to run the dialog. + See the QFileDialog::Option enum for more information on the flags you can pass. To ensure a native file dialog, \l{QFileDialog::}{ShowDirsOnly} must be set. - On Windows and \macos, this static function will use the + On Windows and \macos, this static function uses the native file dialog and not a QFileDialog. However, the native Windows file dialog does not support displaying files in the directory chooser. You need - to pass \l{QFileDialog::}{DontUseNativeDialog} to display files using a + to pass the \l{QFileDialog::}{DontUseNativeDialog} option, or set the global + \\l{Qt::}{AA_DontUseNativeDialogs} application attribute to display files using a QFileDialog. + Note that the \macos native file dialog does not show a title bar. + On Unix/X11, the normal behavior of the file dialog is to resolve and follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp}, - the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If - \a options includes DontResolveSymlinks, the file dialog will treat + the file dialog changes to \c{/var/tmp} after entering \c{/usr/tmp}. If + \a options includes DontResolveSymlinks, the file dialog treats symlinks as regular directories. - On Windows, the dialog will spin a blocking modal event loop that will not - dispatch any QTimers, and if \a parent is not \nullptr then it will position + On Windows, the dialog spins a blocking modal event loop that does not + dispatch any QTimers, and if \a parent is not \nullptr then it positions the dialog just below the parent's title bar. \warning Do not delete \a parent during the execution of the dialog. If you - want to do this, you should create the dialog yourself using one of the + want to do this, you must create the dialog yourself using one of the QFileDialog constructors. \sa getOpenFileName(), getOpenFileNames(), getSaveFileName() @@ -2584,28 +2577,28 @@ QString QFileDialog::getExistingDirectory(QWidget *parent, } /*! - This is a convenience static function that will return an existing + This is a convenience static function that returns an existing directory selected by the user. If the user presses Cancel, it returns an empty url. The function is used similarly to QFileDialog::getExistingDirectory(). In particular \a parent, \a caption, \a dir and \a options are used - in the exact same way. + in exactly the same way. The main difference with QFileDialog::getExistingDirectory() comes from the ability offered to the user to select a remote directory. That's why the return type and the type of \a dir is QUrl. The \a supportedSchemes argument allows to restrict the type of URLs the - user will be able to select. It is a way for the application to declare - the protocols it will support to fetch the file content. An empty list + user is able to select. It is a way for the application to declare + the protocols it supports to fetch the file content. An empty list means that no restriction is applied (the default). - Supported for local files ("file" scheme) is implicit and always enabled; + Support for local files ("file" scheme) is implicit and always enabled; it is not necessary to include it in the restriction. - When possible, this static function will use the native file dialog and - not a QFileDialog. On platforms which don't support selecting remote - files, Qt will allow to select only local files. + When possible, this static function uses the native file dialog and + not a QFileDialog. On platforms that don't support selecting remote + files, Qt allows to select only local files. \sa getExistingDirectory(), getOpenFileUrl(), getOpenFileUrls(), getSaveFileUrl() \since 5.2 @@ -2697,6 +2690,32 @@ void QFileDialog::done(int result) d->signalToDisconnectOnClose.clear(); } +bool QFileDialogPrivate::itemAlreadyExists(const QString &fileName) +{ +#if QT_CONFIG(messagebox) + Q_Q(QFileDialog); + const QString msg = QFileDialog::tr("%1 already exists.\nDo you want to replace it?").arg(fileName); + using B = QMessageBox; + const auto res = B::warning(q, q->windowTitle(), msg, B::Yes | B::No, B::No); + return res == B::Yes; +#endif + return false; +} + +void QFileDialogPrivate::itemNotFound(const QString &fileName, QFileDialog::FileMode mode) +{ +#if QT_CONFIG(messagebox) + Q_Q(QFileDialog); + const QString message = mode == QFileDialog::Directory + ? QFileDialog::tr("%1\nDirectory not found.\n" + "Please verify the correct directory name was given.") + : QFileDialog::tr("%1\nFile not found.\nPlease verify the " + "correct file name was given."); + + QMessageBox::warning(q, q->windowTitle(), message.arg(fileName)); +#endif // QT_CONFIG(messagebox) +} + /*! \reimp */ @@ -2707,9 +2726,9 @@ void QFileDialog::accept() const QList<QUrl> urls = selectedUrls(); if (urls.isEmpty()) return; - d->_q_emitUrlsSelected(urls); - if (urls.count() == 1) - d->_q_emitUrlSelected(urls.first()); + d->emitUrlsSelected(urls); + if (urls.size() == 1) + d->emitUrlSelected(urls.first()); QDialog::accept(); return; } @@ -2720,25 +2739,22 @@ void QFileDialog::accept() QString lineEditText = d->lineEdit()->text(); // "hidden feature" type .. and then enter, and it will move up a dir // special case for ".." - if (lineEditText == QLatin1String("..")) { - d->_q_navigateToParent(); + if (lineEditText == ".."_L1) { + d->navigateToParent(); const QSignalBlocker blocker(d->qFileDialogUi->fileNameEdit); d->lineEdit()->selectAll(); return; } - switch (fileMode()) { + const auto mode = fileMode(); + switch (mode) { case Directory: { QString fn = files.first(); QFileInfo info(fn); if (!info.exists()) info = QFileInfo(d->getEnvironmentVariable(fn)); if (!info.exists()) { -#if QT_CONFIG(messagebox) - QString message = tr("%1\nDirectory not found.\nPlease verify the " - "correct directory name was given."); - QMessageBox::warning(this, windowTitle(), message.arg(info.fileName())); -#endif // QT_CONFIG(messagebox) + d->itemNotFound(info.fileName(), mode); return; } if (info.isDir()) { @@ -2757,8 +2773,8 @@ void QFileDialog::accept() } if (!info.exists()) { - int maxNameLength = d->maxNameLength(info.path()); - if (maxNameLength >= 0 && info.fileName().length() > maxNameLength) + const long maxNameLength = d->maxNameLength(info.path()); + if (maxNameLength >= 0 && info.fileName().size() > maxNameLength) return; } @@ -2766,17 +2782,11 @@ void QFileDialog::accept() if (!info.exists() || testOption(DontConfirmOverwrite) || acceptMode() == AcceptOpen) { d->emitFilesSelected(QStringList(fn)); QDialog::accept(); -#if QT_CONFIG(messagebox) } else { - if (QMessageBox::warning(this, windowTitle(), - tr("%1 already exists.\nDo you want to replace it?") - .arg(info.fileName()), - QMessageBox::Yes | QMessageBox::No, QMessageBox::No) - == QMessageBox::Yes) { + if (d->itemAlreadyExists(info.fileName())) { d->emitFilesSelected(QStringList(fn)); QDialog::accept(); } -#endif } return; } @@ -2788,11 +2798,7 @@ void QFileDialog::accept() if (!info.exists()) info = QFileInfo(d->getEnvironmentVariable(file)); if (!info.exists()) { -#if QT_CONFIG(messagebox) - QString message = tr("%1\nFile not found.\nPlease verify the " - "correct file name was given."); - QMessageBox::warning(this, windowTitle(), message.arg(info.fileName())); -#endif // QT_CONFIG(messagebox) + d->itemNotFound(info.fileName(), mode); return; } if (info.isDir()) { @@ -2811,37 +2817,37 @@ void QFileDialog::accept() void QFileDialogPrivate::saveSettings() { Q_Q(QFileDialog); - QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); - settings.beginGroup(QLatin1String("FileDialog")); + QSettings settings(QSettings::UserScope, u"QtProject"_s); + settings.beginGroup("FileDialog"); if (usingWidgets()) { - settings.setValue(QLatin1String("sidebarWidth"), qFileDialogUi->splitter->sizes().constFirst()); - settings.setValue(QLatin1String("shortcuts"), QUrl::toStringList(qFileDialogUi->sidebar->urls())); - settings.setValue(QLatin1String("treeViewHeader"), qFileDialogUi->treeView->header()->saveState()); + settings.setValue("sidebarWidth", qFileDialogUi->splitter->sizes().constFirst()); + settings.setValue("shortcuts", QUrl::toStringList(qFileDialogUi->sidebar->urls())); + settings.setValue("treeViewHeader", qFileDialogUi->treeView->header()->saveState()); } QStringList historyUrls; const QStringList history = q->history(); historyUrls.reserve(history.size()); for (const QString &path : history) historyUrls << QUrl::fromLocalFile(path).toString(); - settings.setValue(QLatin1String("history"), historyUrls); - settings.setValue(QLatin1String("lastVisited"), lastVisitedDir()->toString()); + settings.setValue("history", historyUrls); + settings.setValue("lastVisited", lastVisitedDir()->toString()); const QMetaEnum &viewModeMeta = q->metaObject()->enumerator(q->metaObject()->indexOfEnumerator("ViewMode")); - settings.setValue(QLatin1String("viewMode"), QLatin1String(viewModeMeta.key(q->viewMode()))); - settings.setValue(QLatin1String("qtVersion"), QLatin1String(QT_VERSION_STR)); + settings.setValue("viewMode", QLatin1StringView(viewModeMeta.key(q->viewMode()))); + settings.setValue("qtVersion", QT_VERSION_STR ""_L1); } bool QFileDialogPrivate::restoreFromSettings() { Q_Q(QFileDialog); - QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); - if (!settings.childGroups().contains(QLatin1String("FileDialog"))) + QSettings settings(QSettings::UserScope, u"QtProject"_s); + if (!settings.childGroups().contains("FileDialog"_L1)) return false; - settings.beginGroup(QLatin1String("FileDialog")); + settings.beginGroup("FileDialog"); - q->setDirectoryUrl(lastVisitedDir()->isEmpty() ? settings.value(QLatin1String("lastVisited")).toUrl() : *lastVisitedDir()); + q->setDirectoryUrl(lastVisitedDir()->isEmpty() ? settings.value("lastVisited").toUrl() : *lastVisitedDir()); - QByteArray viewModeStr = settings.value(QLatin1String("viewMode")).toString().toLatin1(); + QByteArray viewModeStr = settings.value("viewMode").toString().toLatin1(); const QMetaEnum &viewModeMeta = q->metaObject()->enumerator(q->metaObject()->indexOfEnumerator("ViewMode")); bool ok = false; int viewMode = viewModeMeta.keyToValue(viewModeStr.constData(), &ok); @@ -2849,21 +2855,21 @@ bool QFileDialogPrivate::restoreFromSettings() viewMode = QFileDialog::List; q->setViewMode(static_cast<QFileDialog::ViewMode>(viewMode)); - sidebarUrls = QUrl::fromStringList(settings.value(QLatin1String("shortcuts")).toStringList()); - headerData = settings.value(QLatin1String("treeViewHeader")).toByteArray(); + sidebarUrls = QUrl::fromStringList(settings.value("shortcuts").toStringList()); + headerData = settings.value("treeViewHeader").toByteArray(); if (!usingWidgets()) return true; QStringList history; - const auto urlStrings = settings.value(QLatin1String("history")).toStringList(); + const auto urlStrings = settings.value("history").toStringList(); for (const QString &urlStr : urlStrings) { QUrl url(urlStr); if (url.isLocalFile()) history << url.toLocalFile(); } - return restoreWidgetState(history, settings.value(QLatin1String("sidebarWidth"), -1).toInt()); + return restoreWidgetState(history, settings.value("sidebarWidth", -1).toInt()); } #endif // settings @@ -2879,8 +2885,8 @@ bool QFileDialogPrivate::restoreWidgetState(QStringList &history, int splitterPo if (!qFileDialogUi->splitter->restoreState(splitterState)) return false; QList<int> list = qFileDialogUi->splitter->sizes(); - if (list.count() >= 2 && (list.at(0) == 0 || list.at(1) == 0)) { - for (int i = 0; i < list.count(); ++i) + if (list.size() >= 2 && (list.at(0) == 0 || list.at(1) == 0)) { + for (int i = 0; i < list.size(); ++i) list[i] = qFileDialogUi->splitter->widget(i)->sizeHint().width(); qFileDialogUi->splitter->setSizes(list); } @@ -2903,7 +2909,7 @@ bool QFileDialogPrivate::restoreWidgetState(QStringList &history, int splitterPo if (proxyModel) abstractModel = proxyModel; #endif - int total = qMin(abstractModel->columnCount(QModelIndex()), actions.count() + 1); + const int total = qMin(abstractModel->columnCount(QModelIndex()), int(actions.size() + 1)); for (int i = 1; i < total; ++i) actions.at(i - 1)->setChecked(!headerView->isSectionHidden(i)); @@ -2945,8 +2951,8 @@ void QFileDialogPrivate::init(const QFileDialogArgs &args) // Try to restore from the FileDialog settings group; if it fails, fall back // to the pre-5.5 QByteArray serialized settings. if (!restoreFromSettings()) { - const QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); - q->restoreState(settings.value(QLatin1String("Qt/filedialog")).toByteArray()); + const QSettings settings(QSettings::UserScope, u"QtProject"_s); + q->restoreState(settings.value("Qt/filedialog").toByteArray()); } #endif @@ -2982,36 +2988,38 @@ void QFileDialogPrivate::createWidgets() model = new QFileSystemModel(q); model->setIconProvider(&defaultIconProvider); model->setFilter(options->filter()); - model->setObjectName(QLatin1String("qt_filesystem_model")); + model->setObjectName("qt_filesystem_model"_L1); if (QPlatformFileDialogHelper *helper = platformFileDialogHelper()) model->setNameFilterDisables(helper->defaultNameFilterDisables()); else model->setNameFilterDisables(false); - if (nativeDialogInUse) - deletePlatformHelper(); model->d_func()->disableRecursiveSort = true; - QFileDialog::connect(model, SIGNAL(fileRenamed(QString,QString,QString)), q, SLOT(_q_fileRenamed(QString,QString,QString))); - QFileDialog::connect(model, SIGNAL(rootPathChanged(QString)), - q, SLOT(_q_pathChanged(QString))); - QFileDialog::connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), - q, SLOT(_q_rowsInserted(QModelIndex))); + QObjectPrivate::connect(model, &QFileSystemModel::fileRenamed, + this, &QFileDialogPrivate::fileRenamed); + QObjectPrivate::connect(model, &QFileSystemModel::rootPathChanged, + this, &QFileDialogPrivate::pathChanged); + QObjectPrivate::connect(model, &QFileSystemModel::rowsInserted, + this, &QFileDialogPrivate::rowsInserted); model->setReadOnly(false); qFileDialogUi.reset(new Ui_QFileDialog()); qFileDialogUi->setupUi(q); QList<QUrl> initialBookmarks; - initialBookmarks << QUrl(QLatin1String("file:")) + initialBookmarks << QUrl("file:"_L1) << QUrl::fromLocalFile(QDir::homePath()); qFileDialogUi->sidebar->setModelAndUrls(model, initialBookmarks); - QFileDialog::connect(qFileDialogUi->sidebar, SIGNAL(goToUrl(QUrl)), - q, SLOT(_q_goToUrl(QUrl))); + QObjectPrivate::connect(qFileDialogUi->sidebar, &QSidebar::goToUrl, + this, &QFileDialogPrivate::goToUrl); - QObject::connect(qFileDialogUi->buttonBox, SIGNAL(accepted()), q, SLOT(accept())); - QObject::connect(qFileDialogUi->buttonBox, SIGNAL(rejected()), q, SLOT(reject())); + QObject::connect(qFileDialogUi->buttonBox, &QDialogButtonBox::accepted, + q, &QFileDialog::accept); + QObject::connect(qFileDialogUi->buttonBox, &QDialogButtonBox::rejected, + q, &QFileDialog::reject); qFileDialogUi->lookInCombo->setFileDialogPrivate(this); - QObject::connect(qFileDialogUi->lookInCombo, SIGNAL(textActivated(QString)), q, SLOT(_q_goToDirectory(QString))); + QObjectPrivate::connect(qFileDialogUi->lookInCombo, &QComboBox::textActivated, + this, &QFileDialogPrivate::goToDirectory); qFileDialogUi->lookInCombo->setInsertPolicy(QComboBox::NoInsert); qFileDialogUi->lookInCombo->setDuplicatesEnabled(false); @@ -3028,47 +3036,48 @@ void QFileDialogPrivate::createWidgets() qFileDialogUi->fileNameEdit->setInputMethodHints(Qt::ImhNoPredictiveText); - QObject::connect(qFileDialogUi->fileNameEdit, SIGNAL(textChanged(QString)), - q, SLOT(_q_autoCompleteFileName(QString))); - QObject::connect(qFileDialogUi->fileNameEdit, SIGNAL(textChanged(QString)), - q, SLOT(_q_updateOkButton())); - - QObject::connect(qFileDialogUi->fileNameEdit, SIGNAL(returnPressed()), q, SLOT(accept())); + QObjectPrivate::connect(qFileDialogUi->fileNameEdit, &QLineEdit::textChanged, + this, &QFileDialogPrivate::autoCompleteFileName); + QObjectPrivate::connect(qFileDialogUi->fileNameEdit, &QLineEdit::textChanged, + this, &QFileDialogPrivate::updateOkButton); + QObject::connect(qFileDialogUi->fileNameEdit, &QLineEdit::returnPressed, + q, &QFileDialog::accept); // filetype qFileDialogUi->fileTypeCombo->setDuplicatesEnabled(false); qFileDialogUi->fileTypeCombo->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow); qFileDialogUi->fileTypeCombo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - QObject::connect(qFileDialogUi->fileTypeCombo, SIGNAL(activated(int)), - q, SLOT(_q_useNameFilter(int))); - QObject::connect(qFileDialogUi->fileTypeCombo, SIGNAL(textActivated(QString)), - q, SIGNAL(filterSelected(QString))); + QObjectPrivate::connect(qFileDialogUi->fileTypeCombo, &QComboBox::activated, + this, &QFileDialogPrivate::useNameFilter); + QObject::connect(qFileDialogUi->fileTypeCombo, &QComboBox::textActivated, + q, &QFileDialog::filterSelected); qFileDialogUi->listView->setFileDialogPrivate(this); qFileDialogUi->listView->setModel(model); - QObject::connect(qFileDialogUi->listView, SIGNAL(activated(QModelIndex)), - q, SLOT(_q_enterDirectory(QModelIndex))); - QObject::connect(qFileDialogUi->listView, SIGNAL(customContextMenuRequested(QPoint)), - q, SLOT(_q_showContextMenu(QPoint))); + QObjectPrivate::connect(qFileDialogUi->listView, &QAbstractItemView::activated, + this, &QFileDialogPrivate::enterDirectory); + QObjectPrivate::connect(qFileDialogUi->listView, &QAbstractItemView::customContextMenuRequested, + this, &QFileDialogPrivate::showContextMenu); #ifndef QT_NO_SHORTCUT QShortcut *shortcut = new QShortcut(QKeySequence::Delete, qFileDialogUi->listView); - QObject::connect(shortcut, SIGNAL(activated()), q, SLOT(_q_deleteCurrent())); + QObjectPrivate::connect(shortcut, &QShortcut::activated, + this, &QFileDialogPrivate::deleteCurrent); #endif qFileDialogUi->treeView->setFileDialogPrivate(this); qFileDialogUi->treeView->setModel(model); QHeaderView *treeHeader = qFileDialogUi->treeView->header(); QFontMetrics fm(q->font()); - treeHeader->resizeSection(0, fm.horizontalAdvance(QLatin1String("wwwwwwwwwwwwwwwwwwwwwwwwww"))); - treeHeader->resizeSection(1, fm.horizontalAdvance(QLatin1String("128.88 GB"))); - treeHeader->resizeSection(2, fm.horizontalAdvance(QLatin1String("mp3Folder"))); - treeHeader->resizeSection(3, fm.horizontalAdvance(QLatin1String("10/29/81 02:02PM"))); + treeHeader->resizeSection(0, fm.horizontalAdvance("wwwwwwwwwwwwwwwwwwwwwwwwww"_L1)); + treeHeader->resizeSection(1, fm.horizontalAdvance("128.88 GB"_L1)); + treeHeader->resizeSection(2, fm.horizontalAdvance("mp3Folder"_L1)); + treeHeader->resizeSection(3, fm.horizontalAdvance("10/29/81 02:02PM"_L1)); treeHeader->setContextMenuPolicy(Qt::ActionsContextMenu); QActionGroup *showActionGroup = new QActionGroup(q); showActionGroup->setExclusive(false); - QObject::connect(showActionGroup, SIGNAL(triggered(QAction*)), - q, SLOT(_q_showHeader(QAction*)));; + QObjectPrivate::connect(showActionGroup, &QActionGroup::triggered, + this, &QFileDialogPrivate::showHeader); QAbstractItemModel *abstractModel = model; #if QT_CONFIG(proxymodel) @@ -3085,21 +3094,22 @@ void QFileDialogPrivate::createWidgets() QScopedPointer<QItemSelectionModel> selModel(qFileDialogUi->treeView->selectionModel()); qFileDialogUi->treeView->setSelectionModel(qFileDialogUi->listView->selectionModel()); - QObject::connect(qFileDialogUi->treeView, SIGNAL(activated(QModelIndex)), - q, SLOT(_q_enterDirectory(QModelIndex))); - QObject::connect(qFileDialogUi->treeView, SIGNAL(customContextMenuRequested(QPoint)), - q, SLOT(_q_showContextMenu(QPoint))); + QObjectPrivate::connect(qFileDialogUi->treeView, &QAbstractItemView::activated, + this, &QFileDialogPrivate::enterDirectory); + QObjectPrivate::connect(qFileDialogUi->treeView, &QAbstractItemView::customContextMenuRequested, + this, &QFileDialogPrivate::showContextMenu); #ifndef QT_NO_SHORTCUT shortcut = new QShortcut(QKeySequence::Delete, qFileDialogUi->treeView); - QObject::connect(shortcut, SIGNAL(activated()), q, SLOT(_q_deleteCurrent())); + QObjectPrivate::connect(shortcut, &QShortcut::activated, + this, &QFileDialogPrivate::deleteCurrent); #endif // Selections QItemSelectionModel *selections = qFileDialogUi->listView->selectionModel(); - QObject::connect(selections, SIGNAL(selectionChanged(QItemSelection,QItemSelection)), - q, SLOT(_q_selectionChanged())); - QObject::connect(selections, SIGNAL(currentChanged(QModelIndex,QModelIndex)), - q, SLOT(_q_currentChanged(QModelIndex))); + QObjectPrivate::connect(selections, &QItemSelectionModel::selectionChanged, + this, &QFileDialogPrivate::selectionChanged); + QObjectPrivate::connect(selections, &QItemSelectionModel::currentChanged, + this, &QFileDialogPrivate::currentChanged); qFileDialogUi->splitter->setStretchFactor(qFileDialogUi->splitter->indexOf(qFileDialogUi->splitter->widget(1)), QSizePolicy::Expanding); createToolButtons(); @@ -3109,8 +3119,8 @@ void QFileDialogPrivate::createWidgets() // Try to restore from the FileDialog settings group; if it fails, fall back // to the pre-5.5 QByteArray serialized settings. if (!restoreFromSettings()) { - const QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); - q->restoreState(settings.value(QLatin1String("Qt/filedialog")).toByteArray()); + const QSettings settings(QSettings::UserScope, u"QtProject"_s); + q->restoreState(settings.value("Qt/filedialog").toByteArray()); } #endif @@ -3138,17 +3148,18 @@ void QFileDialogPrivate::createWidgets() for (const QUrl &url : initiallySelectedFiles) q->selectUrl(url); lineEdit()->selectAll(); - _q_updateOkButton(); + updateOkButton(); retranslateStrings(); q->resize(preSize.isValid() ? preSize : q->sizeHint()); q->setWindowState(preState); } -void QFileDialogPrivate::_q_showHeader(QAction *action) +void QFileDialogPrivate::showHeader(QAction *action) { Q_Q(QFileDialog); QActionGroup *actionGroup = qobject_cast<QActionGroup*>(q->sender()); - qFileDialogUi->treeView->header()->setSectionHidden(actionGroup->actions().indexOf(action) + 1, !action->isChecked()); + qFileDialogUi->treeView->header()->setSectionHidden(int(actionGroup->actions().indexOf(action) + 1), + !action->isChecked()); } #if QT_CONFIG(proxymodel) @@ -3159,8 +3170,8 @@ void QFileDialogPrivate::_q_showHeader(QAction *action) want to modify the underlying model; for example, to add columns, filter data or add drives. - Any existing proxy model will be removed, but not deleted. The file dialog - will take ownership of the \a proxyModel. + Any existing proxy model is removed, but not deleted. The file dialog + takes ownership of the \a proxyModel. \sa proxyModel() */ @@ -3174,13 +3185,12 @@ void QFileDialog::setProxyModel(QAbstractProxyModel *proxyModel) return; QModelIndex idx = d->rootIndex(); - if (d->proxyModel) { - disconnect(d->proxyModel, SIGNAL(rowsInserted(QModelIndex,int,int)), - this, SLOT(_q_rowsInserted(QModelIndex))); - } else { - disconnect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)), - this, SLOT(_q_rowsInserted(QModelIndex))); - } + if (d->proxyModel) + QObjectPrivate::disconnect(d->proxyModel, &QAbstractProxyModel::rowsInserted, + d, &QFileDialogPrivate::rowsInserted); + else + QObjectPrivate::disconnect(d->model, &QAbstractItemModel::rowsInserted, + d, &QFileDialogPrivate::rowsInserted); if (proxyModel != nullptr) { proxyModel->setParent(this); @@ -3192,8 +3202,8 @@ void QFileDialog::setProxyModel(QAbstractProxyModel *proxyModel) d->completer->setModel(d->proxyModel); d->completer->proxyModel = d->proxyModel; #endif - connect(d->proxyModel, SIGNAL(rowsInserted(QModelIndex,int,int)), - this, SLOT(_q_rowsInserted(QModelIndex))); + QObjectPrivate::connect(d->proxyModel, &QAbstractItemModel::rowsInserted, + d, &QFileDialogPrivate::rowsInserted); } else { d->proxyModel = nullptr; d->qFileDialogUi->listView->setModel(d->model); @@ -3203,8 +3213,8 @@ void QFileDialog::setProxyModel(QAbstractProxyModel *proxyModel) d->completer->sourceModel = d->model; d->completer->proxyModel = nullptr; #endif - connect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)), - this, SLOT(_q_rowsInserted(QModelIndex))); + QObjectPrivate::connect(d->model, &QAbstractItemModel::rowsInserted, + d, &QFileDialogPrivate::rowsInserted); } QScopedPointer<QItemSelectionModel> selModel(d->qFileDialogUi->treeView->selectionModel()); d->qFileDialogUi->treeView->setSelectionModel(d->qFileDialogUi->listView->selectionModel()); @@ -3213,10 +3223,10 @@ void QFileDialog::setProxyModel(QAbstractProxyModel *proxyModel) // reconnect selection QItemSelectionModel *selections = d->qFileDialogUi->listView->selectionModel(); - QObject::connect(selections, SIGNAL(selectionChanged(QItemSelection,QItemSelection)), - this, SLOT(_q_selectionChanged())); - QObject::connect(selections, SIGNAL(currentChanged(QModelIndex,QModelIndex)), - this, SLOT(_q_currentChanged(QModelIndex))); + QObjectPrivate::connect(selections, &QItemSelectionModel::selectionChanged, + d, &QFileDialogPrivate::selectionChanged); + QObjectPrivate::connect(selections, &QItemSelectionModel::currentChanged, + d, &QFileDialogPrivate::currentChanged); } /*! @@ -3242,26 +3252,31 @@ void QFileDialogPrivate::createToolButtons() qFileDialogUi->backButton->setIcon(q->style()->standardIcon(QStyle::SP_ArrowBack, nullptr, q)); qFileDialogUi->backButton->setAutoRaise(true); qFileDialogUi->backButton->setEnabled(false); - QObject::connect(qFileDialogUi->backButton, SIGNAL(clicked()), q, SLOT(_q_navigateBackward())); + QObjectPrivate::connect(qFileDialogUi->backButton, &QPushButton::clicked, + this, &QFileDialogPrivate::navigateBackward); qFileDialogUi->forwardButton->setIcon(q->style()->standardIcon(QStyle::SP_ArrowForward, nullptr, q)); qFileDialogUi->forwardButton->setAutoRaise(true); qFileDialogUi->forwardButton->setEnabled(false); - QObject::connect(qFileDialogUi->forwardButton, SIGNAL(clicked()), q, SLOT(_q_navigateForward())); + QObjectPrivate::connect(qFileDialogUi->forwardButton, &QPushButton::clicked, + this, &QFileDialogPrivate::navigateForward); qFileDialogUi->toParentButton->setIcon(q->style()->standardIcon(QStyle::SP_FileDialogToParent, nullptr, q)); qFileDialogUi->toParentButton->setAutoRaise(true); qFileDialogUi->toParentButton->setEnabled(false); - QObject::connect(qFileDialogUi->toParentButton, SIGNAL(clicked()), q, SLOT(_q_navigateToParent())); + QObjectPrivate::connect(qFileDialogUi->toParentButton, &QPushButton::clicked, + this, &QFileDialogPrivate::navigateToParent); qFileDialogUi->listModeButton->setIcon(q->style()->standardIcon(QStyle::SP_FileDialogListView, nullptr, q)); qFileDialogUi->listModeButton->setAutoRaise(true); qFileDialogUi->listModeButton->setDown(true); - QObject::connect(qFileDialogUi->listModeButton, SIGNAL(clicked()), q, SLOT(_q_showListView())); + QObjectPrivate::connect(qFileDialogUi->listModeButton, &QPushButton::clicked, + this, &QFileDialogPrivate::showListView); qFileDialogUi->detailModeButton->setIcon(q->style()->standardIcon(QStyle::SP_FileDialogDetailedView, nullptr, q)); qFileDialogUi->detailModeButton->setAutoRaise(true); - QObject::connect(qFileDialogUi->detailModeButton, SIGNAL(clicked()), q, SLOT(_q_showDetailsView())); + QObjectPrivate::connect(qFileDialogUi->detailModeButton, &QPushButton::clicked, + this, &QFileDialogPrivate::showDetailsView); QSize toolSize(qFileDialogUi->fileNameEdit->sizeHint().height(), qFileDialogUi->fileNameEdit->sizeHint().height()); qFileDialogUi->backButton->setFixedSize(toolSize); @@ -3274,7 +3289,8 @@ void QFileDialogPrivate::createToolButtons() qFileDialogUi->newFolderButton->setFixedSize(toolSize); qFileDialogUi->newFolderButton->setAutoRaise(true); qFileDialogUi->newFolderButton->setEnabled(false); - QObject::connect(qFileDialogUi->newFolderButton, SIGNAL(clicked()), q, SLOT(_q_createDirectory())); + QObjectPrivate::connect(qFileDialogUi->newFolderButton, &QPushButton::clicked, + this, &QFileDialogPrivate::createDirectory); } /*! @@ -3290,40 +3306,46 @@ void QFileDialogPrivate::createMenuActions() #ifndef QT_NO_SHORTCUT goHomeAction->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_H); #endif - QObject::connect(goHomeAction, SIGNAL(triggered()), q, SLOT(_q_goHome())); + QObjectPrivate::connect(goHomeAction, &QAction::triggered, + this, &QFileDialogPrivate::goHome); q->addAction(goHomeAction); // ### TODO add Desktop & Computer actions QAction *goToParent = new QAction(q); - goToParent->setObjectName(QLatin1String("qt_goto_parent_action")); + goToParent->setObjectName("qt_goto_parent_action"_L1); #ifndef QT_NO_SHORTCUT goToParent->setShortcut(Qt::CTRL | Qt::Key_Up); #endif - QObject::connect(goToParent, SIGNAL(triggered()), q, SLOT(_q_navigateToParent())); + QObjectPrivate::connect(goToParent, &QAction::triggered, + this, &QFileDialogPrivate::navigateToParent); q->addAction(goToParent); renameAction = new QAction(q); renameAction->setEnabled(false); - renameAction->setObjectName(QLatin1String("qt_rename_action")); - QObject::connect(renameAction, SIGNAL(triggered()), q, SLOT(_q_renameCurrent())); + renameAction->setObjectName("qt_rename_action"_L1); + QObjectPrivate::connect(renameAction, &QAction::triggered, + this, &QFileDialogPrivate::renameCurrent); deleteAction = new QAction(q); deleteAction->setEnabled(false); - deleteAction->setObjectName(QLatin1String("qt_delete_action")); - QObject::connect(deleteAction, SIGNAL(triggered()), q, SLOT(_q_deleteCurrent())); + deleteAction->setObjectName("qt_delete_action"_L1); + QObjectPrivate::connect(deleteAction, &QAction::triggered, + this, &QFileDialogPrivate::deleteCurrent); showHiddenAction = new QAction(q); - showHiddenAction->setObjectName(QLatin1String("qt_show_hidden_action")); + showHiddenAction->setObjectName("qt_show_hidden_action"_L1); showHiddenAction->setCheckable(true); - QObject::connect(showHiddenAction, SIGNAL(triggered()), q, SLOT(_q_showHidden())); + QObjectPrivate::connect(showHiddenAction, &QAction::triggered, + this, &QFileDialogPrivate::showHidden); newFolderAction = new QAction(q); - newFolderAction->setObjectName(QLatin1String("qt_new_folder_action")); - QObject::connect(newFolderAction, SIGNAL(triggered()), q, SLOT(_q_createDirectory())); + newFolderAction->setObjectName("qt_new_folder_action"_L1); + QObjectPrivate::connect(newFolderAction, &QAction::triggered, + this, &QFileDialogPrivate::createDirectory); } -void QFileDialogPrivate::_q_goHome() +void QFileDialogPrivate::goHome() { Q_Q(QFileDialog); q->setDirectory(QDir::homePath()); @@ -3346,7 +3368,7 @@ void QFileDialogPrivate::saveHistorySelection() Update history with new path, buttons, and combo */ -void QFileDialogPrivate::_q_pathChanged(const QString &newPath) +void QFileDialogPrivate::pathChanged(const QString &newPath) { Q_Q(QFileDialog); qFileDialogUi->toParentButton->setEnabled(QFileInfo::exists(model->rootPath())); @@ -3359,7 +3381,7 @@ void QFileDialogPrivate::_q_pathChanged(const QString &newPath) if (currentHistoryLocation < 0 || currentHistory.value(currentHistoryLocation).path != newNativePath) { if (currentHistoryLocation >= 0) saveHistorySelection(); - while (currentHistoryLocation >= 0 && currentHistoryLocation + 1 < currentHistory.count()) { + while (currentHistoryLocation >= 0 && currentHistoryLocation + 1 < currentHistory.size()) { currentHistory.removeLast(); } currentHistory.append({newNativePath, PersistentModelIndexList()}); @@ -3390,8 +3412,10 @@ void QFileDialogPrivate::navigate(HistoryItem &historyItem) | QItemSelectionModel::Rows; selectionModel->select(historyItem.selection.constFirst(), flags | QItemSelectionModel::Clear | QItemSelectionModel::Current); - for (int i = 1, size = historyItem.selection.size(); i < size; ++i) - selectionModel->select(historyItem.selection.at(i), flags); + auto it = historyItem.selection.cbegin() + 1; + const auto end = historyItem.selection.cend(); + for (; it != end; ++it) + selectionModel->select(*it, flags); view->scrollTo(historyItem.selection.constFirst()); } @@ -3401,7 +3425,7 @@ void QFileDialogPrivate::navigate(HistoryItem &historyItem) Navigates to the last directory viewed in the dialog. */ -void QFileDialogPrivate::_q_navigateBackward() +void QFileDialogPrivate::navigateBackward() { if (!currentHistory.isEmpty() && currentHistoryLocation > 0) { saveHistorySelection(); @@ -3414,7 +3438,7 @@ void QFileDialogPrivate::_q_navigateBackward() Navigates to the last directory viewed in the dialog. */ -void QFileDialogPrivate::_q_navigateForward() +void QFileDialogPrivate::navigateForward() { if (!currentHistory.isEmpty() && currentHistoryLocation < currentHistory.size() - 1) { saveHistorySelection(); @@ -3428,7 +3452,7 @@ void QFileDialogPrivate::_q_navigateForward() Navigates to the parent directory of the currently displayed directory in the dialog. */ -void QFileDialogPrivate::_q_navigateToParent() +void QFileDialogPrivate::navigateToParent() { Q_Q(QFileDialog); QDir dir(model->rootDirectory()); @@ -3448,7 +3472,7 @@ void QFileDialogPrivate::_q_navigateToParent() Creates a new directory, first asking the user for a suitable name. */ -void QFileDialogPrivate::_q_createDirectory() +void QFileDialogPrivate::createDirectory() { Q_Q(QFileDialog); qFileDialogUi->listView->clearSelection(); @@ -3475,7 +3499,7 @@ void QFileDialogPrivate::_q_createDirectory() } } -void QFileDialogPrivate::_q_showListView() +void QFileDialogPrivate::showListView() { qFileDialogUi->listModeButton->setDown(true); qFileDialogUi->detailModeButton->setDown(false); @@ -3485,7 +3509,7 @@ void QFileDialogPrivate::_q_showListView() qFileDialogUi->listView->doItemsLayout(); } -void QFileDialogPrivate::_q_showDetailsView() +void QFileDialogPrivate::showDetailsView() { qFileDialogUi->listModeButton->setDown(false); qFileDialogUi->detailModeButton->setDown(true); @@ -3500,7 +3524,7 @@ void QFileDialogPrivate::_q_showDetailsView() Show the context menu for the file/dir under position */ -void QFileDialogPrivate::_q_showContextMenu(const QPoint &position) +void QFileDialogPrivate::showContextMenu(const QPoint &position) { #if !QT_CONFIG(menu) Q_UNUSED(position); @@ -3514,30 +3538,33 @@ void QFileDialogPrivate::_q_showContextMenu(const QPoint &position) QModelIndex index = view->indexAt(position); index = mapToSource(index.sibling(index.row(), 0)); - QMenu menu(view); + QMenu *menu = new QMenu(view); + menu->setAttribute(Qt::WA_DeleteOnClose); + if (index.isValid()) { // file context menu const bool ro = model && model->isReadOnly(); QFile::Permissions p(index.parent().data(QFileSystemModel::FilePermissions).toInt()); renameAction->setEnabled(!ro && p & QFile::WriteUser); - menu.addAction(renameAction); + menu->addAction(renameAction); deleteAction->setEnabled(!ro && p & QFile::WriteUser); - menu.addAction(deleteAction); - menu.addSeparator(); + menu->addAction(deleteAction); + menu->addSeparator(); } - menu.addAction(showHiddenAction); + menu->addAction(showHiddenAction); if (qFileDialogUi->newFolderButton->isVisible()) { newFolderAction->setEnabled(qFileDialogUi->newFolderButton->isEnabled()); - menu.addAction(newFolderAction); + menu->addAction(newFolderAction); } - menu.exec(view->viewport()->mapToGlobal(position)); + menu->popup(view->viewport()->mapToGlobal(position)); + #endif // QT_CONFIG(menu) } /*! \internal */ -void QFileDialogPrivate::_q_renameCurrent() +void QFileDialogPrivate::renameCurrent() { Q_Q(QFileDialog); QModelIndex index = qFileDialogUi->listView->currentIndex(); @@ -3559,14 +3586,14 @@ bool QFileDialogPrivate::removeDirectory(const QString &path) Deletes the currently selected item in the dialog. */ -void QFileDialogPrivate::_q_deleteCurrent() +void QFileDialogPrivate::deleteCurrent() { if (model->isReadOnly()) return; - QModelIndexList list = qFileDialogUi->listView->selectionModel()->selectedRows(); - for (int i = list.count() - 1; i >= 0; --i) { - QPersistentModelIndex index = list.at(i); + const QModelIndexList list = qFileDialogUi->listView->selectionModel()->selectedRows(); + for (auto it = list.crbegin(), end = list.crend(); it != end; ++it) { + QPersistentModelIndex index = *it; if (index == qFileDialogUi->listView->rootIndex()) continue; @@ -3613,15 +3640,15 @@ void QFileDialogPrivate::_q_deleteCurrent() } } -void QFileDialogPrivate::_q_autoCompleteFileName(const QString &text) +void QFileDialogPrivate::autoCompleteFileName(const QString &text) { - if (text.startsWith(QLatin1String("//")) || text.startsWith(QLatin1Char('\\'))) { + if (text.startsWith("//"_L1) || text.startsWith(u'\\')) { qFileDialogUi->listView->selectionModel()->clearSelection(); return; } const QStringList multipleFiles = typedFiles(); - if (multipleFiles.count() > 0) { + if (multipleFiles.size() > 0) { QModelIndexList oldFiles = qFileDialogUi->listView->selectionModel()->selectedRows(); QList<QModelIndex> newFiles; for (const auto &file : multipleFiles) { @@ -3629,11 +3656,11 @@ void QFileDialogPrivate::_q_autoCompleteFileName(const QString &text) if (oldFiles.removeAll(idx) == 0) newFiles.append(idx); } - for (const auto &newFile : qAsConst(newFiles)) + for (const auto &newFile : std::as_const(newFiles)) select(newFile); if (lineEdit()->hasFocus()) { auto *sm = qFileDialogUi->listView->selectionModel(); - for (const auto &oldFile : qAsConst(oldFiles)) + for (const auto &oldFile : std::as_const(oldFiles)) sm->select(oldFile, QItemSelectionModel::Toggle | QItemSelectionModel::Rows); } } @@ -3642,7 +3669,7 @@ void QFileDialogPrivate::_q_autoCompleteFileName(const QString &text) /*! \internal */ -void QFileDialogPrivate::_q_updateOkButton() +void QFileDialogPrivate::updateOkButton() { Q_Q(QFileDialog); QPushButton *button = qFileDialogUi->buttonBox->button((q->acceptMode() == QFileDialog::AcceptOpen) @@ -3657,7 +3684,7 @@ void QFileDialogPrivate::_q_updateOkButton() const QStringList files = q->selectedFiles(); QString lineEditText = lineEdit()->text(); - if (lineEditText.startsWith(QLatin1String("//")) || lineEditText.startsWith(QLatin1Char('\\'))) { + if (lineEditText.startsWith("//"_L1) || lineEditText.startsWith(u'\\')) { button->setEnabled(true); updateOkButtonText(); return; @@ -3665,7 +3692,7 @@ void QFileDialogPrivate::_q_updateOkButton() if (files.isEmpty()) { enableButton = false; - } else if (lineEditText == QLatin1String("..")) { + } else if (lineEditText == ".."_L1) { isOpenDirectory = true; } else { switch (fileMode) { @@ -3687,10 +3714,10 @@ void QFileDialogPrivate::_q_updateOkButton() if (info.isDir()) { fileDir = info.canonicalFilePath(); } else { - fileDir = fn.mid(0, fn.lastIndexOf(QLatin1Char('/'))); - fileName = fn.mid(fileDir.length() + 1); + fileDir = fn.mid(0, fn.lastIndexOf(u'/')); + fileName = fn.mid(fileDir.size() + 1); } - if (lineEditText.contains(QLatin1String(".."))) { + if (lineEditText.contains(".."_L1)) { fileDir = info.canonicalFilePath(); fileName = info.fileName(); } @@ -3705,8 +3732,8 @@ void QFileDialogPrivate::_q_updateOkButton() break; } if (!idx.isValid()) { - int maxLength = maxNameLength(fileDir); - enableButton = maxLength < 0 || fileName.length() <= maxLength; + const long maxLength = maxNameLength(fileDir); + enableButton = maxLength < 0 || fileName.size() <= maxLength; } break; } @@ -3738,9 +3765,9 @@ void QFileDialogPrivate::_q_updateOkButton() /*! \internal */ -void QFileDialogPrivate::_q_currentChanged(const QModelIndex &index) +void QFileDialogPrivate::currentChanged(const QModelIndex &index) { - _q_updateOkButton(); + updateOkButton(); emit q_func()->currentChanged(index.data(QFileSystemModel::FilePathRole).toString()); } @@ -3750,7 +3777,7 @@ void QFileDialogPrivate::_q_currentChanged(const QModelIndex &index) This is called when the user double clicks on a file with the corresponding model item \a index. */ -void QFileDialogPrivate::_q_enterDirectory(const QModelIndex &index) +void QFileDialogPrivate::enterDirectory(const QModelIndex &index) { Q_Q(QFileDialog); // My Computer or a directory @@ -3767,8 +3794,9 @@ void QFileDialogPrivate::_q_enterDirectory(const QModelIndex &index) } } else { // Do not accept when shift-clicking to multi-select a file in environments with single-click-activation (KDE) - if (!q->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, nullptr, qFileDialogUi->treeView) - || q->fileMode() != QFileDialog::ExistingFiles || !(QGuiApplication::keyboardModifiers() & Qt::CTRL)) { + if ((!q->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, nullptr, qFileDialogUi->treeView) + || q->fileMode() != QFileDialog::ExistingFiles || !(QGuiApplication::keyboardModifiers() & Qt::CTRL)) + && index.model()->flags(index) & Qt::ItemIsEnabled) { q->accept(); } } @@ -3780,8 +3808,10 @@ void QFileDialogPrivate::_q_enterDirectory(const QModelIndex &index) Changes the file dialog's current directory to the one specified by \a path. */ -void QFileDialogPrivate::_q_goToDirectory(const QString &path) +void QFileDialogPrivate::goToDirectory(const QString &path) { + enum { UrlRole = Qt::UserRole + 1 }; + #if QT_CONFIG(messagebox) Q_Q(QFileDialog); #endif @@ -3800,7 +3830,7 @@ void QFileDialogPrivate::_q_goToDirectory(const QString &path) dir.setPath(getEnvironmentVariable(path2)); if (dir.exists() || path2.isEmpty() || path2 == model->myComputer().toString()) { - _q_enterDirectory(index); + enterDirectory(index); #if QT_CONFIG(messagebox) } else { QString message = QFileDialog::tr("%1\nDirectory not found.\nPlease verify the " @@ -3816,7 +3846,7 @@ void QFileDialogPrivate::_q_goToDirectory(const QString &path) Sets the current name filter to be nameFilter and update the qFileDialogUi->fileNameEdit when in AcceptSave mode with the new extension. */ -void QFileDialogPrivate::_q_useNameFilter(int index) +void QFileDialogPrivate::useNameFilter(int index) { QStringList nameFilters = options->nameFilters(); if (index == nameFilters.size()) { @@ -3829,14 +3859,14 @@ void QFileDialogPrivate::_q_useNameFilter(int index) QStringList newNameFilters = QPlatformFileDialogHelper::cleanFilterList(nameFilter); if (q_func()->acceptMode() == QFileDialog::AcceptSave) { QString newNameFilterExtension; - if (newNameFilters.count() > 0) + if (newNameFilters.size() > 0) newNameFilterExtension = QFileInfo(newNameFilters.at(0)).suffix(); QString fileName = lineEdit()->text(); const QString fileNameExtension = QFileInfo(fileName).suffix(); if (!fileNameExtension.isEmpty() && !newNameFilterExtension.isEmpty()) { - const int fileNameExtensionLength = fileNameExtension.count(); - fileName.replace(fileName.count() - fileNameExtensionLength, + const qsizetype fileNameExtensionLength = fileNameExtension.size(); + fileName.replace(fileName.size() - fileNameExtensionLength, fileNameExtensionLength, newNameFilterExtension); qFileDialogUi->listView->clearSelection(); lineEdit()->setText(fileName); @@ -3852,7 +3882,7 @@ void QFileDialogPrivate::_q_useNameFilter(int index) This is called when the model index corresponding to the current file is changed from \a index to \a current. */ -void QFileDialogPrivate::_q_selectionChanged() +void QFileDialogPrivate::selectionChanged() { const QFileDialog::FileMode fileMode = q_func()->fileMode(); const QModelIndexList indexes = qFileDialogUi->listView->selectionModel()->selectedRows(); @@ -3864,16 +3894,16 @@ void QFileDialogPrivate::_q_selectionChanged() continue; allFiles.append(index.data().toString()); } - if (allFiles.count() > 1) - for (int i = 0; i < allFiles.count(); ++i) { - allFiles.replace(i, QString(QLatin1Char('"') + allFiles.at(i) + QLatin1Char('"'))); + if (allFiles.size() > 1) + for (qsizetype i = 0; i < allFiles.size(); ++i) { + allFiles.replace(i, QString(u'"' + allFiles.at(i) + u'"')); } - QString finalFiles = allFiles.join(QLatin1Char(' ')); + QString finalFiles = allFiles.join(u' '); if (!finalFiles.isEmpty() && !lineEdit()->hasFocus() && lineEdit()->isVisible()) lineEdit()->setText(finalFiles); else - _q_updateOkButton(); + updateOkButton(); } /*! @@ -3881,7 +3911,7 @@ void QFileDialogPrivate::_q_selectionChanged() Includes hidden files and directories in the items displayed in the dialog. */ -void QFileDialogPrivate::_q_showHidden() +void QFileDialogPrivate::showHidden() { Q_Q(QFileDialog); QDir::Filters dirFilters = q->filter(); @@ -3895,7 +3925,7 @@ void QFileDialogPrivate::_q_showHidden() When parent is root and rows have been inserted when none was there before then select the first one. */ -void QFileDialogPrivate::_q_rowsInserted(const QModelIndex &parent) +void QFileDialogPrivate::rowsInserted(const QModelIndex &parent) { if (!qFileDialogUi->treeView || parent != qFileDialogUi->treeView->rootIndex() @@ -3905,7 +3935,7 @@ void QFileDialogPrivate::_q_rowsInserted(const QModelIndex &parent) return; } -void QFileDialogPrivate::_q_fileRenamed(const QString &path, const QString &oldName, const QString &newName) +void QFileDialogPrivate::fileRenamed(const QString &path, const QString &oldName, const QString &newName) { const QFileDialog::FileMode fileMode = q_func()->fileMode(); if (fileMode == QFileDialog::Directory) { @@ -3914,7 +3944,7 @@ void QFileDialogPrivate::_q_fileRenamed(const QString &path, const QString &oldN } } -void QFileDialogPrivate::_q_emitUrlSelected(const QUrl &file) +void QFileDialogPrivate::emitUrlSelected(const QUrl &file) { Q_Q(QFileDialog); emit q->urlSelected(file); @@ -3922,7 +3952,7 @@ void QFileDialogPrivate::_q_emitUrlSelected(const QUrl &file) emit q->fileSelected(file.toLocalFile()); } -void QFileDialogPrivate::_q_emitUrlsSelected(const QList<QUrl> &files) +void QFileDialogPrivate::emitUrlsSelected(const QList<QUrl> &files) { Q_Q(QFileDialog); emit q->urlsSelected(files); @@ -3934,7 +3964,7 @@ void QFileDialogPrivate::_q_emitUrlsSelected(const QList<QUrl> &files) emit q->filesSelected(localFiles); } -void QFileDialogPrivate::_q_nativeCurrentChanged(const QUrl &file) +void QFileDialogPrivate::nativeCurrentChanged(const QUrl &file) { Q_Q(QFileDialog); emit q->currentUrlChanged(file); @@ -3942,7 +3972,7 @@ void QFileDialogPrivate::_q_nativeCurrentChanged(const QUrl &file) emit q->currentChanged(file.toLocalFile()); } -void QFileDialogPrivate::_q_nativeEnterDirectory(const QUrl &directory) +void QFileDialogPrivate::nativeEnterDirectory(const QUrl &directory) { Q_Q(QFileDialog); emit q->directoryUrlEntered(directory); @@ -3971,7 +4001,7 @@ bool QFileDialogPrivate::itemViewKeyboardEvent(QKeyEvent *event) { #endif switch (event->key()) { case Qt::Key_Backspace: - _q_navigateToParent(); + navigateToParent(); return true; case Qt::Key_Back: #ifdef QT_KEYPAD_NAVIGATION @@ -3980,7 +4010,7 @@ bool QFileDialogPrivate::itemViewKeyboardEvent(QKeyEvent *event) { #endif case Qt::Key_Left: if (event->key() == Qt::Key_Back || event->modifiers() == Qt::AltModifier) { - _q_navigateBackward(); + navigateBackward(); return true; } break; @@ -3993,11 +4023,11 @@ bool QFileDialogPrivate::itemViewKeyboardEvent(QKeyEvent *event) { QString QFileDialogPrivate::getEnvironmentVariable(const QString &string) { #ifdef Q_OS_UNIX - if (string.size() > 1 && string.startsWith(QLatin1Char('$'))) { + if (string.size() > 1 && string.startsWith(u'$')) { return QString::fromLocal8Bit(qgetenv(QStringView{string}.mid(1).toLatin1().constData())); } #else - if (string.size() > 2 && string.startsWith(QLatin1Char('%')) && string.endsWith(QLatin1Char('%'))) { + if (string.size() > 2 && string.startsWith(u'%') && string.endsWith(u'%')) { return QString::fromLocal8Bit(qgetenv(QStringView{string}.mid(1, string.size() - 2).toLatin1().constData())); } #endif @@ -4027,18 +4057,18 @@ void QFileDialogComboBox::showPopup() idx = idx.parent(); } // add "my computer" - list.append(QUrl(QLatin1String("file:"))); + list.append(QUrl("file:"_L1)); urlModel->addUrls(list, 0); idx = model()->index(model()->rowCount() - 1, 0); // append history QList<QUrl> urls; - for (int i = 0; i < m_history.count(); ++i) { + for (int i = 0; i < m_history.size(); ++i) { QUrl path = QUrl::fromLocalFile(m_history.at(i)); if (!urls.contains(path)) urls.prepend(path); } - if (urls.count() > 0) { + if (urls.size() > 0) { model()->insertRow(model()->rowCount()); idx = model()->index(model()->rowCount()-1, 0); // ### TODO maybe add a horizontal line before this @@ -4184,12 +4214,12 @@ QString QFSCompleter::pathFromIndex(const QModelIndex &index) const if (!currentLocation.isEmpty() && path.startsWith(currentLocation)) { #if defined(Q_OS_UNIX) if (currentLocation == QDir::separator()) - return path.mid(currentLocation.length()); + return path.remove(0, currentLocation.size()); #endif - if (currentLocation.endsWith(QLatin1Char('/'))) - return path.mid(currentLocation.length()); + if (currentLocation.endsWith(u'/')) + return path.remove(0, currentLocation.size()); else - return path.mid(currentLocation.length()+1); + return path.remove(0, currentLocation.size()+1); } return index.data(QFileSystemModel::FilePathRole).toString(); } @@ -4202,9 +4232,9 @@ QStringList QFSCompleter::splitPath(const QString &path) const QString pathCopy = QDir::toNativeSeparators(path); QChar sep = QDir::separator(); #if defined(Q_OS_WIN) - if (pathCopy == QLatin1String("\\") || pathCopy == QLatin1String("\\\\")) + if (pathCopy == "\\"_L1 || pathCopy == "\\\\"_L1) return QStringList(pathCopy); - QString doubleSlash(QLatin1String("\\\\")); + QString doubleSlash("\\\\"_L1); if (pathCopy.startsWith(doubleSlash)) pathCopy = pathCopy.mid(2); else @@ -4237,11 +4267,11 @@ QStringList QFSCompleter::splitPath(const QString &path) const #endif #if defined(Q_OS_WIN) - bool startsFromRoot = !parts.isEmpty() && parts[0].endsWith(QLatin1Char(':')); + bool startsFromRoot = !parts.isEmpty() && parts[0].endsWith(u':'); #else bool startsFromRoot = pathCopy[0] == sep; #endif - if (parts.count() == 1 || (parts.count() > 1 && !startsFromRoot)) { + if (parts.size() == 1 || (parts.size() > 1 && !startsFromRoot)) { const QFileSystemModel *dirModel; if (proxyModel) dirModel = qobject_cast<const QFileSystemModel *>(proxyModel->sourceModel()); @@ -4249,14 +4279,12 @@ QStringList QFSCompleter::splitPath(const QString &path) const dirModel = sourceModel; QString currentLocation = QDir::toNativeSeparators(dirModel->rootPath()); #if defined(Q_OS_WIN) - if (currentLocation.endsWith(QLatin1Char(':'))) + if (currentLocation.endsWith(u':')) currentLocation.append(sep); #endif if (currentLocation.contains(sep) && path != currentLocation) { QStringList currentLocationList = splitPath(currentLocation); - while (!currentLocationList.isEmpty() - && parts.count() > 0 - && parts.at(0) == QLatin1String("..")) { + while (!currentLocationList.isEmpty() && parts.size() > 0 && parts.at(0) == ".."_L1) { parts.removeFirst(); currentLocationList.removeLast(); } diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index 73136c3707..d59392753a 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QFILEDIALOG_H #define QFILEDIALOG_H @@ -249,8 +213,20 @@ public: const QStringList &supportedSchemes = QStringList()); static void getOpenFileContent(const QString &nameFilter, + const std::function<void(const QString &, const QByteArray &)> &fileContentsReady, + QWidget *parent= nullptr); + + static void saveFileContent(const QByteArray &fileContent, + const QString &fileNameHint, + QWidget *parent = nullptr); + +#if QT_WIDGETS_REMOVED_SINCE(6, 7) + static void getOpenFileContent(const QString &nameFilter, const std::function<void(const QString &, const QByteArray &)> &fileContentsReady); - static void saveFileContent(const QByteArray &fileContent, const QString &fileNameHint = QString()); + static void saveFileContent(const QByteArray &fileContent, + const QString &fileNameHint = QString()); +#endif + protected: QFileDialog(const QFileDialogArgs &args); @@ -262,36 +238,6 @@ private: Q_DECLARE_PRIVATE(QFileDialog) Q_DISABLE_COPY(QFileDialog) - Q_PRIVATE_SLOT(d_func(), void _q_pathChanged(const QString &)) - - Q_PRIVATE_SLOT(d_func(), void _q_navigateBackward()) - Q_PRIVATE_SLOT(d_func(), void _q_navigateForward()) - Q_PRIVATE_SLOT(d_func(), void _q_navigateToParent()) - Q_PRIVATE_SLOT(d_func(), void _q_createDirectory()) - Q_PRIVATE_SLOT(d_func(), void _q_showListView()) - Q_PRIVATE_SLOT(d_func(), void _q_showDetailsView()) - Q_PRIVATE_SLOT(d_func(), void _q_showContextMenu(const QPoint &)) - Q_PRIVATE_SLOT(d_func(), void _q_renameCurrent()) - Q_PRIVATE_SLOT(d_func(), void _q_deleteCurrent()) - Q_PRIVATE_SLOT(d_func(), void _q_showHidden()) - Q_PRIVATE_SLOT(d_func(), void _q_updateOkButton()) - Q_PRIVATE_SLOT(d_func(), void _q_currentChanged(const QModelIndex &index)) - Q_PRIVATE_SLOT(d_func(), void _q_enterDirectory(const QModelIndex &index)) - Q_PRIVATE_SLOT(d_func(), void _q_emitUrlSelected(const QUrl &)) - Q_PRIVATE_SLOT(d_func(), void _q_emitUrlsSelected(const QList<QUrl> &)) - Q_PRIVATE_SLOT(d_func(), void _q_nativeCurrentChanged(const QUrl &)) - Q_PRIVATE_SLOT(d_func(), void _q_nativeEnterDirectory(const QUrl&)) - Q_PRIVATE_SLOT(d_func(), void _q_goToDirectory(const QString &path)) - Q_PRIVATE_SLOT(d_func(), void _q_useNameFilter(int index)) - Q_PRIVATE_SLOT(d_func(), void _q_selectionChanged()) - Q_PRIVATE_SLOT(d_func(), void _q_goToUrl(const QUrl &url)) - Q_PRIVATE_SLOT(d_func(), void _q_goHome()) - Q_PRIVATE_SLOT(d_func(), void _q_showHeader(QAction *)) - Q_PRIVATE_SLOT(d_func(), void _q_autoCompleteFileName(const QString &text)) - Q_PRIVATE_SLOT(d_func(), void _q_rowsInserted(const QModelIndex & parent)) - Q_PRIVATE_SLOT(d_func(), void _q_fileRenamed(const QString &path, - const QString &oldName, - const QString &newName)) friend class QPlatformDialogHelper; }; diff --git a/src/widgets/dialogs/qfiledialog.ui b/src/widgets/dialogs/qfiledialog.ui index e4b4aad6ce..f275e20c63 100644 --- a/src/widgets/dialogs/qfiledialog.ui +++ b/src/widgets/dialogs/qfiledialog.ui @@ -1,43 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <comment>********************************************************************* -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -*********************************************************************</comment> +<comment> +* Copyright (C) 2016 The Qt Company Ltd. +* SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +</comment> <class>QFileDialog</class> <widget class="QDialog" name="QFileDialog"> <property name="geometry"> diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index 28750ca22c..d5ee1c537b 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QFILEDIALOG_P_H #define QFILEDIALOG_P_H @@ -110,8 +74,6 @@ struct QFileDialogArgs QFileDialog::Options options = {}; }; -#define UrlRole (Qt::UserRole + 1) - class Q_WIDGETS_EXPORT QFileDialogPrivate : public QDialogPrivate { Q_DECLARE_PUBLIC(QFileDialog) @@ -158,11 +120,11 @@ public: QLineEdit *lineEdit() const; - static int maxNameLength(const QString &path); + static long maxNameLength(const QString &path); QString basename(const QString &path) const { - int separator = QDir::toNativeSeparators(path).lastIndexOf(QDir::separator()); + const qsizetype separator = QDir::toNativeSeparators(path).lastIndexOf(QDir::separator()); if (separator != -1) return path.mid(separator + 1); return path; @@ -182,7 +144,7 @@ public: { #if defined(Q_OS_WIN) QString n(path); - n.replace(QLatin1Char('\\'), QLatin1Char('/')); + n.replace(u'\\', u'/'); return n; #else // the compile should optimize away this return path; @@ -201,34 +163,34 @@ public: void emitFilesSelected(const QStringList &files); void saveHistorySelection(); - void _q_goHome(); - void _q_pathChanged(const QString &); + void goHome(); + void pathChanged(const QString &); void navigate(HistoryItem &); - void _q_navigateBackward(); - void _q_navigateForward(); - void _q_navigateToParent(); - void _q_createDirectory(); - void _q_showListView(); - void _q_showDetailsView(); - void _q_showContextMenu(const QPoint &position); - void _q_renameCurrent(); - void _q_deleteCurrent(); - void _q_showHidden(); - void _q_showHeader(QAction *); - void _q_updateOkButton(); - void _q_currentChanged(const QModelIndex &index); - void _q_enterDirectory(const QModelIndex &index); - void _q_emitUrlSelected(const QUrl &file); - void _q_emitUrlsSelected(const QList<QUrl> &files); - void _q_nativeCurrentChanged(const QUrl &file); - void _q_nativeEnterDirectory(const QUrl &directory); - void _q_goToDirectory(const QString &); - void _q_useNameFilter(int index); - void _q_selectionChanged(); - void _q_goToUrl(const QUrl &url); - void _q_autoCompleteFileName(const QString &); - void _q_rowsInserted(const QModelIndex & parent); - void _q_fileRenamed(const QString &path, const QString &oldName, const QString &newName); + void navigateBackward(); + void navigateForward(); + void navigateToParent(); + void createDirectory(); + void showListView(); + void showDetailsView(); + void showContextMenu(const QPoint &position); + void renameCurrent(); + void deleteCurrent(); + void showHidden(); + void showHeader(QAction *); + void updateOkButton(); + void currentChanged(const QModelIndex &index); + void enterDirectory(const QModelIndex &index); + void emitUrlSelected(const QUrl &file); + void emitUrlsSelected(const QList<QUrl> &files); + void nativeCurrentChanged(const QUrl &file); + void nativeEnterDirectory(const QUrl &directory); + void goToDirectory(const QString &); + void useNameFilter(int index); + void selectionChanged(); + void goToUrl(const QUrl &url); + void autoCompleteFileName(const QString &); + void rowsInserted(const QModelIndex & parent); + void fileRenamed(const QString &path, const QString &oldName, const QString &newName); // layout #if QT_CONFIG(proxymodel) @@ -259,6 +221,7 @@ public: // dialog. Returning false means that a non-native dialog must be // used instead. bool canBeNativeDialog() const override; + void setVisible(bool visible) override; inline bool usingWidgets() const; inline void setDirectory_sys(const QUrl &directory); @@ -295,6 +258,8 @@ private: virtual void helperPrepareShow(QPlatformDialogHelper *) override; virtual void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) override; + void itemNotFound(const QString &fileName, QFileDialog::FileMode mode); + bool itemAlreadyExists(const QString &fileName); Q_DISABLE_COPY_MOVE(QFileDialogPrivate) }; diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h index a90b9479ca..9bf7f25945 100644 --- a/src/widgets/dialogs/qfilesystemmodel.h +++ b/src/widgets/dialogs/qfilesystemmodel.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <QtGui/QFileSystemModel> diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index f1c844df5e..628297d22b 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qwindowdefs.h" #include "qfontdialog.h" @@ -63,6 +27,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QFontListView : public QListView { Q_OBJECT @@ -103,7 +69,7 @@ QFontListView::QFontListView(QWidget *parent) setEditTriggers(NoEditTriggers); } -static const Qt::WindowFlags DefaultWindowFlags = +static const Qt::WindowFlags qfd_DefaultWindowFlags = Qt::Dialog | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint; QFontDialogPrivate::QFontDialogPrivate() @@ -153,7 +119,7 @@ QFontDialogPrivate::~QFontDialogPrivate() \sa getFont() */ QFontDialog::QFontDialog(QWidget *parent) - : QDialog(*new QFontDialogPrivate, parent, DefaultWindowFlags) + : QDialog(*new QFontDialogPrivate, parent, qfd_DefaultWindowFlags) { Q_D(QFontDialog); d->init(); @@ -228,7 +194,7 @@ void QFontDialogPrivate::init() sampleEdit->setAlignment(Qt::AlignCenter); // Note that the sample text is *not* translated with tr(), as the // characters used depend on the charset encoding. - sampleEdit->setText(QLatin1String("AaBbYyZz")); + sampleEdit->setText("AaBbYyZz"_L1); hbox->addWidget(sampleEdit); writingSystemCombo = new QComboBox(q); @@ -242,14 +208,21 @@ void QFontDialogPrivate::init() size = 0; smoothScalable = false; - QObject::connect(writingSystemCombo, SIGNAL(activated(int)), q, SLOT(_q_writingSystemHighlighted(int))); - QObject::connect(familyList, SIGNAL(highlighted(int)), q, SLOT(_q_familyHighlighted(int))); - QObject::connect(styleList, SIGNAL(highlighted(int)), q, SLOT(_q_styleHighlighted(int))); - QObject::connect(sizeList, SIGNAL(highlighted(int)), q, SLOT(_q_sizeHighlighted(int))); - QObject::connect(sizeEdit, SIGNAL(textChanged(QString)), q, SLOT(_q_sizeChanged(QString))); - - QObject::connect(strikeout, SIGNAL(clicked()), q, SLOT(_q_updateSample())); - QObject::connect(underline, SIGNAL(clicked()), q, SLOT(_q_updateSample())); + QObjectPrivate::connect(writingSystemCombo, &QComboBox::activated, + this, &QFontDialogPrivate::writingSystemHighlighted); + QObjectPrivate::connect(familyList, &QFontListView::highlighted, + this, &QFontDialogPrivate::familyHighlighted); + QObjectPrivate::connect(styleList, &QFontListView::highlighted, + this, &QFontDialogPrivate::styleHighlighted); + QObjectPrivate::connect(sizeList, &QFontListView::highlighted, + this, &QFontDialogPrivate::sizeHighlighted); + QObjectPrivate::connect(sizeEdit, &QLineEdit::textChanged, + this, &QFontDialogPrivate::sizeChanged); + + QObjectPrivate::connect(strikeout, &QCheckBox::clicked, + this, &QFontDialogPrivate::updateSample); + QObjectPrivate::connect(underline, &QCheckBox::clicked, this, + &QFontDialogPrivate::updateSample); for (int i = 0; i < QFontDatabase::WritingSystemsCount; ++i) { QFontDatabase::WritingSystem ws = QFontDatabase::WritingSystem(i); @@ -311,11 +284,11 @@ void QFontDialogPrivate::init() QPushButton *button = static_cast<QPushButton *>(buttonBox->addButton(QDialogButtonBox::Ok)); - QObject::connect(buttonBox, SIGNAL(accepted()), q, SLOT(accept())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, q, &QDialog::accept); button->setDefault(true); buttonBox->addButton(QDialogButtonBox::Cancel); - QObject::connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, q, &QDialog::reject); q->resize(500, 360); @@ -326,7 +299,7 @@ void QFontDialogPrivate::init() familyList->setFocus(); retranslateStrings(); - sampleEdit->setObjectName(QLatin1String("qt_fontDialog_sampleEdit")); + sampleEdit->setObjectName("qt_fontDialog_sampleEdit"_L1); } /*! @@ -424,7 +397,7 @@ bool QFontDialog::eventFilter(QObject *o , QEvent *e) { Q_D(QFontDialog); if (e->type() == QEvent::KeyPress) { - QKeyEvent *k = (QKeyEvent *)e; + QKeyEvent *k = static_cast<QKeyEvent *>(e); if (o == d->sizeEdit && (k->key() == Qt::Key_Up || k->key() == Qt::Key_Down || @@ -460,10 +433,14 @@ bool QFontDialog::eventFilter(QObject *o , QEvent *e) void QFontDialogPrivate::initHelper(QPlatformDialogHelper *h) { - QFontDialog *d = q_func(); - QObject::connect(h, SIGNAL(currentFontChanged(QFont)), d, SIGNAL(currentFontChanged(QFont))); - QObject::connect(h, SIGNAL(fontSelected(QFont)), d, SIGNAL(fontSelected(QFont))); - static_cast<QPlatformFontDialogHelper *>(h)->setOptions(options); + Q_Q(QFontDialog); + auto *fontDialogHelper = static_cast<QPlatformFontDialogHelper *>(h); + fontDialogHelper->setOptions(options); + fontDialogHelper->setCurrentFont(q->currentFont()); + QObject::connect(fontDialogHelper, &QPlatformFontDialogHelper::currentFontChanged, + q, &QFontDialog::currentFontChanged); + QObject::connect(fontDialogHelper, &QPlatformFontDialogHelper::fontSelected, + q, &QFontDialog::fontSelected); } void QFontDialogPrivate::helperPrepareShow(QPlatformDialogHelper *) @@ -532,9 +509,9 @@ void QFontDialogPrivate::updateFamilies() //and try some fall backs match_t type = MATCH_NONE; - if (bestFamilyType <= MATCH_NONE && familyName2 == QStringLiteral("helvetica")) + if (bestFamilyType <= MATCH_NONE && familyName2 == "helvetica"_L1) type = MATCH_LAST_RESORT; - if (bestFamilyType <= MATCH_LAST_RESORT && familyName2 == f.families().first()) + if (bestFamilyType <= MATCH_LAST_RESORT && familyName2 == f.families().constFirst()) type = MATCH_APP; // ### add fallback for writingSystem if (type != MATCH_NONE) { @@ -583,20 +560,20 @@ void QFontDialogPrivate::updateStyles() } } if (!found && first) { - if (cstyle.contains(QLatin1String("Italic"))) { - cstyle.replace(QLatin1String("Italic"), QLatin1String("Oblique")); + if (cstyle.contains("Italic"_L1)) { + cstyle.replace("Italic"_L1, "Oblique"_L1); first = false; goto redo; - } else if (cstyle.contains(QLatin1String("Oblique"))) { - cstyle.replace(QLatin1String("Oblique"), QLatin1String("Italic")); + } else if (cstyle.contains("Oblique"_L1)) { + cstyle.replace("Oblique"_L1, "Italic"_L1); first = false; goto redo; - } else if (cstyle.contains(QLatin1String("Regular"))) { - cstyle.replace(QLatin1String("Regular"), QLatin1String("Normal")); + } else if (cstyle.contains("Regular"_L1)) { + cstyle.replace("Regular"_L1, "Normal"_L1); first = false; goto redo; - } else if (cstyle.contains(QLatin1String("Normal"))) { - cstyle.replace(QLatin1String("Normal"), QLatin1String("Regular")); + } else if (cstyle.contains("Normal"_L1)) { + cstyle.replace("Normal"_L1, "Regular"_L1); first = false; goto redo; } @@ -654,10 +631,10 @@ void QFontDialogPrivate::updateSizes() sizeEdit->clear(); } - _q_updateSample(); + updateSample(); } -void QFontDialogPrivate::_q_updateSample() +void QFontDialogPrivate::updateSample() { // compute new font int pSize = sizeEdit->text().toInt(); @@ -683,7 +660,7 @@ void QFontDialogPrivate::updateSampleFont(const QFont &newFont) /*! \internal */ -void QFontDialogPrivate::_q_writingSystemHighlighted(int index) +void QFontDialogPrivate::writingSystemHighlighted(int index) { writingSystem = QFontDatabase::WritingSystem(index); sampleEdit->setText(QFontDatabase::writingSystemSample(writingSystem)); @@ -693,7 +670,7 @@ void QFontDialogPrivate::_q_writingSystemHighlighted(int index) /*! \internal */ -void QFontDialogPrivate::_q_familyHighlighted(int i) +void QFontDialogPrivate::familyHighlighted(int i) { Q_Q(QFontDialog); family = familyList->text(i); @@ -710,7 +687,7 @@ void QFontDialogPrivate::_q_familyHighlighted(int i) \internal */ -void QFontDialogPrivate::_q_styleHighlighted(int index) +void QFontDialogPrivate::styleHighlighted(int index) { Q_Q(QFontDialog); QString s = styleList->text(index); @@ -729,7 +706,7 @@ void QFontDialogPrivate::_q_styleHighlighted(int index) \internal */ -void QFontDialogPrivate::_q_sizeHighlighted(int index) +void QFontDialogPrivate::sizeHighlighted(int index) { Q_Q(QFontDialog); QString s = sizeList->text(index); @@ -739,7 +716,7 @@ void QFontDialogPrivate::_q_sizeHighlighted(int index) sizeEdit->selectAll(); size = s.toInt(); - _q_updateSample(); + updateSample(); } /*! @@ -748,7 +725,7 @@ void QFontDialogPrivate::_q_sizeHighlighted(int index) The size is passed in the \a s argument as a \e string. */ -void QFontDialogPrivate::_q_sizeChanged(const QString &s) +void QFontDialogPrivate::sizeChanged(const QString &s) { // no need to check if the conversion is valid, since we have an QIntValidator in the size edit int size = s.toInt(); @@ -768,7 +745,7 @@ void QFontDialogPrivate::_q_sizeChanged(const QString &s) else sizeList->clearSelection(); } - _q_updateSample(); + updateSample(); } void QFontDialogPrivate::retranslateStrings() @@ -822,8 +799,11 @@ void QFontDialog::setCurrentFont(const QFont &font) d->strikeout->setChecked(font.strikeOut()); d->underline->setChecked(font.underline()); d->updateFamilies(); - if (QPlatformFontDialogHelper *helper = d->platformFontDialogHelper()) - helper->setCurrentFont(font); + + if (d->nativeDialogInUse) { + if (QPlatformFontDialogHelper *helper = d->platformFontDialogHelper()) + helper->setCurrentFont(font); + } } /*! @@ -836,8 +816,11 @@ void QFontDialog::setCurrentFont(const QFont &font) QFont QFontDialog::currentFont() const { Q_D(const QFontDialog); - if (const QPlatformFontDialogHelper *helper = d->platformFontDialogHelper()) - return helper->currentFont(); + + if (d->nativeDialogInUse) { + if (const QPlatformFontDialogHelper *helper = d->platformFontDialogHelper()) + return helper->currentFont(); + } return d->sampleEdit->font(); } @@ -986,20 +969,31 @@ void QFontDialog::open(QObject *receiver, const char *member) */ void QFontDialog::setVisible(bool visible) { - if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden) != visible) - return; - Q_D(QFontDialog); - if (d->canBeNativeDialog()) - d->setNativeDialogVisible(visible); - if (d->nativeDialogInUse) { + // will call QFontDialogPrivate::setVisible + QDialog::setVisible(visible); +} + +/*! + \internal + + The implementation of QFontDialog::setVisible() has to live here so that the call + to hide() in ~QDialog calls this function; it wouldn't call the override of + QDialog::setVisible(). +*/ +void QFontDialogPrivate::setVisible(bool visible) +{ + Q_Q(QFontDialog); + + if (canBeNativeDialog()) + setNativeDialogVisible(visible); + if (nativeDialogInUse) { // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below // updates the state correctly, but skips showing the non-native version: - setAttribute(Qt::WA_DontShowOnScreen, true); + q->setAttribute(Qt::WA_DontShowOnScreen, true); } else { - d->nativeDialogInUse = false; - setAttribute(Qt::WA_DontShowOnScreen, false); + q->setAttribute(Qt::WA_DontShowOnScreen, false); } - QDialog::setVisible(visible); + QDialogPrivate::setVisible(visible); } /*! @@ -1043,9 +1037,7 @@ bool QFontDialogPrivate::canBeNativeDialog() const return false; } - QLatin1String staticName(QFontDialog::staticMetaObject.className()); - QLatin1String dynamicName(q->metaObject()->className()); - return (staticName == dynamicName); + return strcmp(QFontDialog::staticMetaObject.className(), q->metaObject()->className()) == 0; } QT_END_NAMESPACE diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index ae1320e779..b2900d6a6b 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QFONTDIALOG_H #define QFONTDIALOG_H @@ -106,13 +70,6 @@ protected: private: Q_DISABLE_COPY(QFontDialog) - - Q_PRIVATE_SLOT(d_func(), void _q_sizeChanged(const QString &)) - Q_PRIVATE_SLOT(d_func(), void _q_familyHighlighted(int)) - Q_PRIVATE_SLOT(d_func(), void _q_writingSystemHighlighted(int)) - Q_PRIVATE_SLOT(d_func(), void _q_styleHighlighted(int)) - Q_PRIVATE_SLOT(d_func(), void _q_sizeHighlighted(int)) - Q_PRIVATE_SLOT(d_func(), void _q_updateSample()) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QFontDialog::FontDialogOptions) diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h index 73c17c3708..89b795f35e 100644 --- a/src/widgets/dialogs/qfontdialog_p.h +++ b/src/widgets/dialogs/qfontdialog_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QFONTDIALOG_P_H #define QFONTDIALOG_P_H @@ -57,6 +21,8 @@ #include "qfontdatabase.h" #include "qfontdialog.h" #include <qpa/qplatformdialoghelper.h> + +#include <QtCore/qpointer.h> #include "qsharedpointer.h" QT_REQUIRE_CONFIG(fontdialog); @@ -91,12 +57,12 @@ public: const QString &title, QFontDialog::FontDialogOptions options); void init(); - void _q_sizeChanged(const QString &); - void _q_familyHighlighted(int); - void _q_writingSystemHighlighted(int); - void _q_styleHighlighted(int); - void _q_sizeHighlighted(int); - void _q_updateSample(); + void sizeChanged(const QString &); + void familyHighlighted(int); + void writingSystemHighlighted(int); + void styleHighlighted(int); + void sizeHighlighted(int); + void updateSample(); void updateSampleFont(const QFont &newFont); void retranslateStrings(); @@ -141,6 +107,7 @@ public: QByteArray memberToDisconnectOnClose; bool canBeNativeDialog() const override; + void setVisible(bool visible) override; void _q_runNativeAppModalPanel(); private: diff --git a/src/widgets/dialogs/qfscompleter_p.h b/src/widgets/dialogs/qfscompleter_p.h index be46f5be43..3981e8a3af 100644 --- a/src/widgets/dialogs/qfscompleter_p.h +++ b/src/widgets/dialogs/qfscompleter_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QFSCOMPLETOR_P_H #define QFSCOMPLETOR_P_H diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp index 7569367768..6d1a0b2873 100644 --- a/src/widgets/dialogs/qinputdialog.cpp +++ b/src/widgets/dialogs/qinputdialog.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qinputdialog.h" @@ -54,6 +18,8 @@ #include "qevent.h" #include "qdialog_p.h" +#include <QtCore/qpointer.h> + QT_USE_NAMESPACE enum CandidateSignal { @@ -74,8 +40,7 @@ static const char *candidateSignal(int which) case NumCandidateSignals: break; }; - Q_UNREACHABLE(); - return nullptr; + Q_UNREACHABLE_RETURN(nullptr); } static const char *signalForMember(const char *member) @@ -105,8 +70,10 @@ class QInputDialogSpinBox : public QSpinBox public: QInputDialogSpinBox(QWidget *parent) : QSpinBox(parent) { - connect(lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(notifyTextChanged())); - connect(this, SIGNAL(editingFinished()), this, SLOT(notifyTextChanged())); + connect(lineEdit(), &QLineEdit::textChanged, + this, &QInputDialogSpinBox::notifyTextChanged); + connect(this, &QInputDialogSpinBox::editingFinished, + this, &QInputDialogSpinBox::notifyTextChanged); } signals: @@ -118,9 +85,7 @@ private slots: private: void keyPressEvent(QKeyEvent *event) override { if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && !hasAcceptableInput()) { -#ifndef QT_NO_PROPERTIES setProperty("value", property("value")); -#endif } else { QSpinBox::keyPressEvent(event); } @@ -140,8 +105,10 @@ class QInputDialogDoubleSpinBox : public QDoubleSpinBox public: QInputDialogDoubleSpinBox(QWidget *parent = nullptr) : QDoubleSpinBox(parent) { - connect(lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(notifyTextChanged())); - connect(this, SIGNAL(editingFinished()), this, SLOT(notifyTextChanged())); + connect(lineEdit(), &QLineEdit::textChanged, + this, &QInputDialogDoubleSpinBox::notifyTextChanged); + connect(this, &QInputDialogDoubleSpinBox::editingFinished, + this, &QInputDialogDoubleSpinBox::notifyTextChanged); } signals: @@ -153,9 +120,7 @@ private slots: private: void keyPressEvent(QKeyEvent *event) override { if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && !hasAcceptableInput()) { -#ifndef QT_NO_PROPERTIES setProperty("value", property("value")); -#endif } else { QDoubleSpinBox::keyPressEvent(event); } @@ -202,9 +167,9 @@ public: QString listViewText() const; void ensureLayout() const { const_cast<QInputDialogPrivate *>(this)->ensureLayout(); } bool useComboBoxOrListView() const { return comboBox && comboBox->count() > 0; } - void _q_textChanged(const QString &text); - void _q_plainTextEditTextChanged(); - void _q_currentRowChanged(const QModelIndex &newIndex, const QModelIndex &oldIndex); + void textChanged(const QString &text); + void plainTextEditTextChanged(); + void currentRowChanged(const QModelIndex &newIndex, const QModelIndex &oldIndex); mutable QLabel *label; mutable QDialogButtonBox *buttonBox; @@ -248,8 +213,8 @@ void QInputDialogPrivate::ensureLayout() label->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, q); - QObject::connect(buttonBox, SIGNAL(accepted()), q, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, q, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, q, &QDialog::reject); mainLayout = new QVBoxLayout(q); mainLayout->setSizeConstraint(QLayout::SetMinAndMaxSize); @@ -269,8 +234,8 @@ void QInputDialogPrivate::ensureLineEdit() qt_widget_private(lineEdit)->inheritsInputMethodHints = 1; #endif lineEdit->hide(); - QObject::connect(lineEdit, SIGNAL(textChanged(QString)), - q, SLOT(_q_textChanged(QString))); + QObjectPrivate::connect(lineEdit, &QLineEdit::textChanged, + this, &QInputDialogPrivate::textChanged); } } @@ -284,8 +249,8 @@ void QInputDialogPrivate::ensurePlainTextEdit() qt_widget_private(plainTextEdit)->inheritsInputMethodHints = 1; #endif plainTextEdit->hide(); - QObject::connect(plainTextEdit, SIGNAL(textChanged()), - q, SLOT(_q_plainTextEditTextChanged())); + QObjectPrivate::connect(plainTextEdit, &QPlainTextEdit::textChanged, + this, &QInputDialogPrivate::plainTextEditTextChanged); } } @@ -298,10 +263,10 @@ void QInputDialogPrivate::ensureComboBox() qt_widget_private(comboBox)->inheritsInputMethodHints = 1; #endif comboBox->hide(); - QObject::connect(comboBox, SIGNAL(editTextChanged(QString)), - q, SLOT(_q_textChanged(QString))); - QObject::connect(comboBox, SIGNAL(currentTextChanged(QString)), - q, SLOT(_q_textChanged(QString))); + QObjectPrivate::connect(comboBox, &QComboBox::editTextChanged, + this, &QInputDialogPrivate::textChanged); + QObjectPrivate::connect(comboBox, &QComboBox::currentTextChanged, + this, &QInputDialogPrivate::textChanged); } } @@ -316,9 +281,9 @@ void QInputDialogPrivate::ensureListView() listView->setSelectionMode(QAbstractItemView::SingleSelection); listView->setModel(comboBox->model()); listView->setCurrentIndex(QModelIndex()); // ### - QObject::connect(listView->selectionModel(), - SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), - q, SLOT(_q_currentRowChanged(QModelIndex,QModelIndex))); + QObjectPrivate::connect(listView->selectionModel(), + &QItemSelectionModel::currentRowChanged, + this, &QInputDialogPrivate::currentRowChanged); } } @@ -328,8 +293,8 @@ void QInputDialogPrivate::ensureIntSpinBox() if (!intSpinBox) { intSpinBox = new QInputDialogSpinBox(q); intSpinBox->hide(); - QObject::connect(intSpinBox, SIGNAL(valueChanged(int)), - q, SIGNAL(intValueChanged(int))); + QObject::connect(intSpinBox, &QInputDialogSpinBox::valueChanged, + q, &QInputDialog::intValueChanged); } } @@ -339,8 +304,8 @@ void QInputDialogPrivate::ensureDoubleSpinBox() if (!doubleSpinBox) { doubleSpinBox = new QInputDialogDoubleSpinBox(q); doubleSpinBox->hide(); - QObject::connect(doubleSpinBox, SIGNAL(valueChanged(double)), - q, SIGNAL(doubleValueChanged(double))); + QObject::connect(doubleSpinBox, &QInputDialogDoubleSpinBox::valueChanged, + q, &QInputDialog::doubleValueChanged); } } @@ -415,9 +380,9 @@ void QInputDialogPrivate::chooseRightTextInputWidget() setInputWidget(widget); if (inputWidget == comboBox) { - _q_textChanged(comboBox->currentText()); + textChanged(comboBox->currentText()); } else if (inputWidget == listView) { - _q_textChanged(listViewText()); + textChanged(listViewText()); } } @@ -451,7 +416,7 @@ QString QInputDialogPrivate::listViewText() const } } -void QInputDialogPrivate::_q_textChanged(const QString &text) +void QInputDialogPrivate::textChanged(const QString &text) { Q_Q(QInputDialog); if (textValue != text) { @@ -460,7 +425,7 @@ void QInputDialogPrivate::_q_textChanged(const QString &text) } } -void QInputDialogPrivate::_q_plainTextEditTextChanged() +void QInputDialogPrivate::plainTextEditTextChanged() { Q_Q(QInputDialog); QString text = plainTextEdit->toPlainText(); @@ -470,10 +435,10 @@ void QInputDialogPrivate::_q_plainTextEditTextChanged() } } -void QInputDialogPrivate::_q_currentRowChanged(const QModelIndex &newIndex, - const QModelIndex & /* oldIndex */) +void QInputDialogPrivate::currentRowChanged(const QModelIndex &newIndex, + const QModelIndex & /* oldIndex */) { - _q_textChanged(comboBox->model()->data(newIndex).toString()); + textChanged(comboBox->model()->data(newIndex).toString()); buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); } diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index d3c95ccd23..bbf757e6e6 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QINPUTDIALOG_H #define QINPUTDIALOG_H @@ -197,9 +161,6 @@ public: private: Q_DISABLE_COPY(QInputDialog) - Q_PRIVATE_SLOT(d_func(), void _q_textChanged(const QString&)) - Q_PRIVATE_SLOT(d_func(), void _q_plainTextEditTextChanged()) - Q_PRIVATE_SLOT(d_func(), void _q_currentRowChanged(const QModelIndex&, const QModelIndex&)) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QInputDialog::InputDialogOptions) diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 09c14f1ec1..bf56b17f55 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <QtWidgets/qmessagebox.h> @@ -64,14 +28,24 @@ #include <QtGui/qfontmetrics.h> #include <QtGui/qclipboard.h> #include "private/qabstractbutton_p.h" +#include <QtGui/qpa/qplatformtheme.h> + +#include <QtCore/qanystringview.h> +#include <QtCore/qdebug.h> +#include <QtCore/qpointer.h> +#include <QtCore/qversionnumber.h> #ifdef Q_OS_WIN # include <QtCore/qt_windows.h> #include <qpa/qplatformnativeinterface.h> #endif +#include <optional> + QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + #if defined(Q_OS_WIN) HMENU qt_getWindowsSystemMenu(const QWidget *w) { @@ -82,6 +56,20 @@ HMENU qt_getWindowsSystemMenu(const QWidget *w) } #endif +static_assert(qToUnderlying(QMessageBox::ButtonRole::NRoles) == + qToUnderlying(QDialogButtonBox::ButtonRole::NRoles), + "QMessageBox::ButtonRole and QDialogButtonBox::ButtonRole out of sync!"); + +static_assert(std::is_same_v<std::underlying_type_t<QMessageBox::ButtonRole>, + std::underlying_type_t<QDialogButtonBox::ButtonRole>>); + +// StandardButton enums have different underlying types +// => qToUnderlying and std::is_same_v won't work +// ### Qt 7: make them have the same underlying type +static_assert(static_cast<int>(QMessageBox::StandardButton::LastButton) == + static_cast<int>(QDialogButtonBox::StandardButton::LastButton), + "QMessageBox::StandardButton and QDialogButtonBox::StandardButton out of sync!"); + enum Button { Old_Ok = 1, Old_Cancel = 2, Old_Yes = 3, Old_No = 4, Old_Abort = 5, Old_Retry = 6, Old_Ignore = 7, Old_YesAll = 8, Old_NoAll = 9, Old_ButtonMask = 0xFF, NewButtonMask = 0xFFFFFC00 }; @@ -124,8 +112,8 @@ public: layout->addWidget(textEdit); setLayout(layout); - connect(textEdit, SIGNAL(copyAvailable(bool)), - this, SLOT(textCopyAvailable(bool))); + connect(textEdit, &TextEdit::copyAvailable, + this, &QMessageBoxDetailsText::textCopyAvailable); } void setText(const QString &text) { textEdit->setPlainText(text); } QString text() const { return textEdit->toPlainText(); } @@ -204,8 +192,8 @@ public: void init(const QString &title = QString(), const QString &text = QString()); void setupLayout(); - void _q_buttonClicked(QAbstractButton *); - void _q_clicked(QPlatformDialogHelper::StandardButton button, QPlatformDialogHelper::ButtonRole role); + void buttonClicked(QAbstractButton *); + void helperClicked(QPlatformDialogHelper::StandardButton button, QPlatformDialogHelper::ButtonRole role); void setClickedButton(QAbstractButton *button); QAbstractButton *findButton(int button0, int button1, int button2, int flags); @@ -214,13 +202,14 @@ public: QAbstractButton *abstractButtonForId(int id) const; int execReturnCode(QAbstractButton *button); - int dialogCodeForButton(QAbstractButton *button) const; - void detectEscapeButton(); void updateSize(); int layoutMinimumWidth(); void retranslateStrings(); + void setVisible(bool visible) override; + bool canBeNativeDialog() const override; + static int showOldMessageBox(QWidget *parent, QMessageBox::Icon icon, const QString &title, const QString &text, int button0, int button1, int button2); @@ -237,6 +226,7 @@ public: QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton); static QPixmap standardIcon(QMessageBox::Icon icon, QMessageBox *mb); + static QMessageBox::StandardButton standardButtonForRole(QMessageBox::ButtonRole role); QLabel *label; QMessageBox::Icon icon; @@ -262,7 +252,7 @@ public: private: void initHelper(QPlatformDialogHelper *) override; void helperPrepareShow(QPlatformDialogHelper *) override; - void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) override; + int dialogCode() const override; }; void QMessageBoxPrivate::init(const QString &title, const QString &text) @@ -270,19 +260,19 @@ void QMessageBoxPrivate::init(const QString &title, const QString &text) Q_Q(QMessageBox); label = new QLabel; - label->setObjectName(QLatin1String("qt_msgbox_label")); + label->setObjectName("qt_msgbox_label"_L1); label->setTextInteractionFlags(Qt::TextInteractionFlags(q->style()->styleHint(QStyle::SH_MessageBox_TextInteractionFlags, nullptr, q))); label->setAlignment(Qt::AlignVCenter | Qt::AlignLeft); label->setOpenExternalLinks(true); iconLabel = new QLabel(q); - iconLabel->setObjectName(QLatin1String("qt_msgboxex_icon_label")); + iconLabel->setObjectName("qt_msgboxex_icon_label"_L1); iconLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); buttonBox = new QDialogButtonBox; - buttonBox->setObjectName(QLatin1String("qt_msgbox_buttonbox")); + buttonBox->setObjectName("qt_msgbox_buttonbox"_L1); buttonBox->setCenterButtons(q->style()->styleHint(QStyle::SH_MessageBox_CenterButtons, nullptr, q)); - QObject::connect(buttonBox, SIGNAL(clicked(QAbstractButton*)), - q, SLOT(_q_buttonClicked(QAbstractButton*))); + QObjectPrivate::connect(buttonBox, &QDialogButtonBox::clicked, + this, &QMessageBoxPrivate::buttonClicked); setupLayout(); if (!title.isEmpty() || !text.isEmpty()) { q->setWindowTitle(title); @@ -302,7 +292,7 @@ void QMessageBoxPrivate::setupLayout() Q_Q(QMessageBox); delete q->layout(); QGridLayout *grid = new QGridLayout; - bool hasIcon = !iconLabel->pixmap(Qt::ReturnByValue).isNull(); + const bool hasIcon = !iconLabel->pixmap().isNull(); if (hasIcon) grid->addWidget(iconLabel, 0, 0, 2, 1, Qt::AlignTop); @@ -457,37 +447,50 @@ static int oldButton(int button) int QMessageBoxPrivate::execReturnCode(QAbstractButton *button) { - int ret = buttonBox->standardButton(button); - if (ret == QMessageBox::NoButton) { - ret = customButtonList.indexOf(button); // if button == 0, correctly sets ret = -1 - } else if (compatMode) { - ret = oldButton(ret); + if (int standardButton = buttonBox->standardButton(button)) { + // When using a QMessageBox with standard buttons, the return + // code is a StandardButton value indicating the standard button + // that was clicked. + if (compatMode) + return oldButton(standardButton); + else + return standardButton; + } else { + // When using QMessageBox with custom buttons, the return code + // is an opaque value, and the user is expected to use clickedButton() + // to determine which button was clicked. We make sure to keep the opaque + // value out of the QDialog::DialogCode range, so we can distinguish them. + auto customButtonIndex = customButtonList.indexOf(button); + if (customButtonIndex >= 0) + return QDialog::DialogCode::Accepted + customButtonIndex + 1; + else + return customButtonIndex; // Not found, return -1 } - return ret; } -/*! - \internal - - Returns 0 for RejectedRole and NoRole, 1 for AcceptedRole and YesRole, -1 otherwise - */ -int QMessageBoxPrivate::dialogCodeForButton(QAbstractButton *button) const +int QMessageBoxPrivate::dialogCode() const { Q_Q(const QMessageBox); - switch (q->buttonRole(button)) { - case QMessageBox::AcceptRole: - case QMessageBox::YesRole: - return QDialog::Accepted; - case QMessageBox::RejectRole: - case QMessageBox::NoRole: - return QDialog::Rejected; - default: - return -1; + if (rescode <= QDialog::Accepted) { + return rescode; + } else if (clickedButton) { + switch (q->buttonRole(clickedButton)) { + case QMessageBox::AcceptRole: + case QMessageBox::YesRole: + return QDialog::Accepted; + case QMessageBox::RejectRole: + case QMessageBox::NoRole: + return QDialog::Rejected; + default: + ; + } } + + return QDialogPrivate::dialogCode(); } -void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button) +void QMessageBoxPrivate::buttonClicked(QAbstractButton *button) { Q_Q(QMessageBox); #if QT_CONFIG(textedit) @@ -518,23 +521,26 @@ void QMessageBoxPrivate::setClickedButton(QAbstractButton *button) emit q->buttonClicked(clickedButton); auto resultCode = execReturnCode(button); - close(resultCode); - finalize(resultCode, dialogCodeForButton(button)); + q->done(resultCode); } -void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button, QPlatformDialogHelper::ButtonRole role) +void QMessageBoxPrivate::helperClicked(QPlatformDialogHelper::StandardButton helperButton, QPlatformDialogHelper::ButtonRole role) { + Q_UNUSED(role); Q_Q(QMessageBox); - if (button > QPlatformDialogHelper::LastButton) { - // It's a custom button, and the QPushButton in options is just a proxy - // for the button on the platform dialog. Simulate the user clicking it. - clickedButton = static_cast<QAbstractButton *>(options->customButton(button)->button); - Q_ASSERT(clickedButton); - clickedButton->click(); - q->done(role); - } else { - q->done(button); - } + + // Map back to QAbstractButton, so that the message box behaves the same from + // the outside, regardless of whether it's backed by a native helper or not. + QAbstractButton *dialogButton = helperButton > QPlatformDialogHelper::LastButton ? + static_cast<QAbstractButton *>(options->customButton(helperButton)->button) : + q->button(QMessageBox::StandardButton(helperButton)); + + Q_ASSERT(dialogButton); + + // Simulate click by explicitly clicking the button. This will ensure that + // any logic of the button that responds to the click is respected, including + // plumbing back to buttonClicked above based on the clicked() signal. + dialogButton->click(); } /*! @@ -548,10 +554,11 @@ void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button A message box displays a primary \l{QMessageBox::text}{text} to alert the user to a situation, an \l{QMessageBox::informativeText} - {informative text} to further explain the alert or to ask the user - a question, and an optional \l{QMessageBox::detailedText} - {detailed text} to provide even more data if the user requests - it. A message box can also display an \l{QMessageBox::icon} {icon} + {informative text} to further explain the situation, and an optional + \l{QMessageBox::detailedText} {detailed text} to provide even more data + if the user requests it. + + A message box can also display an \l{QMessageBox::icon} {icon} and \l{QMessageBox::standardButtons} {standard buttons} for accepting a user response. @@ -577,27 +584,21 @@ void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button \image msgbox1.png A better approach than just alerting the user to an event is to - also ask the user what to do about it. Store the question in the - \l{QMessageBox::informativeText} {informative text} property, and - set the \l{QMessageBox::standardButtons} {standard buttons} + also ask the user what to do about it. + + Set the \l{QMessageBox::standardButtons} {standard buttons} property to the set of buttons you want as the set of user responses. The buttons are specified by combining values from StandardButtons using the bitwise OR operator. The display order for the buttons is platform-dependent. For example, on Windows, \uicontrol{Save} is displayed to the left of \uicontrol{Cancel}, whereas on - Mac OS, the order is reversed. - - Mark one of your standard buttons to be your + \macos, the order is reversed. Mark one of your standard buttons to be your \l{QMessageBox::defaultButton()} {default button}. - \snippet code/src_gui_dialogs_qmessagebox.cpp 6 + The \l{QMessageBox::informativeText} {informative text} property can + be used to add additional context to help the user choose the appropriate action. - This is the approach recommended in the - \l{http://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/AppleHIGuidelines/Windows/Windows.html#//apple_ref/doc/uid/20000961-BABCAJID} - {\macos Guidelines}. Similar guidelines apply for the other - platforms, but note the different ways the - \l{QMessageBox::informativeText} {informative text} is handled for - different platforms. + \snippet code/src_gui_dialogs_qmessagebox.cpp 6 \image msgbox2.png @@ -606,10 +607,10 @@ void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button \snippet code/src_gui_dialogs_qmessagebox.cpp 7 - To give the user more information to help him answer the question, - set the \l{QMessageBox::detailedText} {detailed text} property. If - the \l{QMessageBox::detailedText} {detailed text} property is set, - the \uicontrol{Show Details...} button will be shown. + To give the user more information to help them choose the appropriate, + action, set the \l{QMessageBox::detailedText} {detailed text} property. + Depending on the platform the \l{QMessageBox::detailedText} {detailed text}, + may require the user to click a \uicontrol{Show Details...} button to be shown. \image msgbox3.png @@ -749,8 +750,7 @@ void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button When an escape button can't be determined using these rules, pressing \uicontrol Esc has no effect. - \sa QDialogButtonBox, {fowler}{GUI Design Handbook: Message Box}, {Standard Dialogs Example}, - {Qt Widgets - Application Example} + \sa QDialogButtonBox, {Standard Dialogs Example} */ /*! @@ -806,6 +806,12 @@ void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button */ /*! + \enum QMessageBox::Option + \since 6.6 + \value DontUseNativeDialog Don't use the native message dialog. +*/ + +/*! \fn void QMessageBox::buttonClicked(QAbstractButton *button) This signal is emitted whenever a button is clicked inside the QMessageBox. @@ -813,14 +819,21 @@ void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button */ /*! - Constructs a message box with no text and no buttons. \a parent is - passed to the QDialog constructor. + Constructs an \l{Qt::ApplicationModal} {application modal} message box with no text and no buttons. + \a parent is passed to the QDialog constructor. + + The window modality can be overridden via setWindowModality() before calling show(). + + \note Using open() or exec() to show the message box affects the window modality. + Please see the detailed documentation for each function for more information. On \macos, if you want your message box to appear as a Qt::Sheet of its \a parent, set the message box's \l{setWindowModality()} {window modality} to Qt::WindowModal or use open(). Otherwise, the message box will be a standard dialog. + \sa setWindowTitle(), setText(), setIcon(), setStandardButtons(), setWindowModality() + */ QMessageBox::QMessageBox(QWidget *parent) : QDialog(*new QMessageBoxPrivate, parent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint) @@ -830,20 +843,22 @@ QMessageBox::QMessageBox(QWidget *parent) } /*! - Constructs a message box with the given \a icon, \a title, \a - text, and standard \a buttons. Standard or custom buttons can be + Constructs an \l{Qt::ApplicationModal} {application modal} message box with the given \a icon, + \a title, \a text, and standard \a buttons. Standard or custom buttons can be added at any time using addButton(). The \a parent and \a f arguments are passed to the QDialog constructor. - The message box is an \l{Qt::ApplicationModal} {application modal} - dialog box. + The window modality can be overridden via setWindowModality() before calling show(). + + \note Using open() or exec() to show the message box affects the window modality. + Please see the detailed documentation for each function for more information. On \macos, if \a parent is not \nullptr and you want your message box to appear as a Qt::Sheet of that parent, set the message box's \l{setWindowModality()} {window modality} to Qt::WindowModal (default). Otherwise, the message box will be a standard dialog. - \sa setWindowTitle(), setText(), setIcon(), setStandardButtons() + \sa setWindowTitle(), setText(), setIcon(), setStandardButtons(), setWindowModality() */ QMessageBox::QMessageBox(Icon icon, const QString &title, const QString &text, StandardButtons buttons, QWidget *parent, @@ -878,13 +893,39 @@ void QMessageBox::addButton(QAbstractButton *button, ButtonRole role) if (!button) return; removeButton(button); - d->options->addButton(button->text(), static_cast<QPlatformDialogHelper::ButtonRole>(role), - button); + + if (button->text().isEmpty()) { + if (auto *platformTheme = QGuiApplicationPrivate::platformTheme()) { + if (auto standardButton = QMessageBoxPrivate::standardButtonForRole(role)) + button->setText(platformTheme->standardButtonText(standardButton)); + } + + if (button->text().isEmpty()) { + qWarning() << "Cannot add" << button << "without title"; + return; + } + } + d->buttonBox->addButton(button, (QDialogButtonBox::ButtonRole)role); d->customButtonList.append(button); d->autoAddOkButton = false; } +QMessageBox::StandardButton QMessageBoxPrivate::standardButtonForRole(QMessageBox::ButtonRole role) +{ + switch (role) { + case QMessageBox::AcceptRole: return QMessageBox::Ok; + case QMessageBox::RejectRole: return QMessageBox::Cancel; + case QMessageBox::DestructiveRole: return QMessageBox::Discard; + case QMessageBox::HelpRole: return QMessageBox::Help; + case QMessageBox::ApplyRole: return QMessageBox::Apply; + case QMessageBox::YesRole: return QMessageBox::Yes; + case QMessageBox::NoRole: return QMessageBox::No; + case QMessageBox::ResetRole: return QMessageBox::Reset; + default: return QMessageBox::NoButton; + } +} + /*! \since 4.2 \overload @@ -989,6 +1030,12 @@ QMessageBox::StandardButton QMessageBox::standardButton(QAbstractButton *button) Returns a pointer corresponding to the standard button \a which, or \nullptr if the standard button doesn't exist in this message box. + \note Modifying the properties of the returned button may not be reflected + in native implementations of the message dialog. To customize dialog + buttons add a \l{addButton(QAbstractButton *button, QMessageBox::ButtonRole role)} + {custom button} or \l{addButton(const QString &text, QMessageBox::ButtonRole role)} + {button title} instead, or set the \l Option::DontUseNativeDialog option. + \sa standardButtons, standardButton() */ QAbstractButton *QMessageBox::button(StandardButton which) const @@ -1066,14 +1113,14 @@ void QMessageBoxPrivate::detectEscapeButton() // If there is only one button, make it the escape button const QList<QAbstractButton *> buttons = buttonBox->buttons(); - if (buttons.count() == 1) { + if (buttons.size() == 1) { detectedEscapeButton = buttons.first(); return; } // If there are two buttons and one of them is the "Show Details..." // button, then make the other one the escape button - if (buttons.count() == 2 && detailsButton) { + if (buttons.size() == 2 && detailsButton) { auto idx = buttons.indexOf(detailsButton); if (idx != -1) { detectedEscapeButton = buttons.at(1 - idx); @@ -1220,9 +1267,84 @@ QCheckBox* QMessageBox::checkBox() const } /*! + \since 6.6 + Sets the given \a option to be enabled if \a on is true; otherwise, + clears the given \a option. + + Options (particularly the \l Option::DontUseNativeDialog option) should be set + before showing the dialog. + + Setting options while the dialog is visible is not guaranteed to have + an immediate effect on the dialog. + + Setting options after changing other properties may cause these + values to have no effect. + + \sa options, testOption() +*/ +void QMessageBox::setOption(QMessageBox::Option option, bool on) +{ + const QMessageBox::Options previousOptions = options(); + if (!(previousOptions & option) != !on) + setOptions(previousOptions ^ option); +} + +/*! + \since 6.6 + + Returns \c true if the given \a option is enabled; otherwise, returns + false. + + \sa options, setOption() +*/ +bool QMessageBox::testOption(QMessageBox::Option option) const +{ + Q_D(const QMessageBox); + return d->options->testOption(static_cast<QMessageDialogOptions::Option>(option)); +} + +void QMessageBox::setOptions(QMessageBox::Options options) +{ + Q_D(QMessageBox); + + if (QMessageBox::options() == options) + return; + + d->options->setOptions(QMessageDialogOptions::Option(int(options))); +} + +QMessageBox::Options QMessageBox::options() const +{ + Q_D(const QMessageBox); + return QMessageBox::Options(int(d->options->options())); +} + +/*! + \property QMessageBox::options + \brief Options that affect the look and feel of the dialog. + \since 6.6 + + By default, these options are disabled. + + The option \l Option::DontUseNativeDialog should be set + before changing dialog properties or showing the dialog. + + Setting options while the dialog is visible is not guaranteed to have + an immediate effect on the dialog. + + Setting options after changing other properties may cause these + values to have no effect. + + \sa setOption(), testOption() +*/ + +/*! \property QMessageBox::text \brief the message box text to be displayed. + The text should be a brief sentence or phrase that describes the situation, + ideally formulated as a neutral statement, or a call-to-action question. + The text will be interpreted either as a plain text or as rich text, depending on the text format setting (\l QMessageBox::textFormat). The default setting is Qt::AutoText, i.e., the message box will try @@ -1321,7 +1443,7 @@ void QMessageBox::setIcon(Icon icon) QPixmap QMessageBox::iconPixmap() const { Q_D(const QMessageBox); - return d->iconLabel->pixmap(Qt::ReturnByValue); + return d->iconLabel->pixmap(); } void QMessageBox::setIconPixmap(const QPixmap &pixmap) @@ -1355,6 +1477,8 @@ void QMessageBox::setTextFormat(Qt::TextFormat format) d->label->setTextFormat(format); d->label->setWordWrap(format == Qt::RichText || (format == Qt::AutoText && Qt::mightBeRichText(d->label->text()))); + if (d->informativeLabel) + d->informativeLabel->setTextFormat(format); d->updateSize(); } @@ -1496,21 +1620,21 @@ void QMessageBox::keyPressEvent(QKeyEvent *e) #if defined(Q_OS_WIN) if (e == QKeySequence::Copy) { - const QLatin1String separator("---------------------------\n"); + const auto separator = "---------------------------\n"_L1; QString textToCopy; - textToCopy += separator + windowTitle() + QLatin1Char('\n') + separator // title - + d->label->text() + QLatin1Char('\n') + separator; // text + textToCopy += separator + windowTitle() + u'\n' + separator // title + + d->label->text() + u'\n' + separator; // text if (d->informativeLabel) - textToCopy += d->informativeLabel->text() + QLatin1Char('\n') + separator; + textToCopy += d->informativeLabel->text() + u'\n' + separator; const QList<QAbstractButton *> buttons = d->buttonBox->buttons(); for (const auto *button : buttons) - textToCopy += button->text() + QLatin1String(" "); - textToCopy += QLatin1Char('\n') + separator; + textToCopy += button->text() + " "_L1; + textToCopy += u'\n' + separator; #if QT_CONFIG(textedit) if (d->detailsText) - textToCopy += d->detailsText->text() + QLatin1Char('\n') + separator; + textToCopy += d->detailsText->text() + u'\n' + separator; #endif QGuiApplication::clipboard()->setText(textToCopy); return; @@ -1557,6 +1681,26 @@ void QMessageBox::open(QObject *receiver, const char *member) QDialog::open(); } +void QMessageBoxPrivate::setVisible(bool visible) +{ + Q_Q(QMessageBox); + + // Last minute setup + if (autoAddOkButton) + q->addButton(QMessageBox::Ok); + detectEscapeButton(); + + if (canBeNativeDialog()) + setNativeDialogVisible(visible); + + // Update WA_DontShowOnScreen based on whether the native dialog was shown, + // so that QDialog::setVisible(visible) below updates the QWidget state correctly, + // but skips showing the non-native version. + q->setAttribute(Qt::WA_DontShowOnScreen, nativeDialogInUse); + + QDialogPrivate::setVisible(visible); +} + /*! \since 4.5 @@ -1590,16 +1734,10 @@ QMessageBox::ButtonRole QMessageBox::buttonRole(QAbstractButton *button) const void QMessageBox::showEvent(QShowEvent *e) { Q_D(QMessageBox); - if (d->autoAddOkButton) { - addButton(Ok); - } - if (d->detailsButton) - addButton(d->detailsButton, QMessageBox::ActionRole); d->clickedButton = nullptr; - d->detectEscapeButton(); d->updateSize(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QAccessibleEvent event(this, QAccessible::Alert); QAccessible::updateAccessibility(&event); #endif @@ -1621,11 +1759,14 @@ static QMessageBox::StandardButton showNewMessageBox(QWidget *parent, { // necessary for source compatibility with Qt 4.0 and 4.1 // handles (Yes, No) and (Yes|Default, No) - if (defaultButton && !(buttons & defaultButton)) - return (QMessageBox::StandardButton) - QMessageBoxPrivate::showOldMessageBox(parent, icon, title, - text, int(buttons), - int(defaultButton), 0); + if (defaultButton && !(buttons & defaultButton)) { + const int defaultButtons = defaultButton | QMessageBox::Default; + const int otherButtons = buttons.toInt(); + const int ret = QMessageBoxPrivate::showOldMessageBox(parent, icon, title, + text, otherButtons, + defaultButtons, 0); + return static_cast<QMessageBox::StandardButton>(ret); + } QMessageBox msgBox(icon, title, text, QMessageBox::NoButton, parent); QDialogButtonBox *buttonBox = msgBox.findChild<QDialogButtonBox*>(); @@ -1794,9 +1935,10 @@ QMessageBox::StandardButton QMessageBox::critical(QWidget *parent, const QString \li As a last resort it uses the Information icon. \endlist - The about box has a single button labelled "OK". On \macos, the - about box is popped up as a modeless window; on other platforms, - it is currently application modal. + The about box has a single button labelled "OK". + + On \macos, the about box is popped up as a modeless window; on + other platforms, it is currently application modal. \sa QWidget::windowIcon(), QApplication::activeWindow() */ @@ -1813,7 +1955,7 @@ void QMessageBox::about(QWidget *parent, const QString &title, const QString &te } #endif - QMessageBox *msgBox = new QMessageBox(title, text, Information, 0, 0, 0, parent + QMessageBox *msgBox = new QMessageBox(Information, title, text, NoButton, parent #ifdef Q_OS_MAC , Qt::WindowTitleHint | Qt::WindowSystemMenuHint #endif @@ -1826,13 +1968,13 @@ void QMessageBox::about(QWidget *parent, const QString &title, const QString &te // should perhaps be a style hint #ifdef Q_OS_MAC oldMsgBox = msgBox; -#if 0 - // ### doesn't work until close button is enabled in title bar - msgBox->d_func()->autoAddOkButton = false; + auto *d = msgBox->d_func(); + d->buttonBox->setCenterButtons(true); +#ifdef Q_OS_IOS + msgBox->setModal(true); #else - msgBox->d_func()->buttonBox->setCenterButtons(true); -#endif msgBox->setModal(false); +#endif msgBox->show(); #else msgBox->exec(); @@ -1849,7 +1991,7 @@ void QMessageBox::about(QWidget *parent, const QString &title, const QString &te QApplication provides this functionality as a slot. - On \macos, the about box is popped up as a modeless window; on + On \macos, the aboutQt box is popped up as a modeless window; on other platforms, it is currently application modal. \sa QApplication::aboutQt() @@ -1871,7 +2013,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) translatedTextAboutQtCaption = QMessageBox::tr( "<h3>About Qt</h3>" "<p>This program uses Qt version %1.</p>" - ).arg(QLatin1String(QT_VERSION_STR)); + ).arg(QT_VERSION_STR ""_L1); //: Leave this text untranslated or include a verbatim copy of it below //: and note that it is the authoritative version in case of doubt. const QString translatedTextAboutQtText = QMessageBox::tr( @@ -1889,15 +2031,14 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) "<p>Qt licensed under GNU (L)GPL is appropriate for the " "development of Qt applications provided you can comply with the terms " "and conditions of the respective licenses.</p>" - "<p>Please see <a href=\"http://%2/\">%2</a> " + "<p>Please see <a href=\"https://%2/\">%2</a> " "for an overview of Qt licensing.</p>" - "<p>Copyright (C) %1 The Qt Company Ltd and other " + "<p>Copyright (C) The Qt Company Ltd. and other " "contributors.</p>" "<p>Qt and the Qt logo are trademarks of The Qt Company Ltd.</p>" - "<p>Qt is The Qt Company Ltd product developed as an open source " - "project. See <a href=\"http://%3/\">%3</a> for more information.</p>" - ).arg(QStringLiteral("2021"), - QStringLiteral("qt.io/licensing"), + "<p>Qt is The Qt Company Ltd. product developed as an open source " + "project. See <a href=\"https://%3/\">%3</a> for more information.</p>" + ).arg(QStringLiteral("qt.io/licensing"), QStringLiteral("qt.io")); QMessageBox *msgBox = new QMessageBox(parent); msgBox->setAttribute(Qt::WA_DeleteOnClose); @@ -1905,20 +2046,20 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) msgBox->setText(translatedTextAboutQtCaption); msgBox->setInformativeText(translatedTextAboutQtText); - QPixmap pm(QLatin1String(":/qt-project.org/qmessagebox/images/qtlogo-64.png")); + QPixmap pm(":/qt-project.org/qmessagebox/images/qtlogo-64.png"_L1); if (!pm.isNull()) msgBox->setIconPixmap(pm); // should perhaps be a style hint #ifdef Q_OS_MAC oldMsgBox = msgBox; -#if 0 - // ### doesn't work until close button is enabled in title bar - msgBox->d_func()->autoAddOkButton = false; + auto *d = msgBox->d_func(); + d->buttonBox->setCenterButtons(true); +#ifdef Q_OS_IOS + msgBox->setModal(true); #else - msgBox->d_func()->buttonBox->setCenterButtons(true); -#endif msgBox->setModal(false); +#endif msgBox->show(); #else msgBox->exec(); @@ -2140,7 +2281,7 @@ int QMessageBox::information(QWidget *parent, const QString &title, const QStrin } /*! - \deprecated since 6.2. Use the overload taking StandardButtons instead. + \deprecated [6.2] Use the overload taking StandardButtons instead. \overload Displays an information message box with the given \a title and @@ -2439,7 +2580,7 @@ int QMessageBox::critical(QWidget *parent, const QString &title, const QString& /*! - \deprecated + \deprecated [6.2] Returns the text of the message box button \a button, or an empty string if the message box does not contain the button. @@ -2460,7 +2601,7 @@ QString QMessageBox::buttonText(int button) const } /*! - \deprecated + \deprecated [6.2] Sets the text of the message box button \a button to \a text. Setting the text of a button that is not in the message box is @@ -2539,14 +2680,18 @@ void QMessageBox::setDetailedText(const QString &text) \since 4.2 - Infromative text can be used to expand upon the text() to give more - information to the user. On the Mac, this text appears in small - system font below the text(). On other platforms, it is simply - appended to the existing text. + Informative text can be used to expand upon the text() to give more + information to the user, for example describing the consequences of + the situation, or suggestion alternative solutions. + + The text will be interpreted either as a plain text or as rich text, + depending on the text format setting (\l QMessageBox::textFormat). + The default setting is Qt::AutoText, i.e., the message box will try + to auto-detect the format of the text. By default, this property contains an empty string. - \sa QMessageBox::text, QMessageBox::detailedText + \sa textFormat, QMessageBox::text, QMessageBox::detailedText */ QString QMessageBox::informativeText() const { @@ -2566,16 +2711,16 @@ void QMessageBox::setInformativeText(const QString &text) } else { if (!d->informativeLabel) { QLabel *label = new QLabel; - label->setObjectName(QLatin1String("qt_msgbox_informativelabel")); + label->setObjectName("qt_msgbox_informativelabel"_L1); label->setTextInteractionFlags(Qt::TextInteractionFlags(style()->styleHint(QStyle::SH_MessageBox_TextInteractionFlags, nullptr, this))); label->setAlignment(Qt::AlignTop | Qt::AlignLeft); label->setOpenExternalLinks(true); - label->setWordWrap(true); #ifdef Q_OS_MAC // apply a smaller font the information label on the mac label->setFont(qt_app_fonts_hash()->value("QTipLabel")); #endif label->setWordWrap(true); + label->setTextFormat(d->label->textFormat()); d->informativeLabel = label; } d->informativeLabel->setText(text); @@ -2643,6 +2788,7 @@ QPixmap QMessageBoxPrivate::standardIcon(QMessageBox::Icon icon, QMessageBox *mb break; case QMessageBox::Question: tmpIcon = style->standardIcon(QStyle::SP_MessageBoxQuestion, nullptr, mb); + break; default: break; } @@ -2655,13 +2801,21 @@ QPixmap QMessageBoxPrivate::standardIcon(QMessageBox::Icon icon, QMessageBox *mb void QMessageBoxPrivate::initHelper(QPlatformDialogHelper *h) { - Q_Q(QMessageBox); - QObject::connect(h, SIGNAL(clicked(QPlatformDialogHelper::StandardButton,QPlatformDialogHelper::ButtonRole)), - q, SLOT(_q_clicked(QPlatformDialogHelper::StandardButton,QPlatformDialogHelper::ButtonRole))); - static_cast<QPlatformMessageDialogHelper *>(h)->setOptions(options); + auto *messageDialogHelper = static_cast<QPlatformMessageDialogHelper *>(h); + QObjectPrivate::connect(messageDialogHelper, &QPlatformMessageDialogHelper::clicked, + this, &QMessageBoxPrivate::helperClicked); + // Forward state via lambda, so that we can handle addition and removal + // of checkbox via setCheckBox() after initializing helper. + QObject::connect(messageDialogHelper, &QPlatformMessageDialogHelper::checkBoxStateChanged, + q_ptr, [this](Qt::CheckState state) { + if (checkbox) + checkbox->setCheckState(state); + } + ); + messageDialogHelper->setOptions(options); } -static QMessageDialogOptions::Icon helperIcon(QMessageBox::Icon i) +static QMessageDialogOptions::StandardIcon helperIcon(QMessageBox::Icon i) { switch (i) { case QMessageBox::NoIcon: @@ -2684,6 +2838,36 @@ static QPlatformDialogHelper::StandardButtons helperStandardButtons(QMessageBox return buttons; } +bool QMessageBoxPrivate::canBeNativeDialog() const +{ + // Don't use Q_Q here! This function is called from ~QDialog, + // so Q_Q calling q_func() invokes undefined behavior (invalid cast in q_func()). + const QDialog * const q = static_cast<const QMessageBox*>(q_ptr); + if (nativeDialogInUse) + return true; + if (QCoreApplication::testAttribute(Qt::AA_DontUseNativeDialogs) + || q->testAttribute(Qt::WA_DontShowOnScreen) + || q->testAttribute(Qt::WA_StyleSheet) + || (options->options() & QMessageDialogOptions::Option::DontUseNativeDialog)) { + return false; + } + + if (strcmp(QMessageBox::staticMetaObject.className(), q->metaObject()->className()) != 0) + return false; + +#if QT_CONFIG(menu) + for (auto *customButton : buttonBox->buttons()) { + if (QPushButton *pushButton = qobject_cast<QPushButton *>(customButton)) { + // We can't support buttons with menus in native dialogs (yet) + if (pushButton->menu()) + return false; + } + } +#endif + + return QDialogPrivate::canBeNativeDialog(); +} + void QMessageBoxPrivate::helperPrepareShow(QPlatformDialogHelper *) { Q_Q(QMessageBox); @@ -2693,23 +2877,80 @@ void QMessageBoxPrivate::helperPrepareShow(QPlatformDialogHelper *) #if QT_CONFIG(textedit) options->setDetailedText(q->detailedText()); #endif - options->setIcon(helperIcon(q->icon())); - options->setStandardButtons(helperStandardButtons(q)); + options->setStandardIcon(helperIcon(q->icon())); + options->setIconPixmap(q->iconPixmap()); + + // Clear up front, since we might have prepared earlier + options->clearCustomButtons(); + + // Add standard buttons and resolve default/escape button + auto standardButtons = helperStandardButtons(q); + for (int button = QDialogButtonBox::StandardButton::FirstButton; + button <= QDialogButtonBox::StandardButton::LastButton; button <<= 1) { + auto *standardButton = buttonBox->button(QDialogButtonBox::StandardButton(button)); + if (!standardButton) + continue; + + if (auto *platformTheme = QGuiApplicationPrivate::platformTheme()) { + if (standardButton->text() != platformTheme->standardButtonText(button)) { + // The standard button has been customized, so add it as + // a custom button instead. + const auto buttonRole = buttonBox->buttonRole(standardButton); + options->addButton(standardButton->text(), + static_cast<QPlatformDialogHelper::ButtonRole>(buttonRole), + standardButton, button); + standardButtons &= ~QPlatformDialogHelper::StandardButton(button); + } + } + + if (standardButton == defaultButton) + options->setDefaultButton(button); + else if (standardButton == detectedEscapeButton) + options->setEscapeButton(button); + } + options->setStandardButtons(standardButtons); + + // Add custom buttons and resolve default/escape button + for (auto *customButton : customButtonList) { + // Unless it's the details button, since we don't do any + // plumbing for the button's action in that case. + if (customButton == detailsButton) + continue; + + const auto buttonRole = buttonBox->buttonRole(customButton); + const int buttonId = options->addButton(customButton->text(), + static_cast<QPlatformDialogHelper::ButtonRole>(buttonRole), + customButton); + + if (customButton == defaultButton) + options->setDefaultButton(buttonId); + else if (customButton == detectedEscapeButton) + options->setEscapeButton(buttonId); + } + + if (checkbox) + options->setCheckBox(checkbox->text(), checkbox->checkState()); } -void QMessageBoxPrivate::helperDone(QDialog::DialogCode code, QPlatformDialogHelper *) +void qRequireVersion(int argc, char *argv[], QAnyStringView req) { - Q_Q(QMessageBox); - QAbstractButton *button = q->button(QMessageBox::StandardButton(code)); - // If it was a custom button, a custom ID was used, so we won't get a valid pointer here. - // In that case, clickedButton has already been set in _q_buttonClicked. - if (button) - clickedButton = button; + const auto required = QVersionNumber::fromString(req).normalized(); + const auto current = QVersionNumber::fromString(qVersion()).normalized(); + if (current >= required) + return; + std::optional<QApplication> application; + if (!qApp) + application.emplace(argc, argv); + const QString message = QApplication::tr("Application \"%1\" requires Qt %2, found Qt %3.") + .arg(qAppName(), required.toString(), current.toString()); + QMessageBox::critical(nullptr, QApplication::tr("Incompatible Qt Library Error"), + message, QMessageBox::Abort); + qFatal("%ls", qUtf16Printable(message)); } #if QT_DEPRECATED_SINCE(6,2) /*! - \deprecated + \deprecated [6.2] Returns the pixmap used for a standard icon. This allows the pixmaps to be used in more complex message boxes. \a icon @@ -2773,6 +3014,25 @@ QPixmap QMessageBox::standardIcon(Icon icon) \sa show(), result() */ +/*! + \macro QT_REQUIRE_VERSION(int argc, char **argv, const char *version) + \relates QMessageBox + + This macro can be used to ensure that the application is run + with a recent enough version of Qt. This is especially useful + if your application depends on a specific bug fix introduced in a + bug-fix release (for example, 6.1.2). + + The \a argc and \a argv parameters are the \c main() function's + \c argc and \c argv parameters. The \a version parameter is a + string literal that specifies which version of Qt the application + requires (for example, "6.1.2"). + + Example: + + \snippet code/src_gui_dialogs_qmessagebox.cpp 4 +*/ + QT_END_NAMESPACE #include "moc_qmessagebox.cpp" diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index e8aef44981..751674466c 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -1,53 +1,18 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QMESSAGEBOX_H #define QMESSAGEBOX_H #include <QtWidgets/qtwidgetsglobal.h> - #include <QtWidgets/qdialog.h> +#include <QtWidgets/qdialogbuttonbox.h> QT_REQUIRE_CONFIG(messagebox); QT_BEGIN_NAMESPACE +class QAnyStringView; class QLabel; class QMessageBoxPrivate; class QAbstractButton; @@ -67,10 +32,16 @@ class Q_WIDGETS_EXPORT QMessageBox : public QDialog Q_PROPERTY(QString informativeText READ informativeText WRITE setInformativeText) Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags) - + Q_PROPERTY(Options options READ options WRITE setOptions) public: + // Keep in sync with MessageBoxOption in qplatformdialoghelper.h + enum class Option { + DontUseNativeDialog = 0x00000001 + }; + Q_FLAG(Option) + enum Icon { - // keep this in sync with QMessageDialogOptions::Icon + // keep this in sync with QMessageDialogOptions::StandardIcon NoIcon = 0, Information = 1, Warning = 2, @@ -94,6 +65,7 @@ public: NRoles }; + Q_ENUM(ButtonRole) enum StandardButton { // keep this in sync with QDialogButtonBox::StandardButton and QPlatformDialogHelper::StandardButton @@ -128,11 +100,14 @@ public: FlagMask = 0x00000300, // obsolete ButtonMask = ~FlagMask // obsolete }; + Q_ENUM(StandardButton) + #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) typedef StandardButton Button; #endif - + Q_DECLARE_FLAGS(Options, Option) Q_DECLARE_FLAGS(StandardButtons, StandardButton) + Q_FLAG(StandardButtons) explicit QMessageBox(QWidget *parent = nullptr); @@ -185,6 +160,11 @@ public: void setCheckBox(QCheckBox *cb); QCheckBox* checkBox() const; + void setOption(Option option, bool on = true); + bool testOption(Option option) const; + void setOptions(Options options); + Options options() const; + static StandardButton information(QWidget *parent, const QString &title, const QString &text, StandardButtons buttons = Ok, StandardButton defaultButton = NoButton); @@ -313,7 +293,7 @@ public: Q_SIGNALS: void buttonClicked(QAbstractButton *button); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC public Q_SLOTS: int exec() override; #endif @@ -327,29 +307,15 @@ protected: void changeEvent(QEvent *event) override; private: - Q_PRIVATE_SLOT(d_func(), void _q_buttonClicked(QAbstractButton *)) - Q_PRIVATE_SLOT(d_func(), void _q_clicked(QPlatformDialogHelper::StandardButton, QPlatformDialogHelper::ButtonRole)) - Q_DISABLE_COPY(QMessageBox) Q_DECLARE_PRIVATE(QMessageBox) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QMessageBox::StandardButtons) -#define QT_REQUIRE_VERSION(argc, argv, str) { QString s = QString::fromLatin1(str);\ -QString sq = QString::fromLatin1(qVersion()); \ -if ((sq.section(QChar::fromLatin1('.'),0,0).toInt()<<16)+\ -(sq.section(QChar::fromLatin1('.'),1,1).toInt()<<8)+\ -sq.section(QChar::fromLatin1('.'),2,2).toInt()<(s.section(QChar::fromLatin1('.'),0,0).toInt()<<16)+\ -(s.section(QChar::fromLatin1('.'),1,1).toInt()<<8)+\ -s.section(QChar::fromLatin1('.'),2,2).toInt()) { \ -if (!qApp){ \ - new QApplication(argc,argv); \ -} \ -QString s = QApplication::tr("Executable '%1' requires Qt "\ - "%2, found Qt %3.").arg(qAppName()).arg(QString::fromLatin1(\ -str)).arg(QString::fromLatin1(qVersion())); QMessageBox::critical(0, QApplication::tr(\ -"Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); qFatal("%s", s.toLatin1().data()); }} +Q_WIDGETS_EXPORT void qRequireVersion(int argc, char *argv[], QAnyStringView req); + +#define QT_REQUIRE_VERSION(argc, argv, str) qRequireVersion(argc, argv, str); QT_END_NAMESPACE diff --git a/src/widgets/dialogs/qmessagebox.qrc b/src/widgets/dialogs/qmessagebox.qrc deleted file mode 100644 index de217773ec..0000000000 --- a/src/widgets/dialogs/qmessagebox.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource prefix="/qt-project.org/qmessagebox"> - <file>images/qtlogo-64.png</file> -</qresource> -</RCC> diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp index 448acfc7f9..9761bcc828 100644 --- a/src/widgets/dialogs/qprogressdialog.cpp +++ b/src/widgets/dialogs/qprogressdialog.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qprogressdialog.h" @@ -53,15 +17,20 @@ #include "qelapsedtimer.h" #include "qscopedvaluerollback.h" #include <private/qdialog_p.h> + +#include <QtCore/qpointer.h> + #include <limits.h> +using namespace std::chrono_literals; + QT_BEGIN_NAMESPACE // If the operation is expected to take this long (as predicted by // progress time), show the progress dialog. -static const int defaultShowTime = 4000; +static constexpr auto defaultShowTime = 4000ms; // Wait at least this long before attempting to make a prediction. -static const int minWaitTime = 50; +static constexpr auto minWaitTime = 50ms; class QProgressDialogPrivate : public QDialogPrivate { @@ -88,7 +57,7 @@ public: QPointer<QObject> receiverToDisconnectOnClose; QElapsedTimer starttime; QByteArray memberToDisconnectOnClose; - int showTime = defaultShowTime; + std::chrono::milliseconds showTime = defaultShowTime; bool processingEvents = false; bool shownOnce = false; bool autoClose = true; @@ -228,10 +197,11 @@ void QProgressDialogPrivate::_q_disconnectOnClose() A modeless progress dialog is suitable for operations that take place in the background, where the user is able to interact with the - application. Such operations are typically based on QTimer (or - QObject::timerEvent()) or QSocketNotifier; or performed - in a separate thread. A QProgressBar in the status bar of your main window - is often an alternative to a modeless progress dialog. + application. Such operations are typically based on a timer class, + such as QChronoTimer (or the more low-level QObject::timerEvent()) or + QSocketNotifier; or performed in a separate thread. A QProgressBar in + the status bar of your main window is often an alternative to a modeless + progress dialog. You need to have an event loop to be running, connect the canceled() signal to a slot that stops the operation, and call \l @@ -251,8 +221,7 @@ void QProgressDialogPrivate::_q_disconnectOnClose() \image fusion-progressdialog.png A progress dialog shown in the Fusion widget style. - \sa QDialog, QProgressBar, {fowler}{GUI Design Handbook: Progress Indicator}, - {Find Files Example}, {Pixelator Example} + \sa QDialog, QProgressBar */ @@ -662,23 +631,22 @@ void QProgressDialog::setValue(int progress) return; } else { d->setValueCalled = true; - bool need_show; - int elapsed = d->starttime.elapsed(); + bool need_show = false; + using namespace std::chrono; + nanoseconds elapsed = d->starttime.durationElapsed(); if (elapsed >= d->showTime) { need_show = true; } else { if (elapsed > minWaitTime) { - int estimate; - int totalSteps = maximum() - minimum(); - int myprogress = progress - minimum(); - if (myprogress == 0) myprogress = 1; - if ((totalSteps - myprogress) >= INT_MAX / elapsed) - estimate = (totalSteps - myprogress) / myprogress * elapsed; + const int totalSteps = maximum() - minimum(); + const int myprogress = std::max(progress - minimum(), 1); + const int remainingSteps = totalSteps - myprogress; + nanoseconds estimate; + if (remainingSteps >= INT_MAX / elapsed.count()) + estimate = (remainingSteps / myprogress) * elapsed; else - estimate = elapsed * (totalSteps - myprogress) / myprogress; + estimate = (elapsed * remainingSteps) / myprogress; need_show = estimate >= d->showTime; - } else { - need_show = false; } } if (need_show) { @@ -754,17 +722,18 @@ void QProgressDialog::changeEvent(QEvent *ev) void QProgressDialog::setMinimumDuration(int ms) { Q_D(QProgressDialog); - d->showTime = ms; + std::chrono::milliseconds msecs{ms}; + d->showTime = msecs; if (d->bar->value() == d->bar->minimum()) { d->forceTimer->stop(); - d->forceTimer->start(ms); + d->forceTimer->start(msecs); } } int QProgressDialog::minimumDuration() const { Q_D(const QProgressDialog); - return d->showTime; + return int(d->showTime.count()); } @@ -780,7 +749,7 @@ void QProgressDialog::closeEvent(QCloseEvent *e) /*! \property QProgressDialog::autoReset - \brief whether the progress dialog calls reset() as soon as value() equals maximum() + \brief whether the progress dialog calls reset() as soon as value() equals maximum(). The default is true. diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h index 74adb6bd84..132dffa480 100644 --- a/src/widgets/dialogs/qprogressdialog.h +++ b/src/widgets/dialogs/qprogressdialog.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QPROGRESSDIALOG_H #define QPROGRESSDIALOG_H diff --git a/src/widgets/dialogs/qsidebar.cpp b/src/widgets/dialogs/qsidebar.cpp index 296542a187..581e659a44 100644 --- a/src/widgets/dialogs/qsidebar.cpp +++ b/src/widgets/dialogs/qsidebar.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qsidebar_p.h" @@ -53,6 +17,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + void QSideBarDelegate::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const { @@ -77,12 +43,18 @@ QUrlModel::QUrlModel(QObject *parent) : QStandardItemModel(parent), showFullPath { } +QUrlModel::~QUrlModel() +{ + for (const auto &conn : std::as_const(modelConnections)) + disconnect(conn); +} + /*! \reimp */ QStringList QUrlModel::mimeTypes() const { - return QStringList(QLatin1String("text/uri-list")); + return QStringList("text/uri-list"_L1); } /*! @@ -211,11 +183,14 @@ void QUrlModel::setUrl(const QModelIndex &index, const QUrl &url, const QModelIn setData(index, true, EnabledRole); } + // newIcon could be null if fileSystemModel->iconProvider() returns null + if (!newIcon.isNull()) { // Make sure that we have at least 32x32 images - const QSize size = newIcon.actualSize(QSize(32,32)); - if (size.width() < 32) { - QPixmap smallPixmap = newIcon.pixmap(QSize(32, 32)); - newIcon.addPixmap(smallPixmap.scaledToWidth(32, Qt::SmoothTransformation)); + const QSize size = newIcon.actualSize(QSize(32,32)); + if (size.width() < 32) { + QPixmap smallPixmap = newIcon.pixmap(QSize(32, 32)); + newIcon.addPixmap(smallPixmap.scaledToWidth(32, Qt::SmoothTransformation)); + } } if (index.data().toString() != newName) @@ -245,9 +220,10 @@ void QUrlModel::addUrls(const QList<QUrl> &list, int row, bool move) if (row == -1) row = rowCount(); row = qMin(row, rowCount()); - for (int i = list.count() - 1; i >= 0; --i) { - QUrl url = list.at(i); - if (!url.isValid() || url.scheme() != QLatin1String("file")) + const auto rend = list.crend(); + for (auto it = list.crbegin(); it != rend; ++it) { + QUrl url = *it; + if (!url.isValid() || url.scheme() != "file"_L1) continue; //this makes sure the url is clean const QString cleanUrl = QDir::cleanPath(url.toLocalFile()); @@ -299,21 +275,19 @@ void QUrlModel::setFileSystemModel(QFileSystemModel *model) if (model == fileSystemModel) return; if (fileSystemModel != nullptr) { - disconnect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), - this, SLOT(dataChanged(QModelIndex,QModelIndex))); - disconnect(model, SIGNAL(layoutChanged()), - this, SLOT(layoutChanged())); - disconnect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)), - this, SLOT(layoutChanged())); + for (const auto &conn : std::as_const(modelConnections)) + disconnect(conn); } fileSystemModel = model; if (fileSystemModel != nullptr) { - connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), - this, SLOT(dataChanged(QModelIndex,QModelIndex))); - connect(model, SIGNAL(layoutChanged()), - this, SLOT(layoutChanged())); - connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)), - this, SLOT(layoutChanged())); + modelConnections = { + connect(model, &QFileSystemModel::dataChanged, + this, &QUrlModel::dataChanged), + connect(model, &QFileSystemModel::layoutChanged, + this, &QUrlModel::layoutChanged), + connect(model, &QFileSystemModel::rowsRemoved, + this, &QUrlModel::layoutChanged), + }; } clear(); insertColumns(0, 1); @@ -325,7 +299,7 @@ void QUrlModel::setFileSystemModel(QFileSystemModel *model) void QUrlModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { QModelIndex parent = topLeft.parent(); - for (int i = 0; i < watching.count(); ++i) { + for (int i = 0; i < watching.size(); ++i) { QModelIndex index = watching.at(i).index; if (index.model() && topLeft.model()) { Q_ASSERT(index.model() == topLeft.model()); @@ -346,13 +320,11 @@ void QUrlModel::dataChanged(const QModelIndex &topLeft, const QModelIndex &botto void QUrlModel::layoutChanged() { QStringList paths; - const int numPaths = watching.count(); - paths.reserve(numPaths); - for (int i = 0; i < numPaths; ++i) - paths.append(watching.at(i).path); + paths.reserve(watching.size()); + for (const WatchItem &item : std::as_const(watching)) + paths.append(item.path); watching.clear(); - for (int i = 0; i < numPaths; ++i) { - QString path = paths.at(i); + for (const auto &path : paths) { QModelIndex newIndex = fileSystemModel->index(path); watching.append({newIndex, path}); if (newIndex.isValid()) @@ -387,14 +359,16 @@ void QSidebar::setModelAndUrls(QFileSystemModel *model, const QList<QUrl> &newUr setModel(urlModel); setItemDelegate(new QSideBarDelegate(this)); - connect(selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), - this, SLOT(clicked(QModelIndex))); + connect(selectionModel(), &QItemSelectionModel::currentChanged, + this, &QSidebar::clicked); #if QT_CONFIG(draganddrop) setDragDropMode(QAbstractItemView::DragDrop); #endif +#if QT_CONFIG(menu) setContextMenuPolicy(Qt::CustomContextMenu); - connect(this, SIGNAL(customContextMenuRequested(QPoint)), - this, SLOT(showContextMenu(QPoint))); + connect(this, &QSidebar::customContextMenuRequested, + this, &QSidebar::showContextMenu); +#endif urlModel->setUrls(newUrls); setCurrentIndex(this->model()->index(0,0)); } @@ -420,8 +394,8 @@ QSize QSidebar::sizeHint() const void QSidebar::selectUrl(const QUrl &url) { - disconnect(selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), - this, SLOT(clicked(QModelIndex))); + disconnect(selectionModel(), &QItemSelectionModel::currentChanged, + this, &QSidebar::clicked); selectionModel()->clear(); for (int i = 0; i < model()->rowCount(); ++i) { @@ -431,8 +405,8 @@ void QSidebar::selectUrl(const QUrl &url) } } - connect(selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), - this, SLOT(clicked(QModelIndex))); + connect(selectionModel(), &QItemSelectionModel::currentChanged, + this, &QSidebar::clicked); } #if QT_CONFIG(menu) @@ -448,10 +422,10 @@ void QSidebar::showContextMenu(const QPoint &position) QAction *action = new QAction(QFileDialog::tr("Remove"), this); if (indexAt(position).data(QUrlModel::UrlRole).toUrl().path().isEmpty()) action->setEnabled(false); - connect(action, SIGNAL(triggered()), this, SLOT(removeEntry())); + connect(action, &QAction::triggered, this, &QSidebar::removeEntry); actions.append(action); } - if (actions.count() > 0) + if (actions.size() > 0) QMenu::exec(actions, mapToGlobal(position)); } #endif // QT_CONFIG(menu) @@ -463,16 +437,13 @@ void QSidebar::showContextMenu(const QPoint &position) */ void QSidebar::removeEntry() { - QList<QModelIndex> idxs = selectionModel()->selectedIndexes(); - QList<QPersistentModelIndex> indexes; - const int numIndexes = idxs.count(); - indexes.reserve(numIndexes); - for (int i = 0; i < numIndexes; i++) - indexes.append(idxs.at(i)); - - for (int i = 0; i < numIndexes; ++i) { - if (!indexes.at(i).data(QUrlModel::UrlRole).toUrl().path().isEmpty()) - model()->removeRow(indexes.at(i).row()); + const QList<QModelIndex> idxs = selectionModel()->selectedIndexes(); + // Create a list of QPersistentModelIndex as the removeRow() calls below could + // invalidate the indexes in "idxs" + const QList<QPersistentModelIndex> persIndexes(idxs.cbegin(), idxs.cend()); + for (const QPersistentModelIndex &persistent : persIndexes) { + if (!persistent.data(QUrlModel::UrlRole).toUrl().path().isEmpty()) + model()->removeRow(persistent.row()); } } @@ -504,7 +475,7 @@ void QSidebar::focusInEvent(QFocusEvent *event) bool QSidebar::event(QEvent * event) { if (event->type() == QEvent::KeyRelease) { - QKeyEvent* ke = (QKeyEvent*) event; + QKeyEvent *ke = static_cast<QKeyEvent *>(event); if (ke->key() == Qt::Key_Delete) { removeEntry(); return true; diff --git a/src/widgets/dialogs/qsidebar_p.h b/src/widgets/dialogs/qsidebar_p.h index 7f06f0b679..ed17a2ff31 100644 --- a/src/widgets/dialogs/qsidebar_p.h +++ b/src/widgets/dialogs/qsidebar_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QSIDEBAR_H #define QSIDEBAR_H @@ -83,6 +47,7 @@ public: }; QUrlModel(QObject *parent = nullptr); + ~QUrlModel(); QStringList mimeTypes() const override; QMimeData *mimeData(const QModelIndexList &indexes) const override; @@ -116,6 +81,7 @@ private: QList<WatchItem> watching; QList<QUrl> invalidUrls; + std::array<QMetaObject::Connection, 3> modelConnections; }; Q_DECLARE_TYPEINFO(QUrlModel::WatchItem, Q_RELOCATABLE_TYPE); diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index e584db0f15..ec082b9a85 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qwizard.h" #include <QtWidgets/private/qtwidgetsglobal_p.h> @@ -54,7 +18,7 @@ #include "qlineedit.h" #endif #include <qpointer.h> -#include "qpainter.h" +#include "qstylepainter.h" #include "qwindow.h" #include "qpushbutton.h" #include "qset.h" @@ -65,9 +29,8 @@ #include "qstyleoption.h" #include "qvarlengtharray.h" #if defined(Q_OS_MACOS) -#include <QtCore/QMetaMethod> -#include <QtGui/QGuiApplication> -#include <qpa/qplatformnativeinterface.h> +#include <AppKit/AppKit.h> +#include <QtGui/private/qcoregraphics_p.h> #elif QT_CONFIG(style_windowsvista) #include "qwizard_win_p.h" #include "qtimer.h" @@ -81,6 +44,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + // These fudge terms were needed a few places to obtain pixel-perfect results const int GapBetweenLogoAndRightEdge = 5; const int ModernHeaderTopMargin = 2; @@ -163,8 +128,7 @@ static const char *changed_signal(int which) case 6: return SIGNAL(valueChanged(int)); }; static_assert(7 == NFallbackDefaultProperties); - Q_UNREACHABLE(); - return nullptr; + Q_UNREACHABLE_RETURN(nullptr); } class QWizardDefaultProperty @@ -206,7 +170,7 @@ QWizardField::QWizardField(QWizardPage *page, const QString &spec, QObject *obje : page(page), name(spec), mandatory(false), object(object), property(property), changedSignal(changedSignal) { - if (name.endsWith(QLatin1Char('*'))) { + if (name.endsWith(u'*')) { name.chop(1); mandatory = true; } @@ -215,7 +179,7 @@ QWizardField::QWizardField(QWizardPage *page, const QString &spec, QObject *obje void QWizardField::resolve(const QList<QWizardDefaultProperty> &defaultPropertyTable) { if (property.isEmpty()) - findProperty(defaultPropertyTable.constData(), defaultPropertyTable.count()); + findProperty(defaultPropertyTable.constData(), defaultPropertyTable.size()); initialValue = object->property(property); } @@ -254,11 +218,11 @@ public: bool extension = false; bool sideWidget = false; - bool operator==(const QWizardLayoutInfo &other); - inline bool operator!=(const QWizardLayoutInfo &other) { return !operator==(other); } + bool operator==(const QWizardLayoutInfo &other) const; + inline bool operator!=(const QWizardLayoutInfo &other) const { return !operator==(other); } }; -bool QWizardLayoutInfo::operator==(const QWizardLayoutInfo &other) +bool QWizardLayoutInfo::operator==(const QWizardLayoutInfo &other) const { return topLevelMarginLeft == other.topLevelMarginLeft && topLevelMarginRight == other.topLevelMarginRight @@ -363,8 +327,7 @@ void QWizardHeader::setup(const QWizardLayoutInfo &info, const QString &title, { bool modern = ((info.wizStyle == QWizard::ModernStyle) #if QT_CONFIG(style_windowsvista) - || ((info.wizStyle == QWizard::AeroStyle - && QVistaHelper::vistaState() == QVistaHelper::Classic) || vistaDisabled()) + || vistaDisabled() #endif ); @@ -383,7 +346,7 @@ void QWizardHeader::setup(const QWizardLayoutInfo &info, const QString &title, logoLabel->setPixmap(logo); subTitleLabel->setTextFormat(subTitleFormat); - subTitleLabel->setText(QLatin1String("Pq\nPq")); + subTitleLabel->setText("Pq\nPq"_L1); int desiredSubTitleHeight = subTitleLabel->sizeHint().height(); subTitleLabel->setText(subTitle); @@ -420,7 +383,7 @@ void QWizardHeader::setup(const QWizardLayoutInfo &info, const QString &title, void QWizardHeader::paintEvent(QPaintEvent * /* event */) { - QPainter painter(this); + QStylePainter painter(this); painter.drawPixmap(0, 0, bannerPixmap); int x = width() - 2; @@ -451,8 +414,8 @@ public: } QSize minimumSizeHint() const override { - if (!pixmap(Qt::ReturnByValue).isNull()) - return pixmap(Qt::ReturnByValue).deviceIndependentSize().toSize(); + if (!pixmap().isNull()) + return pixmap().deviceIndependentSize().toSize(); return QFrame::minimumSizeHint(); } @@ -570,7 +533,6 @@ public: void updatePixmap(QWizard::WizardPixmap which); #if QT_CONFIG(style_windowsvista) bool vistaDisabled() const; - bool isVistaThemeEnabled(QVistaHelper::VistaState state) const; bool handleAeroStyleChange(); #endif bool isVistaThemeEnabled() const; @@ -639,7 +601,7 @@ public: QPointer<QShortcut> vistaNextShortcut; # endif bool vistaInitPending = true; - QVistaHelper::VistaState vistaState = QVistaHelper::Dirty; + bool vistaDirty = true; bool vistaStateChanged = false; bool inHandleAeroStyleChange = false; #endif @@ -729,10 +691,11 @@ void QWizardPrivate::reset() if (current != -1) { q->currentPage()->hide(); cleanupPagesNotInHistory(); - for (int i = history.count() - 1; i >= 0; --i) - q->cleanupPage(history.at(i)); + const auto end = history.crend(); + for (auto it = history.crbegin(); it != end; ++it) + q->cleanupPage(*it); history.clear(); - for (QWizardPage *page : qAsConst(pageMap)) + for (QWizardPage *page : std::as_const(pageMap)) page->d_func()->initialized = false; current = -1; @@ -766,7 +729,7 @@ void QWizardPrivate::addField(const QWizardField &field) return; } - fieldIndexMap.insert(myField.name, fields.count()); + fieldIndexMap.insert(myField.name, fields.size()); fields += myField; if (myField.mandatory && !myField.changedSignal.isEmpty()) QObject::connect(myField.object, myField.changedSignal, @@ -900,7 +863,7 @@ QWizardLayoutInfo QWizardPrivate::layoutInfoForCurrentPage() QStyleOption option; option.initFrom(q); - const int layoutHorizontalSpacing = style->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, &option); + const int layoutHorizontalSpacing = style->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, &option, q); info.topLevelMarginLeft = style->pixelMetric(QStyle::PM_LayoutLeftMargin, nullptr, q); info.topLevelMarginRight = style->pixelMetric(QStyle::PM_LayoutRightMargin, nullptr, q); info.topLevelMarginTop = style->pixelMetric(QStyle::PM_LayoutTopMargin, nullptr, q); @@ -912,7 +875,7 @@ QWizardLayoutInfo QWizardPrivate::layoutInfoForCurrentPage() info.hspacing = (layoutHorizontalSpacing == -1) ? style->layoutSpacing(QSizePolicy::DefaultType, QSizePolicy::DefaultType, Qt::Horizontal) : layoutHorizontalSpacing; - info.vspacing = style->pixelMetric(QStyle::PM_LayoutVerticalSpacing, &option); + info.vspacing = style->pixelMetric(QStyle::PM_LayoutVerticalSpacing, &option, q); info.buttonSpacing = (layoutHorizontalSpacing == -1) ? style->layoutSpacing(QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Horizontal) : layoutHorizontalSpacing; @@ -923,7 +886,7 @@ QWizardLayoutInfo QWizardPrivate::layoutInfoForCurrentPage() info.wizStyle = wizStyle; if (info.wizStyle == QWizard::AeroStyle #if QT_CONFIG(style_windowsvista) - && (QVistaHelper::vistaState() == QVistaHelper::Classic || vistaDisabled()) + && vistaDisabled() #endif ) info.wizStyle = QWizard::ModernStyle; @@ -1049,7 +1012,7 @@ void QWizardPrivate::recreateLayout(const QWizardLayoutInfo &info) if (aero) { // ### hardcoded for now: - titleFont = QFont(QLatin1String("Segoe UI"), 12); + titleFont = QFont("Segoe UI"_L1, 12); QPalette pal(titleLabel->palette()); pal.setColor(QPalette::Text, QColor(0x00, 0x33, 0x99)); titleLabel->setPalette(pal); @@ -1365,11 +1328,11 @@ static QString object_name_for_button(QWizard::WizardButton which) { switch (which) { case QWizard::CommitButton: - return QLatin1String("qt_wizard_") + QLatin1String("commit"); + return u"qt_wizard_commit"_s; case QWizard::FinishButton: - return QLatin1String("qt_wizard_") + QLatin1String("finish"); + return u"qt_wizard_finish"_s; case QWizard::CancelButton: - return QLatin1String("qt_wizard_") + QLatin1String("cancel"); + return u"qt_wizard_cancel"_s; case QWizard::BackButton: case QWizard::NextButton: case QWizard::HelpButton: @@ -1377,15 +1340,14 @@ static QString object_name_for_button(QWizard::WizardButton which) case QWizard::CustomButton2: case QWizard::CustomButton3: // Make navigation buttons detectable as passive interactor in designer - return QLatin1String("__qt__passive_wizardbutton") + QString::number(which); + return "__qt__passive_wizardbutton"_L1 + QString::number(which); case QWizard::Stretch: case QWizard::NoButton: //case QWizard::NStandardButtons: //case QWizard::NButtons: ; } - Q_UNREACHABLE(); - return QString(); + Q_UNREACHABLE_RETURN(QString()); } bool QWizardPrivate::ensureButton(QWizard::WizardButton which) const @@ -1459,10 +1421,9 @@ void QWizardPrivate::updateButtonTexts() void QWizardPrivate::updateButtonLayout() { if (buttonsHaveCustomLayout) { - QVarLengthArray<QWizard::WizardButton, QWizard::NButtons> array(buttonsCustomLayout.count()); - for (int i = 0; i < buttonsCustomLayout.count(); ++i) - array[i] = buttonsCustomLayout.at(i); - setButtonLayout(array.constData(), array.count()); + QVarLengthArray<QWizard::WizardButton, QWizard::NButtons> array{ + buttonsCustomLayout.cbegin(), buttonsCustomLayout.cend()}; + setButtonLayout(array.constData(), int(array.size())); } else { // Positions: // Help Stretch Custom1 Custom2 Custom3 Cancel Back Next Commit Finish Cancel Help @@ -1556,13 +1517,6 @@ bool QWizardPrivate::vistaDisabled() const return v.isValid() && v.toBool(); } -bool QWizardPrivate::isVistaThemeEnabled(QVistaHelper::VistaState state) const -{ - return wizStyle == QWizard::AeroStyle - && QVistaHelper::vistaState() == state - && !vistaDisabled(); -} - bool QWizardPrivate::handleAeroStyleChange() { Q_Q(QWizard); @@ -1586,25 +1540,17 @@ bool QWizardPrivate::handleAeroStyleChange() if (isVistaThemeEnabled()) { const int topOffset = vistaHelper->topOffset(q); const int topPadding = vistaHelper->topPadding(q); - if (isVistaThemeEnabled(QVistaHelper::VistaAero)) { - if (isWindow) { - vistaHelper->setDWMTitleBar(QVistaHelper::ExtendedTitleBar); - q->installEventFilter(vistaHelper); - } - q->setMouseTracking(true); - antiFlickerWidget->move(0, vistaHelper->titleBarSize() + topOffset); - vistaHelper->backButton()->move( - 0, topOffset // ### should ideally work without the '+ 1' - - qMin(topOffset, topPadding + 1)); - vistaMargins = true; - vistaHelper->backButton()->show(); - } else { - if (isWindow) - vistaHelper->setDWMTitleBar(QVistaHelper::NormalTitleBar); - q->setMouseTracking(true); - antiFlickerWidget->move(0, topOffset); - vistaHelper->backButton()->move(0, -1); // ### should ideally work with (0, 0) + if (isWindow) { + vistaHelper->setDWMTitleBar(QVistaHelper::ExtendedTitleBar); + q->installEventFilter(vistaHelper); } + q->setMouseTracking(true); + antiFlickerWidget->move(0, vistaHelper->titleBarSize() + topOffset); + vistaHelper->backButton()->move( + 0, topOffset // ### should ideally work without the '+ 1' + - qMin(topOffset, topPadding + 1)); + vistaMargins = true; + vistaHelper->backButton()->show(); if (isWindow) vistaHelper->setTitleBarIconAndCaptionVisible(false); QObject::connect( @@ -1633,8 +1579,7 @@ bool QWizardPrivate::handleAeroStyleChange() bool QWizardPrivate::isVistaThemeEnabled() const { #if QT_CONFIG(style_windowsvista) - return isVistaThemeEnabled(QVistaHelper::VistaAero) - || isVistaThemeEnabled(QVistaHelper::VistaBasic); + return wizStyle == QWizard::AeroStyle && !vistaDisabled(); #else return false; #endif @@ -1679,15 +1624,15 @@ void QWizardPrivate::_q_updateButtonStates() const QWizardPage *page = q->currentPage(); bool complete = page && page->isComplete(); - btn.back->setEnabled(history.count() > 1 - && !q->page(history.at(history.count() - 2))->isCommitPage() + btn.back->setEnabled(history.size() > 1 + && !q->page(history.at(history.size() - 2))->isCommitPage() && (!canFinish || !(opts & QWizard::DisabledBackButtonOnLastPage))); btn.next->setEnabled(canContinue && complete); btn.commit->setEnabled(canContinue && complete); btn.finish->setEnabled(canFinish && complete); const bool backButtonVisible = buttonLayoutContains(QWizard::BackButton) - && (history.count() > 1 || !(opts & QWizard::NoBackButtonOnStartPage)) + && (history.size() > 1 || !(opts & QWizard::NoBackButtonOnStartPage)) && (canContinue || !(opts & QWizard::NoBackButtonOnLastPage)); bool commitPage = page && page->isCommitPage(); btn.back->setVisible(backButtonVisible); @@ -1759,23 +1704,19 @@ void QWizardPrivate::setStyle(QStyle *style) } #ifdef Q_OS_MACOS - QPixmap QWizardPrivate::findDefaultBackgroundPixmap() { - QGuiApplication *app = qobject_cast<QGuiApplication *>(QCoreApplication::instance()); - if (!app) - return QPixmap(); - QPlatformNativeInterface *platformNativeInterface = app->platformNativeInterface(); - int at = platformNativeInterface->metaObject()->indexOfMethod("defaultBackgroundPixmapForQWizard()"); - if (at == -1) - return QPixmap(); - QMetaMethod defaultBackgroundPixmapForQWizard = platformNativeInterface->metaObject()->method(at); - QPixmap result; - if (!defaultBackgroundPixmapForQWizard.invoke(platformNativeInterface, Q_RETURN_ARG(QPixmap, result))) - return QPixmap(); - return result; -} + auto *keyboardAssistantURL = [NSWorkspace.sharedWorkspace + URLForApplicationWithBundleIdentifier:@"com.apple.KeyboardSetupAssistant"]; + auto *keyboardAssistantBundle = [NSBundle bundleWithURL:keyboardAssistantURL]; + auto *assistantBackground = [keyboardAssistantBundle imageForResource:@"Background"]; + auto size = QSizeF::fromCGSize(assistantBackground.size); + static const QSizeF expectedSize(242, 414); + if (size == expectedSize) + return qt_mac_toQPixmap(assistantBackground, size); + return QPixmap(); +} #endif #if QT_CONFIG(style_windowsvista) @@ -1791,13 +1732,6 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) painter.fillRect(0, buttonLayoutTop, width(), height() - buttonLayoutTop, brush); painter.setPen(QPen(QBrush(QColor(223, 223, 223)), 0)); // ### hardcoded for now painter.drawLine(0, buttonLayoutTop, width(), buttonLayoutTop); - if (wizardPrivate->isVistaThemeEnabled(QVistaHelper::VistaBasic)) { - if (window()->isActiveWindow()) - painter.setPen(QPen(QBrush(QColor(169, 191, 214)), 0)); // ### hardcoded for now - else - painter.setPen(QPen(QBrush(QColor(182, 193, 204)), 0)); // ### hardcoded for now - painter.drawLine(0, 0, width(), 0); - } } } #endif @@ -1827,9 +1761,8 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) \section1 A Trivial Example The following example illustrates how to create wizard pages and - add them to a wizard. For more advanced examples, see - \l{dialogs/classwizard}{Class Wizard} and \l{dialogs/licensewizard}{License - Wizard}. + add them to a wizard. For more advanced examples, see the + \l{dialogs/licensewizard}{License Wizard}. \snippet dialogs/trivialwizard/trivialwizard.cpp 1 \snippet dialogs/trivialwizard/trivialwizard.cpp 3 @@ -1958,12 +1891,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) To register a field, call QWizardPage::registerField() field. For example: - \snippet dialogs/classwizard/classwizard.cpp 8 - \dots - \snippet dialogs/classwizard/classwizard.cpp 10 - \snippet dialogs/classwizard/classwizard.cpp 11 - \dots - \snippet dialogs/classwizard/classwizard.cpp 13 + \snippet dialogs/licensewizard/licensewizard.cpp 21 The above code registers three fields, \c className, \c baseClass, and \c qobjectMacro, which are associated with three @@ -1974,11 +1902,11 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) The fields of any page are accessible from any other page. For example: - \snippet dialogs/classwizard/classwizard.cpp 17 + \snippet dialogs/licensewizard/licensewizard.cpp 27 Here, we call QWizardPage::field() to access the contents of the - \c className field (which was defined in the \c ClassInfoPage) - and use it to initialize the \c OutputFilePage. The field's + \c details.email field (which was defined in the \c DetailsPage) + and use it to initialize the \c ConclusionPage. The field's contents is returned as a QVariant. When we create a field using QWizardPage::registerField(), we @@ -2021,15 +1949,13 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) \section1 Creating Linear Wizards Most wizards have a linear structure, with page 1 followed by - page 2 and so on until the last page. The \l{dialogs/classwizard}{Class - Wizard} example is such a wizard. With QWizard, linear wizards + page 2 and so on until the last page. The \l{dialogs/trivialwizard} + {Trivial Wizard} example is such a wizard. With QWizard, linear wizards are created by instantiating the \l{QWizardPage}s and inserting them using addPage(). By default, the pages are shown in the order in which they were added. For example: - \snippet dialogs/classwizard/classwizard.cpp 0 - \dots - \snippet dialogs/classwizard/classwizard.cpp 2 + \snippet dialogs/trivialwizard/trivialwizard.cpp linearAddPage When a page is about to be shown, QWizard calls initializePage() (which in turn calls QWizardPage::initializePage()) to fill the @@ -2099,7 +2025,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *) \snippet dialogs/licensewizard/licensewizard.cpp 27 - \sa QWizardPage, {Class Wizard Example}, {License Wizard Example} + \sa QWizardPage, {Trivial Wizard Example}, {License Wizard Example} */ /*! @@ -2262,8 +2188,8 @@ void QWizard::setPage(int theid, QWizardPage *page) page->setParent(d->pageFrame); QList<QWizardField> &pendingFields = page->d_func()->pendingFields; - for (int i = 0; i < pendingFields.count(); ++i) - d->addField(pendingFields.at(i)); + for (const auto &field : std::as_const(pendingFields)) + d->addField(field); pendingFields.clear(); connect(page, SIGNAL(completeChanged()), this, SLOT(_q_updateButtonStates())); @@ -2303,11 +2229,11 @@ void QWizard::removePage(int id) QWizardPage *removedPage = nullptr; // update startItem accordingly - if (d->pageMap.count() > 0) { // only if we have any pages + if (d->pageMap.size() > 0) { // only if we have any pages if (d->start == id) { const int firstId = d->pageMap.constBegin().key(); if (firstId == id) { - if (d->pageMap.count() > 1) + if (d->pageMap.size() > 1) d->start = (++d->pageMap.constBegin()).key(); // secondId else d->start = -1; // removing the last page @@ -2330,7 +2256,7 @@ void QWizard::removePage(int id) removedPage = d->pageMap.take(id); d->history.removeOne(id); d->_q_updateButtonStates(); - } else if (d->history.count() == 1) { + } else if (d->history.size() == 1) { // Case 3: removing the current page which is the first (and only) one in the history d->reset(); removedPage = d->pageMap.take(id); @@ -2353,7 +2279,7 @@ void QWizard::removePage(int id) d->pageVBoxLayout->removeWidget(removedPage); - for (int i = d->fields.count() - 1; i >= 0; --i) { + for (int i = d->fields.size() - 1; i >= 0; --i) { if (d->fields.at(i).page == removedPage) { removedPage->d_func()->pendingFields += d->fields.at(i); d->removeFieldAt(i); @@ -2431,7 +2357,7 @@ void QWizard::setStartId(int theid) Q_D(QWizard); int newStart = theid; if (theid == -1) - newStart = d->pageMap.count() ? d->pageMap.constBegin().key() : -1; + newStart = d->pageMap.size() ? d->pageMap.constBegin().key() : -1; if (d->start == newStart) { d->startSetByUser = theid != -1; @@ -2740,7 +2666,7 @@ void QWizard::setButtonLayout(const QList<WizardButton> &layout) { Q_D(QWizard); - for (int i = 0; i < layout.count(); ++i) { + for (int i = 0; i < layout.size(); ++i) { WizardButton button1 = layout.at(i); if (button1 == NoButton || button1 == Stretch) @@ -2881,7 +2807,7 @@ void QWizard::setPixmap(WizardPixmap which, const QPixmap &pixmap) Returns the pixmap set for role \a which. By default, the only pixmap that is set is the BackgroundPixmap on - \macos version 10.13 and earlier. + \macos. \sa QWizardPage::pixmap(), {Elements of a Wizard Page} */ @@ -2925,7 +2851,7 @@ void QWizard::setDefaultProperty(const char *className, const char *property, const char *changedSignal) { Q_D(QWizard); - for (int i = d->defaultPropertyTable.count() - 1; i >= 0; --i) { + for (int i = d->defaultPropertyTable.size() - 1; i >= 0; --i) { if (qstrcmp(d->defaultPropertyTable.at(i).className, className) == 0) { d->defaultPropertyTable.remove(i); break; @@ -3105,7 +3031,7 @@ QSize QWizard::sizeHint() const void QWizard::back() { Q_D(QWizard); - int n = d->history.count() - 2; + int n = d->history.size() - 2; if (n < 0) return; d->switchToPage(d->history.at(n), QWizardPrivate::Backward); @@ -3142,6 +3068,42 @@ void QWizard::next() } /*! + Sets currentId to \a id, without visiting the pages between currentId and \a id. + + Returns without page change, if + \list + \li wizard holds no pages + \li current page is invalid + \li given page equals currentId() + \li given page is out of range + \endlist + + Note: If pages have been forward skipped and \a id is 0, page visiting history + will be deleted +*/ + +void QWizard::setCurrentId(int id) +{ + Q_D(QWizard); + + if (d->current == -1) + return; + + if (currentId() == id) + return; + + if (!validateCurrentPage()) + return; + + if (id < 0 || Q_UNLIKELY(!d->pageMap.contains(id))) { + qWarning("QWizard::setCurrentId: No such page: %d", id); + return; + } + + d->switchToPage(id, (id < currentId()) ? QWizardPrivate::Backward : QWizardPrivate::Forward); +} + +/*! Restarts the wizard at the start page. This function is called automatically when the wizard is shown. @@ -3171,12 +3133,7 @@ bool QWizard::event(QEvent *event) #if QT_CONFIG(style_windowsvista) else if (event->type() == QEvent::Show && d->vistaInitPending) { d->vistaInitPending = false; - // Do not force AeroStyle when in Classic theme. - // Note that d->handleAeroStyleChange() needs to be called in any case as it does some - // necessary initialization, like ensures that the Aero specific back button is hidden if - // Aero theme isn't active. - if (QVistaHelper::vistaState() != QVistaHelper::Classic) - d->wizStyle = AeroStyle; + d->wizStyle = AeroStyle; d->handleAeroStyleChange(); } else if (d->isVistaThemeEnabled()) { @@ -3206,8 +3163,7 @@ void QWizard::resizeEvent(QResizeEvent *event) #if QT_CONFIG(style_windowsvista) if (d->isVistaThemeEnabled()) { heightOffset = d->vistaHelper->topOffset(this); - if (d->isVistaThemeEnabled(QVistaHelper::VistaAero)) - heightOffset += d->vistaHelper->titleBarSize(); + heightOffset += d->vistaHelper->titleBarSize(); } #endif d->antiFlickerWidget->resize(event->size().width(), event->size().height() - heightOffset); @@ -3229,16 +3185,11 @@ void QWizard::paintEvent(QPaintEvent * event) if (backgroundPixmap.isNull()) return; - QPainter painter(this); + QStylePainter painter(this); painter.drawPixmap(0, (height() - backgroundPixmap.height()) / 2, backgroundPixmap); } #if QT_CONFIG(style_windowsvista) else if (d->isVistaThemeEnabled()) { - if (d->isVistaThemeEnabled(QVistaHelper::VistaBasic)) { - QPainter painter(this); - QColor color = d->vistaHelper->basicWindowFrameColor(); - painter.fillRect(0, 0, width(), QVistaHelper::topOffset(this), color); - } d->vistaHelper->paintEvent(event); } #else @@ -3246,7 +3197,7 @@ void QWizard::paintEvent(QPaintEvent * event) #endif } -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) /*! \reimp */ @@ -3257,12 +3208,12 @@ bool QWizard::nativeEvent(const QByteArray &eventType, void *message, qintptr *r if (d->isVistaThemeEnabled() && eventType == "windows_generic_MSG") { MSG *windowsMessage = static_cast<MSG *>(message); const bool winEventResult = d->vistaHelper->handleWinEvent(windowsMessage, result); - if (QVistaHelper::vistaState() != d->vistaState) { + if (d->vistaDirty) { // QTBUG-78300: When Qt::AA_NativeWindows is set, delay further // window creation until after the platform window creation events. if (windowsMessage->message == WM_GETICON) { d->vistaStateChanged = true; - d->vistaState = QVistaHelper::vistaState(); + d->vistaDirty = false; setWizardStyle(AeroStyle); } } @@ -3448,7 +3399,7 @@ int QWizard::nextId() const using registerField() and can be accessed at any time using field() and setField(). - \sa QWizard, {Class Wizard Example}, {License Wizard Example} + \sa QWizard, {Trivial Wizard Example}, {License Wizard Example} */ /*! @@ -3591,7 +3542,7 @@ QPixmap QWizardPage::pixmap(QWizard::WizardPixmap which) const fields are properly initialized based on fields from previous pages. For example: - \snippet dialogs/classwizard/classwizard.cpp 17 + \snippet dialogs/licensewizard/licensewizard.cpp 27 The default implementation does nothing. @@ -3668,8 +3619,9 @@ bool QWizardPage::isComplete() const return true; const QList<QWizardField> &wizardFields = d->wizard->d_func()->fields; - for (int i = wizardFields.count() - 1; i >= 0; --i) { - const QWizardField &field = wizardFields.at(i); + const auto end = wizardFields.crend(); + for (auto it = wizardFields.crbegin(); it != end; ++it) { + const QWizardField &field = *it; if (field.page == this && field.mandatory) { QVariant value = field.object->property(field.property); if (value == field.initialValue) @@ -3895,7 +3847,7 @@ void QWizardPage::setField(const QString &name, const QVariant &value) Example: - \snippet dialogs/classwizard/classwizard.cpp 17 + \snippet dialogs/licensewizard/licensewizard.cpp accessField \sa QWizard::field(), setField(), registerField() */ diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index 8e058aa93b..0ec973b0d2 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QWIZARD_H #define QWIZARD_H @@ -59,7 +23,7 @@ class Q_WIDGETS_EXPORT QWizard : public QDialog Q_PROPERTY(Qt::TextFormat titleFormat READ titleFormat WRITE setTitleFormat) Q_PROPERTY(Qt::TextFormat subTitleFormat READ subTitleFormat WRITE setSubTitleFormat) Q_PROPERTY(int startId READ startId WRITE setStartId) - Q_PROPERTY(int currentId READ currentId NOTIFY currentIdChanged) + Q_PROPERTY(int currentId READ currentId WRITE setCurrentId NOTIFY currentIdChanged) public: enum WizardButton { @@ -181,13 +145,14 @@ Q_SIGNALS: public Q_SLOTS: void back(); void next(); + void setCurrentId(int id); void restart(); protected: bool event(QEvent *event) override; void resizeEvent(QResizeEvent *event) override; void paintEvent(QPaintEvent *event) override; -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override; #endif void done(int result) override; diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index 24aa24de20..2c4f049e88 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <QtWidgets/private/qtwidgetsglobal_p.h> @@ -60,6 +24,7 @@ #include <vssym32.h> #include <dwmapi.h> +// ### move to qmargins.h Q_DECLARE_METATYPE(QMargins) #ifndef WM_DWMCOMPOSITIONCHANGED @@ -68,9 +33,7 @@ Q_DECLARE_METATYPE(QMargins) QT_BEGIN_NAMESPACE -int QVistaHelper::instanceCount = 0; -int QVistaHelper::m_devicePixelRatio = 1; -QVistaHelper::VistaState QVistaHelper::cachedVistaState = QVistaHelper::Dirty; +qreal QVistaHelper::m_devicePixelRatio = 1.0; /****************************************************************************** ** QVistaBackButton @@ -119,7 +82,7 @@ void QVistaBackButton::paintEvent(QPaintEvent *) RECT clipRect; int xoffset = origin.x() + QWidget::mapToParent(r.topLeft()).x() - 1; int yoffset = origin.y() + QWidget::mapToParent(r.topLeft()).y() - 1; - const int dpr = devicePixelRatio(); + const qreal dpr = devicePixelRatio(); const QRect rDp = QRect(r.topLeft() * dpr, r.size() * dpr); const int xoffsetDp = xoffset * dpr; const int yoffsetDp = yoffset * dpr; @@ -153,18 +116,14 @@ QVistaHelper::QVistaHelper(QWizard *wizard) , backButton_(0) { QVistaHelper::m_devicePixelRatio = wizard->devicePixelRatio(); - if (instanceCount++ == 0) - cachedVistaState = Dirty; + backButton_ = new QVistaBackButton(wizard); backButton_->hide(); iconSpacing = QStyleHelper::dpiScaled(7, wizard); } -QVistaHelper::~QVistaHelper() -{ - --instanceCount; -} +QVistaHelper::~QVistaHelper() = default; void QVistaHelper::updateCustomMargins(bool vistaMargins) { @@ -185,25 +144,6 @@ void QVistaHelper::updateCustomMargins(bool vistaMargins) } } -bool QVistaHelper::isCompositionEnabled() -{ - BOOL bEnabled; - return SUCCEEDED(DwmIsCompositionEnabled(&bEnabled)) && bEnabled; -} - -bool QVistaHelper::isThemeActive() -{ - return IsThemeActive(); -} - -QVistaHelper::VistaState QVistaHelper::vistaState() -{ - if (instanceCount == 0 || cachedVistaState == Dirty) - cachedVistaState = - isCompositionEnabled() ? VistaAero : isThemeActive() ? VistaBasic : Classic; - return cachedVistaState; -} - void QVistaHelper::disconnectBackButton() { if (backButton_) // Leave QStyleSheetStyle's connections on destroyed() intact. @@ -224,18 +164,16 @@ QColor QVistaHelper::basicWindowFrameColor() bool QVistaHelper::setDWMTitleBar(TitleBarChangeType type) { - bool value = false; - if (vistaState() == VistaAero) { - MARGINS mar = {0, 0, 0, 0}; - if (type == NormalTitleBar) - mar.cyTopHeight = 0; - else - mar.cyTopHeight = (titleBarSize() + topOffset(wizard)) * QVistaHelper::m_devicePixelRatio; - if (const HWND wizardHandle = wizardHWND()) - if (SUCCEEDED(DwmExtendFrameIntoClientArea(wizardHandle, &mar))) - value = true; + MARGINS mar = {0, 0, 0, 0}; + if (type == NormalTitleBar) + mar.cyTopHeight = 0; + else + mar.cyTopHeight = (titleBarSize() + topOffset(wizard)) * QVistaHelper::m_devicePixelRatio; + if (const HWND wizardHandle = wizardHWND()) { + if (SUCCEEDED(DwmExtendFrameIntoClientArea(wizardHandle, &mar))) + return true; } - return value; + return false; } Q_GUI_EXPORT HICON qt_pixmapToWinHICON(const QPixmap &); @@ -271,7 +209,7 @@ void QVistaHelper::drawTitleBar(QPainter *painter) const bool isWindow = wizard->isWindow(); const HDC hdc = QVistaHelper::backingStoreDC(wizard, &origin); - if (vistaState() == VistaAero && isWindow) + if (isWindow) drawBlackRect(QRect(0, 0, wizard->width(), titleBarSize() + topOffset(wizard)), hdc); // The button is positioned in QWizardPrivate::handleAeroStyleChange(), @@ -286,15 +224,9 @@ void QVistaHelper::drawTitleBar(QPainter *painter) font = QApplication::font("QMdiSubWindowTitleBar"); const QFontMetrics fontMetrics(font); const QRect brect = fontMetrics.boundingRect(text); - int textHeight = brect.height(); - int textWidth = brect.width(); - int glowOffset = 0; - - if (vistaState() == VistaAero) { - glowOffset = glowSize(wizard); - textHeight += 2 * glowOffset; - textWidth += 2 * glowOffset; - } + const int glowOffset = glowSize(wizard); + int textHeight = brect.height() + 2 * glowOffset; + int textWidth = brect.width() + 2 * glowOffset; const int titleLeft = (wizard->layoutDirection() == Qt::LeftToRight ? titleOffset() - glowOffset @@ -401,11 +333,8 @@ void QVistaHelper::mouseEvent(QEvent *event) bool QVistaHelper::handleWinEvent(MSG *message, qintptr *result) { - if (message->message == WM_THEMECHANGED || message->message == WM_DWMCOMPOSITIONCHANGED) - cachedVistaState = Dirty; - bool status = false; - if (wizard->wizardStyle() == QWizard::AeroStyle && vistaState() == VistaAero) { + if (wizard->wizardStyle() == QWizard::AeroStyle) { status = winEvent(message, result); if (message->message == WM_NCPAINT) wizard->update(); @@ -418,8 +347,6 @@ void QVistaHelper::resizeEvent(QResizeEvent * event) Q_UNUSED(event); rtTop = QRect (0, 0, wizard->width(), frameSize()); int height = captionSize() + topOffset(wizard); - if (vistaState() == VistaBasic) - height -= titleBarSize(); rtTitle = QRect (0, frameSize(), wizard->width(), height); } @@ -458,7 +385,7 @@ void QVistaHelper::mouseMoveEvent(QMouseEvent *event) } wizard->setGeometry(rect); - } else if (vistaState() == VistaAero) { + } else { setMouseCursor(event->pos()); } event->ignore(); @@ -476,11 +403,10 @@ void QVistaHelper::mousePressEvent(QMouseEvent *event) if (rtTitle.contains(event->pos())) { change = movePosition; } else if (rtTop.contains(event->pos())) - change = (vistaState() == VistaAero) ? resizeTop : movePosition; + change = resizeTop; if (change != noChange) { - if (vistaState() == VistaAero) - setMouseCursor(event->pos()); + setMouseCursor(event->pos()); pressed = true; pressedPos = event->pos(); } else { @@ -494,8 +420,7 @@ void QVistaHelper::mouseReleaseEvent(QMouseEvent *event) if (pressed) { pressed = false; wizard->releaseMouse(); - if (vistaState() == VistaAero) - setMouseCursor(event->pos()); + setMouseCursor(event->pos()); } event->ignore(); } @@ -583,112 +508,88 @@ HWND QVistaHelper::wizardHWND() const return 0; } -bool QVistaHelper::drawTitleText(QPainter *painter, const QString &text, const QRect &rect, HDC hdc) +void QVistaHelper::drawTitleText(QPainter *painter, const QString &text, const QRect &rect, HDC hdc) { - bool value = false; - if (vistaState() == VistaAero) { - const QRect rectDp = QRect(rect.topLeft() * QVistaHelper::m_devicePixelRatio, - rect.size() * QVistaHelper::m_devicePixelRatio); - const HANDLE hTheme = OpenThemeData(GetDesktopWindow(), L"WINDOW"); - if (!hTheme) return false; - // Set up a memory DC and bitmap that we'll draw into - HDC dcMem; - HBITMAP bmp; - BITMAPINFO dib; - ZeroMemory(&dib, sizeof(dib)); - dcMem = CreateCompatibleDC(hdc); - - dib.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - dib.bmiHeader.biWidth = rectDp.width(); - dib.bmiHeader.biHeight = -rectDp.height(); - dib.bmiHeader.biPlanes = 1; - dib.bmiHeader.biBitCount = 32; - dib.bmiHeader.biCompression = BI_RGB; - - bmp = CreateDIBSection(hdc, &dib, DIB_RGB_COLORS, NULL, NULL, 0); - - // Set up the DC - const LOGFONT captionLogFont = getCaptionLogFont(hTheme); - const HFONT hCaptionFont = CreateFontIndirect(&captionLogFont); - auto hOldBmp = reinterpret_cast<HBITMAP>(SelectObject(dcMem, (HGDIOBJ) bmp)); - auto hOldFont = reinterpret_cast<HFONT>(SelectObject(dcMem, (HGDIOBJ) hCaptionFont)); - - // Draw the text! - DTTOPTS dto; - memset(&dto, 0, sizeof(dto)); - dto.dwSize = sizeof(dto); - const UINT uFormat = DT_SINGLELINE|DT_CENTER|DT_VCENTER|DT_NOPREFIX; - RECT rctext ={0,0, rectDp.width(), rectDp.height()}; - - dto.dwFlags = DTT_COMPOSITED|DTT_GLOWSIZE; - dto.iGlowSize = glowSize(wizard); - - DrawThemeTextEx(hTheme, dcMem, 0, 0, reinterpret_cast<LPCWSTR>(text.utf16()), -1, uFormat, &rctext, &dto ); - BitBlt(hdc, rectDp.left(), rectDp.top(), rectDp.width(), rectDp.height(), dcMem, 0, 0, SRCCOPY); - SelectObject(dcMem, (HGDIOBJ) hOldBmp); - SelectObject(dcMem, (HGDIOBJ) hOldFont); - DeleteObject(bmp); - DeleteObject(hCaptionFont); - DeleteDC(dcMem); - //ReleaseDC(hwnd, hdc); - } else if (vistaState() == VistaBasic) { - painter->drawText(rect, text); - } - return value; -} + Q_UNUSED(painter); -bool QVistaHelper::drawBlackRect(const QRect &rect, HDC hdc) -{ - bool value = false; - if (vistaState() == VistaAero) { - // Set up a memory DC and bitmap that we'll draw into - const QRect rectDp = QRect(rect.topLeft() * QVistaHelper::m_devicePixelRatio, + const QRect rectDp = QRect(rect.topLeft() * QVistaHelper::m_devicePixelRatio, + rect.size() * QVistaHelper::m_devicePixelRatio); + const HANDLE hTheme = OpenThemeData(GetDesktopWindow(), L"WINDOW"); + if (!hTheme) + return; + // Set up a memory DC and bitmap that we'll draw into + HDC dcMem; + HBITMAP bmp; + BITMAPINFO dib; + ZeroMemory(&dib, sizeof(dib)); + dcMem = CreateCompatibleDC(hdc); + + dib.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + dib.bmiHeader.biWidth = rectDp.width(); + dib.bmiHeader.biHeight = -rectDp.height(); + dib.bmiHeader.biPlanes = 1; + dib.bmiHeader.biBitCount = 32; + dib.bmiHeader.biCompression = BI_RGB; + + bmp = CreateDIBSection(hdc, &dib, DIB_RGB_COLORS, NULL, NULL, 0); + + // Set up the DC + const LOGFONT captionLogFont = getCaptionLogFont(hTheme); + const HFONT hCaptionFont = CreateFontIndirect(&captionLogFont); + auto hOldBmp = reinterpret_cast<HBITMAP>(SelectObject(dcMem, (HGDIOBJ) bmp)); + auto hOldFont = reinterpret_cast<HFONT>(SelectObject(dcMem, (HGDIOBJ) hCaptionFont)); + + // Draw the text! + DTTOPTS dto; + memset(&dto, 0, sizeof(dto)); + dto.dwSize = sizeof(dto); + const UINT uFormat = DT_SINGLELINE|DT_CENTER|DT_VCENTER|DT_NOPREFIX; + RECT rctext ={0,0, rectDp.width(), rectDp.height()}; + + dto.dwFlags = DTT_COMPOSITED|DTT_GLOWSIZE; + dto.iGlowSize = glowSize(wizard); + + DrawThemeTextEx(hTheme, dcMem, 0, 0, reinterpret_cast<LPCWSTR>(text.utf16()), -1, uFormat, &rctext, &dto ); + BitBlt(hdc, rectDp.left(), rectDp.top(), rectDp.width(), rectDp.height(), dcMem, 0, 0, SRCCOPY); + SelectObject(dcMem, (HGDIOBJ) hOldBmp); + SelectObject(dcMem, (HGDIOBJ) hOldFont); + DeleteObject(bmp); + DeleteObject(hCaptionFont); + DeleteDC(dcMem); + //ReleaseDC(hwnd, hdc); +} + +void QVistaHelper::drawBlackRect(const QRect &rect, HDC hdc) +{ + // Set up a memory DC and bitmap that we'll draw into + const QRect rectDp = QRect(rect.topLeft() * QVistaHelper::m_devicePixelRatio, rect.size() * QVistaHelper::m_devicePixelRatio); - HDC dcMem; - HBITMAP bmp; - BITMAPINFO dib; - ZeroMemory(&dib, sizeof(dib)); - dcMem = CreateCompatibleDC(hdc); - - dib.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - dib.bmiHeader.biWidth = rectDp.width(); - dib.bmiHeader.biHeight = -rectDp.height(); - dib.bmiHeader.biPlanes = 1; - dib.bmiHeader.biBitCount = 32; - dib.bmiHeader.biCompression = BI_RGB; - - bmp = CreateDIBSection(hdc, &dib, DIB_RGB_COLORS, NULL, NULL, 0); - auto hOldBmp = reinterpret_cast<HBITMAP>(SelectObject(dcMem, (HGDIOBJ) bmp)); - - BitBlt(hdc, rectDp.left(), rectDp.top(), rectDp.width(), rectDp.height(), dcMem, 0, 0, SRCCOPY); - SelectObject(dcMem, (HGDIOBJ) hOldBmp); - - DeleteObject(bmp); - DeleteDC(dcMem); - } - return value; -} + HDC dcMem; + HBITMAP bmp; + BITMAPINFO dib; + ZeroMemory(&dib, sizeof(dib)); + dcMem = CreateCompatibleDC(hdc); -#ifndef Q_CC_MSVC -static inline int getWindowBottomMargin() -{ - return GetSystemMetrics(SM_CYSIZEFRAME); -} -#else -// QTBUG-36192, GetSystemMetrics(SM_CYSIZEFRAME) returns bogus values -// for MSVC2012 which leads to the custom margin having no effect since -// that only works when removing the entire margin. -static inline int getWindowBottomMargin() -{ - RECT rect = {0, 0, 0, 0}; - AdjustWindowRectEx(&rect, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_THICKFRAME | WS_DLGFRAME, FALSE, 0); - return qAbs(rect.bottom); + dib.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + dib.bmiHeader.biWidth = rectDp.width(); + dib.bmiHeader.biHeight = -rectDp.height(); + dib.bmiHeader.biPlanes = 1; + dib.bmiHeader.biBitCount = 32; + dib.bmiHeader.biCompression = BI_RGB; + + bmp = CreateDIBSection(hdc, &dib, DIB_RGB_COLORS, NULL, NULL, 0); + auto hOldBmp = reinterpret_cast<HBITMAP>(SelectObject(dcMem, (HGDIOBJ) bmp)); + + BitBlt(hdc, rectDp.left(), rectDp.top(), rectDp.width(), rectDp.height(), dcMem, 0, 0, SRCCOPY); + SelectObject(dcMem, (HGDIOBJ) hOldBmp); + + DeleteObject(bmp); + DeleteDC(dcMem); } -#endif // Q_CC_MSVC int QVistaHelper::frameSizeDp() { - return getWindowBottomMargin(); + return GetSystemMetrics(SM_CXSIZEFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER); } int QVistaHelper::captionSizeDp() @@ -714,8 +615,6 @@ int QVistaHelper::glowSize(const QPaintDevice *device) int QVistaHelper::topOffset(const QPaintDevice *device) { - if (vistaState() != VistaAero) - return titleBarSize() + 3; static const int aeroOffset = QStyleHelper::dpiScaled(13, device); return aeroOffset + titleBarSize(); } diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h index a8799e4b86..ce0f7b85b3 100644 --- a/src/widgets/dialogs/qwizard_win_p.h +++ b/src/widgets/dialogs/qwizard_win_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QWIZARD_WIN_P_H #define QWIZARD_WIN_P_H @@ -100,8 +64,6 @@ public: void disconnectBackButton(); void hideBackButton() { if (backButton_) backButton_->hide(); } QColor basicWindowFrameColor(); - enum VistaState { VistaAero, VistaBasic, Classic, Dirty }; - static VistaState vistaState(); static int titleBarSize() { return QVistaHelper::titleBarSizeDp() / QVistaHelper::m_devicePixelRatio; } static int titleBarSizeDp() { return QVistaHelper::frameSizeDp() + QVistaHelper::captionSizeDp(); } static int topPadding(const QPaintDevice *device) { // padding under text @@ -113,8 +75,8 @@ public: private: HWND wizardHWND() const; - bool drawTitleText(QPainter *painter, const QString &text, const QRect &rect, HDC hdc); - static bool drawBlackRect(const QRect &rect, HDC hdc); + void drawTitleText(QPainter *painter, const QString &text, const QRect &rect, HDC hdc); + static void drawBlackRect(const QRect &rect, HDC hdc); static int frameSize() { return QVistaHelper::frameSizeDp() / QVistaHelper::m_devicePixelRatio; } static int frameSizeDp(); @@ -138,10 +100,6 @@ private: void mouseReleaseEvent(QMouseEvent *event); bool eventFilter(QObject *obj, QEvent *event) override; - static int instanceCount; - static VistaState cachedVistaState; - static bool isCompositionEnabled(); - static bool isThemeActive(); enum Changes { resizeTop, movePosition, noChange } change; QPoint pressedPos; bool pressed; @@ -152,7 +110,7 @@ private: int titleBarOffset; // Extra spacing above the text int iconSpacing; // Space between button and icon - static int m_devicePixelRatio; + static qreal m_devicePixelRatio; }; |
