#include "mainwin.h"
#include "bufferview.h"
-#include "chatline.h"
+#include "chatline-old.h"
#include "client.h"
#include "coreconnectdlg.h"
#include "serverlist.h"
statusBar()->showMessage(tr("Waiting for core..."));
serverListDlg = new ServerListDlg(this);
settingsDlg = new SettingsDlg(this);
+
}
void MainWin::init() {
if(serverListDlg->showOnStartup()) {
showServerList();
}
-
+
+ setDockNestingEnabled(true);
+
+
// TESTING
-// setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
-// setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
+ setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
+ setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
-// setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
-// setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
-
-// QDockWidget *dock = new QDockWidget("Topic Dock", this);
-// dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
+ setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
+ setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
-// TopicWidget *topicwidget = new TopicWidget(dock);
-// dock->setWidget(topicwidget);
-
-// addDockWidget(Qt::TopDockWidgetArea, dock);
-// ui.menuViews->addAction(dock->toggleViewAction());
+ QDockWidget *dock = new QDockWidget("Topic Dock", this);
+ dock->setObjectName("TopicDock");
+ dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
+
+ TopicWidget *topicwidget = new TopicWidget(dock);
+ dock->setWidget(topicwidget);
+
+ Client::bufferModel()->mapProperty(0, Qt::DisplayRole, topicwidget, "topic");
+
+ addDockWidget(Qt::TopDockWidgetArea, dock);
+
+ ui.menuViews->addAction(dock->toggleViewAction());
}
BufferTreeModel *model = Client::bufferModel();
connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
- addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QStringList());
- addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QStringList());
- addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QStringList());
- addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QStringList());
- addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QStringList());
+ 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>());
ui.menuViews->addSeparator();
}
-void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QStringList &nets) {
+void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList<uint> &nets) {
QDockWidget *dock = new QDockWidget(viewname, this);
dock->setObjectName(QString("ViewDock-" + viewname)); // should be unique for mainwindow state!
dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
//create the view and initialize it's filter
BufferView *view = new BufferView(dock);
view->setFilteredModel(model, mode, nets);
-
- MappedSelectionModel *mappedSelectionModel = new MappedSelectionModel(view->model());
- Client::bufferModel()->selectionModelSynchronizer()->addSelectionModel(mappedSelectionModel);
- Q_ASSERT(mappedSelectionModel);
- delete view->selectionModel();
- view->setSelectionModel(mappedSelectionModel);
-
+ Client::bufferModel()->synchronizeView(view);
dock->setWidget(view);
addDockWidget(Qt::LeftDockWidgetArea, dock);