diff options
Diffstat (limited to 'src/widgets/widgets/qcalendarwidget.cpp')
| -rw-r--r-- | src/widgets/widgets/qcalendarwidget.cpp | 286 |
1 files changed, 141 insertions, 145 deletions
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index fe1133c6c7..0495b20422 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -1,46 +1,10 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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 "qcalendarwidget.h" #include <qabstractitemmodel.h> -#include <qitemdelegate.h> +#include <qstyleditemdelegate.h> #include <qdatetime.h> #include <qtableview.h> #include <qlayout.h> @@ -63,6 +27,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + enum { RowCount = 6, ColumnCount = 7, @@ -71,13 +37,13 @@ enum { MinimumDayOffset = 1 }; -namespace { - static QString formatNumber(int number, int fieldWidth) { - return QString::number(number).rightJustified(fieldWidth, QLatin1Char('0')); + return QString::number(number).rightJustified(fieldWidth, u'0'); } +namespace QtPrivate { + class QCalendarDateSectionValidator { public: @@ -105,9 +71,9 @@ protected: QString QCalendarDateSectionValidator::highlightString(const QString &str, int pos) { if (pos == 0) - return QLatin1String("<b>") + str + QLatin1String("</b>"); - int startPos = str.length() - pos; - return str.midRef(0, startPos) + QLatin1String("<b>") + str.midRef(startPos, pos) + QLatin1String("</b>"); + return "<b>"_L1 + str + "</b>"_L1; + int startPos = str.size() - pos; + return QStringView{str}.mid(0, startPos) + "<b>"_L1 + QStringView{str}.mid(startPos, pos) + "</b>"_L1; } @@ -186,7 +152,7 @@ QDate QCalendarDayValidator::applyToDate(QDate date, QCalendar cal) const auto parts = cal.partsFromDate(date); if (!parts.isValid()) return QDate(); - parts.day = qMin(qMax(1, m_day), cal.daysInMonth(parts.year, parts.month)); + parts.day = qMin(qMax(1, m_day), cal.daysInMonth(parts.month, parts.year)); return cal.dateFromParts(parts); } @@ -292,7 +258,7 @@ QDate QCalendarMonthValidator::applyToDate(QDate date, QCalendar cal) const if (!parts.isValid()) return QDate(); parts.month = qMin(qMax(1, m_month), cal.monthsInYear(parts.year)); - parts.day = qMin(parts.day, cal.daysInMonth(parts.year, m_month)); // m_month or parts.month ? + parts.day = qMin(parts.day, cal.daysInMonth(m_month, parts.year)); // m_month or parts.month ? return cal.dateFromParts(parts); } @@ -401,7 +367,7 @@ QDate QCalendarYearValidator::applyToDate(QDate date, QCalendar cal) const return QDate(); // This widget does not support negative years (some calendars may support) parts.year = qMax(1, m_year); - parts.day = qMin(parts.day, cal.daysInMonth(parts.year, parts.month)); + parts.day = qMin(parts.day, cal.daysInMonth(parts.month, parts.year)); return cal.dateFromParts(parts); } @@ -426,15 +392,17 @@ QString QCalendarYearValidator::text(QDate date, QCalendar cal, int repeat) cons /////////////////////////////////// struct SectionToken { - Q_DECL_CONSTEXPR SectionToken(QCalendarDateSectionValidator *v, int rep) + constexpr SectionToken(QCalendarDateSectionValidator *v, int rep) : validator(v), repeat(rep) {} QCalendarDateSectionValidator *validator; int repeat; }; -} // unnamed namespace -Q_DECLARE_TYPEINFO(SectionToken, Q_PRIMITIVE_TYPE); -namespace { +} // namespace QtPrivate + +Q_DECLARE_TYPEINFO(QtPrivate::SectionToken, Q_PRIMITIVE_TYPE); + +namespace QtPrivate { class QCalendarDateValidator { @@ -544,11 +512,11 @@ void QCalendarDateValidator::setFormat(const QString &format) clear(); int pos = 0; - const QLatin1Char quote('\''); + const auto quote = u'\''; bool quoting = false; QString separator; while (pos < format.size()) { - const QStringRef mid = format.midRef(pos); + const QStringView mid = QStringView{format}.mid(pos); int offset = 1; if (mid.startsWith(quote)) { @@ -560,13 +528,13 @@ void QCalendarDateValidator::setFormat(const QString &format) quoting = false; } else { QCalendarDateSectionValidator *validator = nullptr; - if (nextChar == QLatin1Char('d')) { + if (nextChar == u'd') { offset = qMin(4, countRepeat(format, pos)); validator = &m_dayValidator; - } else if (nextChar == QLatin1Char('M')) { + } else if (nextChar == u'M') { offset = qMin(4, countRepeat(format, pos)); validator = &m_monthValidator; - } else if (nextChar == QLatin1Char('y')) { + } else if (nextChar == u'y') { offset = qMin(4, countRepeat(format, pos)); validator = &m_yearValidator; } else { @@ -761,8 +729,8 @@ bool QCalendarTextNavigator::eventFilter(QObject *o, QEvent *e) { if (m_widget) { if (e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease) { - QKeyEvent* ke = (QKeyEvent*)e; - if ((ke->text().length() > 0 && ke->text().at(0).isPrint()) || m_dateFrame) { + QKeyEvent *ke = static_cast<QKeyEvent *>(e); + if ((ke->text().size() > 0 && ke->text().at(0).isPrint()) || m_dateFrame) { if (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Select) { applyDate(); emit editingFinished(); @@ -826,27 +794,23 @@ class StaticDayOfWeekAssociativeArray { bool contained[7]; T data[7]; - static Q_DECL_CONSTEXPR int day2idx(Qt::DayOfWeek day) noexcept { return int(day) - 1; } // alt: day % 7 + static constexpr int day2idx(Qt::DayOfWeek day) noexcept { return int(day) - 1; } // alt: day % 7 public: - Q_DECL_CONSTEXPR StaticDayOfWeekAssociativeArray() noexcept(noexcept(T())) -#ifdef Q_COMPILER_CONSTEXPR + constexpr StaticDayOfWeekAssociativeArray() noexcept(noexcept(T())) : contained{}, data{} // arrays require uniform initialization -#else - : contained(), data() -#endif {} - Q_DECL_CONSTEXPR bool contains(Qt::DayOfWeek day) const noexcept { return contained[day2idx(day)]; } - Q_DECL_CONSTEXPR const T &value(Qt::DayOfWeek day) const noexcept { return data[day2idx(day)]; } + constexpr bool contains(Qt::DayOfWeek day) const noexcept { return contained[day2idx(day)]; } + constexpr const T &value(Qt::DayOfWeek day) const noexcept { return data[day2idx(day)]; } - Q_DECL_RELAXED_CONSTEXPR T &operator[](Qt::DayOfWeek day) noexcept + constexpr T &operator[](Qt::DayOfWeek day) noexcept { const int idx = day2idx(day); contained[idx] = true; return data[idx]; } - Q_DECL_RELAXED_CONSTEXPR void insert(Qt::DayOfWeek day, T v) noexcept + constexpr void insert(Qt::DayOfWeek day, T v) noexcept { operator[](day).swap(v); } @@ -860,38 +824,23 @@ class QCalendarModel : public QAbstractTableModel public: QCalendarModel(QObject *parent = nullptr); - int rowCount(const QModelIndex &) const override - { return RowCount + m_firstRow; } - int columnCount(const QModelIndex &) const override - { return ColumnCount + m_firstColumn; } - QVariant data(const QModelIndex &index, int role) const override; - Qt::ItemFlags flags(const QModelIndex &index) const override; - - bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override - { - beginInsertRows(parent, row, row + count - 1); - endInsertRows(); - return true; - } - bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override + int rowCount(const QModelIndex &parent) const override { - beginInsertColumns(parent, column, column + count - 1); - endInsertColumns(); - return true; - } - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override - { - beginRemoveRows(parent, row, row + count - 1); - endRemoveRows(); - return true; + if (parent.isValid()) + return 0; + return RowCount + m_firstRow; } - bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override + + int columnCount(const QModelIndex &parent) const override { - beginRemoveColumns(parent, column, column + count - 1); - endRemoveColumns(); - return true; + if (parent.isValid()) + return 0; + return ColumnCount + m_firstColumn; } + QVariant data(const QModelIndex &index, int role) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + void showMonth(int year, int month); void setDate(QDate d); @@ -955,7 +904,7 @@ public: void internalUpdate() { updateGeometries(); } void setReadOnly(bool enable); - virtual void keyboardSearch(const QString & search) override { Q_UNUSED(search) } + virtual void keyboardSearch(const QString &) override {} signals: void showDate(QDate date); @@ -1130,16 +1079,17 @@ QTextCharFormat QCalendarModel::formatForCell(int row, int col) const { QPalette pal; QPalette::ColorGroup cg = QPalette::Active; + QTextCharFormat format; + if (m_view) { pal = m_view->palette(); if (!m_view->isEnabled()) cg = QPalette::Disabled; else if (!m_view->isActiveWindow()) cg = QPalette::Inactive; + format.setFont(m_view->font()); } - QTextCharFormat format; - format.setFont(m_view->font()); bool header = (m_weekNumbersShown && col == HeaderColumn) || (m_horizontalHeaderFormat != QCalendarWidget::NoHorizontalHeader && row == HeaderRow); format.setBackground(pal.brush(cg, header ? QPalette::AlternateBase : QPalette::Base)); @@ -1157,7 +1107,7 @@ QTextCharFormat QCalendarModel::formatForCell(int row, int col) const if (!header) { QDate date = dateForCell(row, col); format.merge(m_dateFormats.value(date)); - if(date < m_minimumDate || date > m_maximumDate) + if (date < m_minimumDate || date > m_maximumDate) format.setBackground(pal.brush(cg, QPalette::Window)); if (m_shownMonth != date.month(m_calendar)) format.setForeground(pal.brush(QPalette::Disabled, QPalette::Text)); @@ -1173,7 +1123,7 @@ QVariant QCalendarModel::data(const QModelIndex &index, int role) const int row = index.row(); int column = index.column(); - if(role == Qt::DisplayRole) { + if (role == Qt::DisplayRole) { if (m_weekNumbersShown && column == HeaderColumn && row >= m_firstRow && row < m_firstRow + RowCount) { QDate date = dateForCell(row, columnForDayOfWeek(Qt::Monday)); @@ -1303,11 +1253,13 @@ void QCalendarModel::setHorizontalHeaderFormat(QCalendarWidget::HorizontalHeader int oldFormat = m_horizontalHeaderFormat; m_horizontalHeaderFormat = format; if (oldFormat == QCalendarWidget::NoHorizontalHeader) { + beginInsertRows(QModelIndex(), 0, 0); m_firstRow = 1; - insertRow(0); + endInsertRows(); } else if (m_horizontalHeaderFormat == QCalendarWidget::NoHorizontalHeader) { + beginRemoveRows(QModelIndex(), 0, 0); m_firstRow = 0; - removeRow(0); + endRemoveRows(); } internalUpdate(); } @@ -1338,11 +1290,13 @@ void QCalendarModel::setWeekNumbersShown(bool show) m_weekNumbersShown = show; if (show) { + beginInsertColumns(QModelIndex(), 0, 0); m_firstColumn = 1; - insertColumn(0); + endInsertColumns(); } else { + beginRemoveColumns(QModelIndex(), 0, 0); m_firstColumn = 0; - removeColumn(0); + endRemoveColumns(); } internalUpdate(); } @@ -1397,7 +1351,7 @@ QModelIndex QCalendarView::moveCursor(CursorAction cursorAction, Qt::KeyboardMod case QAbstractItemView::MoveEnd: { auto parts = cal.partsFromDate(currentDate); if (parts.isValid()) { - parts.day = cal.daysInMonth(parts.year, parts.month); + parts.day = cal.daysInMonth(parts.month, parts.year); currentDate = cal.dateFromParts(parts); } } @@ -1485,7 +1439,7 @@ QDate QCalendarView::handleMouseEvent(QMouseEvent *event) if (!calendarModel) return QDate(); - QPoint pos = event->pos(); + QPoint pos = event->position().toPoint(); QModelIndex index = indexAt(pos); QDate date = calendarModel->dateForCell(index.row(), index.column()); if (date.isValid() && date >= calendarModel->m_minimumDate @@ -1594,13 +1548,12 @@ void QCalendarView::mouseReleaseEvent(QMouseEvent *event) } } -// ### Qt6: QStyledItemDelegate -class QCalendarDelegate : public QItemDelegate +class QCalendarDelegate : public QStyledItemDelegate { Q_OBJECT public: QCalendarDelegate(QCalendarWidgetPrivate *w, QObject *parent = nullptr) - : QItemDelegate(parent), calendarWidgetPrivate(w) + : QStyledItemDelegate(parent), calendarWidgetPrivate(w) { } virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; @@ -1621,7 +1574,7 @@ public: protected: void paintEvent(QPaintEvent *e) override { - Q_UNUSED(e) + Q_UNUSED(e); QStyleOptionToolButton opt; initStyleOption(&opt); @@ -1655,7 +1608,20 @@ protected: } }; -} // unnamed namespace +} // namespace QtPrivate + +using QCalendarDateSectionValidator = QtPrivate::QCalendarDateSectionValidator; +using QCalendarDayValidator = QtPrivate::QCalendarDayValidator; +using QCalendarMonthValidator = QtPrivate::QCalendarMonthValidator; +using QCalendarYearValidator = QtPrivate::QCalendarYearValidator; +using QCalendarDateValidator = QtPrivate::QCalendarDateValidator; +using QPrevNextCalButton = QtPrivate::QPrevNextCalButton; +using QCalendarDelegate = QtPrivate::QCalendarDelegate; +using QCalToolButton = QtPrivate::QCalToolButton; +using QCalendarDelegate = QtPrivate::QCalendarDelegate; +using QCalendarModel = QtPrivate::QCalendarModel; +using QCalendarView = QtPrivate::QCalendarView; +using QCalendarTextNavigator = QtPrivate::QCalendarTextNavigator; class QCalendarWidgetPrivate : public QWidgetPrivate { @@ -1717,7 +1683,7 @@ void QCalendarDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt QRect rect = option.rect; calendarWidgetPrivate->paintCell(painter, rect, date); } else { - QItemDelegate::paint(painter, option, index); + QStyledItemDelegate::paint(painter, option, index); } } @@ -1728,7 +1694,7 @@ void QCalendarDelegate::paintCell(QPainter *painter, const QRect &rect, QDate da int col = -1; calendarWidgetPrivate->m_model->cellForDate(date, &row, &col); QModelIndex idx = calendarWidgetPrivate->m_model->index(row, col); - QItemDelegate::paint(painter, storedOption, idx); + QStyledItemDelegate::paint(painter, storedOption, idx); } QCalendarWidgetPrivate::QCalendarWidgetPrivate() @@ -1773,7 +1739,7 @@ void QCalendarWidgetPrivate::createNavigationBar(QWidget *widget) { Q_Q(QCalendarWidget); navBarBackground = new QWidget(widget); - navBarBackground->setObjectName(QLatin1String("qt_calendar_navigationbar")); + navBarBackground->setObjectName("qt_calendar_navigationbar"_L1); navBarBackground->setAutoFillBackground(true); navBarBackground->setBackgroundRole(QPalette::Highlight); @@ -1834,11 +1800,11 @@ void QCalendarWidgetPrivate::createNavigationBar(QWidget *widget) monthButton->setFocusPolicy(Qt::NoFocus); //set names for the header controls. - prevMonth->setObjectName(QLatin1String("qt_calendar_prevmonth")); - nextMonth->setObjectName(QLatin1String("qt_calendar_nextmonth")); - monthButton->setObjectName(QLatin1String("qt_calendar_monthbutton")); - yearButton->setObjectName(QLatin1String("qt_calendar_yearbutton")); - yearEdit->setObjectName(QLatin1String("qt_calendar_yearedit")); + prevMonth->setObjectName("qt_calendar_prevmonth"_L1); + nextMonth->setObjectName("qt_calendar_nextmonth"_L1); + monthButton->setObjectName("qt_calendar_monthbutton"_L1); + yearButton->setObjectName("qt_calendar_yearbutton"_L1); + yearEdit->setObjectName("qt_calendar_yearedit"_L1); updateMonthMenu(); showMonth(m_model->m_date.year(m_model->m_calendar), m_model->m_date.month(m_model->m_calendar)); @@ -1939,7 +1905,6 @@ void QCalendarWidgetPrivate::_q_nextMonthClicked() void QCalendarWidgetPrivate::_q_yearEditingFinished() { Q_Q(QCalendarWidget); - yearButton->setText(q->locale().toString(yearEdit->value())); yearEdit->hide(); q->setFocusPolicy(oldFocusPolicy); qApp->removeEventFilter(q); @@ -1948,6 +1913,7 @@ void QCalendarWidgetPrivate::_q_yearEditingFinished() QDate currentDate = getCurrentDate(); int newYear = q->locale().toInt(yearEdit->text()); currentDate = currentDate.addYears(newYear - currentDate.year(m_model->m_calendar), m_model->m_calendar); + yearButton->setText(q->locale().toString(currentDate, u"yyyy", m_model->m_calendar)); updateCurrentPage(currentDate); } @@ -2150,7 +2116,7 @@ QCalendarWidget::QCalendarWidget(QWidget *parent) d->m_model->m_dayFormats.insert(Qt::Saturday, fmt); d->m_model->m_dayFormats.insert(Qt::Sunday, fmt); d->m_view = new QCalendarView(this); - d->m_view->setObjectName(QLatin1String("qt_calendar_calendarview")); + d->m_view->setObjectName("qt_calendar_calendarview"_L1); d->m_view->setModel(d->m_model); d->m_model->setView(d->m_view); d->m_view->setSelectionBehavior(QAbstractItemView::SelectItems); @@ -2232,7 +2198,9 @@ QSize QCalendarWidget::minimumSizeHint() const int rows = 7; int cols = 8; - const int marginH = (style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1) * 2; + QStyleOption option; + option.initFrom(this); + const int marginH = (style()->pixelMetric(QStyle::PM_FocusFrameHMargin, &option, this) + 1) * 2; if (horizontalHeaderFormat() == QCalendarWidget::NoHorizontalHeader) { rows = 6; @@ -2291,7 +2259,7 @@ QSize QCalendarWidget::minimumSizeHint() const headerW += monthW + buttonDecoMargin; fm = d->yearButton->fontMetrics(); - headerW += fm.boundingRect(QLatin1String("5555")).width() + buttonDecoMargin; + headerW += fm.boundingRect("5555"_L1).width() + buttonDecoMargin; headerSize = QSize(headerW, headerH); } @@ -2309,7 +2277,7 @@ QSize QCalendarWidget::minimumSizeHint() const Paints the cell specified by the given \a date, using the given \a painter and \a rect. */ -void QCalendarWidget::paintCell(QPainter *painter, const QRect &rect, const QDate &date) const +void QCalendarWidget::paintCell(QPainter *painter, const QRect &rect, QDate date) const { Q_D(const QCalendarWidget); d->m_delegate->paintCell(painter, rect, date); @@ -2332,7 +2300,7 @@ QDate QCalendarWidget::selectedDate() const return d->m_model->m_date; } -void QCalendarWidget::setSelectedDate(const QDate &date) +void QCalendarWidget::setSelectedDate(QDate date) { Q_D(QCalendarWidget); if (d->m_model->m_date == date && date == d->getCurrentDate()) @@ -2393,7 +2361,7 @@ void QCalendarWidget::setCurrentPage(int year, int month) QDate currentDate = d->getCurrentDate(); QCalendar cal = d->m_model->m_calendar; int day = currentDate.day(cal); - int daysInMonths = cal.daysInMonth(year, month); + int daysInMonths = cal.daysInMonth(month, year); if (day > daysInMonths) day = daysInMonths; @@ -2524,14 +2492,14 @@ void QCalendarWidget::showToday() \snippet code/src_gui_widgets_qcalendarwidget.cpp 1 \endtable - By default, the minimum date is the earliest date that the QDate - class can handle. - When setting a minimum date, the maximumDate and selectedDate properties are adjusted if the selection range becomes invalid. If the provided date is not a valid QDate object, the setMinimumDate() function does nothing. + The default minimum date is November 25, 4714 BCE. + You can restore this default by calling clearMinimumDate() (since Qt 6.6). + \sa setDateRange() */ @@ -2541,7 +2509,7 @@ QDate QCalendarWidget::minimumDate() const return d->m_model->m_minimumDate; } -void QCalendarWidget::setMinimumDate(const QDate &date) +void QCalendarWidget::setMinimumDate(QDate date) { Q_D(QCalendarWidget); if (!date.isValid() || d->m_model->m_minimumDate == date) @@ -2560,6 +2528,11 @@ void QCalendarWidget::setMinimumDate(const QDate &date) } } +void QCalendarWidget::clearMinimumDate() +{ + setMinimumDate(QDate::fromJulianDay(1)); +} + /*! \property QCalendarWidget::maximumDate \brief the maximum date of the currently specified date range. @@ -2575,14 +2548,14 @@ void QCalendarWidget::setMinimumDate(const QDate &date) \snippet code/src_gui_widgets_qcalendarwidget.cpp 2 \endtable - By default, the maximum date is the last day the QDate class can - handle. - When setting a maximum date, the minimumDate and selectedDate properties are adjusted if the selection range becomes invalid. If the provided date is not a valid QDate object, the setMaximumDate() function does nothing. + The default maximum date is December 31, 9999 CE. + You can restore this default by calling clearMaximumDate() (since Qt 6.6). + \sa setDateRange() */ @@ -2592,7 +2565,7 @@ QDate QCalendarWidget::maximumDate() const return d->m_model->m_maximumDate; } -void QCalendarWidget::setMaximumDate(const QDate &date) +void QCalendarWidget::setMaximumDate(QDate date) { Q_D(QCalendarWidget); if (!date.isValid() || d->m_model->m_maximumDate == date) @@ -2611,6 +2584,11 @@ void QCalendarWidget::setMaximumDate(const QDate &date) } } +void QCalendarWidget::clearMaximumDate() +{ + setMaximumDate(QDate(9999, 12, 31)); +} + /*! Defines a date range by setting the minimumDate and maximumDate properties. @@ -2630,7 +2608,7 @@ void QCalendarWidget::setMaximumDate(const QDate &date) \sa setMinimumDate(), setMaximumDate() */ -void QCalendarWidget::setDateRange(const QDate &min, const QDate &max) +void QCalendarWidget::setDateRange(QDate min, QDate max) { Q_D(QCalendarWidget); if (d->m_model->m_minimumDate == min && d->m_model->m_maximumDate == max) @@ -2753,12 +2731,29 @@ bool QCalendarWidget::isGridVisible() const return d->m_view->showGrid(); } +/*! + \since 5.14 + Report the calendar system in use by this widget. + + \sa setCalendar() +*/ + QCalendar QCalendarWidget::calendar() const { Q_D(const QCalendarWidget); return d->m_model->m_calendar; } +/*! + \since 5.14 + Set \a c as the calendar system to be used by this widget. + + The widget can use any supported calendar system. + By default, it uses the Gregorian calendar. + + \sa calendar() +*/ + void QCalendarWidget::setCalendar(QCalendar c) { Q_D(QCalendarWidget); @@ -2895,10 +2890,10 @@ QMap<QDate, QTextCharFormat> QCalendarWidget::dateTextFormat() const } /*! - Returns a QTextCharFormat for \a date. The char format can be be + Returns a QTextCharFormat for \a date. The char format can be empty if the date is not renderd specially. */ -QTextCharFormat QCalendarWidget::dateTextFormat(const QDate &date) const +QTextCharFormat QCalendarWidget::dateTextFormat(QDate date) const { Q_D(const QCalendarWidget); return d->m_model->m_dateFormats.value(date); @@ -2909,7 +2904,7 @@ QTextCharFormat QCalendarWidget::dateTextFormat(const QDate &date) const If \a date is null, all date formats are cleared. */ -void QCalendarWidget::setDateTextFormat(const QDate &date, const QTextCharFormat &format) +void QCalendarWidget::setDateTextFormat(QDate date, const QTextCharFormat &format) { Q_D(QCalendarWidget); if (date.isNull()) @@ -2961,7 +2956,7 @@ void QCalendarWidget::setDateEditEnabled(bool enable) \since 4.3 If the calendar widget's \l{dateEditEnabled}{date edit is enabled}, this - property specifies the amount of time (in millseconds) that the date edit + property specifies the amount of time (in milliseconds) that the date edit remains open after the most recent user input. Once this time has elapsed, the date specified in the date edit is accepted and the popup is closed. @@ -2987,7 +2982,7 @@ void QCalendarWidget::setDateEditAcceptDelay(int delay) \sa updateCells(), yearShown(), monthShown() */ -void QCalendarWidget::updateCell(const QDate &date) +void QCalendarWidget::updateCell(QDate date) { if (Q_UNLIKELY(!date.isValid())) { qWarning("QCalendarWidget::updateCell: Invalid date"); @@ -3046,7 +3041,7 @@ void QCalendarWidget::updateCells() */ /*! - \fn void QCalendarWidget::activated(const QDate &date) + \fn void QCalendarWidget::activated(QDate date) This signal is emitted whenever the user presses the Return or Enter key or double-clicks a \a date in the calendar @@ -3054,7 +3049,7 @@ void QCalendarWidget::updateCells() */ /*! - \fn void QCalendarWidget::clicked(const QDate &date) + \fn void QCalendarWidget::clicked(QDate date) This signal is emitted when a mouse button is clicked. The date the mouse was clicked on is specified by \a date. The signal is @@ -3121,6 +3116,7 @@ bool QCalendarWidget::event(QEvent *event) case QEvent::StyleChange: d->cachedSizeHint = QSize(); d->m_view->updateGeometry(); + break; default: break; } @@ -3143,7 +3139,7 @@ bool QCalendarWidget::eventFilter(QObject *watched, QEvent *event) if (!widget || widget->window() != tlw) return QWidget::eventFilter(watched, event); - QPoint mousePos = widget->mapTo(tlw, static_cast<QMouseEvent *>(event)->pos()); + QPoint mousePos = widget->mapTo(tlw, static_cast<QMouseEvent *>(event)->position().toPoint()); QRect geom = QRect(d->yearEdit->mapTo(tlw, QPoint(0, 0)), d->yearEdit->size()); if (!geom.contains(mousePos)) { event->accept(); @@ -3175,7 +3171,7 @@ void QCalendarWidget::resizeEvent(QResizeEvent * event) // XXX Should really use a QWidgetStack for yearEdit and yearButton, // XXX here we hide the year edit when the layout is likely to break // XXX the manual positioning of the yearEdit over the yearButton. - if(d->yearEdit->isVisible() && event->size().width() != event->oldSize().width()) + if (d->yearEdit->isVisible() && event->size().width() != event->oldSize().width()) d->_q_yearEditingFinished(); QWidget::resizeEvent(event); |