Changeset 561 for trunk/examples/widgets/calendarwidget/window.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)
• examples/widgets/calendarwidget/window.cpp (modified) (7 diffs)

trunk/examples/widgets/calendarwidget/window.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 examples 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$
 **
@@ -168 +168 @@
 void Window::reformatCalendarPage()
 {
-    QTextCharFormat mayFirstFormat;
-    if (mayFirstCheckBox->isChecked())
+    if (firstFridayCheckBox->isChecked()) {
+        QDate firstFriday(calendar->yearShown(), calendar->monthShown(), 1);
+        while (firstFriday.dayOfWeek() != Qt::Friday)
+            firstFriday = firstFriday.addDays(1);
+        QTextCharFormat firstFridayFormat;
+        firstFridayFormat.setForeground(Qt::blue);
+        calendar->setDateTextFormat(firstFriday, firstFridayFormat);
+    }
+
+    //May First in Red takes precedence
+    if (mayFirstCheckBox->isChecked()) {
+        const QDate mayFirst(calendar->yearShown(), 5, 1);
+        QTextCharFormat mayFirstFormat;
         mayFirstFormat.setForeground(Qt::red);
-
-    QTextCharFormat firstFridayFormat;
-    if (firstFridayCheckBox->isChecked())
-        firstFridayFormat.setForeground(Qt::blue);
-
-    QDate date(calendar->yearShown(), calendar->monthShown(), 1); 
-
-    calendar->setDateTextFormat(QDate(date.year(), 5, 1), mayFirstFormat);
-
-    date.setDate(date.year(), date.month(), 1);
-    while (date.dayOfWeek() != Qt::Friday)
-        date = date.addDays(1);
-    calendar->setDateTextFormat(date, firstFridayFormat);
+        calendar->setDateTextFormat(mayFirst, mayFirstFormat);
+    }
 }
 //! [8]
@@ -197 +197 @@
     calendar->setGridVisible(true);
 
-    connect(calendar, SIGNAL(currentPageChanged(int, int)),
+    connect(calendar, SIGNAL(currentPageChanged(int,int)),
             this, SLOT(reformatCalendarPage()));
 
@@ -358 +358 @@
 
 //! [13] //! [14]
-    connect(currentDateEdit, SIGNAL(dateChanged(const QDate &)),
-            calendar, SLOT(setSelectedDate(const QDate &)));
+    connect(currentDateEdit, SIGNAL(dateChanged()),
+            calendar, SLOT(setSelectedDate()));
     connect(calendar, SIGNAL(selectionChanged()),
             this, SLOT(selectedDateChanged()));
-    connect(minimumDateEdit, SIGNAL(dateChanged(const QDate &)),
-            this, SLOT(minimumDateChanged(const QDate &)));
-    connect(maximumDateEdit, SIGNAL(dateChanged(const QDate &)),
-            this, SLOT(maximumDateChanged(const QDate &)));
+    connect(minimumDateEdit, SIGNAL(dateChanged()),
+            this, SLOT(minimumDateChanged()));
+    connect(maximumDateEdit, SIGNAL(dateChanged()),
+            this, SLOT(maximumDateChanged()));
 
 //! [14]
@@ -419 +419 @@
     connect(weekendColorCombo, SIGNAL(currentIndexChanged(int)),
             this, SLOT(weekendFormatChanged()));
-    connect(headerTextFormatCombo, SIGNAL(currentIndexChanged(const QString &)),
+    connect(headerTextFormatCombo, SIGNAL(currentIndexChanged()),
             this, SLOT(reformatHeaders()));
     connect(firstFridayCheckBox, SIGNAL(toggled(bool)),