gui/ui/servereditdlg.ui
gui/ui/serverlistdlg.ui
gui/ui/settingsdlg.ui
-gui/ui/networkview.ui
-gui/networkview.cpp
-gui/networkview.h
+gui/ui/bufferview.ui
+gui/bufferview.cpp
+gui/bufferview.h
gui/buffer.cpp
gui/buffer.h
main/message.cpp
if(createBufferQuery->lastError().isValid()) {
if(createBufferQuery->lastError().number() == 19) { // Null Constraint violation
- qDebug() << createBufferQuery->lastError().text();
createNetworkQuery->bindValue(":userid", user);
createNetworkQuery->bindValue(":networkname", network);
createNetworkQuery->exec();
SET(gui_SRCS chatwidget.cpp channelwidgetinput.cpp tabcompleter.cpp mainwin.cpp serverlist.cpp buffer.cpp bufferwidget.cpp
- identities.cpp coreconnectdlg.cpp guiproxy.cpp networkview.cpp style.cpp settingsdlg.cpp settingspages.cpp)
+ identities.cpp coreconnectdlg.cpp guiproxy.cpp bufferview.cpp style.cpp settingsdlg.cpp settingspages.cpp)
SET(gui_HDRS style.h)
SET(gui_MOCS chatwidget.h channelwidgetinput.h tabcompleter.h mainwin.h serverlist.h identities.h coreconnectdlg.h
- guiproxy.h networkview.h buffer.h bufferwidget.h settingsdlg.h settingspages.h)
+ guiproxy.h bufferview.h buffer.h bufferwidget.h settingsdlg.h settingspages.h)
SET(gui_UICS identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui
nickeditdlg.ui serverlistdlg.ui servereditdlg.ui coreconnectdlg.ui ircwidget.ui
- networkview.ui bufferwidget.ui settingsdlg.ui
+ bufferview.ui bufferwidget.ui settingsdlg.ui
buffermgmntsettingspage.ui connectionsettingspage.ui)
# This prepends ui/ to the UIC names, so we don't have to do this ourselves.
***************************************************************************/
#include "global.h"
-#include "networkview.h"
+#include "bufferview.h"
-NetworkViewWidget::NetworkViewWidget(QWidget *parent) : QWidget(parent) {
+BufferViewWidget::BufferViewWidget(QWidget *parent) : QWidget(parent) {
ui.setupUi(this);
//setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
}
-QSize NetworkViewWidget::sizeHint() const {
+QSize BufferViewWidget::sizeHint() const {
return QSize(150,100);
}
/**************************************************************************/
-NetworkView::NetworkView(QString n, int m, QStringList nets, QWidget *parent) : QDockWidget(parent) {
+BufferView::BufferView(QString n, int m, QStringList nets, QWidget *parent) : QDockWidget(parent) {
setObjectName(QString("View-"+n)); // should be unique for mainwindow state!
name = n; mode = m;
setWindowTitle(name);
networks = nets;
currentBuffer = 0;
- setWidget(new NetworkViewWidget(this));
- tree = qobject_cast<NetworkViewWidget*>(widget())->tree();
+ setWidget(new BufferViewWidget(this));
+ tree = qobject_cast<BufferViewWidget*>(widget())->tree();
tree->header()->hide();
tree->setSortingEnabled(true);
tree->setRootIsDecorated(true);
}
-void NetworkView::setBuffers(QList<Buffer *> buffers) {
+void BufferView::setBuffers(QList<Buffer *> buffers) {
tree->clear(); bufitems.clear(); netitems.clear();
foreach(Buffer *b, buffers) {
bufferUpdated(b);
}
}
-void NetworkView::bufferUpdated(Buffer *b) {
+void BufferView::bufferUpdated(Buffer *b) {
if(bufitems.contains(b)) {
// FIXME this looks ugly
/*
}
}
-void NetworkView::bufferActivity(uint level, Buffer *b) {
+void BufferView::bufferActivity(uint level, Buffer *b) {
QColor c;
if(bufitems.contains(b) and b != currentBuffer) {
if(level & Highlight) {
}
}
-void NetworkView::clearActivity(Buffer *b) {
+void BufferView::clearActivity(Buffer *b) {
QColor c;
// it should be sane not to check if b is in bufitems since we just checked before calling this function
if(b->isActive()) {
bufitems[b]->setForeground(0, c);
}
-bool NetworkView::shouldShow(Buffer *b) {
+bool BufferView::shouldShow(Buffer *b) {
// bool f = false;
if((mode & NoActive) && b->isActive()) return false;
if((mode & NoInactive) && !b->isActive()) return false;
return true;
}
-void NetworkView::bufferDestroyed(Buffer *b) {
+void BufferView::bufferDestroyed(Buffer *b) {
}
-void NetworkView::itemClicked(QTreeWidgetItem *item) {
+void BufferView::itemClicked(QTreeWidgetItem *item) {
Buffer *b = bufitems.key(item);
if(b) {
// there is a buffer associated with the item (aka: status/channel/query)
}
}
-void NetworkView::itemDoubleClicked(QTreeWidgetItem *item) {
+void BufferView::itemDoubleClicked(QTreeWidgetItem *item) {
Buffer *b = bufitems.key(item);
if(b && Buffer::ChannelBuffer == b->bufferType()) {
emit fakeUserInput(b->bufferId(), QString("/join " + b->bufferName()));
}
}
-void NetworkView::selectBuffer(Buffer *b) {
+void BufferView::selectBuffer(Buffer *b) {
QTreeWidgetItem *item = 0;
if(bufitems.contains(b)) item = bufitems[b];
QList<QTreeWidgetItem *> sel = tree->selectedItems();
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef _NETWORKVIEW_H_
-#define _NETWORKVIEW_H_
+#ifndef _BUFFERVIEW_H_
+#define _BUFFERVIEW_H_
#include <QtGui>
-#include "ui_networkview.h"
+#include "ui_bufferview.h"
#include "guiproxy.h"
#include "buffer.h"
typedef QHash<QString, QHash<QString, Buffer*> > BufferHash;
-class NetworkViewWidget : public QWidget {
+class BufferViewWidget : public QWidget {
Q_OBJECT
public:
- NetworkViewWidget(QWidget *parent = 0);
+ BufferViewWidget(QWidget *parent = 0);
QTreeWidget *tree() { return ui.tree; }
private:
- Ui::NetworkViewWidget ui;
+ Ui::BufferViewWidget ui;
};
-class NetworkView : public QDockWidget {
+class BufferView : public QDockWidget {
Q_OBJECT
public:
NewMessage = 0x02, Highlight = 0x40
};
- NetworkView(QString name, int mode, QStringList nets = QStringList(), QWidget *parent = 0);
+ BufferView(QString name, int mode, QStringList nets = QStringList(), QWidget *parent = 0);
void setMode(int mode, QStringList nets = QStringList());
void setName(QString name);
#include "mainwin.h"
#include "buffer.h"
-#include "networkview.h"
+#include "bufferview.h"
#include "serverlist.h"
#include "coreconnectdlg.h"
#include "settingsdlg.h"
}
void MainWin::setupViews() {
- NetworkView *all = new NetworkView(tr("All Buffers"), NetworkView::AllNets);
- registerNetView(all);
+ BufferView *all = new BufferView(tr("All Buffers"), BufferView::AllNets);
+ registerBufferView(all);
addDockWidget(Qt::LeftDockWidgetArea, all);
- NetworkView *allchans = new NetworkView(tr("All Channels"), NetworkView::AllNets|NetworkView::NoQueries|NetworkView::NoServers);
- registerNetView(allchans);
+ BufferView *allchans = new BufferView(tr("All Channels"), BufferView::AllNets|BufferView::NoQueries|BufferView::NoServers);
+ registerBufferView(allchans);
addDockWidget(Qt::LeftDockWidgetArea, allchans);
- NetworkView *allqrys = new NetworkView(tr("All Queries"), NetworkView::AllNets|NetworkView::NoChannels|NetworkView::NoServers);
- registerNetView(allqrys);
+ BufferView *allqrys = new BufferView(tr("All Queries"), BufferView::AllNets|BufferView::NoChannels|BufferView::NoServers);
+ registerBufferView(allqrys);
addDockWidget(Qt::RightDockWidgetArea, allqrys);
- NetworkView *allnets = new NetworkView(tr("All Networks"), NetworkView::AllNets|NetworkView::NoChannels|NetworkView::NoQueries);
- registerNetView(allnets);
+ BufferView *allnets = new BufferView(tr("All Networks"), BufferView::AllNets|BufferView::NoChannels|BufferView::NoQueries);
+ registerBufferView(allnets);
addDockWidget(Qt::RightDockWidgetArea, allnets);
ui.menuViews->addSeparator();
}
-void MainWin::registerNetView(NetworkView *view) {
+void MainWin::registerBufferView(BufferView *view) {
connect(this, SIGNAL(bufferSelected(Buffer *)), view, SLOT(selectBuffer(Buffer *)));
connect(this, SIGNAL(bufferUpdated(Buffer *)), view, SLOT(bufferUpdated(Buffer *)));
connect(this, SIGNAL(bufferActivity(uint, Buffer *)), view, SLOT(bufferActivity(uint, Buffer *)));
*/
Buffer *b = getBuffer(msg.buffer);
- uint level = NetworkView::OtherActivity;
+ uint level = BufferView::OtherActivity;
if(msg.type == Message::Plain or msg.type == Message::Notice){
- level |= NetworkView::NewMessage;
+ level |= BufferView::NewMessage;
}
if(msg.flags & Message::Highlight){
- level |= NetworkView::Highlight;
+ level |= BufferView::Highlight;
}
emit bufferActivity(level, b);
class ServerListDlg;
class CoreConnectDlg;
-class NetworkView;
+class BufferView;
class Buffer;
class BufferWidget;
class SettingsDlg;
~MainWin();
void init();
- void registerNetView(NetworkView *);
+ void registerBufferView(BufferView *);
protected:
void closeEvent(QCloseEvent *event);
//QHash<QString, QList<Message> > coreBackLog;
QList<BufferId> coreBuffers;
- QList<NetworkView *> netViews;
+ QList<BufferView *> netViews;
QTimer *layoutTimer;
QList<Message> layoutQueue;
<ui version="4.0" >
- <class>NetworkViewWidget</class>
- <widget class="QWidget" name="NetworkViewWidget" >
+ <class>BufferViewWidget</class>
+ <widget class="QWidget" name="BufferViewWidget" >
<property name="geometry" >
<rect>
<x>0</x>
</size>
</property>
<property name="windowTitle" >
- <string>NetView</string>
+ <string>BufferView</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >