connect(selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), model(), SLOT(changeCurrent(const QModelIndex &, const QModelIndex &)));
connect(this, SIGNAL(doubleClicked(const QModelIndex &)), model(), SLOT(doubleClickReceived(const QModelIndex &)));
connect(model(), SIGNAL(updateSelection(const QModelIndex &, QItemSelectionModel::SelectionFlags)), selectionModel(), SLOT(select(const QModelIndex &, QItemSelectionModel::SelectionFlags)));
+
+ expandAll();
}
void BufferView::setFilteredModel(QAbstractItemModel *model, BufferViewFilter::Modes mode, QStringList nets) {
}
void BufferView::rowsInserted(const QModelIndex & parent, int start, int end) {
- if(parent.parent() == QModelIndex()) setExpanded(parent, true); qDebug() << "expanded";
+ if(parent.parent() == QModelIndex()) setExpanded(parent, true);
QTreeView::rowsInserted(parent, start, end);
}
void dragEnterEvent(QDragEnterEvent *);
- protected slots:
+ protected:
void rowsInserted (const QModelIndex & parent, int start, int end);
};
#include "guiproxy.h"
#include "buffer.h"
-#include "ui_bufferviewwidget.h"
+#include "gui/ui_bufferviewwidget.h"
#include "bufferview.h"
/*****************************************
#include "guiproxy.h"
#include "mainwin.h"
#include "buffer.h"
-#include "bufferview.h"
+//#include "bufferview.h"
#include "bufferviewwidget.h"
#include "util.h"
if(instanceptr) return instanceptr;
instanceptr = new Client();
instanceptr->init();
+ return instanceptr;
}
void Client::destroy() {
Client::Client() {
clientProxy = ClientProxy::instance();
- mainWin = new MainWin();
- _bufferModel = new BufferTreeModel(mainWin); // FIXME
+ //mainWin = new MainWin();
+
+ _bufferModel = new BufferTreeModel(0); // FIXME
connect(this, SIGNAL(bufferSelected(Buffer *)), _bufferModel, SLOT(selectBuffer(Buffer *)));
connect(this, SIGNAL(bufferUpdated(Buffer *)), _bufferModel, SLOT(bufferUpdated(Buffer *)));
connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(serverError(QAbstractSocket::SocketError)));
connect(Global::instance(), SIGNAL(dataPutLocally(UserId, QString)), this, SLOT(updateCoreData(UserId, QString)));
- connect(ClientProxy::instance(), SIGNAL(csUpdateGlobalData(QString, QVariant)), this, SLOT(updateLocalData(QString, QVariant)));
-
- connect(ClientProxy::instance(), SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), this, SLOT(recvProxySignal(ClientSignal, QVariant, QVariant, QVariant)));
+ connect(clientProxy, SIGNAL(csUpdateGlobalData(QString, QVariant)), this, SLOT(updateLocalData(QString, QVariant)));
+ connect(clientProxy, SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), this, SLOT(recvProxySignal(ClientSignal, QVariant, QVariant, QVariant)));
connect(clientProxy, SIGNAL(csServerState(QString, QVariant)), this, SLOT(recvNetworkState(QString, QVariant)));
connect(clientProxy, SIGNAL(csServerConnected(QString)), this, SLOT(networkConnected(QString)));
connect(clientProxy, SIGNAL(csServerDisconnected(QString)), this, SLOT(networkDisconnected(QString)));
emit requestBacklog(id, -1, -1); // TODO: use custom settings for backlog request
}
- //mainWin = new MainWin();
+ mainWin = new MainWin();
mainWin->init();
}
Client::~Client() {
delete mainWin;
- foreach(Buffer *buf, buffers.values()) delete buf;
delete _bufferModel;
+ foreach(Buffer *buf, buffers.values()) delete buf;
ClientProxy::destroy();
}
#include "buffer.h"
#include "message.h"
#include "guiproxy.h"
+#include "bufferviewwidget.h"
class MainWin;
class ClientProxy;
-class BufferTreeModel;
+//class BufferTreeModel;
class Client : public QObject {
Q_OBJECT
#include "settingsdlg.h"
#include "settingspages.h"
-LayoutThread *layoutThread;
-
MainWin::MainWin() : QMainWindow() {
ui.setupUi(this);
//widget = 0;
}
void MainWin::setupViews() {
+
BufferTreeModel *model = Client::bufferModel(); // FIXME Where is the delete for that? :p
connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
//connect(this, SIGNAL(bufferSelected(Buffer *)), model, SLOT(selectBuffer(Buffer *)));
class BufferWidget;
class SettingsDlg;
-extern LayoutThread *layoutThread;
-
//!\brief The main window and central object of Quassel GUI.
/** In addition to displaying the main window including standard stuff like a menubar,
* dockwidgets and of course the chat window, this class also stores all data it
void setupSettingsDlg();
//void syncToCore(); // implemented in main_mono.cpp or main_gui.cpp
//Buffer * getBuffer(QString net, QString buf);
- Buffer *getBuffer(BufferId);
- BufferId getStatusBufferId(QString net);
- BufferId getBufferId(QString net, QString buf);
+ //Buffer *getBuffer(BufferId);
+ //BufferId getStatusBufferId(QString net);
+ //BufferId getBufferId(QString net, QString buf);
//void buffersUpdated();
QSystemTrayIcon *systray;
QList<BufferViewDock *> netViews;
- QTimer *layoutTimer;
- QList<Message> layoutQueue;
+ //QTimer *layoutTimer;
+ //QList<Message> layoutQueue;
};
#endif