#include "clientbufferviewconfig.h"
#include "clientbufferviewmanager.h"
#include "clientignorelistmanager.h"
+#include "coreconnectdlg.h"
#include "coreconnection.h"
#include "coreconnectionstatuswidget.h"
#include "coreinfodlg.h"
// restore locked state of docks
QtUi::actionCollection("General")->action("LockLayout")->setChecked(s.value("LockLayout", false).toBool());
- if(Quassel::runMode() != Quassel::Monolithic) {
- //showCoreConnectionDlg(true); // autoconnect if appropriate
- } else {
- startInternalCore();
+ CoreConnection *conn = Client::coreConnection();
+ if(!conn->connectToCore()) {
+ // No autoconnect selected (or no accounts)
+ showCoreConnectionDlg();
}
- Client::coreConnection()->start();
}
MainWin::~MainWin() {
}
+void MainWin::showCoreConnectionDlg() {
+ CoreConnectDlg dlg(this);
+ if(dlg.exec() == QDialog::Accepted) {
+ AccountId accId = dlg.selectedAccount();
+ if(accId.isValid())
+ Client::coreConnection()->connectToCore(accId);
+ }
+}
+
void MainWin::showChannelList(NetworkId netId) {
ChannelListDlg *channelListDlg = new ChannelListDlg();