/***************************************************************************
- * 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 *
#include "action.h"
#include "actioncollection.h"
+#include "iconloader.h"
#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"));
- ui.searchUpButton->setEnabled(false);
- ui.searchDownButton->setEnabled(false);
+ layout()->setContentsMargins(0, 0, 0, 0);
hide();
- ActionCollection *coll = QtUi::actionCollection();
+ ActionCollection *coll = QtUi::actionCollection("General");
- Action *toggleSearchBar = coll->add<Action>("toggleSearchBar");
+ QAction *toggleSearchBar = coll->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
+ 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()));
}
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();
}