/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2019 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 "icon.h"
#include "qtui.h"
-ChatViewSearchBar::ChatViewSearchBar(QWidget *parent)
+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"));
+ ui.hideButton->setIcon(icon::get("dialog-close"));
+ ui.searchUpButton->setIcon(icon::get("go-up"));
+ ui.searchDownButton->setIcon(icon::get("go-down"));
_searchDelayTimer.setSingleShot(true);
layout()->setContentsMargins(0, 0, 0, 0);
hide();
- ActionCollection *coll = QtUi::actionCollection("General");
+ ActionCollection* coll = QtUi::actionCollection("General");
- QAction *toggleSearchBar = coll->action("ToggleSearchBar");
- connect(toggleSearchBar, SIGNAL(toggled(bool)), SLOT(setVisible(bool)));
+ QAction* toggleSearchBar = coll->action("ToggleSearchBar");
+ connect(toggleSearchBar, &QAction::toggled, this, &QWidget::setVisible);
- Action *hideSearchBar = coll->add<Action>("HideSearchBar", toggleSearchBar, SLOT(setChecked(bool)));
- hideSearchBar->setShortcutConfigurable(false);
+ auto* hideSearchBar = new Action{{}, this, toggleSearchBar, &QAction::setChecked};
hideSearchBar->setShortcut(Qt::Key_Escape);
+ hideSearchBar->setShortcutConfigurable(false);
+ coll->addAction("HideSearchBar", hideSearchBar);
- 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()));
+ connect(ui.hideButton, &QAbstractButton::clicked, toggleSearchBar, &QAction::toggle);
+ connect(ui.searchEditLine, &QLineEdit::textChanged, this, &ChatViewSearchBar::delaySearch);
+ connect(&_searchDelayTimer, &QTimer::timeout, this, &ChatViewSearchBar::search);
}
-
void ChatViewSearchBar::setVisible(bool visible)
{
// clearing the search field also removes the highlight items from the scene
emit hidden();
}
-
void ChatViewSearchBar::delaySearch()
{
_searchDelayTimer.start(300);
}
-
void ChatViewSearchBar::search()
{
emit searchChanged(ui.searchEditLine->text());