X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtopia%2Fqtopiamainwin.cpp;h=5d615940e521108b97bf1c9ffbc859d53bde6fd1;hb=a7f5d6a23f7214b11f6db85346a67fd7d02767da;hp=5296eb47ea738d714ed741389578fd16dbca0b01;hpb=52380175425bdab29f825c9cd17a0e4c1952c2db;p=quassel.git

diff --git a/src/qtopia/qtopiamainwin.cpp b/src/qtopia/qtopiamainwin.cpp
index 5296eb47..5d615940 100644
--- a/src/qtopia/qtopiamainwin.cpp
+++ b/src/qtopia/qtopiamainwin.cpp
@@ -21,12 +21,13 @@
 #include "qtopiamainwin.h"
 
 #include "buffertreemodel.h"
+#include "bufferviewwidget.h"
 #include "chatline.h"
 #include "coreconnectdlg.h"
 #include "global.h"
 #include "mainwidget.h"
 #include "message.h"
-#include "qtopiagui.h"
+#include "qtopiaui.h"
 #include "signalproxy.h"
 
 // This constructor is the first thing to be called for a Qtopia app, so we do the init stuff
@@ -43,10 +44,13 @@ QtopiaMainWin::QtopiaMainWin(QWidget *parent, Qt::WFlags flags) : QMainWindow(pa
 
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
-  QCoreApplication::setOrganizationName("Quassel IRC Development Team");
+  QCoreApplication::setOrganizationName("Quassel IRC Team");
 
+  QSettings s(QSettings::UserScope, "quassel", "quassel");
+  s.setValue("foo", "bar");
+  
   //Style::init();
-  QtopiaGui *gui = new QtopiaGui(this);
+  QtopiaUi *gui = new QtopiaUi(this);
   Client::init(gui);
 
   setWindowTitle("Quassel IRC");
@@ -56,11 +60,17 @@ QtopiaMainWin::QtopiaMainWin(QWidget *parent, Qt::WFlags flags) : QMainWindow(pa
   mainWidget = new MainWidget(this);
   setCentralWidget(mainWidget);
 
-  QToolBar *toolBar = new QToolBar(this);
+  BufferTreeModel *model = Client::bufferModel();
+  connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *)));
+
+  toolBar = new QToolBar(this);
   toolBar->setIconSize(QSize(16, 16));
-  toolBar->addAction(QIcon(":icon/trash"), "Trash");
   addToolBar(toolBar);
 
+  bufferViewWidget = new BufferViewWidget(this);
+
+  setupActions();
+
   init();
   //gui->init();
 
@@ -80,6 +90,12 @@ void QtopiaMainWin::init() {
 QtopiaMainWin::~QtopiaMainWin() {
 
 
+}
+
+void QtopiaMainWin::setupActions() {
+  showBuffersAction = toolBar->addAction(QIcon(":icon/options-hide"), "Show Buffers", this, SLOT(showBufferView()));  // FIXME provide real icon
+
+
 }
 
 void QtopiaMainWin::connectedToCore() {
@@ -107,3 +123,10 @@ void QtopiaMainWin::showBuffer(Buffer *b) {
   mainWidget->setBuffer(b);
 
 }
+
+void QtopiaMainWin::showBufferView() {
+  bufferViewWidget->showMaximized();
+
+}
+
+