Renamed NetworkView[Widget] to BufferView[Widget].

diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist
index be3867f..4924499 100644 (file)
--- 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/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
 gui/buffer.cpp
 gui/buffer.h
 main/message.cpp

diff --git a/core/sqlitestorage.cpp b/core/sqlitestorage.cpp
index b2804dd..b45f185 100644 (file)
--- 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 
 
   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();
       createNetworkQuery->bindValue(":userid", user);
       createNetworkQuery->bindValue(":networkname", network);
       createNetworkQuery->exec();

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 64743f3..91ff392 100644 (file)
--- 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
 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
 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
 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.
              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 6664758..f49898c 100644 (file)
--- a/gui/networkview.cpp
+++ b/gui/bufferview.cpp
@@ -19,30 +19,30 @@
  ***************************************************************************/
 
 #include "global.h"
  ***************************************************************************/
 
 #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);
 }
 
 
   ui.setupUi(this);
 
   //setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
 }
 
 

-QSize NetworkViewWidget::sizeHint() const {
+QSize BufferViewWidget::sizeHint() const {

   return QSize(150,100);
 
 }
 
 /**************************************************************************/
 
   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;
   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);
   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<Buffer *> buffers) {
+void BufferView::setBuffers(QList<Buffer *> buffers) {

   tree->clear(); bufitems.clear(); netitems.clear();
   foreach(Buffer *b, buffers) {
     bufferUpdated(b);
   }
 }
 
   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
     /*
   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) {
   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()) {
   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);
 }
 
   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;
   // 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;
 }
 
   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)
   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()));
   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<QTreeWidgetItem *> sel = tree->selectedItems();
   QTreeWidgetItem *item = 0;
   if(bufitems.contains(b)) item = bufitems[b];
   QList<QTreeWidgetItem *> 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 a85da6c..a76e327 100644 (file)
--- a/gui/networkview.h
+++ b/gui/bufferview.h
@@ -18,21 +18,21 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   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 <QtGui>

-#include "ui_networkview.h"
+#include "ui_bufferview.h"

 #include "guiproxy.h"
 #include "buffer.h"
 
 typedef QHash<QString, QHash<QString, Buffer*> > BufferHash;
 
 #include "guiproxy.h"
 #include "buffer.h"
 
 typedef QHash<QString, QHash<QString, Buffer*> > BufferHash;
 

-class NetworkViewWidget : public QWidget {
+class BufferViewWidget : public QWidget {

   Q_OBJECT
 
   public:
   Q_OBJECT
 
   public:

-    NetworkViewWidget(QWidget *parent = 0);
+    BufferViewWidget(QWidget *parent = 0);

 
     QTreeWidget *tree() { return ui.tree; }
 
 
     QTreeWidget *tree() { return ui.tree; }
 


@@ -45,11 +45,11 @@ class NetworkViewWidget : public QWidget {
 
 
   private:
 
 
   private:

-    Ui::NetworkViewWidget ui;
+    Ui::BufferViewWidget ui;

 
 };
 
 
 };
 

-class NetworkView : public QDockWidget {
+class BufferView : public QDockWidget {

   Q_OBJECT
 
   public:
   Q_OBJECT
 
   public:


@@ -64,7 +64,7 @@ class NetworkView : public QDockWidget {
       NewMessage = 0x02, Highlight = 0x40
     };
     
       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);
 
     void setMode(int mode, QStringList nets = QStringList());
     void setName(QString name);
 

diff --git a/gui/mainwin.cpp b/gui/mainwin.cpp
index ce57a99..7c4eb51 100644 (file)
--- a/gui/mainwin.cpp
+++ b/gui/mainwin.cpp
@@ -29,7 +29,7 @@
 
 #include "mainwin.h"
 #include "buffer.h"
 
 #include "mainwin.h"
 #include "buffer.h"

-#include "networkview.h"
+#include "bufferview.h"

 #include "serverlist.h"
 #include "coreconnectdlg.h"
 #include "settingsdlg.h"
 #include "serverlist.h"
 #include "coreconnectdlg.h"
 #include "settingsdlg.h"


@@ -153,23 +153,23 @@ void MainWin::setupMenus() {
 }
 
 void MainWin::setupViews() {
 }
 
 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);
   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);
   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);
   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();
 }
 
   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 *)));
   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);
   
   */
   Buffer *b = getBuffer(msg.buffer);
   

-  uint level = NetworkView::OtherActivity;
+  uint level = BufferView::OtherActivity;

   if(msg.type == Message::Plain or msg.type == Message::Notice){
   if(msg.type == Message::Plain or msg.type == Message::Notice){

-    level |= NetworkView::NewMessage;
+    level |= BufferView::NewMessage;

   }
   if(msg.flags & Message::Highlight){
   }
   if(msg.flags & Message::Highlight){

-    level |= NetworkView::Highlight;
+    level |= BufferView::Highlight;

   }
     
   emit bufferActivity(level, b);
   }
     
   emit bufferActivity(level, b);

diff --git a/gui/mainwin.h b/gui/mainwin.h
index 8d9aeea..df7154c 100644 (file)
--- a/gui/mainwin.h
+++ b/gui/mainwin.h
@@ -30,7 +30,7 @@
 
 class ServerListDlg;
 class CoreConnectDlg;
 
 class ServerListDlg;
 class CoreConnectDlg;

-class NetworkView;
+class BufferView;

 class Buffer;
 class BufferWidget;
 class SettingsDlg;
 class Buffer;
 class BufferWidget;
 class SettingsDlg;


@@ -50,7 +50,7 @@ class MainWin : public QMainWindow {
     ~MainWin();
 
     void init();
     ~MainWin();
 
     void init();

-    void registerNetView(NetworkView *);
+    void registerBufferView(BufferView *);

 
   protected:
     void closeEvent(QCloseEvent *event);
 
   protected:
     void closeEvent(QCloseEvent *event);


@@ -124,7 +124,7 @@ class MainWin : public QMainWindow {
     //QHash<QString, QList<Message> > coreBackLog;
     QList<BufferId> coreBuffers;
 
     //QHash<QString, QList<Message> > coreBackLog;
     QList<BufferId> coreBuffers;
 

-    QList<NetworkView *> netViews;
+    QList<BufferView *> netViews;

 
     QTimer *layoutTimer;
     QList<Message> layoutQueue;
 
     QTimer *layoutTimer;
     QList<Message> 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 205afc8..1eaebe3 100644 (file)
--- a/gui/ui/networkview.ui
+++ b/gui/ui/bufferview.ui
@@ -1,6 +1,6 @@
 <ui version="4.0" >
 <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>
   <property name="geometry" >
    <rect>
     <x>0</x>


@@ -24,7 +24,7 @@
    </size>
   </property>
   <property name="windowTitle" >
    </size>
   </property>
   <property name="windowTitle" >

-   <string>NetView</string>
+   <string>BufferView</string>

   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >