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

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/dialogs

Files:

• historydlg.cpp (modified) (3 diffs)
• historydlg.h (modified) (1 diff)

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;