/***************************************************************************
- * Copyright (C) 2005-2015 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 <QHeaderView>
#include <QHBoxLayout>
-#include <QIcon>
#include <QSpacerItem>
#include "client.h"
#include "clientirclisthelper.h"
+#include "icon.h"
ChannelListDlg::ChannelListDlg(QWidget *parent)
: QDialog(parent),
_sortFilter.setFilterKeyColumn(-1);
ui.setupUi(this);
- ui.advancedModeLabel->setPixmap(QIcon::fromTheme("edit-rename").pixmap(22));
+ 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(QIcon::fromTheme("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()));
enableQuery(true);
showFilterLine(false);
showErrors(false);
+
+ // Set initial input focus
+ updateInputFocus();
}
}
+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);
showFilterLine(!channelList.isEmpty());
_ircListModel.setChannelList(channelList);
enableQuery(_listFinished);
+ // Reset input focus since UI changed
+ updateInputFocus();
}
delete _simpleModeSpacer;
_simpleModeSpacer = 0;
}
- ui.advancedModeLabel->setPixmap(QIcon::fromTheme("edit-clear-locationbar-rtl", QIcon::fromTheme("edit-clear")).pixmap(16));
+ 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(QIcon::fromTheme("edit-rename").pixmap(16));
+ ui.advancedModeLabel->setPixmap(icon::get("edit-rename").pixmap(16));
}
ui.channelNameLineEdit->clear();
}
+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)
{
if (!show) {