#include "settingspages/fontssettingspage.h"
#include "settingspages/identitiessettingspage.h"
+#include "settingspages/networkssettingspage.h"
#include "debugconsole.h"
// attach the BufferWidget to the PropertyMapper
- Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, ui.bufferWidget, "currentBuffer");
- connect(Client::networkModel(), SIGNAL(bufferAboutToBeRemoved(BufferId)),
- ui.bufferWidget, SLOT(removeBuffer(BufferId)));
+ ui.bufferWidget->setModel(Client::bufferModel());
+ ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
// attach the NickList to the PropertyMapper
Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
void MainWin::setupViews() {
BufferModel *model = Client::bufferModel();
- addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList<uint>());
- addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList<uint>());
- addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<uint>());
- addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<uint>());
- addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList<uint>());
+ addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList<NetworkId>());
+ addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList<NetworkId>());
+ addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<NetworkId>())->hide();
+ addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<NetworkId>())->hide();
+ addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList<NetworkId>())->hide();
ui.menuViews->addSeparator();
}
-void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList<uint> &nets) {
+QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList<NetworkId> &nets) {
QDockWidget *dock = new QDockWidget(viewname, this);
dock->setObjectName(QString("ViewDock-" + viewname)); // should be unique for mainwindow state!
dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
ui.menuViews->addAction(dock->toggleViewAction());
netViews.append(dock);
+ return dock;
}
void MainWin::setupSettingsDlg() {
+#ifdef SPUTDEV
+ connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME
+#endif
+
settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
+ settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
}
void MainWin::connectedToCore() {
coreConnectDlg = new CoreConnectDlg(this, autoConnect);
connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int)));
coreConnectDlg->setModal(true);
- if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect())
+ //if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect())
coreConnectDlg->show(); // avoid flicker and show dlg only if we do remote connect, which needs a progress bar
- if(autoConnect) coreConnectDlg->doAutoConnect();
+ //if(autoConnect) coreConnectDlg->doAutoConnect();
}
void MainWin::coreConnectionDlgFinished(int /*code*/) {
-
coreConnectDlg->close();
+ //exit(1);
}
void MainWin::closeEvent(QCloseEvent *event)
{
//if (userReallyWantsToQuit()) {
- ui.bufferWidget->saveState();
UiSettings s;
s.setValue("MainWinSize", size());
s.setValue("MainWinPos", pos());