projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't draw a sunken frame around SettingsPageDlg's contents
[quassel.git]
/
src
/
qtui
/
chatviewsearchbar.cpp
diff --git
a/src/qtui/chatviewsearchbar.cpp
b/src/qtui/chatviewsearchbar.cpp
index
c4c6f09
..
19fce8a
100644
(file)
--- a/
src/qtui/chatviewsearchbar.cpp
+++ b/
src/qtui/chatviewsearchbar.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-22,36
+22,49
@@
#include "action.h"
#include "actioncollection.h"
#include "action.h"
#include "actioncollection.h"
+#include "iconloader.h"
#include "qtui.h"
ChatViewSearchBar::ChatViewSearchBar(QWidget *parent)
: QWidget(parent)
{
ui.setupUi(this);
#include "qtui.h"
ChatViewSearchBar::ChatViewSearchBar(QWidget *parent)
: QWidget(parent)
{
ui.setupUi(this);
- layout()->setContentsMargins(0, 0, 0, 0);
+ ui.hideButton->setIcon(BarIcon("dialog-close"));
+ ui.searchUpButton->setIcon(SmallIcon("go-up"));
+ ui.searchDownButton->setIcon(SmallIcon("go-down"));
+ _searchDelayTimer.setSingleShot(true);
- ui.searchUpButton->setEnabled(false);
- ui.searchDownButton->setEnabled(false);
+ layout()->setContentsMargins(0, 0, 0, 0);
hide();
hide();
- ActionCollection *coll = QtUi::actionCollection();
+ ActionCollection *coll = QtUi::actionCollection(
"General"
);
-
Action *toggleSearchBar = coll->add<Action>("t
oggleSearchBar");
+
QAction *toggleSearchBar = coll->action("T
oggleSearchBar");
connect(toggleSearchBar, SIGNAL(toggled(bool)), SLOT(setVisible(bool)));
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
+ Action *hideSearchBar = coll->add<Action>("HideSearchBar", toggleSearchBar, SLOT(setChecked(bool)));
+ hideSearchBar->setShortcutConfigurable(false);
hideSearchBar->setShortcut(Qt::Key_Escape);
connect(ui.hideButton, SIGNAL(clicked()), toggleSearchBar, SLOT(toggle()));
hideSearchBar->setShortcut(Qt::Key_Escape);
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) {
}
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();
ui.searchEditLine->clear();
+ QWidget::setVisible(visible);
if(visible) ui.searchEditLine->setFocus();
}
if(visible) ui.searchEditLine->setFocus();
}
+void ChatViewSearchBar::delaySearch() {
+ _searchDelayTimer.start(300);
+}
+
+void ChatViewSearchBar::search() {
+ emit searchChanged(ui.searchEditLine->text());
+}