if (!Client::isCoreFeatureEnabled(Quassel::Feature::HideInactiveNetworks))
ui.hideInactiveNetworks->hide();
if (!Client::isCoreFeatureEnabled(Quassel::Feature::HideInactiveNetworks))
ui.hideInactiveNetworks->hide();
connect(Client::instance(), &Client::coreConnectionStateChanged, this, &BufferViewSettingsPage::coreConnectionStateChanged);
connect(Client::instance(), &Client::coreConnectionStateChanged, this, &BufferViewSettingsPage::coreConnectionStateChanged);
- connect(ui.bufferViewList->selectionModel(), &QItemSelectionModel::selectionChanged,
- this, &BufferViewSettingsPage::bufferViewSelectionChanged);
+ connect(ui.bufferViewList->selectionModel(),
+ &QItemSelectionModel::selectionChanged,
+ this,
+ &BufferViewSettingsPage::bufferViewSelectionChanged);
connect(ui.onlyStatusBuffers, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
connect(ui.onlyChannelBuffers, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
connect(ui.onlyStatusBuffers, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
connect(ui.onlyChannelBuffers, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
connect(ui.sortAlphabetically, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
connect(ui.hideInactiveBuffers, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
connect(ui.hideInactiveNetworks, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
connect(ui.sortAlphabetically, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
connect(ui.hideInactiveBuffers, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
connect(ui.hideInactiveNetworks, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
- connect(ui.networkSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetHasChanged()));
- connect(ui.minimumActivitySelector, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetHasChanged()));
+ connect(ui.networkSelector, selectOverload<int>(&QComboBox::currentIndexChanged), this, &BufferViewSettingsPage::widgetHasChanged);
+ connect(ui.minimumActivitySelector, selectOverload<int>(&QComboBox::currentIndexChanged), this, &BufferViewSettingsPage::widgetHasChanged);
connect(ui.showSearch, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
connect(ui.showSearch, &QAbstractButton::clicked, this, &BufferViewSettingsPage::widgetHasChanged);
- connect(ui.networkSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(enableStatusBuffers(int)));
+ connect(ui.networkSelector, selectOverload<int>(&QComboBox::currentIndexChanged), this, &BufferViewSettingsPage::enableStatusBuffers);
void BufferViewSettingsPage::reset()
{
ui.bufferViewList->clear();
ui.deleteBufferView->setEnabled(false);
void BufferViewSettingsPage::reset()
{
ui.bufferViewList->clear();
ui.deleteBufferView->setEnabled(false);
- QHash<BufferViewConfig *, BufferViewConfig *>::iterator changedConfigIter = _changedBufferViews.begin();
- QHash<BufferViewConfig *, BufferViewConfig *>::iterator changedConfigIterEnd = _changedBufferViews.end();
- BufferViewConfig *config;
+ QHash<BufferViewConfig*, BufferViewConfig*>::iterator changedConfigIter = _changedBufferViews.begin();
+ QHash<BufferViewConfig*, BufferViewConfig*>::iterator changedConfigIterEnd = _changedBufferViews.end();
+ BufferViewConfig* config;
while (changedConfigIter != changedConfigIterEnd) {
config = changedConfigIter.value();
changedConfigIter = _changedBufferViews.erase(changedConfigIter);
config->deleteLater();
}
while (changedConfigIter != changedConfigIterEnd) {
config = changedConfigIter.value();
changedConfigIter = _changedBufferViews.erase(changedConfigIter);
config->deleteLater();
}
- QList<BufferViewConfig *>::iterator newConfigIter = _newBufferViews.begin();
- QList<BufferViewConfig *>::iterator newConfigIterEnd = _newBufferViews.end();
+ QList<BufferViewConfig*>::iterator newConfigIter = _newBufferViews.begin();
+ QList<BufferViewConfig*>::iterator newConfigIterEnd = _newBufferViews.end();
- const QList<BufferViewConfig *> bufferViewConfigs = Client::bufferViewManager()->bufferViewConfigs();
- foreach(BufferViewConfig *bufferViewConfig, bufferViewConfigs) {
+ const QList<BufferViewConfig*> bufferViewConfigs = Client::bufferViewManager()->bufferViewConfigs();
+ foreach (BufferViewConfig* bufferViewConfig, bufferViewConfigs) {
- ui.networkSelector->setItemData(0, qVariantFromValue<NetworkId>(NetworkId()));
- const Network *net;
- foreach(NetworkId netId, Client::networkIds()) {
+ ui.networkSelector->setItemData(0, QVariant::fromValue(NetworkId()));
+ const Network* net;
+ foreach (NetworkId netId, Client::networkIds()) {
- QHash<BufferViewConfig *, BufferViewConfig *>::iterator changedConfigIter = _changedBufferViews.begin();
- QHash<BufferViewConfig *, BufferViewConfig *>::iterator changedConfigIterEnd = _changedBufferViews.end();
+ QHash<BufferViewConfig*, BufferViewConfig*>::iterator changedConfigIter = _changedBufferViews.begin();
+ QHash<BufferViewConfig*, BufferViewConfig*>::iterator changedConfigIterEnd = _changedBufferViews.end();
BufferViewConfig *config, *changedConfig;
while (changedConfigIter != changedConfigIterEnd) {
config = changedConfigIter.key();
BufferViewConfig *config, *changedConfig;
while (changedConfigIter != changedConfigIterEnd) {
config = changedConfigIter.key();
- QList<BufferViewConfig *>::iterator newConfigIter = _newBufferViews.begin();
- QList<BufferViewConfig *>::iterator newConfigIterEnd = _newBufferViews.end();
+ QList<BufferViewConfig*>::iterator newConfigIter = _newBufferViews.begin();
+ QList<BufferViewConfig*>::iterator newConfigIterEnd = _newBufferViews.end();
- connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigAdded(int)), this, SLOT(addBufferView(int)));
+ connect(Client::bufferViewManager(),
+ selectOverload<int>(&BufferViewManager::bufferViewConfigAdded),
+ this,
+ selectOverload<int>(&BufferViewSettingsPage::addBufferView));
- auto *item = new QListWidgetItem(config->bufferViewName(), ui.bufferViewList);
- item->setData(Qt::UserRole, qVariantFromValue<QObject *>(qobject_cast<QObject *>(config)));
+ auto* item = new QListWidgetItem(config->bufferViewName(), ui.bufferViewList);
+ item->setData(Qt::UserRole, QVariant::fromValue(qobject_cast<QObject*>(config)));
connect(config, &SyncableObject::updatedRemotely, this, &BufferViewSettingsPage::updateBufferView);
connect(config, &QObject::destroyed, this, &BufferViewSettingsPage::bufferViewDeleted);
ui.deleteBufferView->setEnabled(ui.bufferViewList->count() > 1);
}
connect(config, &SyncableObject::updatedRemotely, this, &BufferViewSettingsPage::updateBufferView);
connect(config, &QObject::destroyed, this, &BufferViewSettingsPage::bufferViewDeleted);
ui.deleteBufferView->setEnabled(ui.bufferViewList->count() > 1);
}
void BufferViewSettingsPage::addBufferView(int bufferViewId)
{
// we are informed about a new bufferview from Client::bufferViewManager()
void BufferViewSettingsPage::addBufferView(int bufferViewId)
{
// we are informed about a new bufferview from Client::bufferViewManager()
- obj = ui.bufferViewList->item(i)->data(Qt::UserRole).value<QObject *>();
- if (config == static_cast<BufferViewConfig *>(obj)) {
- QListWidgetItem *item = ui.bufferViewList->takeItem(i);
+ obj = ui.bufferViewList->item(i)->data(Qt::UserRole).value<QObject*>();
+ if (config == static_cast<BufferViewConfig*>(obj)) {
+ QListWidgetItem* item = ui.bufferViewList->takeItem(i);
{
// id's of newly created bufferviews are negative (-1, -2... -n)
int fakeId = -1 * (_newBufferViews.count() + 1);
{
// id's of newly created bufferviews are negative (-1, -2... -n)
int fakeId = -1 * (_newBufferViews.count() + 1);
config->setBufferViewName(bufferViewName);
config->setInitialized();
QList<BufferId> bufferIds;
config->setBufferViewName(bufferViewName);
config->setInitialized();
QList<BufferId> bufferIds;
- obj = ui.bufferViewList->item(i)->data(Qt::UserRole).value<QObject *>();
- if (config == qobject_cast<BufferViewConfig *>(obj))
+ obj = ui.bufferViewList->item(i)->data(Qt::UserRole).value<QObject*>();
+ if (config == qobject_cast<BufferViewConfig*>(obj))
- auto *obj = ui.bufferViewList->item(listPos)->data(Qt::UserRole).value<QObject *>();
- return qobject_cast<BufferViewConfig *>(obj);
+ auto* obj = ui.bufferViewList->item(listPos)->data(Qt::UserRole).value<QObject*>();
+ return qobject_cast<BufferViewConfig*>(obj);
void BufferViewSettingsPage::enableStatusBuffers(int networkIdx)
{
// we don't show a status buffer if we show multiple networks as selecting
void BufferViewSettingsPage::enableStatusBuffers(int networkIdx)
{
// we don't show a status buffer if we show multiple networks as selecting
existing << bufferConfig->bufferViewName();
}
BufferViewEditDlg dlg(QString(), existing, this);
if (dlg.exec() == QDialog::Accepted) {
newBufferView(dlg.bufferViewName());
existing << bufferConfig->bufferViewName();
}
BufferViewEditDlg dlg(QString(), existing, this);
if (dlg.exec() == QDialog::Accepted) {
newBufferView(dlg.bufferViewName());
void BufferViewSettingsPage::on_renameBufferView_clicked()
{
if (ui.bufferViewList->selectedItems().isEmpty())
void BufferViewSettingsPage::on_renameBufferView_clicked()
{
if (ui.bufferViewList->selectedItems().isEmpty())
existing << bufferConfig->bufferViewName();
}
BufferViewEditDlg dlg(config->bufferViewName(), existing, this);
if (dlg.exec() == QDialog::Accepted) {
existing << bufferConfig->bufferViewName();
}
BufferViewEditDlg dlg(config->bufferViewName(), existing, this);
if (dlg.exec() == QDialog::Accepted) {
changedConfig->setBufferViewName(dlg.bufferViewName());
ui.bufferViewList->item(listPos(config))->setText(dlg.bufferViewName());
changedConfig->setBufferViewName(dlg.bufferViewName());
ui.bufferViewList->item(listPos(config))->setText(dlg.bufferViewName());
void BufferViewSettingsPage::on_deleteBufferView_clicked()
{
if (ui.bufferViewList->selectedItems().isEmpty())
return;
void BufferViewSettingsPage::on_deleteBufferView_clicked()
{
if (ui.bufferViewList->selectedItems().isEmpty())
return;
QString viewName = currentItem->text();
int viewId = bufferView(ui.bufferViewList->currentRow())->bufferViewId();
QString viewName = currentItem->text();
int viewId = bufferView(ui.bufferViewList->currentRow())->bufferViewId();
- int ret = QMessageBox::question(this, tr("Delete Chat List?"),
- tr("Do you really want to delete the chat list \"%1\"?").arg(viewName),
- QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
+ int ret = QMessageBox::question(this,
+ tr("Delete Chat List?"),
+ tr("Do you really want to delete the chat list \"%1\"?").arg(viewName),
+ QMessageBox::Yes | QMessageBox::No,
+ QMessageBox::No);
Client::networkModel()->sortBufferIds(bufferIds);
if (!_newBufferViews.contains(config) || config->addNewBuffersAutomatically())
Client::networkModel()->sortBufferIds(bufferIds);
if (!_newBufferViews.contains(config) || config->addNewBuffersAutomatically())
bool BufferViewSettingsPage::testHasChanged()
{
saveConfig(cloneConfig(bufferView(ui.bufferViewList->currentRow())));
bool BufferViewSettingsPage::testHasChanged()
{
saveConfig(cloneConfig(bufferView(ui.bufferViewList->currentRow())));
- QHash<BufferViewConfig *, BufferViewConfig *>::iterator iter = _changedBufferViews.begin();
- QHash<BufferViewConfig *, BufferViewConfig *>::iterator iterEnd = _changedBufferViews.end();
+ QHash<BufferViewConfig*, BufferViewConfig*>::iterator iter = _changedBufferViews.begin();
+ QHash<BufferViewConfig*, BufferViewConfig*>::iterator iterEnd = _changedBufferViews.end();
while (iter != iterEnd) {
if (&(iter.key()) == &(iter.value())) {
iter.value()->deleteLater();
while (iter != iterEnd) {
if (&(iter.key()) == &(iter.value())) {
iter.value()->deleteLater();
changedConfig->fromVariantMap(config->toVariantMap());
changedConfig->setInitialized();
_changedBufferViews[config] = changedConfig;
connect(config, &BufferViewConfig::bufferAdded, changedConfig, &BufferViewConfig::addBuffer);
connect(config, &BufferViewConfig::bufferMoved, changedConfig, &BufferViewConfig::moveBuffer);
connect(config, &BufferViewConfig::bufferRemoved, changedConfig, &BufferViewConfig::removeBuffer);
changedConfig->fromVariantMap(config->toVariantMap());
changedConfig->setInitialized();
_changedBufferViews[config] = changedConfig;
connect(config, &BufferViewConfig::bufferAdded, changedConfig, &BufferViewConfig::addBuffer);
connect(config, &BufferViewConfig::bufferMoved, changedConfig, &BufferViewConfig::moveBuffer);
connect(config, &BufferViewConfig::bufferRemoved, changedConfig, &BufferViewConfig::removeBuffer);
-// connect(config, SIGNAL(addBufferRequested(const BufferId &, int)), changedConfig, SLOT(addBuffer(const BufferId &, int)));
-// connect(config, SIGNAL(moveBufferRequested(const BufferId &, int)), changedConfig, SLOT(moveBuffer(const BufferId &, int)));
-// connect(config, SIGNAL(removeBufferRequested(const BufferId &)), changedConfig, SLOT(removeBuffer(const BufferId &)));
+ // connect(config, &BufferViewConfig::addBufferRequested, changedConfig, &BufferViewConfig::addBuffer);
+ // connect(config, &BufferViewConfig::moveBufferRequested, changedConfig, &BufferViewConfig::moveBuffer);
+ // connect(config, &BufferViewconfig::removeBufferRequested, changedConfig, &BufferViewConfig::removeBuffer);
changedConfig->setProperty("OriginalBufferList", toVariantList<BufferId>(config->bufferList()));
// if this is the currently displayed view we have to change the config of the preview filter
changedConfig->setProperty("OriginalBufferList", toVariantList<BufferId>(config->bufferList()));
// if this is the currently displayed view we have to change the config of the preview filter
if (filter && filter->config() == config)
filter->setConfig(changedConfig);
ui.bufferViewPreview->setConfig(changedConfig);
if (filter && filter->config() == config)
filter->setConfig(changedConfig);
ui.bufferViewPreview->setConfig(changedConfig);
/**************************************************************************
* BufferViewEditDlg
*************************************************************************/
/**************************************************************************
* BufferViewEditDlg
*************************************************************************/
-BufferViewEditDlg::BufferViewEditDlg(const QString &old, QStringList exist, QWidget *parent) : QDialog(parent), existing(std::move(exist))
+BufferViewEditDlg::BufferViewEditDlg(const QString& old, QStringList exist, QWidget* parent)
+ : QDialog(parent)
+ , existing(std::move(exist))