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

diff --git a/src/qtui/chatviewsearchbar.cpp b/src/qtui/chatviewsearchbar.cpp
index 121070d3..55246919 100644
--- a/src/qtui/chatviewsearchbar.cpp
+++ b/src/qtui/chatviewsearchbar.cpp
@@ -20,7 +20,9 @@
 
 #include "chatviewsearchbar.h"
 
-#include <QAction>
+#include "action.h"
+#include "actioncollection.h"
+#include "qtui.h"
 
 ChatViewSearchBar::ChatViewSearchBar(QWidget *parent)
   : QWidget(parent)
@@ -28,21 +30,25 @@ ChatViewSearchBar::ChatViewSearchBar(QWidget *parent)
   ui.setupUi(this);
   layout()->setContentsMargins(0, 0, 0, 0);
 
-  ui.searchUpButton->setEnabled(false);
-  ui.searchDownButton->setEnabled(false);
+  hide();
 
-  _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);
+  ActionCollection *coll = QtUi::actionCollection();
 
-  connect(ui.hideButton, SIGNAL(clicked()),
-	  _toggleViewAction, SLOT(toggle()));
+  Action *toggleSearchBar = coll->add<Action>("toggleSearchBar");
+  connect(toggleSearchBar, SIGNAL(toggled(bool)), SLOT(setVisible(bool)));
+  toggleSearchBar->setText(tr("Show Search Bar"));
+  toggleSearchBar->setShortcut(Qt::CTRL + Qt::Key_F);
+  toggleSearchBar->setCheckable(true);
+
+  Action *hideSearchBar = coll->add<Action>("hideSearchBar", toggleSearchBar, SLOT(setChecked(bool))); // always false
+  hideSearchBar->setShortcut(Qt::Key_Escape);
+
+  connect(ui.hideButton, SIGNAL(clicked()), toggleSearchBar, SLOT(toggle()));
 }
 
 void ChatViewSearchBar::setVisible(bool visible) {
   QWidget::setVisible(visible);
   ui.searchEditLine->clear();
+  if(visible) ui.searchEditLine->setFocus();
 }
+