Finishing the renaming of the BufferTreeView, since SVN doesn't allow

[quassel.git] / src / qtopia / qtopiamainwin.cpp

diff --git a/src/qtopia/qtopiamainwin.cpp b/src/qtopia/qtopiamainwin.cpp
index 3f68fe4..6388058 100644 (file)
--- a/src/qtopia/qtopiamainwin.cpp
+++ b/src/qtopia/qtopiamainwin.cpp
@@ -20,7 +20,7 @@
 
 #include "qtopiamainwin.h"
 
-#include "buffertreemodel.h"
+#include "networkmodel.h"
 #include "bufferviewwidget.h"
 #include "nicklistwidget.h"
 #include "chatline.h"
@@ -62,7 +62,7 @@ QtopiaMainWin::QtopiaMainWin(QWidget *parent, Qt::WFlags flags) : QMainWindow(pa
   mainWidget = new MainWidget(this);
   setCentralWidget(mainWidget);
 
-  BufferTreeModel *model = Client::bufferModel();
+  NetworkModel *model = Client::networkModel();
   connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
 
   toolBar = new QToolBar(this);
@@ -113,6 +113,7 @@ void QtopiaMainWin::closeEvent(QCloseEvent *event) {
 void QtopiaMainWin::setupActions() {
   showBuffersAction = toolBar->addAction(QIcon(":icon/options-hide"), tr("Show Buffers"), this, SLOT(showBufferView()));  // FIXME provide real icon
   showNicksAction = toolBar->addAction(QIcon(":icon/list"), tr("Show Nicks"), this, SLOT(showNickList()));
+  showNicksAction->setEnabled(false);
 
   QMenu *menu = new QMenu(this);
   menu->addAction(showBuffersAction);
@@ -134,7 +135,7 @@ void QtopiaMainWin::connectedToCore() {
   // FIXME just for testing: select first available buffer
   if(Client::allBufferInfos().count() > 1) {
     Buffer *b = Client::buffer(Client::allBufferInfos()[1]);
-    Client::bufferModel()->selectBuffer(b);
+    Client::networkModel()->selectBuffer(b);
   }
 #endif
 }
@@ -153,6 +154,7 @@ void QtopiaMainWin::showBuffer(Buffer *b) {
   bufferViewWidget->hide();
   mainWidget->setBuffer(b);
   nickListWidget->setBuffer(b);
+  showNicksAction->setEnabled(b && b->bufferType() == Buffer::ChannelType);
 
 }