#include "clientbufferviewconfig.h"
#include "clientbufferviewmanager.h"
#include "clientignorelistmanager.h"
+#include "coreconfigwizard.h"
#include "coreconnectdlg.h"
#include "coreconnection.h"
#include "coreconnectionstatuswidget.h"
#include "settingspages/chatviewsettingspage.h"
#include "settingspages/connectionsettingspage.h"
#include "settingspages/coreaccountsettingspage.h"
-#include "settingspages/generalsettingspage.h"
+#include "settingspages/coreconnectionsettingspage.h"
#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
#include "settingspages/ignorelistsettingspage.h"
#else
: QMainWindow(parent),
#endif
- coreLagLabel(new QLabel()),
- sslLabel(new QLabel()),
_msgProcessorStatusWidget(new MsgProcessorStatusWidget(this)),
_coreConnectionStatusWidget(new CoreConnectionStatusWidget(Client::coreConnection(), this)),
_titleSetter(this),
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::coreConnection(), SIGNAL(startCoreSetup(QVariantList)), SLOT(showCoreConfigWizard(QVariantList)));
+ connect(Client::coreConnection(), SIGNAL(connectionErrorPopup(QString)), SLOT(handleCoreConnectionError(QString)));
connect(Client::coreConnection(), SIGNAL(userAuthenticationRequired(CoreAccount *, bool *, QString)), SLOT(userAuthenticationRequired(CoreAccount *, bool *, QString)));
connect(Client::coreConnection(), SIGNAL(handleNoSslInClient(bool*)), SLOT(handleNoSslInClient(bool *)));
connect(Client::coreConnection(), SIGNAL(handleNoSslInCore(bool*)), SLOT(handleNoSslInCore(bool *)));
_coreConnectionStatusWidget->update();
statusBar()->addPermanentWidget(_coreConnectionStatusWidget);
- // Core Lag:
- updateLagIndicator();
- statusBar()->addPermanentWidget(coreLagLabel);
- coreLagLabel->hide();
- connect(Client::signalProxy(), SIGNAL(lagUpdated(int)), this, SLOT(updateLagIndicator(int)));
-
- // SSL indicator
- sslLabel->setPixmap(QPixmap());
- statusBar()->addPermanentWidget(sslLabel);
- sslLabel->hide();
-
QAction *showStatusbar = QtUi::actionCollection("General")->action("ToggleStatusBar");
QtUiSettings uiSettings;
else
statusBar()->clearMessage();
- if(Client::signalProxy()->isSecure()) {
- sslLabel->setPixmap(SmallIcon("security-high"));
- } else {
- sslLabel->setPixmap(SmallIcon("security-low"));
- }
-
- sslLabel->setVisible(!Client::internalCore());
- coreLagLabel->setVisible(!Client::internalCore());
+ _coreConnectionStatusWidget->setVisible(!Client::internalCore());
updateIcon();
systemTray()->setState(SystemTray::Active);
if(accountId > 0) s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId));
}
-void MainWin::updateLagIndicator(int lag) {
- QString text = tr("Core Lag: %1");
- if(lag == -1)
- text = text.arg('-');
- else
- text = text.arg("%1 msec").arg(lag);
- coreLagLabel->setText(text);
-}
-
void MainWin::disconnectedFromCore() {
// save core specific layout and remove bufferviews;
saveLayout();
coll->action("CoreInfo")->setEnabled(false);
//_viewMenu->setEnabled(false);
statusBar()->showMessage(tr("Not connected to core."));
- sslLabel->setPixmap(QPixmap());
- sslLabel->hide();
- updateLagIndicator();
- coreLagLabel->hide();
if(_msgProcessorStatusWidget)
_msgProcessorStatusWidget->setProgress(0, 0);
updateIcon();
systemTray()->setState(SystemTray::Inactive);
}
-void MainWin::startInternalCore() {
-
-}
-
void MainWin::userAuthenticationRequired(CoreAccount *account, bool *valid, const QString &errorMessage) {
Q_UNUSED(errorMessage)
CoreConnectAuthDlg dlg(account, this);
#endif /* HAVE_SSL */
+void MainWin::handleCoreConnectionError(const QString &error) {
+ QMessageBox::critical(this, tr("Core Connection Error"), error, QMessageBox::Ok);
+}
+
void MainWin::showCoreConnectionDlg() {
CoreConnectDlg dlg(this);
if(dlg.exec() == QDialog::Accepted) {
}
}
+void MainWin::showCoreConfigWizard(const QVariantList &backends) {
+ CoreConfigWizard *wizard = new CoreConfigWizard(Client::coreConnection(), backends, this);
+
+ wizard->show();
+}
+
void MainWin::showChannelList(NetworkId netId) {
ChannelListDlg *channelListDlg = new ChannelListDlg();
//Category: Interface
dlg->registerSettingsPage(new AppearanceSettingsPage(dlg));
dlg->registerSettingsPage(new ChatViewSettingsPage(dlg));
+ dlg->registerSettingsPage(new ChatMonitorSettingsPage(dlg));
dlg->registerSettingsPage(new ItemViewSettingsPage(dlg));
+ dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
dlg->registerSettingsPage(new InputWidgetSettingsPage(dlg));
dlg->registerSettingsPage(new TopicWidgetSettingsPage(dlg));
dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
- dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
- dlg->registerSettingsPage(new ChatMonitorSettingsPage(dlg));
- //Category: Misc
- dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
+ //Category: IRC
dlg->registerSettingsPage(new ConnectionSettingsPage(dlg));
dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg));
dlg->registerSettingsPage(new NetworksSettingsPage(dlg));
dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
dlg->registerSettingsPage(new IgnoreListSettingsPage(dlg));
+ // Category: Remote Cores
if(Quassel::runMode() != Quassel::Monolithic) {
dlg->registerSettingsPage(new CoreAccountSettingsPage(dlg));
+ dlg->registerSettingsPage(new CoreConnectionSettingsPage(dlg));
}
dlg->show();