Changeset 6448

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

Files:

• dialogs/historydlg.cpp (modified) (3 diffs)
• dialogs/historydlg.h (modified) (1 diff)
• widgets/calendar.cpp (modified) (3 diffs)
• widgets/calendar.h (modified) (3 diffs)

trunk/qt4-gui/src/dialogs/historydlg.cpp

@@ -133 +133 @@
   searchLayout->addLayout(findLayout);
   connect(myPatternEdit, SIGNAL(textChanged(const QString&)), SLOT(searchTextChanged(const QString&)));
+  myPatternChanged = true;
 
   // Shortcuts for searching
@@ -392 +393 @@
   QRegExp regExp(getRegExp());
 
+  // If search pattern has changed, find all matching dates and mark them in the calendar
+  if (myPatternChanged)
+  {
+    myCalendar->clearMatches();
+
+    for (HistoryListIter i = myHistoryList.begin(); i != myHistoryList.end(); ++i)
+    {
+      QString messageText;
+      if ((*i)->SubCommand() == ICQ_CMDxSUB_SMS) // SMSs are always in UTF-8
+        messageText = QString::fromUtf8((*i)->Text());
+      else
+        messageText = myContactCodec->toUnicode((*i)->Text());
+
+      if (messageText.contains(regExp))
+      {
+        QDate date = QDateTime::fromTime_t((*i)->Time()).date();
+        myCalendar->addMatch(date);
+      }
+    }
+
+    // No need to do this again next time
+    myPatternChanged = false;
+  }
+
   myStatusLabel->setText(QString());
 
@@ -469 +494 @@
   // Clear failed status from previous search
   myPatternEdit->setStyleSheet("");
+
+  // Mark that pattern has changed since previous search
+  myPatternChanged = true;
+
+  // Search field is cleared so clear status message and matching dates
+  if (text.isEmpty())
+  {
+    myStatusLabel->setText(QString());
+    myCalendar->clearMatches();
+  }
 }
 

trunk/qt4-gui/src/dialogs/historydlg.h

@@ -153 +153 @@
   QTextCodec* myContactCodec;
   bool myUseHtml;
+  bool myPatternChanged;
 
   HistoryList myHistoryList;

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;
 };