From bb0bf17b61958e92529338596574f7a2a4f61d2a Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Mon, 11 Jun 2007 18:56:29 +0000 Subject: [PATCH 1/1] Renamed NetworkView[Widget] to BufferView[Widget]. --- Quassel.kdevelop.filelist | 6 ++--- core/sqlitestorage.cpp | 1 - gui/CMakeLists.txt | 6 ++--- gui/{networkview.cpp => bufferview.cpp} | 30 ++++++++++++------------ gui/{networkview.h => bufferview.h} | 16 ++++++------- gui/mainwin.cpp | 26 ++++++++++---------- gui/mainwin.h | 6 ++--- gui/ui/{networkview.ui => bufferview.ui} | 6 ++--- 8 files changed, 48 insertions(+), 49 deletions(-) rename gui/{networkview.cpp => bufferview.cpp} (88%) rename gui/{networkview.h => bufferview.h} (90%) rename gui/ui/{networkview.ui => bufferview.ui} (91%) diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist index be3867fc..4924499c 100644 --- a/Quassel.kdevelop.filelist +++ b/Quassel.kdevelop.filelist @@ -60,9 +60,9 @@ gui/ui/nickeditdlg.ui 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 diff --git a/core/sqlitestorage.cpp b/core/sqlitestorage.cpp index b2804ddc..b45f1858 100644 --- a/core/sqlitestorage.cpp +++ b/core/sqlitestorage.cpp @@ -265,7 +265,6 @@ void SqliteStorage::createBuffer(UserId user, QString network, QString buffer) { 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(); diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 64743f35..91ff392c 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -1,11 +1,11 @@ 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. diff --git a/gui/networkview.cpp b/gui/bufferview.cpp similarity index 88% rename from gui/networkview.cpp rename to gui/bufferview.cpp index 6664758e..f49898cf 100644 --- a/gui/networkview.cpp +++ b/gui/bufferview.cpp @@ -19,30 +19,30 @@ ***************************************************************************/ #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(widget())->tree(); + setWidget(new BufferViewWidget(this)); + tree = qobject_cast(widget())->tree(); tree->header()->hide(); tree->setSortingEnabled(true); tree->setRootIsDecorated(true); @@ -54,14 +54,14 @@ NetworkView::NetworkView(QString n, int m, QStringList nets, QWidget *parent) : } -void NetworkView::setBuffers(QList buffers) { +void BufferView::setBuffers(QList 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 /* @@ -114,7 +114,7 @@ void NetworkView::bufferUpdated(Buffer *b) { } } -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) { @@ -128,7 +128,7 @@ void NetworkView::bufferActivity(uint level, Buffer *b) { } } -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()) { @@ -139,7 +139,7 @@ void NetworkView::clearActivity(Buffer *b) { 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; @@ -150,11 +150,11 @@ bool NetworkView::shouldShow(Buffer *b) { 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) @@ -165,7 +165,7 @@ void NetworkView::itemClicked(QTreeWidgetItem *item) { } } -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())); @@ -173,7 +173,7 @@ void NetworkView::itemDoubleClicked(QTreeWidgetItem *item) { } } -void NetworkView::selectBuffer(Buffer *b) { +void BufferView::selectBuffer(Buffer *b) { QTreeWidgetItem *item = 0; if(bufitems.contains(b)) item = bufitems[b]; QList sel = tree->selectedItems(); diff --git a/gui/networkview.h b/gui/bufferview.h similarity index 90% rename from gui/networkview.h rename to gui/bufferview.h index a85da6c9..a76e3272 100644 --- a/gui/networkview.h +++ b/gui/bufferview.h @@ -18,21 +18,21 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _NETWORKVIEW_H_ -#define _NETWORKVIEW_H_ +#ifndef _BUFFERVIEW_H_ +#define _BUFFERVIEW_H_ #include -#include "ui_networkview.h" +#include "ui_bufferview.h" #include "guiproxy.h" #include "buffer.h" typedef QHash > 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; } @@ -45,11 +45,11 @@ class NetworkViewWidget : public QWidget { private: - Ui::NetworkViewWidget ui; + Ui::BufferViewWidget ui; }; -class NetworkView : public QDockWidget { +class BufferView : public QDockWidget { Q_OBJECT public: @@ -64,7 +64,7 @@ class NetworkView : public QDockWidget { 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); diff --git a/gui/mainwin.cpp b/gui/mainwin.cpp index ce57a997..7c4eb517 100644 --- a/gui/mainwin.cpp +++ b/gui/mainwin.cpp @@ -29,7 +29,7 @@ #include "mainwin.h" #include "buffer.h" -#include "networkview.h" +#include "bufferview.h" #include "serverlist.h" #include "coreconnectdlg.h" #include "settingsdlg.h" @@ -153,23 +153,23 @@ void MainWin::setupMenus() { } 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 *))); @@ -307,12 +307,12 @@ void MainWin::recvMessage(Message msg) { */ 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); diff --git a/gui/mainwin.h b/gui/mainwin.h index 8d9aeea8..df7154c0 100644 --- a/gui/mainwin.h +++ b/gui/mainwin.h @@ -30,7 +30,7 @@ class ServerListDlg; class CoreConnectDlg; -class NetworkView; +class BufferView; class Buffer; class BufferWidget; class SettingsDlg; @@ -50,7 +50,7 @@ class MainWin : public QMainWindow { ~MainWin(); void init(); - void registerNetView(NetworkView *); + void registerBufferView(BufferView *); protected: void closeEvent(QCloseEvent *event); @@ -124,7 +124,7 @@ class MainWin : public QMainWindow { //QHash > coreBackLog; QList coreBuffers; - QList netViews; + QList netViews; QTimer *layoutTimer; QList layoutQueue; diff --git a/gui/ui/networkview.ui b/gui/ui/bufferview.ui similarity index 91% rename from gui/ui/networkview.ui rename to gui/ui/bufferview.ui index 205afc82..1eaebe32 100644 --- a/gui/ui/networkview.ui +++ b/gui/ui/bufferview.ui @@ -1,6 +1,6 @@ - NetworkViewWidget - + BufferViewWidget + 0 @@ -24,7 +24,7 @@ - NetView + BufferView -- 2.20.1