Changeset 561 for trunk/src/gui/widgets/qcalendarwidget.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qcalendarwidget.cpp (modified) (21 diffs)

trunk/src/gui/widgets/qcalendarwidget.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -199 +199 @@
     QString str;
     if (m_day / 10 == 0)
-        str += QLatin1String("0");
+        str += QLatin1);
     str += QString::number(m_day);
     return highlightString(str, m_pos);
@@ -211 +211 @@
         QString str;
         if (date.day() / 10 == 0)
-            str += QLatin1String("0");
+            str += QLatin1);
         return str + QString::number(date.day());
     } else if (repeat == 3) {
@@ -317 +317 @@
     QString str;
     if (m_month / 10 == 0)
-        str += QLatin1String("0");
+        str += QLatin1);
     str += QString::number(m_month);
     return highlightString(str, m_pos);
@@ -329 +329 @@
         QString str;
         if (date.month() / 10 == 0)
-            str += QLatin1String("0");
+            str += QLatin1);
         return str + QString::number(date.month());
     } else if (repeat == 3) {
         return m_locale.standaloneMonthName(date.month(), QLocale::ShortFormat);
-    } else if (repeat >= 4) {
+    } else  {
         return m_locale.standaloneMonthName(date.month(), QLocale::LongFormat);
     }
-    return QString();
 }
 
@@ -433 +432 @@
     for (int i = 0; i < 3; i++) {
         if (m_year / pow == 0)
-            str += QLatin1String("0");
+            str += QLatin1);
         pow *= 10;
     }
@@ -446 +445 @@
         int year = date.year() % 100;
         if (year / 10 == 0)
-            str = QLatin1String("0");
+            str = QLatin1);
         return str + QString::number(year);
     }
@@ -578 +577 @@
 
     int pos = 0;
-    const QLatin1String quote("'");
+    const QLatin1);
     bool quoting = false;
     QString separator;
@@ -1962 +1961 @@
     calendar widget allowing the user to select a date.
     \since 4.2
-    \mainclass
+
     \ingroup advanced
 
@@ -1969 +1968 @@
     The widget is initialized with the current month and year, but
     QCalendarWidget provides several public slots to change the year
-    and month that is shown.  The currently displayed month and year
-    can be retrieved using the currentPageMonth() and currentPageYear()
-    functions, respectively.
+    and month that is shown.
 
     By default, today's date is selected, and the user can select a
@@ -1983 +1980 @@
     all. Note that a date also can be selected programmatically using
     the setSelectedDate() slot.
+
+
+
 
     A newly created calendar widget uses abbreviated day names, and
@@ -2143 +2143 @@
     int rows = 7;
     int cols = 8;
-    int startRow = 0;
-    int startCol = 0;
 
     const int marginH = (style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1) * 2;
@@ -2150 +2148 @@
     if (horizontalHeaderFormat() == QCalendarWidget::NoHorizontalHeader) {
         rows = 6;
-        startRow = 1;
     } else {
         for (int i = 1; i <= 7; i++) {
@@ -2161 +2158 @@
     if (verticalHeaderFormat() == QCalendarWidget::NoVerticalHeader) {
         cols = 7;
-        startCol = 1;
     } else {
         for (int i = 1; i <= 6; i++) {
@@ -2293 +2289 @@
 
     The currently displayed month and year can be retrieved using the
-    currentPageMonth() and currentPageYear() functions respectively.
+    () functions respectively.
 
     \sa yearShown(), monthShown(), showPreviousMonth(), showNextMonth(),
@@ -2302 +2298 @@
 {
     Q_D(QCalendarWidget);
+
+
+
+
+
+
     d->showMonth(year, month);
+
+
+
+
+
+
+
+
 }
 
@@ -2527 +2537 @@
     if (!min.isValid() || !max.isValid())
         return;
-
-    QDate minimum = min;
-    QDate maximum = max;
-    if (min > max) {
-        minimum = max;
-        maximum = min;
-    }
 
     QDate oldDate = d->m_model->m_date;
@@ -2792 +2795 @@
 {
     Q_D(QCalendarWidget);
-    if ( date.isNull() && !format.isValid() )
+    if ()
         d->m_model->m_dateFormats.clear();
     else
@@ -3034 +3037 @@
 {
     Q_D(QCalendarWidget);
-    if (event->type() == QEvent::MouseButtonPress && d->yearEdit->hasFocus() && !QRect(d->yearEdit->mapToGlobal(QPoint(0, 0)), d->yearEdit->size()).contains(static_cast<QMouseEvent *>(event)->globalPos())) {
-        event->accept();
-        d->_q_yearEditingFinished();
-        setFocus();
-        return true;
+    if (event->type() == QEvent::MouseButtonPress && d->yearEdit->hasFocus()) {
+        QWidget *tlw = window();
+        QWidget *widget = static_cast<QWidget*>(watched);
+        //as we have a event filter on the whole application we first make sure that the top level widget
+        //of both this and the watched widget are the same to decide if we should finish the year edition.
+        if (widget->window() == tlw) {
+            QPoint mousePos = widget->mapTo(tlw, static_cast<QMouseEvent *>(event)->pos());
+            QRect geom = QRect(d->yearEdit->mapTo(tlw, QPoint(0, 0)), d->yearEdit->size());
+            if (!geom.contains(mousePos)) {
+                event->accept();
+                d->_q_yearEditingFinished();
+                setFocus();
+                return true;
+            }
+        }
     }
     return QWidget::eventFilter(watched, event);