/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2022 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "channellistdlg.h"
-#include <QHeaderView>
#include <QHBoxLayout>
+#include <QHeaderView>
#include <QSpacerItem>
#include "client.h"
#include "clientirclisthelper.h"
#include "icon.h"
-#include "iconloader.h"
-
-ChannelListDlg::ChannelListDlg(QWidget *parent)
- : QDialog(parent),
- _listFinished(true),
- _ircListModel(this),
- _sortFilter(this),
- _simpleModeSpacer(0),
- _advancedMode(false)
+
+ChannelListDlg::ChannelListDlg(QWidget* parent)
+ : QDialog(parent)
+ , _ircListModel(this)
+ , _sortFilter(this)
{
_sortFilter.setSourceModel(&_ircListModel);
_sortFilter.setFilterCaseSensitivity(Qt::CaseInsensitive);
_sortFilter.setFilterKeyColumn(-1);
ui.setupUi(this);
- ui.advancedModeLabel->setPixmap(BarIcon("edit-rename"));
+ ui.advancedModeLabel->setPixmap(icon::get("edit-rename").pixmap(22));
ui.channelListView->setSelectionBehavior(QAbstractItemView::SelectRows);
ui.channelListView->setSelectionMode(QAbstractItemView::SingleSelection);
ui.channelListView->setTabKeyNavigation(false);
ui.channelListView->setModel(&_sortFilter);
ui.channelListView->setSortingEnabled(true);
+ // Sort A-Z by default
+ ui.channelListView->sortByColumn(0, Qt::AscendingOrder);
ui.channelListView->verticalHeader()->hide();
ui.channelListView->horizontalHeader()->setStretchLastSection(true);
ui.searchChannelsButton->setAutoDefault(false);
- setWindowIcon(Icon("format-list-unordered"));
+ setWindowIcon(icon::get("format-list-unordered"));
- connect(ui.advancedModeLabel, SIGNAL(clicked()), this, SLOT(toggleMode()));
- connect(ui.searchChannelsButton, SIGNAL(clicked()), this, SLOT(requestSearch()));
- connect(ui.channelNameLineEdit, SIGNAL(returnPressed()), this, SLOT(requestSearch()));
- connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), &_sortFilter, SLOT(setFilterFixedString(QString)));
- connect(Client::ircListHelper(), SIGNAL(channelListReceived(const NetworkId &, const QStringList &, QList<IrcListHelper::ChannelDescription> )),
- this, SLOT(receiveChannelList(NetworkId, QStringList, QList<IrcListHelper::ChannelDescription> )));
- connect(Client::ircListHelper(), SIGNAL(finishedListReported(const NetworkId &)), this, SLOT(reportFinishedList()));
- connect(Client::ircListHelper(), SIGNAL(errorReported(const QString &)), this, SLOT(showError(const QString &)));
- connect(ui.channelListView, SIGNAL(activated(QModelIndex)), this, SLOT(joinChannel(QModelIndex)));
+ connect(ui.advancedModeLabel, &ClickableLabel::clicked, this, &ChannelListDlg::toggleMode);
+ connect(ui.searchChannelsButton, &QAbstractButton::clicked, this, &ChannelListDlg::requestSearch);
+ connect(ui.channelNameLineEdit, &QLineEdit::returnPressed, this, &ChannelListDlg::requestSearch);
+ connect(ui.filterLineEdit, &QLineEdit::textChanged, &_sortFilter, &QSortFilterProxyModel::setFilterFixedString);
+ connect(Client::ircListHelper(), &ClientIrcListHelper::channelListReceived, this, &ChannelListDlg::receiveChannelList);
+ connect(Client::ircListHelper(), &ClientIrcListHelper::finishedListReported, this, &ChannelListDlg::reportFinishedList);
+ connect(Client::ircListHelper(), &ClientIrcListHelper::errorReported, this, &ChannelListDlg::showError);
+ connect(ui.channelListView, &QAbstractItemView::activated, this, &ChannelListDlg::joinChannel);
setAdvancedMode(false);
enableQuery(true);
showFilterLine(false);
showErrors(false);
-}
+ // Set initial input focus
+ updateInputFocus();
+}
void ChannelListDlg::setNetwork(NetworkId netId)
{
showFilterLine(false);
}
+void ChannelListDlg::setChannelFilters(const QString& channelFilters)
+{
+ // Enable advanced mode if searching
+ setAdvancedMode(!channelFilters.isEmpty());
+ // Set channel search text after setting advanced mode so it's not cleared
+ ui.channelNameLineEdit->setText(channelFilters.trimmed());
+}
void ChannelListDlg::requestSearch()
{
+ if (!_netId.isValid()) {
+ // No valid network set yet
+ return;
+ }
+
_listFinished = false;
enableQuery(false);
showErrors(false);
Client::ircListHelper()->requestChannelList(_netId, channelFilters);
}
-
-void ChannelListDlg::receiveChannelList(const NetworkId &netId, const QStringList &channelFilters, const QList<IrcListHelper::ChannelDescription> &channelList)
+void ChannelListDlg::receiveChannelList(const NetworkId& netId,
+ const QStringList& channelFilters,
+ const QList<IrcListHelper::ChannelDescription>& channelList)
{
Q_UNUSED(channelFilters)
if (netId != _netId)
showFilterLine(!channelList.isEmpty());
_ircListModel.setChannelList(channelList);
enableQuery(_listFinished);
+ // Reset input focus since UI changed
+ updateInputFocus();
}
-
void ChannelListDlg::showFilterLine(bool show)
{
ui.line->setVisible(show);
ui.filterLineEdit->setVisible(show);
}
-
void ChannelListDlg::enableQuery(bool enable)
{
ui.channelNameLineEdit->setEnabled(enable);
ui.searchChannelsButton->setEnabled(enable);
}
-
void ChannelListDlg::setAdvancedMode(bool advanced)
{
_advancedMode = advanced;
if (_simpleModeSpacer) {
ui.searchLayout->removeItem(_simpleModeSpacer);
delete _simpleModeSpacer;
- _simpleModeSpacer = 0;
+ _simpleModeSpacer = nullptr;
}
- ui.advancedModeLabel->setPixmap(BarIcon("edit-clear-locationbar-rtl"));
+ ui.advancedModeLabel->setPixmap(icon::get("edit-clear-locationbar-rtl").pixmap(16));
}
else {
if (!_simpleModeSpacer) {
_simpleModeSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
ui.searchLayout->insertSpacerItem(0, _simpleModeSpacer);
}
- ui.advancedModeLabel->setPixmap(BarIcon("edit-rename"));
+ ui.advancedModeLabel->setPixmap(icon::get("edit-rename").pixmap(16));
}
ui.channelNameLineEdit->clear();
ui.searchPatternLabel->setVisible(advanced);
}
+void ChannelListDlg::updateInputFocus()
+{
+ // Update keyboard focus to match what options are available. Prioritize the channel name
+ // editor as one likely won't need to filter when already limiting the list.
+ if (ui.channelNameLineEdit->isVisible()) {
+ ui.channelNameLineEdit->setFocus();
+ }
+ else if (ui.filterLineEdit->isVisible()) {
+ ui.filterLineEdit->setFocus();
+ }
+}
void ChannelListDlg::showErrors(bool show)
{
ui.errorTextEdit->setVisible(show);
}
-
void ChannelListDlg::reportFinishedList()
{
_listFinished = true;
}
-
-void ChannelListDlg::showError(const QString &error)
+void ChannelListDlg::showError(const QString& error)
{
showErrors(true);
ui.errorTextEdit->moveCursor(QTextCursor::End);
ui.errorTextEdit->insertPlainText(error + "\n");
}
-
-void ChannelListDlg::joinChannel(const QModelIndex &index)
+void ChannelListDlg::joinChannel(const QModelIndex& index)
{
- Client::instance()->userInput(BufferInfo::fakeStatusBuffer(_netId), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
+ Client::instance()->userInput(BufferInfo::fakeStatusBuffer(_netId),
+ QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
}
projects / quassel.git / blobdiff