#include "settingspages/connectionsettingspage.h"
#include "settingspages/coreaccountsettingspage.h"
#include "settingspages/coreconnectionsettingspage.h"
+#include <settingspages/corehighlightsettingspage.h>
#include "settingspages/dccsettingspage.h"
#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
SLOT(messagesInserted(const QModelIndex &, int, int)));
connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showChannelList(NetworkId)), SLOT(showChannelList(NetworkId)));
connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showIgnoreList(QString)), SLOT(showIgnoreList(QString)));
+ connect(Client::instance(), SIGNAL(showIgnoreList(QString)), SLOT(showIgnoreList(QString)));
connect(Client::coreConnection(), SIGNAL(startCoreSetup(QVariantList, QVariantList)), SLOT(showCoreConfigWizard(QVariantList, QVariantList)));
connect(Client::coreConnection(), SIGNAL(connectionErrorPopup(QString)), SLOT(handleCoreConnectionError(QString)));
setupActions();
setupBufferWidget();
setupMenus();
- setupTransferWidget();
+ // setupTransferWidget(); not ready yet
setupChatMonitor();
setupTopicWidget();
setupInputWidget();
void MainWin::showPasswordChangeDlg()
{
- if((Client::coreFeatures() & Quassel::PasswordChange)) {
+ if(Client::isCoreFeatureEnabled(Quassel::Feature::PasswordChange)) {
PasswordChangeDlg dlg(this);
dlg.exec();
}
}
-void MainWin::showCoreConfigWizard(const QVariantList &backends, const QVariantList &authBackends)
+void MainWin::showCoreConfigWizard(const QVariantList &backends, const QVariantList &authenticators)
{
- CoreConfigWizard *wizard = new CoreConfigWizard(Client::coreConnection(), backends, authBackends, this);
+ CoreConfigWizard *wizard = new CoreConfigWizard(Client::coreConnection(), backends, authenticators, this);
wizard->show();
}
dlg->registerSettingsPage(new SonnetSettingsPage(dlg));
#endif
dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
+ dlg->registerSettingsPage(new CoreHighlightSettingsPage(dlg));
dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
dlg->registerSettingsPage(new NetworksSettingsPage(dlg));
dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
dlg->registerSettingsPage(new IgnoreListSettingsPage(dlg));
- dlg->registerSettingsPage(new DccSettingsPage(dlg));
+ // dlg->registerSettingsPage(new DccSettingsPage(dlg)); not ready yet
// Category: Remote Cores
if (Quassel::runMode() != Quassel::Monolithic) {