Changeset 6448 for trunk/qt4-gui/src/widgets

Timestamp:

07/13/08 03:39:22 (4 months ago)

Author:

flynd

Message:

Searching in history dialog will now mark all dates with matching entries in green.

Location:

trunk/qt4-gui/src/widgets

Files:

• calendar.cpp (modified) (3 diffs)
• calendar.h (modified) (3 diffs)

trunk/qt4-gui/src/widgets/calendar.cpp

@@ -54 +54 @@
 }
 
-void Calendar::markDate(QDate date)
+void Calendar::markDate(const QDate& date)
 {
   QTextCharFormat textFormat = dateTextFormat(date);
@@ -62 +62 @@
   textFormat.setBackground(Qt::transparent);
   setDateTextFormat(date, textFormat);
+}
+
+void Calendar::addMatch(const QDate& date)
+{
+  if (myMatches.contains(date))
+    return;
+
+  myMatches.append(date);
+  updateCell(date);
+}
+
+void Calendar::clearMatches()
+{
+  myMatches.clear();
+  updateCells();
 }
 
@@ -74 +89 @@
     painter->setPen(Qt::NoPen);
     painter->setRenderHints(painter->renderHints() | QPainter::Antialiasing);
-    painter->setBrush(Qt::yellow);
+    painter->setBrush(myMatches.contains(date) ? Qt::green : Qt::yellow);
     painter->drawEllipse(center);
     painter->restore();

trunk/qt4-gui/src/widgets/calendar.h

@@ -25 +25 @@
 
 #include <QCalendarWidget>
+#include <QDate>
+#include <QList>
 
 namespace LicqQtGui
@@ -54 +56 @@
    * @param date Date to mark
    */
-  void markDate(QDate date);
+  void markDate(const QDate& date);
+
+  /**
+   * Mark a search match in the calendar
+   * Note: Date must already be marked with markDate()
+   *
+   * @param date Date of the match
+   */
+  void addMatch(const QDate& date);
+
+  /**
+   * Clear all search matches
+   */
+  void clearMatches();
 
 protected:
@@ -65 +80 @@
    */
   virtual void paintCell(QPainter* painter, const QRect& rect, const QDate& date) const;
+
+private:
+  QList<QDate> myMatches;
 };