Changeset 224

Timestamp:

02/02/06 18:55:23 (3 years ago)

Author:

edmanm

Message:

Add basic search functionality to the message log.

Location:

trunk/src/gui/messagelog

Files:

• messagelog.cpp (modified) (4 diffs)
• messagelog.h (modified) (2 diffs)
• messagelog.ui (modified) (10 diffs)

trunk/src/gui/messagelog/messagelog.cpp

@@ -22 +22 @@
  ****************************************************************/
 
+#include <QMessageBox>
+#include <QInputDialog>
+
 #include "../mainwindow.h"
 #include "messagelog.h"
@@ -104 +107 @@
       this, SLOT(clear()));
   
+  connect(ui.actionFind, SIGNAL(triggered()),
+      this, SLOT(find()));
+
   connect(ui.btnSaveSettings, SIGNAL(clicked()),
       this, SLOT(saveChanges()));
@@ -387 +393 @@
 }
 
+/** Prompts the user for a search string. If the search string is not found in
+ * any of the currently displayed log entires, then a message will be
+ * displayed for the user informing them that no matches were found. 
+ * \sa search()
+ */
+void
+MessageLog::find()
+{
+  QString empty;
+  bool ok;
+  QString text = QInputDialog::getText(this, tr("Find in Message Log"),
+                  tr("Find:"), QLineEdit::Normal, QString(), &ok);
+  
+  if (ok && !text.isEmpty()) {
+    QTreeWidget *tree = ui.lstMessages;
+    QList<QTreeWidgetItem *> results = search(text);
+    if (!results.size()) {
+      QMessageBox::information(this, tr("Not Found"), 
+                               tr("Search found 0 matches."), 
+                               QMessageBox::Ok, QMessageBox::NoButton);
+    } else {
+      /* Deselect all currently selected items */
+      deselectAllItems();
+      /* Select the new matching items */
+      foreach(QTreeWidgetItem *item, results) {
+        if (!tree->isItemHidden(item)) {
+           tree->setItemSelected(item, true);
+         }
+      }
+      /* Set the focus to the first match */
+      tree->scrollToItem(results.at(0));
+    }
+  }
+}
+
 /**
  Clears the message list and resets the message counter
@@ -396 +437 @@
   ui.lstMessages->setStatusTip(QString("Messages Shown: %1")
                                   .arg(_messagesShown));
+}
+
+/** Searches the currently displayed log entries for the given search text.
+ *
+ * \param text The text to search for.
+ * \returns A list of all log items containing the search text. 
+ */
+QList<QTreeWidgetItem *>
+MessageLog::search(QString text)
+{
+  QTreeWidget *tree = ui.lstMessages;
+  QList<QTreeWidgetItem *> results;
+
+  /* Search through the messages in the tree, case-insensitively */
+  return tree->findItems(text, Qt::MatchContains|Qt::MatchWrap, COL_MSG);
+}
+
+/** Deselects all currently selected items. */
+void
+MessageLog::deselectAllItems()
+{
+  QTreeWidget *tree = ui.lstMessages;
+  foreach(QTreeWidgetItem *item, tree->selectedItems()) {
+    tree->setItemSelected(item, false);
+  }
 }
 

trunk/src/gui/messagelog/messagelog.h

@@ -74 +74 @@
   /** Called when the user selects View->Clear all or Ctrl-E **/
   void clear();
+  /** Called when the user selects Edit->Find or Ctrl-F. This will search
+   * through all currently displayed log entries for text specified by the
+   * user, highlighting the entires that contain a match. */
+  void find();
   /** Called when the opactity slider changes value **/
   void setOpacity(int value);
@@ -96 +100 @@
   /** Saves the given list of items to a file */
   void save(QList<QTreeWidgetItem *> items);
-  
+  /** Searches the message log for entries that contain the given text. */
+  QList<QTreeWidgetItem *> search(QString text);
+  /** Deselects all currently selected items. */
+  void deselectAllItems();
+
   /** A pointer to a TorControl object, used to register for log events */
   TorControl* _torControl;

trunk/src/gui/messagelog/messagelog.ui

@@ -293 +293 @@
   </property>
   <property name="windowIcon" >
-   <iconset resource="..\res\vidalia.qrc" >:/images/tor_logo16.png</iconset>
+   <iconset resource="../res/vidalia.qrc" >:/images/tor_logo16.png</iconset>
   </property>
   <property name="statusTip" >
@@ -467 +467 @@
               </property>
               <property name="icon" >
-               <iconset resource="..\res\vidalia.qrc" >:/images/msg_error.png</iconset>
+               <iconset resource="../res/vidalia.qrc" >:/images/msg_error.png</iconset>
               </property>
              </widget>
@@ -483 +483 @@
               </property>
               <property name="icon" >
-               <iconset resource="..\res\vidalia.qrc" >:/images/msg_warn.png</iconset>
+               <iconset resource="../res/vidalia.qrc" >:/images/msg_warn.png</iconset>
               </property>
              </widget>
@@ -499 +499 @@
               </property>
               <property name="icon" >
-               <iconset resource="..\res\vidalia.qrc" >:/images/msg_notice.png</iconset>
+               <iconset resource="../res/vidalia.qrc" >:/images/msg_notice.png</iconset>
               </property>
              </widget>
@@ -515 +515 @@
               </property>
               <property name="icon" >
-               <iconset resource="..\res\vidalia.qrc" >:/images/msg_info.png</iconset>
+               <iconset resource="../res/vidalia.qrc" >:/images/msg_info.png</iconset>
               </property>
              </widget>
@@ -531 +531 @@
               </property>
               <property name="icon" >
-               <iconset resource="..\res\vidalia.qrc" >:/images/msg_debug.png</iconset>
+               <iconset resource="../res/vidalia.qrc" >:/images/msg_debug.png</iconset>
               </property>
              </widget>
@@ -900 +900 @@
      <y>0</y>
      <width>701</width>
-     <height>19</height>
+     <height>22</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menu_Edit" >
-    <property name="title" >
-     <string>&amp;Edit</string>
-    </property>
-    <addaction name="actionCopy" />
-    <addaction name="actionSelect_All" />
-   </widget>
    <widget class="QMenu" name="menu_File" >
     <property name="title" >
@@ -932 +925 @@
     <addaction name="actionClear" />
    </widget>
+   <widget class="QMenu" name="menu_Edit" >
+    <property name="title" >
+     <string>&amp;Edit</string>
+    </property>
+    <addaction name="actionCopy" />
+    <addaction name="actionSelect_All" />
+    <addaction name="separator" />
+    <addaction name="actionFind" />
+   </widget>
    <addaction name="menu_File" />
    <addaction name="menu_Edit" />
@@ -940 +942 @@
     <rect>
      <x>0</x>
-     <y>536</y>
+     <y>538</y>
      <width>701</width>
-     <height>22</height>
+     <height>20</height>
     </rect>
    </property>
@@ -1113 +1115 @@
    </property>
   </action>
+  <action name="actionFind" >
+   <property name="text" >
+    <string>Find</string>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Arial</family>
+     <pointsize>10</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="shortcut" >
+    <string>⌘F</string>
+   </property>
+  </action>
  </widget>
  <pixmapfunction></pixmapfunction>
  <resources>
   <include location="res/vidalia.qrc" />
+  <include location="../res/vidalia.qrc" />
   <include location="../res/vidalia.qrc" />
  </resources>