X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchbar.cpp;h=5dcc11243c16a0209039b0c567732515ed07666c;hp=121070d3d2f501bbd5e8028de6edaa86fc091986;hb=1b8b7589f2fb30e1b3583a8914dabced8a190655;hpb=a117d3bd1592bae3b14630c953790a005b3c3a3d

diff --git a/src/qtui/chatviewsearchbar.cpp b/src/qtui/chatviewsearchbar.cpp
index 121070d3..5dcc1124 100644
--- a/src/qtui/chatviewsearchbar.cpp
+++ b/src/qtui/chatviewsearchbar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,29 +20,54 @@
 
 #include "chatviewsearchbar.h"
 
-#include <QAction>
+#include "action.h"
+#include "actioncollection.h"
+#include "iconloader.h"
+#include "qtui.h"
 
 ChatViewSearchBar::ChatViewSearchBar(QWidget *parent)
   : QWidget(parent)
 {
   ui.setupUi(this);
+  ui.hideButton->setIcon(BarIcon("dialog-close"));
+  ui.searchUpButton->setIcon(SmallIcon("go-up"));
+  ui.searchDownButton->setIcon(SmallIcon("go-down"));
+  _searchDelayTimer.setSingleShot(true);
+
   layout()->setContentsMargins(0, 0, 0, 0);
 
-  ui.searchUpButton->setEnabled(false);
-  ui.searchDownButton->setEnabled(false);
+  hide();
+
+  ActionCollection *coll = QtUi::actionCollection("General");
+
+  QAction *toggleSearchBar = coll->action("ToggleSearchBar");
+  connect(toggleSearchBar, SIGNAL(toggled(bool)), SLOT(setVisible(bool)));
 
-  _toggleViewAction = new QAction(tr("Show search bar"), this);
-  _toggleViewAction->setCheckable(true);
-  _toggleViewAction->setChecked(false);
-  connect(_toggleViewAction, SIGNAL(toggled(bool)),
-	  this, SLOT(setVisible(bool)));
-  setVisible(false);
+  Action *hideSearchBar = coll->add<Action>("HideSearchBar", toggleSearchBar, SLOT(setChecked(bool)));
+  hideSearchBar->setShortcutConfigurable(false);
+  hideSearchBar->setShortcut(Qt::Key_Escape);
 
-  connect(ui.hideButton, SIGNAL(clicked()),
-	  _toggleViewAction, SLOT(toggle()));
+  connect(ui.hideButton, SIGNAL(clicked()), toggleSearchBar, SLOT(toggle()));
+  connect(ui.searchEditLine, SIGNAL(textChanged(const QString &)), this, SLOT(delaySearch()));
+  connect(&_searchDelayTimer, SIGNAL(timeout()), this, SLOT(search()));
 }
 
 void ChatViewSearchBar::setVisible(bool visible) {
-  QWidget::setVisible(visible);
+  // clearing the search field also removes the highlight items from the scene
+  // this should be done before the SearchBar is hidden, as the hiding triggers
+  // a resize event which can lead to strange side effects.
   ui.searchEditLine->clear();
+  QWidget::setVisible(visible);
+  if(visible)
+    ui.searchEditLine->setFocus();
+  else
+    emit hidden();
+}
+
+void ChatViewSearchBar::delaySearch() {
+  _searchDelayTimer.start(300);
+}
+
+void ChatViewSearchBar::search() {
+  emit searchChanged(ui.searchEditLine->text());
 }